diff --git a/anel/meta.json b/anel/meta.json
index 81c5867d..f3c6a16c 100644
--- a/anel/meta.json
+++ b/anel/meta.json
@@ -2,10 +2,10 @@
     "title": "Anel",
     "tagline": "Integrates Anel with nymea",
     "icon": "anel.jpg",
-    "stability": "consumer"
+    "stability": "consumer",
     "offline": true,
     "categories": [
         "sensor",
         "plug"
-    ],
+    ]
 }
diff --git a/aqi/meta.json b/aqi/meta.json
index 632effed..5c322b06 100644
--- a/aqi/meta.json
+++ b/aqi/meta.json
@@ -2,9 +2,9 @@
     "title": "Air Quality Index",
     "tagline": "Get air quality index data." ,
     "icon": "aqi.png",
-    "stability": "consumer"
+    "stability": "consumer",
     "offline": false,
     "categories": [
-        "sensor"
-    ],
+        "service"
+    ]
 }
diff --git a/avahimonitor/meta.json b/avahimonitor/meta.json
index 632effed..6c2f047c 100644
--- a/avahimonitor/meta.json
+++ b/avahimonitor/meta.json
@@ -1,10 +1,10 @@
 {
-    "title": "Air Quality Index",
-    "tagline": "Get air quality index data." ,
-    "icon": "aqi.png",
-    "stability": "consumer"
-    "offline": false,
+    "title": "Avahi",
+    "tagline": "Discover Avahi devices in your network." ,
+    "icon": "avahi.svg",
+    "stability": "community",
+    "offline": true,
     "categories": [
         "sensor"
-    ],
+    ]
 }
diff --git a/awattar/meta.json b/awattar/meta.json
index 632effed..11f3fa64 100644
--- a/awattar/meta.json
+++ b/awattar/meta.json
@@ -1,10 +1,10 @@
 {
-    "title": "Air Quality Index",
-    "tagline": "Get air quality index data." ,
-    "icon": "aqi.png",
-    "stability": "consumer"
+    "title": "aWATTar,
+    "tagline": "Get the latest enery price from aWATTar." ,
+    "icon": "awattar.svg",
+    "stability": "consumer",
     "offline": false,
     "categories": [
-        "sensor"
-    ],
+        "service"
+    ]
 }
diff --git a/boblight/meta.json b/boblight/meta.json
index 632effed..31d8f6b7 100644
--- a/boblight/meta.json
+++ b/boblight/meta.json
@@ -1,10 +1,10 @@
 {
-    "title": "Air Quality Index",
-    "tagline": "Get air quality index data." ,
-    "icon": "aqi.png",
-    "stability": "consumer"
+    "title": "Boblight"
+    "tagline": "Connect to Boblight devices" ,
+    "icon": "boblight.svg",
+    "stability": "community",
     "offline": false,
     "categories": [
-        "sensor"
-    ],
+        "light"
+    ]
 }
diff --git a/bose/meta.json b/bose/meta.json
index 632effed..d713e8f8 100644
--- a/bose/meta.json
+++ b/bose/meta.json
@@ -1,10 +1,10 @@
 {
-    "title": "Air Quality Index",
-    "tagline": "Get air quality index data." ,
-    "icon": "aqi.png",
+    "title": "Bose",
+    "tagline": "Connect to Bose speaker." ,
+    "icon": "bose.svg",
     "stability": "consumer"
-    "offline": false,
+    "offline": true,
     "categories": [
-        "sensor"
-    ],
+        "multimedia"
+    ]
 }
diff --git a/coinmarketcap/meta.json b/coinmarketcap/meta.json
index 632effed..d4142ba0 100644
--- a/coinmarketcap/meta.json
+++ b/coinmarketcap/meta.json
@@ -1,10 +1,10 @@
 {
-    "title": "Air Quality Index",
-    "tagline": "Get air quality index data." ,
-    "icon": "aqi.png",
-    "stability": "consumer"
+    "title": "CoinMarketCap",
+    "tagline": "Get latest crypto prices from CoinMarketCap" ,
+    "icon": "coinmarketcap.svg",
+    "stability": "consumer",
     "offline": false,
     "categories": [
-        "sensor"
-    ],
+        "service"
+    ]
 }
