diff --git a/c4ctrl.py b/c4ctrl.py
index a7f1089..867e9de 100755
--- a/c4ctrl.py
+++ b/c4ctrl.py
@@ -553,7 +553,7 @@ class C4Room: # {{{1
             print("[{}]".format(self.name))
             print("Please enter 0 or 1 for every light:")
             for level in range(len(self.switches)):
-                print((level * '|') + ",- " + self.switches[level][0])
+                print((level * '|') + "+ " + self.switches[level][0])
 
             switch_state = self.get_switch_state()
             print(switch_state) # Present current state.
@@ -745,13 +745,11 @@ class Wohnzimmer(C4Room): # {{{1
     switches = (
             ("Stehlampen", "licht/wohnzimmer/stehlampen"),
             ("Wandlampe", "licht/wohnzimmer/wandlampe"),
+            ("Infoscreen", "screen/wohnzimmer/infoscreen"),
             ("Tür", "licht/wohnzimmer/tuer"),
             ("Mitte", "licht/wohnzimmer/mitte"),
             ("Flur", "licht/wohnzimmer/gang"),
             ("Küche", "licht/wohnzimmer/kueche"),
-            ("Leseleuchte", "socket/wohnzimmer/screen/a"),
-            ("Infoscreen", "screen/wohnzimmer/infoscreen"),
-            #("Verstärker", "socket/wohnzimmer/screen/b")
         )
     master = Dmx7("dmx/wohnzimmer/master")
     lights = (