diff --git a/app/settings.py b/app/settings.py
index 494430e..778c1b3 100644
--- a/app/settings.py
+++ b/app/settings.py
@@ -9,11 +9,11 @@ groups = [
     },           
     {  
         "name"    : "Main Space Lights",
-        "devices" : [ { "powerbar" : "powerbar-main-space", "outlets" : [ 5, 7, 8, 9, 10, 11, 12, 15 ] } ],
+        "devices" : [ { "powerbar" : "powerbar-main-space", "outlets" : [ 5, 6, 7, 8, 9, 10, 11, 12, 15 ] } ],
     },     
     {  
         "name"    : "All Space Lights",
-        "devices" : [ { "powerbar" : "powerbar-main-space", "outlets" : [ 5, 7, 8, 9, 10, 11, 12, 15 ] }, 
+        "devices" : [ { "powerbar" : "powerbar-main-space", "outlets" : [ 5, 6, 7, 8, 9, 10, 11, 12, 15 ] }, 
                       { "powerbar" : "powerbar-aux-space",  "outlets" : [ 1, 17, 13] }],
     },          
 ]
@@ -45,14 +45,12 @@ powerbars = {
         "type" : "baytech",
         "description" : "Powerbar Controlling Main Space",
         "outlets" : { 
-
+               9  :  { "name" : "3D Printers" },
                4  :  { "name" : "LIGHT_MAKERTABLE" },
-               19  :  { "name" : "Laser Cutter" },
                5  :  { "name" : "LIGHT_TABLE" },
-               6  :  { "name" : "3D Printers" },
+               6  :  { "name" : "LIGHT_HAM" },
                7  :  { "name" : "LIGHT_ENTRANCE" },
                8  :  { "name" : "LIGHT_KITCHEN" },
-               9  :  { "name" : "LIGHT_WHEEL" },
                10  :  { "name" : "LIGHT_SOFA" },
                11  :  { "name" : "LIGHT_KITCHEN_SPOTS" },
                12  :  { "name" : "LEDWALL" },
@@ -62,6 +60,7 @@ powerbars = {
                16  :  { "name" : "RADIO_LANE_CTRL_OUTLETS" },
                17  :  { "name" : "MONITOR_3D_1" },
                18  :  { "name" : "MONITOR_3D_2" },
+               19  :  { "name" : "MONITOR_AV_1" },
                20  :  { "name" : "MONITOR_AV_2" },
         }
     }