diff --git a/c4ctrl.py b/c4ctrl.py
index 64c21a7..cc51904 100755
--- a/c4ctrl.py
+++ b/c4ctrl.py
@@ -770,7 +770,8 @@ class Plenarsaal(C4Room): # {{{1
             ("Vorne/Wand", "licht/plenar/vornewand"),
             ("Vorne/Fenster", "licht/plenar/vornefenster"),
             ("Hinten/Wand", "licht/plenar/hintenwand"),
-            ("Hinten/Fenster", "licht/plenar/hintenfenster")
+            ("Hinten/Fenster", "licht/plenar/hintenfenster"),
+            ("Verstärker", "relais/plenar/amp")
         )
     master = Dmx7("dmx/plenar/master")
     lights = (
@@ -791,7 +792,8 @@ class Fnordcenter(C4Room): # {{{1
     name = "Fnordcenter"
     switches = (
             ("Links (Fairydust)", "licht/fnord/links"),
-            ("Rechts (SCUMM)", "licht/fnord/rechts")
+            ("Rechts (SCUMM)", "licht/fnord/rechts"),
+            ("Lautsprecher", "relais/fnord/audio")
         )
     master = Dmx4("dmx/fnord/master")
     lights = (
@@ -808,9 +810,13 @@ class Keller(C4Room): # {{{1
 
     name = "Keller"
     switches = (
+            ("Vorne", "licht/keller/vorne"),
             ("Mitte", "licht/keller/mitte"),
             ("Lötplatz", "licht/keller/loet"),
-            ("Vorne", "licht/keller/vorne")
+            ("Werkbank (kalt)", "led/keller/werkbankkalt"),
+            ("Werkbank (warm)", "led/keller/werkbankwarm"),
+            ("Hinten (kalt)", "led/keller/hintenkalt"),
+            ("Hinten (warm)", "led/keller/hintenwarm")
         )
     master = None
     lights = ()