diff --git a/anel/meta.json b/anel/meta.json
index 1fe384e0..6dffd27a 100644
--- a/anel/meta.json
+++ b/anel/meta.json
@@ -4,8 +4,11 @@
     "icon": "anel.jpg",
     "stability": "consumer",
     "offline": true,
+    "technology": [
+        "network"
+    ],
     "categories": [
         "sensor",
-        "plug"
+        "socket"
     ]
 }
diff --git a/aqi/logo.map.png b/aqi/logo.map.png
deleted file mode 100644
index 096b1807..00000000
Binary files a/aqi/logo.map.png and /dev/null differ
diff --git a/aqi/meta.json b/aqi/meta.json
index 80003d11..3bf8ce95 100644
--- a/aqi/meta.json
+++ b/aqi/meta.json
@@ -4,7 +4,10 @@
     "icon": "aqi.png",
     "stability": "consumer",
     "offline": false,
+    "technology": [
+        "cloud"
+    ],
     "categories": [
-        "service"
+        "online-service"
     ]
 }
diff --git a/avahimonitor/meta.json b/avahimonitor/meta.json
index c4fd8585..45226c41 100644
--- a/avahimonitor/meta.json
+++ b/avahimonitor/meta.json
@@ -4,7 +4,10 @@
     "icon": "avahi.svg",
     "stability": "community",
     "offline": true,
+    "technology": [
+        "network"
+    ],
     "categories": [
-        "sensor"
+        "tool"
     ]
 }
diff --git a/awattar/meta.json b/awattar/meta.json
index 183001f4..0f923c0c 100644
--- a/awattar/meta.json
+++ b/awattar/meta.json
@@ -1,10 +1,13 @@
 {
     "title": "aWATTar",
     "tagline": "Get the latest energy price from aWATTar.",
-    "icon": "awattar.svg",
+    "icon": "awattar.png",
     "stability": "consumer",
     "offline": false,
+    "technology": [
+        "cloud"
+    ],
     "categories": [
-        "service"
+        "online-service"
     ]
 }
diff --git a/boblight/meta.json b/boblight/meta.json
index 14bc9091..3b0f0a63 100644
--- a/boblight/meta.json
+++ b/boblight/meta.json
@@ -4,6 +4,9 @@
     "icon": "boblight.png",
     "stability": "community",
     "offline": false,
+    "technology": [
+        "network"
+    ],
     "categories": [
         "light"
     ]
diff --git a/bose/meta.json b/bose/meta.json
index 2d2208cb..fad8c3e2 100644
--- a/bose/meta.json
+++ b/bose/meta.json
@@ -4,6 +4,9 @@
     "icon": "bose.svg",
     "stability": "consumer",
     "offline": true,
+    "technology": [
+        "network"
+    ],
     "categories": [
         "multimedia"
     ]
diff --git a/coinmarketcap/meta.json b/coinmarketcap/meta.json
index 540aee3b..bde45260 100644
--- a/coinmarketcap/meta.json
+++ b/coinmarketcap/meta.json
@@ -1,10 +1,13 @@
 {
     "title": "CoinMarketCap",
     "tagline": "Get latest crypto prices from CoinMarketCap.",
-    "icon": "coinmarketcap.svg",
+    "icon": "coinmarketcap.png",
     "stability": "consumer",
     "offline": false,
+    "technology": [
+        "cloud"
+    ],
     "categories": [
-        "service"
+        "online-service"
     ]
 }
diff --git a/commandlauncher/meta.json b/commandlauncher/meta.json
index 45cced4c..f8d292b3 100644
--- a/commandlauncher/meta.json
+++ b/commandlauncher/meta.json
@@ -4,6 +4,8 @@
     "icon": "commandlauncher.svg",
     "stability": "community",
     "offline": true,
+    "technology": [
+    ],
     "categories": [
         "tool"
     ]
diff --git a/conrad/meta.json b/conrad/meta.json
index d55eb11b..ce9ede79 100644
--- a/conrad/meta.json
+++ b/conrad/meta.json
@@ -4,6 +4,9 @@
     "icon": "conrad.svg",
     "stability": "community",
     "offline": true,
+    "technology": [
+        "sub-ghz"
+    ],
     "categories": [
         "socket"
     ]
