diff --git a/GameData/SXT/Patches/ModCompatibility/USI/USI-LS.cfg b/GameData/SXT/Patches/ModCompatibility/USI/USI-LS.cfg
index c152eb19..3b5a02b5 100644
--- a/GameData/SXT/Patches/ModCompatibility/USI/USI-LS.cfg
+++ b/GameData/SXT/Patches/ModCompatibility/USI/USI-LS.cfg
@@ -5,18 +5,30 @@
 {
 	MODULE
 	{
-		name = ModuleLifeSupport
+		name = USI_SwapController
+	}
+	MODULE
+	{
+		name = USI_SwappableBay
+		bayName = Bay 1
+		moduleIndex = 0
+	}
+	MODULE
+	{
+		name = USI_Converter
+		UseSpecialistBonus = false
 	}
-
 	MODULE 
 	{
-		name = ModuleHabitation
-		BaseKerbalMonths = 24.6
-		CrewCapacity = 6
-		BaseHabMultiplier = 0
+		name = USILS_HabitationSwapOption
 		ConverterName = Habitat
 		StartActionName = Start Habitat
 		StopActionName = Stop Habitat		
+
+		BaseKerbalMonths = 24.6
+		CrewCapacity = 6
+		BaseHabMultiplier = 0
+
 		INPUT_RESOURCE
 		{
 			ResourceName = ElectricCharge
@@ -30,18 +42,29 @@
 {
 	MODULE
 	{
-		name = ModuleLifeSupport
+		name = USI_SwapController
 	}
-
 	MODULE
 	{
-		name = ModuleLifeSupportRecycler
-		CrewCapacity = 4
-		RecyclePercent = .73
+		name = USI_SwappableBay
+		bayName = Bay 1
+		moduleIndex = 0
+	}
+	MODULE
+	{
+		name = USI_Converter
+		UseSpecialistBonus = false
+	}
+	MODULE
+	{
+		name = USILS_LifeSupportRecyclerSwapOption
 		ConverterName = Life Support
-		tag = Life Support
 		StartActionName = Start Life Support
 		StopActionName = Stop Life Support
+
+		CrewCapacity = 4
+		RecyclePercent = .73
+
 		INPUT_RESOURCE
 		{
 			ResourceName = ElectricCharge
@@ -55,18 +78,29 @@
 {
 	MODULE
 	{
-		name = ModuleLifeSupport
+		name = USI_SwapController
 	}
-
 	MODULE
 	{
-		name = ModuleLifeSupportRecycler
-		CrewCapacity = 1
-		RecyclePercent = .65
+		name = USI_SwappableBay
+		bayName = Bay 1
+		moduleIndex = 0
+	}
+	MODULE
+	{
+		name = USI_Converter
+		UseSpecialistBonus = false
+	}
+	MODULE
+	{
+		name = USILS_LifeSupportRecyclerSwapOption
 		ConverterName = Life Support
-		tag = Life Support
 		StartActionName = Start Life Support
 		StopActionName = Stop Life Support
+
+		CrewCapacity = 1
+		RecyclePercent = .65
+
 		INPUT_RESOURCE
 		{
 			ResourceName = ElectricCharge
@@ -80,18 +114,30 @@
 {
 	MODULE
 	{
-		name = ModuleLifeSupport
+		name = USI_SwapController
+	}
+	MODULE
+	{
+		name = USI_SwappableBay
+		bayName = Bay 1
+		moduleIndex = 0
+	}
+	MODULE
+	{
+		name = USI_Converter
+		UseSpecialistBonus = false
 	}
-
 	MODULE 
 	{
-		name = ModuleHabitation
-		BaseKerbalMonths = 72
-		CrewCapacity = 8
-		BaseHabMultiplier = 0
+		name = USILS_HabitationSwapOption
 		ConverterName = Habitation
 		StartActionName = Start Habitation
 		StopActionName = Stop Habitation
+
+		BaseKerbalMonths = 72
+		CrewCapacity = 8
+		BaseHabMultiplier = 0
+
 		INPUT_RESOURCE
 		{
 			ResourceName = ElectricCharge
@@ -105,18 +151,30 @@
 {
 	MODULE
 	{
-		name = ModuleLifeSupport
+		name = USI_SwapController
+	}
+	MODULE
+	{
+		name = USI_SwappableBay
+		bayName = Bay 1
+		moduleIndex = 0
+	}
+	MODULE
+	{
+		name = USI_Converter
+		UseSpecialistBonus = false
 	}
-
 	MODULE 
 	{
-		name = ModuleHabitation
-		BaseKerbalMonths = 34
-		CrewCapacity = 8
-		BaseHabMultiplier = 0
+		name = USILS_HabitationSwapOption
 		ConverterName = Habitation
 		StartActionName = Start Habitation
 		StopActionName = Stop Habitation
+
+		BaseKerbalMonths = 34
+		CrewCapacity = 8
+		BaseHabMultiplier = 0
+
 		INPUT_RESOURCE
 		{
 			ResourceName = ElectricCharge
@@ -130,18 +188,30 @@
 {
 	MODULE
 	{
-		name = ModuleLifeSupport
+		name = USI_SwapController
+	}
+	MODULE
+	{
+		name = USI_SwappableBay
+		bayName = Bay 1
+		moduleIndex = 0
+	}
+	MODULE
+	{
+		name = USI_Converter
+		UseSpecialistBonus = false
 	}
-
 	MODULE 
 	{
-		name = ModuleHabitation
-		BaseKerbalMonths = 10.5
-		CrewCapacity = 2
-		BaseHabMultiplier = 0
+		name = USILS_HabitationSwapOption
 		ConverterName = Habitation
 		StartActionName = Start Habitation
 		StopActionName = Stop Habitation
+
+		BaseKerbalMonths = 10.5
+		CrewCapacity = 2
+		BaseHabMultiplier = 0
+
 		INPUT_RESOURCE
 		{
 			ResourceName = ElectricCharge
@@ -155,18 +225,30 @@
 {
 	MODULE
 	{
-		name = ModuleLifeSupport
+		name = USI_SwapController
 	}
-
 	MODULE
 	{
-		name = ModuleHabitation
-		BaseKerbalMonths = 21
-		CrewCapacity = 4
-		BaseHabMultiplier = 0
+		name = USI_SwappableBay
+		bayName = Bay 1
+		moduleIndex = 0
+	}
+	MODULE
+	{
+		name = USI_Converter
+		UseSpecialistBonus = false
+	}
+	MODULE 
+	{
+		name = USILS_HabitationSwapOption
 		ConverterName = Habitation
 		StartActionName = Start Habitation
 		StopActionName = Stop Habitation
+
+		BaseKerbalMonths = 21
+		CrewCapacity = 4
+		BaseHabMultiplier = 0
+
 		INPUT_RESOURCE
 		{
 			ResourceName = ElectricCharge
@@ -178,53 +260,54 @@
 //HabRing
 @PART[SXTRotatingMk2Ring]:NEEDS[USILifeSupport]
 {
-
 	MODULE
 	{
-		name = ModuleLifeSupport
+		name = USI_SwapController
+		ResourceCosts = SpecializedParts,60,MaterialKits,300,ElectricCharge,300
 	}
-	
-	MODULE	
+	MODULE
 	{
-		name = ModuleHabitation
-		BaseKerbalMonths = 4.2
-		CrewCapacity = 8
-		BaseHabMultiplier = 2.1
+		name = USI_SwappableBay
+		bayName = Bay 1
+		moduleIndex = 0
+	}
+	MODULE
+	{
+		name = USI_Converter
+		UseSpecialistBonus = false
+	}
+	MODULE 
+	{
+		name = USILS_HabitationSwapOption
 		ConverterName = Hab-Common
 		StartActionName = Start Hab-Common
 		StopActionName = Stop Hab-Common
+
+		BaseKerbalMonths = 4.2
+		CrewCapacity = 8
+		BaseHabMultiplier = 2.1
+
 		INPUT_RESOURCE
 		{
 			ResourceName = ElectricCharge
 			Ratio = 1.05
 		}
 	}
-}
-
-//More HabRing
-@PART[SXTRotatingMk2Ring]:NEEDS[USILifeSupport,KolonyTools]
-{
 	MODULE
 	{
-		name = ModuleHabitation
-		BaseKerbalMonths = 71.4
-		CrewCapacity = 8
-		BaseHabMultiplier = 0
+		name = USILS_HabitationSwapOption
 		ConverterName = Hab-Quarters
 		StartActionName = Start Hab-Quarters
 		StopActionName = Stop Hab-Quarters
+
+		BaseKerbalMonths = 71.4
+		CrewCapacity = 8
+		BaseHabMultiplier = 0
+
 		INPUT_RESOURCE
 		{
 			ResourceName = ElectricCharge
 			Ratio = 1.785	
 		}
 	}
-
-	MODULE
-	{
-		name = ModuleSwappableConverter
-		bayName = C1
-		typeName = Config
-		ResourceCosts = SpecializedParts,60,MaterialKits,300,ElectricCharge,300		
-	}
 }