diff --git a/GameData/MOARdV/FlightSystemsRedux/ASET_VPG.cfg b/GameData/MOARdV/FlightSystemsRedux/ASET_VPG.cfg
index bbb8072..c769ef9 100644
--- a/GameData/MOARdV/FlightSystemsRedux/ASET_VPG.cfg
+++ b/GameData/MOARdV/FlightSystemsRedux/ASET_VPG.cfg
@@ -6,38 +6,16 @@ PROP
 		model = MOARdV/FlightSystemsRedux/ASET_VPGDual/ASET_VPGDual
 	}
   
-// ----- arrow offset
-//	MODULE
-//	{
-//		name = JSIVariableAnimator
-//		refreshRate = 5
-//		VARIABLESET
-//		{		
-//			scale = 0,1
-//			variableName = SYSR_LIQUIDFUELSTAGEPERCENT  
-//			controlledTransform = VPGDAmountLLoc
-//			localTranslationStart = 0,0,0.00
-//			localTranslationEnd  = 0,0,-0.08768
-//		}
-//		VARIABLESET
-//		{		
-//			scale = 0,1
-//			variableName = SYSR_LIQUIDFUELPERCENT  
-//			controlledTransform = VPGDAmountRLoc
-//			localTranslationStart = 0,0,0.00
-//			localTranslationEnd  = 0,0,-0.08768
-//		}	
-//	}	
- 
 	MODULE
 	{
 		name = JSIVariableAnimator
-		refreshRate = 10
+		refreshRate = 2
 
 // ----- arrow offset
 		VARIABLESET
 		{		
 			scale = 0,1
+			maxRateChange = 1
 			variableName = SYSR_LIQUIDFUELSTAGEPERCENT  
 			controlledTransform = VPGDAmountLLoc
 			localTranslationStart = 0,0,0.00
@@ -46,11 +24,18 @@ PROP
 		VARIABLESET
 		{		
 			scale = 0,1
+			maxRateChange = 1
 			variableName = SYSR_LIQUIDFUELPERCENT  
 			controlledTransform = VPGDAmountRLoc
 			localTranslationStart = 0,0,0.00
 			localTranslationEnd  = 0,0,-0.08768
 		}	
+	}
+	MODULE
+	{
+		name = JSIVariableAnimator
+		refreshRate = 10
+		
 // ----- Backlight emissive 			
 
 		VARIABLESET
@@ -135,12 +120,12 @@ PROP
 		model = MOARdV/FlightSystemsRedux/ASET_VPGDual/ASET_VPGDual
 	}
   
-// ----- arrow offset
-
 	MODULE
 	{
 		name = JSIVariableAnimator
-		refreshRate = 5
+		refreshRate = 3
+
+// ----- arrow offset
 		VARIABLESET
 		{
 			scale = 0,25
@@ -157,12 +142,6 @@ PROP
 			localTranslationStart = 0,0,0.00
 			localTranslationEnd  = 0,0,-0.08768
 		}
-	}
-
-	MODULE
-	{
-		name = JSIVariableAnimator
-		refreshRate = 10
 
 // ----- Backlight emissive 			
 
@@ -248,23 +227,6 @@ PROP
 		model = MOARdV/FlightSystemsRedux/ASET_VPG/ASET_VPG_SingleScale
 	}
   
-// ----- arrow offset
-
-//	MODULE
-//	{
-//		name = JSIVariableAnimator
-//		refreshRate = 5
-//		VARIABLESET
-//		{		
-//			variableName = PODTEMPERATURE
-//			scale = 0.0,100.0
-//			controlledTransform = VPGAmountLoc
-//			localTranslationStart = 0,0,0.00
-//			localTranslationEnd  = 0,0,-0.08768
-//		}
-			
-//	}	
-
 	MODULE
 	{
 		name = JSIVariableAnimator
@@ -345,23 +307,6 @@ PROP
 		model = MOARdV/FlightSystemsRedux/ASET_VPG/ASET_VPG_SingleScale
 	}
   
-// ----- arrow offset
-
-//	MODULE
-//	{
-//		name = JSIVariableAnimator
-//		refreshRate = 20
-//		VARIABLESET
-//		{		
-//			variableName = REALISP
-//			scale = 0.0,MAXISP
-//			controlledTransform = VPGAmountLoc
-//			localTranslationStart = 0,0,0.00
-//			localTranslationEnd  = 0,0,-0.08768
-//		}
-			
-//	}	
-
 	MODULE
 	{
 		name = JSIVariableAnimator
@@ -431,26 +376,10 @@ PROP
 		model = MOARdV/FlightSystemsRedux/ASET_VPG/ASET_VPG_SingleScale
 	}
   
-// ----- arrow offset
-
-//	MODULE
-//	{
-//		name = JSIVariableAnimator
-//		refreshRate = 10
-//		VARIABLESET
-//		{		
-//			variableName = SYSR_MONOPROPELLANT
-//			scale = 0.0,SYSR_MONOPROPELLANTMAX
-//			controlledTransform = VPGAmountLoc
-//			localTranslationStart = 0,0,0.00
-//			localTranslationEnd  = 0,0,-0.08768
-//		}
-//	}	
-
 	MODULE
 	{
 		name = JSIVariableAnimator
-		refreshRate = 10
+		refreshRate = 3
 
 // ----- arrow offset
 		VARIABLESET
@@ -461,6 +390,11 @@ PROP
 			localTranslationStart = 0,0,0.00
 			localTranslationEnd  = 0,0,-0.08768
 		}
+	}
+	MODULE
+	{
+		name = JSIVariableAnimator
+		refreshRate = 10
 // ----- Backlight emissive 			
 
 		VARIABLESET
diff --git a/GameData/MOARdV/FlightSystemsRedux/CustomVariables.cfg b/GameData/MOARdV/FlightSystemsRedux/CustomVariables.cfg
index 6499cc0..b675f1b 100644
--- a/GameData/MOARdV/FlightSystemsRedux/CustomVariables.cfg
+++ b/GameData/MOARdV/FlightSystemsRedux/CustomVariables.cfg
@@ -64,7 +64,7 @@ RPM_CUSTOM_VARIABLE
 	
 	SOURCE_VARIABLE
 	{
-		name = TARGETEXISTS
+		name = TARGETISVESSELORPORT
 		range = 0.1, 1.1
 	}
 	SOURCE_VARIABLE
@@ -171,6 +171,50 @@ RPM_CUSTOM_VARIABLE
    }
 }
 
+RPM_CUSTOM_VARIABLE
+{
+	name = MOARdV_DOCKINGRANGE
+	operator = AND
+	
+	SOURCE_VARIABLE
+	{
+		name = PERSISTENT_MOARdV_RadarRangeMode
+		range = 0.5, 1.5
+	}
+	SOURCE_VARIABLE
+	{
+		name = SELECT_MOARdV_FDMODE
+		range = -1.5, -0.5
+	}
+	SOURCE_VARIABLE
+	{
+		name = TRGTSPEED
+		range = -20.0, 20.0
+	}
+}
+
+RPM_CUSTOM_VARIABLE
+{
+	name = MOARdV_DOCKINGCLOSE
+	operator = AND
+	
+	SOURCE_VARIABLE
+	{
+		name = PERSISTENT_MOARdV_RadarRangeMode
+		range = -0.5, 0.5
+	}
+	SOURCE_VARIABLE
+	{
+		name = SELECT_MOARdV_FDMODE
+		range = -1.5, -0.5
+	}
+	SOURCE_VARIABLE
+	{
+		name = TRGTSPEED
+		range = -20.0, 20.0
+	}
+}
+
 RPM_CUSTOM_VARIABLE
 {
 	name = MOARdV_DYNAMICPRESSURE_LOW
@@ -566,7 +610,7 @@ RPM_CUSTOM_VARIABLE
 	operator = AND
 	SOURCE_VARIABLE
 	{
-		name = TARGETEXISTS
+		name = TARGETISVESSELORPORT
 		range = 0.1, 1.1
 	}
 
diff --git a/GameData/MOARdV/FlightSystemsRedux/FasaCameras.cfg b/GameData/MOARdV/FlightSystemsRedux/FasaCameras.cfg
index 26f0190..afbf130 100644
--- a/GameData/MOARdV/FlightSystemsRedux/FasaCameras.cfg
+++ b/GameData/MOARdV/FlightSystemsRedux/FasaCameras.cfg
@@ -10,13 +10,13 @@
 	MODULE
 	{
 		name = JSIRadar
-		trackWhileOff = false
 		resourceAmount = 0.005
 		resourceName = ElectricCharge
 		scanAngle = 30
 		maxRange = 200
 		restrictTrackingAngle = false
 		trackWhileOff = true
+		targetDockingPorts = true
 	}
 }
 
diff --git a/GameData/MOARdV/FlightSystemsRedux/FasaGemini.cfg b/GameData/MOARdV/FlightSystemsRedux/FasaGemini.cfg
index 6a4263a..6a80066 100644
--- a/GameData/MOARdV/FlightSystemsRedux/FasaGemini.cfg
+++ b/GameData/MOARdV/FlightSystemsRedux/FasaGemini.cfg
@@ -4,7 +4,6 @@
 	{
 		name = RasterPropMonitorComputer
 		debugLogging = true
-		//triggeredEvents = autobrake
 	}
 
 	@INTERNAL[FASAGeminiInt2] 
@@ -34,7 +33,7 @@ INTERNAL
 		seatTransformName = Seat_Left
 		portraitCameraName = Camera_Left
 		allowCrewHelmet = false
-		fov = 58
+		fov = 54
 	}
 	MODULE
 	{
@@ -42,12 +41,12 @@ INTERNAL
 		seatTransformName = Seat_Right
 		portraitCameraName = Camera_Right
 		allowCrewHelmet = false
-		fov = 58
+		fov = 54
 	}
 	PROP
 	{
 		name = ABORTbuttonV2
-		position = 0.460515,0.1590435,-0.4654975
+		position = 0.4597221,0.148241,-0.463574
 		rotation = -0.6417302,0.0275141,0.02330782,-0.7660823
 		scale = 0.5,0.5,0.5
 	}
@@ -56,7 +55,7 @@ INTERNAL
 		name = ALCORRotationCtrl
 		position = 0.0007731964,-0.02767943,-0.2915584
 		rotation = 0.0007202965,0.999761,0.02078124,-0.006750648