diff --git a/datetime/meta.json b/datetime/meta.json
index d7bf07d2..c0dbf3f9 100644
--- a/datetime/meta.json
+++ b/datetime/meta.json
@@ -4,6 +4,8 @@
     "icon": "datetime.svg",
     "stability": "consumer",
     "offline": true,
+    "technology": [
+    ],
     "categories": [
         "sensor"
     ]
diff --git a/daylightsensor/meta.json b/daylightsensor/meta.json
index 800a7b7f..46b6d69d 100644
--- a/daylightsensor/meta.json
+++ b/daylightsensor/meta.json
@@ -4,6 +4,8 @@
     "icon": "daylightsensor.svg",
     "stability": "consumer",
     "offline": true,
+    "technology": [
+    ],
     "categories": [
         "sensor"
     ]
diff --git a/denon/meta.json b/denon/meta.json
index b17470df..810660cb 100644
--- a/denon/meta.json
+++ b/denon/meta.json
@@ -4,6 +4,9 @@
     "icon": "denon.svg",
     "stability": "consumer",
     "offline": true,
+    "technology": [
+        "network"
+    ],
     "categories": [
         "multimedia"
     ]
diff --git a/dweetio/meta.json b/dweetio/meta.json
index 0f557cdc..bbc0af7f 100644
--- a/dweetio/meta.json
+++ b/dweetio/meta.json
@@ -4,6 +4,9 @@
     "icon": "dweetio.png",
     "stability": "consumer",
     "offline": false,
+    "technology": [
+        "cloud"
+    ],
     "categories": [
         "service"
     ]
diff --git a/dynatrace/meta.json b/dynatrace/meta.json
index 3fdc84f5..79ddb899 100644
--- a/dynatrace/meta.json
+++ b/dynatrace/meta.json
@@ -4,6 +4,9 @@
     "icon": "dynatrace.svg",
     "stability": "consumer",
     "offline": true,
+    "technology": [
+        "network"
+    ],
     "categories": [
         "light"
     ]
diff --git a/elgato/avea.png b/elgato/avea.png
new file mode 100644
index 00000000..9c45bc46
Binary files /dev/null and b/elgato/avea.png differ
diff --git a/elgato/meta.json b/elgato/meta.json
index 3f67ceec..3db0fb8e 100644
--- a/elgato/meta.json
+++ b/elgato/meta.json
@@ -1,9 +1,12 @@
 {
     "title": "Elgato",
     "tagline": "Connect to Elgato devices.",
-    "icon": "elgato.svg",
+    "icon": "avea.png",
     "stability": "community",
     "offline": true,
+    "technology": [
+        "bluetooth"
+    ],
     "categories": [
         "light"
     ]
diff --git a/elro/meta.json b/elro/meta.json
index d6fbb800..44cb6762 100644
--- a/elro/meta.json
+++ b/elro/meta.json
@@ -4,6 +4,9 @@
     "icon": "elro.svg",
     "stability": "community",
     "offline": true,
+    "technology": [
+        "sub-ghz"
+    ],
     "categories": [
     ]
 }
diff --git a/eq-3/meta.json b/eq-3/meta.json
index 813b41e2..f708e45d 100644
--- a/eq-3/meta.json
+++ b/eq-3/meta.json
@@ -4,6 +4,9 @@
     "icon": "eq3.svg",
     "stability": "community",
     "offline": true,
+    "technology": [
+        "network"
+    ],
     "categories": [
     ]
 }
diff --git a/flowercare/meta.json b/flowercare/meta.json
index 05a7f2c6..6e198bff 100644
--- a/flowercare/meta.json
+++ b/flowercare/meta.json
@@ -4,6 +4,9 @@
     "icon": "flowercare.svg",
     "stability": "community",
     "offline": true,
+    "technology": [
+        "bluetooth"
+    ],
     "categories": [
         "sensor"
     ]
diff --git a/genericelements/meta.json b/genericelements/meta.json
index b84b3094..c6d8356c 100644
--- a/genericelements/meta.json
+++ b/genericelements/meta.json
@@ -4,6 +4,8 @@
     "icon": "genericelements.svg",
     "stability": "community",
     "offline": true,
+    "technology": [
+    ],
     "categories": [
         "tool"
     ]
