diff --git a/Essentials Core/PepperDashEssentialsBase/Lighting/LightingBase.cs b/Essentials Core/PepperDashEssentialsBase/Lighting/LightingBase.cs
index 13170eb3..4c629af4 100644
--- a/Essentials Core/PepperDashEssentialsBase/Lighting/LightingBase.cs	
+++ b/Essentials Core/PepperDashEssentialsBase/Lighting/LightingBase.cs	
@@ -26,6 +26,8 @@ namespace PepperDash.Essentials.Core.Lighting
             : base(key, name)
         {
             LightingScenes = new List<LightingScene>();
+
+            CurrentLightingScene = new LightingScene();
         }
 
         public abstract void SelectScene(LightingScene scene);
diff --git a/Essentials Devices Common/Essentials Devices Common/Environment/Lutron/LutronQuantum.cs b/Essentials Devices Common/Essentials Devices Common/Environment/Lutron/LutronQuantum.cs
index cd89f8bf..8d94e9eb 100644
--- a/Essentials Devices Common/Essentials Devices Common/Environment/Lutron/LutronQuantum.cs	
+++ b/Essentials Devices Common/Essentials Devices Common/Environment/Lutron/LutronQuantum.cs	
@@ -143,7 +143,7 @@ namespace PepperDash.Essentials.Devices.Common.Environment.Lutron
                         {
                             case (int)eAction.Scene:
                                 {
-                                    var scene = Int32.Parse(response[3]);
+                                    var scene = response[3];
                                     CurrentLightingScene = LightingScenes.FirstOrDefault(s => s.ID.Equals(scene));
 
                                     OnLightingSceneChange();
diff --git a/Essentials/PepperDashEssentials/Properties/ControlSystem.cfg b/Essentials/PepperDashEssentials/Properties/ControlSystem.cfg
index e96d289d..cf4be97b 100644
--- a/Essentials/PepperDashEssentials/Properties/ControlSystem.cfg
+++ b/Essentials/PepperDashEssentials/Properties/ControlSystem.cfg
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ControlSystem>
-  <Name>Desk MC3</Name>
-  <Address>ssh 10.0.0.15</Address>
-  <ProgramSlot>Program01</ProgramSlot>
-  <Storage>Internal Flash</Storage>
+<?xml version="1.0" encoding="utf-8"?>
+<ControlSystem>
+  <Name>Test RMC3</Name>
+  <Address>auto 192.168.1.40</Address>
+  <ProgramSlot>Program01</ProgramSlot>
+  <Storage>Internal Flash</Storage>
 </ControlSystem>
\ No newline at end of file
diff --git a/Release Package/PepperDashEssentials.cpz b/Release Package/PepperDashEssentials.cpz
index e3b193a4..dea4163a 100644
Binary files a/Release Package/PepperDashEssentials.cpz and b/Release Package/PepperDashEssentials.cpz differ
diff --git a/Release Package/PepperDashEssentials.dll b/Release Package/PepperDashEssentials.dll
index 0f53ff7c..6e1696d4 100644
Binary files a/Release Package/PepperDashEssentials.dll and b/Release Package/PepperDashEssentials.dll differ