-		scale = 1.000038,1.000035,0.9999996
+		scale = 1.000041,1.000035,0.9999996
 	}
 	PROP
 	{
@@ -77,7 +76,7 @@ INTERNAL
 		name = APswitchNMLminus
 		position = 0.01440358,0.5028884,-0.3300222
 		rotation = 0.9863636,-0.006342504,0.001009055,0.1644552
-		scale = 0.8,0.8000001,0.8000165
+		scale = 0.8,0.8000001,0.8000181
 	}
 	PROP
 	{
@@ -91,21 +90,21 @@ INTERNAL
 		name = APswitchNODE
 		position = 0.0144,0.51895,-0.2811572
 		rotation = 0.9863636,-0.006342504,0.001009055,0.1644552
-		scale = 0.8,0.8000001,0.800016
+		scale = 0.8,0.8000001,0.8000177
 	}
 	PROP
 	{
 		name = APswitchPARminus
 		position = -0.04337651,0.5103139,-0.3052061
 		rotation = 0.9878675,0.007298522,-0.001232002,0.1551225
-		scale = 0.8000164,0.8000007,0.8000004
+		scale = 0.800018,0.8000007,0.8000004
 	}
 	PROP
 	{
 		name = APswitchPARplus
 		position = -0.01434159,0.5107341,-0.3052992
 		rotation = 0.9874562,0.01031967,-0.001646488,0.1575471
-		scale = 0.7999836,0.8,0.7999998
+		scale = 0.7999821,0.8,0.7999998
 	}
 	PROP
 	{
@@ -119,7 +118,7 @@ INTERNAL
 		name = APswitchRADminus
 		position = 0.01439758,0.51072,-0.3051523
 		rotation = 0.9863636,-0.006342504,0.001009055,0.1644552
-		scale = 0.8,0.8000001,0.8000165
+		scale = 0.8,0.8000001,0.8000181
 	}
 	PROP
 	{
@@ -133,49 +132,49 @@ INTERNAL
 		name = APswitchRETROGRAD
 		position = 0.01440988,0.4951561,-0.3546694
 		rotation = 0.9863636,-0.006342504,0.001009055,0.1644552
-		scale = 0.8,0.8000001,0.8000165
+		scale = 0.8,0.8000001,0.8000181
 	}
 	PROP
 	{
 		name = APswitchRVELminus
 		position = -0.04337147,0.5017583,-0.3296957
 		rotation = 0.9878675,0.007298522,-0.001232002,0.1551225
-		scale = 0.8000164,0.8000007,0.8000004
+		scale = 0.800018,0.8000007,0.8000004
 	}
 	PROP
 	{
 		name = APswitchRVELplus
 		position = -0.01433456,0.5023071,-0.329955
 		rotation = 0.9874562,0.01031967,-0.001646488,0.1575471
-		scale = 0.7999836,0.8,0.7999998
+		scale = 0.7999821,0.8,0.7999998
 	}
 	PROP
 	{
 		name = APswitchSURFPROGRADE
 		position = -0.01434159,0.5187329,-0.2808703
 		rotation = 0.9874562,0.01031967,-0.001646488,0.1575471
-		scale = 0.7999841,0.8,0.7999998
+		scale = 0.7999825,0.8,0.7999998
 	}
 	PROP
 	{
 		name = APswitchSURFRETROGRADE
 		position = -0.04337212,0.5182353,-0.2806054
 		rotation = 0.9878675,0.007298522,-0.001232002,0.1551225
-		scale = 0.8000159,0.8000007,0.8000004
+		scale = 0.8000175,0.8000007,0.8000004
 	}
 	PROP
 	{
 		name = APswitchTGTminus
 		position = -0.04337408,0.4936962,-0.354339
 		rotation = 0.9878675,0.007298522,-0.001232002,0.1551225
-		scale = 0.8000164,0.8000007,0.8000004
+		scale = 0.800018,0.8000007,0.8000004
 	}
 	PROP
 	{
 		name = APswitchTGTplus
 		position = -0.01433594,0.4943379,-0.3545049
 		rotation = 0.9874562,0.01031967,-0.001646488,0.1575471
-		scale = 0.7999836,0.8,0.7999998
+		scale = 0.7999821,0.8,0.7999998
 	}
 	PROP
 	{
@@ -200,22 +199,29 @@ INTERNAL
 	}
 	PROP
 	{
-		name = ASET_EngineGauge
-		position = 0.1857939,0.2120937,-0.4725952
-		rotation = -0.6417302,0.0275141,0.02330782,-0.7660823
-		scale = 0.32,0.32,0.32
+		name = ASET_FDAI-01
+		position = 0.3098156,0.2036494,-0.4905174
+		rotation = 0.6415712,-0.03232766,-0.02734031,0.7658942
+		scale = 0.8,0.8,0.7999997
+	}
+	PROP
+	{
+		name = ASET_FDAI-01
+		position = -0.3354944,0.2009965,-0.4900352
+		rotation = 0.6414532,0.03610227,0.02998285,0.7657255
+		scale = 0.8,0.7999996,0.8
 	}
 	PROP
 	{
 		name = ASET_G-METER
-		position = 0.1834782,0.2799839,-0.4846811
-		rotation = -0.6417302,0.0275141,0.02330782,-0.7660823
+		position = -0.01037604,0.3897289,-0.3874364
+		rotation = 0.7400765,-2.952868E-09,-2.952869E-09,0.6725227
 		scale = 0.32,0.32,0.32
 	}
 	PROP
 	{
 		name = ASET_RadarAltimeter
-		position = 0.3770434,0.1998639,-0.4704952
+		position = 0.3884627,0.1990508,-0.470355
 		rotation = -0.6417302,0.0275141,0.02330782,-0.7660823
 		scale = 0.32,0.32,0.32
 	}
@@ -231,14 +237,56 @@ INTERNAL
 		name = CrewManual_AscentChklist
 		position = 0.1102736,-0.06697835,-0.2609644
 		rotation = 0.6996247,0.7141764,0.01013492,-0.01935755
-		scale = 0.5,0.5,0.4999833
+		scale = 0.5,0.5,0.4999817
 	}
 	PROP
 	{
 		name = CrewManual_OrbChklist
 		position = 0.1118192,-0.07174805,-0.1463137
 		rotation = 0.6996247,0.7141764,0.01013492,-0.01935755
-		scale = 0.5,0.5,0.4999833
+		scale = 0.5,0.5,0.4999817
+	}
+	PROP
+	{
+		name = FDAI_ErrorScaleSelector-01
+		position = 0.234134,0.1896077,-0.4697177
+		rotation = -0.6400721,0.03164417,0.02684133,-0.7671936
+		scale = 0.5,0.500001,0.5
+	}
+	PROP
+	{
+		name = FDAI_ErrorScaleSelector-01
+		position = -0.4106964,0.1612349,-0.4633556
+		rotation = 0.6414532,0.03610227,0.02998285,0.7657255
+		scale = 0.4999997,0.4999997,0.5
+	}
+	PROP
+	{
+		name = FDAI_GMCP-01
+		position = 0.3026915,0.1177367,-0.459951
+		rotation = -0.6400721,0.03164417,0.02684133,-0.7671936
+		scale = 1.05,1.000002,1.05
+	}
+	PROP
+	{
+		name = FDAI_GMCP-01
+		position = -0.4155702,0.108078,-0.4569898
+		rotation = 0.6415976,0.03220267,0.02671614,0.7658994
+		scale = 1.05,0.9999993,1.05
+	}
+	PROP
+	{
+		name = FDAI_RateScaleSelector-01
+		position = 0.23687,0.2231521,-0.4761222
+		rotation = -0.6400721,0.03164417,0.02684133,-0.7671936
+		scale = 0.5,0.500001,0.5
+	}
+	PROP
+	{
+		name = FDAI_RateScaleSelector-01
+		position = -0.4523306,0.1571796,-0.4626485
+		rotation = 0.6414532,0.03610227,0.02998285,0.7657255
+		scale = 0.4999997,0.4999997,0.5
 	}
 	PROP
 	{
@@ -266,98 +314,84 @@ INTERNAL
 		name = KanonDSLR600
 		position = -0.5111957,-0.05363663,-0.1890496
 		rotation = -0.5303486,-0.8344665,-0.1209666,-0.08810915
-		scale = 0.25,0.25,0.2499998
+		scale = 0.25,0.25,0.2499994
 	}
 	PROP
 	{
 		name = MOARdV.BtnB_AltitudeAdd
 		position = -0.2709028,0.2091197,-0.4727294
 		rotation = -0.6413453,-0.03875623,-0.03220635,-0.7655959
-		scale = 0.5,0.4999996,0.5
+		scale = 0.5,0.499999,0.5
 	}
 	PROP
 	{
 		name = MOARdV.BtnB_AltitudeAddLarge
 		position = -0.239052,0.2122898,-0.4733067
 		rotation = -0.6413453,-0.03875623,-0.03220635,-0.7655959
-		scale = 0.5,0.4999997,0.5
+		scale = 0.5,0.499999,0.5
 	}
 	PROP
 	{
 		name = MOARdV.BtnB_AltitudeSub
 		position = -0.266964,0.1707884,-0.4659068
 		rotation = -0.6413453,-0.03875623,-0.03220635,-0.7655959
-		scale = 0.5,0.4999996,0.5
+		scale = 0.5,0.499999,0.5
 	}
 	PROP
 	{
 		name = MOARdV.BtnB_AltitudeSubLarge
 		position = -0.2346598,0.1740037,-0.4664923
 		rotation = -0.6413453,-0.03875623,-0.03220635,-0.7655959
-		scale = 0.5,0.4999997,0.5
+		scale = 0.5,0.499999,0.5
 	}
 	PROP
 	{
 		name = MOARdV.BtnB_ChangeApoapsis
 		position = -0.2268644,0.1471236,-0.4617098
 		rotation = -0.6413453,-0.03875623,-0.03220635,-0.7655959
-		scale = 0.5,0.4999998,0.5
+		scale = 0.5,0.499999,0.5
 	}
 	PROP
 	{
 		name = MOARdV.BtnB_ChangePeriapsis
 		position = -0.248707,0.1449626,-0.4613163
 		rotation = -0.6413453,-0.03875623,-0.03220635,-0.7655959
-		scale = 0.5,0.4999998,0.5
+		scale = 0.5,0.499999,0.5
 	}
 	PROP
 	{
 		name = MOARdV.BtnB_CircularizeAltitude
 		position = -0.2703346,0.1427892,-0.4609206
 		rotation = -0.6413453,-0.03875623,-0.03220635,-0.7655959
-		scale = 0.5,0.4999998,0.5
+		scale = 0.5,0.499999,0.5
 	}
 	PROP
 	{
 		name = MOARdV.BtnB_LoadAltitude
 		position = -0.2136963,0.1954618,-0.470321
 		rotation = -0.6413453,-0.03875623,-0.03220635,-0.7655959
-		scale = 0.5,0.4999995,0.5
+		scale = 0.5,0.499999,0.5
 	}
 	PROP
 	{
 		name = MOARdV.BtnB_PlotManeuver
 		position = -0.2244933,0.1240483,-0.4576026
 		rotation = -0.6413453,-0.03875623,-0.03220635,-0.7655959
-		scale = 0.5,0.5,0.5
-	}
-	PROP
-	{
-		name = MOARdV.BtnB_SpeedMode
-		position = 0.2177823,0.1661268,-0.4669111
-		rotation = -0.6417302,0.0275141,0.02330782,-0.7660823
-		scale = 0.5,0.5,0.5
+		scale = 0.5,0.4999992,0.5
 	}
 	PROP
 	{
 		name = MOARdV.BtnB_Undock
 		position = -0.02996784,0.2815716,-0.3940774
 		rotation = 0.7392696,-2.949325E-09,-2.956408E-09,0.6734096
-		scale = 0.5,0.5,0.4999958
+		scale = 0.5,0.5,0.499995
 	}
 	PROP
 	{
-		name = MOARdV.LEDNodedV
-		position = 0.2513602,0.164221,-0.4665819
-		rotation = -0.6414242,0.03541904,0.02993097,-0.7657837
-		scale = 0.6,0.6,0.5999997
-	}
-	PROP
-	{
-		name = MOARdV.LEDNodedV
-		position = -0.3786512,0.152772,-0.4643703
-		rotation = -0.6368741,-0.03255507,-0.02673602,-0.769816
-		scale = 0.600002,0.6,0.6
+		name = MOARdV.EngineGauge
+		position = 0.1857939,0.2120937,-0.4725952
+		rotation = -0.6417302,0.0275141,0.02330782,-0.7660823
+		scale = 0.32,0.32,0.32
 	}
 	PROP
 	{
@@ -367,39 +401,11 @@ INTERNAL
 		scale = 0.6,0.6,0.6
 	}
 	PROP
-	{
-		name = MOARdV.LEDSpeed
-		position = 0.1801148,0.1694731,-0.4686644
-		rotation = -0.6432852,0.02756139,0.02325188,-0.7647771
-		scale = 0.65,0.6499998,0.65
-	}
-	PROP
-	{
-		name = MOARdV.Mini_Docking
-		position = -0.3348054,0.1139785,-0.4544011
-		rotation = -0.6426341,-0.03385788,-0.02765052,-0.7649252
-		scale = 0.55,0.55,0.55
-	}
-	PROP
-	{
-		name = MOARdV.Mini_Docking
-		position = 0.2743979,0.1174223,-0.4560971
-		rotation = -0.6395498,0.03374216,0.02865862,-0.767474
-		scale = 0.55,0.5500011,0.55
-	}
-	PROP
-	{
-		name = MOARdV.Mini_RangeRate
-		position = 0.2044464,0.1234796,-0.4571503
-		rotation = -0.6415005,0.03381497,0.02857267,-0.7658442
-		scale = 0.55,0.55,0.5499988
-	}
-	PROP
 	{
 		name = MOARdV.Mini_Testing
 		position = -0.2193101,0.0418512,-0.4400772
 		rotation = 0.6388229,0.03346518,0.02857453,0.7680944
-		scale = 1.199998,1,1.199998
+		scale = 1.199997,1,1.199998
 	}
 	PROP
 	{
@@ -409,11 +415,25 @@ INTERNAL
 		scale = 0.45,0.65,0.45
 	}
 	PROP