diff --git a/commandlauncher/meta.json b/commandlauncher/meta.json
index 632effed..1b6e901b 100644
--- a/commandlauncher/meta.json
+++ b/commandlauncher/meta.json
@@ -1,10 +1,10 @@
 {
-    "title": "Air Quality Index",
-    "tagline": "Get air quality index data." ,
-    "icon": "aqi.png",
-    "stability": "consumer"
-    "offline": false,
+    "title": "Command Launcher",
+    "tagline": "Launch local commands or bash scripts" ,
+    "icon": "commandlauncher.svg",
+    "stability": "community",
+    "offline": true,
     "categories": [
-        "sensor"
-    ],
+        "tool"
+    ]
 }
diff --git a/conrad/meta.json b/conrad/meta.json
index 632effed..30087460 100644
--- a/conrad/meta.json
+++ b/conrad/meta.json
@@ -1,10 +1,10 @@
 {
-    "title": "Air Quality Index",
-    "tagline": "Get air quality index data." ,
-    "icon": "aqi.png",
-    "stability": "consumer"
+    "title": "Conrad",
+    "tagline": "Gontrol Conrad 433MHz devices." ,
+    "icon": "conrad.svg",
+    "stability": "community",
     "offline": false,
     "categories": [
-        "sensor"
-    ],
+        "socket"
+    ]
 }
diff --git a/datetime/meta.json b/datetime/meta.json
index 632effed..7269b2a4 100644
--- a/datetime/meta.json
+++ b/datetime/meta.json
@@ -1,10 +1,10 @@
 {
-    "title": "Air Quality Index",
-    "tagline": "Get air quality index data." ,
-    "icon": "aqi.png",
+    "title": "Date and Time",
+    "tagline": "TODO" ,
+    "icon": "datetime.svg",
     "stability": "consumer"
-    "offline": false,
+    "offline": true,
     "categories": [
         "sensor"
-    ],
+    ]
 }
diff --git a/daylightsensor/meta.json b/daylightsensor/meta.json
index 632effed..fb385519 100644
--- a/daylightsensor/meta.json
+++ b/daylightsensor/meta.json
@@ -1,10 +1,10 @@
 {
-    "title": "Air Quality Index",
-    "tagline": "Get air quality index data." ,
-    "icon": "aqi.png",
+    "title": "Daylight Sensor",
+    "tagline": "Get sunrise and sundown events." ,
+    "icon": "daylightsensor.svg",
     "stability": "consumer"
-    "offline": false,
+    "offline": true,
     "categories": [
         "sensor"
-    ],
+    ]
 }
diff --git a/denon/meta.json b/denon/meta.json
index 632effed..3fc987d9 100644
--- a/denon/meta.json
+++ b/denon/meta.json
@@ -1,10 +1,10 @@
 {
-    "title": "Air Quality Index",
-    "tagline": "Get air quality index data." ,
-    "icon": "aqi.png",
-    "stability": "consumer"
-    "offline": false,
+    "title": "Denon",
+    "tagline": "Control Denon Heos and AVR devices" ,
+    "icon": "denon.svg",
+    "stability": "consumer",
+    "offline": true,
     "categories": [
-        "sensor"
-    ],
+        "multimedia"
+    ]
 }
diff --git a/dweetio/meta.json b/dweetio/meta.json
index 632effed..dffcc1f5 100644
--- a/dweetio/meta.json
+++ b/dweetio/meta.json
@@ -1,10 +1,10 @@
 {
-    "title": "Air Quality Index",
-    "tagline": "Get air quality index data." ,
-    "icon": "aqi.png",
-    "stability": "consumer"
+    "title": "dweet.io",
+    "tagline": "Get and push data to dweet.io" ,
+    "icon": "dweet.svg",
+    "stability": "consumer",
     "offline": false,
     "categories": [
-        "sensor"
-    ],
+        "service
+    ]
 }
diff --git a/dynatrace/meta.json b/dynatrace/meta.json
index 632effed..781eea4e 100644
--- a/dynatrace/meta.json
+++ b/dynatrace/meta.json
@@ -1,10 +1,10 @@
 {
-    "title": "Air Quality Index",
-    "tagline": "Get air quality index data." ,
+    "title": "Dynatrace",
+    "tagline": "Connect to the Dynatrace UFO" ,
     "icon": "aqi.png",
-    "stability": "consumer"
-    "offline": false,
+    "stability": "consumer",
+    "offline": true,
     "categories": [
-        "sensor"
+        "light"
     ],
 }
