diff --git a/Models/Lights/greennav.xml b/Models/Lights/greennav.xml
index 3a264ad4..86fc3a7c 100644
--- a/Models/Lights/greennav.xml
+++ b/Models/Lights/greennav.xml
@@ -12,10 +12,10 @@
 		<object-name>Light</object-name>
 		<condition>
 			<greater-than>
-				<property>systems/electrical/outputs/nav-switch</property>
+				<property>controls/lighting/nav-lights-switch</property>
 				<value>0</value>
 			</greater-than>
-		</condition>				
+		</condition>
 	</animation>
 
 	<!-- Billboard animation -->
@@ -24,8 +24,5 @@
 		<type>billboard</type>
 		<object-name>Light</object-name>
 	</animation>
-	<effect>
-		<inherits-from>Effects/model-transparent</inherits-from>
-		<object-name>Light</object-name>
-	</effect>
+
 </PropertyList>
diff --git a/Models/Lights/rednav.xml b/Models/Lights/rednav.xml
index be024dbe..5a29efd9 100644
--- a/Models/Lights/rednav.xml
+++ b/Models/Lights/rednav.xml
@@ -12,7 +12,7 @@
 		<object-name>Light</object-name>
 		<condition>
 			<greater-than>
-				<property>systems/electrical/outputs/nav-switch</property>
+				<property>controls/lighting/nav-lights-switch</property>
 				<value>0</value>
 			</greater-than>
 		</condition>
@@ -24,8 +24,5 @@
 		<type>billboard</type>
 		<object-name>Light</object-name>
 	</animation>
-	<effect>
-		<inherits-from>Effects/model-transparent</inherits-from>
-		<object-name>Light</object-name>
-	</effect>
+
 </PropertyList>
diff --git a/Models/Lights/strobe.xml b/Models/Lights/strobe.xml
index 644d40a0..6a7717ea 100644
--- a/Models/Lights/strobe.xml
+++ b/Models/Lights/strobe.xml
@@ -11,7 +11,7 @@
 		<type>select</type>
 		<object-name>Light</object-name>
 		<condition>
-			<property>systems/electrical/outputs/strobe</property>
+			<property>sim/model/lights/strobe/state</property>
 		</condition>
 	</animation>