+	{
+		name = MOARdV.MonitorFlightInfo
+		position = 0.2296677,0.1599318,-0.4646595
+		rotation = -0.6431786,0.03086991,0.0260348,-0.7646507
+		scale = 0.2700001,0.27,0.27
+	}
+	PROP
+	{
+		name = MOARdV.MonitorFlightInfo
+		position = -0.3381377,0.113981,-0.4571848
+		rotation = -0.6384443,-0.03541235,-0.02900052,-0.7683059
+		scale = 0.27,0.27,0.27
+	}
+	PROP
 	{
 		name = MOARdV.MonitorMissionTime
 		position = -0.01064369,0.3104715,-0.3958565
 		rotation = -0.7418371,-1.062195E-15,1.175066E-15,-0.6705801
-		scale = 0.6,0.6,0.6000023
+		scale = 0.6,0.6,0.6000035
 	}
 	PROP
 	{
@@ -425,23 +445,23 @@ INTERNAL
 	PROP
 	{
 		name = MOARdV.MonitorNodeTime
-		position = 0.296101,0.160246,-0.4658191
-		rotation = -0.634837,0.03414006,0.02916569,-0.7713403
-		scale = 0.6000019,0.600001,0.6000003
+		position = 0.1854257,0.1705061,-0.467693
+		rotation = -0.6350036,0.02941662,0.02527814,-0.7715349
+		scale = 0.6000034,0.6000009,0.6000003
 	}
 	PROP
 	{
 		name = MOARdV.MonitorNodeTime
-		position = -0.3332703,0.1566744,-0.4651394
+		position = -0.330645,0.1419971,-0.4624076
 		rotation = -0.6384443,-0.03541235,-0.02900052,-0.7683059
-		scale = 0.5999978,0.6,0.6
+		scale = 0.5999963,0.6,0.6
 	}
 	PROP
 	{
 		name = MOARdV.MonitorUniversalTime
-		position = -0.4085055,0.1979222,-0.4727715
+		position = -0.4167298,0.1971807,-0.4726279
 		rotation = -0.6384443,-0.03541235,-0.02900052,-0.7683059
-		scale = 0.5999979,0.6,0.6
+		scale = 0.5999964,0.6,0.6
 	}
 	PROP
 	{
@@ -451,20 +471,6 @@ INTERNAL
 		scale = 0.55,0.55,0.55
 	}
 	PROP
-	{
-		name = MOARdV.MultiSw_4_FDNMode
-		position = 0.3318821,0.09541504,-0.4508559
-		rotation = -0.6417302,0.0275141,0.02330782,-0.7660823
-		scale = 0.55,0.55,0.55
-	}
-	PROP
-	{
-		name = MOARdV.MultiSw_4_FDNMode
-		position = -0.3909854,0.09128291,-0.4500964
-		rotation = -0.641475,-0.03553793,-0.02951037,-0.765752
-		scale = 0.5500007,0.55,0.55
-	}
-	PROP
 	{
 		name = MOARdV.MultiSw_4_Radio
 		position = 0.05442081,0.1316603,-0.4071933
@@ -474,7 +480,7 @@ INTERNAL
 	PROP
 	{
 		name = MOARdV.onAblation
-		position = 0.2237157,0.2745253,-0.4880743
+		position = 0.2261357,0.2743529,-0.4880446
 		rotation = -0.6417302,0.0275141,0.02330782,-0.7660823
 		scale = 0.45,0.45,0.45
 	}
@@ -495,23 +501,23 @@ INTERNAL
 	PROP
 	{
 		name = MOARdV.onAirBraking
-		position = 0.2247298,0.290146,-0.4908558
+		position = 0.2273954,0.2899562,-0.4908231
 		rotation = -0.6417302,0.0275141,0.02330782,-0.7660823
 		scale = 0.45,0.45,0.45
 	}
 	PROP
 	{
 		name = MOARdV.onApproach
-		position = 0.3229194,0.1308613,-0.4630648
+		position = 0.1983925,0.2920215,-0.491179
 		rotation = -0.6417302,0.0275141,0.02330782,-0.7660823
-		scale = 0.4,0.4,0.4
+		scale = 0.45,0.45,0.45
 	}
 	PROP
 	{
 		name = MOARdV.onBttyCharge
 		position = 0.006285685,0.2112813,-0.4059869
 		rotation = 0.7392696,-2.949325E-09,-2.956408E-09,0.6734096
-		scale = 0.35,0.3500012,0.3499988
+		scale = 0.35,0.350002,0.349998
 	}
 	PROP
 	{
@@ -558,23 +564,23 @@ INTERNAL
 	PROP
 	{
 		name = MOARdV.onEngineFailure
-		position = 0.187913,0.2440564,-0.4826355
-		rotation = -0.6417302,0.0275141,0.02330782,-0.7660823
-		scale = 0.5,0.5,0.5
+		position = -0.1879352,0.2440541,-0.4826351
+		rotation = -0.6413453,-0.03875623,-0.03220635,-0.7655959
+		scale = 0.5,0.499999,0.5
 	}
 	PROP
 	{
 		name = MOARdV.onEngineFailure
-		position = -0.1879352,0.2440541,-0.4826351
-		rotation = -0.6413453,-0.03875623,-0.03220635,-0.7655959
-		scale = 0.5,0.499999,0.5
+		position = 0.1959158,0.2611674,-0.4856849
+		rotation = -0.6417302,0.0275141,0.02330782,-0.7660823
+		scale = 0.45,0.45,0.45
 	}
 	PROP
 	{
 		name = MOARdV.onEngineOverheat
-		position = 0.220743,0.2417185,-0.4822325
+		position = 0.1670754,0.2632211,-0.4860389
 		rotation = -0.6417302,0.0275141,0.02330782,-0.7660823
-		scale = 0.5,0.5,0.5
+		scale = 0.45,0.45,0.45
 	}
 	PROP
 	{
@@ -592,17 +598,17 @@ INTERNAL
 	}
 	PROP
 	{
-		name = MOARdV.onHighG
-		position = 0.2226398,0.2592644,-0.4853569
+		name = MOARdV.onFuelLow
+		position = 0.1682848,0.2784725,-0.4887547
 		rotation = -0.6417302,0.0275141,0.02330782,-0.7660823
 		scale = 0.45,0.45,0.45
 	}
 	PROP
 	{
-		name = MOARdV.onImpact
-		position = 0.2534245,0.239343,-0.4818226
+		name = MOARdV.onHighG
+		position = 0.2249021,0.2591033,-0.4853292
 		rotation = -0.6417302,0.0275141,0.02330782,-0.7660823
-		scale = 0.5,0.5,0.5
+		scale = 0.45,0.45,0.45
 	}
 	PROP
 	{
@@ -628,7 +634,7 @@ INTERNAL
 	PROP
 	{
 		name = MOARdV.onParachuteArmed
-		position = 0.4284065,0.2036428,-0.4754584
+		position = 0.440248,0.2027995,-0.475313
 		rotation = -0.6417302,0.0275141,0.02330782,-0.7660823
 		scale = 0.4,0.4,0.4
 	}
@@ -649,9 +655,9 @@ INTERNAL
 	PROP
 	{
 		name = MOARdV.onRCSIndicator
-		position = 0.3485909,0.1289694,-0.4626829
+		position = 0.1972628,0.276409,-0.488399
 		rotation = -0.6417302,0.0275141,0.02330782,-0.7660823
-		scale = 0.4,0.4,0.4
+		scale = 0.45,0.45,0.45
 	}
 	PROP
 	{
@@ -663,21 +669,21 @@ INTERNAL
 	PROP
 	{
 		name = MOARdV.onScan
-		position = 0.1054644,0.05179941,-0.4112465
+		position = 0.1103065,0.05179941,-0.4112465
 		rotation = 0.297224,0,0,0.9548078
 		scale = 0.4,0.4,0.4
 	}
 	PROP
 	{
 		name = MOARdV.onStageLocked
-		position = 0.1109441,0.2276194,-0.4041385
+		position = 0.1109441,0.2336174,-0.4035635
 		rotation = 0.7400765,-2.952868E-09,-2.952869E-09,0.6725227
 		scale = 0.5,0.5,0.5
 	}
 	PROP
 	{
 		name = MOARdV.onStageReady
-		position = 0.1109441,0.2109056,-0.4055978
+		position = 0.1109441,0.2171686,-0.4049974
 		rotation = 0.7400765,-2.952868E-09,-2.952869E-09,0.6725227
 		scale = 0.5,0.5,0.5
 	}
@@ -691,21 +697,21 @@ INTERNAL
 	PROP
 	{
 		name = MOARdV.onTarget
-		position = 0.1054644,0.0444344,-0.4005631
+		position = 0.1102215,0.0444344,-0.4005631
 		rotation = 0.297224,0,0,0.9548078
 		scale = 0.4,0.4,0.4
 	}
 	PROP
 	{
 		name = MOARdV.SignalLampAltitudeDrogue
-		position = 0.4083651,0.1963229,-0.4720151
+		position = 0.4187836,0.195581,-0.4718872
 		rotation = -0.6417302,0.0275141,0.02330782,-0.7660823
 		scale = 0.7,0.7,0.7
 	}
 	PROP
 	{
 		name = MOARdV.SignalLampAltitudeMain
-		position = 0.4076549,0.1849705,-0.4700955
+		position = 0.417864,0.1842435,-0.4699702
 		rotation = -0.6417302,0.0275141,0.02330782,-0.7660823
 		scale = 0.7,0.7,0.7
 	}
@@ -747,15 +753,15 @@ INTERNAL
 	PROP
 	{
 		name = MOARdV.SignalLampDynPressureHigh
-		position = 0.263747,0.2240123,-0.4747486
-		rotation = -0.6417302,0.0275141,0.02330782,-0.7660823
+		position = -0.0520277,0.4093408,-0.3840592
+		rotation = 0.7400765,-2.952868E-09,-2.952869E-09,0.6725227
 		scale = 0.5,0.5,0.5
 	}
 	PROP
 	{
 		name = MOARdV.SignalLampDynPressureLow
-		position = 0.2608142,0.1840535,-0.4676334
-		rotation = -0.6417302,0.0275141,0.02330782,-0.7660823
+		position = -0.0520277,0.3639777,-0.3884079
+		rotation = 0.7400765,-2.952868E-09,-2.952869E-09,0.6725227
 		scale = 0.5,0.5,0.5
 	}
 	PROP
@@ -838,7 +844,7 @@ INTERNAL
 	PROP
 	{
 		name = MOARdV.SignalLampReentryAltitude
-		position = 0.4091949,0.207665,-0.4738213
+		position = 0.4196844,0.206918,-0.4736925
 		rotation = -0.6417302,0.0275141,0.02330782,-0.7660823
 		scale = 0.7,0.7,0.7
 	}
@@ -850,27 +856,6 @@ INTERNAL
 		scale = 0.7,0.7,0.7
 	}
 	PROP
-	{
-		name = MOARdV.SignalLampSpeedModeOrbital
-		position = 0.2014232,0.1676103,-0.4673806
-		rotation = -0.6417302,0.0275141,0.02330782,-0.7660823
-		scale = 0.5,0.5,0.5
-	}
-	PROP
-	{
-		name = MOARdV.SignalLampSpeedModeSurface
-		position = 0.2009571,0.1607584,-0.4661606
-		rotation = -0.6417302,0.0275141,0.02330782,-0.7660823
-		scale = 0.5,0.5,0.5
-	}
-	PROP
-	{
-		name = MOARdV.SignalLampSpeedModeTarget
-		position = 0.2017971,0.1740848,-0.4685334
-		rotation = -0.6417302,0.0275141,0.02330782,-0.7660823
-		scale = 0.5,0.5,0.5
-	}
-	PROP
 	{
 		name = MOARdV.SignalLampTimerOn
 		position = 0.01290153,0.3254666,-0.3937492
@@ -920,13 +905,6 @@ INTERNAL
 		scale = 0.3,0.3,0.3
 	}
 	PROP
-	{
-		name = MOARdV.SmallPlate.Speed
-		position = 0.1812969,0.1833101,-0.4699556
-		rotation = -0.6417302,0.0275141,0.02330782,-0.7660823
-		scale = 0.3,0.3,0.3
-	}
-	PROP
 	{
 		name = MOARdV.SmallPlate.TDAControl
 		position = 0.0003294534,0.2878309,-0.3938937
@@ -1160,7 +1138,7 @@ INTERNAL
 	PROP
 	{
 		name = MOARdV.swTumbleAcquireTarget
-		position = 0.07481186,0.04944969,-0.4050396
+		position = 0.08003466,0.04944969,-0.4050396
 		rotation = 0.297224,0,0,0.9548078
 		scale = 0.45,0.45,0.45
 	}
@@ -1204,7 +1182,7 @@ INTERNAL
 		name = MOARdV.swTumblePrecision
 		position = 0.4159452,0.02100196,-0.4583564
 		rotation = 0.6409552,-0.0258363,-0.01758534,0.7669418
-		scale = 0.4500102,0.45,0.45
+		scale = 0.450011,0.45,0.45
 	}
 	PROP
 	{
@@ -1214,6 +1192,13 @@ INTERNAL
 		scale = 0.45,0.4499987,0.45
 	}
 	PROP
+	{
+		name = MOARdV.swTumbleRadarRange
+		position = 0.04547074,0.04944969,-0.4050396
+		rotation = 0.297224,0,0,0.9548078
+		scale = 0.45,0.45,0.45
+	}
+	PROP
 	{
 		name = MOARdV.swTumbleRadioEnable
 		position = -0.01261875,0.133057,-0.4098079
@@ -1223,35 +1208,35 @@ INTERNAL
 	PROP
 	{
 		name = MOARdV.VPG_CabinTemp
-		position = 0.04025033,0.3769884,-0.3871607
+		position = -0.06758089,0.2841899,-0.3984916
 		rotation = 0.7400765,-2.952868E-09,-2.952869E-09,0.6725227
 		scale = 0.7,0.7,0.7
 	}
 	PROP
 	{
 		name = MOARdV.VPG_Dual_Fuel
-		position = 0.2228307,0.2064598,-0.4716071
-		rotation = -0.6417302,0.0275141,0.02330782,-0.7660823
-		scale = 0.45,0.45,0.45
+		position = -0.1033761,0.2843227,-0.3984789
+		rotation = 0.7400765,-2.952868E-09,-2.952869E-09,0.6725227
+		scale = 0.7,0.7,0.7
 	}
 	PROP
 	{
 		name = MOARdV.VPG_Dual_Fuel
-		position = -0.1033761,0.2843227,-0.3984789
+		position = 0.07192232,0.3769884,-0.3871607
 		rotation = 0.7400765,-2.952868E-09,-2.952869E-09,0.6725227
 		scale = 0.7,0.7,0.7
 	}
 	PROP
 	{
 		name = MOARdV.VPG_Dual_Pressure
-		position = 0.2482432,0.2046501,-0.4712952
-		rotation = -0.6417302,0.0275141,0.02330782,-0.7660823
-		scale = 0.45,0.45,0.45
+		position = -0.07028286,0.3769884,-0.3871607
+		rotation = 0.7400765,-2.952868E-09,-2.952869E-09,0.6725227
+		scale = 0.7,0.7,0.7
 	}
 	PROP
 	{
 		name = MOARdV.VPG_EngineEfficiency
-		position = -0.06758089,0.2841899,-0.3984916
+		position = 0.0401934,0.3769884,-0.3871607
 		rotation = 0.7400765,-2.952868E-09,-2.952869E-09,0.6725227
 		scale = 0.7,0.7,0.7
 	}
@@ -1263,25 +1248,11 @@ INTERNAL
 		scale = 0.8,0.8,0.8
 	}
 	PROP
-	{
-		name = NavBall_mercury
-		position = 0.3022672,0.2058113,-0.4783966
-		rotation = 0.6417304,-0.02751388,-0.02330792,0.7660822
-		scale = 1,1,1
-	}
-	PROP
-	{
-		name = NavBall_mercury
-		position = -0.3423897,0.2032532,-0.4779244
-		rotation = 0.6415456,0.0336583,0.02793551,0.7658369
-		scale = 1.000004,1.000008,0.9999914
-	}
-	PROP
 	{
 		name = PSU
 		position = -0.0009511857,0.5945712,-0.04780451
 		rotation = 0.004390765,0.117002,0.9930971,0.007022723
-		scale = 0.4000119,0.4,0.3999992
+		scale = 0.4000127,0.4,0.3999992
 	}
 	PROP
 	{
@@ -1300,7 +1271,7 @@ INTERNAL
 	PROP
 	{
 		name = StageSwitch
-		position = 0.1109441,0.1795762,-0.4084584
+		position = 0.1109441,0.1848824,-0.4079497
 		rotation = 0.7400765,-2.952868E-09,-2.952869E-09,0.6725227
 		scale = 0.5,0.5,0.5
 	}
@@ -1400,28 +1371,28 @@ INTERNAL
 		name = SwitchFlatPanelLongClear
 		position = 3.506345E-09,0.4448896,-0.384412
 		rotation = 0.04654531,5.111517E-12,-4.175984E-09,0.9989162
-		scale = 0.8,0.8000047,0.8
+		scale = 0.8,0.8000063,0.8
 	}
 	PROP
 	{
 		name = SwitchFlatPanelShortClear
 		position = 0.1665685,0.2838504,-0.4918939
 		rotation = 0.07643187,0.003388967,0.03589979,-0.9964226
-		scale = 1,0.9999998,0.9999657
+		scale = 1,0.9999998,0.9999635
 	}
 	PROP
 	{
 		name = SwitchFlatPanelShortClear
 		position = -5.309475E-06,0.5199447,-0.3205159
 		rotation = 0.5932959,-0.002966803,-0.002007234,0.8049765
-		scale = 0.8500163,1.9,3
+		scale = 0.8500178,1.9,3
 	}
 	PROP
 	{
 		name = SwitchFlatPanelShortClear
 		position = -0.01064369,0.3299559,-0.3982671
 		rotation = 0.04685477,3.817753E-12,-4.175985E-09,0.9989017
-		scale = 0.4,0.9999972,1
+		scale = 0.4,0.9999947,1
 	}
 	PROP
 	{
@@ -1435,28 +1406,14 @@ INTERNAL
 		name = SwitchFlatPanelShortClear
 		position = 0.01947395,0.138089,-0.4126901
 		rotation = 0.04685458,0.000122053,-0.00260203,0.9988984
-		scale = 0.8000113,0.8,0.8
-	}
-	PROP
-	{
-		name = SwitchFlatPanelShortClear
-		position = 0.2996742,0.1037029,-0.4566484
-		rotation = 0.09052373,0.003178467,0.03922214,-0.9951166
-		scale = 0.7,0.7,0.5
-	}
-	PROP
-	{
-		name = SwitchFlatPanelShortClear
-		position = -0.3588247,0.09939854,-0.4558122
-		rotation = 0.09050244,-0.003735936,-0.03679955,-0.9952092
-		scale = 0.7,0.7,0.5
+		scale = 0.8000128,0.8,0.8
 	}
 	PROP
 	{
 		name = SwitchFlatPanelShortClear
 		position = -0.01064369,0.2820552,-0.3991544
 		rotation = 0.04685477,3.817753E-12,-4.175985E-09,0.9989017
-		scale = 0.4,0.3999957,1
+		scale = 0.4,0.3999949,1
 	}
 	PROP
 	{
@@ -1477,7 +1434,7 @@ INTERNAL
 		name = SwitchFlatPanelShortClear
 		position = -0.008662606,0.2141451,-0.4073972
 		rotation = 0.0331313,0.0331313,-0.7063302,0.7063302
-		scale = 0.6999965,0.9,0.8
+		scale = 0.6999959,0.9,0.8
 	}
 	PROP
 	{
@@ -1487,6 +1444,20 @@ INTERNAL
 		scale = 0.45,0.8,0.8
 	}
 	PROP
+	{
+		name = SwitchFlatPanelShortClear
+		position = 0.2358013,0.2107759,-0.4787689
+		rotation = 0.06192835,0.06665701,0.732523,-0.6746347
+		scale = 0.45,0.620001,1
+	}
+	PROP
+	{
+		name = SwitchFlatPanelShortClear
+		position = -0.4313444,0.1635733,-0.4686902
+		rotation = -0.09143754,0.004159656,0.04674444,0.9947044
+		scale = 0.5499995,0.5999997,1
+	}
+	PROP
 	{
 		name = swPush_CHUT_ARM
 		position = 0.06983314,-0.006803902,-0.3246683
@@ -1503,7 +1474,7 @@ INTERNAL
 	PROP
 	{
 		name = swPush_CHUT_DEPLOY
-		position = 0.4269517,0.1843362,-0.4718804
+		position = 0.4386377,0.1835041,-0.471737
 		rotation = -0.6417302,0.0275141,0.02330782,-0.7660823
 		scale = 0.7,0.7,0.7
 	}
diff --git a/GameData/MOARdV/FlightSystemsRedux/MOARdV_EngineGauge.cfg b/GameData/MOARdV/FlightSystemsRedux/MOARdV_EngineGauge.cfg
new file mode 100644
index 0000000..cd836a4
--- /dev/null
+++ b/GameData/MOARdV/FlightSystemsRedux/MOARdV_EngineGauge.cfg
@@ -0,0 +1,76 @@
+PROP
+{
+	name = MOARdV.EngineGauge
+	MODEL
+	{
+		model = ASET/ASET_Avionics/ClassicPack/ASET_EngineGauge/ASET_EngineGauge
+	}
+  
+// THRUST arrow rotation
+
+	MODULE
+	{
+		name = JSIVariableAnimator
+		refreshRate = 1
+		VARIABLESET
+		{
+			scale = 0,1.25
+			variableName = EFFECTIVERAWTHROTTLE   
+			controlledTransform = THRUST_arrow
+			localRotationStart = 0,-45,0
+			localRotationEnd = 0,67.5,0
+			maxRateChange = 1.0
+		}
+		
+// THROTTLE arrow rotation
+		
+		VARIABLESET
+		{
+			scale = 0,1
+			variableName = THROTTLE  
+			controlledTransform = THROTTLE_arrow
+			localRotationStart = 0,45,0
+			localRotationEnd = 0,-45,0
+			maxRateChange = 1.0
+		}
+	}	
+ 
+// ----- Backlight emissive 
+
+		MODULE
+		{
+			name = JSIVariableAnimator
+			refreshRate = 10
+			
+			VARIABLESET
+			{
+				coloredObject = THRUST_arrow
+				passiveColor = 0,0,0,255
+				activeColor = 180,180,180,255
+				variableName = CUSTOM_ALCOR_BACKLIGHT_ON
+				scale = 0,1
+				threshold = 0.1,1.1
+			}
+			
+			VARIABLESET
+			{
+				coloredObject = THROTTLE_arrow
+				passiveColor = 0,0,0,255
+				activeColor = 180,180,180,255
+				variableName = CUSTOM_ALCOR_BACKLIGHT_ON
+				scale = 0,1
+				threshold = 0.1,1.1
+			}
+			
+			VARIABLESET
+			{
+				coloredObject = EngineGauge_Scale
+				passiveColor = 0,0,0,255
+				activeColor = 180,180,180,255
+				variableName = CUSTOM_ALCOR_BACKLIGHT_ON
+				scale = 0,1
+				threshold = 0.1,1.1
+			}
+					
+		}
+}
\ No newline at end of file
diff --git a/GameData/MOARdV/FlightSystemsRedux/MappedVariables.cfg b/GameData/MOARdV/FlightSystemsRedux/MappedVariables.cfg
index 8894ff6..344b059 100644
--- a/GameData/MOARdV/FlightSystemsRedux/MappedVariables.cfg
+++ b/GameData/MOARdV/FlightSystemsRedux/MappedVariables.cfg
@@ -70,6 +70,13 @@ RPM_MAPPED_VARIABLE
 	mappedRange = 0, 359999
 }
 
+RPM_MAPPED_VARIABLE
+{
+	sourceVariable = TARGETCLOSESTAPPROACHTIME
+	sourceRange = 0, 359999
+	mappedVariable = MOARdV_TARGETCLOSESTAPPROACHTIME
+	mappedRange = 0, 359999
+}
 RPM_MAPPED_VARIABLE
 {
 	sourceVariable = PITCHNODE
@@ -96,12 +103,20 @@ RPM_MAPPED_VARIABLE
 
 RPM_MAPPED_VARIABLE
 {
-	sourceVariable = SELECTEDSPEED
+	sourceVariable = SELECT_MOARdV_SPEED
 	sourceRange = 0,9999
 	mappedVariable = MOARdV_SELECTEDSPEED
 	mappedRange = 0,9999
 }
 
+RPM_MAPPED_VARIABLE
+{
+	sourceVariable = SELECT_MOARdV_SPEED
+	sourceRange = 0,999
+	mappedVariable = MOARdV_SELECTEDPRECISESPEED
+	mappedRange = 0,9990
+}
+
 RPM_MAPPED_VARIABLE
 {
 	sourceVariable = PERSISTENT_SETALTITUDE
@@ -125,6 +140,14 @@ RPM_MAPPED_VARIABLE
 	mappedRange = 0,9999
 }
 
+RPM_MAPPED_VARIABLE
+{
+	sourceVariable = TARGETDISTANCE
+	sourceRange = 0,9999
+	mappedVariable = MOARdV_TARGETDISTANCE
+	mappedRange = 0,9999
+}
+
 RPM_MAPPED_VARIABLE
 {
 	sourceVariable = TGTRELX
diff --git a/GameData/MOARdV/FlightSystemsRedux/NumericDisplay/fdd1_nodedv.txt b/GameData/MOARdV/FlightSystemsRedux/NumericDisplay/fdd1_nodedv.txt
index 05ed926..9d25f8b 100644
--- a/GameData/MOARdV/FlightSystemsRedux/NumericDisplay/fdd1_nodedv.txt
+++ b/GameData/MOARdV/FlightSystemsRedux/NumericDisplay/fdd1_nodedv.txt
@@ -1 +1 @@
-[#{1:"000000";"80FF0A";"80FF0A"}]{2:;"  00[@x-31].";"  00[@x-31]."}{0,4:00}[@x-31]. $&$ MAPPED_MOARdV_MNODEDV CUSTOM_MOARdV_POWER_DRAINED MNODEEXISTS
\ No newline at end of file
+[#{1:"000000";"80FF0A";"80FF0A"}]{2:;"  00[@x-31].";"  00[@x-31]."}{0,4:00}[@x-32]. $&$ MAPPED_MOARdV_MNODEDV CUSTOM_MOARdV_POWER_DRAINED MNODEEXISTS
\ No newline at end of file
diff --git a/GameData/MOARdV/FlightSystemsRedux/NumericDisplay/fdd2_tgtdst.txt b/GameData/MOARdV/FlightSystemsRedux/NumericDisplay/fdd2_tgtdst.txt
index fd3728b..347e2fb 100644
--- a/GameData/MOARdV/FlightSystemsRedux/NumericDisplay/fdd2_tgtdst.txt
+++ b/GameData/MOARdV/FlightSystemsRedux/NumericDisplay/fdd2_tgtdst.txt
@@ -1 +1 @@
-[#{1:"000000";"80FF0A";"80FF0A"}]{2:;"  00[@x-31].";}{0,4:00}[@x-31]. $&$ MAPPED_MOARdV_TARGETCLOSESTAPPROACHDISTANCE CUSTOM_MOARdV_POWER_DRAINED TARGETEXISTS
\ No newline at end of file
+[#{1:"000000";"80FF0A";"80FF0A"}]{2:;"  00[@x-31].";}{0,4:00}[@x-32]. $&$ MAPPED_MOARdV_TARGETCLOSESTAPPROACHDISTANCE CUSTOM_MOARdV_POWER_DRAINED TARGETEXISTS
\ No newline at end of file
diff --git a/GameData/MOARdV/FlightSystemsRedux/NumericDisplay/fdd4_tgtrange.txt b/GameData/MOARdV/FlightSystemsRedux/NumericDisplay/fdd4_tgtrange.txt
new file mode 100644
index 0000000..e51f968
--- /dev/null
+++ b/GameData/MOARdV/FlightSystemsRedux/NumericDisplay/fdd4_tgtrange.txt
@@ -0,0 +1 @@
+[#{1:"000000";"80FF0A";"80FF0A"}]{2:;"  00[@x-31].";}{0,4:0} $&$ MAPPED_MOARdV_TARGETDISTANCE CUSTOM_MOARdV_POWER_DRAINED PERSISTENT_MOARdV_RadarRangeMode
\ No newline at end of file
diff --git a/GameData/MOARdV/FlightSystemsRedux/NumericDisplay/fdt2_tgttime.txt b/GameData/MOARdV/FlightSystemsRedux/NumericDisplay/fdt2_tgttime.txt
index b9fa73f..3e6828c 100644
--- a/GameData/MOARdV/FlightSystemsRedux/NumericDisplay/fdt2_tgttime.txt
+++ b/GameData/MOARdV/FlightSystemsRedux/NumericDisplay/fdt2_tgttime.txt
@@ -1 +1 @@
-[#{1:"000000";"80FF0A";"80FF0A"}]{2:;"00:00:00";}{0,8:METHH:mm:ss} $&$ TARGETCLOSESTAPPROACHTIME CUSTOM_MOARdV_POWER_DRAINED TARGETEXISTS
\ No newline at end of file
+[#{1:"000000";"80FF0A";"80FF0A"}]{2:;"00:00:00";}{0,8:METHH:mm:ss} $&$ MAPPED_MOARdV_TARGETCLOSESTAPPROACHTIME CUSTOM_MOARdV_POWER_DRAINED TARGETEXISTS
\ No newline at end of file
diff --git a/GameData/MOARdV/FlightSystemsRedux/NumericDisplay/fi0_orbit.txt b/GameData/MOARdV/FlightSystemsRedux/NumericDisplay/fi0_orbit.txt
new file mode 100644
index 0000000..c4aca34
--- /dev/null
+++ b/GameData/MOARdV/FlightSystemsRedux/NumericDisplay/fi0_orbit.txt
@@ -0,0 +1,2 @@
+[#{0:"000000";"80FF0A";"80FF0A"}]     . $&$  CUSTOM_MOARdV_POWER_DRAINED
+[#{1:"000000";"80FF0A";"80FF0A"}]{2:"";"         ";"         "}{0,4:0} $&$ MAPPED_MOARdV_SELECTEDSPEED CUSTOM_MOARdV_POWER_DRAINED ORBITMAKESSENSE
\ No newline at end of file
diff --git a/GameData/MOARdV/FlightSystemsRedux/NumericDisplay/fi1_range.txt b/GameData/MOARdV/FlightSystemsRedux/NumericDisplay/fi1_range.txt
new file mode 100644
index 0000000..33426a9
--- /dev/null
+++ b/GameData/MOARdV/FlightSystemsRedux/NumericDisplay/fi1_range.txt
@@ -0,0 +1,2 @@
+[#{1:"000000";"80FF0A";"80FF0A"}]{0,4:0} $&$ MAPPED_MOARdV_TARGETDISTANCE CUSTOM_MOARdV_POWER_DRAINED
+[#{1:"000000";"80FF0A";"80FF0A"}]{2:"";"         ";"         "}{0,4:0} $&$ MAPPED_MOARdV_SELECTEDSPEED CUSTOM_MOARdV_POWER_DRAINED ORBITMAKESSENSE
\ No newline at end of file
diff --git a/GameData/MOARdV/FlightSystemsRedux/NumericDisplay/fi1a_range.txt b/GameData/MOARdV/FlightSystemsRedux/NumericDisplay/fi1a_range.txt
new file mode 100644
index 0000000..ddb416c
--- /dev/null
+++ b/GameData/MOARdV/FlightSystemsRedux/NumericDisplay/fi1a_range.txt
@@ -0,0 +1,2 @@
+[#{1:"000000";"80FF0A";"80FF0A"}]{0,4:0} $&$ MAPPED_MOARdV_TARGETDISTANCE CUSTOM_MOARdV_POWER_DRAINED
+[#{1:"000000";"80FF0A";"80FF0A"}]{2:"";"         ";"         "}{0,4:00}[@x-32]. $&$ MAPPED_MOARdV_SELECTEDPRECISESPEED CUSTOM_MOARdV_POWER_DRAINED ORBITMAKESSENSE
\ No newline at end of file
diff --git a/GameData/MOARdV/FlightSystemsRedux/NumericDisplay/fi2_node.txt b/GameData/MOARdV/FlightSystemsRedux/NumericDisplay/fi2_node.txt
new file mode 100644
index 0000000..bd6ace6
--- /dev/null
+++ b/GameData/MOARdV/FlightSystemsRedux/NumericDisplay/fi2_node.txt
@@ -0,0 +1,2 @@
+[#{1:"000000";"80FF0A";"80FF0A"}]{2:;"  00[@x-31].";"  00[@x-31]."}{0,4:00}[@x-32]. $&$ MAPPED_MOARdV_MNODEDV CUSTOM_MOARdV_POWER_DRAINED MNODEEXISTS
+[#{1:"000000";"80FF0A";"80FF0A"}]{2:"";"         ";"         "}{0,4:0} $&$ MAPPED_MOARdV_SELECTEDSPEED CUSTOM_MOARdV_POWER_DRAINED ORBITMAKESSENSE
\ No newline at end of file
diff --git a/GameData/MOARdV/FlightSystemsRedux/NumericDisplay/fi3_target.txt b/GameData/MOARdV/FlightSystemsRedux/NumericDisplay/fi3_target.txt
new file mode 100644
index 0000000..360457a
--- /dev/null
+++ b/GameData/MOARdV/FlightSystemsRedux/NumericDisplay/fi3_target.txt
@@ -0,0 +1,2 @@
+[#{1:"000000";"80FF0A";"80FF0A"}]{2:;"  00[@x-31].";}{0,4:00}[@x-32]. $&$ MAPPED_MOARdV_TARGETCLOSESTAPPROACHDISTANCE CUSTOM_MOARdV_POWER_DRAINED TARGETEXISTS
+[#{1:"000000";"80FF0A";"80FF0A"}]{2:"";"         ";"         "}{0,4:0}. $&$ MAPPED_MOARdV_SELECTEDSPEED CUSTOM_MOARdV_POWER_DRAINED ORBITMAKESSENSE
\ No newline at end of file
diff --git a/GameData/MOARdV/FlightSystemsRedux/NumericDisplay/fi3a_target.txt b/GameData/MOARdV/FlightSystemsRedux/NumericDisplay/fi3a_target.txt
new file mode 100644
index 0000000..ca5b1c7
--- /dev/null
+++ b/GameData/MOARdV/FlightSystemsRedux/NumericDisplay/fi3a_target.txt
@@ -0,0 +1,2 @@
+[#{1:"000000";"80FF0A";"80FF0A"}]{2:;"  00[@x-31].";}{0,4:00}[@x-32]. $&$ MAPPED_MOARdV_TARGETCLOSESTAPPROACHDISTANCE CUSTOM_MOARdV_POWER_DRAINED TARGETEXISTS
+[#{1:"000000";"80FF0A";"80FF0A"}]{2:"";"         ";"         "}{0,4:00}[@x-32]. $&$ MAPPED_MOARdV_SELECTEDPRECISESPEED CUSTOM_MOARdV_POWER_DRAINED ORBITMAKESSENSE
\ No newline at end of file
diff --git a/GameData/MOARdV/FlightSystemsRedux/NumericDisplay/fi4_surface.txt b/GameData/MOARdV/FlightSystemsRedux/NumericDisplay/fi4_surface.txt
new file mode 100644
index 0000000..148c00d
--- /dev/null
+++ b/GameData/MOARdV/FlightSystemsRedux/NumericDisplay/fi4_surface.txt
@@ -0,0 +1,2 @@
+[#{0:"000000";"80FF0A";"80FF0A"}]     . $&$ CUSTOM_MOARdV_POWER_DRAINED
+[#{1:"000000";"80FF0A";"80FF0A"}]{2:"";"         ";"         "}{0,4:0} $&$ MAPPED_MOARdV_SELECTEDSPEED CUSTOM_MOARdV_POWER_DRAINED ORBITMAKESSENSE
\ No newline at end of file
diff --git a/GameData/MOARdV/FlightSystemsRedux/SelectVariables.cfg b/GameData/MOARdV/FlightSystemsRedux/SelectVariables.cfg
index 9a8d39c..3579f7c 100644
--- a/GameData/MOARdV/FlightSystemsRedux/SelectVariables.cfg
+++ b/GameData/MOARdV/FlightSystemsRedux/SelectVariables.cfg
@@ -26,3 +26,209 @@ RPM_SELECT_VARIABLE
 		value = ALTITUDE
 	}
 }
+
+RPM_SELECT_VARIABLE
+{
+	// Returns values analogous to SPEEDDISPLAYMODE: -1 = target, 0 = surface, 1 = orbit
+	name = MOARdV_FDMODE
+	
+	// ORBIT
+	defaultValue = 1
+	VARIABLE_DEFINITION
+	{
+		name = PERSISTENT_MOARdV_ALTMODE
+		range = 0.5, 1.5
+		
+		value = 0
+	}
+	
+	VARIABLE_DEFINITION
+	{
+		name = CUSTOM_FDAIGMCP_TARGET-01
+		range = 0.5, 1.5
+		
+		value = -1
+	}
+
+	VARIABLE_DEFINITION
+	{
+		name = CUSTOM_FDAIGMCP_TARGETRVELPLUS-01
+		range = 0.5, 1.5
+		
+		value = -1
+	}
+
+	VARIABLE_DEFINITION
+	{
+		name = CUSTOM_FDAIGMCP_TARGETRVELMINUS-01
+		range = 0.5, 1.5
+		
+		value = -1
+	}
+
+	VARIABLE_DEFINITION
+	{
+		name = CUSTOM_FDAIGMCP_SASTARGETPROGRADE-01
+		range = 0.5, 1.5
+		
+		value = -1
+	}
+
+	VARIABLE_DEFINITION
+	{
+		name = CUSTOM_FDAIGMCP_SASTARGETRETROGRADE-01
+		range = 0.5, 1.5
+		
+		value = -1
+	}
+
+	VARIABLE_DEFINITION
+	{
+		name = CUSTOM_FDAIGMCP_SASTARGETPLUS-01
+		range = 0.5, 1.5
+		
+		value = -1
+	}
+	
+	VARIABLE_DEFINITION
+	{
+		name = CUSTOM_FDAIGMCP_SURFPROGRADE-01
+		range = 0.5, 1.5
+		
+		value = 0
+	}
+
+	VARIABLE_DEFINITION
+	{
+		name = CUSTOM_FDAIGMCP_SURFRETROGRADE-01
+		range = 0.5, 1.5
+		
+		value = 0
+	}
+
+	VARIABLE_DEFINITION
+	{
+		name = CUSTOM_FDAIGMCP_SASSURFPROGRADE-01
+		range = 0.5, 1.5
+		
+		value = 0
+	}
+
+	VARIABLE_DEFINITION
+	{
+		name = CUSTOM_FDAIGMCP_SASSURFRETROGRADE-01
+		range = 0.5, 1.5
+		
+		value = 0
+	}
+}
+
+RPM_SELECT_VARIABLE
+{
+	name = MOARdV_SPEED
+
+	defaultValue = ORBTSPEED
+	
+	VARIABLE_DEFINITION
+	{
+		name = SELECT_MOARdV_FDMODE
+		range = -0.5, 0.5
+		
+		value = SURFSPEED
+	}
+	
+	VARIABLE_DEFINITION
+	{
+		name = SELECT_MOARdV_FDMODE
+		range = -1.5, -0.5
+		
+		value = TRGTSPEED
+	}
+}
+
+RPM_SELECT_VARIABLE
+{
+	name = MOARdV_SPEED_BOB
+
+	defaultValue = ORBTSPEED
+
+	VARIABLE_DEFINITION
+	{
+		name = CUSTOM_FDAIGMCP_SURFPROGRADE-01
+		range = 0.5, 1.5
+		
+		value = SURFSPEED
+	}
+
+	VARIABLE_DEFINITION
+	{
+		name = CUSTOM_FDAIGMCP_SURFRETROGRADE-01
+		range = 0.5, 1.5
+		
+		value = SURFSPEED
+	}
+
+	VARIABLE_DEFINITION
+	{
+		name = CUSTOM_FDAIGMCP_SASSURFPROGRADE-01
+		range = 0.5, 1.5
+		
+		value = SURFSPEED
+	}
+
+	VARIABLE_DEFINITION
+	{
+		name = CUSTOM_FDAIGMCP_SASSURFRETROGRADE-01
+		range = 0.5, 1.5
+		
+		value = SURFSPEED
+	}
+
+	VARIABLE_DEFINITION
+	{
+		name = CUSTOM_FDAIGMCP_TARGET-01
+		range = 0.5, 1.5
+		
+		value = TRGTSPEED
+	}
+
+	VARIABLE_DEFINITION
+	{
+		name = CUSTOM_FDAIGMCP_TARGETRVELPLUS-01
+		range = 0.5, 1.5
+		
+		value = TRGTSPEED
+	}
+
+	VARIABLE_DEFINITION
+	{
+		name = CUSTOM_FDAIGMCP_TARGETRVELMINUS-01
+		range = 0.5, 1.5
+		
+		value = TRGTSPEED
+	}
+
+	VARIABLE_DEFINITION
+	{
+		name = CUSTOM_FDAIGMCP_SASTARGETPROGRADE-01
+		range = 0.5, 1.5
+		
+		value = TRGTSPEED
+	}
+
+	VARIABLE_DEFINITION
+	{
+		name = CUSTOM_FDAIGMCP_SASTARGETRETROGRADE-01
+		range = 0.5, 1.5
+		
+		value = TRGTSPEED
+	}
+
+	VARIABLE_DEFINITION
+	{
+		name = CUSTOM_FDAIGMCP_SASTARGETPLUS-01
+		range = 0.5, 1.5
+		
+		value = TRGTSPEED
+	}
+}
diff --git a/GameData/MOARdV/FlightSystemsRedux/SignalLamp.cfg b/GameData/MOARdV/FlightSystemsRedux/SignalLamp.cfg
index ffeee88..1759976 100644
--- a/GameData/MOARdV/FlightSystemsRedux/SignalLamp.cfg
+++ b/GameData/MOARdV/FlightSystemsRedux/SignalLamp.cfg
@@ -95,6 +95,7 @@ PROP
 			activeColor = 0,255,58,255
 			variableName = BRAKES
 			scale = 0.5,1.001
+			//maxRateChange = 1.0
 		}
  		VARIABLESET
 		{	scale = 1,0
diff --git a/GameData/MOARdV/FlightSystemsRedux/SwitchRotary.cfg b/GameData/MOARdV/FlightSystemsRedux/SwitchRotary.cfg
index b6288e2..83a1c0c 100644
--- a/GameData/MOARdV/FlightSystemsRedux/SwitchRotary.cfg
+++ b/GameData/MOARdV/FlightSystemsRedux/SwitchRotary.cfg
@@ -51,7 +51,6 @@ PROP
 		{
 			coloredObject = swRotaryCircleMarkObj
 			passiveColor = 0,0,0,255
-			//activeColor = 100,120,145,255
 			activeColor = 255,215,135,255
 			variableName = CUSTOM_ALCOR_BACKLIGHT_ON
 			scale = 0,1
@@ -128,7 +127,6 @@ PROP
 		{
 			coloredObject = swRotaryCircleMarkObj
 			passiveColor = 0,0,0,255
-			//activeColor = 100,120,145,255
 			activeColor = 255,215,135,255
 			variableName = CUSTOM_ALCOR_BACKLIGHT_ON
 			scale = 0,1
@@ -195,7 +193,7 @@ PROP
 		{
 			coloredObject = swRotaryCircleMarkObj
 			passiveColor = 0,0,0,255
-			activeColor = 100,120,145,255
+			activeColor = 255,215,135,255
 			variableName = CUSTOM_ALCOR_BACKLIGHT_ON
 			scale = 0,1
 			threshold = 0.1,1.1
@@ -265,7 +263,6 @@ PROP
 		{
 			coloredObject = swRotaryCircleMarkObj
 			passiveColor = 0,0,0,255
-			//activeColor = 100,120,145,255
 			activeColor = 255,215,135,255
 			variableName = CUSTOM_ALCOR_BACKLIGHT_ON
 			scale = 0,1
diff --git a/GameData/MOARdV/FlightSystemsRedux/multiSw4.cfg b/GameData/MOARdV/FlightSystemsRedux/multiSw4.cfg
index 6debca8..1fb0bee 100644
--- a/GameData/MOARdV/FlightSystemsRedux/multiSw4.cfg
+++ b/GameData/MOARdV/FlightSystemsRedux/multiSw4.cfg
@@ -66,10 +66,10 @@ PROP
 			coloredObject = swRotaryCircleMarkObj
 			passiveColor = 0,0,0,255
 			activeColor = 255,215,135,255
-			//activeColor = 100;120,145,255
 			variableName = CUSTOM_ALCOR_BACKLIGHT_ON
 			scale = 0,1
-			threshold = 0.1,1.001
+			threshold = 0.1,1.1
+
 		}
 		VARIABLESET	
 		{
@@ -78,7 +78,7 @@ PROP
 			activeColor = 70,100,225,255
 			variableName = CUSTOM_ALCOR_BACKLIGHT_ON
 			scale = 0,1
-			threshold = 0.1,1.001
+			threshold = 0.1,1.1
 		}
 	}	
 // switcher lables
@@ -208,10 +208,9 @@ PROP
 			coloredObject = swRotaryCircleMarkObj
 			passiveColor = 0,0,0,255
 			activeColor = 255,215,135,255
-			//activeColor = 100;120,145,255
 			variableName = CUSTOM_ALCOR_BACKLIGHT_ON
 			scale = 0,1
-			threshold = 0.1,1.001
+			threshold = 0.1,1.1
 		}
 		VARIABLESET	
 		{
@@ -220,7 +219,7 @@ PROP
 			activeColor = 70,100,225,255
 			variableName = CUSTOM_ALCOR_BACKLIGHT_ON
 			scale = 0,1
-			threshold = 0.1,1.001
+			threshold = 0.1,1.1
 		}
 	}	
 // switcher lables
@@ -335,7 +334,7 @@ PROP
 		animationName = MultiSwitcher_4pos
 		variableName = PERSISTENT_MOARdV_RADIOMODE
 		scale = 0,3
-		refreshRate = 1
+		refreshRate = 3
 	}
 	
 // switcher backlight
@@ -352,7 +351,7 @@ PROP
 			activeColor = 255,215,135,255
 			variableName = CUSTOM_ALCOR_BACKLIGHT_ON
 			scale = 0,1
-			threshold = 0.1,1.001
+			threshold = 0.1,1.1
 		}
 		VARIABLESET	
 		{
@@ -361,7 +360,7 @@ PROP
 			activeColor = 70,100,225,255
 			variableName = CUSTOM_ALCOR_BACKLIGHT_ON
 			scale = 0,1
-			threshold = 0.1,1.001
+			threshold = 0.1,1.1
 		}
 	}	
 // switcher lables
diff --git a/GameData/MOARdV/FlightSystemsRedux/swTumble.cfg b/GameData/MOARdV/FlightSystemsRedux/swTumble.cfg
index 1e98008..9570e4a 100644
--- a/GameData/MOARdV/FlightSystemsRedux/swTumble.cfg
+++ b/GameData/MOARdV/FlightSystemsRedux/swTumble.cfg
@@ -28,11 +28,10 @@ PROP
 		name = JSIVariableAnimator
 		coloredObject = GlowBorder
 		passiveColor = 0,0,0,255
-		//activeColor = 100,120,145,255
 		activeColor = 255,215,135,255
 		variableName = CUSTOM_ALCOR_BACKLIGHT_ON
 		scale = 0,1
-		//threshold = 0.1,1.1
+		threshold = 0.1,1.1
 		refreshRate = 10
 	}	
 }
@@ -70,11 +69,10 @@ PROP
 		name = JSIVariableAnimator
 		coloredObject = GlowBorder
 		passiveColor = 0,0,0,255
-		//activeColor = 100,120,145,255
 		activeColor = 255,215,135,255
 		variableName = CUSTOM_ALCOR_BACKLIGHT_ON
 		scale = 0,1
-		//threshold = 0.1,1.1
+		threshold = 0.1,1.1
 		refreshRate = 10
 	}	
 }
@@ -111,11 +109,10 @@ PROP
 		name = JSIVariableAnimator
 		coloredObject = GlowBorder
 		passiveColor = 0,0,0,255
-		//activeColor = 100,120,145,255
 		activeColor = 255,215,135,255
 		variableName = CUSTOM_ALCOR_BACKLIGHT_ON
 		scale = 0,1
-		//threshold = 0.1,1.1
+		threshold = 0.1,1.1
 		refreshRate = 10
 	}	
 }
@@ -151,11 +148,10 @@ PROP
 		name = JSIVariableAnimator
 		coloredObject = GlowBorder
 		passiveColor = 0,0,0,255
-		//activeColor = 100,120,145,255
 		activeColor = 255,215,135,255
 		variableName = CUSTOM_ALCOR_BACKLIGHT_ON
 		scale = 0,1
-		//threshold = 0.1,1.1
+		threshold = 0.1,1.1
 		refreshRate = 10
 	}	
 }
@@ -190,11 +186,10 @@ PROP
 		name = JSIVariableAnimator
 		coloredObject = GlowBorder
 		passiveColor = 0,0,0,255
-		//activeColor = 100,120,145,255
 		activeColor = 255,215,135,255
 		variableName = CUSTOM_ALCOR_BACKLIGHT_ON
 		scale = 0,1
-		//threshold = 0.1,1.1
+		threshold = 0.1,1.1
 		refreshRate = 10
 	}	
 }
@@ -236,11 +231,10 @@ PROP
 		name = JSIVariableAnimator
 		coloredObject = GlowBorder
 		passiveColor = 0,0,0,255
-		//activeColor = 100,120,145,255
 		activeColor = 255,215,135,255
 		variableName = CUSTOM_ALCOR_BACKLIGHT_ON
 		scale = 0,1
-		//threshold = 0.1,1.1
+		threshold = 0.1,1.1
 		refreshRate = 10
 	}	
 }
@@ -282,11 +276,10 @@ PROP
 		name = JSIVariableAnimator
 		coloredObject = GlowBorder
 		passiveColor = 0,0,0,255
-		//activeColor = 100,120,145,255
 		activeColor = 255,215,135,255
 		variableName = CUSTOM_ALCOR_BACKLIGHT_ON
 		scale = 0,1
-		//threshold = 0.1,1.1
+		threshold = 0.1,1.1
 		refreshRate = 10
 	}	
 }
@@ -328,11 +321,10 @@ PROP
 		name = JSIVariableAnimator
 		coloredObject = GlowBorder
 		passiveColor = 0,0,0,255
-		//activeColor = 100,120,145,255
 		activeColor = 255,215,135,255
 		variableName = CUSTOM_ALCOR_BACKLIGHT_ON
 		scale = 0,1
-		//threshold = 0.1,1.1
+		threshold = 0.1,1.1
 		refreshRate = 10
 	}	
 }
@@ -374,11 +366,10 @@ PROP
 		name = JSIVariableAnimator
 		coloredObject = GlowBorder
 		passiveColor = 0,0,0,255
-		//activeColor = 100,120,145,255
 		activeColor = 255,215,135,255
 		variableName = CUSTOM_ALCOR_BACKLIGHT_ON
 		scale = 0,1
-		//threshold = 0.1,1.1
+		threshold = 0.1,1.1
 		refreshRate = 10
 	}	
 }
@@ -420,11 +411,10 @@ PROP
 		name = JSIVariableAnimator
 		coloredObject = GlowBorder
 		passiveColor = 0,0,0,255
-		//activeColor = 100,120,145,255
 		activeColor = 255,215,135,255
 		variableName = CUSTOM_ALCOR_BACKLIGHT_ON
 		scale = 0,1
-		//threshold = 0.1,1.1
+		threshold = 0.1,1.1
 		refreshRate = 10
 	}	
 }
@@ -466,11 +456,10 @@ PROP
 		name = JSIVariableAnimator
 		coloredObject = GlowBorder
 		passiveColor = 0,0,0,255
-		//activeColor = 100,120,145,255
 		activeColor = 255,215,135,255
 		variableName = CUSTOM_ALCOR_BACKLIGHT_ON
 		scale = 0,1
-		//threshold = 0.1,1.1
+		threshold = 0.1,1.1
 		refreshRate = 10
 	}	
 }