diff --git a/genericinterfaces/meta.json b/genericinterfaces/meta.json
index f827db8e..71341a78 100644
--- a/genericinterfaces/meta.json
+++ b/genericinterfaces/meta.json
@@ -4,6 +4,8 @@
     "icon": "genericinterfaces.svg",
     "stability": "community",
     "offline": true,
+    "technology": [
+    ],
     "categories": [
         "tool"
     ]
diff --git a/gpio/gpio.svg b/gpio/gpio.svg
new file mode 100644
index 00000000..3e1a4cf9
--- /dev/null
+++ b/gpio/gpio.svg
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="512px" height="512px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
+<g>
+	<g>
+		<path d="M128,320c26.467,0,48,21.533,48,48s-21.533,48-48,48s-48-21.533-48-48S101.533,320,128,320 M128,304
+			c-35.346,0-64,28.654-64,64c0,35.347,28.654,64,64,64s64-28.653,64-64C192,332.654,163.346,304,128,304L128,304z"/>
+		<path d="M383.25,288c44.388,0,80.625,36.112,80.625,80.5S427.888,448,383.5,448h-255C84.112,448,48,412.888,48,368.5
+			S84.112,288,128.5,288H383 M383.5,272h-255C75.205,272,32,315.205,32,368.5S75.205,464,128.5,464h255
+			c53.295,0,96.5-42.205,96.5-95.5S436.795,272,383.5,272L383.5,272z"/>
+	</g>
+	<g>
+		<path d="M384,96c26.467,0,48,21.533,48,48s-21.533,48-48,48s-48-21.533-48-48S357.533,96,384,96 M384,80
+			c-35.346,0-64,28.654-64,64c0,35.347,28.654,64,64,64s64-28.653,64-64C448,108.654,419.346,80,384,80L384,80z"/>
+		<path d="M129,64h254.5c44.388,0,80.5,36.112,80.5,80.5S427.888,224,383.5,224h-255c-44.388,0-80.375-35.112-80.375-79.5
+			S84.362,64,128.75,64 M128.5,48C75.205,48,32,91.205,32,144.5S75.205,240,128.5,240h255c53.295,0,96.5-42.205,96.5-95.5
+			S436.795,48,383.5,48H128.5L128.5,48z"/>
+	</g>
+</g>
+</svg>
diff --git a/gpio/meta.json b/gpio/meta.json
index a47f1ecc..1ce38a41 100644
--- a/gpio/meta.json
+++ b/gpio/meta.json
@@ -1,9 +1,11 @@
 {
     "title": "GPIO",
     "tagline": "Control GPIOs for Raspberry Pi or BeagleBone Black.",
-    "icon": "beagleboneblack.svg",
+    "icon": "gpio.svg",
     "stability": "community",
     "offline": false,
+    "technology": [
+    ],
     "categories": [
         "sensor"
     ]
diff --git a/httpcommander/meta.json b/httpcommander/meta.json
index 25a34e95..c0d9fe9e 100644
--- a/httpcommander/meta.json
+++ b/httpcommander/meta.json
@@ -4,6 +4,9 @@
     "icon": "httpcommander.svg",
     "stability": "consumer",
     "offline": true,
+    "technology": [
+        "network"
+    ],
     "categories": [
         "tool"
     ]
diff --git a/intertechno/meta.json b/intertechno/meta.json
index 93a19eb1..2d2d1633 100644
--- a/intertechno/meta.json
+++ b/intertechno/meta.json
@@ -4,6 +4,9 @@
     "icon": "intertechno.svg",
     "stability": "community",
     "offline": true,
+    "technology": [
+        "sub-ghz"
+    ],
     "categories": [
         "socket"
     ]
diff --git a/keba/meta.json b/keba/meta.json
index 982eec0f..cdb4be7b 100644
--- a/keba/meta.json
+++ b/keba/meta.json
@@ -4,6 +4,9 @@
     "icon": "keba.svg",
     "stability": "consumer",
     "offline": true,
+    "technology": [
+        "network"
+    ],
     "categories": [
     ]
 }
diff --git a/kodi/meta.json b/kodi/meta.json
index a8bb8aaa..4567f546 100644
--- a/kodi/meta.json
+++ b/kodi/meta.json
@@ -4,6 +4,9 @@
     "icon": "kodi.svg",
     "stability": "community",
     "offline": true,
