diff --git a/GameData/SSTU/ModIntegration/MechJeb2/MJ.cfg b/GameData/SSTU/ModIntegration/MechJeb2/MJ.cfg
index 5f24916d..fa0be5b7 100644
--- a/GameData/SSTU/ModIntegration/MechJeb2/MJ.cfg
+++ b/GameData/SSTU/ModIntegration/MechJeb2/MJ.cfg
@@ -1,104 +1,100 @@
 @PART[SSTU-SC-V-CM|SSTU-SC-A-DM|SSTU-SC-A-OM|SSTU-SC-A-SMX|SSTU-SC-B-CM|SSTU-SC-B-CMX|SSTU-SC-C-CM|SSTU-SC-C-CMX|SSTU-SC-E-FS|SSTU-SC-E-FSX]:FOR[SSTU]:NEEDS[MechJeb2]
 {
-    MODULE
+    %MODULE[MechJebCore]
     {
-        name = MechJebCore
-        MechJebLocalSettings
+        %MechJebLocalSettings
 		{
-            MechJebModuleCustomWindowEditor { unlockTechs = flightControl }
-            MechJebModuleSmartASS { unlockTechs = flightControl }
-            MechJebModuleManeuverPlanner { unlockTechs = advFlightControl }
-            MechJebModuleNodeEditor { unlockTechs = advFlightControl }
-            MechJebModuleTranslatron { unlockTechs = advFlightControl }
-            MechJebModuleWarpHelper { unlockTechs = advFlightControl }
-            MechJebModuleAttitudeAdjustment { unlockTechs = advFlightControl }
-            MechJebModuleThrustWindow { unlockTechs = advFlightControl }
-            MechJebModuleRCSBalancerWindow { unlockTechs = advFlightControl }
-            MechJebModuleRoverWindow { unlockTechs = fieldScience }
-            MechJebModuleAscentGuidance { unlockTechs = unmannedTech }
-            MechJebModuleLandingGuidance { unlockTechs = unmannedTech }
-            MechJebModuleSpaceplaneGuidance { unlockTechs = unmannedTech }
-            MechJebModuleDockingGuidance { unlockTechs = advUnmanned }
-            MechJebModuleRendezvousAutopilotWindow { unlockTechs = advUnmanned }
-            MechJebModuleRendezvousGuidance { unlockTechs = advUnmanned }
+            %MechJebModuleCustomWindowEditor { unlockTechs = flightControl }
+            %MechJebModuleSmartASS { unlockTechs = flightControl }
+            %MechJebModuleManeuverPlanner { unlockTechs = advFlightControl }
+            %MechJebModuleNodeEditor { unlockTechs = advFlightControl }
+            %MechJebModuleTranslatron { unlockTechs = advFlightControl }
+            %MechJebModuleWarpHelper { unlockTechs = advFlightControl }
+            %MechJebModuleAttitudeAdjustment { unlockTechs = advFlightControl }
+            %MechJebModuleThrustWindow { unlockTechs = advFlightControl }
+            %MechJebModuleRCSBalancerWindow { unlockTechs = advFlightControl }
+            %MechJebModuleRoverWindow { unlockTechs = fieldScience }
+            %MechJebModuleAscentGuidance { unlockTechs = unmannedTech }
+            %MechJebModuleLandingGuidance { unlockTechs = unmannedTech }
+            %MechJebModuleSpaceplaneGuidance { unlockTechs = unmannedTech }
+            %MechJebModuleDockingGuidance { unlockTechs = advUnmanned }
+            %MechJebModuleRendezvousAutopilotWindow { unlockTechs = advUnmanned }
+            %MechJebModuleRendezvousGuidance { unlockTechs = advUnmanned }
         }
     }
 }
 @PART[SSTU-SC-GEN-PPC|SSTU-SC-TANK-MUS|SSTU-SC-C-ICPS|SSTU-SC-C-HUS]:FOR[SSTU]:NEEDS[MechJeb2]
 {
-	MODULE
+    %MODULE[MechJebCore]
 	{
-		name = MechJebCore
-		MechJebLocalSettings
+		%MechJebLocalSettings
 		{
-			MechJebModuleCustomWindowEditor { unlockTechs = flightControl }
-			MechJebModuleSmartASS { unlockTechs = flightControl }
-			MechJebModuleManeuverPlanner { unlockTechs = advFlightControl }
-			MechJebModuleNodeEditor { unlockTechs = advFlightControl }
-			MechJebModuleTranslatron { unlockTechs = advFlightControl }
-			MechJebModuleWarpHelper { unlockTechs = advFlightControl }
-			MechJebModuleAttitudeAdjustment { unlockTechs = advFlightControl }
-			MechJebModuleThrustWindow { unlockTechs = advFlightControl }
-			MechJebModuleRCSBalancerWindow { unlockTechs = advFlightControl }
-			MechJebModuleRoverWindow { unlockTechs = fieldScience }
-			MechJebModuleAscentGuidance { unlockTechs = unmannedTech }
-			MechJebModuleLandingGuidance { unlockTechs = unmannedTech }
-			MechJebModuleSpaceplaneGuidance { unlockTechs = unmannedTech }
-			MechJebModuleDockingGuidance { unlockTechs = advUnmanned }
-			MechJebModuleRendezvousAutopilotWindow { unlockTechs = advUnmanned }
-			MechJebModuleRendezvousGuidance { unlockTechs = advUnmanned }
+			%MechJebModuleCustomWindowEditor { unlockTechs = flightControl }
+			%MechJebModuleSmartASS { unlockTechs = flightControl }
+			%MechJebModuleManeuverPlanner { unlockTechs = advFlightControl }
+			%MechJebModuleNodeEditor { unlockTechs = advFlightControl }
+			%MechJebModuleTranslatron { unlockTechs = advFlightControl }
+			%MechJebModuleWarpHelper { unlockTechs = advFlightControl }
+			%MechJebModuleAttitudeAdjustment { unlockTechs = advFlightControl }
+			%MechJebModuleThrustWindow { unlockTechs = advFlightControl }
+			%MechJebModuleRCSBalancerWindow { unlockTechs = advFlightControl }
+			%MechJebModuleRoverWindow { unlockTechs = fieldScience }
+			%MechJebModuleAscentGuidance { unlockTechs = unmannedTech }
+			%MechJebModuleLandingGuidance { unlockTechs = unmannedTech }
+			%MechJebModuleSpaceplaneGuidance { unlockTechs = unmannedTech }
+			%MechJebModuleDockingGuidance { unlockTechs = advUnmanned }
+			%MechJebModuleRendezvousAutopilotWindow { unlockTechs = advUnmanned }
+			%MechJebModuleRendezvousGuidance { unlockTechs = advUnmanned }
 		}
 	}
 }
 @PART[SSTU-LC2-POD|SSTU-LC3-POD|SSTU-LC5-POD]:FOR[SSTU]:NEEDS[MechJeb2]
 {
-	MODULE
+    %MODULE[MechJebCore]
 	{
-		name = MechJebCore
-		MechJebLocalSettings
+		%MechJebLocalSettings
 		{
-			MechJebModuleCustomWindowEditor { unlockTechs = flightControl }
-			MechJebModuleSmartASS { unlockTechs = flightControl }
-			MechJebModuleManeuverPlanner { unlockTechs = advFlightControl }
-			MechJebModuleNodeEditor { unlockTechs = advFlightControl }
-			MechJebModuleTranslatron { unlockTechs = advFlightControl }
-			MechJebModuleWarpHelper { unlockTechs = advFlightControl }
-			MechJebModuleAttitudeAdjustment { unlockTechs = advFlightControl }
-			MechJebModuleThrustWindow { unlockTechs = advFlightControl }
-			MechJebModuleRCSBalancerWindow { unlockTechs = advFlightControl }
-			MechJebModuleRoverWindow { unlockTechs = fieldScience }
-			MechJebModuleAscentGuidance { unlockTechs = unmannedTech }
-			MechJebModuleLandingGuidance { unlockTechs = unmannedTech }
-			MechJebModuleSpaceplaneGuidance { unlockTechs = unmannedTech }
-			MechJebModuleDockingGuidance { unlockTechs = advUnmanned }
-			MechJebModuleRendezvousAutopilotWindow { unlockTechs = advUnmanned }
-			MechJebModuleRendezvousGuidance { unlockTechs = advUnmanned }
+			%MechJebModuleCustomWindowEditor { unlockTechs = flightControl }
+			%MechJebModuleSmartASS { unlockTechs = flightControl }
+			%MechJebModuleManeuverPlanner { unlockTechs = advFlightControl }
+			%MechJebModuleNodeEditor { unlockTechs = advFlightControl }
+			%MechJebModuleTranslatron { unlockTechs = advFlightControl }
+			%MechJebModuleWarpHelper { unlockTechs = advFlightControl }
+			%MechJebModuleAttitudeAdjustment { unlockTechs = advFlightControl }
+			%MechJebModuleThrustWindow { unlockTechs = advFlightControl }
+			%MechJebModuleRCSBalancerWindow { unlockTechs = advFlightControl }
+			%MechJebModuleRoverWindow { unlockTechs = fieldScience }
+			%MechJebModuleAscentGuidance { unlockTechs = unmannedTech }
+			%MechJebModuleLandingGuidance { unlockTechs = unmannedTech }
+			%MechJebModuleSpaceplaneGuidance { unlockTechs = unmannedTech }
+			%MechJebModuleDockingGuidance { unlockTechs = advUnmanned }
+			%MechJebModuleRendezvousAutopilotWindow { unlockTechs = advUnmanned }
+			%MechJebModuleRendezvousGuidance { unlockTechs = advUnmanned }
 		}
 	}
 }
 @PART[SSTU-ST-DOS-COM|SSTU-ST-DOS-FEM|SSTU-ST-DOS-HAB|SSTU-ST-DOS-LAB|SSTU-ST-DOS-PWR|SSTU-ST-DOS-TKS|SSTU-ST-HAB-B1|SSTU-ST-HAB-B2|SSTU-ST-HAB-C1|SSTU-ST-HAB-C2]:FOR[SSTU]:NEEDS[MechJeb2]
 {
-	MODULE
+    %MODULE[MechJebCore]
 	{
-		name = MechJebCore
-		MechJebLocalSettings
+		%MechJebLocalSettings
 		{
-			MechJebModuleCustomWindowEditor { unlockTechs = flightControl }
-			MechJebModuleSmartASS { unlockTechs = flightControl }
-			MechJebModuleManeuverPlanner { unlockTechs = advFlightControl }
-			MechJebModuleNodeEditor { unlockTechs = advFlightControl }
-			MechJebModuleTranslatron { unlockTechs = advFlightControl }
-			MechJebModuleWarpHelper { unlockTechs = advFlightControl }
-			MechJebModuleAttitudeAdjustment { unlockTechs = advFlightControl }
-			MechJebModuleThrustWindow { unlockTechs = advFlightControl }
-			MechJebModuleRCSBalancerWindow { unlockTechs = advFlightControl }
-			MechJebModuleRoverWindow { unlockTechs = fieldScience }
-			MechJebModuleAscentGuidance { unlockTechs = unmannedTech }
-			MechJebModuleLandingGuidance { unlockTechs = unmannedTech }
-			MechJebModuleSpaceplaneGuidance { unlockTechs = unmannedTech }
-			MechJebModuleDockingGuidance { unlockTechs = advUnmanned }
-			MechJebModuleRendezvousAutopilotWindow { unlockTechs = advUnmanned }
-			MechJebModuleRendezvousGuidance { unlockTechs = advUnmanned }
+			%MechJebModuleCustomWindowEditor { unlockTechs = flightControl }
+			%MechJebModuleSmartASS { unlockTechs = flightControl }
+			%MechJebModuleManeuverPlanner { unlockTechs = advFlightControl }
+			%MechJebModuleNodeEditor { unlockTechs = advFlightControl }
+			%MechJebModuleTranslatron { unlockTechs = advFlightControl }
+			%MechJebModuleWarpHelper { unlockTechs = advFlightControl }
+			%MechJebModuleAttitudeAdjustment { unlockTechs = advFlightControl }
+			%MechJebModuleThrustWindow { unlockTechs = advFlightControl }
+			%MechJebModuleRCSBalancerWindow { unlockTechs = advFlightControl }
+			%MechJebModuleRoverWindow { unlockTechs = fieldScience }
+			%MechJebModuleAscentGuidance { unlockTechs = unmannedTech }
+			%MechJebModuleLandingGuidance { unlockTechs = unmannedTech }
+			%MechJebModuleSpaceplaneGuidance { unlockTechs = unmannedTech }
+			%MechJebModuleDockingGuidance { unlockTechs = advUnmanned }
+			%MechJebModuleRendezvousAutopilotWindow { unlockTechs = advUnmanned }
+			%MechJebModuleRendezvousGuidance { unlockTechs = advUnmanned }
 		}
 	}
 }
diff --git a/GameData/SSTU/Plugins/SSTUTools.dll b/GameData/SSTU/Plugins/SSTUTools.dll
index 11c0123c..11dee541 100644
Binary files a/GameData/SSTU/Plugins/SSTUTools.dll and b/GameData/SSTU/Plugins/SSTUTools.dll differ