@@ -507,11 +496,10 @@ PROP
 		name = JSIVariableAnimator
 		coloredObject = GlowBorder
 		passiveColor = 0,0,0,255
-		//activeColor = 100,120,145,255
 		activeColor = 255,215,135,255
 		variableName = CUSTOM_ALCOR_BACKLIGHT_ON
 		scale = 0,1
-		//threshold = 0.1,1.1
+		threshold = 0.1,1.1
 		refreshRate = 10
 	}	
 }
@@ -554,11 +542,60 @@ PROP
 		name = JSIVariableAnimator
 		coloredObject = GlowBorder
 		passiveColor = 0,0,0,255
-		//activeColor = 100,120,145,255
 		activeColor = 255,215,135,255
 		variableName = CUSTOM_ALCOR_BACKLIGHT_ON
 		scale = 0,1
-		//threshold = 0.1,1.1
+		threshold = 0.1,1.1
+		refreshRate = 10
+	}	
+}
+
+PROP
+{
+	name = MOARdV.swTumbleRadarRange
+	MODEL
+	{
+		model = ASET/ASET_Props/Control/SwitchTumble/SwitchTumble
+	}
+	MODULE
+	{
+		name = JSIActionGroupSwitch
+		animationName = SwitchTumbleAnim
+		switchTransform = SwitchColider
+		actionName = dummy
+		switchSound = ASET/ASET_Props/Sounds/tumbleClick01
+		perPodPersistenceName = MOARdV_RadarRangeMode
+		masterVariableName = TARGETISVESSELORPORT
+		masterVariableRange = 0.1,1.1
+	}
+
+ 	MODULE
+	{
+		name = JSIVariableLabel
+		transformName = TextTopObj
+		fontSize = 0.010
+		refreshRate = 10
+		labelText = [#<=0:"FFFFFF";"ff0000";"000000"=>] RANGE $&$ CUSTOM_ALCOR_BACKLIGHT_ON 
+	}
+	
+	 	MODULE
+	{
+		name = JSIVariableLabel
+		transformName = TextPlateBottomObj
+		fontSize = 0.010
+		refreshRate = 10
+		labelText = [#<=0:"FFFFFF";"ff0000";"000000"=>] TRACK $&$ CUSTOM_ALCOR_BACKLIGHT_ON 
+	}
+	
+	MODULE
+	{
+		name = JSIVariableAnimator
+		coloredObject = GlowBorder
+		passiveColor = 0,0,0,255
+		activeColor = 255,215,135,255
+		variableName = CUSTOM_ALCOR_BACKLIGHT_ON
+		scale = 0,1
+		threshold = 0.1,1.1
 		refreshRate = 10
 	}	
 }
@@ -599,11 +636,10 @@ PROP
 		name = JSIVariableAnimator
 		coloredObject = GlowBorder
 		passiveColor = 0,0,0,255
-		//activeColor = 100,120,145,255
 		activeColor = 255,215,135,255
 		variableName = CUSTOM_ALCOR_BACKLIGHT_ON
 		scale = 0,1
-		//threshold = 0.1,1.1
+		threshold = 0.1,1.1
 		refreshRate = 10
 	}	
 }
