diff --git a/src/main/java/de/ph87/home/demo/DemoService.java b/src/main/java/de/ph87/home/demo/DemoService.java
index 4eb2b5c..517dde1 100644
--- a/src/main/java/de/ph87/home/demo/DemoService.java
+++ b/src/main/java/de/ph87/home/demo/DemoService.java
@@ -67,7 +67,7 @@ public class DemoService {
     device(eg, "ambiente", "Ambiente", 849, 848, tagDecoration, tagDecorationInside);
 
     final AreaDto wohnzimmer = area(eg, "wohnzimmer", "Wohnzimmer");
-    tunable(wohnzimmer, "spots", "Spots", 28, 828, 2344, 2343, 1825, 1824, tagLight);
+    tunable(wohnzimmer, "spots", "", 28, 828, 2344, 2343, 1825, 1824, tagLight);
     shutter(wohnzimmer, "links", "Links", 1048, tagShutter, tagFront);
     shutter(wohnzimmer, "rechts", "Rechts", 1811, tagShutter, tagFront);
     device(wohnzimmer, "fernseher", "Fernseher", 20, 4, tagDevice, tagMedia, tagVideo, tagConfirm);
@@ -76,25 +76,25 @@ public class DemoService {
     device(wohnzimmer, "fensterdekoration", "Fenster", 1823, 1822, tagDecoration, tagDecorationWindow);
 
     final AreaDto kueche = area(eg, "kueche", "Küche");
-    tunable(kueche, "spots", "Spots", 2311, 2304, 2342, 2341, 2321, 2317, tagLight);
+    tunable(kueche, "spots", "", 2311, 2304, 2342, 2341, 2321, 2317, tagLight);
     device(kueche, "haengelampe", "Hängelampe", 2313, 2312, tagLight);
     shutter(kueche, "seite", "Seite", 2316, tagShutter, tagSide);
     shutter(kueche, "theke", "Theke", 2320, tagShutter, tagBack);
     shutter(kueche, "tuer", "Tür", 2324, tagShutter, tagBack);
 
     final AreaDto waschkueche = area(eg, "waschkueche", "Waschküche");
-    tunable(waschkueche, "spots", "Spots", 1827, 1826, 1829, 1828, 1831, 1830, tagLight);
+    tunable(waschkueche, "spots", "", 1827, 1826, 1829, 1828, 1831, 1830, tagLight);
     shutter(waschkueche, "seite", "Seite", 1820, tagShutter, tagBack);
 
     final AreaDto flurEg = area(eg, "flur", "Flur EG");
-    tunable(flurEg, "spots", "Spots", 1032, 1294, 2340, 2339, 2327, 2325, tagLight);
+    tunable(flurEg, "spots", "", 1032, 1294, 2340, 2339, 2327, 2325, tagLight);
 
     /* OG ----------------------------------------------------------------------------------------- */
 
     final AreaDto og = area(null, "og", "OG");
 
     final AreaDto flurOg = area(og, "flur", "Flur OG");
-    tunable(flurOg, "spots", "Spots", 814, 813, 2086, 2070, 2074, 2073, tagLight);
+    tunable(flurOg, "spots", "", 814, 813, 2086, 2070, 2074, 2073, tagLight);
     shutter(flurOg, "vorne", "Vorne", 1293, tagShutter, tagFront);
     shutter(flurOg, "hinten", "Hinten", 2080, 2079, tagShutter, tagBack);
     device(flurOg, "ambiente", "Ambiente", 1538, 1539, tagDecoration, tagDecorationInside);
@@ -102,7 +102,7 @@ public class DemoService {
 
     final AreaDto badOg = area(og, "bad", "Bad");
     shutter(badOg, "", "", 1308, 1307, tagShutter, tagBack);
-    tunable(badOg, "spots", "Spots", 1299, 841, 1320, 1319, 1318, 1317, tagLight);
+    tunable(badOg, "spots", "", 1299, 841, 1320, 1319, 1318, 1317, tagLight);
     tunable(badOg, "waschbecken", "Waschbecken", 790, 789, 1320, 1319, 1318, 1317, tagLight);
     tunable(badOg, "badewanne", "Badewanne", 782, 781, 1320, 1319, 1318, 1317, tagLight);
     tunable(badOg, "dusche", "Dusche", 774, 773, 1320, 1319, 1318, 1317, tagLight);
@@ -110,7 +110,7 @@ public class DemoService {
 
     final AreaDto arbeitszimmer = area(og, "arbeitszimmer", "Arbeitszimmer");
     shutter(arbeitszimmer, "", "", 2064, tagShutter, tagBack);
-    tunable(arbeitszimmer, "spots", "Spots", 2058, 2057, 2067, 2069, 2049, 2054, tagLight);
+    tunable(arbeitszimmer, "spots", "", 2058, 2057, 2067, 2069, 2049, 2054, tagLight);
     device(arbeitszimmer, "pc", "Patrick PC", 2052, 2051, tagDevice, tagMedia, tagAudio, tagVideo, tagConfirm);
     device(arbeitszimmer, "schreibtisch", "Patrick Schreibtisch", 2050, 2048, tagDevice, tagMedia, tagAudio, tagVideo, tagConfirm);
     device(arbeitszimmer, "drucker", "Drucker", 2066, 2065, tagDevice, tagConfirm);
@@ -118,14 +118,14 @@ public class DemoService {
     final AreaDto schlafzimmer = area(og, "schlafzimmer", "Schlafzimmer");
     shutter(schlafzimmer, "links", "Links", 1303, tagShutter, tagFront);
     shutter(schlafzimmer, "rechts", "Rechts", 1304, tagShutter, tagFront);
-    tunable(schlafzimmer, "spots", "Spots", 1309, 829, 1322, 1321, 1316, 1315, tagLight);
+    tunable(schlafzimmer, "spots", "", 1309, 829, 1322, 1321, 1316, 1315, tagLight);
     device(schlafzimmer, "loewe", "Löwe", 844, 843, tagDecoration, tagDecorationInside);
     device(schlafzimmer, "sternenhimmel", "Sternenhimmel", 846, 845, tagDecoration, tagDecorationInside);
     device(schlafzimmer, "fenster", "Fenster", 2333, 2334, tagDecoration, tagDecorationWindow);
 
     final AreaDto emil = area(og, "emil", "Emil");
     shutter(emil, "", "", 1807, tagShutter, tagFront);
-    tunable(emil, "spots", "Spots", 1796, 1795, 2085, 2084, 2083, 2082, tagLight);
+    tunable(emil, "spots", "", 1796, 1795, 2085, 2084, 2083, 2082, tagLight);
     device(emil, "fenster_links", "Fenster Links", 1804, 1803, tagDecoration, tagDecorationWindow);
     device(emil, "fenster_rechts", "Fenster Rechts", 1802, 1801, tagDevice);
     device(emil, "wand_scheune", "Wand Scheune", 2072, 2071, tagDevice);