+    "technology": [
+        "network"
+    ],
     "categories": [
         "multimedia"
     ]
diff --git a/leynew/meta.json b/leynew/meta.json
index 1fd2a31e..86812861 100644
--- a/leynew/meta.json
+++ b/leynew/meta.json
@@ -4,6 +4,9 @@
     "icon": "leynew.jpg",
     "stability": "community",
     "offline": true,
+    "technology": [
+        "sub-ghz"
+    ],
     "categories": [
         "socket"
     ]
diff --git a/lgsmarttv/meta.json b/lgsmarttv/meta.json
index 63490583..7a0ac47c 100644
--- a/lgsmarttv/meta.json
+++ b/lgsmarttv/meta.json
@@ -4,6 +4,9 @@
     "icon": "lg.svg",
     "stability": "consumer",
     "offline": true,
+    "technology": [
+        "network"
+    ],
     "categories": [
         "sensor"
     ]
diff --git a/mailnotification/meta.json b/mailnotification/meta.json
index 73b13836..fd1679f4 100644
--- a/mailnotification/meta.json
+++ b/mailnotification/meta.json
@@ -4,6 +4,9 @@
     "icon": "mailnotification.svg",
     "stability": "consumer",
     "offline": false,
+    "technology": [
+        "cloud"
+    ],
     "categories": [
         "notification"
     ]
diff --git a/mqttclient/meta.json b/mqttclient/meta.json
index 71f7e5e7..5efb6898 100644
--- a/mqttclient/meta.json
+++ b/mqttclient/meta.json
@@ -4,6 +4,9 @@
     "icon": "mqtt.svg",
     "stability": "community",
     "offline": true,
+    "technology": [
+        "network"
+    ],
     "categories": [
         "tool"
     ]
diff --git a/nanoleaf/meta.json b/nanoleaf/meta.json
index f196b034..459cbc2a 100644
--- a/nanoleaf/meta.json
+++ b/nanoleaf/meta.json
@@ -4,6 +4,9 @@
     "icon": "nanoleaf.svg",
     "stability": "consumer",
     "offline": true,
+    "technology": [
+        "network"
+    ],
     "categories": [
         "light"
     ]
diff --git a/netatmo/meta.json b/netatmo/meta.json
index 92969d14..11e9b3f4 100644
--- a/netatmo/meta.json
+++ b/netatmo/meta.json
@@ -4,6 +4,9 @@
     "icon": "netatmo.png",
     "stability": "consumer",
     "offline": false,
+    "technology": [
+        "network"
+    ],
     "categories": [
         "sensor"
     ]
diff --git a/networkdetector/meta.json b/networkdetector/meta.json
index 73bc08cd..f9c68cc0 100644
--- a/networkdetector/meta.json
+++ b/networkdetector/meta.json
@@ -4,6 +4,9 @@
     "icon": "networkdetector.svg",
     "stability": "community",
     "offline": true,
+    "technology": [
+        "network"
+    ],
     "categories": [
         "sensor"
     ]
diff --git a/nuki/meta.json b/nuki/meta.json
index 3631af66..07f54522 100644
--- a/nuki/meta.json
+++ b/nuki/meta.json
@@ -4,6 +4,9 @@
     "icon": "nuki.png",
     "stability": "consumer",
     "offline": true,
+    "technology": [
+        "bluetooth"
+    ],
     "categories": [
         "lock"
     ]
diff --git a/onewire/meta.json b/onewire/meta.json
index 8d06382f..bb1d1a2e 100644
--- a/onewire/meta.json
+++ b/onewire/meta.json
@@ -4,6 +4,9 @@
     "icon": "onewire.png",
     "stability": "community",
     "offline": true,
+    "technology": [
+        "one-wire"
+    ],
     "categories": [
         "sensor"
     ]
diff --git a/openuv/meta.json b/openuv/meta.json
index 7ba037be..b5ab5943 100644
--- a/openuv/meta.json
+++ b/openuv/meta.json
@@ -4,6 +4,9 @@
     "icon": "openuv.png",
     "stability": "consumer",
     "offline": false,
+    "technology": [
+        "cloud"
+    ],
     "categories": [
         "service"
     ]