@@ -644,11 +680,10 @@ PROP
 		name = JSIVariableAnimator
 		coloredObject = GlowBorder
 		passiveColor = 0,0,0,255
-		//activeColor = 100,120,145,255
 		activeColor = 255,215,135,255
 		variableName = CUSTOM_ALCOR_BACKLIGHT_ON
 		scale = 0,1
-		//threshold = 0.1,1.1
+		threshold = 0.1,1.1
 		refreshRate = 10
 	}	
 }
@@ -670,22 +705,12 @@ PROP
 		switchSound = ASET/ASET_Props/Sounds/tumbleClick01
 	}
 
-//	MODULE
-//	{
-//		name = JSIVariableLabel
-//		transformName = TextTopObj
-//		fontSize = 0.012
-//		refreshRate = 10
-//		labelText = [#<=0:"FFFFFF";"ff0000";"000000"=>]  COMMUNICATION $&$ CUSTOM_ALCOR_BACKLIGHT_ON 
-//	}
-
  	MODULE
 	{
 		name = JSIVariableLabel
 		transformName = TextPlateTopObj
 		fontSize = 0.007
 		refreshRate = 10
-		//oneShot = true
 		labelText = [#<=0:"FFFFFF";"ff0000";"000000"=>]    ENABLE $&$ CUSTOM_ALCOR_BACKLIGHT_ON
 	}
 	
@@ -695,7 +720,6 @@ PROP
 		transformName = TextPlateBottomObj
 		fontSize = 0.007
 		refreshRate = 10
-		//oneShot = true
 		labelText = [#<=0:"FFFFFF";"ff0000";"000000"=>]     DISABLE $&$ CUSTOM_ALCOR_BACKLIGHT_ON
 	}
 	
@@ -704,11 +728,10 @@ PROP
 		name = JSIVariableAnimator
 		coloredObject = GlowBorder
 		passiveColor = 0,0,0,255
-		//activeColor = 100,120,145,255
 		activeColor = 255,215,135,255
 		variableName = CUSTOM_ALCOR_BACKLIGHT_ON
 		scale = 0,1
-		//threshold = 0.1,1.1
+		threshold = 0.1,1.1
 		refreshRate = 10
 	}	
 }
