diff --git a/common/component_templates/RG_interdictor_parts.txt b/common/component_templates/RG_interdictor_parts.txt
index 97573b4..07dd8e8 100644
--- a/common/component_templates/RG_interdictor_parts.txt
+++ b/common/component_templates/RG_interdictor_parts.txt
@@ -23,6 +23,8 @@ utility_component_template = {
 		RG_graygoo_Buff
 		RG_graygoo_mothership
 		RG_graygoo_icebreaker_interdictor
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
 	}
 	upgrades_to = "RG_Interdictor_FUSION_REACTOR"
 	ai_weight = {
@@ -55,6 +57,8 @@ utility_component_template = {
 		RG_graygoo_Buff
 		RG_graygoo_mothership
 		RG_graygoo_icebreaker_interdictor
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
 	}
 	upgrades_to = "RG_Interdictor_COLD_FUSION_REACTOR"
 	ai_weight = {
@@ -87,6 +91,8 @@ utility_component_template = {
 		RG_graygoo_Buff
 		RG_graygoo_mothership
 		RG_graygoo_icebreaker_interdictor
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
 	}
 	upgrades_to = "RG_Interdictor_ANTIMATTER_REACTOR"
 	ai_weight = {
@@ -119,6 +125,8 @@ utility_component_template = {
 		RG_graygoo_Buff
 		RG_graygoo_mothership
 		RG_graygoo_icebreaker_interdictor
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
 	}
 	upgrades_to = "RG_Interdictor_ZERO_POINT_REACTOR"
 	ai_weight = {
diff --git a/common/global_ship_designs/!_RG_event_ship_designs_distant_stars_overwrite.txt b/common/global_ship_designs/!_RG_event_ship_designs_distant_stars_overwrite.txt
index 495d432..d6ed358 100644
--- a/common/global_ship_designs/!_RG_event_ship_designs_distant_stars_overwrite.txt
+++ b/common/global_ship_designs/!_RG_event_ship_designs_distant_stars_overwrite.txt
@@ -336,292 +336,60 @@ ship_design = {
 	ship_size = nanite_space_dragon_baby
 	is_event_design = yes
 	section = {
-		template = "RG_nanite_space_dragon_baby_key"
+		template = "nanite_space_dragon_baby_key"
 		slot = "mid"
 		component = {
-			slot = "PLANET_KILLER_GUN_01"
-			template = "RG_PLANET_KILLER"
-		}
-		component = {
-			slot = "TITAN_01"
-			template = "GRAY_BEAM_STATIC_EX"
-		}
-		component = {
-			slot = "TITAN_02"
-			template = "GRAY_BEAM_STATIC_EX"
-		}
-		component = {
-			slot = "TITAN_03"
-			template = "GRAY_BEAM_STATIC_EX"
-		}
-		component = {
-			slot = "TITAN_04"
-			template = "GRAY_BEAM_STATIC_EX"
-		}
-		component = {
-			slot = "TITAN_05"
-			template = "GRAY_BEAM_STATIC_EX"
-		}
-		component = {
-			slot = "TITAN_06"
-			template = "GRAY_BEAM_STATIC_EX"
-		}
-		component = {
-			slot = "EXTRA_LARGE_01"
+			slot = "PRIMARY_GUN_01"
 			template = "GRAY_BEAM_STATIC_X"
 		}
 		component = {
-			slot = "EXTRA_LARGE_02"
-			template = "GRAY_BEAM_STATIC_X"
+			slot = "SECONDARY_GUN_01"
+			template = "SMALL_GRAY_WEAPON_LANCE"
 		}
 		component = {
-			slot = "EXTRA_LARGE_03"
-			template = "GRAY_BEAM_STATIC_X"
+			slot = "SECONDARY_GUN_02"
+			template = "SMALL_GRAY_WEAPON_LANCE"
 		}
 		component = {
-			slot = "EXTRA_LARGE_04"
-			template = "GRAY_BEAM_STATIC_X"
+			slot = "SECONDARY_GUN_03"
+			template = "SMALL_GRAY_WEAPON_LANCE"
 		}
 		component = {
-			slot = "EXTRA_LARGE_05"
-			template = "GRAY_BEAM_STATIC_X"
+			slot = "SECONDARY_GUN_04"
+			template = "SMALL_GRAY_WEAPON_LANCE"
 		}
 		component = {
-			slot = "EXTRA_LARGE_06"
-			template = "GRAY_BEAM_STATIC_X"
+			slot = "SECONDARY_GUN_05"
+			template = "SMALL_GRAY_WEAPON_LANCE"
 		}
 		component = {
-			slot = "EXTRA_LARGE_07"
-			template = "GRAY_BEAM_STATIC_X"
+			slot = "SECONDARY_GUN_06"
+			template = "SMALL_GRAY_WEAPON_LANCE"
 		}
 		component = {
-			slot = "EXTRA_LARGE_08"
-			template = "GRAY_BEAM_STATIC_X"
+			slot = "SECONDARY_GUN_07"
+			template = "SMALL_GRAY_WEAPON_LANCE"
 		}
 		component = {
-			slot = "TORPEDO_01"
-			template = "RG_ENERGY_MISSILE"
+			slot = "SECONDARY_GUN_08"
+			template = "SMALL_GRAY_WEAPON_LANCE"
 		}
 		component = {
-			slot = "TORPEDO_02"
-			template = "RG_ENERGY_MISSILE"
-		}
-		component = {
-			slot = "TORPEDO_03"
-			template = "RG_ENERGY_MISSILE"
-		}
-		component = {
-			slot = "TORPEDO_04"
-			template = "RG_ENERGY_MISSILE"
-		}
-		component = {
-			slot = "TORPEDO_05"
-			template = "RG_ENERGY_MISSILE"
-		}
-		component = {
-			slot = "TORPEDO_06"
-			template = "RG_ENERGY_MISSILE"
-		}
-		component = {
-			slot = "TORPEDO_07"
-			template = "RG_ENERGY_MISSILE"
-		}
-		component = {
-			slot = "TORPEDO_08"
-			template = "RG_ENERGY_MISSILE"
-		}
-		component = {
-			slot = "LARGE_GUN_01"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_02"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_03"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_04"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_05"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_06"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_07"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_08"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_09"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_10"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_11"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_12"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_13"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_14"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_15"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_16"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_17"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_18"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_19"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_20"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_21"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_22"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_23"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_24"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_25"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_26"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_27"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_28"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_29"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_30"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_31"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_32"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_33"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_34"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_35"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_36"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "PD_01"
+			slot = "TERTIARY_GUN_01"
 			template = "RG_FLAK_BATTERY"
 		}
 		component = {
-			slot = "PD_02"
+			slot = "TERTIARY_GUN_02"
 			template = "RG_FLAK_BATTERY"
 		}
 		component = {
-			slot = "PD_03"
+			slot = "TERTIARY_GUN_03"
 			template = "RG_FLAK_BATTERY"
 		}
 		component = {
-			slot = "PD_04"
+			slot = "TERTIARY_GUN_04"
 			template = "RG_FLAK_BATTERY"
 		}
-		component = {
-			slot = "PD_05"
-			template = "RG_FLAK_BATTERY"
-		}
-		component = {
-			slot = "PD_06"
-			template = "RG_FLAK_BATTERY"
-		}
-		component = {
-			slot = "PD_07"
-			template = "RG_FLAK_BATTERY"
-		}
-		component = {
-			slot = "PD_08"
-			template = "RG_FLAK_BATTERY"
-		}
-		component = {
-			slot = "PD_09"
-			template = "RG_FLAK_BATTERY"
-		}
-		component = {
-			slot = "PD_10"
-			template = "RG_FLAK_BATTERY"
-		}
-		component = {
-			slot = "PD_11"
-			template = "RG_FLAK_PHOENIX"
-		}
-		component = {
-			slot = "PD_12"
-			template = "RG_FLAK_PHOENIX"
-		}
 		component = {
 			slot = "LARGE_UTILITY_1"
 			template = "HUGE_GRAY_MIX_ARMOR"
@@ -638,217 +406,17 @@ ship_design = {
 			slot = "LARGE_UTILITY_4"
 			template = "HUGE_GRAY_MIX_ARMOR"
 		}
-		component = {
-			slot = "LARGE_UTILITY_5"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_6"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_7"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_8"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_9"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_10"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_11"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_12"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_13"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_14"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_15"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_16"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_17"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_18"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_19"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_20"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_21"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_22"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_23"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_24"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_25"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_26"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_27"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_28"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_29"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_30"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_31"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_32"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_33"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_34"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_35"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_36"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_37"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_38"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_39"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_40"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_41"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_42"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_43"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_44"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_45"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_46"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_47"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_48"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
 		component = {
 			slot = "AUX_UTILITY_1"
 			template = "RG_AUTO_REPAIR"
 		}
 		component = {
 			slot = "AUX_UTILITY_2"
-			template = "RG_AUTO_REPAIR"
-		}
-		component = {
-			slot = "AUX_UTILITY_3"
 			template = "RG_ARMOR_BOOSTER"
 		}
-		component = {
-			slot = "AUX_UTILITY_4"
-			template = "RG_ARMOR_BOOSTER"
-		}
-		component = {
-			slot = "AUX_UTILITY_5"
-			template = "RG_ENIGMATIC_SCHEDULER"
-		}
-		component = {
-			slot = "AUX_UTILITY_6"
-			template = "RG_ENIGMATIC_SCHEDULER"
-		}
-		component = {
-			slot = "AUX_UTILITY_7"
-			template = "RG_ENGINE_BOOSTER"
-		}
-		component = {
-			slot = "AUX_UTILITY_8"
-			template = "RG_ENGINE_BOOSTER"
-		}
 	}
 	required_component = "GUARDIAN_DRIVE"
-	required_component = "COMBAT_COMPUTER_ARTILLERY_DEFAULT"
+	required_component = "RG_COMBAT_COMPUTER_battle"
 	required_component = "GUARDIAN_PROPULSION"
 	required_component = "GUARDIAN_SENSORS"
 }