diff --git a/elgato/meta.json b/elgato/meta.json
index 632effed..dc8373cb 100644
--- a/elgato/meta.json
+++ b/elgato/meta.json
@@ -1,10 +1,9 @@
 {
-    "title": "Air Quality Index",
-    "tagline": "Get air quality index data." ,
-    "icon": "aqi.png",
-    "stability": "consumer"
-    "offline": false,
+    "title": "Elgato",
+    "tagline": "Connect to Elgato devices." ,
+    "icon": "elgato.svg",
+    "stability": "community",
+    "offline": true,
     "categories": [
-        "sensor"
-    ],
+    ]
 }
diff --git a/simulation/meta.json b/simulation/meta.json
index 632effed..20be1cfe 100644
--- a/simulation/meta.json
+++ b/simulation/meta.json
@@ -1,10 +1,15 @@
 {
-    "title": "Air Quality Index",
-    "tagline": "Get air quality index data." ,
-    "icon": "aqi.png",
-    "stability": "consumer"
+    "title": "Simulation",
+    "tagline": "Simulate different thing types" ,
+    "icon": "",
+    "stability": "consumer",
     "offline": false,
     "categories": [
+        "light",
+        "heating",
+        "socket",
+        "blind",
+        "multimedia",
         "sensor"
     ],
 }
diff --git a/usbrelay/meta.json b/usbrelay/meta.json
index 632effed..64e03f98 100644
--- a/usbrelay/meta.json
+++ b/usbrelay/meta.json
@@ -1,10 +1,9 @@
 {
-    "title": "Air Quality Index",
-    "tagline": "Get air quality index data." ,
-    "icon": "aqi.png",
-    "stability": "consumer"
-    "offline": false,
+    "title": "USB Reley",
+    "tagline": "Control relays connected over USB",
+    "icon": "usbrelay.svg",
+    "stability": "consumer",
+    "offline": true,
     "categories": [
-        "sensor"
-    ],
+    ]
 }
diff --git a/wakeonlan/meta.json b/wakeonlan/meta.json
index 632effed..e47571c1 100644
--- a/wakeonlan/meta.json
+++ b/wakeonlan/meta.json
@@ -1,10 +1,9 @@
 {
-    "title": "Air Quality Index",
-    "tagline": "Get air quality index data." ,
-    "icon": "aqi.png",
-    "stability": "consumer"
+    "title": "Wake-On-LAN",
+    "tagline": "Wake divices in you LAN" ,
+    "icon": "wol.svg",
+    "stability": "consumer",
     "offline": false,
     "categories": [
-        "sensor"
-    ],
+    ]
 }
diff --git a/wemo/meta.json b/wemo/meta.json
index 632effed..c3bf87b0 100644
--- a/wemo/meta.json
+++ b/wemo/meta.json
@@ -1,10 +1,10 @@
 {
-    "title": "Air Quality Index",
-    "tagline": "Get air quality index data." ,
-    "icon": "aqi.png",
-    "stability": "consumer"
-    "offline": false,
+    "title": "WeMo",
+    "tagline": "Control WeMo devices." ,
+    "icon": "wemo.svg",
+    "stability": "consumer",
+    "offline": true,
     "categories": [
-        "sensor"
+        "socket"
     ],
 }
diff --git a/ws2812fx/meta.json b/ws2812fx/meta.json
index 632effed..32716d3a 100644
--- a/ws2812fx/meta.json
+++ b/ws2812fx/meta.json
@@ -1,10 +1,10 @@
 {
-    "title": "Air Quality Index",
-    "tagline": "Get air quality index data." ,
-    "icon": "aqi.png",
-    "stability": "consumer"
-    "offline": false,
+    "title": "WS2812FX",
+    "tagline": "Connect to devices flashed with the WS2812FX library." ,
+    "icon": "ws2812fx.svf",
+    "stability": "community",
+    "offline": true,
     "categories": [
-        "sensor"
-    ],
+        "light"
+    ]
 }