@@ -743,11 +766,10 @@ PROP
 		name = JSIVariableAnimator
 		coloredObject = GlowBorder
 		passiveColor = 0,0,0,255
-		//activeColor = 100,120,145,255
 		activeColor = 255,215,135,255
 		variableName = CUSTOM_ALCOR_BACKLIGHT_ON
 		scale = 0,1
-		//threshold = 0.1,1.1
+		threshold = 0.1,1.1
 		refreshRate = 10
 	}	
 }
@@ -782,11 +804,10 @@ PROP
 		name = JSIVariableAnimator
 		coloredObject = GlowBorder
 		passiveColor = 0,0,0,255
-		//activeColor = 100,120,145,255
 		activeColor = 255,215,135,255
 		variableName = CUSTOM_ALCOR_BACKLIGHT_ON
 		scale = 0,1
-		//threshold = 0.1,1.1
+		threshold = 0.1,1.1
 		refreshRate = 10
 	}	
 }
@@ -812,11 +833,10 @@ PROP
 		name = JSIVariableAnimator
 		coloredObject = GlowBorder
 		passiveColor = 0,0,0,255
-		//activeColor = 100,120,145,255
 		activeColor = 255,215,135,255
 		variableName = CUSTOM_ALCOR_BACKLIGHT_ON
 		scale = 0,1
