diff --git a/A320-100-CFM.xml b/A320-100-CFM.xml
index e68416c8..83354795 100644
--- a/A320-100-CFM.xml
+++ b/A320-100-CFM.xml
@@ -141,6 +141,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 	<system file="glass-effect1"/>
 	<system file="a320-fcs"/>
 	<system file="a320-spoiler"/>
+	<system file="a320-lights"/>
 	
 	<flight_control name="none"/>
 	
diff --git a/A320-200-CFM.xml b/A320-200-CFM.xml
index cc5c783c..293f7492 100644
--- a/A320-200-CFM.xml
+++ b/A320-200-CFM.xml
@@ -141,6 +141,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 	<system file="glass-effect1"/>
 	<system file="a320-fcs"/>
 	<system file="a320-spoiler"/>
+	<system file="a320-lights"/>
 	
 	<flight_control name="none"/>
 	
diff --git a/A320-200-IAE.xml b/A320-200-IAE.xml
index ddbdc62d..753b14e7 100644
--- a/A320-200-IAE.xml
+++ b/A320-200-IAE.xml
@@ -141,6 +141,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 	<system file="glass-effect1"/>
 	<system file="a320-fcs"/>
 	<system file="a320-spoiler"/>
+	<system file="a320-lights"/>
 	
 	<flight_control name="none"/>
 	<aerodynamics file="Systems/a320-aerodynamics.xml"/>
diff --git a/A320neo-CFM.xml b/A320neo-CFM.xml
index 828ec642..6562e1d4 100644
--- a/A320neo-CFM.xml
+++ b/A320neo-CFM.xml
@@ -141,6 +141,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 	<system file="glass-effect1"/>
 	<system file="a320-fcs"/>
 	<system file="a320-spoiler"/>
+	<system file="a320-lights"/>
 	
 	<flight_control name="none"/>
 	
diff --git a/A320neo-PW.xml b/A320neo-PW.xml
index 0f7cdc24..21d8dd22 100644
--- a/A320neo-PW.xml
+++ b/A320neo-PW.xml
@@ -141,6 +141,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 	<system file="glass-effect1"/>
 	<system file="a320-fcs"/>
 	<system file="a320-spoiler"/>
+	<system file="a320-lights"/>
 	
 	<flight_control name="none"/>
 	
diff --git a/Models/Effects/panel-flood.eff b/Models/Effects/panel-flood.eff
index 9305a2ed..e711bace 100644
--- a/Models/Effects/panel-flood.eff
+++ b/Models/Effects/panel-flood.eff
@@ -7,7 +7,7 @@
 		<dirt-enabled type="int">0</dirt-enabled>
 		<ambient-correction type="float">0.0</ambient-correction>
         <lightmap-enabled type="int">1</lightmap-enabled>
-        <lightmap-factor type="float" n="0"><use>/controls/lighting/main-flood-knb</use></lightmap-factor>
+        <lightmap-factor type="float" n="0"><use>/controls/lighting/panel-light</use></lightmap-factor>
         <lightmap-color type="vec3d" n="0">1.0 1.0 1.0</lightmap-color>
         <texture n="3">
             <image>Aircraft/IDG-A32X/Models/Effects/panel-floodlight.png</image>
diff --git a/Models/Effects/reading-light-checklist.eff b/Models/Effects/reading-light-checklist.eff
index db546ce7..84c8f865 100644
--- a/Models/Effects/reading-light-checklist.eff
+++ b/Models/Effects/reading-light-checklist.eff
@@ -7,8 +7,7 @@
 		<dirt-enabled type="int">0</dirt-enabled>
 		<ambient-correction type="float">0.0</ambient-correction>
         <lightmap-enabled type="int">1</lightmap-enabled>
-        <!--<lightmap-factor type="float" n="0"><use>/controls/lighting/reading-light-knb</use></lightmap-factor>-->
-        <lightmap-factor type="float" n="0"><use>/controls/lighting/main-flood-knb</use></lightmap-factor>
+        <lightmap-factor type="float" n="0"><use>/controls/lighting/reading-light</use>*0.5</lightmap-factor>
         <lightmap-color type="vec3d" n="0">1.0 1.0 1.0</lightmap-color>
         <texture n="3">
             <image>Aircraft/IDG-A32X/Models/Effects/checklist.png</image>
diff --git a/Models/Effects/reading-light.eff b/Models/Effects/reading-light.eff
index 0bb6e4fb..5a05f813 100644
--- a/Models/Effects/reading-light.eff
+++ b/Models/Effects/reading-light.eff
@@ -7,8 +7,7 @@
 		<dirt-enabled type="int">0</dirt-enabled>
 		<ambient-correction type="float">0.0</ambient-correction>
         <lightmap-enabled type="int">1</lightmap-enabled>
-        <!--<lightmap-factor type="float" n="0"><use>/controls/lighting/reading-light-knb</use></lightmap-factor>-->
-        <lightmap-factor type="float" n="0"><use>/controls/lighting/main-flood-knb</use></lightmap-factor>
+        <lightmap-factor type="float" n="0"><use>/controls/lighting/reading-light</use></lightmap-factor>
         <lightmap-color type="vec3d" n="0">1.0 1.0 1.0</lightmap-color>
         <texture n="3">
             <image>Aircraft/IDG-A32X/Models/Effects/reading-light.png</image>
diff --git a/Systems/a320-lights.xml b/Systems/a320-lights.xml
new file mode 100644
index 00000000..24fadc2b
--- /dev/null
+++ b/Systems/a320-lights.xml
@@ -0,0 +1,33 @@
+<!-- Airbus A320 FCS -->
+<!-- Joshua Davidson (it0uchpods) -->
+
+<!--
+##############################################
+# Copyright (c) Joshua Davidson (it0uchpods) #
+##############################################
+-->
+
+<system name="A320: Lights">
+
+	<channel name="Lights">
+		<switch name="lights/reading-light">
+			<output>/controls/lighting/reading-light</output>
+			
+			<default value="0" />
+			<test logic="OR" value="/controls/lighting/main-flood-knb">
+				/systems/electrical/bus/dc1 gt 25
+			</test>
+		</switch>
+		
+		<switch name="lights/panel-light">
+			<output>/controls/lighting/panel-light</output>
+			
+			<default value="0" />
+			<test logic="OR" value="/controls/lighting/main-flood-knb">
+				/systems/electrical/bus/dc-ess gt 25
+				/systems/electrical/bus/dc1 gt 25
+			</test>
+		</switch>
+	</channel>
+
+</system>