diff --git a/openweathermap/meta.json b/openweathermap/meta.json
index 05fd7826..2d95e9d9 100644
--- a/openweathermap/meta.json
+++ b/openweathermap/meta.json
@@ -4,6 +4,9 @@
     "icon": "openweathermap.svg",
     "stability": "consumer",
     "offline": false,
+    "technology": [
+        "cloud"
+    ],
     "categories": [
         "weather",
         "service"
diff --git a/osdomotics/meta.json b/osdomotics/meta.json
index dcb0db28..c1fe720b 100644
--- a/osdomotics/meta.json
+++ b/osdomotics/meta.json
@@ -4,6 +4,9 @@
     "icon": "osdomotics.svg",
     "stability": "community",
     "offline": true,
+    "technology": [
+        "serial-port"
+    ],
     "categories": [
         "gateway"
     ]
diff --git a/philipshue/meta.json b/philipshue/meta.json
index b3d9faf0..3519ce57 100644
--- a/philipshue/meta.json
+++ b/philipshue/meta.json
@@ -1,9 +1,12 @@
 {
     "title": "Philips Hue",
     "tagline": "Connect and control Philips Hue devices.",
-    "icon": "philipshue.svg",
+    "icon": "philipshue.png",
     "stability": "consumer",
     "offline": true,
+    "technology": [
+        "network"
+    ],
     "categories": [
         "light",
         "sensor"
diff --git a/pushbullet/meta.json b/pushbullet/meta.json
index 35d5c59b..5e9ec978 100644
--- a/pushbullet/meta.json
+++ b/pushbullet/meta.json
@@ -1,10 +1,14 @@
 {
     "title": "Pushbullet",
     "tagline": "Send notifictions over Pushbullet.",
-    "icon": "pushbullet.svg",
+    "icon": "pushbullet.png",
     "stability": "consumer",
     "offline": false,
+    "technology": [
+        "cloud"
+    ],
     "categories": [
+        "online-service",
         "notification"
     ]
 }
diff --git a/pushbullet/pushbullet.png b/pushbullet/pushbullet.png
new file mode 100644
index 00000000..130e8ca8
Binary files /dev/null and b/pushbullet/pushbullet.png differ
diff --git a/remotessh/meta.json b/remotessh/meta.json
index 43d3fc23..69d5860c 100644
--- a/remotessh/meta.json
+++ b/remotessh/meta.json
@@ -1,9 +1,12 @@
 {
     "title": "Remote SSH",
     "tagline": "Get SSH access over a reverse SSH proxy.",
-    "icon": "reversessh.svg",
+    "icon": "remotessh.svg",
     "stability": "community",
     "offline": false,
+    "technology": [
+        "cloud"
+    ],
     "categories": [
         "tool"
     ]
diff --git a/remotessh/remotessh.svg b/remotessh/remotessh.svg
new file mode 100644
index 00000000..172543b8
--- /dev/null
+++ b/remotessh/remotessh.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="512px" height="512px" viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
+<g>
+	<g>
+		<polygon points="288,144 288,160 400,160 400,432 112,432 112,160 224,160 224,144 96,144 96,448 416,448 416,144 		"/>
+	</g>
+	<g>
+		<polygon points="193.1,252.3 181.5,263.9 256,338.4 330.5,263.9 318.9,252.3 264.2,307 264.2,64 247.8,64 247.8,307 		"/>
+	</g>
+</g>
+</svg>
diff --git a/senic/meta.json b/senic/meta.json
index e26d7777..bb8b8025 100644
--- a/senic/meta.json
+++ b/senic/meta.json
@@ -4,6 +4,10 @@
     "icon": "senic.png",
     "stability": "consumer",
     "offline": true,
+    "technology": [
+        "bluetooth"
+    ],
     "categories": [
+        "switch"
     ]
 }
diff --git a/serialportcommander/meta.json b/serialportcommander/meta.json
index e5e87da9..f3d89bd8 100644
--- a/serialportcommander/meta.json
+++ b/serialportcommander/meta.json
@@ -4,6 +4,9 @@
     "icon": "serialportcomander.svg",
     "stability": "community",
     "offline": true,
+    "technology": [
+        "serial-port"
+    ],
     "categories": [
         "tool"
     ]
diff --git a/shelly/meta.json b/shelly/meta.json
index 1b850f2a..4141bb61 100644
--- a/shelly/meta.json
+++ b/shelly/meta.json
@@ -4,7 +4,11 @@
     "icon": "shelly.svg",
     "stability": "consumer",
     "offline": true,
+    "technology": [
+        "network"
+    ],
     "categories": [
-        "socket"
+        "socket",
+        "relay"
     ]
 }
diff --git a/simulation/meta.json b/simulation/meta.json
index f635a35f..a31ea3d2 100644
--- a/simulation/meta.json
+++ b/simulation/meta.json
@@ -4,6 +4,8 @@
     "icon": "simulation.svg",
     "stability": "consumer",
     "offline": false,
+    "technology": [
+    ],
     "categories": [
         "tool"
     ]
diff --git a/snapd/meta.json b/snapd/meta.json
index 73c8d171..380d408f 100644
--- a/snapd/meta.json
+++ b/snapd/meta.json
@@ -1,9 +1,12 @@
 {
     "title": "Snapd",
     "tagline": "Control the Snap daemon.",
-    "icon": "snappy.svg",
+    "icon": "snapd.svg",
     "stability": "consumer",
     "offline": true,
+    "technology": [
+        "cloud"
+    ],
     "categories": [
         "tool"
     ]
diff --git a/sonos/meta.json b/sonos/meta.json
index f754661e..b4b9f398 100644
--- a/sonos/meta.json
+++ b/sonos/meta.json
@@ -4,6 +4,9 @@
     "icon": "sonos.svg",
     "stability": "consumer",
     "offline": false,
+    "technology": [
+        "cloud"
+    ],
     "categories": [
         "multimedia"
     ]
diff --git a/systemmonitor/meta.json b/systemmonitor/meta.json
index bcb14483..0a0357f7 100644
--- a/systemmonitor/meta.json
+++ b/systemmonitor/meta.json
@@ -4,6 +4,8 @@
     "icon": "systemmonitor.svg",
     "stability": "community",
     "offline": true,
+    "technology": [
+    ],
     "categories": [
         "tool"
     ]
diff --git a/tado/meta.json b/tado/meta.json
index f96378b8..fe9ceafe 100644
--- a/tado/meta.json
+++ b/tado/meta.json
@@ -4,6 +4,9 @@
     "icon": "tado.png",
     "stability": "community",
     "offline": false,
+    "technology": [
+        "cloud"
+    ],
     "categories": [
         "heating"
     ]
diff --git a/tasmota/integrationplugintasmota.json b/tasmota/integrationplugintasmota.json
index 523cb4fb..d87e94b9 100644
--- a/tasmota/integrationplugintasmota.json
+++ b/tasmota/integrationplugintasmota.json
@@ -1,4 +1,4 @@
-{
+ {
     "name": "tasmota",
     "displayName": "Sonoff-Tasmota",
     "id": "d136e0c0-0cbf-4731-aabb-b2201088d6cb",
diff --git a/tasmota/meta.json b/tasmota/meta.json
index 0c0a2042..a7e7270e 100644
--- a/tasmota/meta.json
+++ b/tasmota/meta.json
@@ -4,7 +4,11 @@
     "icon": "tasmota.svg",
     "stability": "community",
     "offline": true,
+    "technology": [
+        "network"
+    ],
     "categories": [
+        "relay",
         "socket"
     ]
 }
diff --git a/tcpcommander/meta.json b/tcpcommander/meta.json
index 68145626..ad010c74 100644
--- a/tcpcommander/meta.json
+++ b/tcpcommander/meta.json
@@ -4,6 +4,9 @@
     "icon": "tcpcommander.svg",
     "stability": "community",
     "offline": true,
+    "technology": [
+        "network"
+    ],
     "categories": [
         "tool"
     ]
diff --git a/texasinstruments/meta.json b/texasinstruments/meta.json
index 30032703..e4a43d0c 100644
--- a/texasinstruments/meta.json
+++ b/texasinstruments/meta.json
@@ -4,6 +4,9 @@
     "icon": "texasinstruments.svg",
     "stability": "community",
     "offline": true,
+    "technology": [
+        "bluetooth"
+    ],
     "categories": [
         "sensor"
     ]
diff --git a/tplink/meta.json b/tplink/meta.json
index f11f92b9..aecaf050 100644
--- a/tplink/meta.json
+++ b/tplink/meta.json
@@ -4,6 +4,9 @@
     "icon": "tplink.png",
     "stability": "community",
     "offline": true,
+    "technology": [
+        "network"
+    ],
     "categories": [
         "sensor"
     ]
diff --git a/tuya/meta.json b/tuya/meta.json
index b75cfe92..bb2b66e7 100644
--- a/tuya/meta.json
+++ b/tuya/meta.json
@@ -2,8 +2,11 @@
     "title": "Tuya",
     "tagline": "Connect to the Tuya cloud.",
     "icon": "tuya.jpg",
-    "stability": "consumer",
+    "stability": "community",
     "offline": false,
+    "technology": [
+        "cloud"
+    ],
     "categories": [
         "sensor"
     ]
diff --git a/udpcommander/meta.json b/udpcommander/meta.json
index b3386fda..3d291aef 100644
--- a/udpcommander/meta.json
+++ b/udpcommander/meta.json
@@ -4,6 +4,9 @@
     "icon": "udpcommander.svg",
     "stability": "community",
     "offline": true,
+    "technology": [
+        "network"
+    ],
     "categories": [
         "tool"
     ]
diff --git a/udpcommander/udpcommander.svg b/udpcommander/udpcommander.svg
new file mode 100644
index 00000000..9b43e0f9
--- /dev/null
+++ b/udpcommander/udpcommander.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="512px" height="512px" viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
+<path d="M96,249.6l116.6,51.3L269.8,416L416,96L96,249.6z M228.1,296.5l155.7-166.2L269.2,379.2L228.1,296.5z M381.8,128.3
+	L216.8,285.4L134,249L381.8,128.3z"/>
+</svg>
diff --git a/unifi/meta.json b/unifi/meta.json
index a88d61cb..8adeb408 100644
--- a/unifi/meta.json
+++ b/unifi/meta.json
@@ -4,6 +4,9 @@
     "icon": "unifi.png",
     "stability": "consumer",
     "offline": true,
+    "technology": [
+        "network"
+    ],
     "categories": [
         "sensor"
     ]
diff --git a/unitec/meta.json b/unitec/meta.json
index 77a0e4bd..06d8b415 100644
--- a/unitec/meta.json
+++ b/unitec/meta.json
@@ -4,6 +4,9 @@
     "icon": "unitec.jpg",
     "stability": "community",
     "offline": true,
+    "technology": [
+        "sub-ghz"
+    ],
     "categories": [
         "socket"
     ]
diff --git a/usbrelay/meta.json b/usbrelay/meta.json
index 43802736..3e9d49ce 100644
--- a/usbrelay/meta.json
+++ b/usbrelay/meta.json
@@ -4,6 +4,9 @@
     "icon": "usbrelay.svg",
     "stability": "consumer",
     "offline": true,
+    "technology": [
+        "usb"
+    ],
     "categories": [
     ]
 }
diff --git a/wakeonlan/meta.json b/wakeonlan/meta.json
index c4a558c2..62206640 100644
--- a/wakeonlan/meta.json
+++ b/wakeonlan/meta.json
@@ -3,7 +3,10 @@
     "tagline": "Wake up devices in you LAN.",
     "icon": "wol.svg",
     "stability": "consumer",
-    "offline": false,
+    "offline": true,
+    "technology": [
+        "network"
+    ],
     "categories": [
     ]
 }
diff --git a/wemo/meta.json b/wemo/meta.json
index b83e108b..d4a177d7 100644
--- a/wemo/meta.json
+++ b/wemo/meta.json
@@ -4,6 +4,9 @@
     "icon": "wemo.svg",
     "stability": "consumer",
     "offline": true,
+    "technology": [
+        "network"
+    ],
     "categories": [
         "socket"
     ]
diff --git a/ws2812fx/meta.json b/ws2812fx/meta.json
index a79afaa8..b9e4addb 100644
--- a/ws2812fx/meta.json
+++ b/ws2812fx/meta.json
@@ -1,9 +1,12 @@
 {
     "title": "WS2812FX",
     "tagline": "Connect to devices flashed with the WS2812FX library.",
-    "icon": "ws2812fx.svg",
+    "icon": "ws2812fx.png",
     "stability": "community",
     "offline": true,
+    "technology": [
+        "usb"
+    ],
     "categories": [
         "light"
     ]