-		//threshold = 0.1,1.1
+		threshold = 0.1,1.1
 		refreshRate = 10
 	}	
 }
@@ -842,11 +862,10 @@ PROP
 		name = JSIVariableAnimator
 		coloredObject = GlowBorder
 		passiveColor = 0,0,0,255
-		//activeColor = 100,120,145,255
 		activeColor = 255,215,135,255
 		variableName = CUSTOM_ALCOR_BACKLIGHT_ON
 		scale = 0,1
-		//threshold = 0.1,1.1
+		threshold = 0.1,1.1
 		refreshRate = 10
 	}	
 }
@@ -872,11 +891,10 @@ PROP
 		name = JSIVariableAnimator
 		coloredObject = GlowBorder
 		passiveColor = 0,0,0,255
-		//activeColor = 100,120,145,255
 		activeColor = 255,215,135,255
 		variableName = CUSTOM_ALCOR_BACKLIGHT_ON
 		scale = 0,1
-		//threshold = 0.1,1.1
+		threshold = 0.1,1.1
 		refreshRate = 10
 	}	
 }
@@ -902,11 +920,10 @@ PROP
 		name = JSIVariableAnimator
 		coloredObject = GlowBorder
 		passiveColor = 0,0,0,255
-		//activeColor = 100,120,145,255
 		activeColor = 255,215,135,255
 		variableName = CUSTOM_ALCOR_BACKLIGHT_ON
 		scale = 0,1
-		//threshold = 0.1,1.1
+		threshold = 0.1,1.1
 		refreshRate = 10
 	}	
 }
@@ -932,11 +949,10 @@ PROP
 		name = JSIVariableAnimator
 		coloredObject = GlowBorder
 		passiveColor = 0,0,0,255
-		//activeColor = 100,120,145,255
 		activeColor = 255,215,135,255
 		variableName = CUSTOM_ALCOR_BACKLIGHT_ON
 		scale = 0,1
-		//threshold = 0.1,1.1
+		threshold = 0.1,1.1
 		refreshRate = 10
 	}	
 }
@@ -962,11 +978,10 @@ PROP
 		name = JSIVariableAnimator
 		coloredObject = GlowBorder
 		passiveColor = 0,0,0,255
-		//activeColor = 100,120,145,255
 		activeColor = 255,215,135,255
 		variableName = CUSTOM_ALCOR_BACKLIGHT_ON
 		scale = 0,1
-		//threshold = 0.1,1.1
+		threshold = 0.1,1.1
 		refreshRate = 10
 	}	
 }
@@ -992,11 +1007,10 @@ PROP
 		name = JSIVariableAnimator
 		coloredObject = GlowBorder
 		passiveColor = 0,0,0,255
-		//activeColor = 100,120,145,255
 		activeColor = 255,215,135,255
 		variableName = CUSTOM_ALCOR_BACKLIGHT_ON
 		scale = 0,1
-		//threshold = 0.1,1.1
+		threshold = 0.1,1.1
 		refreshRate = 10
 	}	
 }
@@ -1022,11 +1036,10 @@ PROP
 		name = JSIVariableAnimator
 		coloredObject = GlowBorder
 		passiveColor = 0,0,0,255
-		//activeColor = 100,120,145,255
 		activeColor = 255,215,135,255
 		variableName = CUSTOM_ALCOR_BACKLIGHT_ON
 		scale = 0,1
-		//threshold = 0.1,1.1
+		threshold = 0.1,1.1
 		refreshRate = 10
 	}	
 }
@@ -1052,11 +1065,10 @@ PROP
 		name = JSIVariableAnimator
 		coloredObject = GlowBorder
 		passiveColor = 0,0,0,255
-		//activeColor = 100,120,145,255
 		activeColor = 255,215,135,255
 		variableName = CUSTOM_ALCOR_BACKLIGHT_ON
 		scale = 0,1
-		//threshold = 0.1,1.1
+		threshold = 0.1,1.1
 		refreshRate = 10
 	}	
 }
@@ -1082,11 +1094,10 @@ PROP
 		name = JSIVariableAnimator
 		coloredObject = GlowBorder
 		passiveColor = 0,0,0,255
-		//activeColor = 100,120,145,255
 		activeColor = 255,215,135,255
 		variableName = CUSTOM_ALCOR_BACKLIGHT_ON
 		scale = 0,1
-		//threshold = 0.1,1.1
+		threshold = 0.1,1.1
 		refreshRate = 10
 	}	
 }
@@ -1125,11 +1136,10 @@ PROP
 		name = JSIVariableAnimator
 		coloredObject = GlowBorder
 		passiveColor = 0,0,0,255
-		//activeColor = 100,120,145,255
 		activeColor = 255,215,135,255
 		variableName = CUSTOM_ALCOR_BACKLIGHT_ON
 		scale = 0,1
-		//threshold = 0.1,1.1
+		threshold = 0.1,1.1
 		refreshRate = 10
 	}	
 }
@@ -1165,11 +1175,10 @@ PROP
 		name = JSIVariableAnimator
 		coloredObject = GlowBorder
 		passiveColor = 0,0,0,255
-		//activeColor = 100,120,145,255
 		activeColor = 255,215,135,255
 		variableName = CUSTOM_ALCOR_BACKLIGHT_ON
 		scale = 0,1
-		//threshold = 0.1,1.1
+		threshold = 0.1,1.1
 		refreshRate = 10
 	}	
 }
@@ -1205,11 +1214,10 @@ PROP
 		name = JSIVariableAnimator
 		coloredObject = GlowBorder
 		passiveColor = 0,0,0,255
-		//activeColor = 100,120,145,255
 		activeColor = 255,215,135,255
 		variableName = CUSTOM_ALCOR_BACKLIGHT_ON
 		scale = 0,1
-		//threshold = 0.1,1.1
+		threshold = 0.1,1.1
 		refreshRate = 10
 	}	
 }
@@ -1245,11 +1253,10 @@ PROP
 		name = JSIVariableAnimator
 		coloredObject = GlowBorder
 		passiveColor = 0,0,0,255
-		//activeColor = 100,120,145,255
 		activeColor = 255,215,135,255
 		variableName = CUSTOM_ALCOR_BACKLIGHT_ON
 		scale = 0,1
-		//threshold = 0.1,1.1
+		threshold = 0.1,1.1
 		refreshRate = 10
 	}	
 }
@@ -1284,11 +1291,10 @@ PROP
 		name = JSIVariableAnimator
 		coloredObject = GlowBorder
 		passiveColor = 0,0,0,255
-		//activeColor = 100,120,145,255
 		activeColor = 255,215,135,255
 		variableName = CUSTOM_ALCOR_BACKLIGHT_ON
 		scale = 0,1
-		//threshold = 0.1,1.1
+		threshold = 0.1,1.1
 		refreshRate = 10
 	}	
 
@@ -1325,11 +1331,10 @@ PROP
 		name = JSIVariableAnimator
 		coloredObject = GlowBorder
 		passiveColor = 0,0,0,255
-		//activeColor = 100,120,145,255
 		activeColor = 255,215,135,255
 		variableName = CUSTOM_ALCOR_BACKLIGHT_ON
 		scale = 0,1
-		//threshold = 0.1,1.1
+		threshold = 0.1,1.1
 		refreshRate = 10
 	}	
 }
@@ -1347,7 +1352,6 @@ PROP
 		animationName = SwitchTumbleAnim
 		switchTransform = SwitchColider
 		actionName = dummy
-		//perPodPersistenceName = MOARdV_LS_Pump2B
 		switchSound = ASET/ASET_Props/Sounds/tumbleClick01
 	}
 
@@ -1365,11 +1369,10 @@ PROP
 		name = JSIVariableAnimator
 		coloredObject = GlowBorder
 		passiveColor = 0,0,0,255
-		//activeColor = 100,120,145,255
 		activeColor = 255,215,135,255
 		variableName = CUSTOM_ALCOR_BACKLIGHT_ON
 		scale = 0,1
-		//threshold = 0.1,1.1
+		threshold = 0.1,1.1
 		refreshRate = 10
 	}	
 }
diff --git a/GameData/MOARdV/FlightSystemsRedux/switch_B.cfg b/GameData/MOARdV/FlightSystemsRedux/switch_B.cfg
index c10f1bc..cda5567 100644
--- a/GameData/MOARdV/FlightSystemsRedux/switch_B.cfg
+++ b/GameData/MOARdV/FlightSystemsRedux/switch_B.cfg
@@ -99,7 +99,6 @@ PROP
 
 		TRANSFERACTION
 		{
-			//name = JSIMechJeb
 			getVariable = SELECT_MOARdV_ALTITUDE
 			perPodPersistenceName = SETALTITUDE
 			stateVariable = PERSISTENT_MOARdV_ALTMODE
@@ -120,6 +119,7 @@ PROP
 			coloredObject = switch_B_ButtonName
 			passiveColor = 0,0,0,255
 			activeColor = 255,215,135,255
+			threshold = 0.5,1.1
 		}
 		VARIABLESET
 		{
@@ -128,6 +128,7 @@ PROP
 			coloredObject = switch_B_ButtonBacklightBorder
 			passiveColor = 0,0,0,255
 			activeColor = 255,215,135,255
+			threshold = 0.5,1.1
 		}
 		
 //---------------- Switching ON -------------------------	
@@ -220,6 +221,7 @@ PROP
 			coloredObject = switch_B_ButtonName
 			passiveColor = 0,0,0,255
 			activeColor = 255,215,135,255
+			threshold = 0.5,1.1
 		}
 		VARIABLESET
 		{
@@ -228,6 +230,7 @@ PROP
 			coloredObject = switch_B_ButtonBacklightBorder
 			passiveColor = 0,0,0,255
 			activeColor = 255,215,135,255
+			threshold = 0.5,1.1
 		}
 	}
 //---------------- name -------------------------
@@ -273,6 +276,7 @@ PROP
 			coloredObject = switch_B_ButtonName
 			passiveColor = 0,0,0,255
 			activeColor = 255,215,135,255
+			threshold = 0.5,1.1
 		}
 		VARIABLESET
 		{
@@ -281,6 +285,7 @@ PROP
 			coloredObject = switch_B_ButtonBacklightBorder
 			passiveColor = 0,0,0,255
 			activeColor = 255,215,135,255
+			threshold = 0.5,1.1
 		}
 	}
 	MODULE
@@ -345,14 +350,6 @@ PROP
 			animationName = switch_B_ButtonPushAnim
 			switchSound = ASET/ASET_Props/Sounds/tumbleClick01
 			increment = 100000
-//			incrementCurve
-//			{
-//				key = 0 1000
-//				key = 2 1000
-//				key = 4 10000
-//				key = 5 100000
-//				key = 6 100000
-//			}
 		}
 	}
 	
@@ -369,6 +366,7 @@ PROP
 			coloredObject = switch_B_ButtonName
 			passiveColor = 0,0,0,255
 			activeColor = 255,215,135,255
+			threshold = 0.5,1.1
 		}
 		VARIABLESET
 		{
@@ -377,6 +375,7 @@ PROP
 			coloredObject = switch_B_ButtonBacklightBorder
 			passiveColor = 0,0,0,255
 			activeColor = 255,215,135,255
+			threshold = 0.5,1.1
 		}
 	}
 //---------------- name -------------------------
@@ -422,6 +421,7 @@ PROP
 			coloredObject = switch_B_ButtonName
 			passiveColor = 0,0,0,255
 			activeColor = 255,215,135,255
+			threshold = 0.5,1.1
 		}
 		VARIABLESET
 		{
@@ -430,6 +430,7 @@ PROP
 			coloredObject = switch_B_ButtonBacklightBorder
 			passiveColor = 0,0,0,255
 			activeColor = 255,215,135,255
+			threshold = 0.5,1.1
 		}
 	}
 	MODULE
@@ -447,14 +448,6 @@ PROP
 			animationName = switch_B_ButtonPushAnim
 			switchSound = ASET/ASET_Props/Sounds/tumbleClick01
 			increment = -100000
-//			incrementCurve
-//			{
-//				key = 0 -1000
-//				key = 2 -1000
-//				key = 4 -10000
-//				key = 5 -100000
-//				key = 6 -100000
-//			}
 		}
 	}
 		
@@ -508,6 +501,7 @@ PROP
 			coloredObject = switch_B_ButtonName
 			passiveColor = 0,0,0,255
 			activeColor = 255,215,135,255
+			threshold = 0.5,1.1
 		}
 		VARIABLESET
 		{
@@ -516,6 +510,7 @@ PROP
 			coloredObject = switch_B_ButtonBacklightBorder
 			passiveColor = 0,0,0,255
 			activeColor = 255,215,135,255
+			threshold = 0.5,1.1
 		}
 //---------------- Switching ON -------------------------	
 		VARIABLESET
@@ -685,7 +680,7 @@ PROP
 		{
 			variableName = PERSISTENT_BackLight
 			scale = 0,1
-			//threshold = 0.5,1.1
+			threshold = 0.5,1.1
 			coloredObject = switch_B_ButtonName
 			passiveColor = 0,0,0,255
 			activeColor = 255,215,135,255
@@ -694,7 +689,7 @@ PROP
 		{
 			variableName = PERSISTENT_BackLight
 			scale = 0,1
-			//threshold = 0.5,1.1
+			threshold = 0.5,1.1
 			coloredObject = switch_B_ButtonBacklightBorder
 			passiveColor = 0,0,0,255
 			activeColor = 255,215,135,255
@@ -778,7 +773,7 @@ PROP
 		{
 			variableName = PERSISTENT_BackLight
 			scale = 0,1
-			//threshold = 0.5,1.1
+			threshold = 0.5,1.1
 			coloredObject = switch_B_ButtonName
 			passiveColor = 0,0,0,255
 			activeColor = 255,215,135,255
@@ -801,7 +796,6 @@ PROP
 			coloredObject = switch_B_ButtonLamp
 			passiveColor = 0,0,0,255
 			activeColor = 95,175,0,255
-			//activeColor = 255,215,135,255
 		}
 		VARIABLESET
 		{
@@ -834,70 +828,6 @@ PROP
 	}
 }
 
-PROP
-{
-	name = MOARdV.BtnB_SpeedMode
-	MODEL
-	{
-		model = ASET/ASET_Props/Control/switch_B_Button01/switch_B_Button01
-	}
-//---------------- Action -------------------------
-	MODULE
-	{
-		name = JSIActionGroupSwitch
-		animationName = switch_B_ButtonPushAnim
-		switchTransform = switch_B_ButtonBody
-		actionName = plugin
-
-		PLUGINACTION
-		{
-			name = JSIInternalRPMButtons
-			actionMethod = ButtonSpeedMode
-			stateMethod = ButtonSpeedModeState
-		}
-		switchSound = ASET/ASET_Props/Sounds/tumbleClick01
-	}
-
-	MODULE 
-	{
-		name = JSIVariableAnimator
-		refreshRate = 10
-		
-//---------------- Backlight -------------------------
-		VARIABLESET
-		{
-			variableName = PERSISTENT_BackLight
-			scale = 0,1
-			threshold = 0.5,1.1
-			coloredObject = switch_B_ButtonName
-			passiveColor = 0,0,0,255
-			//activeColor = 95,175,0,255
-			activeColor = 255,215,135,255
-		}
-		VARIABLESET
-		{
-			variableName = PERSISTENT_BackLight
-			scale = 0,1
-			threshold = 0.5,1.1
-			coloredObject = switch_B_ButtonBacklightBorder
-			passiveColor = 0,0,0,255
-			//activeColor = 95,175,0,255
-			//activeColor = 100,120,145,255
-			activeColor = 255,215,135,255
-		}
-	}
-	
-//---------------- name -------------------------
-	MODULE
-	{
-		name = JSIPropTextureShift
-		transformToShift = switch_B_ButtonName
-		layerToShift = _MainTex _Emissive
-		x = 0.0
-		y = 0.0625
-	}
-}
-
 PROP
 {
 	name = MOARdV.BtnB_Undock
@@ -924,34 +854,6 @@ PROP
 		switchSound = ASET/ASET_Props/Sounds/B_Button01_Click
 	}
 
-//---------------- Backlight -------------------------
-	
-	//MODULE
-	//{
-	//	name = JSIActionGroupSwitch
-	//	perPodPersistenceName = BackLight
-	//	actionName = dummy
-	//	coloredObject = switch_B_ButtonName
-	//	disabledColor = 0,0,0,255
-	//	//enabledColor = 95,175,0,255
-	//	enabledColor = 255,215,135,255
-	//	switchSound = ASET/ASET_Props/Sounds/beep-21
-	//	switchSoundVolume = 0.0
-	//}
-	
-	//MODULE
-	//{
-	//	name = JSIActionGroupSwitch
-	//	perPodPersistenceName = BackLight
-	//	actionName = dummy
-	//	coloredObject = switch_B_ButtonBacklightBorder
-	//	disabledColor = 0,0,0,255
-	//	enabledColor = 255,215,135,255
-	//	//enabledColor = 95,175,0,255
-	//	switchSound = ASET/ASET_Props/Sounds/beep-21
-	//	switchSoundVolume = 0.0
-	//}
-
 	MODULE 
 	{
 		name = JSIVariableAnimator
@@ -965,7 +867,6 @@ PROP
 			threshold = 0.5,1.1
 			coloredObject = switch_B_ButtonName
 			passiveColor = 0,0,0,255
-			//activeColor = 95,175,0,255
 			activeColor = 255,215,135,255
 		}
 		VARIABLESET
@@ -975,9 +876,7 @@ PROP
 			threshold = 0.5,1.1
 			coloredObject = switch_B_ButtonBacklightBorder
 			passiveColor = 0,0,0,255
-			//activeColor = 95,175,0,255
 			activeColor = 255,215,135,255
-			//activeColor = 100,120,145,255
 		}
 		
 //---------------- Switching ON -------------------------	
@@ -989,7 +888,6 @@ PROP
 			coloredObject = switch_B_ButtonLamp
 			passiveColor = 0,0,0,255
 			activeColor = 95,175,0,255
-			//activeColor = 255,215,135,255
 		}
 		VARIABLESET
 		{