diff --git a/TechChanges.txt b/TechChanges.txt
index 844e42bfea5..948dae07c0d 100644
--- a/TechChanges.txt
+++ b/TechChanges.txt
@@ -11,4 +11,22 @@ The following changes are in effect from vanilla techs. This does not include ad
 - BBA anti-ship missiles have been delayed from 1017 to 1023
 - Early ICBMs have been delayed from 1017 to 1023, and a new "Advanced Short Range Rocket" has been added in 1017
 - NSB super-heavy cannon 0.5 added as a 1007 tech
-- Increased naval output of concentrated industry
\ No newline at end of file
+- Increased naval output of concentrated industry
+
+AAT UPDATE:
+- Removed +50% IC and reliability reduction of super-heavy turrets 
+- Super heavy support companies boost armor variant armor value by +15% and their own breakthrough by +15%
+- Increased entrenchment of engineers to be close to pre-AAT levels
+- Increased Rocket Engine thrust to pre-AAT levels and increased their speed as well
+- Reduced Great War Truck hardness by 2.5%
+- Increased signals initiative back to 20% (pre-AAT levels)
+- Added a "Commandeer Civilian Trucks" decision, similar to the one for trains
+- Reverted all nerfs to mines to pre-AAT levels, added a new nerf decreasing naval supremacy boost by 50% (from 100%)
+- Did not implement many of AAT's tank chassis changes. Some were still implemented
+- Did not implement AAT's changes to tank armor and engine upgrades with NSB
+- Added "Heavy AA" tank modules, at double the production and resource cost and a size category larger, with double stats aside from hard attack and piercing
+- SPAA gets buffs to air attack from small AA techs
+- Pioneers are not exclusive with engineers
+- Added close support gun secondary turret
+- Reverted terrain nerfs to SH support companies
+- Made some Heavy Tank MIO traits heavy-exclusive (ie not applying to super heavies) to further differentiate the new Super Heavy MIO
\ No newline at end of file
diff --git a/changelog.txt b/changelog.txt
index 3bff2bccb87..0e001e61a3d 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,4 +1,57 @@
-🔥 “The Way of Fire” 2.2.0.1 🔥
+🔥 “The Way of Fire” 2.2.1 🔥
+✢ Additions:
+	- Full compatibility ensured with Arms Against Tyranny.
+	- Added female generic griffon Republican general portraits.
+	- Added a new cosmetic tag for the Titanic Realm, and the ability for them to research Jagers.
+	- New victory points and supply hubs have been added in the hillpony region.
+	- Added heavy anti-air and close support gun tank modules.
+	- Implemented a decision to commandeer civilian trucks.
+	- Added options to strengthen Roam, Talonsvaal and Lan Kir.
+	- The Realm of Kiria can now intervene against expansionist Roam, Talonsvaal and Lan Kir.
+	- The Republic of Kiria can now gain war goals against their western neighbours.
+
+✢ Changes:
+	- The land doctrine GUI has been reorganised.
+	- Improved the custom event background.
+	- Replaced the background image for the Kirian technology tree.
+	- Placeholder wars from Roam, Talonsvaal and Lan Kir now notify the player of their intentions.
+	- Replaced Pharynx's Armour Officer trait with Veteran Jager trait.
+	- Scientific Astrology now also provides better protection against resistance activities.
+	- Super-heavy turrets no longer have a reliability reduction and a production cost increase.
+	- Increased Rocket Engine thrust to pre-AAT levels and increased their speed as well.
+	- Increased Engineer Company entrenchment to pre-AAT levels.
+	- Increased Signal Company initiative to pre-AAT level.
+	- Great War Truck's hardness has been reduced.
+	- SPAA will now receive buffs from small AA technologies.
+	- Consumer Goods modifiers have been rebalanced.
+	- Pioneer and Engineer companies' mutual exclusivity has been removed.
+	- Talarayi's flag has been reworked.
+
+✢ Fixes:
+	- Corrected AI weight for Wingbardy which could result in them not invading Francistria, Talouse and Arantiga.
+	- AI should be more willing to take islands in peace deals even if they don't neighbour them.
+	- Implemented a proper AI template for marines.
+	- Changeling Fragrance's political screen should no longer break upon reloading a save.
+	- Fixed an issue where Changeling Fragrance could produce too many infiltrators on a weekly basis.
+	- Corrected an issue where several characters could be active in both Changeling Lands and Free Changeling Hives.
+	- Fixed magical medium/heavy cannon tank modules being available on light tanks.
+	- Fixed an issue where Sicameon would not get a designer despite saying otherwise.
+	- Corrected an issue where Kirian pirate raid events didn't trigger properly.
+	- Various minor issues with Kirian content have been corrected.
+	- Corrected many issues with starting naval and aircraft forces.
+	- Fixed the joint focus tree in the River Federation.
+	- Puppeting the Dread League as Viira will now remove all of their ideas.
+	- Tobuck's decisions for white peace now work properly.
+	- An issue with Zarantia's Tatzelwurm state modifier has been fixed.
+	- Fixed ELF's Manehattan liberation news event never firing.
+	- Corrected issues with various strategy plans.
+	- Starting production lines have been made matching regardless of DLC ownership.
+	- Miscellaneous bugfixes and improvements.
+	- Miscellaneous localisation fixes.
+
+
+
+🔥 “The Way of Fire” 2.2.0.1 🔥
 ✢ Additions:
 	- New loading screen.
 	- Replaced the vanilla event background with a custom one.
diff --git a/common/abilities/SWE_abilities.txt b/common/abilities/SWE_abilities.txt
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/common/abilities/generic_leader_abilities.txt b/common/abilities/generic_leader_abilities.txt
index 2587fdbc97b..ecd9678060c 100644
--- a/common/abilities/generic_leader_abilities.txt
+++ b/common/abilities/generic_leader_abilities.txt
@@ -200,7 +200,7 @@ ability = {
 		}
 
 		unit_modifiers = {
-			paratrooper_count_per_plane = 1.0
+			paratrooper_weight_factor = -0.10
 			paradrop_organization_factor = 2.0
 			paratrooper_aa_defense = 0.5
 		}
diff --git a/common/aces/00_aces.txt b/common/aces/00_aces.txt
index 4fa0be122e5..3fbd2d9324d 100644
--- a/common/aces/00_aces.txt
+++ b/common/aces/00_aces.txt
@@ -3,7 +3,7 @@
 modifiers = {
 	### Fighters ###
 	fighter_good = {
-		type = { fighter interceptor }
+		type = { fighter heavy_fighter interceptor }
 		chance = 0.9
 		effect = {
 			air_attack_factor = 0.03
@@ -12,7 +12,7 @@ modifiers = {
 		}
 	}
 	fighter_unique = {
-		type = { fighter interceptor }
+		type = { fighter heavy_fighter interceptor }
 		chance = 0.4
 		effect = {
 			air_attack_factor = 0.06
@@ -21,7 +21,7 @@ modifiers = {
 		}
 	}
 	fighter_genius = {
-		type = { fighter interceptor }
+		type = { fighter heavy_fighter interceptor }
 		chance = 0.05
 		effect = {
 			air_attack_factor = 0.1
diff --git a/common/ai_equipment/CHN_tank.txt b/common/ai_equipment/CHN_tank.txt
index 6a7f4d2e358..961b48850e0 100644
--- a/common/ai_equipment/CHN_tank.txt
+++ b/common/ai_equipment/CHN_tank.txt
@@ -2200,6 +2200,408 @@ CHN_super_heavy_tanks = {
 			armor_skirts
 		}
 	}
+	improved_super_heavy_tank_default = {
+		priority = {
+			factor = 10
+			modifier = { 
+				has_government = fascism
+				factor = 5
+			}
+			
+		}
+		enable = {
+			has_tech = super_heavy_tank_chassis_b
+		}
+
+		target_variant = {
+			match_value = 1000
+			type = super_heavy_tank_chassis_2
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+						tank_super_heavy_cannon_2 
+						tank_super_heavy_cannon
+					} 
+				}
+				turret_type_slot = tank_super_heavy_four_man_tank_turret
+				suspension_type_slot = tank_interleaved_suspension
+				armor_type_slot = tank_cast_armor
+				engine_type_slot = tank_gas_turbine_engine
+				special_type_slot_1 = tank_radio_module
+				special_type_slot_2 = secondary_turret_hmg
+				special_type_slot_3 = secondary_turret_hmg
+				special_type_slot_4 = sloped_armor
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 14
+				tank_nsb_armor_upgrade = {
+					base = 12
+					modifier = {
+						add = 5
+						has_war = yes
+					}
+					modifier = {
+						any_enemy_country = {
+							is_major = yes
+						}
+						add = 5
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			
+			tank_high_velocity_cannon_2 
+			tank_high_velocity_cannon_3 
+			tank_heavy_cannon 
+			tank_heavy_cannon_2 
+			tank_heavy_cannon_3 
+			tank_super_heavy_cannon
+			tank_super_heavy_cannon_2 
+			tank_super_heavy_four_man_tank_turret
+			tank_interleaved_suspension
+			tank_cast_armor
+			tank_gas_turbine_engine
+			tank_petrol_electric_engine
+			tank_radio_4
+			tank_radio_3
+			tank_radio_2
+			tank_radio_1
+			secondary_turret_hmg
+			sloped_armor
+		}
+	}
+	advanced_super_heavy_tank_default = {
+		priority = {
+			factor = 10
+			modifier = { 
+				has_government = fascism
+				factor = 5
+			}
+			
+		}
+		enable = {
+			has_tech = super_heavy_tank_chassis_c
+		}
+
+		target_variant = {
+			match_value = 1000
+			type = super_heavy_tank_chassis_3
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+						tank_super_heavy_cannon_3
+						tank_super_heavy_cannon_2
+					} 
+				}
+				turret_type_slot = tank_super_heavy_four_man_tank_turret
+				suspension_type_slot = tank_interleaved_suspension
+				armor_type_slot = tank_cast_armor
+				engine_type_slot = tank_gas_turbine_engine
+				special_type_slot_1 = tank_radio_module
+				special_type_slot_2 = secondary_turret_hmg
+				special_type_slot_3 = secondary_turret_hmg
+				special_type_slot_4 = sloped_armor
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 16
+				tank_nsb_armor_upgrade = {
+					base = 14
+					modifier = {
+						add = 5
+						has_war = yes
+					}
+					modifier = {
+						any_enemy_country = {
+							is_major = yes
+						}
+						add = 5
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			
+			tank_high_velocity_cannon_2 
+			tank_high_velocity_cannon_3 
+			tank_heavy_cannon 
+			tank_heavy_cannon_2 
+			tank_heavy_cannon_3 
+			tank_super_heavy_cannon
+			tank_super_heavy_cannon_2 
+			tank_super_heavy_cannon_3
+			tank_super_heavy_four_man_tank_turret
+			tank_interleaved_suspension
+			tank_cast_armor
+			tank_gas_turbine_engine
+			tank_petrol_electric_engine
+			tank_radio_5
+			tank_radio_4
+			tank_radio_3
+			tank_radio_2
+			tank_radio_1
+			secondary_turret_hmg
+			sloped_armor
+		}
+	}
+}
+
+
+
+
+CHN_modern_tanks = {
+	category = land
+
+	blocked_for = {}
+
+	available_for = {CHN CCN}
+
+	roles = {
+		land_modern_tank
+	}
+
+	priority = {
+		factor = 200
+		modifier = {
+			num_of_factories < 100
+			factor = 0
+		}
+	}
+
+	basic_modern_tank_default = { 
+		priority = {
+			factor = 100
+		}
+
+		target_variant = {
+			match_value = 1000
+			type = modern_tank_chassis_1
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+						tank_heavy_cannon_3 
+						tank_high_velocity_cannon_3 
+						tank_heavy_cannon_2 
+						tank_high_velocity_cannon_2 
+						tank_heavy_cannon 
+					} 
+				}
+				turret_type_slot = tank_modern_tank_turret
+				suspension_type_slot = tank_torsion_bar_suspension
+				armor_type_slot = tank_welded_armor
+				engine_type_slot = tank_gasoline_engine
+				special_type_slot_1 = tank_radio_module
+				special_type_slot_2 = smoke_launchers
+				special_type_slot_3 = armor_skirts
+				special_type_slot_4 = sloped_armor
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 14
+				tank_nsb_armor_upgrade = {
+					base = 4
+					modifier = {
+						add = 4
+						has_war = yes
+					}
+					modifier = {
+						any_enemy_country = {
+							is_major = yes
+						}
+						add = 3
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			
+			tank_high_velocity_cannon_2 
+			tank_high_velocity_cannon_3 
+			tank_heavy_cannon 
+			tank_heavy_cannon_2 
+			tank_heavy_cannon_3 
+			tank_modern_tank_turret
+			tank_torsion_bar_suspension
+			tank_welded_armor
+			tank_gas_turbine_engine
+			tank_gasoline_engine
+			sloped_armor
+			smoke_launchers
+			armor_skirts
+			stabilizer
+			tank_radio_3
+			tank_radio_2
+			tank_radio_1
+		}
+	}
+	
+	improved_modern_tank_default = {
+		priority = {
+			factor = 100
+			modifier = { 
+				has_tech = main_battle_tank_chassis_c 
+				factor = 0 #let's not waste XP here
+			}
+		}
+
+		target_variant = {
+			match_value = 2000
+			type = modern_tank_chassis_2
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+						tank_heavy_cannon_4
+						tank_high_velocity_cannon_4
+						tank_heavy_cannon_3 
+						tank_high_velocity_cannon_3 
+						tank_heavy_cannon_2 
+						tank_high_velocity_cannon_2 
+						tank_heavy_cannon 
+					} 
+				}
+				turret_type_slot = tank_modern_tank_turret
+				suspension_type_slot = tank_torsion_bar_suspension
+				armor_type_slot = tank_cast_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = tank_radio_module
+				special_type_slot_2 = smoke_launchers
+				special_type_slot_3 = auto_loader
+				special_type_slot_4 = sloped_armor
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 14
+				tank_nsb_armor_upgrade = {
+					base = 6
+					modifier = {
+						add = 3
+						has_war = yes
+					}
+					modifier = {
+						any_enemy_country = {
+							is_major = yes
+						}
+						add = 2
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_heavy_cannon 
+			tank_heavy_cannon_2 
+			tank_heavy_cannon_3 
+			tank_heavy_cannon_4
+			tank_heavy_cannon_5
+			tank_modern_tank_turret
+			tank_torsion_bar_suspension
+			tank_cast_armor
+			tank_diesel_engine
+			sloped_armor
+			smoke_launchers
+			auto_loader
+			easy_maintenance_2
+			easy_maintenance
+			stabilizer
+			stabilizer_2
+			tank_radio_5
+			tank_radio_4
+			tank_radio_3
+			tank_radio_2
+			tank_radio_1
+		}
+	}
+
+	advanced_modern_tank_default = {
+		priority = {
+			factor = 100
+		}
+
+		target_variant = {
+			match_value = 3000
+			type = modern_tank_chassis_3
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+						tank_heavy_cannon_5
+						tank_high_velocity_cannon_5
+						tank_heavy_cannon_4
+						tank_high_velocity_cannon_4
+						tank_heavy_cannon_3 
+						tank_high_velocity_cannon_3 
+						tank_heavy_cannon_2 
+						tank_high_velocity_cannon_2 
+						tank_heavy_cannon 
+					} 
+				}
+				turret_type_slot = tank_modern_tank_turret
+				suspension_type_slot = tank_hydropneumatic_suspension
+				armor_type_slot = tank_composite_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = tank_radio_module
+				special_type_slot_2 = smoke_launchers
+				special_type_slot_3 = {
+					any_of = {
+						easy_maintenance_2
+						easy_maintenance
+						stabilizer_3
+						auto_loader
+						gun_computer
+						surface_to_air_missiles
+						anti_tank_guided_missiles
+					}
+				}
+				special_type_slot_4 = sloped_armor
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 16
+				tank_nsb_armor_upgrade = {
+					base = 8
+					modifier = {
+						add = 3
+						has_war = yes
+					}
+					modifier = {
+						any_enemy_country = {
+							is_major = yes
+						}
+						add = 2
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_heavy_cannon 
+			tank_heavy_cannon_2 
+			tank_heavy_cannon_3 
+			tank_heavy_cannon_4
+			tank_heavy_cannon_5
+			tank_modern_tank_turret
+			tank_torsion_bar_suspension
+			tank_hydropneumatic_suspension
+			tank_cast_armor
+			tank_composite_armor
+			gun_computer
+			surface_to_air_missiles
+			anti_tank_guided_missiles
+			tank_diesel_engine
+			sloped_armor
+			smoke_launchers
+			easy_maintenance_2
+			easy_maintenance
+			stabilizer
+			stabilizer_2
+			stabilizer_3
+			auto_loader
+			tank_radio_5
+			tank_radio_4
+			tank_radio_3
+			tank_radio_2
+			tank_radio_1
+		}
+	}
 }
 
 CHN_modern_tank_destroyer = {
diff --git a/common/ai_equipment/EQS_naval.txt b/common/ai_equipment/EQS_naval.txt
index dae2b835d08..8538c8544d0 100644
--- a/common/ai_equipment/EQS_naval.txt
+++ b/common/ai_equipment/EQS_naval.txt
@@ -1051,10 +1051,7 @@ EQS_naval_light_AA_cruiser = {
 		factor = 50
 		modifier = {
 			factor = 20
-			OR = {
-				has_war_with = USA
-				has_war_with = JAP
-			}
+			has_war_with = HIP
 		}
 	}
 	cruiser_light_AA = {
diff --git a/common/ai_equipment/EQS_tank.txt b/common/ai_equipment/EQS_tank.txt
index edcd6df8658..c317e88a00f 100644
--- a/common/ai_equipment/EQS_tank.txt
+++ b/common/ai_equipment/EQS_tank.txt
@@ -2321,8 +2321,419 @@ EQS_super_heavy_tanks = {
 			sloped_armor
 		}
 	}
+	improved_super_heavy_tank_default = {
+		priority = {
+			factor = 10
+			modifier = { 
+				has_government = fascism
+				factor = 5
+			}
+			
+		}
+		enable = {
+			has_tech = super_heavy_tank_chassis_b
+		}
+
+		target_variant = {
+			match_value = 1000
+			type = super_heavy_tank_chassis_2
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+						tank_super_heavy_cannon_2 
+						tank_super_heavy_cannon
+					} 
+				}
+				turret_type_slot = tank_super_heavy_four_man_tank_turret
+				suspension_type_slot = tank_interleaved_suspension
+				armor_type_slot = tank_cast_armor
+				engine_type_slot = tank_gas_turbine_engine
+				special_type_slot_1 = tank_radio_module
+				special_type_slot_2 = secondary_turret_hmg
+				special_type_slot_3 = secondary_turret_hmg
+				special_type_slot_4 = sloped_armor
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 14
+				tank_nsb_armor_upgrade = {
+					base = 12
+					modifier = {
+						add = 5
+						has_war = yes
+					}
+					modifier = {
+						any_enemy_country = {
+							is_major = yes
+						}
+						add = 5
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			
+			tank_high_velocity_cannon_2 
+			tank_high_velocity_cannon_3 
+			tank_heavy_cannon 
+			tank_heavy_cannon_2 
+			tank_heavy_cannon_3 
+			tank_super_heavy_cannon
+			tank_super_heavy_cannon_2 
+			tank_super_heavy_four_man_tank_turret
+			tank_interleaved_suspension
+			tank_cast_armor
+			tank_gas_turbine_engine
+			tank_petrol_electric_engine
+			tank_radio_4
+			tank_radio_3
+			tank_radio_2
+			tank_radio_1
+			secondary_turret_hmg
+			sloped_armor
+		}
+	}
+	advanced_super_heavy_tank_default = {
+		priority = {
+			factor = 10
+			modifier = { 
+				has_government = fascism
+				factor = 5
+			}
+			
+		}
+		enable = {
+			has_tech = super_heavy_tank_chassis_c
+		}
+
+		target_variant = {
+			match_value = 1000
+			type = super_heavy_tank_chassis_3
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+						tank_super_heavy_cannon_3
+						tank_super_heavy_cannon_2
+					} 
+				}
+				turret_type_slot = tank_super_heavy_four_man_tank_turret
+				suspension_type_slot = tank_interleaved_suspension
+				armor_type_slot = tank_cast_armor
+				engine_type_slot = tank_gas_turbine_engine
+				special_type_slot_1 = tank_radio_module
+				special_type_slot_2 = secondary_turret_hmg
+				special_type_slot_3 = secondary_turret_hmg
+				special_type_slot_4 = sloped_armor
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 16
+				tank_nsb_armor_upgrade = {
+					base = 14
+					modifier = {
+						add = 5
+						has_war = yes
+					}
+					modifier = {
+						any_enemy_country = {
+							is_major = yes
+						}
+						add = 5
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			
+			tank_high_velocity_cannon_2 
+			tank_high_velocity_cannon_3 
+			tank_heavy_cannon 
+			tank_heavy_cannon_2 
+			tank_heavy_cannon_3 
+			tank_super_heavy_cannon
+			tank_super_heavy_cannon_2 
+			tank_super_heavy_cannon_3
+			tank_super_heavy_four_man_tank_turret
+			tank_interleaved_suspension
+			tank_cast_armor
+			tank_gas_turbine_engine
+			tank_petrol_electric_engine
+			tank_radio_5
+			tank_radio_4
+			tank_radio_3
+			tank_radio_2
+			tank_radio_1
+			secondary_turret_hmg
+			sloped_armor
+		}
+	}
 }
 
+
+
+EQS_modern_tanks = {
+	category = land
+
+	blocked_for = {}
+	available_for = {
+		# eqs
+		EQS
+		CRY
+		NLR
+		VAN
+		SCS
+		BAL
+		NMS
+		CES
+		JUN
+		TEM
+		LSP
+		ELF
+		EQC
+		PCB
+	}
+
+	priority = {
+		factor = 200
+		modifier = {
+			num_of_factories < 100
+			factor = 0
+		}
+	}
+
+	basic_modern_tank_default = { #Centurion 
+		priority = {
+			factor = 10
+		}
+
+		target_variant = {
+			match_value = 1000
+			type = modern_tank_chassis_1
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+						tank_heavy_cannon_3 
+						tank_high_velocity_cannon_3 
+						tank_heavy_cannon_2 
+						tank_high_velocity_cannon_2 
+						tank_heavy_cannon 
+					} 
+				}
+				turret_type_slot = tank_modern_tank_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_welded_armor
+				engine_type_slot = tank_gasoline_engine
+				special_type_slot_1 = tank_radio_module
+				special_type_slot_2 = smoke_launchers
+				special_type_slot_3 = stabilizer
+				special_type_slot_4 = sloped_armor
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 10
+				tank_nsb_armor_upgrade = {
+					base = 4
+					modifier = {
+						add = 3
+						has_war = yes
+					}
+					modifier = {
+						any_enemy_country = {
+							is_major = yes
+						}
+						add = 2
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			
+			tank_high_velocity_cannon_2 
+			tank_high_velocity_cannon_3 
+			tank_heavy_cannon 
+			tank_heavy_cannon_2 
+			tank_heavy_cannon_3 
+			tank_modern_tank_turret
+			tank_bogie_suspension
+			tank_welded_armor
+			tank_gasoline_engine
+			sloped_armor
+			smoke_launchers
+			stabilizer
+			tank_radio_3
+			tank_radio_2
+			tank_radio_1
+		}
+	}
+	
+	improved_modern_tank_default = {
+		priority = {
+			factor = 100
+			modifier = { 
+				has_tech = main_battle_tank_chassis_c 
+				factor = 0 #let's not waste XP here
+			}
+		}
+
+		target_variant = {
+			match_value = 2000
+			type = modern_tank_chassis_2
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+						tank_heavy_cannon_4
+						tank_high_velocity_cannon_4
+						tank_heavy_cannon_3 
+						tank_high_velocity_cannon_3 
+						tank_heavy_cannon_2 
+						tank_high_velocity_cannon_2 
+						tank_heavy_cannon 
+					} 
+				}
+				turret_type_slot = tank_modern_tank_turret
+				suspension_type_slot = tank_torsion_bar_suspension
+				armor_type_slot = tank_cast_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = tank_radio_module
+				special_type_slot_2 = smoke_launchers
+				special_type_slot_3 = auto_loader
+				special_type_slot_4 = sloped_armor
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 14
+				tank_nsb_armor_upgrade = {
+					base = 6
+					modifier = {
+						add = 3
+						has_war = yes
+					}
+					modifier = {
+						any_enemy_country = {
+							is_major = yes
+						}
+						add = 2
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_heavy_cannon 
+			tank_heavy_cannon_2 
+			tank_heavy_cannon_3 
+			tank_heavy_cannon_4
+			tank_heavy_cannon_5
+			tank_modern_tank_turret
+			tank_torsion_bar_suspension
+			tank_cast_armor
+			tank_diesel_engine
+			sloped_armor
+			smoke_launchers
+			auto_loader
+			easy_maintenance_2
+			easy_maintenance
+			stabilizer
+			stabilizer_2
+			tank_radio_5
+			tank_radio_4
+			tank_radio_3
+			tank_radio_2
+			tank_radio_1
+		}
+	}
+
+	advanced_modern_tank_default = {
+		priority = {
+			factor = 100
+		}
+
+		target_variant = {
+			match_value = 3000
+			type = modern_tank_chassis_3
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+						tank_heavy_cannon_5
+						tank_high_velocity_cannon_5
+						tank_heavy_cannon_4
+						tank_high_velocity_cannon_4
+						tank_heavy_cannon_3 
+						tank_high_velocity_cannon_3 
+						tank_heavy_cannon_2 
+						tank_high_velocity_cannon_2 
+						tank_heavy_cannon 
+					} 
+				}
+				turret_type_slot = tank_modern_tank_turret
+				suspension_type_slot = tank_hydropneumatic_suspension
+				armor_type_slot = tank_composite_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = tank_radio_module
+				special_type_slot_2 = smoke_launchers
+				special_type_slot_3 = {
+					any_of = {
+						easy_maintenance_2
+						easy_maintenance
+						stabilizer_3
+						auto_loader
+						gun_computer
+						surface_to_air_missiles
+						anti_tank_guided_missiles
+					}
+				}
+				special_type_slot_4 = sloped_armor
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 16
+				tank_nsb_armor_upgrade = {
+					base = 8
+					modifier = {
+						add = 3
+						has_war = yes
+					}
+					modifier = {
+						any_enemy_country = {
+							is_major = yes
+						}
+						add = 2
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_heavy_cannon 
+			tank_heavy_cannon_2 
+			tank_heavy_cannon_3 
+			tank_heavy_cannon_4
+			tank_heavy_cannon_5
+			tank_modern_tank_turret
+			tank_torsion_bar_suspension
+			tank_hydropneumatic_suspension
+			tank_cast_armor
+			tank_composite_armor
+			gun_computer
+			surface_to_air_missiles
+			anti_tank_guided_missiles
+			tank_diesel_engine
+			sloped_armor
+			smoke_launchers
+			easy_maintenance_2
+			easy_maintenance
+			stabilizer
+			stabilizer_2
+			stabilizer_3
+			auto_loader
+			tank_radio_5
+			tank_radio_4
+			tank_radio_3
+			tank_radio_2
+			tank_radio_1
+		}
+	}
+}
+
+
 EQS_modern_tank_destroyer = {
 	category = land
 
diff --git a/common/ai_equipment/HIP_naval.txt b/common/ai_equipment/HIP_naval.txt
index b7fbd0b2ed3..10cda9d1b99 100644
--- a/common/ai_equipment/HIP_naval.txt
+++ b/common/ai_equipment/HIP_naval.txt
@@ -143,7 +143,7 @@ HIP_destroyers = {
 			factor = 100
 			modifier = {
 				factor = 10
-				has_war_with = JAP
+				has_war_with = EQS
 			}
 		}
 		role_icon_index = 2
@@ -184,7 +184,7 @@ HIP_destroyers = {
 			factor = 200
 			modifier = {
 				factor = 10
-				has_war_with = JAP
+				has_war_with = EQS
 			}
 		}
 		role_icon_index = 2
@@ -1491,7 +1491,7 @@ HIP_naval_submarine = {
 			factor = 50
 			modifier = {
 				factor = 15
-				has_war_with = JAP
+				has_war_with = EQS
 			}
 		}
 		role_icon_index = 6
diff --git a/common/ai_equipment/HIP_tank.txt b/common/ai_equipment/HIP_tank.txt
new file mode 100644
index 00000000000..343cdadad66
--- /dev/null
+++ b/common/ai_equipment/HIP_tank.txt
@@ -0,0 +1,2754 @@
+# AI tank design for testing
+
+HIP_light_tanks = {
+	category = land
+
+	blocked_for = {}
+
+	available_for = {HIP}
+
+	roles = {
+		land_light_tank
+	}
+
+	priority = {
+		factor = 1000
+	}
+
+	great_war_tank_default = {
+	
+		priority = {
+			factor = 1
+			modifier = { 
+				has_tech = basic_light_tank_chassis
+				factor = 0 #let's not waste XP here
+			}
+		}
+
+		target_variant = {
+			match_value = 1000
+			type = light_tank_chassis_0
+			modules = {
+				main_armament_slot = tank_heavy_machine_gun
+				turret_type_slot = tank_light_one_man_tank_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_riveted_armor
+				engine_type_slot = tank_gasoline_engine
+				special_type_slot_1 = empty
+				special_type_slot_2 = empty
+				special_type_slot_3 = empty
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 3
+				tank_nsb_armor_upgrade = {
+					base = 1
+					modifier = {
+						add = 1
+						has_war = yes
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_heavy_machine_gun
+			tank_light_one_man_tank_turret
+			tank_bogie_suspension
+			tank_riveted_armor
+			tank_gasoline_engine
+		}
+	}
+
+	basic_light_tank_default = { #M2 light
+	
+		priority = {
+			factor = 100
+			modifier = { 
+				has_tech = improved_light_tank_chassis 
+				factor = 0 #let's not waste XP here
+			}
+		}
+
+		target_variant = {
+			match_value = 2000
+			type = light_tank_chassis_1
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+						tank_small_cannon_2 
+						tank_high_velocity_cannon  
+						tank_small_cannon 
+					} 
+				}
+				turret_type_slot = tank_light_two_man_tank_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_riveted_armor
+				engine_type_slot = tank_gasoline_engine
+				special_type_slot_1 = additional_machine_guns
+				special_type_slot_2 = empty
+				special_type_slot_3 = empty
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 5
+				tank_nsb_armor_upgrade = {
+					base = 2
+					modifier = {
+						add = 1
+						has_war = yes
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_small_cannon 
+			tank_small_cannon_2 
+			tank_high_velocity_cannon
+			tank_light_two_man_tank_turret
+			tank_bogie_suspension
+			tank_riveted_armor
+			tank_gasoline_engine
+			additional_machine_guns
+		}
+	}
+
+	improved_light_tank_default = { #M3/M5 Stuart
+
+		priority = {
+			factor = 10
+			modifier = { 
+				has_tech = advanced_light_tank_chassis 
+				factor = 0 #let's not waste XP here
+			}
+		}
+
+		target_variant = {
+			match_value = 3000
+			type = light_tank_chassis_2
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+						tank_high_velocity_cannon 
+						tank_small_cannon_2 
+						tank_small_cannon  
+					} 
+				}
+				turret_type_slot = tank_light_two_man_tank_turret 
+
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = { 
+					any_of = { 
+						tank_welded_armor 
+						tank_riveted_armor 
+					} 
+				}
+				engine_type_slot = tank_gasoline_engine
+				special_type_slot_1 = tank_radio_module
+				special_type_slot_2 = sloped_armor
+				special_type_slot_3 = additional_machine_guns
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 5
+				tank_nsb_armor_upgrade = {
+					base = 3
+					modifier = {
+						add = 2
+						has_war = yes
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_radio_3
+			tank_radio_2
+			tank_radio_1
+			tank_small_cannon_2 
+			tank_high_velocity_cannon
+			tank_small_cannon 
+			tank_light_two_man_tank_turret
+			tank_welded_armor
+			tank_bogie_suspension
+			tank_riveted_armor
+			tank_gasoline_engine
+			sloped_armor
+			additional_machine_guns
+		}
+	}
+
+	advanced_light_tank_default = { #M24
+		priority = {
+			factor = 10
+		}
+		
+		target_variant = {
+			match_value = 4000
+			type = light_tank_chassis_3
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+						tank_close_support_gun 
+						tank_high_velocity_cannon 
+					} 
+				}
+				turret_type_slot = tank_light_three_man_tank_turret
+				suspension_type_slot = tank_torsion_bar_suspension
+				armor_type_slot = tank_welded_armor
+				engine_type_slot = tank_gasoline_engine
+				special_type_slot_1 = tank_radio_module
+				special_type_slot_2 = sloped_armor
+				special_type_slot_3 = empty
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 5
+				tank_nsb_armor_upgrade = 4
+			}
+		}
+
+		allowed_modules = { 
+			tank_radio_3
+			tank_radio_2
+			tank_radio_1   
+			tank_close_support_gun  
+			tank_high_velocity_cannon
+			tank_light_three_man_tank_turret
+			tank_torsion_bar_suspension
+			tank_welded_armor
+			tank_gasoline_engine
+			sloped_armor
+		}
+	}
+}
+
+HIP_light_tank_destroyers = {
+	category = land
+
+	blocked_for = {}
+
+	available_for = {HIP}
+
+	roles = {
+		land_light_tank_destroyer
+	}
+
+	priority = {
+		factor = 100
+		modifier = {
+			NOT = { has_tech = basic_medium_tank_chassis } 
+			any_enemy_country = {
+				has_tech = basic_medium_tank_chassis
+			}
+			factor = 15
+		}
+	}
+	light_tank_destroyer_1 = {
+		priority = {
+			factor = 100
+			
+		}
+		enable = {
+			has_tech = interwar_antitank
+		}
+
+		target_variant = {
+			match_value = 1000
+			type = light_tank_destroyer_chassis_1
+			modules = {
+				main_armament_slot = tank_high_velocity_cannon
+				turret_type_slot = tank_light_two_man_tank_turret
+				suspension_type_slot = tank_wheeled_suspension
+				armor_type_slot = tank_riveted_armor
+				engine_type_slot = tank_gasoline_engine
+				special_type_slot_1 = empty
+				special_type_slot_2 = empty
+				special_type_slot_3 = empty
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 3
+				tank_nsb_armor_upgrade = {
+					base = 1
+					modifier = {
+						add = 1
+						has_war = yes
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_high_velocity_cannon
+			tank_light_two_man_tank_turret
+			tank_wheeled_suspension
+			tank_riveted_armor
+			tank_gasoline_engine
+		}
+	}
+	light_tank_destroyer_2 = {
+		priority = {
+			factor = 200
+			
+		}
+		enable = {
+			OR = {
+				has_tech = interwar_antitank
+				has_tech = artillery1
+			}
+		}
+
+		target_variant = {
+			match_value = 1500
+			type = light_tank_destroyer_chassis_2
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+						tank_high_velocity_cannon_2 
+						tank_medium_cannon_2 
+						tank_medium_cannon 
+						tank_high_velocity_cannon 
+					} 
+				}
+				turret_type_slot = tank_light_fixed_superstructure_turret
+				suspension_type_slot = tank_half_track_suspension
+				armor_type_slot = tank_riveted_armor
+				engine_type_slot = tank_gasoline_engine
+				special_type_slot_1 = tank_radio_module
+				special_type_slot_2 = extra_ammo_storage
+				special_type_slot_3 = empty
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 4
+				tank_nsb_armor_upgrade = {
+					base = 2
+					modifier = {
+						add = 1
+						has_war = yes
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_radio_3
+			tank_radio_2
+			tank_radio_1
+			tank_medium_cannon 
+			tank_medium_cannon_2 
+			tank_high_velocity_cannon 
+			tank_high_velocity_cannon_2
+			tank_light_fixed_superstructure_turret
+			tank_half_track_suspension
+			tank_riveted_armor
+			tank_diesel_engine
+			extra_ammo_storage
+		}
+	}
+}
+
+HIP_light_tank_artillery = {
+	category = land
+
+	blocked_for = {}
+
+	available_for = {HIP}
+
+	roles = {
+		land_light_tank_artillery
+	}
+
+	priority = {
+		factor = 500
+	}
+	light_tank_artillery_1 = {
+		priority = {
+			factor = 100
+			
+		}
+		enable = {
+			has_tech = interwar_artillery
+		}
+
+		target_variant = {
+			match_value = 1000
+			type = light_tank_artillery_chassis_1
+			modules = {
+				main_armament_slot = tank_close_support_gun
+				turret_type_slot = tank_light_two_man_tank_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_riveted_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = empty
+				special_type_slot_2 = empty
+				special_type_slot_3 = empty
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 3
+				tank_nsb_armor_upgrade = {
+					base = 1
+					modifier = {
+						add = 1
+						has_war = yes
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_close_support_gun
+			tank_light_two_man_tank_turret
+			tank_bogie_suspension
+			tank_riveted_armor
+			tank_diesel_engine
+		}
+	}
+	light_tank_artillery_2 = {
+		priority = {
+			factor = 200
+			
+		}
+		enable = {
+				has_tech = interwar_artillery
+		}
+
+		target_variant = {
+			match_value = 1500
+			type = light_tank_artillery_chassis_2
+			modules = {
+				main_armament_slot = tank_medium_howitzer
+				turret_type_slot = tank_light_fixed_superstructure_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_riveted_armor
+				engine_type_slot = tank_gasoline_engine
+				special_type_slot_1 = empty
+				special_type_slot_2 = empty
+				special_type_slot_3 = empty
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 4
+				tank_nsb_armor_upgrade = {
+					base = 2
+					modifier = {
+						add = 1
+						has_war = yes
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_medium_howitzer
+			tank_light_fixed_superstructure_turret
+			tank_bogie_suspension
+			tank_riveted_armor
+			tank_gasoline_engine
+		}
+	}
+
+	light_tank_artillery_3 = {
+		priority = {
+			factor = 200
+			
+		}
+		enable = {
+			has_tech = artillery1
+		}
+
+		target_variant = {
+			match_value = 2000
+			type = light_tank_artillery_chassis_3
+			modules = {
+				main_armament_slot = tank_medium_howitzer_2
+				turret_type_slot = tank_light_fixed_superstructure_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_riveted_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = extra_ammo_storage
+				special_type_slot_2 = empty
+				special_type_slot_3 = empty
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 4
+				tank_nsb_armor_upgrade = {
+					base = 2
+					modifier = {
+						add = 1
+						has_war = yes
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_medium_howitzer_2
+			tank_light_fixed_superstructure_turret
+			tank_bogie_suspension
+			tank_riveted_armor
+			tank_diesel_engine
+			extra_ammo_storage
+		}
+	}
+}
+
+HIP_light_tank_anti_air = {
+	category = land
+
+	blocked_for = {}
+
+	available_for = {HIP}
+
+	roles = {
+		land_light_tank_anti_air
+	}
+
+	priority = {
+		factor = 5
+		modifier = {
+			NOT = { has_tech = fighter2 } #we should probably do something about that air superiority...
+			any_enemy_country = {
+				has_tech = fighter2
+			}
+			factor = 3
+		}
+	}
+	light_tank_anti_air_1 = {
+		priority = {
+			factor = 10
+			
+		}
+		enable = {
+			has_tech = interwar_antiair
+		}
+
+		target_variant = {
+			match_value = 1000
+			type = light_tank_aa_chassis_1
+			modules = {
+				main_armament_slot = tank_anti_air_cannon
+				turret_type_slot = tank_light_one_man_tank_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_riveted_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = empty
+				special_type_slot_2 = empty
+				special_type_slot_3 = empty
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 3
+				tank_nsb_armor_upgrade = {
+					base = 1
+					modifier = {
+						add = 1
+						has_war = yes
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_anti_air_cannon
+			tank_light_one_man_tank_turret
+			tank_bogie_suspension
+			tank_riveted_armor
+			tank_diesel_engine
+		}
+	}
+	light_tank_anti_air_2 = {
+		priority = {
+			factor = 20
+			
+		}
+		enable = {
+			has_tech = antiair2
+		}
+
+		target_variant = {
+			match_value = 1500
+			type = light_tank_aa_chassis_2
+			modules = {
+				main_armament_slot = tank_anti_air_cannon_2
+				turret_type_slot = tank_light_two_man_tank_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_riveted_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = empty
+				special_type_slot_2 = empty
+				special_type_slot_3 = empty
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 4
+				tank_nsb_armor_upgrade = {
+					base = 2
+					modifier = {
+						add = 1
+						has_war = yes
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_anti_air_cannon_2
+			tank_light_two_man_tank_turret
+			tank_bogie_suspension
+			tank_riveted_armor
+			tank_diesel_engine
+		}
+	}
+
+	light_tank_anti_air_3 = {
+		priority = {
+			factor = 20
+			
+		}
+		enable = {
+			has_tech = antiair5
+		}
+
+		target_variant = {
+			match_value = 2500
+			type = light_tank_aa_chassis_3
+			modules = {
+				main_armament_slot = tank_anti_air_cannon_2
+				turret_type_slot = tank_light_two_man_tank_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_riveted_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = empty
+				special_type_slot_2 = empty
+				special_type_slot_3 = empty
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 5
+				tank_nsb_armor_upgrade = {
+					base = 3
+					modifier = {
+						add = 1
+						has_war = yes
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_anti_air_cannon_2
+			tank_light_two_man_tank_turret
+			tank_bogie_suspension
+			tank_riveted_armor
+			tank_diesel_engine
+		}
+	}
+}
+
+HIP_medium_tanks = {
+	category = land
+
+	blocked_for = {}
+
+	available_for = {HIP}
+
+	roles = {
+		land_medium_tank
+	}
+
+	priority = {
+		factor = 2000
+	}
+
+	basic_medium_tank_default = { #M2 Medium
+		priority = {
+			factor = 100
+			modifier = { 
+				has_tech = improved_medium_tank_chassis
+				factor = 0 #let's not waste XP here
+			}
+		}
+		
+		visible = no
+		
+		target_variant = {
+			match_value = 2000
+			type = medium_tank_chassis_1
+			modules = {
+				main_armament_slot = { 
+					any_of = {  
+						tank_small_cannon_2 
+						tank_high_velocity_cannon 
+						tank_small_cannon 
+					} 
+				}
+				turret_type_slot = tank_medium_two_man_tank_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_riveted_armor
+				engine_type_slot = tank_gasoline_engine
+				special_type_slot_1 = sloped_armor
+				special_type_slot_2 = empty
+				special_type_slot_3 = empty
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 7
+				tank_nsb_armor_upgrade = {
+					base = 3
+					modifier = {
+						add = 2
+						has_war = yes
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			
+			tank_small_cannon 
+			tank_small_cannon_2  
+			tank_high_velocity_cannon
+			tank_medium_two_man_tank_turret
+			tank_bogie_suspension
+			tank_riveted_armor
+			tank_gasoline_engine
+			sloped_armor
+		}
+	}
+
+	basic_medium_tank_improved = { #M3 Medium
+		priority = {
+			factor = 300
+			modifier = { 
+				has_tech = improved_medium_tank_chassis
+				factor = 0 #let's not waste XP here
+			}
+			modifier = {
+				is_historical_focus_on = no
+				factor = 0 #The Grant was a weird design that is kinda suboptimal in game
+			}
+		}
+
+		target_variant = {
+			match_value = 2500
+			type = medium_tank_chassis_1
+			modules = {
+				main_armament_slot = { 
+					any_of = {  
+						tank_medium_cannon_2
+						tank_medium_cannon
+					} 
+				}
+				turret_type_slot = tank_medium_fixed_superstructure_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_riveted_armor
+				engine_type_slot = tank_gasoline_engine
+				special_type_slot_1 = sloped_armor
+				special_type_slot_2 = tank_radio_module
+				special_type_slot_3 = secondary_turret_small_cannon
+				special_type_slot_4 = easy_maintenance
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 8
+				tank_nsb_armor_upgrade = {
+					base = 3
+					modifier = {
+						add = 2
+						has_war = yes
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			
+			tank_medium_cannon_2  
+			tank_medium_cannon 
+			tank_medium_fixed_superstructure_turret
+			tank_bogie_suspension
+			tank_riveted_armor
+			tank_gasoline_engine
+			sloped_armor
+			secondary_turret_small_cannon
+			tank_radio_3
+			tank_radio_2
+			tank_radio_1
+			easy_maintenance
+		}
+	}
+
+	improved_medium_tank_default = { #M4 Sherman
+		priority = {
+			factor = 750
+			modifier = { 
+				has_tech = advanced_medium_tank_chassis 
+				factor = 0 #let's not waste XP here
+			}
+		}
+
+		target_variant = {
+			match_value = 3000
+			type = medium_tank_chassis_2
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+						tank_medium_cannon_2 
+						tank_medium_cannon 
+						tank_high_velocity_cannon_2
+					} 
+				}
+				turret_type_slot = tank_medium_three_man_tank_turret 
+
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = { 
+					any_of = { 
+						tank_cast_armor 
+						tank_welded_armor 
+					} 
+				}
+				engine_type_slot = tank_gasoline_engine
+				special_type_slot_1 = tank_radio_module
+				special_type_slot_2 = stabilizer
+				special_type_slot_3 = sloped_armor
+				special_type_slot_4 = easy_maintenance
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 5
+				tank_nsb_armor_upgrade = {
+					base = 5
+					modifier = {
+						add = 3
+						has_war = yes
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+
+			tank_medium_cannon_2
+			tank_high_velocity_cannon_2
+			tank_medium_cannon 
+			tank_medium_three_man_tank_turret
+			tank_bogie_suspension
+			tank_welded_armor
+			tank_cast_armor
+			tank_gasoline_engine
+			tank_radio_3
+			tank_radio_2
+			tank_radio_1
+			stabilizer
+			sloped_armor
+			easy_maintenance
+		}
+	}
+
+	advanced_medium_tank_default = {
+		priority = {
+			factor = 500
+		}
+
+		target_variant = {
+			match_value = 4000
+			type = medium_tank_chassis_3
+			modules = {
+				main_armament_slot = { any_of = { tank_high_velocity_cannon_2 tank_medium_cannon_2 } }
+				turret_type_slot = tank_medium_three_man_tank_turret
+				suspension_type_slot = tank_torsion_bar_suspension
+				armor_type_slot = tank_welded_armor
+				engine_type_slot = tank_gasoline_engine
+				special_type_slot_1 = tank_radio_module
+				special_type_slot_2 = sloped_armor
+				special_type_slot_3 = stabilizer
+				special_type_slot_4 = easy_maintenance
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = {
+					base = 5
+					modifier = {
+							add = 3
+							has_war = yes
+						}
+				}
+				tank_nsb_armor_upgrade = {
+					base = 6
+					modifier = {
+						add = 3
+						has_war = yes
+					}
+					modifier = {
+						add = 3
+						any_enemy_country = {
+							is_major = yes
+						}
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_medium_cannon_2
+			tank_high_velocity_cannon_2
+			tank_medium_three_man_tank_turret
+			tank_torsion_bar_suspension
+			tank_welded_armor
+			tank_gasoline_engine
+			sloped_armor
+			tank_radio_3
+			tank_radio_2
+			tank_radio_1
+			stabilizer
+			easy_maintenance
+			wet_ammo_storage
+		}
+	}
+}
+
+HIP_medium_tank_destroyer = {
+	category = land
+
+	blocked_for = {}
+
+	available_for = {HIP}
+
+	roles = {
+		land_medium_tank_destroyer
+	}
+
+	priority = {
+		factor = 500
+		modifier = {
+			NOT = { has_tech = basic_heavy_tank_chassis } 
+			any_enemy_country = {
+				has_tech = basic_heavy_tank_chassis
+			}
+			factor = 3
+		}
+		modifier = {
+			has_template_containing_unit = medium_tank_destroyer_brigade
+			factor = 10
+		}
+	}
+	medium_tank_destroyer_1 = {
+		priority = {
+			factor = 100
+			
+		}
+		enable = {
+			has_tech = interwar_antitank
+		}
+
+		target_variant = {
+			match_value = 1000
+			type = medium_tank_destroyer_chassis_1
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+						tank_medium_cannon_2 
+						tank_high_velocity_cannon_2 
+						tank_medium_cannon 
+					} 
+				}
+				turret_type_slot = tank_medium_three_man_tank_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_riveted_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = tank_radio_module
+				special_type_slot_2 = sloped_armor
+				special_type_slot_3 = easy_maintenance
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 9
+				tank_nsb_armor_upgrade = {
+					base = 3
+					modifier = {
+						add = 2
+						has_war = yes
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_high_velocity_cannon_2
+			tank_medium_cannon 
+			tank_medium_cannon_2
+			tank_medium_three_man_tank_turret
+			tank_bogie_suspension
+			tank_riveted_armor
+			tank_diesel_engine
+			sloped_armor
+			tank_radio_1
+			tank_radio_2
+			tank_radio_3
+			easy_maintenance
+		}
+	}
+	medium_tank_destroyer_2 = {
+		priority = {
+			factor = 200
+			
+		}
+		enable = {
+			OR = {
+				has_tech = interwar_antitank
+				has_tech = artillery1
+			}
+		}
+
+		target_variant = {
+			match_value = 1500
+			type = medium_tank_destroyer_chassis_2
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+						tank_high_velocity_cannon_2 
+						tank_medium_cannon_2  
+						tank_medium_cannon 
+					} 
+				}
+				turret_type_slot = tank_medium_three_man_tank_turret
+				suspension_type_slot = tank_torsion_bar_suspension
+				armor_type_slot = tank_welded_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = tank_radio_module
+				special_type_slot_2 = sloped_armor
+				special_type_slot_3 = easy_maintenance
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 8
+				tank_nsb_armor_upgrade = 3
+			}
+		}
+
+		allowed_modules = {
+			tank_medium_cannon 
+			tank_medium_cannon_2 
+			tank_high_velocity_cannon_2 
+			tank_medium_three_man_tank_turret
+			tank_torsion_bar_suspension
+			tank_welded_armor
+			tank_diesel_engine
+			tank_radio_3
+			tank_radio_2
+			tank_radio_1
+			sloped_armor
+			easy_maintenance
+		}
+	}
+
+	medium_tank_destroyer_3 = { #some weird offshot, not an M36
+		priority = {
+			factor = 200
+			
+		}
+		enable = {
+			OR = {
+				has_tech = antitank3
+				has_tech = artillery1
+			}
+		}
+
+		target_variant = {
+			match_value = 2000
+			type = medium_tank_destroyer_chassis_3
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+						tank_high_velocity_cannon_2 
+						tank_heavy_cannon 
+						tank_medium_cannon_2 
+					} 
+				}
+				turret_type_slot = tank_medium_fixed_superstructure_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_welded_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = tank_radio_module
+				special_type_slot_2 = sloped_armor
+				special_type_slot_3 = smoke_launchers
+				special_type_slot_4 = extra_ammo_storage
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 6
+				tank_nsb_armor_upgrade = 6
+			}
+		}
+
+		allowed_modules = {
+			tank_medium_cannon_2 
+			tank_high_velocity_cannon_2 
+			tank_high_velocity_cannon_3 
+			tank_heavy_cannon 
+			tank_heavy_cannon_2
+			tank_medium_fixed_superstructure_turret
+			tank_bogie_suspension
+			tank_welded_armor
+			tank_diesel_engine
+			tank_radio_3
+			tank_radio_2
+			tank_radio_1
+			sloped_armor
+			smoke_launchers
+		}
+	}
+}
+
+HIP_medium_tank_artillery = {
+	category = land
+
+	blocked_for = {}
+
+	available_for = {HIP}
+
+	roles = {
+		land_medium_tank_artillery
+	}
+
+	priority = {
+		factor = 500
+		modifier = {
+			has_template_containing_unit = medium_sp_artillery_brigade
+			factor = 10
+		}
+	}
+	medium_tank_artillery_1 = {
+		priority = {
+			factor = 100
+			
+		}
+		enable = {
+			has_tech = interwar_artillery
+		}
+
+		target_variant = {
+			match_value = 1000
+			type = medium_tank_artillery_chassis_1
+			modules = {
+				main_armament_slot = tank_medium_howitzer
+				turret_type_slot = tank_medium_fixed_superstructure_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_riveted_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = easy_maintenance
+				special_type_slot_2 = empty
+				special_type_slot_3 = empty
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 3
+				tank_nsb_armor_upgrade = {
+					base = 3
+					modifier = {
+						add = 1
+						has_war = yes
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_medium_howitzer
+			tank_medium_fixed_superstructure_turret
+			tank_bogie_suspension
+			tank_riveted_armor
+			tank_diesel_engine
+			easy_maintenance
+		}
+	}
+	medium_tank_artillery_2 = {
+		priority = {
+			factor = 200
+			
+		}
+		enable = {
+				has_tech = interwar_artillery
+		}
+
+		target_variant = {
+			match_value = 1500
+			type = medium_tank_artillery_chassis_2
+			modules = {
+				main_armament_slot = tank_medium_howitzer_2
+				turret_type_slot = tank_medium_fixed_superstructure_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_riveted_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = easy_maintenance
+				special_type_slot_2 = empty
+				special_type_slot_3 = empty
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 4
+				tank_nsb_armor_upgrade = {
+					base = 4
+					modifier = {
+						add = 1
+						has_war = yes
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_medium_howitzer_2
+			tank_medium_fixed_superstructure_turret
+			tank_bogie_suspension
+			tank_riveted_armor
+			tank_diesel_engine
+			easy_maintenance
+		}
+	}
+
+	medium_tank_artillery_3 = {
+		priority = {
+			factor = 200
+			
+		}
+		enable = {
+			has_tech = artillery1
+		}
+
+		target_variant = {
+			match_value = 2000
+			type = medium_tank_artillery_chassis_3
+			modules = {
+				main_armament_slot = tank_heavy_howitzer
+				turret_type_slot = tank_medium_fixed_superstructure_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_riveted_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = easy_maintenance
+				special_type_slot_2 = empty
+				special_type_slot_3 = empty
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 4
+				tank_nsb_armor_upgrade = {
+					base = 5
+					modifier = {
+						add = 1
+						has_war = yes
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			extra_ammo_storage
+			tank_heavy_howitzer
+			tank_medium_fixed_superstructure_turret
+			tank_bogie_suspension
+			tank_riveted_armor
+			tank_diesel_engine
+			easy_maintenance
+		}
+	}
+}
+
+HIP_medium_tank_anti_air = {
+	category = land
+
+	blocked_for = {}
+
+	available_for = {HIP}
+
+	roles = {
+		land_medium_tank_anti_air
+	}
+
+	priority = {
+		factor = 5
+		modifier = {
+			NOT = { has_tech = fighter2 } #we should probably do something about that air superiority...
+			any_enemy_country = {
+				has_tech = fighter2
+			}
+			factor = 3
+		}
+	}
+	medium_tank_anti_air_1 = {
+		priority = {
+			factor = 10
+			
+		}
+		enable = {
+			has_tech = interwar_antiair
+		}
+
+		target_variant = {
+			match_value = 1000
+			type = medium_tank_aa_chassis_1
+			modules = {
+				main_armament_slot = tank_anti_air_cannon
+				turret_type_slot = tank_medium_one_man_tank_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_riveted_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = easy_maintenance
+				special_type_slot_2 = empty
+				special_type_slot_3 = empty
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 4
+				tank_nsb_armor_upgrade = {
+					base = 1
+					modifier = {
+						add = 1
+						has_war = yes
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_anti_air_cannon
+			tank_medium_one_man_tank_turret
+			tank_bogie_suspension
+			tank_riveted_armor
+			tank_diesel_engine
+			easy_maintenance
+		}
+	}
+	medium_tank_anti_air_2 = {
+		priority = {
+			factor = 20
+			
+		}
+		enable = {
+			has_tech = antiair2
+		}
+
+		target_variant = {
+			match_value = 1500
+			type = medium_tank_aa_chassis_2
+			modules = {
+				main_armament_slot = tank_anti_air_cannon_2
+				turret_type_slot = tank_medium_two_man_tank_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_riveted_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = easy_maintenance
+				special_type_slot_2 = empty
+				special_type_slot_3 = empty
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 4
+				tank_nsb_armor_upgrade = {
+					base = 2
+					modifier = {
+						add = 1
+						has_war = yes
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_anti_air_cannon_2
+			tank_medium_two_man_tank_turret
+			tank_bogie_suspension
+			tank_riveted_armor
+			tank_diesel_engine
+			easy_maintenance
+		}
+	}
+
+	medium_tank_anti_air_3 = {
+		priority = {
+			factor = 20
+			
+		}
+		enable = {
+			has_tech = antiair5
+		}
+
+		target_variant = {
+			match_value = 2500
+			type = medium_tank_aa_chassis_3
+			modules = {
+				main_armament_slot = tank_anti_air_cannon_3
+				turret_type_slot = tank_medium_two_man_tank_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_riveted_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = easy_maintenance
+				special_type_slot_2 = empty
+				special_type_slot_3 = empty
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 5
+				tank_nsb_armor_upgrade = {
+					base = 3
+					modifier = {
+						add = 1
+						has_war = yes
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_anti_air_cannon_3
+			tank_medium_two_man_tank_turret
+			tank_bogie_suspension
+			tank_riveted_armor
+			tank_diesel_engine
+			easy_maintenance
+		}
+	}
+}
+###HEAVY TANKS
+HIP_heavy_tanks = {
+	category = land
+
+	blocked_for = {}
+
+	available_for = {HIP}
+
+	roles = {
+		land_heavy_tank
+	}
+
+	priority = {
+		factor = 200
+		modifier = {
+			num_of_factories < 50
+			factor = 0
+		}
+	}
+
+	basic_heavy_tank_default = { #M6
+		priority = {
+			factor = 10
+			modifier = { 
+				has_tech = improved_heavy_tank_chassis 
+				factor = 0 #let's not waste XP here
+			}
+			
+		}
+
+		target_variant = {
+			match_value = 1000
+			type = heavy_tank_chassis_1
+			modules = {
+				main_armament_slot = tank_heavy_cannon
+				turret_type_slot = tank_heavy_three_man_tank_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_cast_armor
+				engine_type_slot = tank_gasoline_engine
+				special_type_slot_1 = tank_radio_module
+				special_type_slot_2 = stabilizer
+				special_type_slot_3 = empty
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 5
+				tank_nsb_armor_upgrade = 8
+			}
+		}
+
+		allowed_modules = {
+			
+			tank_heavy_cannon
+			tank_heavy_three_man_tank_turret
+			tank_bogie_suspension
+			tank_cast_armor
+			tank_gasoline_engine
+			tank_radio_3
+			tank_radio_2
+			tank_radio_1
+			stabilizer
+		}
+	}
+
+	improved_heavy_tank_default = { #Pershing
+		priority = {
+			factor = 10
+			modifier = { 
+				has_tech = advanced_heavy_tank_chassis 
+				factor = 0 #let's not waste XP here
+			}
+		}
+
+		target_variant = {
+			match_value = 2000
+			type = heavy_tank_chassis_2
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+						tank_heavy_cannon_2 
+						tank_high_velocity_cannon_3 
+						tank_heavy_cannon 
+						tank_high_velocity_cannon_2  
+					} 
+				}
+				turret_type_slot = tank_heavy_three_man_tank_turret 
+				suspension_type_slot = tank_torsion_bar_suspension
+				armor_type_slot = tank_cast_armor
+				engine_type_slot = tank_gasoline_engine
+				special_type_slot_1 = tank_radio_module
+				special_type_slot_2 = sloped_armor
+				special_type_slot_3 = empty
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 8
+				tank_nsb_armor_upgrade = {
+					base = 7
+					modifier = {
+						add = 3
+						has_war = yes
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_heavy_cannon 
+			tank_heavy_cannon_2
+			tank_high_velocity_cannon_3
+			tank_high_velocity_cannon_2
+			tank_heavy_two_man_tank_turret
+			tank_heavy_three_man_tank_turret
+			tank_torsion_bar_suspension
+			tank_cast_armor
+			tank_gasoline_engine
+			tank_radio_3
+			tank_radio_2
+			tank_radio_1
+		}
+	}
+
+	advanced_heavy_tank_default = { #T29
+		priority = {
+			factor = 10
+		}
+
+		target_variant = {
+			match_value = 4000
+			type = heavy_tank_chassis_3
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+						tank_heavy_cannon_3
+						tank_heavy_cannon_2
+						tank_high_velocity_cannon_3  
+						tank_high_velocity_cannon_2 
+					} 
+				}
+				turret_type_slot = tank_heavy_three_man_tank_turret
+				suspension_type_slot = tank_torsion_bar_suspension
+				armor_type_slot = tank_welded_armor
+				engine_type_slot = tank_gasoline_engine
+				special_type_slot_1 = tank_radio_module
+				special_type_slot_2 = sloped_armor
+				special_type_slot_3 = smoke_launchers
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = {
+					base = 8
+					modifier = {
+							add = 3
+							has_war = yes
+						}
+				}
+				tank_nsb_armor_upgrade = {
+					base = 8
+					modifier = {
+						add = 4
+						has_war = yes
+					}
+					modifier = {
+						add = 4
+						any_enemy_country = {
+							is_major = yes
+						}
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_heavy_cannon_2
+			tank_high_velocity_cannon_2
+			tank_heavy_cannon_3
+			tank_high_velocity_cannon_3
+			tank_heavy_three_man_tank_turret
+			tank_torsion_bar_suspension
+			tank_welded_armor
+			tank_gasoline_engine
+			tank_radio_3
+			tank_radio_2
+			tank_radio_1
+			sloped_armor
+			smoke_launchers
+		}
+	}
+}
+
+HIP_heavy_tank_destroyer = {
+	category = land
+
+	blocked_for = {}
+
+	available_for = {HIP}
+
+	roles = {
+		land_heavy_tank_destroyer
+	}
+
+	priority = {
+		factor = 500
+		modifier = {
+			NOT = { has_tech = basic_heavy_tank_chassis } 
+			any_enemy_country = {
+				has_tech = basic_heavy_tank_chassis
+			}
+			factor = 3
+		}
+	}
+	heavy_tank_destroyer_1 = {
+		priority = {
+			factor = 100
+			
+		}
+		enable = {
+			has_tech = antitank2
+		}
+
+		target_variant = {
+			match_value = 1000
+			type = heavy_tank_destroyer_chassis_1
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+						tank_heavy_cannon_2 
+						tank_high_velocity_cannon_2 
+						tank_heavy_cannon 
+					} 
+				}
+				turret_type_slot = tank_heavy_three_man_tank_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_riveted_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = empty
+				special_type_slot_2 = empty
+				special_type_slot_3 = empty
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 8
+				tank_nsb_armor_upgrade = {
+					base = 3
+					modifier = {
+						add = 3
+						has_war = yes
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_heavy_cannon 
+			tank_heavy_cannon_2
+			tank_high_velocity_cannon_2
+			tank_heavy_three_man_tank_turret
+			tank_bogie_suspension
+			tank_riveted_armor
+			tank_diesel_engine
+		}
+	}
+	heavy_tank_destroyer_2 = {
+		priority = {
+			factor = 200
+			
+		}
+		enable = {
+			OR = {
+				has_tech = interwar_antitank
+				has_tech = artillery1
+			}
+		}
+
+		target_variant = {
+			match_value = 1500
+			type = heavy_tank_destroyer_chassis_2
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+						tank_super_heavy_cannon 
+						tank_high_velocity_cannon_3 
+						tank_heavy_cannon_2 
+						tank_high_velocity_cannon_2 
+						tank_heavy_cannon 
+					} 
+				}
+				turret_type_slot = tank_heavy_fixed_superstructure_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_cast_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = tank_radio_module
+				special_type_slot_2 = extra_ammo_storage
+				special_type_slot_3 = empty
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 6
+				tank_nsb_armor_upgrade = {
+					base = 6
+					modifier = {
+						add = 6
+						has_war = yes
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_heavy_cannon 
+			tank_heavy_cannon_2 
+			tank_high_velocity_cannon_2 
+			tank_high_velocity_cannon_3
+			tank_super_heavy_cannon
+			tank_heavy_fixed_superstructure_turret
+			tank_bogie_suspension
+			tank_cast_armor
+			tank_diesel_engine
+			tank_radio_3
+			tank_radio_2
+			tank_radio_1
+			extra_ammo_storage
+		}
+	}
+
+	heavy_tank_destroyer_3 = {
+		priority = {
+			factor = 200
+			
+		}
+		enable = {
+			OR = {
+				has_tech = antitank3
+				has_tech = artillery1
+			}
+		}
+
+		target_variant = {
+			match_value = 2000
+			type = heavy_tank_destroyer_chassis_3
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+						tank_super_heavy_cannon 
+						tank_high_velocity_cannon_3 
+						tank_heavy_cannon_2 
+						tank_high_velocity_cannon_2 
+					} 
+				}
+				turret_type_slot = tank_heavy_fixed_superstructure_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_welded_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = tank_radio_module
+				special_type_slot_2 = sloped_armor
+				special_type_slot_3 = smoke_launchers
+				special_type_slot_4 = extra_ammo_storage
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 8
+				tank_nsb_armor_upgrade = {
+					base = 8
+					modifier = {
+						add = 6
+						has_war = yes
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_heavy_cannon_2 
+			tank_high_velocity_cannon_2 
+			tank_high_velocity_cannon_3 
+			tank_super_heavy_cannon 
+			tank_heavy_fixed_superstructure_turret
+			tank_bogie_suspension
+			tank_welded_armor
+			tank_diesel_engine
+			tank_radio_3
+			tank_radio_2
+			tank_radio_1
+			sloped_armor
+			smoke_launchers
+			extra_ammo_storage
+		}
+	}
+}
+
+HIP_heavy_tank_artillery = {
+	category = land
+
+	blocked_for = {}
+
+	available_for = {HIP}
+
+	roles = {
+		land_heavy_tank_artillery
+	}
+
+	priority = {
+		factor = 500
+	}
+	heavy_tank_artillery_1 = {
+		priority = {
+			factor = 100
+			
+		}
+		enable = {
+			has_tech = interwar_artillery
+		}
+
+		target_variant = {
+			match_value = 1000
+			type = heavy_tank_artillery_chassis_1
+			modules = {
+				main_armament_slot = tank_medium_howitzer
+				turret_type_slot = tank_heavy_fixed_superstructure_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_riveted_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = empty
+				special_type_slot_2 = empty
+				special_type_slot_3 = empty
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 4
+				tank_nsb_armor_upgrade = {
+					base = 3
+					modifier = {
+						add = 1
+						has_war = yes
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_medium_howitzer
+			tank_heavy_fixed_superstructure_turret
+			tank_bogie_suspension
+			tank_riveted_armor
+			tank_diesel_engine
+		}
+	}
+	heavy_tank_artillery_2 = {
+		priority = {
+			factor = 200
+			
+		}
+		enable = {
+				has_tech = interwar_artillery
+		}
+
+		target_variant = {
+			match_value = 1500
+			type = heavy_tank_artillery_chassis_2
+			modules = {
+				main_armament_slot = tank_medium_howitzer_2
+				turret_type_slot = tank_heavy_fixed_superstructure_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_riveted_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = extra_ammo_storage
+				special_type_slot_2 = empty
+				special_type_slot_3 = empty
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 5
+				tank_nsb_armor_upgrade = {
+					base = 4
+					modifier = {
+						add = 1
+						has_war = yes
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_medium_howitzer_2
+			tank_heavy_fixed_superstructure_turret
+			tank_bogie_suspension
+			tank_riveted_armor
+			tank_diesel_engine
+			extra_ammo_storage
+		}
+	}
+
+	heavy_tank_artillery_3 = {
+		priority = {
+			factor = 200
+			
+		}
+		enable = {
+			has_tech = artillery5
+		}
+
+		target_variant = {
+			match_value = 2000
+			type = heavy_tank_artillery_chassis_3
+			modules = {
+				main_armament_slot = tank_heavy_howitzer
+				turret_type_slot = tank_heavy_fixed_superstructure_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_riveted_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = extra_ammo_storage
+				special_type_slot_2 = empty
+				special_type_slot_3 = empty
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 6
+				tank_nsb_armor_upgrade = {
+					base = 5
+					modifier = {
+						add = 1
+						has_war = yes
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_heavy_howitzer
+			tank_heavy_fixed_superstructure_turret
+			tank_bogie_suspension
+			tank_riveted_armor
+			tank_diesel_engine
+			extra_ammo_storage
+		}
+	}
+}
+
+HIP_heavy_tank_anti_air = {
+	category = land
+
+	blocked_for = {}
+
+	available_for = {HIP}
+
+	roles = {
+		land_heavy_tank_anti_air
+	}
+
+	priority = {
+		factor = 50
+		modifier = {
+			NOT = { has_tech = fighter2 } #we should probably do something about that air superiority...
+			any_enemy_country = {
+				has_tech = fighter2
+			}
+			factor = 3
+		}
+	}
+	heavy_tank_anti_air_1 = {
+		priority = {
+			factor = 10
+			
+		}
+		enable = {
+			has_tech = interwar_antiair
+		}
+
+		target_variant = {
+			match_value = 1000
+			type = heavy_tank_aa_chassis_1
+			modules = {
+				main_armament_slot = tank_anti_air_cannon
+				turret_type_slot = tank_heavy_two_man_tank_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_riveted_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = empty
+				special_type_slot_2 = empty
+				special_type_slot_3 = empty
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 4
+				tank_nsb_armor_upgrade = {
+					base = 3
+					modifier = {
+						add = 1
+						has_war = yes
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_anti_air_cannon
+			tank_heavy_two_man_tank_turret
+			tank_bogie_suspension
+			tank_riveted_armor
+			tank_diesel_engine
+		}
+	}
+	heavy_tank_anti_air_2 = {
+		priority = {
+			factor = 20
+			
+		}
+		enable = {
+			has_tech = antiair2
+		}
+
+		target_variant = {
+			match_value = 1500
+			type = heavy_tank_aa_chassis_2
+			modules = {
+				main_armament_slot = tank_anti_air_cannon_2
+				turret_type_slot = tank_heavy_two_man_tank_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_riveted_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = empty
+				special_type_slot_2 = empty
+				special_type_slot_3 = empty
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 4
+				tank_nsb_armor_upgrade = {
+					base = 2
+					modifier = {
+						add = 1
+						has_war = yes
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_anti_air_cannon_2
+			tank_heavy_two_man_tank_turret
+			tank_bogie_suspension
+			tank_riveted_armor
+			tank_diesel_engine
+		}
+	}
+
+	heavy_tank_anti_air_3 = {
+		priority = {
+			factor = 20
+			
+		}
+		enable = {
+			has_tech = antiair5
+		}
+
+		target_variant = {
+			match_value = 2500
+			type = heavy_tank_aa_chassis_3
+			modules = {
+				main_armament_slot = tank_anti_air_cannon_3
+				turret_type_slot = tank_heavy_two_man_tank_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_riveted_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = empty
+				special_type_slot_2 = empty
+				special_type_slot_3 = empty
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 5
+				tank_nsb_armor_upgrade = {
+					base = 3
+					modifier = {
+						add = 1
+						has_war = yes
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_anti_air_cannon_3
+			tank_heavy_two_man_tank_turret
+			tank_bogie_suspension
+			tank_riveted_armor
+			tank_diesel_engine
+		}
+	}
+}
+
+HIP_super_heavy_tanks = {
+	category = land
+
+	blocked_for = {}
+
+	available_for = {HIP}
+
+	roles = {
+		land_super_heavy_tank
+	}
+
+	priority = {
+		factor = 200
+		modifier = {
+			num_of_factories < 100
+			factor = 0
+		}
+	}
+
+	basic_super_heavy_tank_default = { #T95 superheavy tank
+		priority = {
+			factor = 10
+			modifier = { 
+				has_government = fascism
+				factor = 5
+			}
+			
+		}
+
+		target_variant = {
+			match_value = 1000
+			type = super_heavy_tank_chassis
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+						tank_super_heavy_cannon 
+						tank_heavy_cannon_3 
+						tank_high_velocity_cannon_3 
+						tank_heavy_cannon_2 
+						tank_high_velocity_cannon_2 
+						tank_heavy_cannon 
+					} 
+				}
+				turret_type_slot = tank_heavy_fixed_superstructure_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_cast_armor
+				engine_type_slot = tank_gasoline_engine
+				special_type_slot_1 = tank_radio_module
+				special_type_slot_2 = armor_skirts
+				special_type_slot_3 = wet_ammo_storage
+				special_type_slot_4 = sloped_armor
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 12
+				tank_nsb_armor_upgrade = {
+					base = 10
+					modifier = {
+						add = 5
+						has_war = yes
+					}
+					modifier = {
+						any_enemy_country = {
+							is_major = yes
+						}
+						add = 5
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			
+			tank_high_velocity_cannon_2 
+			tank_high_velocity_cannon_3 
+			tank_heavy_cannon 
+			tank_heavy_cannon_2 
+			tank_heavy_cannon_3 
+			tank_super_heavy_cannon
+			tank_heavy_fixed_superstructure_turret
+			tank_interleaved_suspension
+			tank_cast_armor
+			tank_gasoline_engine
+			tank_radio_3
+			tank_radio_2
+			tank_radio_1
+			armor_skirts
+			sloped_armor
+			wet_ammo_storage
+		}
+	}
+	improved_super_heavy_tank_default = {
+		priority = {
+			factor = 10
+			modifier = { 
+				has_government = fascism
+				factor = 5
+			}
+			
+		}
+		enable = {
+			has_tech = super_heavy_tank_chassis_b
+		}
+
+		target_variant = {
+			match_value = 1000
+			type = super_heavy_tank_chassis_2
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+						tank_super_heavy_cannon_2 
+						tank_super_heavy_cannon
+					} 
+				}
+				turret_type_slot = tank_super_heavy_four_man_tank_turret
+				suspension_type_slot = tank_interleaved_suspension
+				armor_type_slot = tank_cast_armor
+				engine_type_slot = tank_gas_turbine_engine
+				special_type_slot_1 = tank_radio_module
+				special_type_slot_2 = secondary_turret_hmg
+				special_type_slot_3 = secondary_turret_hmg
+				special_type_slot_4 = sloped_armor
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 14
+				tank_nsb_armor_upgrade = {
+					base = 12
+					modifier = {
+						add = 5
+						has_war = yes
+					}
+					modifier = {
+						any_enemy_country = {
+							is_major = yes
+						}
+						add = 5
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			
+			tank_high_velocity_cannon_2 
+			tank_high_velocity_cannon_3 
+			tank_heavy_cannon 
+			tank_heavy_cannon_2 
+			tank_heavy_cannon_3 
+			tank_super_heavy_cannon
+			tank_super_heavy_cannon_2 
+			tank_super_heavy_four_man_tank_turret
+			tank_interleaved_suspension
+			tank_cast_armor
+			tank_gas_turbine_engine
+			tank_petrol_electric_engine
+			tank_radio_4
+			tank_radio_3
+			tank_radio_2
+			tank_radio_1
+			secondary_turret_hmg
+			sloped_armor
+		}
+	}
+	advanced_super_heavy_tank_default = {
+		priority = {
+			factor = 10
+			modifier = { 
+				has_government = fascism
+				factor = 5
+			}
+			
+		}
+		enable = {
+			has_tech = super_heavy_tank_chassis_c
+		}
+
+		target_variant = {
+			match_value = 1000
+			type = super_heavy_tank_chassis_3
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+						tank_super_heavy_cannon_3
+						tank_super_heavy_cannon_2
+					} 
+				}
+				turret_type_slot = tank_super_heavy_four_man_tank_turret
+				suspension_type_slot = tank_interleaved_suspension
+				armor_type_slot = tank_cast_armor
+				engine_type_slot = tank_gas_turbine_engine
+				special_type_slot_1 = tank_radio_module
+				special_type_slot_2 = secondary_turret_hmg
+				special_type_slot_3 = secondary_turret_hmg
+				special_type_slot_4 = sloped_armor
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 16
+				tank_nsb_armor_upgrade = {
+					base = 14
+					modifier = {
+						add = 5
+						has_war = yes
+					}
+					modifier = {
+						any_enemy_country = {
+							is_major = yes
+						}
+						add = 5
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			
+			tank_high_velocity_cannon_2 
+			tank_high_velocity_cannon_3 
+			tank_heavy_cannon 
+			tank_heavy_cannon_2 
+			tank_heavy_cannon_3 
+			tank_super_heavy_cannon
+			tank_super_heavy_cannon_2 
+			tank_super_heavy_cannon_3
+			tank_super_heavy_four_man_tank_turret
+			tank_interleaved_suspension
+			tank_cast_armor
+			tank_gas_turbine_engine
+			tank_petrol_electric_engine
+			tank_radio_5
+			tank_radio_4
+			tank_radio_3
+			tank_radio_2
+			tank_radio_1
+			secondary_turret_hmg
+			sloped_armor
+		}
+	}
+}
+
+HIP_modern_tanks = { #m46
+	category = land
+
+	blocked_for = {}
+
+	available_for = {HIP}
+
+	roles = {
+		land_modern_tank
+	}
+
+	priority = {
+		factor = 200
+		modifier = {
+			num_of_factories < 100
+			factor = 0
+		}
+	}
+
+	basic_modern_tank_default = {
+		priority = {
+			factor = 10
+		}
+
+		target_variant = {
+			match_value = 1000
+			type = modern_tank_chassis_1
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+						tank_heavy_cannon_3 
+						tank_high_velocity_cannon_3 
+						tank_heavy_cannon_2 
+						tank_high_velocity_cannon_2 
+						tank_heavy_cannon 
+					} 
+				}
+				turret_type_slot = tank_modern_tank_turret
+				suspension_type_slot = tank_torsion_bar_suspension
+				armor_type_slot = tank_cast_armor
+				engine_type_slot = tank_gasoline_engine
+				special_type_slot_1 = tank_radio_module
+				special_type_slot_2 = wet_ammo_storage
+				special_type_slot_3 = easy_maintenance
+				special_type_slot_4 = sloped_armor
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 13
+				tank_nsb_armor_upgrade = {
+					base = 5
+					modifier = {
+						add = 3
+						has_war = yes
+					}
+					modifier = {
+						any_enemy_country = {
+							is_major = yes
+						}
+						add = 3
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			
+			tank_high_velocity_cannon_2 
+			tank_high_velocity_cannon_3 
+			tank_heavy_cannon 
+			tank_heavy_cannon_2 
+			tank_heavy_cannon_3 
+			tank_modern_tank_turret
+			tank_torsion_bar_suspension
+			tank_cast_armor
+			tank_gasoline_engine
+			sloped_armor
+			wet_ammo_storage
+			easy_maintenance
+			smoke_launchers
+			tank_radio_3
+			tank_radio_2
+			tank_radio_1
+		}
+	}
+	
+	improved_modern_tank_default = {
+		priority = {
+			factor = 100
+			modifier = { 
+				has_tech = main_battle_tank_chassis_c 
+				factor = 0 #let's not waste XP here
+			}
+		}
+
+		target_variant = {
+			match_value = 2000
+			type = modern_tank_chassis_2
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+						tank_heavy_cannon_4
+						tank_high_velocity_cannon_4
+						tank_heavy_cannon_3 
+						tank_high_velocity_cannon_3 
+						tank_heavy_cannon_2 
+						tank_high_velocity_cannon_2 
+						tank_heavy_cannon 
+					} 
+				}
+				turret_type_slot = tank_modern_tank_turret
+				suspension_type_slot = tank_torsion_bar_suspension
+				armor_type_slot = tank_cast_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = tank_radio_module
+				special_type_slot_2 = smoke_launchers
+				special_type_slot_3 = auto_loader
+				special_type_slot_4 = sloped_armor
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 14
+				tank_nsb_armor_upgrade = {
+					base = 6
+					modifier = {
+						add = 3
+						has_war = yes
+					}
+					modifier = {
+						any_enemy_country = {
+							is_major = yes
+						}
+						add = 2
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_heavy_cannon 
+			tank_heavy_cannon_2 
+			tank_heavy_cannon_3 
+			tank_heavy_cannon_4
+			tank_heavy_cannon_5
+			tank_modern_tank_turret
+			tank_torsion_bar_suspension
+			tank_cast_armor
+			tank_diesel_engine
+			sloped_armor
+			smoke_launchers
+			auto_loader
+			easy_maintenance_2
+			easy_maintenance
+			stabilizer
+			stabilizer_2
+			tank_radio_5
+			tank_radio_4
+			tank_radio_3
+			tank_radio_2
+			tank_radio_1
+		}
+	}
+
+	advanced_modern_tank_default = {
+		priority = {
+			factor = 100
+		}
+
+		target_variant = {
+			match_value = 3000
+			type = modern_tank_chassis_3
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+						tank_heavy_cannon_5
+						tank_high_velocity_cannon_5
+						tank_heavy_cannon_4
+						tank_high_velocity_cannon_4
+						tank_heavy_cannon_3 
+						tank_high_velocity_cannon_3 
+						tank_heavy_cannon_2 
+						tank_high_velocity_cannon_2 
+						tank_heavy_cannon 
+					} 
+				}
+				turret_type_slot = tank_modern_tank_turret
+				suspension_type_slot = tank_hydropneumatic_suspension
+				armor_type_slot = tank_composite_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = tank_radio_module
+				special_type_slot_2 = smoke_launchers
+				special_type_slot_3 = {
+					any_of = {
+						easy_maintenance_2
+						easy_maintenance
+						stabilizer_3
+						auto_loader
+						gun_computer
+						surface_to_air_missiles
+						anti_tank_guided_missiles
+					}
+				}
+				special_type_slot_4 = sloped_armor
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 16
+				tank_nsb_armor_upgrade = {
+					base = 8
+					modifier = {
+						add = 3
+						has_war = yes
+					}
+					modifier = {
+						any_enemy_country = {
+							is_major = yes
+						}
+						add = 2
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_heavy_cannon 
+			tank_heavy_cannon_2 
+			tank_heavy_cannon_3 
+			tank_heavy_cannon_4
+			tank_heavy_cannon_5
+			tank_modern_tank_turret
+			tank_torsion_bar_suspension
+			tank_hydropneumatic_suspension
+			tank_cast_armor
+			tank_composite_armor
+			gun_computer
+			surface_to_air_missiles
+			anti_tank_guided_missiles
+			tank_diesel_engine
+			sloped_armor
+			smoke_launchers
+			easy_maintenance_2
+			easy_maintenance
+			stabilizer
+			stabilizer_2
+			stabilizer_3
+			auto_loader
+			tank_radio_5
+			tank_radio_4
+			tank_radio_3
+			tank_radio_2
+			tank_radio_1
+		}
+	}
+}
+
+HIP_modern_tank_destroyer = {
+	category = land
+
+	blocked_for = {}
+
+	available_for = {HIP}
+
+	roles = {
+		land_modern_tank_destroyer
+	}
+
+	priority = {
+		factor = 200
+		modifier = {
+			num_of_factories < 100
+			factor = 0
+		}
+	}
+
+	basic_modern_tank_destroyer_default = {
+		priority = {
+			factor = 10
+			
+		}
+
+		target_variant = {
+			match_value = 1000
+			type = modern_tank_destroyer_chassis
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+						tank_high_velocity_cannon_3 
+						tank_heavy_cannon_3 
+						tank_heavy_cannon_2 
+						tank_high_velocity_cannon_2 
+						tank_heavy_cannon 
+					} 
+				}
+				turret_type_slot = tank_modern_tank_turret
+				suspension_type_slot = tank_torsion_bar_suspension
+				armor_type_slot = tank_cast_armor
+				engine_type_slot = tank_gasoline_engine
+				special_type_slot_1 = tank_radio_module
+				special_type_slot_2 = smoke_launchers
+				special_type_slot_3 = wet_ammo_storage
+				special_type_slot_4 = sloped_armor
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 12
+				tank_nsb_armor_upgrade = {
+					base = 2
+					modifier = {
+						add = 3
+						has_war = yes
+					}
+					modifier = {
+						any_enemy_country = {
+							is_major = yes
+						}
+						add = 3
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			
+			tank_high_velocity_cannon_2 
+			tank_high_velocity_cannon_3 
+			tank_heavy_cannon 
+			tank_heavy_cannon_2 
+			tank_heavy_cannon_3 
+			tank_modern_tank_turret
+			tank_torsion_bar_suspension
+			tank_cast_armor
+			tank_gasoline_engine
+			sloped_armor
+			smoke_launchers
+			wet_ammo_storage
+			tank_radio_3
+			tank_radio_2
+			tank_radio_1
+		}
+	}
+}
+
+HIP_amphibious_tanks = {
+	category = land
+
+	blocked_for = {}
+
+	available_for = {HIP}
+
+	roles = {
+		land_amphibious_tank
+	}
+
+	priority = {
+		factor = 20
+	}
+
+	basic_amphibious_tank_default = {
+		priority = {
+			factor = 50
+			
+		}
+
+		target_variant = {
+			match_value = 1000
+			type = amphibious_tank_chassis
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+						tank_close_support_gun
+						tank_small_cannon_2
+						tank_small_cannon
+					} 
+				}
+				turret_type_slot = tank_light_turret_type
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_riveted_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = additional_machine_guns
+				special_type_slot_2 = empty
+				special_type_slot_3 = empty
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 5
+				tank_nsb_armor_upgrade = {
+					base = 2
+					modifier = {
+						add = 2
+						has_war = yes
+					}
+					modifier = {
+						any_enemy_country = {
+							is_major = yes
+						}
+						add = 3
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_small_cannon
+			tank_small_cannon_2
+			tank_medium_cannon
+			tank_medium_cannon_2
+			tank_close_support_gun
+			tank_light_turret_type
+			tank_bogie_suspension
+			tank_riveted_armor
+			tank_diesel_engine
+			additional_machine_guns
+			tank_radio_3
+			tank_radio_2
+			tank_radio_1
+		}
+	}
+}
\ No newline at end of file
diff --git a/common/ai_equipment/JER_tank.txt b/common/ai_equipment/JER_tank.txt
index 5ed7db04def..60298c60a5f 100644
--- a/common/ai_equipment/JER_tank.txt
+++ b/common/ai_equipment/JER_tank.txt
@@ -2267,8 +2267,422 @@ JER_super_heavy_tanks = {
 			auto_loader
 		}
 	}
+	improved_super_heavy_tank_default = {
+		priority = {
+			factor = 10
+			modifier = { 
+				has_government = fascism
+				factor = 5
+			}
+			
+		}
+		enable = {
+			has_tech = super_heavy_tank_chassis_b
+		}
+
+		target_variant = {
+			match_value = 1000
+			type = super_heavy_tank_chassis_2
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+						tank_super_heavy_cannon_2 
+						tank_super_heavy_cannon
+					} 
+				}
+				turret_type_slot = tank_super_heavy_four_man_tank_turret
+				suspension_type_slot = tank_interleaved_suspension
+				armor_type_slot = tank_cast_armor
+				engine_type_slot = tank_gas_turbine_engine
+				special_type_slot_1 = tank_radio_module
+				special_type_slot_2 = secondary_turret_hmg
+				special_type_slot_3 = secondary_turret_hmg
+				special_type_slot_4 = sloped_armor
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 14
+				tank_nsb_armor_upgrade = {
+					base = 12
+					modifier = {
+						add = 5
+						has_war = yes
+					}
+					modifier = {
+						any_enemy_country = {
+							is_major = yes
+						}
+						add = 5
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			
+			tank_high_velocity_cannon_2 
+			tank_high_velocity_cannon_3 
+			tank_heavy_cannon 
+			tank_heavy_cannon_2 
+			tank_heavy_cannon_3 
+			tank_super_heavy_cannon
+			tank_super_heavy_cannon_2 
+			tank_super_heavy_four_man_tank_turret
+			tank_interleaved_suspension
+			tank_cast_armor
+			tank_gas_turbine_engine
+			tank_petrol_electric_engine
+			tank_radio_4
+			tank_radio_3
+			tank_radio_2
+			tank_radio_1
+			secondary_turret_hmg
+			sloped_armor
+		}
+	}
+	advanced_super_heavy_tank_default = {
+		priority = {
+			factor = 10
+			modifier = { 
+				has_government = fascism
+				factor = 5
+			}
+			
+		}
+		enable = {
+			has_tech = super_heavy_tank_chassis_c
+		}
+
+		target_variant = {
+			match_value = 1000
+			type = super_heavy_tank_chassis_3
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+						tank_super_heavy_cannon_3
+						tank_super_heavy_cannon_2
+					} 
+				}
+				turret_type_slot = tank_super_heavy_four_man_tank_turret
+				suspension_type_slot = tank_interleaved_suspension
+				armor_type_slot = tank_cast_armor
+				engine_type_slot = tank_gas_turbine_engine
+				special_type_slot_1 = tank_radio_module
+				special_type_slot_2 = secondary_turret_hmg
+				special_type_slot_3 = secondary_turret_hmg
+				special_type_slot_4 = sloped_armor
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 16
+				tank_nsb_armor_upgrade = {
+					base = 14
+					modifier = {
+						add = 5
+						has_war = yes
+					}
+					modifier = {
+						any_enemy_country = {
+							is_major = yes
+						}
+						add = 5
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			
+			tank_high_velocity_cannon_2 
+			tank_high_velocity_cannon_3 
+			tank_heavy_cannon 
+			tank_heavy_cannon_2 
+			tank_heavy_cannon_3 
+			tank_super_heavy_cannon
+			tank_super_heavy_cannon_2 
+			tank_super_heavy_cannon_3
+			tank_super_heavy_four_man_tank_turret
+			tank_interleaved_suspension
+			tank_cast_armor
+			tank_gas_turbine_engine
+			tank_petrol_electric_engine
+			tank_radio_5
+			tank_radio_4
+			tank_radio_3
+			tank_radio_2
+			tank_radio_1
+			secondary_turret_hmg
+			sloped_armor
+		}
+	}
 }
 
+JER_modern_tanks = {
+	category = land
+
+	blocked_for = {}
+
+	available_for = {
+		# jer
+		ERI
+		HEL
+		AET
+		JER
+		JEB
+		JFT
+		JES
+		JRR
+		AVI
+		POM
+		VIN
+		FLO
+		FEZ
+		MER
+	}
+
+	roles = {
+		land_modern_tank
+	}
+
+	priority = {
+		factor = 200
+		modifier = {
+			num_of_factories < 100
+			factor = 0
+		}
+	}
+
+	basic_modern_tank_default = {
+		priority = {
+			factor = 100
+		}
+
+		target_variant = {
+			match_value = 1000
+			type = modern_tank_chassis_1
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+						tank_heavy_cannon_3 
+						tank_high_velocity_cannon_3 
+						tank_heavy_cannon_2 
+						tank_high_velocity_cannon_2 
+						tank_heavy_cannon 
+					} 
+				}
+				turret_type_slot = tank_modern_tank_turret
+				suspension_type_slot = tank_torsion_bar_suspension
+				armor_type_slot = tank_cast_armor
+				engine_type_slot = tank_gas_turbine_engine
+				special_type_slot_1 = tank_radio_module
+				special_type_slot_2 = smoke_launchers
+				special_type_slot_3 = auto_loader
+				special_type_slot_4 = sloped_armor
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 14
+				tank_nsb_armor_upgrade = {
+					base = 4
+					modifier = {
+						add = 3
+						has_war = yes
+					}
+					modifier = {
+						any_enemy_country = {
+							is_major = yes
+						}
+						add = 1
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			
+			tank_high_velocity_cannon_2 
+			tank_high_velocity_cannon_3 
+			tank_heavy_cannon 
+			tank_heavy_cannon_2 
+			tank_heavy_cannon_3 
+			tank_modern_tank_turret
+			tank_torsion_bar_suspension
+			tank_cast_armor
+			tank_gas_turbine_engine
+			sloped_armor
+			smoke_launchers
+			auto_loader
+			tank_radio_3
+			tank_radio_2
+			tank_radio_1
+		}
+	}
+	
+	improved_modern_tank_default = {
+		priority = {
+			factor = 100
+			modifier = { 
+				has_tech = main_battle_tank_chassis_c 
+				factor = 0 #let's not waste XP here
+			}
+		}
+
+		target_variant = {
+			match_value = 2000
+			type = modern_tank_chassis_2
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+						tank_heavy_cannon_4
+						tank_high_velocity_cannon_4
+						tank_heavy_cannon_3 
+						tank_high_velocity_cannon_3 
+						tank_heavy_cannon_2 
+						tank_high_velocity_cannon_2 
+						tank_heavy_cannon 
+					} 
+				}
+				turret_type_slot = tank_modern_tank_turret
+				suspension_type_slot = tank_torsion_bar_suspension
+				armor_type_slot = tank_cast_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = tank_radio_module
+				special_type_slot_2 = smoke_launchers
+				special_type_slot_3 = auto_loader
+				special_type_slot_4 = sloped_armor
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 14
+				tank_nsb_armor_upgrade = {
+					base = 6
+					modifier = {
+						add = 3
+						has_war = yes
+					}
+					modifier = {
+						any_enemy_country = {
+							is_major = yes
+						}
+						add = 2
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_heavy_cannon 
+			tank_heavy_cannon_2 
+			tank_heavy_cannon_3 
+			tank_heavy_cannon_4
+			tank_heavy_cannon_5
+			tank_modern_tank_turret
+			tank_torsion_bar_suspension
+			tank_cast_armor
+			tank_diesel_engine
+			sloped_armor
+			smoke_launchers
+			auto_loader
+			easy_maintenance_2
+			easy_maintenance
+			stabilizer
+			stabilizer_2
+			tank_radio_5
+			tank_radio_4
+			tank_radio_3
+			tank_radio_2
+			tank_radio_1
+		}
+	}
+
+	advanced_modern_tank_default = {
+		priority = {
+			factor = 100
+		}
+
+		target_variant = {
+			match_value = 3000
+			type = modern_tank_chassis_3
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+						tank_heavy_cannon_5
+						tank_high_velocity_cannon_5
+						tank_heavy_cannon_4
+						tank_high_velocity_cannon_4
+						tank_heavy_cannon_3 
+						tank_high_velocity_cannon_3 
+						tank_heavy_cannon_2 
+						tank_high_velocity_cannon_2 
+						tank_heavy_cannon 
+					} 
+				}
+				turret_type_slot = tank_modern_tank_turret
+				suspension_type_slot = tank_hydropneumatic_suspension
+				armor_type_slot = tank_composite_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = tank_radio_module
+				special_type_slot_2 = smoke_launchers
+				special_type_slot_3 = {
+					any_of = {
+						easy_maintenance_2
+						easy_maintenance
+						stabilizer_3
+						auto_loader
+						gun_computer
+						surface_to_air_missiles
+						anti_tank_guided_missiles
+					}
+				}
+				special_type_slot_4 = sloped_armor
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 16
+				tank_nsb_armor_upgrade = {
+					base = 8
+					modifier = {
+						add = 3
+						has_war = yes
+					}
+					modifier = {
+						any_enemy_country = {
+							is_major = yes
+						}
+						add = 2
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_heavy_cannon 
+			tank_heavy_cannon_2 
+			tank_heavy_cannon_3 
+			tank_heavy_cannon_4
+			tank_heavy_cannon_5
+			tank_modern_tank_turret
+			tank_torsion_bar_suspension
+			tank_hydropneumatic_suspension
+			tank_cast_armor
+			tank_composite_armor
+			gun_computer
+			surface_to_air_missiles
+			anti_tank_guided_missiles
+			tank_diesel_engine
+			sloped_armor
+			smoke_launchers
+			easy_maintenance_2
+			easy_maintenance
+			stabilizer
+			stabilizer_2
+			stabilizer_3
+			auto_loader
+			tank_radio_5
+			tank_radio_4
+			tank_radio_3
+			tank_radio_2
+			tank_radio_1
+		}
+	}
+}
+
+
 JER_modern_tank_destroyer = {
 	category = land
 
diff --git a/common/ai_equipment/LCT_tank.txt b/common/ai_equipment/LCT_tank.txt
index 2841f135888..2729ce1ffae 100644
--- a/common/ai_equipment/LCT_tank.txt
+++ b/common/ai_equipment/LCT_tank.txt
@@ -2069,6 +2069,404 @@ LCT_super_heavy_tanks = {
 			sloped_armor
 		}
 	}
+	improved_super_heavy_tank_default = {
+		priority = {
+			factor = 10
+			modifier = { 
+				has_government = fascism
+				factor = 5
+			}
+			
+		}
+		enable = {
+			has_tech = super_heavy_tank_chassis_b
+		}
+
+		target_variant = {
+			match_value = 1000
+			type = super_heavy_tank_chassis_2
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+						tank_super_heavy_cannon_2 
+						tank_super_heavy_cannon
+					} 
+				}
+				turret_type_slot = tank_super_heavy_four_man_tank_turret
+				suspension_type_slot = tank_interleaved_suspension
+				armor_type_slot = tank_cast_armor
+				engine_type_slot = tank_gas_turbine_engine
+				special_type_slot_1 = tank_radio_module
+				special_type_slot_2 = secondary_turret_hmg
+				special_type_slot_3 = secondary_turret_hmg
+				special_type_slot_4 = sloped_armor
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 14
+				tank_nsb_armor_upgrade = {
+					base = 12
+					modifier = {
+						add = 5
+						has_war = yes
+					}
+					modifier = {
+						any_enemy_country = {
+							is_major = yes
+						}
+						add = 5
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			
+			tank_high_velocity_cannon_2 
+			tank_high_velocity_cannon_3 
+			tank_heavy_cannon 
+			tank_heavy_cannon_2 
+			tank_heavy_cannon_3 
+			tank_super_heavy_cannon
+			tank_super_heavy_cannon_2 
+			tank_super_heavy_four_man_tank_turret
+			tank_interleaved_suspension
+			tank_cast_armor
+			tank_gas_turbine_engine
+			tank_petrol_electric_engine
+			tank_radio_4
+			tank_radio_3
+			tank_radio_2
+			tank_radio_1
+			secondary_turret_hmg
+			sloped_armor
+		}
+	}
+	advanced_super_heavy_tank_default = {
+		priority = {
+			factor = 10
+			modifier = { 
+				has_government = fascism
+				factor = 5
+			}
+			
+		}
+		enable = {
+			has_tech = super_heavy_tank_chassis_c
+		}
+
+		target_variant = {
+			match_value = 1000
+			type = super_heavy_tank_chassis_3
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+						tank_super_heavy_cannon_3
+						tank_super_heavy_cannon_2
+					} 
+				}
+				turret_type_slot = tank_super_heavy_four_man_tank_turret
+				suspension_type_slot = tank_interleaved_suspension
+				armor_type_slot = tank_cast_armor
+				engine_type_slot = tank_gas_turbine_engine
+				special_type_slot_1 = tank_radio_module
+				special_type_slot_2 = secondary_turret_hmg
+				special_type_slot_3 = secondary_turret_hmg
+				special_type_slot_4 = sloped_armor
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 16
+				tank_nsb_armor_upgrade = {
+					base = 14
+					modifier = {
+						add = 5
+						has_war = yes
+					}
+					modifier = {
+						any_enemy_country = {
+							is_major = yes
+						}
+						add = 5
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			
+			tank_high_velocity_cannon_2 
+			tank_high_velocity_cannon_3 
+			tank_heavy_cannon 
+			tank_heavy_cannon_2 
+			tank_heavy_cannon_3 
+			tank_super_heavy_cannon
+			tank_super_heavy_cannon_2 
+			tank_super_heavy_cannon_3
+			tank_super_heavy_four_man_tank_turret
+			tank_interleaved_suspension
+			tank_cast_armor
+			tank_gas_turbine_engine
+			tank_petrol_electric_engine
+			tank_radio_5
+			tank_radio_4
+			tank_radio_3
+			tank_radio_2
+			tank_radio_1
+			secondary_turret_hmg
+			sloped_armor
+		}
+	}
+}
+
+
+JAP_modern_tanks = {
+	category = land
+
+	blocked_for = {}
+
+	available_for = { LCT }
+
+	roles = {
+		land_modern_tank
+	}
+
+	priority = {
+		factor = 20
+		modifier = {
+			num_of_factories < 100
+			factor = 0
+		}
+	}
+
+	basic_modern_tank_default = {
+		priority = {
+			factor = 10
+		}
+
+		target_variant = {
+			match_value = 1000
+			type = modern_tank_chassis_1
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+						tank_heavy_cannon_3 
+						tank_high_velocity_cannon_3 
+						tank_heavy_cannon_2 
+						tank_high_velocity_cannon_2 
+						tank_heavy_cannon 
+					} 
+				}
+				turret_type_slot = tank_modern_tank_turret
+				suspension_type_slot = tank_torsion_bar_suspension
+				armor_type_slot = tank_cast_armor
+				engine_type_slot = tank_gas_turbine_engine
+				special_type_slot_1 = tank_radio_module
+				special_type_slot_2 = smoke_launchers
+				special_type_slot_3 = stabilizer
+				special_type_slot_4 = sloped_armor
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 14
+				tank_nsb_armor_upgrade = {
+					base = 4
+					modifier = {
+						add = 3
+						has_war = yes
+					}
+					modifier = {
+						any_enemy_country = {
+							is_major = yes
+						}
+						add = 2
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			
+			tank_high_velocity_cannon_2 
+			tank_high_velocity_cannon_3 
+			tank_heavy_cannon 
+			tank_heavy_cannon_2 
+			tank_heavy_cannon_3 
+			tank_modern_tank_turret
+			tank_torsion_bar_suspension
+			tank_cast_armor
+			tank_gas_turbine_engine
+			sloped_armor
+			smoke_launchers
+			stabilizer
+			tank_radio_3
+			tank_radio_2
+			tank_radio_1
+		}
+	}
+	
+	improved_modern_tank_default = {
+		priority = {
+			factor = 100
+			modifier = { 
+				has_tech = main_battle_tank_chassis_c 
+				factor = 0 #let's not waste XP here
+			}
+		}
+
+		target_variant = {
+			match_value = 2000
+			type = modern_tank_chassis_2
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+						tank_heavy_cannon_4
+						tank_high_velocity_cannon_4
+						tank_heavy_cannon_3 
+						tank_high_velocity_cannon_3 
+						tank_heavy_cannon_2 
+						tank_high_velocity_cannon_2 
+						tank_heavy_cannon 
+					} 
+				}
+				turret_type_slot = tank_modern_tank_turret
+				suspension_type_slot = tank_torsion_bar_suspension
+				armor_type_slot = tank_cast_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = tank_radio_module
+				special_type_slot_2 = smoke_launchers
+				special_type_slot_3 = auto_loader
+				special_type_slot_4 = sloped_armor
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 14
+				tank_nsb_armor_upgrade = {
+					base = 6
+					modifier = {
+						add = 3
+						has_war = yes
+					}
+					modifier = {
+						any_enemy_country = {
+							is_major = yes
+						}
+						add = 2
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_heavy_cannon 
+			tank_heavy_cannon_2 
+			tank_heavy_cannon_3 
+			tank_heavy_cannon_4
+			tank_heavy_cannon_5
+			tank_modern_tank_turret
+			tank_torsion_bar_suspension
+			tank_cast_armor
+			tank_diesel_engine
+			sloped_armor
+			smoke_launchers
+			auto_loader
+			easy_maintenance_2
+			easy_maintenance
+			stabilizer
+			stabilizer_2
+			tank_radio_5
+			tank_radio_4
+			tank_radio_3
+			tank_radio_2
+			tank_radio_1
+		}
+	}
+
+	advanced_modern_tank_default = {
+		priority = {
+			factor = 100
+		}
+
+		target_variant = {
+			match_value = 3000
+			type = modern_tank_chassis_3
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+						tank_heavy_cannon_5
+						tank_high_velocity_cannon_5
+						tank_heavy_cannon_4
+						tank_high_velocity_cannon_4
+						tank_heavy_cannon_3 
+						tank_high_velocity_cannon_3 
+						tank_heavy_cannon_2 
+						tank_high_velocity_cannon_2 
+						tank_heavy_cannon 
+					} 
+				}
+				turret_type_slot = tank_modern_tank_turret
+				suspension_type_slot = tank_hydropneumatic_suspension
+				armor_type_slot = tank_composite_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = tank_radio_module
+				special_type_slot_2 = smoke_launchers
+				special_type_slot_3 = {
+					any_of = {
+						easy_maintenance_2
+						easy_maintenance
+						stabilizer_3
+						auto_loader
+						gun_computer
+						surface_to_air_missiles
+						anti_tank_guided_missiles
+					}
+				}
+				special_type_slot_4 = sloped_armor
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 16
+				tank_nsb_armor_upgrade = {
+					base = 8
+					modifier = {
+						add = 3
+						has_war = yes
+					}
+					modifier = {
+						any_enemy_country = {
+							is_major = yes
+						}
+						add = 2
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_heavy_cannon 
+			tank_heavy_cannon_2 
+			tank_heavy_cannon_3 
+			tank_heavy_cannon_4
+			tank_heavy_cannon_5
+			tank_modern_tank_turret
+			tank_torsion_bar_suspension
+			tank_hydropneumatic_suspension
+			tank_cast_armor
+			tank_composite_armor
+			gun_computer
+			surface_to_air_missiles
+			anti_tank_guided_missiles
+			tank_diesel_engine
+			sloped_armor
+			smoke_launchers
+			easy_maintenance_2
+			easy_maintenance
+			stabilizer
+			stabilizer_2
+			stabilizer_3
+			auto_loader
+			tank_radio_5
+			tank_radio_4
+			tank_radio_3
+			tank_radio_2
+			tank_radio_1
+		}
+	}
 }
 
 LCT_modern_tank_destroyer = {
diff --git a/common/ai_equipment/STG_tank.txt b/common/ai_equipment/STG_tank.txt
index 0603d47186b..3eb3ed650ca 100644
--- a/common/ai_equipment/STG_tank.txt
+++ b/common/ai_equipment/STG_tank.txt
@@ -2096,8 +2096,407 @@ STG_super_heavy_tanks = {
 			sloped_armor
 		}
 	}
+	improved_super_heavy_tank_default = {
+		priority = {
+			factor = 10
+			modifier = { 
+				has_government = fascism
+				factor = 5
+			}
+			
+		}
+		enable = {
+			has_tech = super_heavy_tank_chassis_b
+		}
+
+		target_variant = {
+			match_value = 1000
+			type = super_heavy_tank_chassis_2
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+						tank_super_heavy_cannon_2 
+						tank_super_heavy_cannon
+					} 
+				}
+				turret_type_slot = tank_super_heavy_four_man_tank_turret
+				suspension_type_slot = tank_interleaved_suspension
+				armor_type_slot = tank_cast_armor
+				engine_type_slot = tank_gas_turbine_engine
+				special_type_slot_1 = tank_radio_module
+				special_type_slot_2 = secondary_turret_hmg
+				special_type_slot_3 = secondary_turret_hmg
+				special_type_slot_4 = sloped_armor
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 14
+				tank_nsb_armor_upgrade = {
+					base = 12
+					modifier = {
+						add = 5
+						has_war = yes
+					}
+					modifier = {
+						any_enemy_country = {
+							is_major = yes
+						}
+						add = 5
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			
+			tank_high_velocity_cannon_2 
+			tank_high_velocity_cannon_3 
+			tank_heavy_cannon 
+			tank_heavy_cannon_2 
+			tank_heavy_cannon_3 
+			tank_super_heavy_cannon
+			tank_super_heavy_cannon_2 
+			tank_super_heavy_four_man_tank_turret
+			tank_interleaved_suspension
+			tank_cast_armor
+			tank_gas_turbine_engine
+			tank_petrol_electric_engine
+			tank_radio_4
+			tank_radio_3
+			tank_radio_2
+			tank_radio_1
+			secondary_turret_hmg
+			sloped_armor
+		}
+	}
+	advanced_super_heavy_tank_default = {
+		priority = {
+			factor = 10
+			modifier = { 
+				has_government = fascism
+				factor = 5
+			}
+			
+		}
+		enable = {
+			has_tech = super_heavy_tank_chassis_c
+		}
+
+		target_variant = {
+			match_value = 1000
+			type = super_heavy_tank_chassis_3
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+						tank_super_heavy_cannon_3
+						tank_super_heavy_cannon_2
+					} 
+				}
+				turret_type_slot = tank_super_heavy_four_man_tank_turret
+				suspension_type_slot = tank_interleaved_suspension
+				armor_type_slot = tank_cast_armor
+				engine_type_slot = tank_gas_turbine_engine
+				special_type_slot_1 = tank_radio_module
+				special_type_slot_2 = secondary_turret_hmg
+				special_type_slot_3 = secondary_turret_hmg
+				special_type_slot_4 = sloped_armor
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 16
+				tank_nsb_armor_upgrade = {
+					base = 14
+					modifier = {
+						add = 5
+						has_war = yes
+					}
+					modifier = {
+						any_enemy_country = {
+							is_major = yes
+						}
+						add = 5
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			
+			tank_high_velocity_cannon_2 
+			tank_high_velocity_cannon_3 
+			tank_heavy_cannon 
+			tank_heavy_cannon_2 
+			tank_heavy_cannon_3 
+			tank_super_heavy_cannon
+			tank_super_heavy_cannon_2 
+			tank_super_heavy_cannon_3
+			tank_super_heavy_four_man_tank_turret
+			tank_interleaved_suspension
+			tank_cast_armor
+			tank_gas_turbine_engine
+			tank_petrol_electric_engine
+			tank_radio_5
+			tank_radio_4
+			tank_radio_3
+			tank_radio_2
+			tank_radio_1
+			secondary_turret_hmg
+			sloped_armor
+		}
+	}
 }
 
+
+STG_modern_tanks = {
+	category = land
+
+	blocked_for = {}
+
+	available_for = {STG STL }
+
+	roles = {
+		land_modern_tank
+	}
+
+	priority = {
+		factor = 200
+		modifier = {
+			num_of_factories < 100
+			factor = 0
+		}
+	}
+
+	basic_modern_tank_default = { #T54
+		priority = {
+			factor = 10
+		}
+
+		target_variant = {
+			match_value = 1000
+			type = modern_tank_chassis_1
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+						tank_high_velocity_cannon_3 
+						tank_heavy_cannon_3 
+						tank_heavy_cannon_2 
+						tank_high_velocity_cannon_2 
+						tank_heavy_cannon 
+					} 
+				}
+				turret_type_slot = tank_modern_tank_turret
+				suspension_type_slot = tank_torsion_bar_suspension
+				armor_type_slot = tank_cast_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = tank_radio_module
+				special_type_slot_2 = sloped_armor
+				special_type_slot_3 = easy_maintenance
+				special_type_slot_4 = stabilizer
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 14
+				tank_nsb_armor_upgrade = {
+					base = 8
+					modifier = {
+						add = 5
+						has_war = yes
+					}
+					modifier = {
+						any_enemy_country = {
+							is_major = yes
+						}
+						add = 5
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			
+			tank_high_velocity_cannon_2 
+			tank_high_velocity_cannon_3 
+			tank_heavy_cannon 
+			tank_heavy_cannon_2 
+			tank_heavy_cannon_3 
+			tank_modern_tank_turret
+			tank_torsion_bar_suspension
+			tank_cast_armor
+			tank_diesel_engine
+			sloped_armor
+			easy_maintenance
+			stabilizer
+			armor_skirts
+			tank_radio_3
+			tank_radio_2
+			tank_radio_1
+		}
+	}
+	improved_modern_tank_default = {
+		priority = {
+			factor = 100
+			modifier = { 
+				has_tech = main_battle_tank_chassis_c 
+				factor = 0 #let's not waste XP here
+			}
+		}
+
+		target_variant = {
+			match_value = 2000
+			type = modern_tank_chassis_2
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+						tank_heavy_cannon_4
+						tank_high_velocity_cannon_4
+						tank_heavy_cannon_3 
+						tank_high_velocity_cannon_3 
+						tank_heavy_cannon_2 
+						tank_high_velocity_cannon_2 
+						tank_heavy_cannon 
+					} 
+				}
+				turret_type_slot = tank_modern_tank_turret
+				suspension_type_slot = tank_torsion_bar_suspension
+				armor_type_slot = tank_cast_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = tank_radio_module
+				special_type_slot_2 = smoke_launchers
+				special_type_slot_3 = auto_loader
+				special_type_slot_4 = sloped_armor
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 14
+				tank_nsb_armor_upgrade = {
+					base = 6
+					modifier = {
+						add = 3
+						has_war = yes
+					}
+					modifier = {
+						any_enemy_country = {
+							is_major = yes
+						}
+						add = 2
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_heavy_cannon 
+			tank_heavy_cannon_2 
+			tank_heavy_cannon_3 
+			tank_heavy_cannon_4
+			tank_heavy_cannon_5
+			tank_modern_tank_turret
+			tank_torsion_bar_suspension
+			tank_cast_armor
+			tank_diesel_engine
+			sloped_armor
+			smoke_launchers
+			auto_loader
+			easy_maintenance_2
+			easy_maintenance
+			stabilizer
+			stabilizer_2
+			tank_radio_5
+			tank_radio_4
+			tank_radio_3
+			tank_radio_2
+			tank_radio_1
+		}
+	}
+
+	advanced_modern_tank_default = {
+		priority = {
+			factor = 100
+		}
+
+		target_variant = {
+			match_value = 3000
+			type = modern_tank_chassis_3
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+						tank_heavy_cannon_5
+						tank_high_velocity_cannon_5
+						tank_heavy_cannon_4
+						tank_high_velocity_cannon_4
+						tank_heavy_cannon_3 
+						tank_high_velocity_cannon_3 
+						tank_heavy_cannon_2 
+						tank_high_velocity_cannon_2 
+						tank_heavy_cannon 
+					} 
+				}
+				turret_type_slot = tank_modern_tank_turret
+				suspension_type_slot = tank_hydropneumatic_suspension
+				armor_type_slot = tank_composite_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = tank_radio_module
+				special_type_slot_2 = smoke_launchers
+				special_type_slot_3 = {
+					any_of = {
+						easy_maintenance_2
+						easy_maintenance
+						stabilizer_3
+						auto_loader
+						gun_computer
+						surface_to_air_missiles
+						anti_tank_guided_missiles
+					}
+				}
+				special_type_slot_4 = sloped_armor
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 16
+				tank_nsb_armor_upgrade = {
+					base = 8
+					modifier = {
+						add = 3
+						has_war = yes
+					}
+					modifier = {
+						any_enemy_country = {
+							is_major = yes
+						}
+						add = 2
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_heavy_cannon 
+			tank_heavy_cannon_2 
+			tank_heavy_cannon_3 
+			tank_heavy_cannon_4
+			tank_heavy_cannon_5
+			tank_modern_tank_turret
+			tank_torsion_bar_suspension
+			tank_hydropneumatic_suspension
+			tank_cast_armor
+			tank_composite_armor
+			gun_computer
+			surface_to_air_missiles
+			anti_tank_guided_missiles
+			tank_diesel_engine
+			sloped_armor
+			smoke_launchers
+			easy_maintenance_2
+			easy_maintenance
+			stabilizer
+			stabilizer_2
+			stabilizer_3
+			auto_loader
+			tank_radio_5
+			tank_radio_4
+			tank_radio_3
+			tank_radio_2
+			tank_radio_1
+		}
+	}
+}
+
+
 STG_modern_tank_destroyer = {
 	category = land
 
diff --git a/common/ai_equipment/WNG_tank.txt b/common/ai_equipment/WNG_tank.txt
index 81825e3a95c..bb6fdd9132f 100644
--- a/common/ai_equipment/WNG_tank.txt
+++ b/common/ai_equipment/WNG_tank.txt
@@ -2199,8 +2199,406 @@ WNG_super_heavy_tanks = {
 			sloped_armor
 		}
 	}
+	improved_super_heavy_tank_default = {
+		priority = {
+			factor = 10
+			modifier = { 
+				has_government = fascism
+				factor = 5
+			}
+			
+		}
+		enable = {
+			has_tech = super_heavy_tank_chassis_b
+		}
+
+		target_variant = {
+			match_value = 1000
+			type = super_heavy_tank_chassis_2
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+						tank_super_heavy_cannon_2 
+						tank_super_heavy_cannon
+					} 
+				}
+				turret_type_slot = tank_super_heavy_four_man_tank_turret
+				suspension_type_slot = tank_interleaved_suspension
+				armor_type_slot = tank_cast_armor
+				engine_type_slot = tank_gas_turbine_engine
+				special_type_slot_1 = tank_radio_module
+				special_type_slot_2 = secondary_turret_hmg
+				special_type_slot_3 = secondary_turret_hmg
+				special_type_slot_4 = sloped_armor
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 14
+				tank_nsb_armor_upgrade = {
+					base = 12
+					modifier = {
+						add = 5
+						has_war = yes
+					}
+					modifier = {
+						any_enemy_country = {
+							is_major = yes
+						}
+						add = 5
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			
+			tank_high_velocity_cannon_2 
+			tank_high_velocity_cannon_3 
+			tank_heavy_cannon 
+			tank_heavy_cannon_2 
+			tank_heavy_cannon_3 
+			tank_super_heavy_cannon
+			tank_super_heavy_cannon_2 
+			tank_super_heavy_four_man_tank_turret
+			tank_interleaved_suspension
+			tank_cast_armor
+			tank_gas_turbine_engine
+			tank_petrol_electric_engine
+			tank_radio_4
+			tank_radio_3
+			tank_radio_2
+			tank_radio_1
+			secondary_turret_hmg
+			sloped_armor
+		}
+	}
+	advanced_super_heavy_tank_default = {
+		priority = {
+			factor = 10
+			modifier = { 
+				has_government = fascism
+				factor = 5
+			}
+			
+		}
+		enable = {
+			has_tech = super_heavy_tank_chassis_c
+		}
+
+		target_variant = {
+			match_value = 1000
+			type = super_heavy_tank_chassis_3
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+						tank_super_heavy_cannon_3
+						tank_super_heavy_cannon_2
+					} 
+				}
+				turret_type_slot = tank_super_heavy_four_man_tank_turret
+				suspension_type_slot = tank_interleaved_suspension
+				armor_type_slot = tank_cast_armor
+				engine_type_slot = tank_gas_turbine_engine
+				special_type_slot_1 = tank_radio_module
+				special_type_slot_2 = secondary_turret_hmg
+				special_type_slot_3 = secondary_turret_hmg
+				special_type_slot_4 = sloped_armor
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 16
+				tank_nsb_armor_upgrade = {
+					base = 14
+					modifier = {
+						add = 5
+						has_war = yes
+					}
+					modifier = {
+						any_enemy_country = {
+							is_major = yes
+						}
+						add = 5
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			
+			tank_high_velocity_cannon_2 
+			tank_high_velocity_cannon_3 
+			tank_heavy_cannon 
+			tank_heavy_cannon_2 
+			tank_heavy_cannon_3 
+			tank_super_heavy_cannon
+			tank_super_heavy_cannon_2 
+			tank_super_heavy_cannon_3
+			tank_super_heavy_four_man_tank_turret
+			tank_interleaved_suspension
+			tank_cast_armor
+			tank_gas_turbine_engine
+			tank_petrol_electric_engine
+			tank_radio_5
+			tank_radio_4
+			tank_radio_3
+			tank_radio_2
+			tank_radio_1
+			secondary_turret_hmg
+			sloped_armor
+		}
+	}
+}
+
+
+ITA_modern_tanks = {
+	category = land
+
+	blocked_for = {}
+
+	available_for = { WNG }
+
+	roles = {
+		land_modern_tank
+	}
+
+	priority = {
+		factor = 200
+		modifier = {
+			num_of_factories < 100
+			factor = 0
+		}
+	}
+
+	basic_modern_tank_default = {
+		priority = {
+			factor = 10
+		}
+
+		target_variant = {
+			match_value = 1000
+			type = modern_tank_chassis_1
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+						tank_heavy_cannon_3 
+						tank_high_velocity_cannon_3 
+						tank_heavy_cannon_2 
+						tank_high_velocity_cannon_2 
+						tank_heavy_cannon 
+					} 
+				}
+				turret_type_slot = tank_modern_tank_turret
+				suspension_type_slot = tank_torsion_bar_suspension
+				armor_type_slot = tank_cast_armor
+				engine_type_slot = tank_gas_turbine_engine
+				special_type_slot_1 = tank_radio_module
+				special_type_slot_2 = smoke_launchers
+				special_type_slot_3 = stabilizer
+				special_type_slot_4 = sloped_armor
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 18
+				tank_nsb_armor_upgrade = {
+					base = 8
+					modifier = {
+						add = 5
+						has_war = yes
+					}
+					modifier = {
+						any_enemy_country = {
+							is_major = yes
+						}
+						add = 5
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			
+			tank_high_velocity_cannon_2 
+			tank_high_velocity_cannon_3 
+			tank_heavy_cannon 
+			tank_heavy_cannon_2 
+			tank_heavy_cannon_3 
+			tank_modern_tank_turret
+			tank_torsion_bar_suspension
+			tank_cast_armor
+			tank_gas_turbine_engine
+			sloped_armor
+			smoke_launchers
+			stabilizer
+			tank_radio_3
+			tank_radio_2
+			tank_radio_1
+		}
+	}
+	improved_modern_tank_default = {
+		priority = {
+			factor = 100
+			modifier = { 
+				has_tech = main_battle_tank_chassis_c 
+				factor = 0 #let's not waste XP here
+			}
+		}
+
+		target_variant = {
+			match_value = 2000
+			type = modern_tank_chassis_2
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+						tank_heavy_cannon_4
+						tank_high_velocity_cannon_4
+						tank_heavy_cannon_3 
+						tank_high_velocity_cannon_3 
+						tank_heavy_cannon_2 
+						tank_high_velocity_cannon_2 
+						tank_heavy_cannon 
+					} 
+				}
+				turret_type_slot = tank_modern_tank_turret
+				suspension_type_slot = tank_torsion_bar_suspension
+				armor_type_slot = tank_cast_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = tank_radio_module
+				special_type_slot_2 = smoke_launchers
+				special_type_slot_3 = auto_loader
+				special_type_slot_4 = sloped_armor
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 14
+				tank_nsb_armor_upgrade = {
+					base = 6
+					modifier = {
+						add = 3
+						has_war = yes
+					}
+					modifier = {
+						any_enemy_country = {
+							is_major = yes
+						}
+						add = 2
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_heavy_cannon 
+			tank_heavy_cannon_2 
+			tank_heavy_cannon_3 
+			tank_heavy_cannon_4
+			tank_heavy_cannon_5
+			tank_modern_tank_turret
+			tank_torsion_bar_suspension
+			tank_cast_armor
+			tank_diesel_engine
+			sloped_armor
+			smoke_launchers
+			auto_loader
+			easy_maintenance_2
+			easy_maintenance
+			stabilizer
+			stabilizer_2
+			tank_radio_5
+			tank_radio_4
+			tank_radio_3
+			tank_radio_2
+			tank_radio_1
+		}
+	}
+
+	advanced_modern_tank_default = {
+		priority = {
+			factor = 100
+		}
+
+		target_variant = {
+			match_value = 3000
+			type = modern_tank_chassis_3
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+						tank_heavy_cannon_5
+						tank_high_velocity_cannon_5
+						tank_heavy_cannon_4
+						tank_high_velocity_cannon_4
+						tank_heavy_cannon_3 
+						tank_high_velocity_cannon_3 
+						tank_heavy_cannon_2 
+						tank_high_velocity_cannon_2 
+						tank_heavy_cannon 
+					} 
+				}
+				turret_type_slot = tank_modern_tank_turret
+				suspension_type_slot = tank_hydropneumatic_suspension
+				armor_type_slot = tank_composite_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = tank_radio_module
+				special_type_slot_2 = smoke_launchers
+				special_type_slot_3 = {
+					any_of = {
+						easy_maintenance_2
+						easy_maintenance
+						stabilizer_3
+						auto_loader
+						gun_computer
+						surface_to_air_missiles
+						anti_tank_guided_missiles
+					}
+				}
+				special_type_slot_4 = sloped_armor
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 16
+				tank_nsb_armor_upgrade = {
+					base = 8
+					modifier = {
+						add = 3
+						has_war = yes
+					}
+					modifier = {
+						any_enemy_country = {
+							is_major = yes
+						}
+						add = 2
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_heavy_cannon 
+			tank_heavy_cannon_2 
+			tank_heavy_cannon_3 
+			tank_heavy_cannon_4
+			tank_heavy_cannon_5
+			tank_modern_tank_turret
+			tank_torsion_bar_suspension
+			tank_hydropneumatic_suspension
+			tank_cast_armor
+			tank_composite_armor
+			gun_computer
+			surface_to_air_missiles
+			anti_tank_guided_missiles
+			tank_diesel_engine
+			sloped_armor
+			smoke_launchers
+			easy_maintenance_2
+			easy_maintenance
+			stabilizer
+			stabilizer_2
+			stabilizer_3
+			auto_loader
+			tank_radio_5
+			tank_radio_4
+			tank_radio_3
+			tank_radio_2
+			tank_radio_1
+		}
+	}
 }
 
+
 WNG_modern_tank_destroyer = {
 	category = land
 
diff --git a/common/ai_equipment/generic_tank.txt b/common/ai_equipment/generic_tank.txt
index 4221ddc9012..06461dabb31 100644
--- a/common/ai_equipment/generic_tank.txt
+++ b/common/ai_equipment/generic_tank.txt
@@ -4,6 +4,7 @@ generic_light_tanks = {
 	category = land
 
 	blocked_for = {
+		HIP
 		CHN
 		CCN
 		LCT
@@ -284,6 +285,7 @@ generic_light_tank_destroyers = {
 	category = land
 
 	blocked_for = {
+		HIP
 		CHN
 		CCN
 		LCT
@@ -452,6 +454,7 @@ generic_light_tank_artillery = {
 	category = land
 
 	blocked_for = {
+		HIP
 		CHN
 		CCN
 		LCT
@@ -647,6 +650,7 @@ generic_light_tank_anti_air = {
 	category = land
 
 	blocked_for = {
+		HIP
 		CHN
 		CCN
 		LCT
@@ -841,6 +845,7 @@ generic_medium_tanks = {
 	category = land
 
 	blocked_for = {
+		HIP
 		CHN
 		CCN
 		LCT
@@ -1079,6 +1084,7 @@ generic_medium_tank_destroyer = {
 	category = land
 
 	blocked_for = {
+		HIP
 		CHN
 		CCN
 		LCT
@@ -1317,6 +1323,7 @@ generic_medium_tank_artillery = {
 	category = land
 
 	blocked_for = {
+		HIP
 		CHN
 		CCN
 		LCT
@@ -1512,6 +1519,7 @@ generic_medium_tank_anti_air = {
 	category = land
 
 	blocked_for = {
+		HIP
 		CHN
 		CCN
 		LCT
@@ -1706,6 +1714,7 @@ generic_heavy_tanks = {
 	category = land
 
 	blocked_for = {
+		HIP
 		CHN
 		CCN
 		LCT
@@ -1974,6 +1983,7 @@ generic_heavy_tank_destroyer = {
 	category = land
 
 	blocked_for = {
+		HIP
 		CHN
 		CCN
 		LCT
@@ -2214,6 +2224,7 @@ generic_heavy_tank_artillery = {
 	category = land
 
 	blocked_for = {
+		HIP
 		CHN
 		CCN
 		LCT
@@ -2406,6 +2417,7 @@ generic_heavy_tank_anti_air = {
 	category = land
 
 	blocked_for = {
+		HIP
 		CHN
 		CCN
 		LCT
@@ -2600,6 +2612,7 @@ generic_super_heavy_tanks = {
 	category = land
 
 	blocked_for = {
+		HIP
 		CHN
 		CCN
 		LCT
@@ -2671,7 +2684,7 @@ generic_super_heavy_tanks = {
 
 		target_variant = {
 			match_value = 1000
-			type = super_heavy_tank_chassis
+			type = super_heavy_tank_chassis_1
 			modules = {
 				main_armament_slot = { 
 					any_of = { 
@@ -2730,11 +2743,207 @@ generic_super_heavy_tanks = {
 			sloped_armor
 		}
 	}
+	improved_super_heavy_tank_default = {
+		priority = {
+			factor = 10
+			modifier = { 
+				has_government = fascism
+				factor = 5
+			}
+			
+		}
+		enable = {
+			has_tech = super_heavy_tank_chassis_b
+		}
+
+		target_variant = {
+			match_value = 1000
+			type = super_heavy_tank_chassis_2
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+						tank_super_heavy_cannon_2 
+						tank_super_heavy_cannon
+					} 
+				}
+				turret_type_slot = tank_super_heavy_four_man_tank_turret
+				suspension_type_slot = tank_interleaved_suspension
+				armor_type_slot = tank_cast_armor
+				engine_type_slot = tank_gas_turbine_engine
+				special_type_slot_1 = tank_radio_module
+				special_type_slot_2 = secondary_turret_hmg
+				special_type_slot_3 = secondary_turret_hmg
+				special_type_slot_4 = sloped_armor
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 14
+				tank_nsb_armor_upgrade = {
+					base = 12
+					modifier = {
+						add = 5
+						has_war = yes
+					}
+					modifier = {
+						any_enemy_country = {
+							is_major = yes
+						}
+						add = 5
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			
+			tank_high_velocity_cannon_2 
+			tank_high_velocity_cannon_3 
+			tank_heavy_cannon 
+			tank_heavy_cannon_2 
+			tank_heavy_cannon_3 
+			tank_super_heavy_cannon
+			tank_super_heavy_cannon_2 
+			tank_super_heavy_four_man_tank_turret
+			tank_interleaved_suspension
+			tank_cast_armor
+			tank_gas_turbine_engine
+			tank_petrol_electric_engine
+			tank_radio_4
+			tank_radio_3
+			tank_radio_2
+			tank_radio_1
+			secondary_turret_hmg
+			sloped_armor
+		}
+	}
+	advanced_super_heavy_tank_default = {
+		priority = {
+			factor = 10
+			modifier = { 
+				has_government = fascism
+				factor = 5
+			}
+			
+		}
+		enable = {
+			has_tech = super_heavy_tank_chassis_c
+		}
+
+		target_variant = {
+			match_value = 1000
+			type = super_heavy_tank_chassis_3
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+						tank_super_heavy_cannon_3
+						tank_super_heavy_cannon_2
+					} 
+				}
+				turret_type_slot = tank_super_heavy_four_man_tank_turret
+				suspension_type_slot = tank_interleaved_suspension
+				armor_type_slot = tank_cast_armor
+				engine_type_slot = tank_gas_turbine_engine
+				special_type_slot_1 = tank_radio_module
+				special_type_slot_2 = secondary_turret_hmg
+				special_type_slot_3 = secondary_turret_hmg
+				special_type_slot_4 = sloped_armor
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 16
+				tank_nsb_armor_upgrade = {
+					base = 14
+					modifier = {
+						add = 5
+						has_war = yes
+					}
+					modifier = {
+						any_enemy_country = {
+							is_major = yes
+						}
+						add = 5
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			
+			tank_high_velocity_cannon_2 
+			tank_high_velocity_cannon_3 
+			tank_heavy_cannon 
+			tank_heavy_cannon_2 
+			tank_heavy_cannon_3 
+			tank_super_heavy_cannon
+			tank_super_heavy_cannon_2 
+			tank_super_heavy_cannon_3
+			tank_super_heavy_four_man_tank_turret
+			tank_interleaved_suspension
+			tank_cast_armor
+			tank_gas_turbine_engine
+			tank_petrol_electric_engine
+			tank_radio_5
+			tank_radio_4
+			tank_radio_3
+			tank_radio_2
+			tank_radio_1
+			secondary_turret_hmg
+			sloped_armor
+		}
+	}
 }
 
 generic_modern_tanks = {
 	category = land
 	
+	blocked_for = {
+		HIP
+		CHN
+		CCN
+		LCT
+		STG
+		STL
+		
+		# eqs
+		EQS
+		CRY
+		NLR
+		VAN
+		SCS
+		BAL
+		NMS
+		CES
+		JUN
+		TEM
+		LSP
+		ELF
+		EQC
+		PCB
+		
+		# jer
+		ERI
+		HEL
+		AET
+		JER
+		JEB
+		JFT
+		JES
+		JRR
+		AVI
+		POM
+		VIN
+		FLO
+		FEZ
+		MER
+		
+		# wng
+		SIC
+		CYA
+		FRN
+		ARA
+		WNG
+		FAL
+		TAL
+		JKR
+	}
 
 	roles = {
 		land_modern_tank
@@ -2819,7 +3028,17 @@ generic_modern_tanks = {
 			match_value = 2000
 			type = modern_tank_chassis_2
 			modules = {
-				main_armament_slot = tank_heavy_cannon_5
+				main_armament_slot = { 
+					any_of = { 
+						tank_heavy_cannon_4
+						tank_high_velocity_cannon_4
+						tank_heavy_cannon_3 
+						tank_high_velocity_cannon_3 
+						tank_heavy_cannon_2 
+						tank_high_velocity_cannon_2 
+						tank_heavy_cannon 
+					} 
+				}
 				turret_type_slot = tank_modern_tank_turret
 				suspension_type_slot = tank_torsion_bar_suspension
 				armor_type_slot = tank_cast_armor
@@ -2860,8 +3079,10 @@ generic_modern_tanks = {
 			sloped_armor
 			smoke_launchers
 			auto_loader
+			easy_maintenance_2
 			easy_maintenance
 			stabilizer
+			stabilizer_2
 			tank_radio_5
 			tank_radio_4
 			tank_radio_3
@@ -2877,9 +3098,21 @@ generic_modern_tanks = {
 
 		target_variant = {
 			match_value = 3000
-			type = modern_tank_chassis_1
+			type = modern_tank_chassis_3
 			modules = {
-				main_armament_slot = tank_heavy_cannon_5
+				main_armament_slot = { 
+					any_of = { 
+						tank_heavy_cannon_5
+						tank_high_velocity_cannon_5
+						tank_heavy_cannon_4
+						tank_high_velocity_cannon_4
+						tank_heavy_cannon_3 
+						tank_high_velocity_cannon_3 
+						tank_heavy_cannon_2 
+						tank_high_velocity_cannon_2 
+						tank_heavy_cannon 
+					} 
+				}
 				turret_type_slot = tank_modern_tank_turret
 				suspension_type_slot = tank_hydropneumatic_suspension
 				armor_type_slot = tank_composite_armor
@@ -2888,8 +3121,9 @@ generic_modern_tanks = {
 				special_type_slot_2 = smoke_launchers
 				special_type_slot_3 = {
 					any_of = {
+						easy_maintenance_2
 						easy_maintenance
-						stabilizer
+						stabilizer_3
 						auto_loader
 						gun_computer
 						surface_to_air_missiles
@@ -2933,8 +3167,11 @@ generic_modern_tanks = {
 			tank_diesel_engine
 			sloped_armor
 			smoke_launchers
+			easy_maintenance_2
 			easy_maintenance
 			stabilizer
+			stabilizer_2
+			stabilizer_3
 			auto_loader
 			tank_radio_5
 			tank_radio_4
@@ -2948,7 +3185,57 @@ generic_modern_tanks = {
 generic_modern_tank_destroyer = {
 	category = land
 
-	blocked_for = {EQS NLR EQC CRY CHN CCN STG STL}
+	
+	blocked_for = {
+		HIP
+		CHN
+		CCN
+		LCT
+		STG
+		STL
+		
+		# eqs
+		EQS
+		CRY
+		NLR
+		VAN
+		SCS
+		BAL
+		NMS
+		CES
+		JUN
+		TEM
+		LSP
+		ELF
+		EQC
+		PCB
+		
+		# jer
+		ERI
+		HEL
+		AET
+		JER
+		JEB
+		JFT
+		JES
+		JRR
+		AVI
+		POM
+		VIN
+		FLO
+		FEZ
+		MER
+		
+		# wng
+		SIC
+		CYA
+		FRN
+		ARA
+		WNG
+		FAL
+		TAL
+		JKR
+	}
 
 	
 
@@ -3030,7 +3317,57 @@ generic_modern_tank_destroyer = {
 generic_amphibious_tanks = {
 	category = land
 
-	blocked_for = {EQS NLR EQC CRY CHN CCN STG STL}
+	
+	blocked_for = {
+		HIP
+		CHN
+		CCN
+		LCT
+		STG
+		STL
+		
+		# eqs
+		EQS
+		CRY
+		NLR
+		VAN
+		SCS
+		BAL
+		NMS
+		CES
+		JUN
+		TEM
+		LSP
+		ELF
+		EQC
+		PCB
+		
+		# jer
+		ERI
+		HEL
+		AET
+		JER
+		JEB
+		JFT
+		JES
+		JRR
+		AVI
+		POM
+		VIN
+		FLO
+		FEZ
+		MER
+		
+		# wng
+		SIC
+		CYA
+		FRN
+		ARA
+		WNG
+		FAL
+		TAL
+		JKR
+	}
 
 	
 
diff --git a/common/ai_strategy/default.txt b/common/ai_strategy/default.txt
index 7c1262fdcf5..a3eebe1ab86 100644
--- a/common/ai_strategy/default.txt
+++ b/common/ai_strategy/default.txt
@@ -1829,4 +1829,226 @@ strat_bomber_production = {
 		id = large_plane_airframe
 		value = 1
 	}
+}
+
+default_stockpile_management = { ### these values need to be discussed
+	enable = {
+		num_divisions > 150
+	}
+
+	abort = {
+		num_divisions < 130
+	}
+
+	ai_strategy = {
+		type = equipment_stockpile_surplus_ratio
+		value = 35 # add this to default PRODUCTION_EQUIPMENT_SURPLUS_FACTOR
+	}
+}
+
+default_market_stockpile_management = {
+	enable = {
+		always = yes
+		# NOT = { original_tag = EQS } # commented until actually needed
+	}
+	abort_when_not_enabled = yes
+
+	ai_strategy = {
+		type = equipment_market_for_sale_threshold
+		id = train
+		value = 20  # only start considering selling trains if surplus more than 20
+	}
+	ai_strategy = {
+		type = equipment_market_min_for_sale
+		id = train
+		value = 5  # only put up for sale in chunks of 5
+	}
+	ai_strategy = {
+		type = equipment_market_for_sale_factor
+		id = train
+		value = -50  # put fewer trains up for sale
+	}
+	ai_strategy = {
+		type = equipment_market_for_sale_threshold
+		id = convoy
+		value = 100 
+	}
+	ai_strategy = {
+		type = equipment_market_min_for_sale
+		id = convoy
+		value = 30 
+	}
+	ai_strategy = {
+		type = equipment_market_for_sale_threshold
+		id = fighter
+		value = 100
+	}
+	ai_strategy = {
+		type = equipment_market_for_sale_threshold
+		id = cas
+		value = 100
+	}
+	ai_strategy = {
+		type = equipment_market_for_sale_threshold
+		id = cv_fighter
+		value = 100
+	}
+	ai_strategy = {
+		type = equipment_market_for_sale_threshold
+		id = cv_cas
+		value = 100
+	}
+}
+
+default_market_stockpile_management_if_at_war = {
+	enable = {
+		has_war = yes
+		# NOT = { original_tag = EQS } # commented until actually needed
+	}
+	abort_when_not_enabled = yes
+
+	# Don't sell stuff that we need for the war
+	ai_strategy = {
+		type = equipment_market_for_sale_threshold
+		id = infantry
+		value = 20000
+	}
+	ai_strategy = {
+		type = equipment_market_for_sale_threshold
+		id = support
+		value = 6000
+	}
+	ai_strategy = {
+		type = equipment_market_for_sale_threshold
+		id = artillery
+		value = 1000
+	}
+	ai_strategy = {
+		type = equipment_market_for_sale_threshold
+		id = fighter
+		value = 200
+	}
+	ai_strategy = {
+		type = equipment_market_for_sale_threshold
+		id = motorized
+		value = 1000
+	}
+	ai_strategy = {
+		type = equipment_market_for_sale_threshold
+		id = train
+		value = 50
+	}
+	ai_strategy = {
+		type = equipment_market_for_sale_threshold
+		id = convoy
+		value = 50
+	}
+}
+
+never_buy_melee_equipment = {
+	enable = {
+		always = yes
+	}
+	abort = { always = no }
+
+ #This affects how the AI scores the available equipment to buy. Must specify either equipment_type or seller or both.
+	ai_strategy = {
+    	type = equipment_market_buy
+    	equipment_type = melee_equipment_0  # optional: equipment type or archetype to buy
+    	value = -50000  # Part of the score calculation for things to buy. Related define: EQUIPMENT_MARKET_SCORE_FACTOR_AI_STRAT_WEIGHT
+	}
+	ai_strategy = {
+    	type = equipment_market_buy
+    	equipment_type = melee_equipment_1  # optional: equipment type or archetype to buy
+    	value = -50000  # Part of the score calculation for things to buy. Related define: EQUIPMENT_MARKET_SCORE_FACTOR_AI_STRAT_WEIGHT
+	}
+}
+
+never_buy_unique_equipment = { # Similar to above never_buy_melee_equipment but for the various unique equipments various nations use
+	enable = {
+		always = yes
+	}
+	abort = { always = no }
+
+ # Each unique equipment archetype must be specified individually when created so AI won't sell it in the international market
+	ai_strategy = {
+    	type = equipment_market_buy
+    	equipment_type = bar_leopold_equipment # BAR - Leopold's Armour
+    	value = -50000  # Part of the score calculation for things to buy. Related define: EQUIPMENT_MARKET_SCORE_FACTOR_AI_STRAT_WEIGHT
+	}
+	ai_strategy = {
+		type = equipment_market_buy
+    	equipment_type = windigo_equipment # DED - Windigo Equipment
+    	value = -50000
+	}
+	ai_strategy = {
+		type = equipment_market_buy
+    	equipment_type = tatzelwurm_equipment # ZAR - Tatzlwurm
+    	value = -50000
+	}
+	ai_strategy = {
+		type = equipment_market_buy
+    	equipment_type = tatzelwurm_armor_equipment # ZAR - Tatzlwurm Armour
+    	value = -50000
+	}
+	ai_strategy = {
+		type = equipment_market_buy
+    	equipment_type = polar_bear_equipment # PLB - Panserbjørn Armor
+    	value = -50000
+	}
+	ai_strategy = {
+		type = equipment_market_buy
+    	equipment_type = living_factory_equipment # DED - Living Factory Equipment
+    	value = -50000
+	}
+	ai_strategy = {
+		type = equipment_market_buy
+    	equipment_type = bone_abomination_equipment # DED - Bone Abomination Equipment
+    	value = -50000
+	}
+	ai_strategy = {
+		type = equipment_market_buy
+    	equipment_type = dark_mage_equipment # DED - Dark Mage Equipment
+    	value = -50000
+	}
+	ai_strategy = {
+		type = equipment_market_buy
+    	equipment_type = bone_armor_equipment # DED - Bone Armor Equipment
+    	value = -50000
+	}
+	ai_strategy = {
+		type = equipment_market_buy
+    	equipment_type = fused_pony_equipment # DED - Fused Pony Equipment
+    	value = -50000
+	}
+	ai_strategy = {
+		type = equipment_market_buy
+    	equipment_type = swarm_equipment # DED - Swarm Equipment
+    	value = -50000
+	}
+	ai_strategy = {
+		type = equipment_market_buy
+    	equipment_type = super_griffons_armor # Star Knight Armor
+    	value = -50000
+	}
+	ai_strategy = {
+		type = equipment_market_buy
+    	equipment_type = super_griffons_weapon # Star Knight Weapon / Bolzengewehr
+    	value = -50000
+	}
+	ai_strategy = {
+		type = equipment_market_buy
+    	equipment_type = dragon_equipment # Draconic Equipment
+    	value = -50000
+	}
+	ai_strategy = {
+		type = equipment_market_buy
+    	equipment_type = CHN_manehattan_protectorate_railway_gun # CHN Manehattan - Soryth-Klasse Eisenbahnwaffe
+    	value = -50000
+	}
+	ai_strategy = {
+		type = equipment_market_buy
+    	equipment_type = CTH_convoy # CTH - Armoured Convoys
+    	value = -50000
+	}
 }
\ No newline at end of file
diff --git a/common/ai_strategy_plans/CHN_historical_strategy_plan.txt b/common/ai_strategy_plans/CHN_historical_strategy_plan.txt
index 294b672e532..c39c04457f3 100644
--- a/common/ai_strategy_plans/CHN_historical_strategy_plan.txt
+++ b/common/ai_strategy_plans/CHN_historical_strategy_plan.txt
@@ -80,10 +80,10 @@ CHN_ideas_plan = {
 		war_economy = 70.0
 		partial_economic_mobilisation = 60.0
 		all_adults_serve = 55.0
-		chntrimmel = 50.0
+		idea_chntrimmel = 50.0
 		extensive_conscription = 45.0
-		chnwarindustrialist = 40.0
-		chnindustrialist = 30.0
+		idea_chnwarindustrialist = 40.0
+		idea_chnindustrialist = 30.0
 	}
 
 	# Keep small, as it is used as a factor for some things (such as research needs)
diff --git a/common/ai_strategy_plans/STG_alternate_strategy_plan.txt b/common/ai_strategy_plans/STG_alternate_strategy_plan.txt
index 1c93115f94f..144c8b18a52 100644
--- a/common/ai_strategy_plans/STG_alternate_strategy_plan.txt
+++ b/common/ai_strategy_plans/STG_alternate_strategy_plan.txt
@@ -67,7 +67,7 @@ STG_sinister_alternate_path = {
 		limited_conscription = 45.0
 		vasya = 40.0
 		spikestg = 20.0
-		gold_muffin = 5.0
+		STG_gold_muffin = 5.0
 	}
 
 	# Keep small, as it is used as a factor for some things (such as research needs)
diff --git a/common/ai_strategy_plans/STG_historical_strategy_plan.txt b/common/ai_strategy_plans/STG_historical_strategy_plan.txt
index 8c397ec7739..187120ec76d 100644
--- a/common/ai_strategy_plans/STG_historical_strategy_plan.txt
+++ b/common/ai_strategy_plans/STG_historical_strategy_plan.txt
@@ -72,7 +72,7 @@ STG_historical = {
 		limited_conscription = 45.0
 		sinnie = 30.0
 		spikestg = 20.0
-		gold_muffin = 5.0
+		STG_gold_muffin = 5.0
 	}
 
 	# Keep small, as it is used as a factor for some things (such as research needs)
diff --git a/common/ai_templates/generic.txt b/common/ai_templates/generic.txt
index 93dec0c2bcd..3780046d032 100644
--- a/common/ai_templates/generic.txt
+++ b/common/ai_templates/generic.txt
@@ -187,7 +187,7 @@ armor_generic = {
 			}
 		}
 
-		target_width = 28.0
+		target_width = 30.0
 		width_weight = 3
 		column_swap_factor = 0.01
 		reinforce_prio = 1
@@ -215,7 +215,7 @@ armor_generic = {
 			}
 
 			regiments = {
-				medium_armor = 7
+				medium_armor = 8
 				motorized = 7
 			}
 		}
@@ -301,7 +301,7 @@ armor_generic = {
 			}
 		}
 
-		target_width = 28
+		target_width = 30.0
 		width_weight = 3
 		column_swap_factor = 0.01
 		reinforce_prio = 1
@@ -334,7 +334,7 @@ armor_generic = {
 			}
 
 			regiments = {
-				medium_armor = 7
+				medium_armor = 8
 				mechanized = 7
 			}
 		}
@@ -382,7 +382,7 @@ armor_generic = {
 				num_of_military_factories > 60
 			}
 		}
-		target_width = 28
+		target_width = 30.0
 		width_weight = 3
 		column_swap_factor = 0.01
 		reinforce_prio = 1
@@ -403,7 +403,7 @@ armor_generic = {
 			}
 
 			regiments = {
-				modern_armor = 7
+				modern_armor = 8
 				mechanized = 7
 			}
 		}
@@ -1460,8 +1460,9 @@ marines_generic = {
 			}
 		}
 
-		width_weight = 1
-		column_swap_factor = 0.01
+		target_width = 18.0
+		width_weight = 1.0
+		column_swap_factor = 0.1
 		reinforce_prio = 1
 
 		can_upgrade_in_field = {
diff --git a/common/ai_templates/templates_CHN.txt b/common/ai_templates/templates_CHN.txt
index 5a435828406..d692dd3fbb3 100644
--- a/common/ai_templates/templates_CHN.txt
+++ b/common/ai_templates/templates_CHN.txt
@@ -135,7 +135,7 @@ armor_CHN = {
 			}
 		}
 
-		target_width = 28.0
+		target_width = 30.0
 		width_weight = 3
 		column_swap_factor = 0.01
 		reinforce_prio = 1
@@ -163,7 +163,7 @@ armor_CHN = {
 			}
 
 			regiments = {
-				medium_armor = 7
+				medium_armor = 8
 				motorized = 7
 			}
 		}
@@ -250,7 +250,7 @@ armor_CHN = {
 			}
 		}
 
-		target_width = 28
+		target_width = 30.0
 		width_weight = 3
 		column_swap_factor = 0.01
 		reinforce_prio = 1
@@ -283,7 +283,7 @@ armor_CHN = {
 			}
 
 			regiments = {
-				medium_armor = 7
+				medium_armor = 8
 				mechanized = 7
 			}
 		}
@@ -332,7 +332,7 @@ armor_CHN = {
 				num_of_military_factories > 60
 			}
 		}
-		target_width = 28
+		target_width = 30.0
 		width_weight = 3
 		column_swap_factor = 0.01
 		reinforce_prio = 1
@@ -353,7 +353,7 @@ armor_CHN = {
 			}
 
 			regiments = {
-				modern_armor = 7
+				modern_armor = 8
 				mechanized = 7
 			}
 		}
diff --git a/common/ai_templates/templates_EQS.txt b/common/ai_templates/templates_EQS.txt
index 8ea38d8d7ce..77a10b87692 100644
--- a/common/ai_templates/templates_EQS.txt
+++ b/common/ai_templates/templates_EQS.txt
@@ -185,7 +185,7 @@ armor_EQS = {
 			}
 		}
 
-		target_width = 28.0
+		target_width = 30.0
 		width_weight = 3
 		column_swap_factor = 0.01
 		reinforce_prio = 1
@@ -213,7 +213,7 @@ armor_EQS = {
 			}
 
 			regiments = {
-				medium_armor = 7
+				medium_armor = 8
 				motorized = 7
 			}
 		}
@@ -300,7 +300,7 @@ armor_EQS = {
 			}
 		}
 
-		target_width = 28
+		target_width = 30.0
 		width_weight = 3
 		column_swap_factor = 0.01
 		reinforce_prio = 1
@@ -333,7 +333,7 @@ armor_EQS = {
 			}
 
 			regiments = {
-				medium_armor = 7
+				medium_armor = 8
 				mechanized = 7
 			}
 		}
@@ -382,7 +382,7 @@ armor_EQS = {
 				num_of_military_factories > 60
 			}
 		}
-		target_width = 28
+		target_width = 30.0
 		width_weight = 3
 		column_swap_factor = 0.01
 		reinforce_prio = 1
@@ -403,7 +403,7 @@ armor_EQS = {
 			}
 
 			regiments = {
-				modern_armor = 7
+				modern_armor = 8
 				mechanized = 7
 			}
 		}
diff --git a/common/autonomous_states/aat_defense_council_member.txt b/common/autonomous_states/aat_defense_council_member.txt
new file mode 100644
index 00000000000..5d2a8ad0514
--- /dev/null
+++ b/common/autonomous_states/aat_defense_council_member.txt
@@ -0,0 +1,55 @@
+autonomy_state = {
+	id = autonomy_aat_defense_council_member
+	
+	is_puppet = yes
+	
+	min_freedom_level = 0.0
+	
+	manpower_influence = 0
+	use_overlord_color = yes
+	rule = {
+		desc = "RULE_DESC_IS_A_SUBJECT"
+		
+		can_not_declare_war = yes
+		can_decline_call_to_war = no
+		units_deployed_to_overlord = yes
+		can_be_spymaster = no
+		contributes_operatives = yes
+		can_create_collaboration_government = no
+	}
+	
+	modifier = {
+		autonomy_manpower_share = 1
+		can_master_build_for_us = 1
+		extra_trade_to_overlord_factor = 1.0
+		overlord_trade_cost_factor = -0.8
+		cic_to_overlord_factor = 0.05
+		mic_to_overlord_factor = 1
+		autonomy_gain_global_factor = -0.3
+		peace_score_ratio_transferred_to_overlord = 0.5
+		lend_lease_tension_with_overlord = -0.40
+	}
+	
+	ai_subject_wants_higher = {
+		factor = 0
+	}
+	
+	ai_overlord_wants_lower = {
+		factor = 0.0
+	}
+
+	ai_overlord_wants_garrison = {
+		always = yes
+	}
+
+	allowed = {
+		always = no
+	}
+	
+	can_take_level = {
+	}
+
+	can_lose_level = {
+		always = no
+	}
+}
diff --git a/common/autonomous_states/colony.txt b/common/autonomous_states/colony.txt
index 4557a5365b2..c5460fba1fc 100644
--- a/common/autonomous_states/colony.txt
+++ b/common/autonomous_states/colony.txt
@@ -23,7 +23,8 @@ autonomy_state = {
 		can_master_build_for_us = 1
 		license_subject_master_purchase_cost = -0.5
 		peace_score_ratio_transferred_to_overlord = 0.1
-		
+		lend_lease_tension_with_overlord = -0.30
+
 		research_sharing_per_country_bonus_factor = -0.3
 	}
 
diff --git a/common/autonomous_states/dominion.txt b/common/autonomous_states/dominion.txt
index bc4c83ed134..8b8b8fd06a3 100644
--- a/common/autonomous_states/dominion.txt
+++ b/common/autonomous_states/dominion.txt
@@ -17,6 +17,7 @@ autonomy_state = {
 		overlord_trade_cost_factor = -0.25
 		license_subject_master_purchase_cost = -0.25
 		peace_score_ratio_transferred_to_overlord = 0.05
+		lend_lease_tension_with_overlord = -0.1
 
 	}
 
diff --git a/common/autonomous_states/integrated_puppet.txt b/common/autonomous_states/integrated_puppet.txt
index 9eb6ae8d825..175f08419ed 100644
--- a/common/autonomous_states/integrated_puppet.txt
+++ b/common/autonomous_states/integrated_puppet.txt
@@ -25,6 +25,7 @@ autonomy_state = {
 		mic_to_overlord_factor = 0.75
 		license_subject_master_purchase_cost = -0.6
 		peace_score_ratio_transferred_to_overlord = 0.2
+		lend_lease_tension_with_overlord = -0.40
 				
 		research_sharing_per_country_bonus_factor = -0.3
 	}
diff --git a/common/autonomous_states/lar_collaboration_government.txt b/common/autonomous_states/lar_collaboration_government.txt
index ee4650b6d9c..157571541d2 100644
--- a/common/autonomous_states/lar_collaboration_government.txt
+++ b/common/autonomous_states/lar_collaboration_government.txt
@@ -26,6 +26,7 @@ autonomy_state = {
 		cic_to_overlord_factor = 0.75
 		mic_to_overlord_factor = 0.75
 		peace_score_ratio_transferred_to_overlord = 0.2
+		lend_lease_tension_with_overlord = -0.1
 
 
 		research_sharing_per_country_bonus_factor = -0.5
diff --git a/common/autonomous_states/nsb_personal_union.txt b/common/autonomous_states/nsb_personal_union.txt
new file mode 100644
index 00000000000..59ea9f4d5a6
--- /dev/null
+++ b/common/autonomous_states/nsb_personal_union.txt
@@ -0,0 +1,53 @@
+autonomy_state = {
+	id = autonomy_personal_union
+	
+	is_puppet = yes
+	
+	use_overlord_color = yes
+	
+	min_freedom_level = 0.0
+	
+	manpower_influence = 1.0
+	
+	#Entirely diplomatically dependent on their overlord, but fairly autonomous in industry
+	rule = {
+		desc = "RULE_DESC_IS_A_SUBJECT"
+		
+		can_not_declare_war = yes
+		can_decline_call_to_war = no
+		units_deployed_to_overlord = no
+		can_be_spymaster = no
+		contributes_operatives = yes
+		can_create_collaboration_government = no
+	}
+	
+	modifier = {
+		autonomy_manpower_share = 0.0
+		
+		extra_trade_to_overlord_factor = 0.5
+		overlord_trade_cost_factor = -0.5
+		can_master_build_for_us = 1
+		peace_score_ratio_transferred_to_overlord = 0.05
+		lend_lease_tension_with_overlord = -0.10
+	}
+	
+	ai_subject_wants_higher = {
+		factor = 10.0
+	}
+	
+	ai_overlord_wants_lower = {
+		factor = 0.0
+	}
+	
+	allowed_levels_filter = {
+		autonomy_personal_union
+	}
+
+	allowed = {
+		always = no
+	}
+	
+	can_lose_level = {
+		always = no
+	}
+}
\ No newline at end of file
diff --git a/common/autonomous_states/puppet.txt b/common/autonomous_states/puppet.txt
index 1661aab4c8d..7712c8b3d62 100644
--- a/common/autonomous_states/puppet.txt
+++ b/common/autonomous_states/puppet.txt
@@ -23,6 +23,7 @@ autonomy_state = {
 		overlord_trade_cost_factor = -0.9
 		license_subject_master_purchase_cost = -0.5
 		peace_score_ratio_transferred_to_overlord = 0.1
+		lend_lease_tension_with_overlord = -0.40
 
 		research_sharing_per_country_bonus_factor = -0.3
 	}
diff --git a/common/autonomous_states/reichskommissariat.txt b/common/autonomous_states/reichskommissariat.txt
index b2622c583ee..7b0c3e6a21d 100644
--- a/common/autonomous_states/reichskommissariat.txt
+++ b/common/autonomous_states/reichskommissariat.txt
@@ -27,6 +27,7 @@ autonomy_state = {
 		license_subject_master_purchase_cost = -1
 		autonomy_gain_global_factor = -0.3
 		peace_score_ratio_transferred_to_overlord = 0.1
+		lend_lease_tension_with_overlord = -0.20
 		research_sharing_per_country_bonus_factor = -0.5
 	}
 
diff --git a/common/autonomous_states/reichsprotectorate.txt b/common/autonomous_states/reichsprotectorate.txt
index 8ab78a05e66..0c791e62126 100644
--- a/common/autonomous_states/reichsprotectorate.txt
+++ b/common/autonomous_states/reichsprotectorate.txt
@@ -26,6 +26,7 @@ autonomy_state = {
 		license_subject_master_purchase_cost = -1
 		autonomy_gain_global_factor = -0.3
 		peace_score_ratio_transferred_to_overlord = 0.05
+		lend_lease_tension_with_overlord = -0.30
 		research_sharing_per_country_bonus_factor = -0.5
 	}
 
diff --git a/common/autonomous_states/satellite.txt b/common/autonomous_states/satellite.txt
index f308f59b2b8..dd51f8a9922 100644
--- a/common/autonomous_states/satellite.txt
+++ b/common/autonomous_states/satellite.txt
@@ -19,6 +19,7 @@ autonomy_state = {
 		license_subject_master_purchase_cost = -1.0
 		autonomy_gain_global_factor = -0.3
 		peace_score_ratio_transferred_to_overlord = 0.1
+		lend_lease_tension_with_overlord = -0.30
 	}
 
 	ai_subject_wants_higher = {
diff --git a/common/autonomous_states/supervised_state.txt b/common/autonomous_states/supervised_state.txt
index cc1cdd4a9a8..22ba41bd0f1 100644
--- a/common/autonomous_states/supervised_state.txt
+++ b/common/autonomous_states/supervised_state.txt
@@ -23,6 +23,7 @@ autonomy_state = {
 		autonomy_gain = 2
 		master_ideology_drift = 0.3
 		peace_score_ratio_transferred_to_overlord = 0.15
+		lend_lease_tension_with_overlord = -0.20
 	}
 	
 	ai_subject_wants_higher = {
diff --git a/common/bop/FIN.txt b/common/bop/FIN.txt
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/common/bop/HIP.txt b/common/bop/HIP.txt
index 653b2a44185..f6c09ff47ef 100644
--- a/common/bop/HIP.txt
+++ b/common/bop/HIP.txt
@@ -11,7 +11,7 @@ HIP_antifa_bop = {
 		modifier = {
 			industrial_capacity_factory = 0.05
 			industrial_capacity_dockyard = 0.05
-			consumer_goods_factor = 0.02
+			consumer_goods_factor = 0.04
 			stability_factor = 0.05
 		}
 	}
@@ -26,7 +26,7 @@ HIP_antifa_bop = {
 			modifier = {
 				industrial_capacity_factory = 0.15
 				industrial_capacity_dockyard = 0.15
-				consumer_goods_factor = 0.06
+				consumer_goods_factor = 0.12
 			}
 			on_activate = {
 				log = "Fully blue activated"
@@ -40,7 +40,7 @@ HIP_antifa_bop = {
 			modifier = {
 				industrial_capacity_factory = 0.1
 				industrial_capacity_dockyard = 0.1
-				consumer_goods_factor = 0.04
+				consumer_goods_factor = 0.08
 			}
 			on_activate = {
 				log = "Very blue activated"
diff --git a/common/bop/NOR.txt b/common/bop/NOR.txt
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/common/bop/SWE.txt b/common/bop/SWE.txt
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/common/characters/CCN.txt b/common/characters/CCN.txt
index 23a42928d56..87b0ffd0c0d 100644
--- a/common/characters/CCN.txt
+++ b/common/characters/CCN.txt
@@ -354,7 +354,7 @@ characters={
 			available = {
 				if = {
 					limit = { country_exists = CHN }
-					NOT = { CHN = { has_idea = chnairmarshal1 } }
+					NOT = { CHN = { has_idea = idea_chnairmarshal1 } }
 				}
 			}
 			traits = {
@@ -382,7 +382,7 @@ characters={
 			available = {
 				if = {
 					limit = { country_exists = CHN }
-					NOT = { CHN = { has_idea = chnairmarshal2 } }
+					NOT = { CHN = { has_idea = idea_chnairmarshal2 } }
 				}
 			}
 			traits = {
@@ -410,7 +410,7 @@ characters={
 			available = {
 				if = {
 					limit = { country_exists = CHN }
-					NOT = { CHN = { has_idea = chnairmarshal3 } }
+					NOT = { CHN = { has_idea = idea_chnairmarshal3 } }
 				}
 			}
 			traits = {
diff --git a/common/characters/CHN.txt b/common/characters/CHN.txt
index 453403ae26a..e68d67d7658 100644
--- a/common/characters/CHN.txt
+++ b/common/characters/CHN.txt
@@ -425,7 +425,7 @@ characters={
 			}
 		}
 		corps_commander={
-			traits={ armor_officer changeling_race_trait }
+			traits={ jaeger changeling_race_trait }
 			skill=4
 			attack_skill=4
 			defense_skill=3
diff --git a/common/characters/EQC.txt b/common/characters/EQC.txt
index 03df5fb6a4e..9030c35be94 100644
--- a/common/characters/EQC.txt
+++ b/common/characters/EQC.txt
@@ -127,6 +127,7 @@ characters={
 			planning_skill=3
 			logistics_skill=3
 			legacy_id=716
+			desc = cijik_desc
 		}
 		gender = female
 	}
@@ -164,6 +165,7 @@ characters={
 			planning_skill=3
 			logistics_skill=2
 			legacy_id=711
+			desc = smol_spore_desc
 		}
 	}
 	EQC_wandering_sunrise={
@@ -236,6 +238,7 @@ characters={
 			planning_skill=1
 			logistics_skill=1
 			legacy_id=718
+			desc = anja_snow_desc
 		}
 		gender = female
 	}
@@ -255,6 +258,7 @@ characters={
 			planning_skill=1
 			logistics_skill=4
 			legacy_id=1595
+			desc = Sparky_desc
 		}
 	}
 	EQC_grand_wingsword={
@@ -309,6 +313,7 @@ characters={
 			planning_skill=2
 			logistics_skill=2
 			legacy_id=712
+			desc = EQC_Moonlight_poppy_desc
 		}
 		gender = female
 	}
diff --git a/common/characters/HIP.txt b/common/characters/HIP.txt
index fb6cc3d2aeb..e925bf1a478 100644
--- a/common/characters/HIP.txt
+++ b/common/characters/HIP.txt
@@ -1299,11 +1299,11 @@ characters={
 			}
 		}
 		corps_commander={
-			traits = { infantry_officer artillery_specialist hippogriff_race_trait }
+			traits = { cavalry_officer desert_fox hippogriff_race_trait }
 			skill = 2
-			attack_skill = 1
+			attack_skill = 3
 			defense_skill = 2
-			planning_skill = 3
+			planning_skill = 1
 			logistics_skill = 1
 			legacy_id = 20214
 			desc = "HIP_ARCUS_DESC"
@@ -1316,6 +1316,38 @@ characters={
 			allowed = {
 				original_tag = HIP
 			}
+			traits = { army_cavalry_2 }
+			
+			ai_will_do = {
+				factor = 1
+			}
+		}
+	}
+	HIP_arden_ironquill={
+		name=HIP_arden_ironquill
+		portraits={
+			army={
+				large="gfx/leaders/HIP/arden_ironquill.tga"
+				small="gfx/interface/ideas/Advisors/HIP/HIP_arden_ironquill.tga"
+			}
+		}
+		corps_commander={
+			traits = { old_guard infantry_leader hippogriff_race_trait }
+			skill = 2
+			attack_skill = 1
+			defense_skill = 3
+			planning_skill = 2
+			logistics_skill = 1
+			desc = "HIP_ARDEN_DESC"
+		}
+		advisor = {
+			slot = high_command
+			idea_token = HIP_arden_ironquill
+			ledger = army
+			cost = 100
+			allowed = {
+				original_tag = HIP
+			}
 			traits = { army_infantry_2 }
 			
 			ai_will_do = {
@@ -1323,6 +1355,38 @@ characters={
 			}
 		}
 	}
+	HIP_ulyssess={
+		name=HIP_ulyssess
+		portraits={
+			army={
+				large="gfx/leaders/HIP/ulyssess.tga"
+				small="gfx/interface/ideas/Advisors/HIP/HIP_ulyssess.tga"
+			}
+		}
+		corps_commander={
+			traits = { panzer_leader trickster hippogriff_race_trait }
+			skill = 2
+			attack_skill = 2
+			defense_skill = 1
+			planning_skill = 1
+			logistics_skill = 3
+			desc = "HIP_ULYSSES_DESC"
+		}
+		advisor = {
+			slot = high_command
+			idea_token = HIP_ulyssess
+			ledger = army
+			cost = 100
+			allowed = {
+				original_tag = HIP
+			}
+			traits = { army_armored_1 }
+			
+			ai_will_do = {
+				factor = 1
+			}
+		}
+	}
 	HIP_lucy_duskfeather={
 		name=HIP_lucy_duskfeather
 		portraits={
diff --git a/common/characters/KIR.txt b/common/characters/KIR.txt
index a6ac1882260..cf34edadd8f 100644
--- a/common/characters/KIR.txt
+++ b/common/characters/KIR.txt
@@ -13,7 +13,7 @@ characters = {
 			expire = "1965.1.1.1"
 			id = 852000
 		}
-		country_leader ={ 
+		country_leader = {
 			desc = "KIR_rain_shine_desc"
 			ideology = theocracy_subideology
 			traits = { KIR_matriarch_superior }
@@ -37,6 +37,7 @@ characters = {
 				original_tag = KIR
 			}
 			available = {
+				is_country_leader = no
 				has_country_flag = KIR_pol_1_available
 				if = {
 					limit = {
@@ -159,6 +160,7 @@ characters = {
 				original_tag = KIR
 			}
 			available = {
+				is_country_leader = no
 				has_country_flag = KIR_pol_2_available
 			}
 			visible = {
@@ -206,6 +208,7 @@ characters = {
 				}
 			}
 			available = {
+				is_country_leader = no
 				has_country_flag = KIR_pol_4_available
 			}
 			visible = {
@@ -277,6 +280,7 @@ characters = {
 				}
 			}
 			available = {
+				is_country_leader = no
 				has_country_flag = KIR_pol_5_available
 			}
 			visible = {
@@ -307,6 +311,9 @@ characters = {
 					original_tag = KIS
 				}
 			}
+			available = {
+				is_country_leader = no
+			}
 			visible = {
 				has_country_flag = KIR_pol_6_available
 			}
@@ -347,6 +354,9 @@ characters = {
 					has_dlc = "La Resistance"
 				}
 			}
+			available = {
+				is_country_leader = no
+			}
 			visible = {
 				has_country_flag = KIR_pol_7_available
 			}
@@ -368,6 +378,9 @@ characters = {
 				original_tag = KIR
 				has_dlc = "La Resistance"
 			}
+			available = {
+				is_country_leader = no
+			}
 			visible = {
 				has_country_flag = KIR_pol_7_available
 			}
@@ -424,6 +437,9 @@ characters = {
 			allowed = {
 				original_tag = KIS
 			}
+			available = {
+				is_country_leader = no
+			}
 			visible = {
 				is_country_leader = no
 			}
@@ -449,6 +465,7 @@ characters = {
 				}
 			}
 			available = {
+				is_country_leader = no
 				NOT = {
 					has_country_flag = KIC_mission_removed_dayspring_rose_flag
 				}
@@ -537,6 +554,9 @@ characters = {
 					original_tag = KIR
 				}
 			}
+			available = {
+				is_country_leader = no
+			}
 			visible = {
 				if = {
 					limit = {
@@ -629,6 +649,7 @@ characters = {
 				original_tag = KIR
 			}
 			available = {
+				is_country_leader = no
 				has_completed_focus = KIR_focus_2a
 				has_completed_focus = KIR_focus_2b
 			}
@@ -660,6 +681,7 @@ characters = {
 				original_tag = KIR
 			}
 			available = {
+				is_country_leader = no
 				has_government = democratic
 			}
 			visible = {
@@ -712,6 +734,9 @@ characters = {
 			allowed = {
 				original_tag = KIS
 			}
+			available = {
+				is_country_leader = no
+			}
 			visible = {
 				has_country_flag = KIR_council_focus_x_flag
 			}
@@ -1552,6 +1577,9 @@ characters = {
 					original_tag = KIS
 				}
 			}
+			available = {
+				is_country_leader = no
+			}
 			visible = {
 				if = {
 					limit = {
diff --git a/common/characters/MGY.txt b/common/characters/MGY.txt
index bb375080ff4..46827077783 100644
--- a/common/characters/MGY.txt
+++ b/common/characters/MGY.txt
@@ -83,4 +83,41 @@ characters={
 		}
 		gender=female
 	}
+	MGY_annu={
+		name=MGY_annu
+		portraits={
+			army={
+				large="gfx/leaders/MGY/annu.tga"
+				small="gfx/interface/ideas/Advisors/MGY/MGY_annu.tga"
+			}
+		}
+		corps_commander={
+			traits={ pony_race_trait war_hero desert_fox }
+			skill=2
+			attack_skill=2
+			defense_skill=2
+			planning_skill=1
+			logistics_skill=2
+			desc = MGY_annu_desc
+		}
+	}
+	MGY_violetta_locifer={
+		name=MGY_violetta_locifer
+		portraits={
+			army={
+				large="gfx/leaders/MGY/violetta_locifer.tga"
+				small="gfx/interface/ideas/Advisors/MGY/MGY_violetta_locifer.tga"
+			}
+		}
+		corps_commander={
+			traits={ pony_race_trait infantry_officer desert_fox }
+			skill=1
+			attack_skill=1
+			defense_skill=1
+			planning_skill=1
+			logistics_skill=1
+			desc = MGY_violetta_locifer_desc
+		}
+		gender=female
+	}
 }
diff --git a/common/characters/NCR.txt b/common/characters/NCR.txt
index 8386e19e333..15973eb39e9 100644
--- a/common/characters/NCR.txt
+++ b/common/characters/NCR.txt
@@ -232,7 +232,7 @@ characters={
 				original_tag = NCR
 			}
 			modifier = {
-				consumer_goods_factor = -0.07
+				consumer_goods_factor = -0.14
 				local_resources_factor = -0.15
 			}
 			traits = {
@@ -259,7 +259,7 @@ characters={
 			modifier = {
 				research_speed_factor = 0.08
 				political_power_gain = -0.05
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 			}
 			traits = {
 
diff --git a/common/characters/PLB.txt b/common/characters/PLB.txt
index 74b7c876d33..291c2823ccb 100644
--- a/common/characters/PLB.txt
+++ b/common/characters/PLB.txt
@@ -1716,7 +1716,7 @@ characters={
 			}
 				
 			modifier = {
-				consumer_goods_factor = 0.07
+				consumer_goods_factor = 0.15
 				breakthrough_factor = 0.1
 				army_strength_factor = 0.1
 				modifier_army_sub_unit_panzerbar_attack_factor = 0.1
diff --git a/common/characters/STW.txt b/common/characters/STW.txt
index 0dd802bc03b..0f6fe5bb4e5 100644
--- a/common/characters/STW.txt
+++ b/common/characters/STW.txt
@@ -660,7 +660,7 @@ characters={
 		}
 	}
 	STW_peasant_collective = {
-		name=VIN_duke_trubach
+		name=STW_peasant_collective
 		portraits={
 			civilian={
 				large="gfx/leaders/CYA/Regency.tga"
diff --git a/common/characters/TBK.txt b/common/characters/TBK.txt
index cbed19f9d45..6401272842f 100644
--- a/common/characters/TBK.txt
+++ b/common/characters/TBK.txt
@@ -656,7 +656,7 @@ characters={
 				has_completed_focus = TBK_moonspeaker_union
 			}
 			modifier = {
-				consumer_goods_factor = 0.025
+				consumer_goods_factor = 0.05
 				compliance_growth = 0.05
 				stability_factor = 0.1
 			}
diff --git a/common/characters/WIN.txt b/common/characters/WIN.txt
index f83e57e8018..af4b0ec0e6c 100644
--- a/common/characters/WIN.txt
+++ b/common/characters/WIN.txt
@@ -479,7 +479,7 @@ characters = {
 				army_cavalry_3 
 			}
 			modifier = {
-			    consumer_goods_factor = 0.005
+			    consumer_goods_factor = 0.01
 			}
 		}
 	}
@@ -704,7 +704,7 @@ characters = {
 				army_regrouping_2 
 			}
 			modifier = {
-			    consumer_goods_factor = 0.005
+			    consumer_goods_factor = 0.01
 			}
 		}
 	}
@@ -744,7 +744,7 @@ characters = {
 				army_artillery_1 
 			}
 			modifier = {
-			    consumer_goods_factor = 0.005
+			    consumer_goods_factor = 0.01
 			}
 		}
 		gender = female
@@ -785,7 +785,7 @@ characters = {
 				army_commando_3 
 			}
 			modifier = {
-			    consumer_goods_factor = 0.005
+			    consumer_goods_factor = 0.01
 			}
 		}
 	}
@@ -825,7 +825,7 @@ characters = {
 				army_infantry_2 
 			}
 			modifier = {
-			    consumer_goods_factor = 0.005
+			    consumer_goods_factor = 0.01
 			}
 		}
 	}
@@ -865,7 +865,7 @@ characters = {
 				army_logistics_3 
 			}
 			modifier = {
-			    consumer_goods_factor = 0.005
+			    consumer_goods_factor = 0.01
 			}
 		}
 	}
@@ -977,7 +977,7 @@ characters = {
                 WIN_self_made_pony						
 			}
 			modifier = {
-			    consumer_goods_factor = 0.005
+			    consumer_goods_factor = 0.01
 			}
 		}
 	}
@@ -1014,7 +1014,7 @@ characters = {
                 unhindered_s						
 			}
 			modifier = {
-			    consumer_goods_factor = 0.005
+			    consumer_goods_factor = 0.01
 			}
 		}
 	}
@@ -1051,7 +1051,7 @@ characters = {
                 WIN_made_mare						
 			}
 			modifier = {
-			    consumer_goods_factor = 0.005
+			    consumer_goods_factor = 0.01
 			}
 		}
 	}
@@ -1088,7 +1088,7 @@ characters = {
                 silent_workgriffon						
 			}
 			modifier = {
-			    consumer_goods_factor = 0.005
+			    consumer_goods_factor = 0.01
 			}
 		}
 	}
@@ -1125,7 +1125,7 @@ characters = {
                 captain_of_industry						
 			}
 			modifier = {
-			    consumer_goods_factor = 0.005
+			    consumer_goods_factor = 0.01
 			}
 		}
 	}
@@ -1162,7 +1162,7 @@ characters = {
                 war_industrialist						
 			}
 			modifier = {
-			    consumer_goods_factor = 0.005
+			    consumer_goods_factor = 0.01
 			}
 		}
 	}
@@ -1477,7 +1477,7 @@ characters = {
                 army_chief_organizational_2						
 			}
 			modifier = {
-			    consumer_goods_factor = 0.005
+			    consumer_goods_factor = 0.01
 			}
 		}
 	}
@@ -1515,7 +1515,7 @@ characters = {
                 army_chief_morale_3						
 			}
 			modifier = {
-			    consumer_goods_factor = 0.005
+			    consumer_goods_factor = 0.01
 			}
 		}
 	}
@@ -1698,7 +1698,7 @@ characters = {
 				navy_chief_commerce_raiding_2 
 			}
 			modifier = {
-			    consumer_goods_factor = 0.005
+			    consumer_goods_factor = 0.01
 			}
 		}
 	}
@@ -1736,7 +1736,7 @@ characters = {
 				navy_chief_maneuver_2 
 			}
 			modifier = {
-			    consumer_goods_factor = 0.005
+			    consumer_goods_factor = 0.01
 			}
 		}
 	}
@@ -1930,7 +1930,7 @@ characters = {
                 air_chief_safety_3						
 			}
 			modifier = {
-			    consumer_goods_factor = 0.005
+			    consumer_goods_factor = 0.01
 			}
 		}
 	}
@@ -1968,7 +1968,7 @@ characters = {
                 air_chief_ground_support_2						
 			}
 			modifier = {
-			    consumer_goods_factor = 0.005
+			    consumer_goods_factor = 0.01
 			}
 		}
 	}
@@ -2634,7 +2634,7 @@ characters = {
 			}
 			modifier = {
 			    army_attack_factor = 0.05
-				consumer_goods_factor = 0.005
+				consumer_goods_factor = 0.01
 			}
 		}
 	}
diff --git a/common/characters/YAL.txt b/common/characters/YAL.txt
index 3c7032fb0bc..62ea4540454 100644
--- a/common/characters/YAL.txt
+++ b/common/characters/YAL.txt
@@ -190,14 +190,15 @@ characters={
 		}
 		corps_commander={
 			traits={ griffon_race_trait armchair_general media_personality artillery_specialist }
-			skill=1
+			skill=2
 			attack_skill=1
 			defense_skill=1
-			planning_skill=1
-			logistics_skill=1
+			planning_skill=3
+			logistics_skill=2
+			desc = YAL_tommykay_desc
 		}
 		advisor = {
-			cost = 50
+			cost = 100
 			slot = high_command
 			idea_token = YAL_tommykay
 			ledger = army
@@ -205,7 +206,7 @@ characters={
 				original_tag = YAL
 			}
 
-			traits = { army_artillery_1 }
+			traits = { army_artillery_2 }
 
 			ai_will_do = {
 				factor = 1
diff --git a/common/countries/cosmetic.txt b/common/countries/cosmetic.txt
index dc28364cd93..39adf570d17 100644
--- a/common/countries/cosmetic.txt
+++ b/common/countries/cosmetic.txt
@@ -390,6 +390,11 @@ PLB_crusade = {
 	color_ui = rgb { 87 104 170 }
 }
 
+PLB_wild_hunt = {
+	color = rgb { 62 97 88 }
+	color_ui = rgb { 62 97 88 }
+}
+
 PLB_realm_of_beasts = {
 	color = rgb { 94 63 140 }
 	color_ui = rgb { 94 63 140 }
diff --git a/common/country_leader/00_traits.txt b/common/country_leader/00_traits.txt
index 08d3d148399..b8aba1a991d 100644
--- a/common/country_leader/00_traits.txt
+++ b/common/country_leader/00_traits.txt
@@ -10,19 +10,21 @@
 @chief_experience_gain_medium = 0.30
 @chief_experience_gain_high = 0.40
 
+###Todo remove commented advisor experience gains
+
 leader_traits = {
-	
+
 	dictator = {
 		random = no
 		political_power_factor = 0.25
 		weekly_casualties_war_support = 0.001
 		ai_desired_divisions_factor = 0.20
-		
+
 		ai_will_do = {
 			factor = 1
 		}
 	}
-	
+
 	warrior_code = {
 		random = no
 		ai_call_ally_desire_factor = -40
@@ -63,31 +65,31 @@ leader_traits = {
 			factor = 1
 		}
 	}
-	
+
 	ww_one_trauma = {
 		random = no
 		ai_call_ally_desire_factor = 10
-		
+
 		ai_will_do = {
 			factor = 1
 		}
 	}
-	
+
 	stout_defender = { # This particular trait will make the AI heavily prioritize defensive warfare, rarely, if ever, attacking out of fortified locations
 		random = no
 		ai_focus_defense_factor = 0.5
 		ai_focus_peaceful_factor = 0.1
-		
+
 		ai_will_do = {
 			factor = 1
 		}
 	}
-	
+
 	warmonger = {
 		random = no
 		ai_focus_aggressive_factor = 0.5
 		ai_focus_peaceful_factor = -0.15
-		
+
 		ai_will_do = {
 			factor = 1
 		}
@@ -98,7 +100,7 @@ leader_traits = {
 		political_power_factor = -0.3
 		stability_factor = 0.05
 		justify_war_goal_time = -0.25
-		
+
 		ai_will_do = {
 			factor = 1
 		}
@@ -109,7 +111,7 @@ leader_traits = {
 		war_support_factor = 0.05
 		stability_factor = 0.05
 		justify_war_goal_time = -0.25
-		
+
 		ai_will_do = {
 			factor = 1
 		}
@@ -119,7 +121,7 @@ leader_traits = {
 		random = no
 		political_power_factor = -0.5
 		stability_factor = -0.1
-		
+
 		ai_will_do = {
 			factor = 1
 		}
@@ -129,7 +131,7 @@ leader_traits = {
 		random = no
 		political_power_factor = -0.3
 		stability_factor = -0.2
-		
+
 		ai_will_do = {
 			factor = 1
 		}
@@ -140,7 +142,7 @@ leader_traits = {
 		trade_laws_cost_factor = -0.25
 		economy_cost_factor = -0.25
 		industrial_capacity_factory = 0.1
-		
+
 		ai_will_do = {
 			factor = 1
 		}
@@ -149,7 +151,7 @@ leader_traits = {
 	wallis_fancy_title = {
 		random = no
 		neutrality_drift = 0.05
-		
+
 		ai_will_do = {
 			factor = 1
 		}
@@ -165,7 +167,7 @@ leader_traits = {
 		air_chief_cost_factor = 0.25
 		army_chief_cost_factor = 0.25
 		navy_chief_cost_factor = 0.25
-		
+
 		ai_will_do = {
 			factor = 1
 		}
@@ -174,7 +176,7 @@ leader_traits = {
 	headstrong = {
 		random = no
 		political_power_factor = 0.15
-		
+
 		ai_will_do = {
 			factor = 1
 		}
@@ -185,7 +187,7 @@ leader_traits = {
 		stability_factor = 0.15
 		industrial_capacity_factory = 0.05
 		industrial_capacity_dockyard = 0.05
-		
+
 		ai_will_do = {
 			factor = 1
 		}
@@ -203,7 +205,7 @@ leader_traits = {
 		air_chief_cost_factor = -0.25
 		army_chief_cost_factor = -0.25
 		navy_chief_cost_factor = -0.25
-		
+
 		ai_will_do = {
 			factor = 1
 		}
@@ -214,8 +216,8 @@ leader_traits = {
 		political_power_factor = -0.1
 		stability_factor = 0.05
 		neutrality_drift = 0.05
-		consumer_goods_factor = -0.05
-		
+		consumer_goods_factor = -0.15
+
 		ai_will_do = {
 			factor = 1
 		}
@@ -226,7 +228,7 @@ leader_traits = {
 		political_power_factor = -0.1
 		war_support_factor = 0.05
 		conscription = 0.01
-		
+
 		ai_will_do = {
 			factor = 1
 		}
@@ -235,7 +237,7 @@ leader_traits = {
 	stammer = {
 		random = no
 		political_power_factor = -0.1
-		
+
 		ai_will_do = {
 			factor = 1
 		}
@@ -244,8 +246,8 @@ leader_traits = {
 	humble = {
 		random = no
 		neutrality_drift = 0.05
-		consumer_goods_factor = -0.05
-		
+		consumer_goods_factor = -0.15
+
 		ai_will_do = {
 			factor = 1
 		}
@@ -255,7 +257,7 @@ leader_traits = {
 		random = no
 		war_support_factor = 0.1
 		political_power_factor = 0.05
-		
+
 		ai_will_do = {
 			factor = 1
 		}
@@ -264,7 +266,7 @@ leader_traits = {
 	chamberlain_appeaser = {
 		random = no
 		war_support_factor = -0.05
-		
+
 		ai_will_do = {
 			factor = 1
 		}
@@ -273,7 +275,7 @@ leader_traits = {
 	rearmer = {
 		random = no
 		industrial_capacity_factory = 0.05
-		
+
 		ai_will_do = {
 			factor = 1
 		}
@@ -283,7 +285,7 @@ leader_traits = {
 		random = no
 		political_power_factor = 0.05
 		political_advisor_cost_factor = -0.1
-		
+
 		ai_will_do = {
 			factor = 1
 		}
@@ -299,7 +301,7 @@ leader_traits = {
 				air_range = 0.01
 			}
 		}
-		
+
 		ai_will_do = {
 			factor = 1
 		}
@@ -312,17 +314,17 @@ leader_traits = {
 				air_range = 0.1 naval_strike_attack = 0.1
 			}
 		}
-		
+
 		ai_will_do = {
 			factor = 1
 		}
 	}
 
-	
-	indomitable_perseverance = { # Ground units get 4 more Morale 
+
+	indomitable_perseverance = { # Ground units get 4 more Morale
 		random = no
 		army_morale_factor = 0.04
-		
+
 		ai_will_do = {
 			factor = 1
 		}
@@ -337,14 +339,14 @@ leader_traits = {
 		random = no
 		production_speed_buildings_factor = 0.01
 	}
-	
+
 	#ESPIONAGE IDEAS#
-	
+
 	head_of_intelligence = {
 		random = no
+		
 		operative_slot = 1
 		agency_upgrade_time = -0.15
-
 		ai_will_do = {
 			factor = 1
 			modifier = {
@@ -353,66 +355,67 @@ leader_traits = {
 			}
 		}
 	}
-	
+
 	mastermind_code_cracker = {
 		random = no
+		
 		decryption_power = 15
 	}
 
 
-	#ai_focus_defense_factor
-	#ai_focus_aggressive_factor
-	#ai_focus_production_factor
-	#ai_focus_military_advancements_factor
-	#ai_focus_peaceful_factor
-	#ai_focus_naval_factor
-	#ai_focus_naval_air_factor
-	#ai_focus_aviation_factor
+#ai_focus_defense_factor
+#ai_focus_aggressive_factor
+#ai_focus_production_factor
+#ai_focus_military_advancements_factor
+#ai_focus_peaceful_factor
+#ai_focus_naval_factor
+#ai_focus_naval_air_factor
+#ai_focus_aviation_factor
+
 
-	
 	tenacious_defender = {
 		random = no
-		
+
 		ai_will_do = {
 			factor = 1
 		}
 	}
-	
+
 	exiled = {
 		random = no
-		
+
 		ai_will_do = {
 			factor = 1
 		}
 	}
-	
+
 	political_prisoner = {
 		random = no
-		
+
 		ai_will_do = {
 			factor = 1
 		}
 	}
-	
+
 	assassination_survivor = {
 		random = no
-		
+
 		ai_will_do = {
 			factor = 1
 		}
 	}
-	
+
 	stalins_puppet = {
 		random = no
-		
+
 		ai_will_do = {
 			factor = 1
 		}
 	}
-	
+
 	union_man = {
 		random = no
-		
+
 		ai_will_do = {
 			factor = 1
 		}
@@ -421,7 +424,7 @@ leader_traits = {
 	political_dancer = {
 		random = no
 		political_power_factor = 0.15
-		
+
 		ai_will_do = {
 			factor = 1
 		}
@@ -430,7 +433,7 @@ leader_traits = {
 	staunch_constitutionalist = {
 		random = no
 		drift_defence_factor = 0.5
-		
+
 		ai_will_do = {
 			factor = 1
 		}
@@ -472,7 +475,7 @@ leader_traits = {
 	cornered_fox = {
 		random = no
 		army_defence_factor = 0.15
-		army_morale_factor = 0.10
+		army_morale_Factor = 0.10
 
 		ai_will_do = {
 			factor = 1
@@ -485,7 +488,7 @@ leader_traits = {
 		justify_war_goal_time = 0.15
 		subversive_activites_upkeep = -0.3
 		max_command_power = 30
-		
+
 		ai_will_do = {
 			factor = 1
 		}
@@ -518,7 +521,7 @@ leader_traits = {
 	railroad_enthusiast = { #Valentin Campa
 		random = no
 		production_speed_rail_way_factor = 0.25
-		
+
 		ai_will_do = {
 			factor = 1
 		}
@@ -528,19 +531,19 @@ leader_traits = {
 		random = no
 		army_morale_factor = 0.05
 		political_power_factor = 0.10
-		
+
 		ai_will_do = {
 			factor = 1
 		}
-	}		
+	}
 
 	revolutionary_general = { #Francisco José Mugica
 		random = no
-		resistance_growth_on_our_occupied_states = 0.25 
+		resistance_growth_on_our_occupied_states = 0.25
 		mobilization_laws_cost_factor = -0.25
 		economy_cost_factor = -0.25
 		theorist_cost_factor = -0.25
-		
+
 		ai_will_do = {
 			factor = 1
 		}
@@ -590,20 +593,20 @@ leader_traits = {
 
 	refounder_of_mexico = { # democratic Cardenas
 		random = no
-		
+
 		stability_factor = 0.05
 		trade_opinion_factor = 0.2
 
 		ai_will_do = {
 			factor = 1
 		}
-	}		
+	}
 
 	the_gentleman_president = { #Manuel Avila Camacho
 		random = no
 		stability_factor = 0.05
 		improve_relations_maintain_cost_factor = -0.5
-		
+
 		ai_will_do = {
 			factor = 1
 		}
@@ -613,25 +616,25 @@ leader_traits = {
 		random = no
 		stability_factor = 0.1
 		production_speed_infrastructure_factor = 0.2
-	
+
 		ai_will_do = {
 			factor = 1
 		}
 	}
 
-	conservative_nationalist_lar = { #Antonio de Oliveira Salazar - LAR 
+	conservative_nationalist_lar = { #Antonio de Oliveira Salazar - LAR
 		random = no
 		stability_weekly = 0.005
 		production_speed_infrastructure_factor = 0.2
-		
+
 		ai_will_do = {
 			factor = 1
 		}
 	}
-	
+
 	the_silver_president = { #Juan Andreu
 		random = no
-		consumer_goods_factor = -0.05
+		consumer_goods_factor = -0.15
 		fascism_acceptance = 50
 		ai_will_do = {
 			factor = 1
@@ -643,7 +646,7 @@ leader_traits = {
 
 		stability_factor = 0.05
 		industrial_capacity_factory = 0.1
-		
+
 		ai_will_do = {
 			factor = 1
 		}
@@ -653,7 +656,7 @@ leader_traits = {
 		random = no
 		industrial_capacity_factory = 0.1
 		drift_defence_factor = 0.15
-		
+
 		ai_will_do = {
 			factor = 1
 		}
@@ -677,10 +680,10 @@ leader_traits = {
 		ai_will_do = {
 			factor = 1
 		}
-	}	
+	}
 
 	fascist_sympathies = {
-		random = no		
+		random = no
 		fascism_acceptance = 70
 
 		ai_will_do = {
@@ -755,7 +758,7 @@ leader_traits = {
 		air_chief_cost_factor = -0.25
 		army_chief_cost_factor = -0.25
 		navy_chief_cost_factor = -0.25
-		
+
 		ai_will_do = {
 			factor = 1
 		}
@@ -823,7 +826,15 @@ leader_traits = {
 
 	popular_figurehead2 = {
 		stability_factor = 0.05
-		
+
+		ai_will_do = {
+			factor = 1
+		}
+	}
+
+	popular_figurehead3 = {
+		stability_factor = 0.1
+
 		ai_will_do = {
 			factor = 1
 		}
@@ -854,7 +865,7 @@ leader_traits = {
 		air_chief_cost_factor = -0.25
 		army_chief_cost_factor = -0.25
 		navy_chief_cost_factor = -0.25
-		
+
 		ai_will_do = {
 			factor = 1
 		}
@@ -883,14 +894,14 @@ leader_traits = {
 		army_core_attack_factor = 0.1
 		army_core_defence_factor = 0.1
 	}
-	
+
 	red_army_organizer = { # Trotsky's trait if invited to join the Mexican government. Combines effects of Genius Army Organizer and Communist Revolutionary
 		army_org_factor = 0.12
 		experience_gain_army = @chief_experience_gain_high
 		communism_drift = 0.1
 
 		command_cap = @tier3
-		
+
 		ai_will_do = {
 			factor = 2
 		}
@@ -930,14 +941,14 @@ leader_traits = {
 		random = no
 		trade_laws_cost_factor = -0.33
 		economy_cost_factor = -0.33
-		consumer_goods_factor = -0.05
+		consumer_goods_factor = -0.15
 	}
 
 	strict_austerity_adherent = {
 		random = no
 		stability_factor = -0.15
 		economy_cost_factor = 0.5
-		consumer_goods_factor = -0.1
+		consumer_goods_factor = -0.30
 	}
 
 	defeatist = {
@@ -1071,7 +1082,7 @@ leader_traits = {
 
 	disgraced_monarch = {
 		random = no
-		consumer_goods_factor = -0.05
+		consumer_goods_factor = -0.15
 		stability_factor = -0.1
 	}
 
@@ -1104,6 +1115,11 @@ leader_traits = {
 	militant_socialist = {
 		random = no
 		war_support_factor = 0.05
+		targeted_modifier = {
+			tag = STG
+			attack_bonus_against = 0.1
+			defense_bonus_against = 0.1
+		}
 	}
 
 	constitutional_monarch_minor = { #Dom Duarte Nuno, King of Portugal
@@ -1138,7 +1154,7 @@ leader_traits = {
 		air_chief_cost_factor = -0.15
 		army_chief_cost_factor = -0.15
 		navy_chief_cost_factor = -0.15
-		
+
 		ai_will_do = {
 			factor = 1
 		}
@@ -1161,7 +1177,7 @@ leader_traits = {
 		war_support_factor = 0.15
 		political_power_gain = 0.15
 		political_advisor_cost_factor = -0.25
-		
+
 		ai_will_do = {
 			factor = 1
 		}
@@ -1177,7 +1193,7 @@ leader_traits = {
 		random = no
 		stability_factor = 0.05
 		economy_cost_factor = -0.33
-		consumer_goods_factor = -0.03
+		consumer_goods_factor = -0.10
 		democratic_acceptance = 50
 		fascism_acceptance = -25
 		communism_acceptance = -25
@@ -1198,19 +1214,6 @@ leader_traits = {
 		justify_war_goal_time = -0.15
 	}
 
-	# likes_turkey = {
-	# 	random = no
-	# 	ai_strategy = {
-	# 		type = befriend
-	# 		id = "TUR"			
-	# 		value = 50
-	# 	}
-		
-	# 	ai_will_do = {
-	# 		factor = 1
-	# 	}
-	# }
-
 	archon_basileus = {
 		random = no
 		political_power_gain = 0.15
@@ -1388,7 +1391,7 @@ leader_traits = {
 
 	the_statist = { #Peker
 		random = no
-		consumer_goods_factor = -0.03
+		consumer_goods_factor = -0.10
 		political_power_factor = 0.1
 		production_speed_arms_factory_factor = 0.05
 		production_speed_industrial_complex_factor = 0.05
@@ -1396,7 +1399,7 @@ leader_traits = {
 
 	the_academic = { #Aydemir
 		random = no
-		consumer_goods_factor = -0.03
+		consumer_goods_factor = -0.10
 		political_power_factor = 0.1
 		industrial_capacity_factory = 0.05
 		production_factory_efficiency_gain_factor = 0.05
@@ -1419,7 +1422,7 @@ leader_traits = {
 		random = no
 		political_power_factor = -0.3
 		stability_factor = -0.1
-		
+
 		ai_will_do = {
 			factor = 1
 		}
@@ -1448,20 +1451,20 @@ leader_traits = {
 		training_time_factor = -0.05
 		fascism_drift = 0.1
 	}
-	
+
 	devoted_corporatist = {
 		random = no
 
 		political_power_factor = 0.1
 		industrial_capacity_factory = 0.05
-	}	
+	}
 
 	sharp_tongued_lawyer = {
 		random = no
 
 		improve_relations_maintain_cost_factor = -0.5
 		drift_defence_factor = 0.25
-	}	
+	}
 
 	resolute_social_democrat = {
 		random = no
@@ -1469,7 +1472,7 @@ leader_traits = {
 		stability_factor = 0.05
 		political_power_factor = 0.05
 		democratic_drift = 0.1
-	}	
+	}
 
 	gifted_shipping_magnate = {
 		random = no
@@ -1517,7 +1520,7 @@ leader_traits = {
 		production_speed_industrial_complex_factor = 0.05
 		industrial_capacity_factory = 0.05
 		drift_defence_factor = 0.25
-	}	
+	}
 
 	prime_minister_cakmak = {
 		random = no
@@ -1547,7 +1550,7 @@ leader_traits = {
 	prime_minister_saracoglu = {
 		random = no
 
-		consumer_goods_factor = -0.03
+		consumer_goods_factor = -0.10
 		political_power_gain = 0.05
 		opinion_gain_monthly_factor = 0.25
 		enemy_justify_war_goal_time = 0.25
@@ -1556,7 +1559,7 @@ leader_traits = {
 	prime_minister_peker = {
 		random = no
 
-		consumer_goods_factor = -0.03
+		consumer_goods_factor = -0.10
 		production_speed_arms_factory_factor = 0.07
 		production_speed_industrial_complex_factor = 0.07
 		fascism_drift = 0.1
@@ -1665,7 +1668,7 @@ leader_traits = {
 		political_power_factor = 0.15
 		stability_factor = 0.05
 		war_support_factor = 0.05
-		
+
 		ai_will_do = {
 			factor = 1
 		}
@@ -1674,7 +1677,7 @@ leader_traits = {
 	# BULGARIA LEADER TRAITS
 	tsar_unifier = { #Tsar Boris III
 		random = no
-		war_support_factor = -0.1		
+		war_support_factor = -0.1
 		neutrality_drift = 0.05
 		drift_defence_factor = 0.25
 	}
@@ -1778,7 +1781,7 @@ leader_traits = {
 	the_bloody_professor_regency_council = { #Regency Council (led by Aleksandar Tsankov)
 		random = no
 		master_ideology_drift = 0.1
-		war_support_weekly = 0.005
+		war_support_factor = 0.05
 		mobilization_speed = 0.1
 		fascism_drift = 0.1
 		foreign_subversive_activites = -0.5
@@ -1828,7 +1831,7 @@ leader_traits = {
 		random = no
 		production_speed_industrial_complex_factor = 0.1
 		production_speed_infrastructure_factor = 0.05
-		consumer_goods_factor = -0.03
+		consumer_goods_factor = -0.10
 	}
 
 	womens_rights_activist = {
@@ -1849,7 +1852,7 @@ leader_traits = {
 		random = no
 		fascism_drift = 0.05
 		political_power_factor = 0.1
-		consumer_goods_factor = -0.05
+		consumer_goods_factor = -0.15
 	}
 
 	nazi_sympathizer = {
@@ -1974,7 +1977,7 @@ leader_traits = {
 	tainted_ras = {
 		random = no
 		production_factory_efficiency_gain_factor = -0.1
-		consumer_goods_factor = 0.05
+		consumer_goods_factor = 0.10
 		equipment_capture_factor = 0.25
 		neutrality_acceptance = 30
 		
@@ -1982,7 +1985,7 @@ leader_traits = {
 	tainted_ras_2 = {
 		random = no
 		production_factory_efficiency_gain_factor = -0.1
-		consumer_goods_factor = 0.05
+		consumer_goods_factor = 0.10
 		equipment_capture_factor = 0.25
 		neutrality_acceptance = 30
 		stability_factor = 0.05
@@ -2005,7 +2008,7 @@ leader_traits = {
 		neutrality_acceptance = 30
 		
 	}
-	
+
 	# Alemework Beyene
 	gallant_doctor = {
 		random = no
@@ -2049,7 +2052,7 @@ leader_traits = {
 	liberator_of_eth_haymanot = {
 		random = no
 		production_factory_efficiency_gain_factor = 0
-		consumer_goods_factor = 0.1
+		consumer_goods_factor = 0.20
 		equipment_capture_factor = 0.25
 		neutrality_acceptance = 30
 		stability_factor = 0.1
@@ -2106,7 +2109,6 @@ leader_traits = {
 		request_lease_tension = -0.3
 		production_factory_max_efficiency_factor = 0.1
 		female_random_army_leader_chance = 0.35
-		female_divisional_commander_chance = 0.35
 	}
 
 	minister_of_the_interior_aregai = {
@@ -2133,7 +2135,7 @@ leader_traits = {
 
 	anti_unionist_pure_anarchist = {
 		random = no
-		consumer_goods_factor = -0.02
+		consumer_goods_factor = -0.05
 		production_speed_buildings_factor = 0.1
 		industry_free_repair_factor = 0.15
 	}
@@ -2166,11 +2168,13 @@ leader_traits = {
 	harsh_propagandist = {
 		random = no
 		fascism_drift = 0.10
+		neutrality_drift = 0.05
 		offensive_war_stability_factor = 0.15
 	}
 	
 	commander_of_the_fetno_derash = {
 		random = no
+		
 		special_forces_cap = 0.2
 		special_forces_out_of_supply_factor = -0.1
 		agency_upgrade_time = -0.1
@@ -2180,6 +2184,7 @@ leader_traits = {
 	}
 	commander_of_the_fetno_derash_no_lar = {
 		random = no
+		
 		special_forces_cap = 0.2
 		special_forces_out_of_supply_factor = -0.15
 		resistance_growth_on_our_occupied_states = 0.15
@@ -2193,11 +2198,9 @@ leader_traits = {
 		political_power_factor = 0.05
 	}
 
-
-
 	minister_of_finance_deressa = {
 		random = no
-		consumer_goods_factor = -0.03
+		consumer_goods_factor = -0.10
 		min_export = -0.05
 		industrial_capacity_factory = 0.1
 		production_lack_of_resource_penalty_factor = -0.05
@@ -2251,7 +2254,7 @@ leader_traits = {
 	rich_sultan = {
 		random = no
 		industrial_capacity_factory = 0.05
-		consumer_goods_factor = 0.05
+		consumer_goods_factor = 0.10
 		political_power_factor = 0.1
 	}
 
@@ -2381,7 +2384,7 @@ leader_traits = {
 		opinion_gain_monthly_factor = 0.07
 		resistance_damage_to_garrison = -0.07
 	}
-	
+
 	mussolini_minister_of_justice = {
 		random = no
 		improve_relations_maintain_cost_factor = -0.25
@@ -2463,7 +2466,7 @@ leader_traits = {
 		random = no
 		party_popularity_stability_factor = 0.15
 		political_power_factor = 0.1
-		consumer_goods_factor = -0.02
+		consumer_goods_factor = -0.05
 	}
 
 	#FERRUCIO PARRI
@@ -2483,7 +2486,7 @@ leader_traits = {
 
 		political_advisor_cost_factor = -0.25
 		stability_factor = 0.1
-		consumer_goods_factor = -0.03
+		consumer_goods_factor = -0.10
 	}
 
 	### CLN ###
@@ -2632,7 +2635,7 @@ leader_traits = {
 		random = no 
 		
 		political_power_gain = 0.25
-		consumer_goods_factor = -0.02
+		consumer_goods_factor = -0.10
 		puppet_cost_factor = -0.4
 		
 		ai_will_do = {
@@ -2653,6 +2656,7 @@ leader_traits = {
 		}
 	}
 
+
 	############################
 	### ITALY ADVISOR TRAITS ###
 	############################
@@ -2790,13 +2794,17 @@ leader_traits = {
 		war_support_factor = 0.15
 		stability_factor = 0.1  
 	}
+
 	### Pro Cantons ###
+
 	SWI_radical_democrat = { #Unlocks Democratic Tradition Campaign
 		random = no
+		 
 		#power_balance_daily = 0.003
 		democratic_drift = 0.07
 		production_speed_industrial_complex_factor = 0.1
 	}
+
 	SWI_democratic_capitalist = { #Unlocks Defense Fund Drive
 		random = no 
 		#power_balance_daily = 0.003
@@ -2806,24 +2814,31 @@ leader_traits = {
 	
 	SWI_cantonal_conservative = { #Unlocks Democratic Tradition Campaign
 		random = no
+		 
 		#power_balance_daily = 0.003
 		party_popularity_stability_factor = 0.1
 		political_power_gain = 0.1
 		democratic_drift = 0.05
 	}
+
 	SWI_anarchist = { 
 		random = no
+		 
 		#power_balance_daily = 0.003
 		communism_drift = 0.05
 	}
+
 	SWI_trade_unionist = { #Unlocks Rally Workers 
 		random = no
+		 
 		#power_balance_daily = 0.003
 		communism_drift = 0.05	
 		production_factory_max_efficiency_factor = 0.05
 		production_lack_of_resource_penalty_factor = -0.3
 	}
+
 	### Pro Council ### 
+
 	SWI_fascist_appeaser = {  #Unlocks appease fascists
 		random = no
 		#power_balance_daily = -0.003
@@ -2834,13 +2849,16 @@ leader_traits = {
 	
 	SWI_fascist = { #Unlocks appease fascists
 		random = no
+		 
 		#power_balance_daily = -0.003
 		fascism_drift = 0.07
 		stability_factor = -0.1
 		war_support_factor = 0.1
 	}
+	
 	SWI_fascist_propagandist = { #Unlocks Spouse Fascism
 		random = no
+		 
 		#power_balance_daily = -0.003
 		fascism_drift = 0.07
 		war_support_factor = 0.15
@@ -2848,6 +2866,7 @@ leader_traits = {
 	
 	SWI_fascist_recruiter = { #Unlocks Spouse Fascism
 		random = no
+		 
 		#power_balance_daily = -0.003
 		fascism_drift = 0.07
 		stability_factor = -0.1
@@ -2857,12 +2876,14 @@ leader_traits = {
 	
 	SWI_corporatist = { #Unlocks Rally Workers 
 		random = no
+		 
 		#power_balance_daily = -0.003
 		democratic_drift = -0.05
 		surrender_limit = -0.1
 		opinion_gain_monthly_factor = -0.1
 		political_power_gain = 0.3
 	}
+
 	SWI_social_democrat = { #Unlocks Focus on Swiss Unity 
 		random = no
 		#power_balance_daily = -0.003
@@ -2871,6 +2892,7 @@ leader_traits = {
 		communism_drift = 0.03
 		democratic_drift = 0.05
 	}
+
 	SWI_socialist_pacifist = { #Unlocks Focus on Swiss Unity 
 		random = no
 		communism_drift = 0.05
@@ -2878,12 +2900,14 @@ leader_traits = {
 		political_power_gain = 0.25	
 		stability_factor = 0.05
 	}
+
 	SWI_pragmatic_democrat = { #Unlocks Defense Fund Drive
 		random = no
 		#power_balance_daily = -0.003
 		democratic_drift = 0.05
 		stability_factor = 0.1
 	}
+
 	SWI_conservative_democrat = { #Unlocks Isolate Switzerland
 		random = no
 		#power_balance_daily = -0.003
@@ -2891,6 +2915,7 @@ leader_traits = {
 		political_power_factor = -0.1
 		stability_factor = 0.05
 	}
+
 	SWI_militaristic_democrat = { #Unlocks Militarization Drive
 		random = no
 		#power_balance_daily = -0.003
@@ -2906,6 +2931,7 @@ leader_traits = {
 		opinion_gain_monthly_factor = -0.1
 		surrender_limit = 0.2
 	}
+
 	SWI_nationalistic_industrialist = { #Unlocks SWI_defense_fund_drive
 		random = no
 		#power_balance_daily = -0.003
@@ -2913,35 +2939,46 @@ leader_traits = {
 		production_lack_of_resource_penalty_factor = -0.3
 		war_support_factor = 0.10
 	}
+
 	SWI_soviet_spy = { #Unlocks Anti-Fascist Drive
 		random = no 
+		
 		intel_network_gain_factor = 0.2
 		communism_drift = 0.05
 		war_support_factor = 0.10
+
 	}
+
 	### Neutrals ###
+
 	SWI_diplomat = {  #Unlocks Diplomatic Mission 
 		random = no
+		 
 		opinion_gain_monthly_factor = 0.3
 		trade_opinion_factor = 0.5
 		drift_defence_factor = 0.2
 		intel_network_gain_factor = 0.15
 	}
+
 	SWI_intelligence_officer = { #Unlocks Expand Covert Operations  
 		random = no
+		
 		agency_upgrade_time = -0.15
 		decryption_factor = 0.1
 		army_intel_factor = 0.3
 		operative_slot = 1
 	}
+
 	SWI_humanitarian = { #Unlocks Support Humanitarian Efforts 
 		random = no
+		 
 		democratic_drift = 0.05		
 		war_support_factor = -0.15
 		join_faction_tension = -0.15
 		civilian_intel_factor = 0.15
 		political_power_factor = 0.5
 	}
+
 	SWI_weapons_designer = { #Unlocks Expand Arms Industry 
 		random = no 
 		production_factory_max_efficiency_factor = 0.1
@@ -2949,683 +2986,1861 @@ leader_traits = {
 		materiel_manufacturer_cost_factor = -0.75
 		research_speed_factor = 0.1
 	}
+
 	SWI_brandy_the_st_bernard_trait = {
 		random = no
 		political_power_factor = -0.3
 		stability_factor = -0.1
 		war_support_factor = -0.1
 	}
-	################################
-	## SOVIET UNION LEADER TRAITS ##
-	################################
 
-	### STALIN ###
-	stalin_political_paranoia = {
+	#########################
+	######   DENMARK   ######
+	#########################
+
+	#LEADER TRAITS
+	DEN_socialdemokrat = { #Thorvald Stauning/Vilhelm Buhl
 		random = no
-		drift_defence_factor = 0.1
-		custom_modifier_tooltip = SOV_paranoia_modifier_increase_effect_tt
+		political_power_factor = 0.05
+		party_popularity_stability_factor = 0.1
+		political_advisor_cost_factor = -0.15
+		mobilization_laws_cost_factor = 0.1
+		trade_laws_cost_factor = -0.1
 	}
 
-	stalin_political_paranoia_advanced = {
+	DEN_venstre = { #Knud Kristensen/Erik Scavenius
 		random = no
-		drift_defence_factor = 0.1
-		custom_modifier_tooltip = SOV_paranoia_advance_modifier_increase_effect_tt
+		party_popularity_stability_factor = 0.05
+		political_advisor_cost_factor = -0.15
+		consumer_goods_factor = -0.1
+		economy_cost_factor = 0.15
+		trade_laws_cost_factor = -0.15
 	}
 
-	stalin_heart_of_steel = {
+	DEN_kommunist = { #Aksel Larsen
 		random = no
-		stability_factor = -0.1
-		war_support_factor = 0.05
 		political_power_factor = 0.05
-		opinion_gain_monthly_factor = -0.05
-		subjects_autonomy_gain = -0.1
+		party_popularity_stability_factor = 0.05
+		trade_laws_cost_factor = -0.1
+		consumer_goods_factor = -0.2
+		conscription = 0.015
 	}
 
-	stalin_heart_of_steel_opposition = {
+	DEN_konservativ = { #Christmas Moller
 		random = no
-		stability_factor = -0.1
-		war_support_factor = 0.05
-		opinion_gain_monthly_factor = -0.05
-		subjects_autonomy_gain = -0.1
+		war_support_factor = 0.1
+		production_speed_arms_factory_factor = 0.05
+		mobilization_laws_cost_factor = -0.1
+		conscription = 0.025
+		custom_modifier_tooltip = DEN_military_advisors_cost_big_tt
+		hidden_modifier = {
+			air_advisor_cost_factor = -0.15
+			army_advisor_cost_factor = -0.15
+			navy_advisor_cost_factor = -0.15
+		}
 	}
 
-	stalin_inheritor_of_lenin = {
+	DEN_rightwing_populist = { #Knud Bach
 		random = no
-		political_power_factor = 0.1
-		justify_war_goal_time = -0.25
+		political_power_factor = 0.05
+		party_popularity_stability_factor = 0.1
+		war_support_factor = 0.05
+		monthly_population = 0.05
+		mobilization_laws_cost_factor = 0.15
+		economy_cost_factor = -0.1
+		trade_laws_cost_factor = -0.1
+		conscription = 0.015
 	}
 
-	stalin_inheritor_of_lenin_genius = {
+	DEN_the_king = { #Christian X
 		random = no
-		political_power_factor = 0.1
-		justify_war_goal_time = -0.25
-		research_speed_factor = 0.05
+		party_popularity_stability_factor = 0.05
+		war_support_factor = 0.05
+		mobilization_laws_cost_factor = -0.1
+		economy_cost_factor = -0.1
+		trade_laws_cost_factor = 0.15
+		conscription = 0.025
+		custom_modifier_tooltip = DEN_military_advisors_cost_big_tt
+		hidden_modifier = {
+			air_advisor_cost_factor = -0.15
+			army_advisor_cost_factor = -0.15
+			navy_advisor_cost_factor = -0.15
+		}
 	}
 
-	stalin_inheritor_of_lenin_leader = {
+	DEN_fascist_militarist = { #Cay Lembcke
 		random = no
-		political_power_factor = 0.1
-		justify_war_goal_time = -0.25
-		party_popularity_stability_factor = 0.15
-		defensive_war_stability_factor = 0.4
-		political_advisor_cost_factor = -0.25
+		war_support_factor = 0.1
+		production_speed_arms_factory_factor = 0.05
+		mobilization_laws_cost_factor = -0.1
+		economy_cost_factor = -0.1
+		trade_laws_cost_factor = 0.15
+		conscription = 0.015
+		custom_modifier_tooltip = DEN_military_advisors_cost_small_tt
+		hidden_modifier = {
+			air_advisor_cost_factor = -0.10
+			army_advisor_cost_factor = -0.10
+			navy_advisor_cost_factor = -0.10
+		}
 	}
 
-	stalin_inheritor_of_lenin_final = {
+	DEN_fascist_populist = { #Fritz Clausen
 		random = no
-		political_power_factor = 0.1
-		justify_war_goal_time = -0.25
-		research_speed_factor = 0.05
-		party_popularity_stability_factor = 0.15
-		defensive_war_stability_factor = 0.4
-		political_advisor_cost_factor = -0.25
+		political_power_factor = 0.05
+		party_popularity_stability_factor = 0.1
+		war_support_factor = 0.1
+		mobilization_laws_cost_factor = -0.1
+		economy_cost_factor = -0.1
+		trade_laws_cost_factor = 0.15
+		conscription = 0.015
 	}
 
-	stalin_servant_of_lenin = {
+	DEN_freedom_council_traits = { 
 		random = no
-		drift_defence_factor = 0.15
-		guarantee_cost = -0.5
+		custom_modifier_tooltip = ITA_political_reformer_tt
+		hidden_modifier = {
+			political_advisor_cost_factor = -0.25
+			air_advisor_cost_factor = -0.25
+			army_advisor_cost_factor = -0.25
+			navy_advisor_cost_factor = -0.25
+		}
+		mobilization_laws_cost_factor = -0.1
+		economy_cost_factor = -0.1
+		trade_laws_cost_factor = -0.1
+		conscription = 0.025
+		weekly_casualties_war_support = 0.001
+		weekly_bombing_war_support = 0.001
+		weekly_convoys_war_support = 0.001
 	}
 
-	stalin_servant_of_lenin_worship = {
+	#BEWARE! All characters with this trait will get promoted or retired through a Danish Event - use with caution
+	DEN_plenipotentiary = { 
 		random = no
-		drift_defence_factor = 0.15
-		guarantee_cost = -0.5
-		stability_factor = 0.15
+		political_power_factor = -0.05
+		mobilization_laws_cost_factor = 0.05
+		economy_cost_factor = 0.05
+		trade_laws_cost_factor = 0.05
+		consumer_goods_factor = -0.1
+		power_balance_weekly = -0.005
+		master_ideology_drift = 0.01
 	}
 
-	stalin_servant_of_lenin_leader = {
+	#ADVISOR TRAITS
+	udenrigsminister = { #Foreign Minister
 		random = no
-		drift_defence_factor = 0.15
-		guarantee_cost = -0.5
-		party_popularity_stability_factor = 0.15
-		defensive_war_stability_factor = 0.4
-		political_advisor_cost_factor = -0.25
+		improve_relations_maintain_cost_factor = -0.25
+		opinion_gain_monthly_factor = 0.15
+		trade_opinion_factor = 0.15
 	}
 
-	stalin_servant_of_lenin_final = {
+	landbrugsminister = { #Agricultural Minister
 		random = no
-		drift_defence_factor = 0.15
-		guarantee_cost = -0.5
-		stability_factor = 0.15
-		party_popularity_stability_factor = 0.15
-		defensive_war_stability_factor = 0.4
-		political_advisor_cost_factor = -0.25
+		neutrality_drift = 0.1
+		monthly_population = 0.05
+		consumer_goods_factor = -0.10
+		economy_cost_factor = -0.1
 	}
 
-	stalin_great_commander = {
+	forsvarsminister = { #Defense Minister
 		random = no
-		war_support_factor = 0.1
-		army_morale_factor = 0.05
-		annex_cost_factor = -0.1
+		production_speed_arms_factory_factor = 0.1
+		production_speed_dockyard_factor = 0.1
+		production_speed_air_base_factor = 0.1
+		production_speed_naval_base_factor = 0.1
 	}
 
-	stalin_architect_of_communism = {
+	undervisningsminister = { #Education minister
 		random = no
-		communism_drift = 0.1
-		master_ideology_drift = 0.1
-		puppet_cost_factor = -0.2
+		research_speed_factor = 0.05
 	}
 
-	stalin_father_of_nations = {
+	finansminister = { #Finance Minister
 		random = no
-		stability_weekly = 0.001
-		compliance_gain = 0.05
-		justify_war_goal_when_in_major_war_time = -0.5
-		conscription = 0.02
+		consumer_goods_factor = -0.15
+		economy_cost_factor = -0.15
+		stability_factor = 0.05
 	}
 
-	stalin_authority_undermined = {
+	welfare_architect = {
 		random = no
-		drift_defence_factor = 0.05
-		political_power_factor = 0.1
-		custom_modifier_tooltip = SOV_paranoia_modifier_increase_2_effect_tt
+		stability_factor = 0.1
+		political_power_factor = 0.05
+		consumer_goods_factor = -0.15
 	}
-	
-	
-	#BERIYA
-	unscrupulous_orchestrator = {
+
+	disarmament_proponent = {
 		random = no
-		intel_network_gain_factor = 0.15
-		own_operative_detection_chance_factor = -0.1
-		intelligence_agency_defense = 0.1
-		stability_factor = -0.1
+		stability_factor = 0.05
+		war_support_factor = -0.05
+		consumer_goods_factor = -0.1
+		trade_laws_cost_factor = -0.15
 	}
 
-	#BERIYA -> No LaR
-	unscrupulous_orchestrator_no_lar = {
+	rearmament_proponent = {
 		random = no
-		subversive_activites_upkeep = -0.35
 		war_support_factor = 0.1
-		stability_factor = -0.1
+		conscription = 0.015
+		mobilization_laws_cost_factor = -0.15
+		conversion_cost_civ_to_mil_factor = -0.1
 	}
 
-	#SMIRNOV
-	the_siberian_lenin = {
+	industry_magnate = {
 		random = no
-		resistance_activity = -0.1
-		resistance_damage_to_garrison = -0.1
-		operative_slot = 1
-		resistance_decay = 0.1
-		stability_factor = -0.05
+		production_speed_industrial_complex_factor = 0.1
+		industrial_capacity_factory = 0.1
+		industrial_capacity_dockyard = 0.1		
 	}
 
-	#THE SUPREME SOVIET
-	strong_party_discipline = {
+	#########################
+	######   FINLAND   ######
+	#########################
+
+	### COUNTRY LEADER TRAITS ###
+
+	#SVINHUFVUD & PAASIKIVI
+	kokoomus_policies = {
+		random = no
+		consumer_goods_factor = -0.1
+	}
+
+	#SVINHUFVUD
+	member_of_the_suojeluskunta = {
 		random = no
+		max_surrender_limit_offset = 0.15
+		stability_factor = -0.05
 		drift_defence_factor = 0.15
-		compliance_gain = 0.05
-		resistance_decay = 0.1
-		stability_factor = 0.1
-		surrender_limit = 0.1
 	}
 
-	#BUKHARIN
-	defender_of_the_peasantry = {
+	member_of_the_suojeluskunta_improved = {
 		random = no
-		political_power_factor = 0.1
+		max_surrender_limit_offset = 0.3
+		stability_factor = -0.05
+		drift_defence_factor = 0.25
+		justify_war_goal_when_in_major_war_time = -0.35
+		max_command_power_mult = 0.25
+	}
+
+	#PAASIKIVI
+	paasikivi_doctrine = {
+		random = no
+		war_support_factor = -0.05
 		stability_factor = 0.05
-		research_speed_factor = 0.02
+		improve_relations_maintain_cost_factor = -0.1
 		democratic_acceptance = 50
-		civilian_intel_to_others = 15
-		industrial_capacity_factory = -0.05
+		communism_acceptance = 50
 	}
 
-	#BUKHARIN -> Improved
-	hero_of_the_peasantry = {
+	paasikivi_doctrine_improved = {
 		random = no
-		political_power_factor = 0.15
+		war_support_factor = -0.05
 		stability_factor = 0.1
-		research_speed_factor = 0.05
+		improve_relations_maintain_cost_factor = -0.2
 		democratic_acceptance = 50
-		civilian_intel_to_others = 15
-		industrial_capacity_factory = -0.02
+		communism_acceptance = 50
+		compliance_gain = 0.1
+		research_speed_factor = 0.1
 	}
 
-	#RYKOV
-	labor_defense_organizer = {
+	#KALLIO
+	backed_by_political_coalition = {
 		random = no
-		consumer_goods_factor = -0.05
-		army_core_defence_factor = 0.05
-		experience_gain_army_factor = 0.05
-		research_speed_factor = -0.03
+		political_power_factor = 0.1
+		political_advisor_cost_factor = -0.25
+		trade_laws_cost_factor = -0.25
+		economy_cost_factor = -0.25
 	}
 
-	#ZINOVYEV
-	born_agitator = {
+	#RYTI
+	white_liberal_leader = {
 		random = no
-		political_power_factor = 0.1
-		conscription_factor = 0.15
-		army_morale_factor = 0.05
-		stability_factor = -0.05
-		compliance_growth = -0.05
+		political_power_factor = 0.05
+		production_factory_max_efficiency_factor = 0.05
+		neutrality_drift = 0.05
 	}
 
-	#KAMENEV
-	the_faded_star = {
+	white_liberal_leader_improved = {
 		random = no
-		research_speed_factor = 0.03
-		stability_factor = 0.1
-		compliance_gain = 0.05
-		political_power_factor = -0.1
-		drift_defence_factor = -0.1
+		political_power_factor = 0.1
+		production_factory_max_efficiency_factor = 0.1
+		neutrality_drift = 0.1
 	}
 
-	defier_of_the_sun_god = {
+	expansionist_policies = {
 		random = no
-		army_morale_factor = 0.05
-		compliance_growth = 0.05
-		targeted_modifier = {
-			tag = EQS
-			attack_bonus_against = 0.1
-			defense_bonus_against = 0.1
-		}
-		targeted_modifier = {
-			tag = NLR
-			attack_bonus_against = 0.1
-			defense_bonus_against = 0.1
-		}
+		generate_wargoal_tension = -0.25
+		justify_war_goal_time = -0.25
+		custom_modifier_tooltip = FIN_expansionist_policies_take_states_tt
 	}
 
-	supreme_representative_of_god_on_earth = {
+	#MANNERHEIM
+	sotamarsalkka = {
 		random = no
-		stability_factor = 0.1
-		war_support_factor = 0.1
-		drift_defence_factor = 1
+		conscription = 0.01
+		war_support_factor = 0.05
+		stability_factor = -0.05
+		defensive_war_stability_factor = 0.1
 	}
 
-	fascist_orchestrator = {
+	sotamarsalkka_improved = {
 		random = no
-		political_advisor_cost_factor = -0.33
-		high_command_cost_factor = -0.33
-		air_chief_cost_factor = -0.33
-		army_chief_cost_factor = -0.33
-		navy_chief_cost_factor = -0.33
-		subjects_autonomy_gain = -0.3
-		production_speed_arms_factory_factor = 0.05
-		production_speed_dockyard_factor = 0.05
+		conscription = 0.02
+		war_support_factor = 0.1
+		stability_factor = -0.05
+		defensive_war_stability_factor = 0.2
 	}
 
-	emperor_and_autocrat_of_all_the_russias = {
+	#ANNALA
+	architect_of_finnish_coporatism = {
 		random = no
-		resistance_growth_on_our_occupied_states = 0.1
-		required_garrison_factor = -0.15
-		war_support_factor = 0.05
+		trade_laws_cost_factor = -0.33
+		economy_cost_factor = -0.33
+		consumer_goods_factor = -0.15
+		global_building_slots = 1
+		production_speed_buildings_factor = 0.15
 	}
 
-	emigre_connections = {
+	#TANNER
+	pragmatic_socialist = {
 		random = no
-		weekly_manpower = 2000
-		consumer_goods_factor = -0.03
+		war_support_factor = -0.05
+		party_popularity_stability_factor = 0.1
+		political_advisor_cost_factor = -0.2
+		communism_acceptance = -35		
 	}
 
-	desperate_gambit = {
+	champion_of_national_cooperation = {
 		random = no
-		army_core_attack_factor = 0.1
-		army_core_defence_factor = 0.1
-		resistance_growth_on_our_occupied_states  = 0.25
+		party_popularity_stability_factor = 0.2
+		political_advisor_cost_factor = -0.2
+		communism_acceptance = -70
+		mobilization_laws_cost_factor = -0.33
+		economy_cost_factor = -0.33
+		conscription = 0.02
 	}
 
-	dysfunctional_assembly = {
+	#AALTONEN
+	committed_anti_fascist = {
 		random = no
-		stability_weekly = -0.002
-		political_power_gain = -0.5
+		opinion_gain_monthly_same_ideology_factor = 0.25
+		send_volunteer_size = 2
+		agency_upgrade_time = -0.15
+		drift_defence_factor = 0.5
 	}
-
-	#################################
-	## SOVIET UNION ADVISOR TRAITS ##
-	#################################
-
-	head_of_the_nkvd_yagoda_initial = {
+	unbreakable_anti_fascist = {
 		random = no
-		stability_factor = -0.05
-		enemy_operative_detection_chance = 0.1
-		enemy_operative_capture_chance_factor = 0.05
-		civilian_intel_to_others = -5
-		custom_modifier_tooltip = SOV_head_of_the_nkvd_locked_tt
+		opinion_gain_monthly_same_ideology_factor = 0.25
+		send_volunteer_size = 4
+		agency_upgrade_time = -0.3
+		drift_defence_factor = 0.5
+		root_out_resistance_effectiveness_factor = 0.2
+		war_support_factor = 0.1
 	}
 
-	head_of_the_nkvd_yagoda = {
+	committed_anti_fascist_no_lar = {
 		random = no
-		stability_factor = -0.05
-		enemy_operative_detection_chance = 0.1
-		enemy_operative_capture_chance_factor = 0.05
-		civilian_intel_to_others = -5
-		custom_modifier_tooltip = SOV_head_of_the_nkvd_yagoda_tt
-		custom_modifier_tooltip = SOV_head_of_the_nkvd_locked_tt
+		opinion_gain_monthly_same_ideology_factor = 0.25
+		send_volunteer_size = 2
+		foreign_subversive_activites = -0.15
+		drift_defence_factor = 0.5
 	}
-
-	head_of_the_nkvd_yagoda_no_paranoia = {
+	unbreakable_anti_fascist_no_lar = {
 		random = no
-		stability_factor = -0.05
-		enemy_operative_detection_chance = 0.1
-		enemy_operative_capture_chance_factor = 0.05
-		civilian_intel_to_others = -5
+		opinion_gain_monthly_same_ideology_factor = 0.25
+		send_volunteer_size = 4
+		foreign_subversive_activites = -0.3
+		drift_defence_factor = 0.5
+		subversive_activites_upkeep = -0.2
+		war_support_factor = 0.1
 	}
 
-	head_of_the_nkvd_yezhov_initial = {
+	#LEINO
+	devoted_communist = {
 		random = no
-		stability_factor = -0.1
-		enemy_operative_detection_chance = 0.1
-		enemy_operative_capture_chance_factor = 0.1
-		civilian_intel_to_others = -10
-		agency_upgrade_time = -0.1
-		custom_modifier_tooltip = SOV_head_of_the_nkvd_locked_tt
+		industrial_capacity_factory = 0.1
+		resistance_activity = -0.1
+		compliance_gain = 0.05
 	}
 
-	head_of_the_nkvd_yezhov = {
+
+	#KUUSINEN
+
+	FIN_stalins_puppet_kuusinen = {
 		random = no
-		stability_factor = -0.1
-		enemy_operative_detection_chance = 5
-		enemy_operative_capture_chance_factor = 0.1
-		civilian_intel_to_others = -10
-		agency_upgrade_time = -0.1
-		custom_modifier_tooltip = SOV_head_of_the_nkvd_yezhov_tt
-		custom_modifier_tooltip = SOV_head_of_the_nkvd_locked_tt
+		production_speed_buildings_factor = 0.1
+		custom_modifier_tooltip = FIN_stalins_puppet_kuusinen_ns_tt
+	}
+	
+	international_communist = {
+		random = no
+		opinion_gain_monthly_same_ideology_factor = 1
+		subversive_activites_upkeep = -0.5
+		conscription = 0.02
+		war_support_factor = 0.05
 	}
 
-	head_of_the_nkvd_yezhov_no_paranoia = {
+
+	#PRINCE WOLFGANG VON HESSE
+	crown_prince_of_finland = {
 		random = no
-		stability_factor = -0.1
-		enemy_operative_detection_chance = 0.1
-		enemy_operative_capture_chance_factor = 0.1
-		civilian_intel_to_others = -10
-		agency_upgrade_time = -0.1
+		custom_modifier_tooltip = FIN_crown_prince_of_finland_tt
+		fascism_acceptance = 75
+		political_power_factor = 0.1
+		stability_factor = 0.05
+		neutrality_drift = 0.1
+		conscription = 0.025
 	}
 
-	head_of_the_nkvd_beriya_initial = {
+
+
+	### BOP TRAITS COUNTRY LEADER TRAITS ###
+
+	personal_agenda_svinhufvud = {
 		random = no
-		stability_factor = -0.05
-		enemy_operative_detection_chance = 5
-		enemy_operative_capture_chance_factor = 0.15
-		civilian_intel_to_others = -10
-		intel_network_gain_factor = 0.1
-		custom_modifier_tooltip = SOV_head_of_the_nkvd_locked_tt
+		custom_modifier_tooltip = FIN_personal_agenda_svinhufvud_tt
 	}
 
-	head_of_the_nkvd_beriya = {
+	personal_agenda_kallio = {
 		random = no
-		stability_factor = -0.05
-		enemy_operative_detection_chance = 0.1
-		enemy_operative_capture_chance_factor = 0.15
-		civilian_intel_to_others = -10
-		intel_network_gain_factor = 0.1
-		custom_modifier_tooltip = SOV_head_of_the_nkvd_beriya_tt
-		custom_modifier_tooltip = SOV_head_of_the_nkvd_locked_tt
+		custom_modifier_tooltip = FIN_personal_agenda_kallio_tt
 	}
 
-	head_of_the_nkvd_beriya_no_paranoia = {
+	personal_agenda_ryti = {
 		random = no
-		stability_factor = -0.05
-		enemy_operative_detection_chance = 0.2
-		enemy_operative_capture_chance_factor = 0.15
-		civilian_intel_to_others = -10
-		intel_network_gain_factor = 0.1
+		custom_modifier_tooltip = FIN_personal_agenda_ryti_tt
 	}
 
-	#Kaganovich
-	iron_lazar = {
+	personal_agenda_mannerheim = {
 		random = no
-		equipment_bonus = {
-			train_equipment = {
-				build_cost_ic = 0.05
-				reliability = 0.15
-			}
-		}
-		production_speed_rail_way_factor = 0.05
-		production_speed_supply_node_factor = 0.05
-		fuel_gain_factor = 0.05
+		custom_modifier_tooltip = FIN_personal_agenda_mannerheim_tt
 	}
 
-	#Khrsuhchyov
-	political_commissar = {
+	personal_agenda_paasikivi = {
 		random = no
-		communism_drift = 0.1
-		political_power_factor = 0.05
-		max_command_power = 30
+		custom_modifier_tooltip = FIN_personal_agenda_paasikivi_tt
 	}
 
-	#Molotov
-	pc_for_foreign_affairs_molotov = {
+	personal_agenda_annala = {
 		random = no
-		trade_opinion_factor = 0.10
-		justify_war_goal_time = -0.1
-		fascism_acceptance = 40
+		custom_modifier_tooltip = FIN_personal_agenda_annala_tt
 	}
 
-	#Litvinov
-	pc_for_foreign_affairs_litvinov = {
+	personal_agenda_tanner = {
 		random = no
-		opinion_gain_monthly_factor = 0.15
-		enemy_justify_war_goal_time = 0.15
-		request_lease_tension = -0.2
-		democratic_acceptance = 40
+		custom_modifier_tooltip = FIN_personal_agenda_tanner_tt
 	}
 
-	#Patriarch Sergy
-	patriarch_of_moscow_and_all_russia = {
+	personal_agenda_aaltonen = {
 		random = no
-		stability_factor = 0.1
-		army_morale_factor = 0.1
-		compliance_growth_on_our_occupied_states = -0.15
+		custom_modifier_tooltip = FIN_personal_agenda_aaltonen_tt
 	}
 
-	#Smirnov
-	head_directorate_of_new_buildings = {
+	personal_agenda_leino = {
 		random = no
-		production_speed_buildings_factor = 0.1 
-		industrial_capacity_factory = 0.05
-		industrial_capacity_dockyard = 0.05
+		custom_modifier_tooltip = FIN_personal_agenda_leino_tt
 	}
 
-	#Smilga
-	soviet_economist = {
+	personal_agenda_kuusinen = {
 		random = no
-		consumer_goods_factor = -0.02
-		war_support_factor = 0.05
-		production_speed_synthetic_refinery_factor = 0.15
-		subversive_activites_upkeep = -0.05
+		custom_modifier_tooltip = FIN_personal_agenda_kuusinen_tt
 	}
 
-	#Radek
-	international_revolutionary = {
+	personal_agenda_von_hesse = {
 		random = no
-		subversive_activites_upkeep = -0.1
-		intel_network_gain_factor = 0.1
-		boost_ideology_mission_factor = 0.1
-		diplomatic_pressure_mission_factor = 0.1
-		# TODO Thomas - maybe add something relating to decisions for internatinal revolutions
+		custom_modifier_tooltip = FIN_personal_agenda_von_hesse_tt
 	}
 
-	#Preobrazhensky
-	ecomonist_publicist = {
+	### KARELIAN LEADER TRAITS ###
+
+	grandpa_vainamoinen = {
 		random = no
-		production_factory_max_efficiency_factor = 0.05
-		political_power_factor = 0.05
-		party_popularity_stability_factor = 0.1
+		consumer_goods_factor = -0.15
+		required_garrison_factor = -0.3
 	}
 
-	#Shlyapnikov
-	left_trade_unionist = {
+	tribal_warrior = {
 		random = no
-		political_power_factor = -0.1
-		drift_defence_factor = 0.1
-		research_speed_factor = 0.1
-		min_export = -0.1
+		army_speed_factor = 0.05
+		org_loss_when_moving = -0.15
+		initiative_factor = 0.04
 	}
 
-	#Trotsky
-	pc_military_naval_affairs = {
+	veteran_guerrilla_fighter = {
 		random = no
-		resistance_growth = -0.1
-		army_org_factor = 0.1
-		experience_gain_army_factor = 0.1
-		experience_gain_navy_factor = 0.1
-		party_popularity_stability_factor = -0.1
+		war_support_factor = 0.1
+		conscription_factor = 0.15
+		army_core_defence_factor = 0.1
 	}
 
-	#Bukharin
-	economy_reformer = {
+	### ADVISOR TRAITS ###
+
+	FIN_communist_revolutionary_leino = {
 		random = no
-		research_speed_factor = 0.05
-		stability_factor = 0.05
-		political_power_factor = 0.05
+		communism_drift = 0.1
+		custom_modifier_tooltip = FIN_communist_revolutionary_leino_tt
 	}
 
-	#Tomsky Default
-	right_trade_unionist = {
+	FIN_technocrat_saarinen = {
 		random = no
-		industrial_capacity_factory = 0.1
-		production_factory_max_efficiency_factor = 0.1
-		line_change_production_efficiency_factor = 0.1
-		production_factory_efficiency_gain_factor = -0.05
+		production_speed_industrial_complex_factor = 0.05
+		research_speed_factor = 0.05
+		custom_modifier_tooltip = FIN_technocrat_saarinen_tt
 	}
 
-	#Tomsky Improved
-	chair_of_the_unions = {
+	FIN_patriotic_socialist_kuusinen = {
 		random = no
-		industrial_capacity_factory = 0.1
-		production_factory_max_efficiency_factor = 0.15
-		line_change_production_efficiency_factor = 0.1
+		communism_drift = 0.05
+		war_support_factor = 0.1
+		custom_modifier_tooltip = FIN_patriotic_socialist_kuusinen_tt
 	}
 
-	#Rykov
-	peoples_commissar_for_posts_and_telegraphs = {
+	FIN_democratic_reformer_fagerholm = {
 		random = no
-		political_power_factor = 0.05
-		land_reinforce_rate = 0.02
+		democratic_drift = 0.1
+		custom_modifier_tooltip = FIN_democratic_reformer_fagerholm_tt
 	}
 
-	#Zinovyev
-	communist_theorist = {
+	FIN_humble_appeaser_tanner = {
 		random = no
-		drift_defence_factor = 0.1
-		political_power_factor = 0.15
+		war_support_factor = -0.05
+		stability_factor = 0.1
+		custom_modifier_tooltip = FIN_humble_appeaser_tanner_tt
 	}
 
-	#Kamenev
-	appeasing_technocrat = {
+	FIN_champion_of_equality_sillanpaa = {
 		random = no
-		drift_defence_factor = -0.1
-		political_power_factor = 0.15
+		political_power_factor = 0.1
 		stability_factor = 0.1
-		compliance_gain = 0.02
+		democratic_drift = 0.05
+		custom_modifier_tooltip = FIN_champion_of_equality_sillanpaa_tt
 	}
 
-	#Ryutin
-	anti_stalinist_propagandist = {
+
+	white_liberal = {
 		random = no
-		subversive_activites_upkeep = -0.15
-		boost_resistance_factor = 0.1
-		resistance_decay_on_our_occupied_states = -0.1
-		intel_from_operatives_factor = 0.1
+		neutrality_drift = 0.05
+		production_factory_max_efficiency_factor = 0.05
+		political_power_factor = 0.05
 	}
 
-	#Sokolnikov
-	peoples_commissar_of_finance = {
+	fascist_corporatist = {
 		random = no
-		industrial_capacity_factory = 0.15
-		industrial_capacity_dockyard = 0.15
-		production_speed_buildings_factor = -0.05
-		industry_repair_factor = -0.05
+		fascism_drift = 0.05
+		industrial_capacity_factory = 0.05
+		political_power_factor = 0.05
 	}
 
-	#Semyonov
-	ataman_transbaikal_host = {
+	model_cajander = {
 		random = no
-		army_attack_against_major_factor = 0.15
-		stability_factor = -0.05
-		political_power_factor = -0.05
-		army_attack_speed_factor = 0.1
-		unit_motorized_design_cost_factor = -0.25
+		stability_factor = 0.1
+		war_support_factor = -0.05
+		consumer_goods_factor = -0.15
+		mobilization_speed = -0.1
+		mobilization_laws_cost_factor = 0.15
 	}
 
-	internal_rivalry = {
+	hurja_hilja = {
 		random = no
-		political_power_factor = -0.05
-		encryption_factor = -0.15
-		join_faction_tension = 0.5
-		opinion_gain_monthly_factor = -0.25
+		stability_factor = -0.05
+		fascism_drift = 0.05
+		resistance_growth_on_our_occupied_states = 0.1
+		political_power_factor = 0.1
 	}
 
-	political_chameleon = {
+	nationalist_lutheran_priest = {
 		random = no
-		stability_factor = 0.1
+		weekly_manpower = 200
+		fascism_drift = 0.05
+		political_power_factor = 0.05
 	}
 
-	mladorossi_theorist = {
+	maan_turva_headman = {
 		random = no
-		stability_weekly = -0.001
-		political_power_factor = 0.10
-		communism_drift = 0.03
-		neutrality_drift = 0.15
+		intelligence_agency_defense = 0.05
+		civilian_intel_to_others = -10
+		resistance_damage_to_garrison = 0.1
+		drift_defence_factor = 0.2
 	}
 
-	the_foreign_connection = {
+	white_chaplain = {
 		random = no
-		fascism_drift = 0.1
-		consumer_goods_factor = -0.03
-		opinion_gain_monthly_same_ideology_factor = 0.15
+		war_support_factor = 0.05
+		army_morale_factor = 0.05
+		army_core_defence_factor = 0.05
+		drift_defence_factor = 0.1
 	}
 
-	theocratic_diplomat = {
+	karelian_irredentist_writer = {
 		random = no
-		opinion_gain_monthly_factor = 0.15
-		drift_defence_factor = 0.15
+		stability_factor = 0.05
 		political_power_factor = 0.05
+		justify_war_goal_time = -0.1
+		communism_drift = -0.1
 	}
 
-	orthodox_rabblerouser = {
+	agrarian_nationalist = {
 		random = no
-		conscription = 0.01
-		non_core_manpower = 0.025
+		political_power_factor = 0.05
+		global_building_slots_factor = 0.1
+		consumer_goods_factor = -0.10
 	}
 
-	driver_of_the_faithful = {
+	champion_of_equality = {
 		random = no
-		consumer_goods_factor = -0.03
-		industrial_capacity_factory = 0.05
+		political_power_factor = 0.1
+		stability_factor = 0.1
+		democratic_drift = 0.05
 	}
 
-	the_masses_opium = {
+	kautskyian_socialist = {
 		random = no
-		required_garrison_factor = -0.2
-		resistance_garrison_penetration_chance = -0.25
-		weekly_manpower = 1000
+		defensive_war_stability_factor = 0.15
+		offensive_war_stability_factor = -0.1
+		political_power_factor = 0.1
+		communism_drift = 0.05
 	}
 
-	### IDEA TRAITS ###
-	
+	socialist_journalist = {
+		random = no
+		communism_drift = 0.05
+		political_power_factor = 0.05
+		compliance_gain = 0.02
+	}
+
+	veteran_trade_unionist = {
+		random = no
+		industrial_capacity_factory = 0.05
+		production_speed_buildings_factor = 0.05
+		stability_factor = 0.05
+		political_power_factor = -0.1
+	}
+
+	former_leader_of_red_finland = {
+		random = no
+		production_speed_industrial_complex_factor = 0.1
+		production_speed_dockyard_factor = 0.1
+		war_support_factor = 0.05
+	}
+
+	anti_soviet_socialist = {
+		random = no
+		political_power_factor = 0.05
+		war_support_factor = 0.05
+		democratic_acceptance = 40
+		drift_defence_factor = 0.1
+	}
+
+	master_armorer = {
+		random = no
+		equipment_conversion_speed = 0.15
+		equipment_upgrade_xp_cost = -0.1
+		industrial_capacity_factory = 0.05
+		production_lack_of_resource_penalty_factor = -0.1
+	}
+
+	################################
+	## Sweden TRAITS 			  ##
+	################################
+
+	SWE_committee_against_the_finnish_white_terror_idea = {
+		random = no
+		army_breakthrough_against_minor_factor = 0.06		
+	}
+
+	SWE_support_party_in_power = {
+		random = no
+		political_advisor_cost_factor = 0.25
+		economy_cost_factor = 0.25
+		trade_laws_cost_factor = 0.25
+		mobilization_laws_cost_factor = 0.25
+	}
+
+	SWE_minor_opposition_party_in_power = {
+		random = no
+		stability_factor = -0.05
+	}
+
+	SWE_rearnament_proponent = {
+		equipment_bonus = {
+			infantry_equipment = {
+				build_cost_ic = -0.05
+				instant = yes
+			}
+		}
+		war_support_factor = 0.05
+	}
+
+	SWE_rearnament_proponent_upgraded = {
+		equipment_bonus = {
+			infantry_equipment = {
+				build_cost_ic = -0.1
+				instant = yes
+			}
+		}
+		war_support_factor = 0.1
+	}
+
+	SWE_fallen_riksdag_trait = {
+		political_power_factor = -0.25
+	}
+
+	SWE_solidified_mandate = {
+		political_power_factor = 0.05
+		trade_laws_cost_factor = -0.1
+		economy_cost_factor = -0.15
+		stability_factor = 0.025
+	}
+
+	SWE_solidified_mandate_upgraded = {
+		political_power_factor = 0.1
+		trade_laws_cost_factor = -0.2
+		economy_cost_factor = -0.3
+		stability_factor = 0.05
+	}
+
+	SWE_admiral_of_industry = {
+		random = no
+		production_speed_industrial_complex_factor = 0.17
+		production_speed_infrastructure_factor = 0.17
+		production_speed_rail_way_factor = 0.17
+		production_speed_synthetic_refinery_factor = 0.17
+	}
+
+	SWE_close_ties_to_the_military = {
+		random = no
+		max_command_power = 30
+		training_time_factor = -0.1
+
+	}
+
+	SWE_landsfader = {
+		random = no
+		army_core_defence_factor = 0.06
+		army_core_attack_factor = 0.06
+		supply_combat_penalties_on_core_factor = -0.08
+	}
+
+	SWE_respectful_occupier = {
+		random = no
+		resistance_target = -0.1
+		resistance_growth = -0.15
+		resistance_activity = -0.2
+	}
+
+
+
+	SWE_education_for_all = {
+		random = no
+		research_speed_factor = 0.06
+
+	}
+
+	SWE_every_barrel_counts = {
+		random = no
+		supply_consumption_factor = -0.05
+		air_fuel_consumption_factor = -0.05
+		navy_fuel_consumption_factor = -0.05
+	}
+
+
+	SWE_reluctant_towards_rearmament = {
+		mobilization_laws_cost_factor = 0.15
+		war_support_factor = -0.05
+	}
+
+	SWE_minister_of_trade = {
+		random = no
+		trade_laws_cost_factor = -0.5
+		trade_opinion_factor = 0.35
+	}
+
+	SWE_minister_of_supply = {
+		supply_factor = 0.1
+		production_lack_of_resource_penalty_factor = -0.2
+	}
+
+	SWE_minister_of_justice = {
+		random = no
+		resistance_target = -0.05
+	}
+
+	SWE_minister_of_state = {
+		random = no
+		political_power_factor = 0.1
+	}
+
+	SWE_suffragette = { 
+		random = no
+		stability_factor = -0.05
+		production_speed_buildings_factor = 0.05	
+
+	}
+
+	SWE_suffragette_research = {
+		random = no
+		research_speed_factor = 0.04
+		stability_factor = -0.04
+	}
+
+	SWE_suffragette_production = {
+		random = no
+		industrial_capacity_factory = 0.04
+		industrial_capacity_dockyard = 0.04
+		stability_factor = -0.04
+	}
+
+	SWE_suffragette_clout = {
+		random = no
+		stability_factor = -0.05
+		economy_cost_factor = -0.33
+		mobilization_laws_cost_factor = -0.33
+		trade_laws_cost_factor = -0.33
+		political_advisor_cost_factor = -0.2
+
+
+	}
+
+	SWE_suffragette_rfsu = {
+		random = no
+		
+		democratic_drift = 0.08
+		party_popularity_stability_factor = 0.08
+		opinion_gain_monthly_same_ideology_factor = 0.2
+	}
+
+
+	SWE_committee_against_the_finnish_white_terror = {
+		random = no
+		communism_acceptance = 50
+		army_breakthrough_against_minor_factor = 0.06
+		
+	}
+
+	SWE_foreign_minister = {
+		random = no
+		enemy_justify_war_goal_time = 0.3
+		request_lease_tension = -0.5
+		lend_lease_tension = -0.5
+		embargo_threshold_factor = -0.5
+		embargo_cost_factor = -0.5
+		military_industrial_organization_funds_gain = 0.15
+	}
+
+	SWE_foreign_minister_no_bba = {
+		random = no
+		enemy_justify_war_goal_time = 0.3
+		request_lease_tension = -0.5
+		lend_lease_tension = -0.5
+		military_industrial_organization_funds_gain = 0.25
+	}
+
+	SWE_minister_of_agriculture = {
+		random = no
+		production_speed_infrastructure_factor = 0.2
+		production_speed_rail_way_factor = 0.1
+	}
+
+	SWE_interventionist_firebrand = {
+		random = no
+		send_volunteers_tension = -0.7
+		send_volunteer_divisions_required = -0.5
+		send_volunteer_size = 3
+		army_attack_against_major_factor = 0.08
+		army_defence_against_major_factor = 0.08
+	}
+
+	SWE_minister_of_defense= {
+		random = no
+		production_speed_bunker_factor = 0.1
+		production_speed_synthetic_refinery_factor = 0.1
+		production_speed_coastal_bunker_factor = 0.1
+		production_speed_anti_air_building_factor = 0.1
+		production_speed_arms_factory_factor = 0.1
+	}
+
+	SWE_family_oriented_sociologist = { 
+	#200,000 units are ready, with a million more well on the way
+		weekly_manpower = 80
+		monthly_population = 0.1
+		fascism_drift = -0.03
+		war_support_factor = -0.01
+
+	}
+
+	SWE_anti_nazi_interdisciplinary_social_scientist = {
+		war_stability_factor = 0.1
+		production_speed_industrial_complex_factor = 0.04
+		resistance_target_on_our_occupied_states = 0.1
+		fascism_drift = -0.1
+	}
+
+	SWE_partners_in_a_dangerous_time_gunnar = {
+		production_speed_industrial_complex_factor = 0.03
+	}
+
+	SWE_partners_in_a_dangerous_time_alva = {
+		stability_factor = 0.02
+	}
+
+	SWE_minister_of_transport = {
+		random = no
+		production_speed_industrial_complex_factor = 0.1
+		production_speed_infrastructure_factor = 0.1
+		production_speed_rail_way_factor = 0.1
+		production_speed_supply_node_factor = 0.1
+	}
+
+	SWE_former_autocrat = {
+		random = no
+		political_power_factor = -0.1
+		fascism_acceptance = 20
+		neutrality_acceptance = 20
+		neutrality_drift = 0.01
+		command_power_gain_mult = 0.15
+	}
+
+	SWE_former_autocrat_upgraded = {
+		random = no
+		fascism_acceptance = 20
+		neutrality_acceptance = 20
+		neutrality_drift = 0.01
+		command_power_gain_mult = 0.15
+	}
+
+	SWE_exiled_revolutionaries = {
+		command_cap = @tier2
+		army_attack_factor = 0.16
+		stability_factor = -0.08
+		army_org_factor = -0.06
+	}
+
+	SWE_ardent_conservative = {
+		political_power_factor = -0.1
+		grant_medal_cost_factor = -0.15
+		dig_in_speed_factor = 0.20
+		max_dig_in_factor = 0.1
+		conscription = 0.02
+	}
+
+	SWE_the_great = {
+		max_training = 0.15
+		experience_gain_army_unit_factor = 0.15
+		experience_loss_factor = -0.25
+	}
+
+	the_spider = {
+		land_night_attack = 0.1
+		air_night_penalty = -0.1
+		naval_night_attack = 0.1
+	}
+
+	untethered = {
+		army_speed_factor = 0.1
+		org_loss_when_moving = -0.1
+	}
+
+	mild_mannered_no_lar = {
+		trade_opinion_factor = 0.2
+		improve_relations_maintain_cost_factor = -0.25
+		subversive_activites_upkeep = -0.25
+	}
+
+	mild_mannered = {
+		trade_opinion_factor = 0.2
+		improve_relations_maintain_cost_factor = -0.25
+		own_operative_detection_chance_factor = -0.05
+	}
+
+	unbreakable = {
+		dont_lose_dig_in_on_attack = 1.0
+		offence = -0.05
+		defence = 0.15
+	}
+
+	hyena = {
+		equipment_capture_factor = 0.1
+	}
+
+	lucky = {
+		land_reinforce_rate = 0.02
+		naval_critical_score_chance_factor = 0.1
+		critical_receive_chance = -0.1
+	}
+
+	amnesiac = { #You dont always remember everything, but seeing rockets explode will forever be a wonder as a result
+		rocket_attack_factor = 0.15
+		political_power_factor = -0.1
+		planning_speed = -0.2
+		coordination_bonus = -0.2
+	}
+
+	trusty_no_lar = {
+		trade_opinion_factor = 0.2
+		opinion_gain_monthly = 0.25
+		foreign_subversive_activites = 0.3
+	}
+
+	trusty = {
+		trade_opinion_factor = 0.2
+		opinion_gain_monthly = 0.25
+		operation_coup_government_outcome = 0.25
+		operation_infiltrate_outcome = 0.25
+		operation_boost_resistance_outcome = 0.35
+		operation_targeted_sabotage_industry_outcome = 0.35
+		operation_targeted_sabotage_resources_outcome = 0.35
+		operation_targeted_sabotage_infrastructure_outcome = 0.35
+	}
+
+	##############
+	### ICEMAN ###
+	##############
+
+	# Country Leader 
+	ICE_hot_tempered_reformer = {
+		random = no
+		stability_factor = -0.05
+		political_power_factor = 0.1
+		democratic_drift = 0.01
+	}
+	ICE_national_romanticist = {
+		justify_war_goal_time = -0.1
+		drift_defence_factor = 0.25
+	}
+	ICE_revolutionary_educator = {
+		random = no
+		party_popularity_stability_factor = 0.15
+		research_speed_factor = 0.1
+	}
+
+	ICE_the_strict_regent = {
+		random = no
+		political_power_factor = -0.15
+		stability_factor = 0.1
+		industrial_capacity_factory = 0.05
+	}
+	ICE_independence_advocate = {
+		random = no
+		autonomy_gain = 0.1
+		autonomy_gain_global_factor = 0.2
+		party_popularity_stability_factor = 0.15
+	}
+	ICE_the_navy_king = {
+		random = no
+		naval_doctrine_cost_factor = -0.1
+		experience_gain_navy_factor = 0.2
+	}
+
+	ICE_transportation_enthusiast = {
+		equipment_bonus = {
+			train_equipment = {
+				instant = yes
+				build_cost_ic = -0.15
+			}
+		}
+		equipment_bonus = {
+			motorized_equipment = {
+				instant = yes
+				build_cost_ic = -0.15
+			}
+		}
+
+	}
+
+	# Advisor traits 
+	ICE_minister_of_healthcare_and_finance = { 
+		random = no 
+		stability_factor = 0.1
+		production_speed_industrial_complex_factor = 0.1
+	}
+
+	ICE_internationalist_guardian = { 
+		random = no 
+		join_faction_tension = -0.05
+		send_volunteers_tension = -0.15
+		send_volunteer_divisions_required = -0.75
+	}
+	ICE_minister_of_finance_moller = {
+		random = no
+		consumer_goods_factor = -0.05
+		industrial_capacity_factory = 0.1
+		production_lack_of_resource_penalty_factor = -0.05
+	}
+	ICE_judge_and_editor = { 
+		random = no 
+		political_power_factor = 0.05
+		non_core_manpower = 0.2
+		stability_factor = 0.05
+	}
+	ICE_travel_enthusiast = { 
+		random = no 
+		custom_modifier_tooltip = ICE_travel_enthusiast_tt
+		send_volunteers_tension = -0.05
+		send_volunteer_divisions_required = -0.05
+	}
+
+	ICE_progressive_doctor = {
+		random = no
+		drift_defence_factor = 0.20
+		weekly_manpower = 100
+		conscription_factor = 0.1
+	}
+	ICE_trade_unionist = { #Unlocks Rally Workers 
+		random = no
+		 
+		#power_balance_daily = 0.003
+		communism_drift = 0.02	
+		production_factory_max_efficiency_factor = 0.1
+		production_lack_of_resource_penalty_factor = -0.3
+	}
+	ICE_german_consul = {
+		random = no
+		fascism_acceptance = 50
+		opinion_gain_monthly_same_ideology_factor = 0.15
+		research_speed_factor = 0.05
+		weekly_manpower = 50
+	}
+	# Company traits 
+	ICE_shipping_concern = {
+		random = no
+		ai_will_do = {
+			factor = 1
+		}
+	}
+
+	# End Iceland
+
+
+
+	anti_stalinist_marxist = {
+		random = no
+		communism_acceptance = -20
+		trade_opinion_factor = 0.10
+		justify_war_goal_time = -0.1
+	}
+
+	national_socialist_sympathizer = {
+		random = no
+		fascism_drift = 0.02
+		fascism_acceptance = 40
+	}
+
+	minister_of_ecclesiastical_affairs = { #Education
+		random = no
+		research_speed_factor = 0.06
+	}
+
+	special_envoy = {
+		random = no
+		
+		operative_slot = 1
+		agency_upgrade_time = -0.2
+		civilian_intel_factor = 0.2
+		stability_factor = 0.05
+	}
+
+	minister_of_ecclesiastical_affairs_upgraded = { #Education
+		random = no
+		research_speed_factor = 0.1
+		political_power_factor = 0.05
+	}
+
+	national_socialist_veterinarian = {
+		random = no
+		stability_factor = -0.1
+		justify_war_goal_time = -0.1
+		conscription = 0.02
+	}
+
+	munckska_karens_member = {
+		random = no
+		resistance_activity = -0.1
+		drift_defence_factor = 0.25
+		communism_acceptance = -50
+	}
+
+	socialist_writer = {
+		random = no
+		communism_drift = 0.1
+		conscription_factor = 0.1
+		ai_will_do = {
+			factor = 1
+		}
+	}
+
+	protector_of_cultural_heritage = {
+		random = no
+		stability_factor = 0.1
+		democratic_acceptance = 60
+		communism_acceptance = 60
+		ai_will_do = {
+			factor = 1
+		}
+	}
+
+	humanist = { 
+		random = no
+		 	
+		war_support_factor = -0.1
+		civilian_intel_factor = 0.15
+		political_power_factor = 0.15
+	}
+
+	################################
+	## SOVIET UNION LEADER TRAITS ##
+	################################
+
+	### STALIN ###
+	stalin_political_paranoia = {
+		random = no
+		drift_defence_factor = 0.1
+		custom_modifier_tooltip = SOV_paranoia_modifier_increase_effect_tt
+	}
+
+	stalin_political_paranoia_advanced = {
+		random = no
+		drift_defence_factor = 0.1
+		custom_modifier_tooltip = SOV_paranoia_advance_modifier_increase_effect_tt
+	}
+
+	stalin_heart_of_steel = {
+		random = no
+		stability_factor = -0.1
+		war_support_factor = 0.05
+		political_power_factor = 0.05
+		opinion_gain_monthly_factor = -0.05
+		subjects_autonomy_gain = -0.1
+	}
+
+	stalin_heart_of_steel_opposition = {
+		random = no
+		stability_factor = -0.1
+		war_support_factor = 0.05
+		opinion_gain_monthly_factor = -0.05
+		subjects_autonomy_gain = -0.1
+	}
+
+	stalin_inheritor_of_lenin = {
+		random = no
+		political_power_factor = 0.1
+		justify_war_goal_time = -0.25
+	}
+
+	stalin_inheritor_of_lenin_genius = {
+		random = no
+		political_power_factor = 0.1
+		justify_war_goal_time = -0.25
+		research_speed_factor = 0.05
+	}
+
+	stalin_inheritor_of_lenin_leader = {
+		random = no
+		political_power_factor = 0.1
+		justify_war_goal_time = -0.25
+		party_popularity_stability_factor = 0.15
+		defensive_war_stability_factor = 0.4
+		political_advisor_cost_factor = -0.25
+	}
+
+	stalin_inheritor_of_lenin_final = {
+		random = no
+		political_power_factor = 0.1
+		justify_war_goal_time = -0.25
+		research_speed_factor = 0.05
+		party_popularity_stability_factor = 0.15
+		defensive_war_stability_factor = 0.4
+		political_advisor_cost_factor = -0.25
+	}
+
+	stalin_servant_of_lenin = {
+		random = no
+		drift_defence_factor = 0.15
+		guarantee_cost = -0.5
+	}
+
+	stalin_servant_of_lenin_worship = {
+		random = no
+		drift_defence_factor = 0.15
+		guarantee_cost = -0.5
+		stability_factor = 0.15
+	}
+
+	stalin_servant_of_lenin_leader = {
+		random = no
+		drift_defence_factor = 0.15
+		guarantee_cost = -0.5
+		party_popularity_stability_factor = 0.15
+		defensive_war_stability_factor = 0.4
+		political_advisor_cost_factor = -0.25
+	}
+
+	stalin_servant_of_lenin_final = {
+		random = no
+		drift_defence_factor = 0.15
+		guarantee_cost = -0.5
+		stability_factor = 0.15
+		party_popularity_stability_factor = 0.15
+		defensive_war_stability_factor = 0.4
+		political_advisor_cost_factor = -0.25
+	}
+
+	stalin_great_commander = {
+		random = no
+		war_support_factor = 0.1
+		army_morale_factor = 0.05
+		annex_cost_factor = -0.1
+	}
+
+	stalin_architect_of_communism = {
+		random = no
+		communism_drift = 0.1
+		master_ideology_drift = 0.1
+		puppet_cost_factor = -0.2
+	}
+
+	stalin_father_of_nations = {
+		random = no
+		stability_weekly = 0.001
+		compliance_gain = 0.05
+		justify_war_goal_when_in_major_war_time = -0.5
+		conscription = 0.02
+	}
+
+	stalin_authority_undermined = {
+		random = no
+		drift_defence_factor = 0.05
+		political_power_factor = 0.1
+		custom_modifier_tooltip = SOV_paranoia_modifier_increase_2_effect_tt
+	}
+
+	#BERIYA
+	unscrupulous_orchestrator = {
+		random = no
+		intel_network_gain_factor = 0.15
+		own_operative_detection_chance_factor = -0.1
+		intelligence_agency_defense = 0.1
+		stability_factor = -0.1
+	}
+
+	#BERIYA -> No LaR
+	unscrupulous_orchestrator_no_lar = {
+		random = no
+		subversive_activites_upkeep = -0.35
+		war_support_factor = 0.1
+		stability_factor = -0.1
+	}
+
+	#SMIRNOV
+	the_siberian_lenin = {
+		random = no
+		resistance_activity = -0.1
+		resistance_damage_to_garrison = -0.1
+		operative_slot = 1
+		resistance_decay = 0.1
+		stability_factor = -0.05
+	}
+
+	#THE SUPREME SOVIET
+	strong_party_discipline = {
+		random = no
+		drift_defence_factor = 0.15
+		compliance_gain = 0.05
+		resistance_decay = 0.1
+		stability_factor = 0.1
+		surrender_limit = 0.1
+	}
+
+	#BUKHARIN
+	defender_of_the_peasantry = {
+		random = no
+		political_power_factor = 0.1
+		stability_factor = 0.05
+		research_speed_factor = 0.02
+		democratic_acceptance = 50
+		civilian_intel_to_others = 15
+		industrial_capacity_factory = -0.05
+	}
+
+	#BUKHARIN -> Improved
+	hero_of_the_peasantry = {
+		random = no
+		political_power_factor = 0.15
+		stability_factor = 0.1
+		research_speed_factor = 0.05
+		democratic_acceptance = 50
+		civilian_intel_to_others = 15
+		industrial_capacity_factory = -0.02
+	}
+
+	#RYKOV
+	labor_defense_organizer = {
+		random = no
+		consumer_goods_factor = -0.15
+		army_core_defence_factor = 0.05
+		experience_gain_army_factor = 0.05
+		research_speed_factor = -0.03
+	}
+
+	#ZINOVYEV
+	born_agitator = {
+		random = no
+		political_power_factor = 0.1
+		conscription_factor = 0.15
+		army_morale_factor = 0.05
+		stability_factor = -0.05
+		compliance_growth = -0.05
+	}
+
+	#KAMENEV
+	the_faded_star = {
+		random = no
+		research_speed_factor = 0.03
+		stability_factor = 0.1
+		compliance_gain = 0.05
+		political_power_factor = -0.1
+		drift_defence_factor = -0.1
+	}
+
+	defier_of_the_sun_god = {
+		random = no
+		army_morale_factor = 0.05
+		compliance_growth = 0.05
+		targeted_modifier = {
+			tag = EQS
+			attack_bonus_against = 0.1
+			defense_bonus_against = 0.1
+		}
+		targeted_modifier = {
+			tag = NLR
+			attack_bonus_against = 0.1
+			defense_bonus_against = 0.1
+		}
+	}
+
+	supreme_representative_of_god_on_earth = {
+		random = no
+		stability_factor = 0.1
+		war_support_factor = 0.1
+		drift_defence_factor = 1
+	}
+
+	fascist_orchestrator = {
+		random = no
+		political_advisor_cost_factor = -0.33
+		high_command_cost_factor = -0.33
+		air_chief_cost_factor = -0.33
+		army_chief_cost_factor = -0.33
+		navy_chief_cost_factor = -0.33
+		subjects_autonomy_gain = -0.3
+		production_speed_arms_factory_factor = 0.05
+		production_speed_dockyard_factor = 0.05
+	}
+
+	emperor_and_autocrat_of_all_the_russias = {
+		random = no
+		resistance_growth_on_our_occupied_states = 0.1
+		required_garrison_factor = -0.15
+		war_support_factor = 0.05
+	}
+
+	emigre_connections = {
+		random = no
+		weekly_manpower = 2000
+		consumer_goods_factor = -0.10
+	}
+
+	desperate_gambit = {
+		random = no
+		army_core_attack_factor = 0.1
+		army_core_defence_factor = 0.1
+		resistance_growth_on_our_occupied_states  = 0.25
+	}
+
+	dysfunctional_assembly = {
+		random = no
+		stability_weekly = -0.002
+		political_power_gain = -0.5
+	}
+
+	#################################
+	## SOVIET UNION ADVISOR TRAITS ##
+	#################################
+
+	head_of_the_nkvd_yagoda_initial = {
+		random = no
+		stability_factor = -0.05
+		enemy_operative_detection_chance = 0.1
+		enemy_operative_capture_chance_factor = 0.05
+		civilian_intel_to_others = -5
+		custom_modifier_tooltip = SOV_head_of_the_nkvd_locked_tt
+	}
+
+	head_of_the_nkvd_yagoda = {
+		random = no
+		stability_factor = -0.05
+		enemy_operative_detection_chance = 0.1
+		enemy_operative_capture_chance_factor = 0.05
+		civilian_intel_to_others = -5
+		custom_modifier_tooltip = SOV_head_of_the_nkvd_yagoda_tt
+		custom_modifier_tooltip = SOV_head_of_the_nkvd_locked_tt
+	}
+
+	head_of_the_nkvd_yagoda_no_paranoia = {
+		random = no
+		stability_factor = -0.05
+		enemy_operative_detection_chance = 0.1
+		enemy_operative_capture_chance_factor = 0.05
+		civilian_intel_to_others = -5
+	}
+
+	head_of_the_nkvd_yezhov_initial = {
+		random = no
+		stability_factor = -0.1
+		enemy_operative_detection_chance = 0.1
+		enemy_operative_capture_chance_factor = 0.1
+		civilian_intel_to_others = -10
+		agency_upgrade_time = -0.1
+		custom_modifier_tooltip = SOV_head_of_the_nkvd_locked_tt
+	}
+
+	head_of_the_nkvd_yezhov = {
+		random = no
+		stability_factor = -0.1
+		enemy_operative_detection_chance = 0.1
+		enemy_operative_capture_chance_factor = 0.1
+		civilian_intel_to_others = -10
+		agency_upgrade_time = -0.1
+		custom_modifier_tooltip = SOV_head_of_the_nkvd_yezhov_tt
+		custom_modifier_tooltip = SOV_head_of_the_nkvd_locked_tt
+	}
+
+	head_of_the_nkvd_yezhov_no_paranoia = {
+		random = no
+		stability_factor = -0.1
+		enemy_operative_detection_chance = 0.1
+		enemy_operative_capture_chance_factor = 0.1
+		civilian_intel_to_others = -10
+		agency_upgrade_time = -0.1
+	}
+
+	head_of_the_nkvd_beriya_initial = {
+		random = no
+		stability_factor = -0.05
+		enemy_operative_detection_chance = 0.1
+		enemy_operative_capture_chance_factor = 0.15
+		civilian_intel_to_others = -10
+		intel_network_gain_factor = 0.1
+		custom_modifier_tooltip = SOV_head_of_the_nkvd_locked_tt
+	}
+
+	head_of_the_nkvd_beriya = {
+		random = no
+		stability_factor = -0.05
+		enemy_operative_detection_chance = 0.1
+		enemy_operative_capture_chance_factor = 0.15
+		civilian_intel_to_others = -10
+		intel_network_gain_factor = 0.1
+		custom_modifier_tooltip = SOV_head_of_the_nkvd_beriya_tt
+		custom_modifier_tooltip = SOV_head_of_the_nkvd_locked_tt
+	}
+
+	head_of_the_nkvd_beriya_no_paranoia = {
+		random = no
+		stability_factor = -0.05
+		enemy_operative_detection_chance = 0.2
+		enemy_operative_capture_chance_factor = 0.15
+		civilian_intel_to_others = -10
+		intel_network_gain_factor = 0.1
+	}
+
+	#Kaganovich
+	iron_lazar = {
+		random = no
+		equipment_bonus = {
+			train_equipment = {
+				build_cost_ic = 0.05
+				reliability = 0.15
+			}
+		}
+		production_speed_rail_way_factor = 0.05
+		production_speed_supply_node_factor = 0.05
+		fuel_gain_factor = 0.05
+	}
+
+	#Khrsuhchyov
+	political_commissar = {
+		random = no
+		communism_drift = 0.1
+		political_power_factor = 0.05
+		max_command_power = 30
+	}
+
+	#Molotov
+	pc_for_foreign_affairs_molotov = {
+		random = no
+		trade_opinion_factor = 0.10
+		justify_war_goal_time = -0.1
+		fascism_acceptance = 40
+	}
+
+	#Litvinov
+	pc_for_foreign_affairs_litvinov = {
+		random = no
+		opinion_gain_monthly_factor = 0.15
+		enemy_justify_war_goal_time = 0.15
+		request_lease_tension = -0.2
+		democratic_acceptance = 40
+	}
+
+	#Patriarch Sergy
+	patriarch_of_moscow_and_all_russia = {
+		random = no
+		stability_factor = 0.1
+		army_morale_factor = 0.1
+		compliance_growth_on_our_occupied_states = -0.15
+	}
+
+	#Smirnov
+	head_directorate_of_new_buildings = {
+		random = no
+		production_speed_buildings_factor = 0.1
+		industrial_capacity_factory = 0.05
+		industrial_capacity_dockyard = 0.05
+	}
+
+	#Smilga
+	soviet_economist = {
+		random = no
+		consumer_goods_factor = -0.10
+		war_support_factor = 0.05
+		production_speed_synthetic_refinery_factor = 0.15
+		subversive_activites_upkeep = -0.05
+	}
+
+	#Radek
+	international_revolutionary = {
+		random = no
+		subversive_activites_upkeep = -0.1
+		intel_network_gain_factor = 0.1
+		boost_ideology_mission_factor = 0.1
+		diplomatic_pressure_mission_factor = 0.1
+		# TODO Thomas - maybe add something relating to decisions for internatinal revolutions
+	}
+
+	#Preobrazhensky
+	ecomonist_publicist = {
+		random = no
+		production_factory_max_efficiency_factor = 0.05
+		political_power_factor = 0.05
+		party_popularity_stability_factor = 0.1
+	}
+
+	#Shlyapnikov
+	left_trade_unionist = {
+		random = no
+		political_power_factor = -0.1
+		drift_defence_factor = 0.1
+		research_speed_factor = 0.1
+		min_export = -0.1
+	}
+
+	#Trotsky
+	pc_military_naval_affairs = {
+		random = no
+		resistance_growth = -0.1
+		army_org_factor = 0.1
+		experience_gain_army_factor = 0.1
+		experience_gain_navy_factor = 0.1
+		party_popularity_stability_factor = -0.1
+	}
+
+	#Bukharin
+	economy_reformer = {
+		random = no
+		research_speed_factor = 0.05
+		stability_factor = 0.05
+		political_power_factor = 0.05
+	}
+
+	#Tomsky Default
+	right_trade_unionist = {
+		random = no
+		industrial_capacity_factory = 0.1
+		production_factory_max_efficiency_factor = 0.1
+		line_change_production_efficiency_factor = 0.1
+		production_factory_efficiency_gain_factor = -0.05
+	}
+
+	#Tomsky Improved
+	chair_of_the_unions = {
+		random = no
+		industrial_capacity_factory = 0.1
+		production_factory_max_efficiency_factor = 0.15
+		line_change_production_efficiency_factor = 0.1
+	}
+
+	#Rykov
+	peoples_commissar_for_posts_and_telegraphs = {
+		random = no
+		political_power_factor = 0.05
+		land_reinforce_rate = 0.02
+	}
+
+	#Zinovyev
+	communist_theorist = {
+		random = no
+		drift_defence_factor = 0.1
+		political_power_factor = 0.15
+	}
+
+	#Kamenev
+	appeasing_technocrat = {
+		random = no
+		drift_defence_factor = -0.1
+		political_power_factor = 0.15
+		stability_factor = 0.1
+		compliance_gain = 0.02
+	}
+
+	#Ryutin
+	anti_stalinist_propagandist = {
+		random = no
+		subversive_activites_upkeep = -0.15
+		boost_resistance_factor = 0.1
+		resistance_decay_on_our_occupied_states = -0.1
+		intel_from_operatives_factor = 0.1
+	}
+
+	#Sokolnikov
+	peoples_commissar_of_finance = {
+		random = no
+		industrial_capacity_factory = 0.15
+		industrial_capacity_dockyard = 0.15
+		production_speed_buildings_factor = -0.05
+		industry_repair_factor = -0.05
+	}
+
+	#Semyonov
+	ataman_transbaikal_host = {
+		random = no
+		army_attack_against_major_factor = 0.15
+		stability_factor = -0.05
+		political_power_factor = -0.05
+		army_attack_speed_factor = 0.1
+		unit_motorized_design_cost_factor = -0.25
+	}
+
+	internal_rivalry = {
+		random = no
+		political_power_factor = -0.05
+		encryption_factor = -0.15
+		join_faction_tension = 0.5
+		opinion_gain_monthly_factor = -0.25
+	}
+
+	political_chameleon = {
+		random = no
+		stability_factor = 0.1
+	}
+
+	mladorossi_theorist = {
+		random = no
+		stability_weekly = -0.001
+		political_power_factor = 0.10
+		communism_drift = 0.03
+		neutrality_drift = 0.15
+	}
+
+	the_foreign_connection = {
+		random = no
+		fascism_drift = 0.1
+		consumer_goods_factor = -0.10
+		opinion_gain_monthly_same_ideology_factor = 0.15
+	}
+
+	theocratic_diplomat = {
+		random = no
+		opinion_gain_monthly_factor = 0.15
+		drift_defence_factor = 0.15
+		political_power_factor = 0.05
+	}
+
+	orthodox_rabblerouser = {
+		random = no
+		conscription = 0.01
+		non_core_manpower = 0.025
+	}
+
+	driver_of_the_faithful = {
+		random = no
+		consumer_goods_factor = -0.10
+		industrial_capacity_factory = 0.05
+	}
+
+	the_masses_opium = {
+		random = no
+		required_garrison_factor = -0.2
+		resistance_garrison_penetration_chance = -0.25
+		weekly_manpower = 1000
+	}
+
+	### IDEA TRAITS ###
+
 	# drift is a percent applied weekly
 	communist_revolutionary = {
 		random = no
 		# Boosts Communism
 		communism_drift = 0.1
-		
+
 		ai_will_do = {
 			factor = 1
-			#modifier = {
-				#not = { has_completed_focus = USA_suspend_the_presecution }
-				#factor = 0
-			#}
 		}
 	}
-	
+
 	democratic_reformer = {
 		random = no
 		# Boosts Democracy
 		democratic_drift = 0.1
-		
+
 		ai_will_do = {
 			factor = 0
 		}
 	}
-	
+
 	fascist_demagogue = {
 		random = no
 		# Boosts Fascism
 		fascism_drift = 0.1
-		
+
 		ai_will_do = {
 			factor = 1
-			#modifier = { 
-			#	not = { has_completed_focus = USA_america_first }
-			#	factor = 0
-			#}
 		}
 	}
 	staunch_monarchist = {
 		random = no
 		# Boosts Unaligned
 		neutrality_drift = 0.1
-		
+
 		ai_will_do = {
 			factor = 1
-			#modifier = {
-			#	tag = HUN
-			#	not = { has_completed_focus = HUN_invite_the_habsburg_prince }
-			#	factor = 0
-			#}
 		}
 	}
-	
+
 	shadow_of_calles = {
 		random = no
 
 		neutrality_drift = 0.1
 		political_power_factor = 0.15
-		
+
 		ai_will_do = {
 			factor = 1
 		}
 	}
-	
+
 	social_reformer = {
 		random = no
 
 		democratic_drift = 0.1
 		stability_factor = 0.15
-		
+
 		ai_will_do = {
 			factor = 1
 		}
@@ -3637,7 +4852,7 @@ leader_traits = {
 		fascism_drift = 0.1
 		generate_wargoal_tension = -0.5
 		justify_war_goal_time = -0.25
-		
+
 		ai_will_do = {
 			factor = 1
 		}
@@ -3647,16 +4862,16 @@ leader_traits = {
 		random = no
 
 		communism_drift = 0.1
-		consumer_goods_factor = -0.05
-		
+		consumer_goods_factor = -0.15
+
 		ai_will_do = {
 			factor = 1
 		}
 	}
 
 	popular_figurehead = {
-		stability_factor = 0.15 
-		
+		stability_factor = 0.15
+
 		ai_will_do = {
 			factor = 1
 		}
@@ -3671,110 +4886,96 @@ leader_traits = {
 	}
 
 	propaganda_expert = {
-		war_support_factor = 0.10 
-		
+		war_support_factor = 0.10
+
 		ai_will_do = {
 			factor = 1
 		}
 	}
 	technocrat = {
-	
+
 		production_speed_industrial_complex_factor = 0.05
 		research_speed_factor = 0.05
 		ai_will_do = {
-			factor = 2
+			factor = 1
 		}
 	}
-	
+
 	silent_workhorse = {
 		random = yes
 		political_power_factor = 0.15
-		
-		ai_will_do = {
-			factor = 1.2
-		}
-	}
-	
-	prince_of_terror = {
-		resistance_damage_to_garrison = -0.25 
-		foreign_subversive_activites = -0.3
-		non_core_manpower = 0.02
-		
+
 		ai_will_do = {
 			factor = 1
 		}
 	}
-	
-	UESR_lavender_trait = {
-		resistance_damage_to_garrison = -0.25 
+
+	prince_of_terror = {
+		resistance_damage_to_garrison = -0.25
 		foreign_subversive_activites = -0.3
 		non_core_manpower = 0.02
-		
+
 		ai_will_do = {
 			factor = 1
 		}
 	}
-	
+
 	compassionate_gentleman = {
 		random = yes
 		opinion_gain_monthly_factor = 0.15
-		ai_focus_peaceful_factor = 0.05
-		improve_relations_maintain_cost_factor = -0.5
+		resistance_damage_to_garrison = -0.15
 
 		ai_will_do = {
-			factor = 0.2
+			factor = 1
 		}
 	}
-	
+
 	backroom_backstabber = {
 		subversive_activites_upkeep = -0.25
 		drift_defence_factor = 0.25
-		
+
 		ai_will_do = {
-			factor = 0.2
+			factor = 1
 		}
 	}
-	
+
 	smooth_talking_charmer = {
 		random = yes
-		min_export = -0.05
-		trade_opinion_factor = 0.10
 		improve_relations_maintain_cost_factor = -0.5
-		
+		trade_opinion_factor = 0.10
+
 		ai_will_do = {
-			factor = 0.2
+			factor = 1
 		}
 	}
-	
+
 	ideological_crusader = {
 		random = yes
 		opinion_gain_monthly_same_ideology_factor = 1.0
 		party_popularity_stability_factor = 0.1
-		
+
 		ai_will_do = {
 			factor = 0.2
 		}
 	}
-	
+
 	fortification_engineer = {
 		random = yes
 		production_speed_bunker_factor = 0.2
 		production_speed_coastal_bunker_factor = 0.2
 		production_speed_anti_air_building_factor = 0.2
-		ai_focus_defense_factor = 0.05
-		
+
 		ai_will_do = {
-			factor = 0.2
+			factor = 1
 		}
 	}
-	
+
 	war_industrialist = {
 		random = yes
 		production_speed_arms_factory_factor = 0.1
-		production_speed_dockyard_factor = 0.1		
+		production_speed_dockyard_factor = 0.1
 		production_speed_fuel_silo_factor = 0.1
-		ai_focus_war_production_factor = 0.1
-		
+
 		ai_will_do = {
 			factor = 2
 			modifier = {
@@ -3787,22 +4988,26 @@ leader_traits = {
 			}
 		}
 	}
-	
+
 	captain_of_industry = {
 		random = yes
 		production_speed_industrial_complex_factor = 0.1
 		production_speed_infrastructure_factor = 0.1
 		production_speed_rail_way_factor = 0.1
 		production_speed_synthetic_refinery_factor = 0.1
-		
+
 		ai_will_do = {
-			factor = 2
+			factor = 1
+			modifier = {
+				factor = 1.8
+				date < 1939.1.1
+			}
 		}
 	}
 
 	financial_expert = {
 		random = yes
-		consumer_goods_factor = -0.03
+		consumer_goods_factor = -0.15
 
 		ai_will_do = {
 			factor = 2
@@ -3811,7 +5016,7 @@ leader_traits = {
 	economist = {
 		random = yes
 		production_factory_max_efficiency_factor = 0.05
-		
+
 		ai_will_do = {
 			factor = 2
 		}
@@ -3821,21 +5026,20 @@ leader_traits = {
 		random = yes
 		political_power_factor = 0.05
 		stability_factor = 0.05
-		
+
 		ai_will_do = {
 			factor = 2
 		}
 	}
-	
+
 	armaments_organizer = {
 		random = yes
-		ai_focus_military_equipment_factor = 0.05
 		conversion_cost_civ_to_mil_factor = -0.2
 		production_speed_supply_node_factor = 0.1
 		# civ_to_mil_industry_conversion_rate = -1
-		
+
 		ai_will_do = {
-			factor = 2
+			factor = 1
 		}
 	}
 	reluctant_interventionist = {
@@ -3843,7 +5047,7 @@ leader_traits = {
 		stability_factor = 0.05
 		lend_lease_tension = -0.2
 		request_lease_tension = -0.2
-		
+
 		ai_will_do = {
 			factor = 2
 		}
@@ -3855,23 +5059,23 @@ leader_traits = {
 		production_speed_rocket_site_factor = 0.15
 		production_speed_radar_station_factor = 0.15
 		production_speed_nuclear_reactor_factor = 0.15
-		
+
 		ai_will_do = {
 			factor = 0.2
 		}
 	}
-	
+
 	rocket_scientist = {
 		random = no
-		
+
 		ai_will_do = {
 			factor = 1
 		}
 	}
-	
+
 	nuclear_scientist = {
 		random = no
-		
+
 		ai_will_do = {
 			factor = 1
 		}
@@ -3882,121 +5086,121 @@ leader_traits = {
 	propaganda_bungler = {
 		random = no
 		war_support_factor = 0.05
-		
+
 		ai_will_do = {
 			factor = 1
 		}
 	}
-	
+
 	silent_mule = {
 		random = no
 		political_power_factor = 0.05
-		
+
 		ai_will_do = {
-			factor = 1.2
+			factor = 1
 		}
 	}
-	
+
 	baron_of_terror = {
-		resistance_damage_to_garrison = -0.15 
+		resistance_damage_to_garrison = -0.15
 		foreign_subversive_activites = -0.15
 		non_core_manpower = 0.01
-		
+
 		ai_will_do = {
 			factor = 1
 		}
 	}
-	
+
 	compassionate_commoner = {
 		random = no
 		opinion_gain_monthly_factor = 0.05
-		
+
 		ai_will_do = {
 			factor = 1
 		}
 	}
-	
+
 	backroom_windbag = {
 		random = no
 		political_power_factor = 0.02
 		drift_defence_factor = 0.05
-		
+
 		ai_will_do = {
 			factor = 1
 		}
 	}
-	
+
 	smooth_talking_con_man = {
 		random = no
 		trade_opinion_factor = 0.05
-		
+
 		ai_will_do = {
 			factor = 1
 		}
 	}
-	
+
 	ideological_groupie = {
 		random = no
 		opinion_gain_monthly_same_ideology_factor = 0.05
-		
+
 		ai_will_do = {
 			factor = 0.2
 		}
 	}
-	
+
 	fortification_armchair_general = {
 		random = no
 		production_speed_bunker_factor = 0.1
 		production_speed_coastal_bunker_factor = 0.1
 		production_speed_anti_air_building_factor = 0.1
-		
+
 		ai_will_do = {
-			factor = 0.2
+			factor = 1
 		}
 	}
-	
+
 	war_profiteer = {
 		random = no
 		production_speed_arms_factory_factor = 0.05
 		production_speed_dockyard_factor = 0.05
-		
+
 		ai_will_do = {
 			factor = 2
 		}
 	}
-	
+
 	lieutenant_of_industry = {
 		random = no
 		production_speed_industrial_complex_factor = 0.05
 		production_speed_infrastructure_factor = 0.05
 		production_speed_rail_way_factor = 0.05
 		production_speed_synthetic_refinery_factor = 0.05
-		
+
 		ai_will_do = {
-			factor = 2
+			factor = 1
 		}
 	}
 
 	finance_graduate = {
 		random = no
-		consumer_goods_factor = -0.02
-		
+		consumer_goods_factor = -0.10
+
 		ai_will_do = {
 			factor = 2
 		}
 	}
-	
-	
+
+
 	armaments_aficionado = {
 		random = no
 		conversion_cost_civ_to_mil_factor= -0.1
 		# civ_to_mil_industry_conversion_rate = -1
-		
+
 		ai_will_do = {
 			factor = 1
 		}
 	}
-	
+
 	quartermaster_trainee = {
 		random = no
 		production_speed_air_base_factor = 0.05
@@ -4004,22 +5208,23 @@ leader_traits = {
 		production_speed_rocket_site_factor = 0.05
 		production_speed_radar_station_factor = 0.05
 		production_speed_nuclear_reactor_factor = 0.05
-		
+
 		ai_will_do = {
 			factor = 0.2
 		}
 	}
-	
+
 	little_rocket_man = {
 		random = no
-		
+
 		ai_will_do = {
 			factor = 1
 		}
 	}
-	
+
 	nuclear_enthusiast = {
-		
+		random = no
+
 		ai_will_do = {
 			factor = 1
 		}
@@ -4035,7 +5240,7 @@ leader_traits = {
 		political_power_factor = 0.05
 		army_morale_factor = 0.1
 		experience_gain_air_factor = 0.03
-		
+
 		ai_will_do = {
 			factor = 1
 		}
@@ -4044,10 +5249,10 @@ leader_traits = {
 	princess_of_terror = {
 		random = no
 
-		resistance_damage_to_garrison = -0.25 
+		resistance_damage_to_garrison = -0.25
 		foreign_subversive_activites = -0.3
 		non_core_manpower = 0.02
-		
+
 		ai_will_do = {
 			factor = 1
 		}
@@ -4058,7 +5263,7 @@ leader_traits = {
 
 		war_support_factor = 0.1
 		communism_drift = 0.1
-		
+
 		ai_will_do = {
 			factor = 1
 		}
@@ -4069,7 +5274,7 @@ leader_traits = {
 
 		stability_factor = -0.1
 		conscription = 0.02
-		
+
 		ai_will_do = {
 			factor = 1
 		}
@@ -4081,7 +5286,7 @@ leader_traits = {
 		war_support_factor = 0.1
 		neutrality_drift = 0.1
 		weekly_bombing_war_support = 0.001
-		
+
 		ai_will_do = {
 			factor = 1
 		}
@@ -4091,8 +5296,8 @@ leader_traits = {
 		random = no
 
 		stability_factor = 0.05
-		consumer_goods_factor = -0.05
-		
+		consumer_goods_factor = -0.15
+
 		ai_will_do = {
 			factor = 1
 		}
@@ -4102,7 +5307,7 @@ leader_traits = {
 		random = no
 
 		political_power_factor = 0.15
-		
+
 		ai_will_do = {
 			factor = 1
 		}
@@ -4114,7 +5319,7 @@ leader_traits = {
 		political_power_factor = -0.3
 		industrial_capacity_factory = 0.1
 		industrial_capacity_dockyard = 0.1
-		
+
 		ai_will_do = {
 			factor = 1
 		}
@@ -4123,9 +5328,9 @@ leader_traits = {
 	resistance_banker = {
 		random = no
 
-		consumer_goods_factor = -0.1
-		resistance_growth_on_our_occupied_states = 0.1 
-		
+		consumer_goods_factor = -0.30
+		resistance_growth_on_our_occupied_states = 0.1
+
 		ai_will_do = {
 			factor = 1
 		}
@@ -4137,7 +5342,7 @@ leader_traits = {
 		non_core_manpower = 0.02
 		weekly_manpower = 250
 		communism_drift = 0.05
-		
+
 		ai_will_do = {
 			factor = 1
 		}
@@ -4148,7 +5353,7 @@ leader_traits = {
 
 		political_power_factor = 0.1
 		stability_factor = 0.05
-		
+
 		ai_will_do = {
 			factor = 1
 		}
@@ -4158,7 +5363,7 @@ leader_traits = {
 		random = no
 		democratic_drift = 0.05
 		political_power_factor = 0.05
-		
+
 		ai_will_do = {
 			factor = 2
 		}
@@ -4168,7 +5373,7 @@ leader_traits = {
 		random = no
 		fascism_drift = -0.02
 		stability_factor = 0.1
-		
+
 		ai_will_do = {
 			factor = 2
 		}
@@ -4177,7 +5382,7 @@ leader_traits = {
 	monarchist_media_mogul = {
 		random = no
 		neutrality_drift = 0.1
-		
+
 		ai_will_do = {
 			factor = 2
 		}
@@ -4187,7 +5392,7 @@ leader_traits = {
 		random = no
 		political_power_factor = 0.05
 		stability_factor = 0.05
-		
+
 		ai_will_do = {
 			factor = 2
 		}
@@ -4196,7 +5401,7 @@ leader_traits = {
 	### Spanish LAR traits ###
 
 	education_reformer = {
-	
+
 		research_speed_factor = 0.05
 		ai_will_do = {
 			factor = 1
@@ -4208,7 +5413,7 @@ leader_traits = {
 
 		democratic_drift = 0.05
 		stability_factor = 0.1
-		
+
 		ai_will_do = {
 			factor = 1
 		}
@@ -4217,10 +5422,10 @@ leader_traits = {
 	gran_carabinero = { # Hundred Thousand Sons of Negrín!
 		random = no
 
-		consumer_goods_factor = -0.02
+		consumer_goods_factor = -0.10
 		stability_factor = 0.05
 		conscription = 0.005
-		
+
 		ai_will_do = {
 			factor = 1
 		}
@@ -4232,7 +5437,7 @@ leader_traits = {
 		communism_drift = 0.05
 		war_support_factor = 0.1
 		stability_factor = 0.1
-		
+
 		ai_will_do = {
 			factor = 1
 		}
@@ -4244,7 +5449,7 @@ leader_traits = {
 		neutrality_drift = 0.05
 		political_power_factor = 0.1
 		war_support_factor = 0.1
-		
+
 		ai_will_do = {
 			factor = 1
 		}
@@ -4255,7 +5460,7 @@ leader_traits = {
 
 		communism_drift = 0.1
 		political_power_factor = 0.15
-		
+
 		ai_will_do = {
 			factor = 1
 		}
@@ -4265,7 +5470,7 @@ leader_traits = {
 		random = no
 
 		industrial_capacity_factory = 0.05
-		
+
 		ai_will_do = {
 			factor = 1
 		}
@@ -4278,7 +5483,7 @@ leader_traits = {
 		foreign_subversive_activites = -0.20
 		drift_defence_factor = 0.20
 		stability_factor = -0.05
-		
+
 		ai_will_do = {
 			factor = 1
 		}
@@ -4289,7 +5494,7 @@ leader_traits = {
 
 		neutrality_drift = 0.05
 		political_power_factor = 0.15
-		
+
 		ai_will_do = {
 			factor = 1
 		}
@@ -4306,13 +5511,14 @@ leader_traits = {
 		fascism_drift = 0.05
 		production_speed_industrial_complex_factor = 0.1
 		production_speed_infrastructure_factor = 0.1
+		production_speed_rail_way_factor = 0.1
 		production_speed_synthetic_refinery_factor = 0.1
 	}
 
 	falangist_syndicalist = {
 		random = no
 		fascism_drift = 0.1
-		consumer_goods_factor = -0.05
+		consumer_goods_factor = -0.15
 	}
 
 	leftist_freemason = {
@@ -4344,11 +5550,11 @@ leader_traits = {
 	}
 
 	regional_traditionalist_leader = {
-		random = no	
+		random = no
 		war_support_factor = 0.1
 		drift_defence_factor = 0.15
 	}
-	
+
 	### Baltic States ###
 
 	priestly_prime_minister = {
@@ -4383,7 +5589,7 @@ leader_traits = {
 
 	agricultural_capitalist = {
 		random = no
-		consumer_goods_factor = -0.05
+		consumer_goods_factor = -0.15
 		neutrality_drift = 0.05
 	}
 
@@ -4391,11 +5597,11 @@ leader_traits = {
 		random = no
 		fascism_drift = -0.05
 		fascism_acceptance = -40
-		# targeted_modifier = {
-		# 	tag = GER
-		# 	attack_bonus_against = 0.1
-		# 	defense_bonus_against = 0.1
-		# }
+		targeted_modifier = {
+			tag = CHN
+			attack_bonus_against = 0.1
+			defense_bonus_against = 0.1
+		}
 	}
 
 	subservient_democrat = {
@@ -4438,7 +5644,7 @@ leader_traits = {
 	vapsid_economist = {
 		random = no
 		fascism_drift = 0.05
-		consumer_goods_factor = -0.05
+		consumer_goods_factor = -0.15
 	}
 
 	subservient_ultranationalist = {
@@ -4484,7 +5690,7 @@ leader_traits = {
 		neutrality_drift = -0.2
 		mobilization_laws_cost_factor = -0.1
 	}
-	
+
 	latvian_militant = {
 		random = no
 		neutrality_drift = 0.05
@@ -4522,7 +5728,7 @@ leader_traits = {
 
 	national_determinist = {
 		random = no
-		resistance_damage_to_garrison = -0.25 
+		resistance_damage_to_garrison = -0.25
 		foreign_subversive_activites = -0.3
 		non_core_manpower = -0.02
 		conscription_factor = 0.05
@@ -4560,7 +5766,7 @@ leader_traits = {
 	falangist_militarist = {
 		random = no
 		fascism_drift = 0.05
-		resistance_damage_to_garrison = -0.25 
+		resistance_damage_to_garrison = -0.25
 		foreign_subversive_activites = -0.3
 		non_core_manpower = 0.02
 	}
@@ -4594,7 +5800,7 @@ leader_traits = {
 		army_core_attack_factor = 0.05
 		army_core_defence_factor = 0.05
 	}
-	
+
 	anti_bolshevik_leftist = {
 		random = no
 		communism_drift = 0.05
@@ -4621,155 +5827,156 @@ leader_traits = {
 		army_core_attack_factor = 0.05
 		army_core_defence_factor = 0.05
 	}
-	
+
 	royal_dictator = {
 		random = no
 		political_power_factor = 0.15
 		neutrality_drift = 0.05
 	}
-	
+
 	autocratic_archbishop = {
 		random = no
 		stability_factor = 0.15
 		neutrality_drift = 0.05
 	}
-	
+
 	staunch_aristocrat = {
 		random = no
-		consumer_goods_factor = -0.05
+		consumer_goods_factor = -0.20
 		drift_defence_factor = 0.15
 	}
-	
+
 	soviet_thaw = {
 		random = no
 		drift_defence_factor = 0.15
 		autonomy_gain = 0.5
 	}
-	
+
 	socialist_autocrat = {
 		random = no
 		communism_drift = 0.05
 		political_power_factor = 0.2
 	}
-	
+
 	the_last_romanov_maybe = {
 		random = no
 		stability_factor = -0.2
 	}
-	
+
 	the_last_romanov_probably = {
 		random = no
 		stability_factor = -0.05
 	}
-	
+
 	the_last_romanov_definitely = {
 		random = no
 		stability_factor = 0.2
 		war_support_factor = 0.1
 		political_power_factor = 0.1
 	}
-	
+
 	resistance_artist = {
 		random = no
 		stability_factor = 0.1
 		exiled_government_weekly_manpower = 700
 		legitimacy_gain_factor = 0.25
 	}
-	
+
 	polish_peasant_champion = {
 		random = no
 		stability_factor = 0.1
 		conscription_factor = 0.05
 	}
-	
+
 	morges_champion = {
 		random = no
 		war_support_factor = 0.1
 		training_time_factor = -0.1
 		mobilization_laws_cost_factor = -0.1
 	}
-	
+
 	he_who_bears_the_throne = {
 		random = no
 		stability_factor = 0.2
 		war_support_factor = 0.2
 		drift_defence_factor = 0.5
 	}
-	
+
 	personal_union_trait = {
 		random = no
 		stability_factor = 0.1
 		autonomy_gain_global_factor = -0.5
 	}
-	
+
 	socdem_reformist = {
 		random = no
 		political_power_factor = 0.15
 		democratic_drift = 0.05
 	}
-	
+
 	national_propagandist = {
 		random = no
 		political_power_factor = 0.15
 		fascism_drift = 0.05
 	}
-	
+
 	nationalist_journalist = {
 		random = no
 		stability_factor = 0.1
 		fascism_drift = 0.05
 	}
-	
+
 	father_of_polish_nationalism = {
 		random = no
 		political_power_factor = 0.1
 		stability_factor = 0.1
 		fascism_drift = 0.1
 	}
-	
+
 	unruly_falangist = {
 		random = no
 		generate_wargoal_tension = -0.5
 		justify_war_goal_time = -0.25
 		war_support_factor = 0.05
 	}
-	
+
 	POL_cossack_king = {
 		random = no
 		justify_war_goal_time = -0.25
 		motorized_attack_factor = 0.15
 		motorized_defence_factor = 0.15
 	}
-	
+
 	royal_legitimist = {
 		random = no
 		political_power_factor = 0.1
 		compliance_gain = 0.05
 		stability_factor = 0.05
 	}
-	
+
 	patriot_king = {
 		random = no
 		stability_factor = 0.05
 		war_support_factor = 0.1
 	}
-	
+
 	king_of_galicia_and_lodomeria = {
 		random = no
 		political_power_factor = 0.1
 	}
-	
+
 	POL_soldier_king = {
 		random = no
 		army_morale_factor = 0.1
 	}
-	
+
 	LIT_king_of_lithuania = {
 		random = no
 		stability_factor = 0.1
 		war_support_factor = 0.05
 	}
 
+
 	#Hess
 	amateur_aviator_hess = {
 		political_power_factor = 0.15
@@ -4779,23 +5986,20 @@ leader_traits = {
 			}
 		}
 	}
+
+
 	###
 	
 	council_of_theorists = {
+		experience_gain_army = 0.03
+		experience_gain_air = 0.03
+		experience_gain_navy = 0.03
 		land_doctrine_cost_factor = -0.05
 		air_doctrine_cost_factor = -0.05
 		naval_doctrine_cost_factor = -0.05
-		
-		ai_will_do = {
-			factor = 500
-		}
-	}
-	
-	military_theorist = {
-		land_doctrine_cost_factor = -0.1
-		
+
 		ai_will_do = {
-			factor = 500
+			factor = 3
 		}
 	}
 	
@@ -4808,188 +6012,173 @@ leader_traits = {
 		}
 	}
 
-	mobile_warfare_expert = { 
+	military_theorist = {
+		land_doctrine_cost_factor = -0.1
+
+		ai_will_do = {
+			factor = 1
+		}
+	}
+
+	mobile_warfare_expert = {
 		cat_mobile_warfare_cost_factor = -0.15
-		
+
 		ai_will_do = {
 			factor = 0
 			modifier = {
 				add = 600
-				OR = {
-					has_tech = mobile_warfare
-					is_researching_technology = mobile_warfare
-				}
+				has_tech = mobile_warfare
 			}
 		}
 	}
-	
+
 	superior_firepower_expert = {
 		cat_superior_firepower_cost_factor = -0.15
-		
+
 		ai_will_do = {
 			factor = 0
 			modifier = {
 				add = 600
-				OR = {
-					has_tech = superior_firepower
-					is_researching_technology = superior_firepower
-				}
+				has_tech = superior_firepower
 			}
 		}
 	}
-	
+
 	grand_battle_plan_expert = {
 		cat_grand_battle_plan_cost_factor = -0.15
-		
+
 		ai_will_do = {
 			factor = 0
 			modifier = {
 				add = 600
-				OR = {
-					has_tech = trench_warfare
-					is_researching_technology = trench_warfare
-				}
+				has_tech = trench_warfare
 			}
 		}
 	}
-	
+
 	mass_assault_expert = {
 		cat_mass_assault_cost_factor = -0.15
-		
+
 		ai_will_do = {
 			factor = 0
 			modifier = {
 				add = 600
-				OR = {
-					has_tech = mass_assault
-					is_researching_technology = mass_assault
-				}
+				has_tech = mass_assault
 			}
 		}
 	}
-	
+
 	air_warfare_theorist = {
 		air_doctrine_cost_factor = -0.1
-		
+
 		ai_will_do = {
-			factor = 500
+			factor = 1
 		}
 	}
-	
+
 	dive_bomber = {
 		equipment_bonus = {
 			small_plane_cas_airframe = {
-					instant = yes
-					air_ground_attack = 0.1 
+				instant = yes
+				air_ground_attack = 0.1
 			}
 		}
 		air_doctrine_cost_factor = -0.10
-		
+
 		ai_will_do = {
-			factor = 100
+			factor = 1
 		}
 	}
-	
+
 	victory_through_airpower = {
 		cat_strategic_destruction_cost_factor = -0.15
-		
+
 		ai_will_do = {
 			factor = 0
 			modifier = {
 				add = 150
-				OR = {
-					has_tech = air_superiority
-					is_researching_technology = air_superiority
-				}
+				has_tech = air_superiority
 			}
 		}
 	}
-	
+
 	close_air_support_proponent = {
 		cat_battlefield_support_cost_factor = -0.15
-		
+
 		ai_will_do = {
 			factor = 0
 			modifier = {
 				add = 150
-				OR = {
-					has_tech = force_rotation
-					is_researching_technology = force_rotation
-				}
+				has_tech = force_rotation
 			}
 		}
 	}
-	
+
 	assault_avaition = {
-		cat_operational_integrity_cost_factor = -0.15
 		
+		cat_operational_integrity_cost_factor = -0.15
+
 		ai_will_do = {
 			factor = 0
 			modifier = {
 				add = 150
-				OR = {
-					has_tech = formation_flying
-					is_researching_technology = formation_flying
-				}
+				has_tech = formation_flying
 			}
 		}
 	}
-	
+
 	naval_theorist = {
-		naval_doctrine_cost_factor = -0.1
 		
+		naval_doctrine_cost_factor = -0.1
+
 		ai_will_do = {
-			factor = 100
+			factor = 1
 		}
+		
 	}
-	
+
 	naval_aviation_pioneer = {
-		cat_base_strike_cost_factor = -0.15
 		
+		cat_base_strike_cost_factor = -0.15
+
 		ai_will_do = {
 			factor = 0
 			modifier = {
 				add = 150
-				OR = {
-					has_tech = base_strike
-					is_researching_technology = base_strike
-				}
+				has_tech = base_strike
 			}
 		}
 	}
-	
+
 	grand_fleet_proponent = {
-		cat_fleet_in_being_cost_factor = -0.15
 		
+		cat_fleet_in_being_cost_factor = -0.15
+
 		ai_will_do = {
 			factor = 0
 			modifier = {
 				add = 150
-				OR = {
-					has_tech = fleet_in_being
-					is_researching_technology = fleet_in_being
-				}
+				has_tech = fleet_in_being
 			}
 		}
 	}
-	
+
 	submarine_specialist = {
-		cat_trade_interdiction_cost_factor = -0.15
 		
+		cat_trade_interdiction_cost_factor = -0.15
+
 		ai_will_do = {
 			factor = 0
 			modifier = {
 				add = 150
-				OR = {
-					has_tech = trade_interdiction
-					is_researching_technology = trade_interdiction
-				}
+				has_tech = trade_interdiction
 			}
 		}
 	}
-	
+
 	blitzkrieg_theorist = {
 		
+
 		equipment_bonus = {
 			armor = {
 				instant = yes
@@ -4997,20 +6186,20 @@ leader_traits = {
 			}
 		}
 		cat_mobile_warfare_cost_factor = -0.15
-		
+
 		ai_will_do = {
-			factor = 600
+			factor = 500
 		}
 	}
 
 	aircraft_manufacturer = {
 		random = no
-	
+
 		ai_will_do = {
 			factor = 1
 		}
 	}
-	
+
 	light_aircraft_manufacturer = {
 		random = no
 		equipment_bonus = {
@@ -5021,29 +6210,29 @@ leader_traits = {
 				air_agility = 0.1 maximum_speed = 0.1
 			}
 		}
-		
+
 		ai_will_do = {
 			factor = 1
 		}
 	}
 
-	light_aircraft_manufacturer_2 = { 
+	light_aircraft_manufacturer_2 = {
 		random = no
 		equipment_bonus = {
 			small_plane_airframe = {
 				air_agility = 0.2 maximum_speed = 0.1
 			}
-			cv_small_plane_airframe  = {
+			cv_small_plane_airframe = {
 				air_agility = 0.2 maximum_speed = 0.1
 			}
 		}
-		
+
 		ai_will_do = {
 			factor = 2
 		}
 	}
-	
-	
+
+
 	CAS_manufacturer = {
 		random = no
 		equipment_bonus = {
@@ -5054,12 +6243,12 @@ leader_traits = {
 				air_ground_attack = 0.1 reliability = 0.1
 			}
 		}
-		
+
 		ai_will_do = {
 			factor = 1
 		}
 	}
-	
+
 	medium_aircraft_manufacturer = {
 		random = no
 		equipment_bonus = {
@@ -5073,13 +6262,13 @@ leader_traits = {
 				reliability = 0.2
 			}
 		}
-		
+
 		ai_will_do = {
 			factor = 1
 		}
 	}
 
-	fuel_efficient_aircraft_manufacturer = { 
+	fuel_efficient_aircraft_manufacturer = {
 		random = no
 		equipment_bonus = {
 			small_plane_airframe = {
@@ -5093,12 +6282,12 @@ leader_traits = {
 				reliability = 0.2
 			}
 		}
-		
+
 		ai_will_do = {
 			factor = 1
 		}
 	}
-	
+
 	heavy_aircraft_manufacturer = {
 		random = no
 		equipment_bonus = {
@@ -5110,12 +6299,12 @@ leader_traits = {
 				air_range = 0.1
 			}
 		}
-		
+
 		ai_will_do = {
 			factor = 1
 		}
 	}
-	
+
 	naval_aircraft_manufacturer = {
 		random = no
 		equipment_bonus = {
@@ -5132,12 +6321,12 @@ leader_traits = {
 				air_range = 0.1 naval_strike_attack = 0.1
 			}
 		}
-		
+
 		ai_will_do = {
 			factor = 1
 		}
 	}
-	
+
 	multi_role_aircraft_manufacturer = {
 		random = no
 		equipment_bonus = {
@@ -5154,6 +6343,7 @@ leader_traits = {
 				reliability = 0.1
 			}
 		}
+
 		ai_will_do = {
 			factor = 1
 		}
@@ -5167,8 +6357,11 @@ leader_traits = {
 			armor = {
 				reliability = 0.05
 			}
+			armored_car_equipment = {
+				reliability = 0.05
+			}
 		}
-		
+
 		ai_will_do = {
 			factor = 1
 		}
@@ -5178,13 +6371,13 @@ leader_traits = {
 		random = no
 		equipment_bonus = {
 			armor = {
-				maximum_speed = 0.05 reliability = 0.1 
+				maximum_speed = 0.05 reliability = 0.1
 			}
 			armored_car_equipment = {
 				maximum_speed = 0.05 reliability = 0.1
 			}
 		}
-		
+
 		ai_will_do = {
 			factor = 1
 		}
@@ -5199,7 +6392,7 @@ leader_traits = {
 				hard_attack = 0.05
 			}
 		}
-	
+
 		ai_will_do = {
 			factor = 1
 		}
@@ -5217,12 +6410,12 @@ leader_traits = {
 				armor_value = 0.05
 			}
 		}
-		
+
 		ai_will_do = {
 			factor = 1
 		}
 	}
-	
+
 	medium_tank_manufacturer = {
 		random = no
 		equipment_bonus = {
@@ -5233,12 +6426,12 @@ leader_traits = {
 				reliability = 0.05 soft_attack = 0.05
 			}
 		}
-		
+
 		ai_will_do = {
 			factor = 1
 		}
 	}
-	
+
 	heavy_tank_manufacturer = {
 		random = no
 		equipment_bonus = {
@@ -5249,12 +6442,12 @@ leader_traits = {
 				armor_value = 0.05 hard_attack = 0.05
 			}
 		}
-		
+
 		ai_will_do = {
 			factor = 1
 		}
 	}
-	
+
 	tank_manufacturer = {
 		random = no
 		#generic
@@ -5272,7 +6465,7 @@ leader_traits = {
 			factor = 1
 		}
 	}
-	
+
 	repair_and_refurbishment_plant = { #NSB - Repairs & Refit
 		random = no
 		equipment_bonus = {
@@ -5289,19 +6482,19 @@ leader_traits = {
 				build_cost_ic = -0.05
 			}
 		}
-			
+
 		ai_will_do = {
 			factor = 1
 		}
 	}
-	
+
 	black_sea_naval_manufacturer = { #NSB - Screen Ships and Submarines
 		random = no
-	
+
 		equipment_bonus = {
 			screen_ship = {
 				build_cost_ic = -0.15 sub_detection = 0.1 naval_range = -0.25
-				}
+			}
 			submarine = {
 				build_cost_ic = -0.15 sub_visibility = -0.1 naval_range = -0.25
 			}
@@ -5309,7 +6502,7 @@ leader_traits = {
 				build_cost_ic = 0.15 naval_range = -0.25
 			}
 		}
-			
+
 		ai_will_do = {
 			factor = 1
 		}
@@ -5331,10 +6524,12 @@ leader_traits = {
 				build_cost_ic = -0.1 sub_visibility = -0.1 surface_visibility = -0.1 naval_speed = 0.1 naval_range = 0.1
 			}
 		}
+
 		ai_will_do = {
 			factor = 1
 		}
 	}
+
 	submarine_manufacturer_2 = { #Improved version used for Italy (done in trait in order to keep a nice tooltip)
 		random = no
 		equipment_bonus = {
@@ -5351,12 +6546,12 @@ leader_traits = {
 				build_cost_ic = -0.15 sub_visibility = -0.1 surface_visibility = -0.1 naval_speed = 0.15 naval_range = 0.1
 			}
 		}
+
 		ai_will_do = {
 			factor = 1
 		}
 	}
 
-	
 	pacific_fleet_naval_manufacturer = { #longer ranged, CVs favor larger hangers over armor
 		random = no
 		equipment_bonus = {
@@ -5373,41 +6568,41 @@ leader_traits = {
 				naval_range = 0.25
 			}
 		}
-		
+
 		ai_will_do = {
 			factor = 1
 		}
 	}
-	
+
 	atlantic_fleet_naval_manufacturer = { #armored carriers, slightly buffed cap ships
 		random = no
 		equipment_bonus = {
 			carrier = {
-				armor_value = 0.5 
+				armor_value = 0.5
 				max_strength = 0.1
 			}
 			capital_ship = {
-				armor_value = 0.1 
+				armor_value = 0.1
 				hg_attack = 0.1
 			}
 			#screen_ship = {
-			#	
+			#
 			#}
 			#submarine = {
-			#	
+			#
 			#}
 		}
-		
+
 		ai_will_do = {
 			factor = 1
 		}
 	}
-		
+
 	battlefleet_designer = { #armored carriers, slightly buffed cap ships
 		random = no
 		equipment_bonus = {
 			capital_ship = {
-				armor_value = 0.15 
+				armor_value = 0.15
 				hg_attack = 0.15
 			}
 			screen_ship = {
@@ -5415,12 +6610,12 @@ leader_traits = {
 				sub_detection = -0.25
 			}
 		}
-		
+
 		ai_will_do = {
 			factor = 1
 		}
 	}
-	
+
 	raiding_fleet_naval_manufacturer = {
 		random = no
 		equipment_bonus = {
@@ -5439,12 +6634,12 @@ leader_traits = {
 				sub_visibility = -0.1 surface_visibility = -0.1 naval_speed = 0.1
 			}
 		}
-		
+
 		ai_will_do = {
 			factor = 1
 		}
 	}
-	
+
 	convoy_escort_naval_manufacturer = {
 		random = no
 		equipment_bonus = {
@@ -5452,7 +6647,7 @@ leader_traits = {
 				naval_range = 0.3 sub_detection = 0.1 naval_speed = 0.1 build_cost_ic = 0.1
 			}
 		}
-		
+
 		ai_will_do = {
 			factor = 1
 		}
@@ -5465,15 +6660,15 @@ leader_traits = {
 				naval_range = -0.25 naval_speed = 0.1
 			}
 			screen_ship = {
-				naval_range = -0.25 naval_speed = 0.1 
+				naval_range = -0.25 naval_speed = 0.1
 			}
 		}
-	
+
 		ai_will_do = {
 			factor = 1
 		}
 	}
-	
+
 	coastal_defence_naval_manufacturer = {
 		random = no
 		equipment_bonus = {
@@ -5492,32 +6687,32 @@ leader_traits = {
 				build_cost_ic = -0.25 naval_range = -0.5
 			}
 		}
-		
+
 		ai_will_do = {
 			factor = 1
 		}
 	}
-	
+
 	naval_manufacturer = {
 		random = no
 		#generic
-		
+
 		ai_will_do = {
 			factor = 1
 		}
 	}
-	
+
 	artillery_manufacturer = {
 		random = no
-		
+
 		ai_will_do = {
 			factor = 1
 		}
 	}
-	
+
 	infantry_equipment_manufacturer = {
 		random = no
-		
+
 		ai_will_do = {
 			factor = 1
 		}
@@ -5525,23 +6720,23 @@ leader_traits = {
 
 	support_equipment_manufacturer = {
 		random = no
-		
+
 		ai_will_do = {
 			factor = 1
 		}
 	}
-	
+
 	motorized_equipment_manufacturer = {
 		random = no
-		
+
 		ai_will_do = {
 			factor = 1
 		}
 	}
-	
+
 	industrial_concern = {
 		random = no
-		
+
 		ai_will_do = {
 			factor = 1
 		}
@@ -5559,7 +6754,7 @@ leader_traits = {
 			}
 		}
 		ai_will_do = {
-			factor = 1.2
+			factor = 1
 		}
 	}
 
@@ -5568,23 +6763,43 @@ leader_traits = {
 
 		production_speed_infrastructure_factor = 0.1
 		production_speed_rail_way_factor = 0.1
-		
+
 		ai_will_do = {
-			factor = 1.2
+			factor = 1
 		}
 	}
-	
+
 	refinery_concern = {
 		random = no
-		
+
+		ai_will_do = {
+			factor = 1
+		}
+	}
+
+	electronics_concern = {
+		random = no
+
+		ai_will_do = {
+			factor = 1
+		}
+	}
+
+	telephone_company = {
+		random= No
+		land_reinforce_rate = 0.02
+		coordination_bonus = 0.04
 		ai_will_do = {
 			factor = 1
 		}
 	}
-	
-	electronics_concern = {
+
+	mining_company = {
 		random = no
-		
+
+		local_resources_factor = 0.1
+		production_lack_of_resource_penalty_factor = -0.15
+
 		ai_will_do = {
 			factor = 1
 		}
@@ -5592,7 +6807,7 @@ leader_traits = {
 
 	electronics_developer = {
 		random = no
-		
+
 		ai_will_do = {
 			factor = 1
 		}
@@ -5603,7 +6818,7 @@ leader_traits = {
 
 		production_speed_infrastructure_factor = 0.05
 		industrial_capacity_dockyard = 0.05
-		
+
 		ai_will_do = {
 			factor = 1
 		}
@@ -5613,7 +6828,7 @@ leader_traits = {
 		random = no
 
 		industrial_capacity_factory = 0.1
-		
+
 		ai_will_do = {
 			factor = 1
 		}
@@ -5624,9 +6839,9 @@ leader_traits = {
 
 		min_export = 0.3
 		opinion_gain_monthly_factor = -0.05
-		consumer_goods_factor = 0.05
+		consumer_goods_factor = 0.10
 		political_power_gain = -0.15
-		
+
 		ai_will_do = {
 			factor = 1
 		}
@@ -5637,7 +6852,7 @@ leader_traits = {
 
 		min_export = 0.15
 		political_power_gain = -0.05
-		
+
 		ai_will_do = {
 			factor = 1
 		}
@@ -5649,9 +6864,9 @@ leader_traits = {
 		production_speed_infrastructure_factor = 0.15
 		production_speed_rail_way_factor = 0.15
 		industry_repair_factor = 0.2
-		
+
 		ai_will_do = {
-			factor = 1.2
+			factor = 1
 		}
 	}
 
@@ -5662,9 +6877,9 @@ leader_traits = {
 		political_power_gain = -0.05
 		production_speed_buildings_factor = 0.05
 		production_factory_max_efficiency_factor = 0.15
-		
+
 		ai_will_do = {
-			factor = 1.5
+			factor = 1
 		}
 	}
 
@@ -5673,12 +6888,327 @@ leader_traits = {
 
 		political_power_gain = 0.05
 		opinion_gain_monthly_factor = 0.05
+
+		ai_will_do = {
+			factor = 1
+		}
+	}
+
+	################################
+	##       NORWAY TRAITS 		  ##
+	################################
+
+	NOR_royal_chamberlain = { # For Peder Anker Wedel-Jarlsberg as Advisor
+		random = no
+		
+		neutrality_drift = 0.1
+		stability_factor = 0.15
+
+		ai_will_do = {
+			factor = 1
+		}
+	}
+
+	NOR_queen_of_norway = {
+		random = no 
+
+		stability_factor = 0.2
+		political_power_cost = -0.05
+		consumer_goods_factor = 0.15
+	}
+
+
+	NOR_shrewd_regent = { # For Peder Anker Wedel Jarlsberg as a country leader 
+		random = no
+
+		stability_factor = 0.2
+		political_power_cost = 0.15
+	}
+
+
+
+	NOR_aristocratic_industrialist = { # For Axel Aubert
+		random = no 
+
+		neutrality_drift = 0.03
+		production_speed_buildings_factor = 0.1
+		production_speed_bunker_factor = 0.25
+		production_speed_coastal_bunker_factor = 0.25
+	}
+
+	NOR_democratic_powerhouse = { #For Martin Tranmael
+		random = no 
+
+		democratic_drift = 0.1
+		stability_factor = 0.15
+		war_support_factor = -0.15
+	}
+
+	NOR_pacifist_diplomat = { #For Halvdan Koht
+		random = no 
+
+		war_support_factor = -0.1 
+		political_power_gain = 0.15
+		opinion_gain_monthly_factor = 0.25
+	}
+
+	NOR_shipping_capitalist = { #For Johan Ludwig Mowinckel 
+		random = no 
+
+		production_speed_dockyard_factor = 0.17
+	}
+
+	NOR_stern_communist = {
+		random = no 
+
+		communism_drift = 0.09
+		surrender_limit = 0.25
+		political_power_factor = -0.05
+	}
+
+	NOR_conciliatory_socialist = {
+		random = no 
+
+		stability_factor = 0.1
+		communism_drift = 0.01
+	}
+
+	NOR_communist_agitator = {
+		random = no 
+
+		communism_drift = 0.1
+		resistance_growth_on_our_occupied_states = 0.15
+	}
+
+	NOR_radical_trade_unionist = {
+		random = no 
+
+		communism_drift = 0.05
+		production_speed_buildings_factor = 0.12
+	}
+
+	NOR_permanent_revolutionary = {
+		random = no 
+
+		communism_drift = 0.08
+		war_stability_factor = -0.2
+		non_core_manpower = 0.07
+	}
+
+	NOR_fascist_lackey = { # For Quisling (Advisor)
+		random = no 
+
+		fascism_drift = 0.08
+		stability_factor = -0.1
+		war_stability_factor = 0.15
+		war_support_factor = 0.1
+	}
+
+	NOR_fascist_dilettante = { # for Quisling (Country Leader)
+		random = no 
+
+		fascism_drift = 0.01
+		stability_factor = -0.15
+		war_support_factor = -0.1
+		resistance_decay = -0.15	
+	}
+
+	NOR_fascist_landssviker = { # for Quisling (Country Leader)
+		random = no 
+
+		fascism_drift = 0.01
+		stability_factor = -0.2
+		war_support_factor = -0.15
+		resistance_decay = -0.15
+
+	}
+
+	NOR_ruthless_administrator = {
+		random = no 
+
+		fascism_drift = 0.12
+		stability_factor = 0.2
+		resistance_decay = 0.1
+	}
+
+	NOR_fascist_judiciary = {
+		random = no 
+
+		compliance_growth = 0.05
+		resistance_growth = -0.1
+	}
+
+	NOR_fascist_advocate = {
+		random = no 
+
+		stability_factor = 0.2
+		fascism_drift = 0.02
+	}
+
+	NOR_callous_engineer = {
+		random = no 
+
+		research_speed_factor = 0.09
+	}
+
+	NOR_tobacco_industrialist = {
+		random = no 
+
+		war_support_factor = -0.15
+		production_speed_infrastructure_factor = 0.25
+		production_speed_industrial_complex_factor = 0.2
+	}
+
+	NOR_compliant_politician = {
+		random = no 
+
+		stability_factor = 0.10
+		political_power_factor = 0.1
+	}
+
+	NOR_conservative_businessman = {
+		random = no 
+
+		production_speed_buildings_factor = 0.10
+		fascism_drift = 0.03
+	}
+
+	NOR_germanophile_officer = { # For Jonas Lie 
+		random = no 
+
+		fascism_drift = 0.03
+		war_support_factor = 0.2
+		experience_gain_army = 0.09
+		resistance_decay = -0.25
+		stability_factor = -0.25
+	}
+
+	NOR_ruthless_police_captain = { # Prince of Terror equivalent, also for Jonas Lie
+		resistance_damage_to_garrison = -0.3
+		foreign_subversive_activites = -0.4
+		non_core_manpower = 0.04
+		stability_factor = 0.15
+		war_support_factor = 0.2
+		fascism_drift = 0.01
+
+		ai_will_do = {
+			factor = 1
+		}
+	}
+
+	NOR_clueless_defense_minister = { # For Ljundberg  
+		random = no 
+		
+
+		land_doctrine_cost_factor = -0.1
+		mobilization_laws_cost_factor = 0.75
+	}
+
+	NOR_minister_of_agriculture = {
+		random = no 
+		
+
+		weekly_manpower = 300 
+		war_support_factor = -0.05
+	}
+
+	###### OFFICER CORPS TRAITS ######
+
+	NOR_defeatist_commander_in_chief = {
+		
+		experience_gain_army = @chief_experience_gain_low
+		
+		command_cap = @tier1
 		
+		max_dig_in_factor = 0.1
+		dig_in_speed_factor = 0.25
+		surrender_limit = -0.2
+				ai_will_do = {
+			factor = 1
+			modifier = {
+				factor = 0
+				command_power < @tier1
+			}
+		}
+	}
+	
+	NOR_hydroelectric_company_trait = {
+
+		country_resource_aluminium = 10 
+		production_speed_industrial_complex_factor = 0.15
+
+
+		ai_will_do = {
+			factor = 1
+		}
+	}
+
+	NOR_nationalized_hydroelectric_company_trait = {
+
+		country_resource_aluminium = 20 
+		production_speed_industrial_complex_factor = 0.2
+		production_speed_infrastructure_factor = 0.1
+
+		ai_will_do = {
+			factor = 1
+		}
+	}
+
+	NOR_oppportunistic_officer = { # For Sundlo
+		
+		land_doctrine_cost_factor = -0.1
+		experience_gain_army_factor = 0.07
+
+		ai_will_do = {
+			factor = 1
+		}
+	}
+
+	NOR_pragmatic_defense_minister = { # For Torp
+		
+		land_doctrine_cost_factor = -0.1
+		production_speed_industrial_complex_factor = 0.1
+
+		ai_will_do = {
+			factor = 1
+		}
+	}
+
+	NOR_vigilant_fort_commander = { # For Birger Eriksen (Military High Command)
+		random = no
+
+		coastal_bunker_effectiveness_factor = 0.05
+		land_bunker_effectiveness_factor = 0.1 
+		initiative_factor = 0.02
+
+		#experience_gain_army = @experience_gain_low
+
+		command_cap = @tier1
+
+		ai_will_do = {
+			factor = 2
+			modifier = {
+				factor = 0
+				command_power < @tier1
+			}
+		}
+	}
+
+
+
+############
+
+	inventive_genius = {
+		random = no
+
+		political_power_gain = 0.05
+		opinion_gain_monthly_factor = 0.05
+
 		ai_will_do = {
 			factor = 1
 		}
 	}
-	
+
 	### Military Minister Traits
 
 	# 1 is worst, 3 is best
@@ -5692,6 +7222,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 1
+			modifier = {
+				factor = 0
+				command_power < @tier1
+			}
 		}
 	}
 
@@ -5704,29 +7238,43 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 2
+			modifier = {
+				factor = 0
+				command_power < @tier2
+			}
 		}
 	}
 
 	army_chief_defensive_3 = { # +15 Defensive efficiency
 		army_defence_factor = 0.15
+		ai_focus_defense_factor = 0.15
 		experience_gain_army = @chief_experience_gain_high
 
 		command_cap = @tier3
 
 		ai_will_do = {
 			factor = 3
+			modifier = {
+				factor = 0
+				command_power < @tier3
+			}
 		}
 	}
 
 
 	army_chief_offensive_1 = { # +5 Offensive efficiency
 		army_attack_factor = 0.05
+		ai_focus_aggressive_factor = 0.15
 		experience_gain_army = @chief_experience_gain_low
 
 		command_cap = @tier1
 
 		ai_will_do = {
 			factor = 1
+			modifier = {
+				factor = 0
+				command_power < @tier1
+			}
 		}
 	}
 
@@ -5739,6 +7287,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 2
+			modifier = {
+				factor = 0
+				command_power < @tier2
+			}
 		}
 	}
 
@@ -5751,6 +7303,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 3
+			modifier = {
+				factor = 0
+				command_power < @tier3
+			}
 		}
 	}
 
@@ -5759,7 +7315,11 @@ leader_traits = {
 		max_command_power = 10
 
 		ai_will_do = {
-			factor = 1
+			factor = 0.5
+			modifier = {
+				factor = 0
+				command_power < @tier1
+			}
 		}
 	}
 
@@ -5771,6 +7331,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 1
+			modifier = {
+				factor = 0
+				command_power < @tier1
+			}
 		}
 	}
 
@@ -5782,6 +7346,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 2
+			modifier = {
+				factor = 0
+				command_power < @tier2
+			}
 		}
 	}
 
@@ -5793,6 +7361,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 3
+			modifier = {
+				factor = 0
+				command_power < @tier3
+			}
 		}
 	}
 
@@ -5806,6 +7378,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 1
+			modifier = {
+				factor = 0
+				command_power < @tier1
+			}
 		}
 	}
 
@@ -5818,6 +7394,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 2
+			modifier = {
+				factor = 0
+				command_power < @tier2
+			}
 		}
 	}
 
@@ -5830,6 +7410,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 3
+			modifier = {
+				factor = 0
+				command_power < @tier3
+			}
 		}
 	}
 
@@ -5842,6 +7426,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 1
+			modifier = {
+				factor = 0
+				command_power < @tier1
+			}
 		}
 	}
 
@@ -5853,6 +7441,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 2
+			modifier = {
+				factor = 0
+				command_power < @tier2
+			}
 		}
 	}
 
@@ -5864,6 +7456,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 3
+			modifier = {
+				factor = 0
+				command_power < @tier3
+			}
 		}
 	}
 
@@ -5875,6 +7471,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 1
+			modifier = {
+				factor = 0
+				command_power < @tier1
+			}
 		}
 	}
 
@@ -5886,6 +7486,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 2
+			modifier = {
+				factor = 0
+				command_power < @tier2
+			}
 		}
 	}
 
@@ -5897,6 +7501,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 3
+			modifier = {
+				factor = 0
+				command_power < @tier3
+			}
 		}
 	}
 
@@ -5908,6 +7516,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 1
+			modifier = {
+				factor = 0
+				command_power < @tier1
+			}
 		}
 	}
 
@@ -5919,6 +7531,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 2
+			modifier = {
+				factor = 0
+				command_power < @tier2
+			}
 		}
 	}
 
@@ -5930,6 +7546,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 3
+			modifier = {
+				factor = 0
+				command_power < @tier3
+			}
 		}
 	}
 
@@ -5941,7 +7561,11 @@ leader_traits = {
 		command_cap = @tier1
 
 		ai_will_do = {
-			factor = 1
+			factor = 0.5
+			modifier = {
+				factor = 0
+				command_power < @tier1
+			}
 		}
 	}
 
@@ -5952,7 +7576,11 @@ leader_traits = {
 		command_cap = @tier2
 
 		ai_will_do = {
-			factor = 2
+			factor = 1
+			modifier = {
+				factor = 0
+				command_power < @tier2
+			}
 		}
 	}
 
@@ -5963,7 +7591,11 @@ leader_traits = {
 		command_cap = @tier3
 
 		ai_will_do = {
-			factor = 3
+			factor = 1.5
+			modifier = {
+				factor = 0
+				command_power < @tier3
+			}
 		}
 	}
 
@@ -5976,6 +7608,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 1
+			modifier = {
+				factor = 0
+				command_power < @tier1
+			}
 		}
 	}
 
@@ -5987,7 +7623,11 @@ leader_traits = {
 		command_cap = @tier2
 
 		ai_will_do = {
-			factor = 1
+			factor = 2
+			modifier = {
+				factor = 0
+				command_power < @tier2
+			}
 		}
 	}
 
@@ -5999,7 +7639,11 @@ leader_traits = {
 		command_cap = @tier3
 
 		ai_will_do = {
-			factor = 1
+			factor = 3
+			modifier = {
+				factor = 0
+				command_power < @tier3
+			}
 		}
 	}
 
@@ -6012,6 +7656,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 1
+			modifier = {
+				factor = 0
+				command_power < @tier1
+			}
 		}
 	}
 
@@ -6023,6 +7671,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 2
+			modifier = {
+				factor = 0
+				command_power < @tier2
+			}
 		}
 	}
 
@@ -6034,6 +7686,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 3
+			modifier = {
+				factor = 0
+				command_power < @tier3
+			}
 		}
 	}
 
@@ -6047,6 +7703,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 1
+			modifier = {
+				factor = 0
+				command_power < @tier1
+			}
 		}
 	}
 
@@ -6059,6 +7719,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 2
+			modifier = {
+				factor = 0
+				command_power < @tier2
+			}
 		}
 	}
 
@@ -6071,11 +7735,16 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 3
+			modifier = {
+				factor = 0
+				command_power < @tier3
+			}
 		}
 	}
 
 
 	army_artillery_1 = { # +4 artillery efficiency
+		
 		army_artillery_attack_factor = 0.1
 		army_artillery_defence_factor = 0.05
 		#experience_gain_army = @experience_gain_low
@@ -6084,10 +7753,15 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 1
+			modifier = {
+				factor = 0
+				command_power < @tier1
+			}
 		}
 	}
 
 	army_artillery_2 = { # +8 artillery efficiency
+		
 		army_artillery_attack_factor = 0.15
 		army_artillery_defence_factor = 0.1
 		#experience_gain_army = @experience_gain_medium
@@ -6096,10 +7770,15 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 2
+			modifier = {
+				factor = 0
+				command_power < @tier2
+			}
 		}
 	}
 
 	army_artillery_3 = { # +12 artillery efficiency
+		
 		army_artillery_attack_factor = 0.2
 		army_artillery_defence_factor = 0.15
 		#experience_gain_army = @experience_gain_high
@@ -6108,6 +7787,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 3
+			modifier = {
+				factor = 0
+				command_power < @tier3
+			}
 		}
 	}
 
@@ -6121,6 +7804,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 1
+			modifier = {
+				factor = 0
+				command_power < @tier1
+			}
 		}
 	}
 
@@ -6133,6 +7820,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 3
+			modifier = {
+				factor = 0
+				command_power < @tier2
+			}
 		}
 	}
 
@@ -6145,43 +7836,59 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 4
+			modifier = {
+				factor = 0
+				command_power < @tier3
+			}
 		}
 	}
 
 
 	army_commando_1 = { # +4 paratrooper/marine/mountain efficiency
-		special_forces_attack_factor = 0.1
-	    special_forces_defence_factor = 0.1
+		special_forces_attack_factor = 0.05
+		special_forces_cap_flat = 3
 		#experience_gain_army = @experience_gain_low
 
 		command_cap = @tier1
 
 		ai_will_do = {
 			factor = 1
+			modifier = {
+				factor = 0
+				command_power < @tier1
+			}
 		}
 	}
 
 	army_commando_2 = { # +8 paratrooper/marine/mountain efficiency
-		special_forces_attack_factor = 0.15
-	    special_forces_defence_factor = 0.15
+		special_forces_attack_factor = 0.10
+		special_forces_cap_flat = 6
 		#experience_gain_army = @experience_gain_medium
 
 		command_cap = @tier2
 
 		ai_will_do = {
 			factor = 2
+			modifier = {
+				factor = 0
+				command_power < @tier2
+			}
 		}
 	}
 
 	army_commando_3 = { # +12 paratrooper/marine/mountain efficiency
-		special_forces_attack_factor = 0.2
-	    special_forces_defence_factor = 0.2
+		special_forces_attack_factor = 0.15
+		special_forces_cap_flat = 10
 		#experience_gain_army = @experience_gain_high
 
 		command_cap = @tier3
 
 		ai_will_do = {
 			factor = 3
+			modifier = {
+				factor = 0
+				command_power < @tier3
+			}
 		}
 	}
 
@@ -6191,12 +7898,16 @@ leader_traits = {
 		motorized_defence_factor = 0.05
 		mechanized_attack_factor = 0.05
 		mechanized_defence_factor = 0.05		
-		#experience_gain_army = @experience_gain_low
+	#experience_gain_army = @experience_gain_low
 
 		command_cap = @tier1
 
 		ai_will_do = {
 			factor = 1
+			modifier = {
+				factor = 0
+				command_power < @tier1
+			}
 		}
 	}
 
@@ -6211,6 +7922,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 2
+			modifier = {
+				factor = 0
+				command_power < @tier2
+			}
 		}
 	}
 
@@ -6219,12 +7934,16 @@ leader_traits = {
 		motorized_defence_factor = 0.15
 		mechanized_attack_factor = 0.15
 		mechanized_defence_factor = 0.15		
-		#experience_gain_army = @experience_gain_high
+	#experience_gain_army = @experience_gain_high
 
 		command_cap = @tier3
 
 		ai_will_do = {
 			factor = 3
+			modifier = {
+				factor = 0
+				command_power < @tier3
+			}
 		}
 	}
 
@@ -6239,6 +7958,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 2
+			modifier = {
+				factor = 0
+				command_power < @tier1
+			}
 		}
 	}
 
@@ -6253,6 +7976,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 3
+			modifier = {
+				factor = 0
+				command_power < @tier2
+			}
 		}
 	}
 
@@ -6267,6 +7994,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 4
+			modifier = {
+				factor = 0
+				command_power < @tier3
+			}
 		}
 	}
 
@@ -6279,6 +8010,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 1
+			modifier = {
+				factor = 0
+				command_power < @tier1
+			}
 		}
 	}
 
@@ -6290,6 +8025,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 2
+			modifier = {
+				factor = 0
+				command_power < @tier2
+			}
 		}
 	}
 
@@ -6301,6 +8040,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 3
+			modifier = {
+				factor = 0
+				command_power < @tier3
+			}
 		}
 	}
 
@@ -6313,6 +8056,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 1
+			modifier = {
+				factor = 0
+				command_power < @tier1
+			}
 		}
 	}
 
@@ -6324,6 +8071,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 2
+			modifier = {
+				factor = 0
+				command_power < @tier2
+			}
 		}
 	}
 
@@ -6335,6 +8086,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 3
+			modifier = {
+				factor = 0
+				command_power < @tier3
+			}
 		}
 	}
 
@@ -6347,6 +8102,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 2
+			modifier = {
+				factor = 0
+				command_power < @tier1
+			}
 		}
 	}
 
@@ -6358,6 +8117,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 4
+			modifier = {
+				factor = 0
+				command_power < @tier2
+			}
 		}
 	}
 
@@ -6369,6 +8132,96 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 6
+			modifier = {
+				factor = 0
+				command_power < @tier3
+			}
+		}
+	}
+
+
+	army_radio_intelligence_1 = {
+		random = no
+		
+		civilian_intel_factor = 0.03
+		army_intel_factor = 0.03
+		navy_intel_factor = 0.03
+		airforce_intel_factor = 0.03		
+		initiative_factor = 0.02
+
+		#experience_gain_army = @experience_gain_low
+
+		command_cap = @tier1
+
+		ai_will_do = {
+			factor = 2
+			modifier = {
+				factor = 0
+				command_power < @tier1
+			}
+		}
+	}
+
+	army_radio_intelligence_2 = {
+		random = no
+		
+		civilian_intel_factor = 0.06
+		army_intel_factor = 0.06
+		navy_intel_factor = 0.06
+		airforce_intel_factor = 0.06		
+		initiative_factor = 0.04
+
+		#experience_gain_army = @experience_gain_medium
+
+		command_cap = @tier2
+
+		ai_will_do = {
+			factor = 4
+			modifier = {
+				factor = 0
+				command_power < @tier2
+			}
+		}
+	}
+
+	army_radio_intelligence_3 = {
+		random = no
+		
+		civilian_intel_factor = 0.09
+		army_intel_factor = 0.09
+		navy_intel_factor = 0.09
+		airforce_intel_factor = 0.09		
+		initiative_factor = 0.06
+
+		#experience_gain_army = @experience_gain_high
+
+		command_cap = @tier3
+
+		ai_will_do = {
+			factor = 6
+			modifier = {
+				factor = 0
+				command_power < @tier3
+			}
+		}
+	}
+
+	army_german_ground_commander = { #FIN-specific, considered Genius (tier 3)
+		amphibious_invasion = 0.1
+		paradrop_organization_factor = 0.1
+		army_infantry_attack_factor = 0.05
+		max_command_power = 60
+
+		#experience_gain_army = @experience_gain_high
+
+		command_cap = @tier3
+
+		ai_will_do = {
+			factor = 3
+			modifier = {
+				factor = 0
+				command_power < @tier3
+			}
 		}
 	}
 
@@ -6382,6 +8235,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 1
+			modifier = {
+				factor = 0
+				command_power < @tier1
+			}
 		}
 	}
 
@@ -6394,6 +8251,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 2
+			modifier = {
+				factor = 0
+				command_power < @tier2
+			}
 		}
 	}
 
@@ -6406,6 +8267,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 3
+			modifier = {
+				factor = 0
+				command_power < @tier3
+			}
 		}
 	}
 
@@ -6418,6 +8283,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 1
+			modifier = {
+				factor = 0
+				command_power < @tier1
+			}
 		}
 	}
 
@@ -6429,6 +8298,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 2
+			modifier = {
+				factor = 0
+				command_power < @tier2
+			}
 		}
 	}
 
@@ -6440,6 +8313,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 3
+			modifier = {
+				factor = 0
+				command_power < @tier3
+			}
 		}
 	}
 
@@ -6448,7 +8325,11 @@ leader_traits = {
 		max_command_power = 10
 
 		ai_will_do = {
-			factor = 1
+			factor = 0.25
+			modifier = {
+				factor = 0
+				command_power < @tier1
+			}
 		}
 	}
 
@@ -6460,6 +8341,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 1
+			modifier = {
+				factor = 0
+				command_power < @tier1
+			}
 		}
 	}
 
@@ -6471,6 +8356,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 2
+			modifier = {
+				factor = 0
+				command_power < @tier2
+			}
 		}
 	}
 
@@ -6482,6 +8371,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 3
+			modifier = {
+				factor = 0
+				command_power < @tier3
+			}
 		}
 	}
 
@@ -6494,6 +8387,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 1
+			modifier = {
+				factor = 0
+				command_power < @tier1
+			}
 		}
 	}
 
@@ -6505,6 +8402,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 2
+			modifier = {
+				factor = 0
+				command_power < @tier2
+			}
 		}
 	}
 
@@ -6516,6 +8417,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 3
+			modifier = {
+				factor = 0
+				command_power < @tier3
+			}
 		}
 	}
 
@@ -6529,6 +8434,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 1
+			modifier = {
+				factor = 0
+				command_power < @tier1
+			}
 		}
 	}
 
@@ -6540,6 +8449,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 2
+			modifier = {
+				factor = 0
+				command_power < @tier2
+			}
 		}
 	}
 
@@ -6551,6 +8464,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 3
+			modifier = {
+				factor = 0
+				command_power < @tier3
+			}
 		}
 	}
 
@@ -6563,6 +8480,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 1
+			modifier = {
+				factor = 0
+				command_power < @tier1
+			}
 		}
 	}
 
@@ -6574,6 +8495,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 2
+			modifier = {
+				factor = 0
+				command_power < @tier2
+			}
 		}
 	}
 
@@ -6585,6 +8510,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 3
+			modifier = {
+				factor = 0
+				command_power < @tier3
+			}
 		}
 	}
 
@@ -6599,6 +8528,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 1
+			modifier = {
+				factor = 0
+				command_power < @tier1
+			}
 		}
 	}
 
@@ -6612,6 +8545,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 2
+			modifier = {
+				factor = 0
+				command_power < @tier2
+			}
 		}
 	}
 
@@ -6625,6 +8562,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 3
+			modifier = {
+				factor = 0
+				command_power < @tier3
+			}
 		}
 	}
 
@@ -6639,6 +8580,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 1
+			modifier = {
+				factor = 0
+				command_power < @tier1
+			}
 		}
 	}
 
@@ -6652,6 +8597,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 2
+			modifier = {
+				factor = 0
+				command_power < @tier2
+			}
 		}
 	}
 
@@ -6665,6 +8614,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 3
+			modifier = {
+				factor = 0
+				command_power < @tier3
+			}
 		}
 	}
 
@@ -6679,6 +8632,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 1
+			modifier = {
+				factor = 0
+				command_power < @tier1
+			}
 		}
 	}
 
@@ -6692,6 +8649,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 2
+			modifier = {
+				factor = 0
+				command_power < @tier2
+			}
 		}
 	}
 
@@ -6705,6 +8666,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 3
+			modifier = {
+				factor = 0
+				command_power < @tier3
+			}
 		}
 	}
 
@@ -6719,6 +8684,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 1
+			modifier = {
+				factor = 0
+				command_power < @tier1
+			}
 		}
 	}
 
@@ -6732,6 +8701,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 2
+			modifier = {
+				factor = 0
+				command_power < @tier2
+			}
 		}
 	}
 
@@ -6745,6 +8718,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 3
+			modifier = {
+				factor = 0
+				command_power < @tier3
+			}
 		}
 	}
 
@@ -6760,6 +8737,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 1
+			modifier = {
+				factor = 0
+				command_power < @tier1
+			}
 		}
 	}
 
@@ -6774,6 +8755,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 2
+			modifier = {
+				factor = 0
+				command_power < @tier2
+			}
 		}
 	}
 
@@ -6788,6 +8773,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 3
+			modifier = {
+				factor = 0
+				command_power < @tier3
+			}
 		}
 	}
 
@@ -6800,6 +8789,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 1
+			modifier = {
+				factor = 0
+				command_power < @tier1
+			}
 		}
 	}
 
@@ -6811,6 +8804,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 2
+			modifier = {
+				factor = 0
+				command_power < @tier2
+			}
 		}
 	}
 
@@ -6822,6 +8819,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 3
+			modifier = {
+				factor = 0
+				command_power < @tier3
+			}
 		}
 	}
 
@@ -6836,6 +8837,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 1
+			modifier = {
+				factor = 0
+				command_power < @tier1
+			}
 		}
 	}
 
@@ -6849,6 +8854,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 2
+			modifier = {
+				factor = 0
+				command_power < @tier2
+			}
 		}
 	}
 
@@ -6862,6 +8871,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 3
+			modifier = {
+				factor = 0
+				command_power < @tier3
+			}
 		}
 	}
 
@@ -6873,6 +8886,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 1
+			modifier = {
+				factor = 0
+				command_power < @tier1
+			}
 		}
 	}
 	air_pilot_training_2 = {
@@ -6883,6 +8900,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 2
+			modifier = {
+				factor = 0
+				command_power < @tier2
+			}
 		}
 	}
 	air_pilot_training_3 = {
@@ -6893,6 +8914,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 3
+			modifier = {
+				factor = 0
+				command_power < @tier3
+			}
 		}
 	}
 
@@ -6901,13 +8926,16 @@ leader_traits = {
 		navy_carrier_air_attack_factor = 0.03
 		navy_carrier_air_targetting_factor = 0.03
 		navy_carrier_air_agility_factor = 0.04
-		ai_focus_naval_air_factor = 0.15
 		experience_gain_navy = @chief_experience_gain_low
 
 		command_cap = @tier1
 
 		ai_will_do = {
 			factor = 1
+			modifier = {
+				factor = 0
+				command_power < @tier1
+			}
 		}
 	}
 
@@ -6915,13 +8943,16 @@ leader_traits = {
 		navy_carrier_air_attack_factor = 0.06
 		navy_carrier_air_targetting_factor = 0.07
 		navy_carrier_air_agility_factor = 0.08
-		ai_focus_naval_air_factor = 0.15
 		experience_gain_navy = @chief_experience_gain_medium
 
 		command_cap = @tier2
 
 		ai_will_do = {
 			factor = 2
+			modifier = {
+				factor = 0
+				command_power < @tier2
+			}
 		}
 	}
 
@@ -6929,13 +8960,16 @@ leader_traits = {
 		navy_carrier_air_attack_factor = 0.1
 		navy_carrier_air_targetting_factor = 0.12
 		navy_carrier_air_agility_factor = 0.15
-		ai_focus_naval_air_factor = 0.15
 		experience_gain_navy = @chief_experience_gain_high
 
 		command_cap = @tier3
 
 		ai_will_do = {
 			factor = 3
+			modifier = {
+				factor = 0
+				command_power < @tier3
+			}
 		}
 	}
 
@@ -6951,6 +8985,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 1
+			modifier = {
+				factor = 0
+				command_power < @tier1
+			}
 		}
 	}
 
@@ -6965,6 +9003,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 2
+			modifier = {
+				factor = 0
+				command_power < @tier2
+			}
 		}
 	}
 
@@ -6979,6 +9021,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 3
+			modifier = {
+				factor = 0
+				command_power < @tier3
+			}
 		}
 	}
 
@@ -6991,6 +9037,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 1
+			modifier = {
+				factor = 0
+				command_power < @tier1
+			}
 		}
 	}
 
@@ -7002,6 +9052,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 2
+			modifier = {
+				factor = 0
+				command_power < @tier2
+			}
 		}
 	}
 
@@ -7013,6 +9067,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 3
+			modifier = {
+				factor = 0
+				command_power < @tier3
+			}
 		}
 	}
 
@@ -7022,7 +9080,11 @@ leader_traits = {
 		max_command_power = 10
 
 		ai_will_do = {
-			factor = 1
+			factor = 0.25
+			modifier = {
+				factor = 0
+				command_power < @tier3
+			}
 		}
 	}
 
@@ -7034,11 +9096,14 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 1
+			modifier = {
+				factor = 0
+				command_power < @tier1
+			}
 		}
 	}
 
 	navy_chief_reform_2 = {
-		ai_focus_naval_factor = 0.05
 		experience_gain_navy = @chief_experience_gain_medium
 		experience_gain_navy_factor = 0.1
 
@@ -7046,17 +9111,25 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 2
+			modifier = {
+				factor = 0
+				command_power < @tier2
+			}
 		}
 	}
 
 	navy_chief_reform_3 = {
-		ai_focus_naval_factor = 0.05
 		experience_gain_navy = @chief_experience_gain_high
 		experience_gain_navy_factor = 0.15
+
 		command_cap = @tier3
 
 		ai_will_do = {
 			factor = 3
+			modifier = {
+				factor = 0
+				command_power < @tier3
+			}
 		}
 	}
 
@@ -7068,6 +9141,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 1
+			modifier = {
+				factor = 0
+				command_power < @tier1
+			}
 		}
 	}
 
@@ -7079,6 +9156,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 2
+			modifier = {
+				factor = 0
+				command_power < @tier2
+			}
 		}
 	}
 
@@ -7090,6 +9171,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 3
+			modifier = {
+				factor = 0
+				command_power < @tier3
+			}
 		}
 	}
 
@@ -7102,6 +9187,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 1
+			modifier = {
+				factor = 0
+				command_power < @tier1
+			}
 		}
 	}
 
@@ -7113,6 +9202,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 2
+			modifier = {
+				factor = 0
+				command_power < @tier2
+			}
 		}
 	}
 
@@ -7124,6 +9217,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 3
+			modifier = {
+				factor = 0
+				command_power < @tier3
+			}
 		}
 	}
 
@@ -7136,6 +9233,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 1
+			modifier = {
+				factor = 0
+				command_power < @tier1
+			}
 		}
 	}
 
@@ -7147,6 +9248,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 2
+			modifier = {
+				factor = 0
+				command_power < @tier2
+			}
 		}
 	}
 
@@ -7158,6 +9263,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 3
+			modifier = {
+				factor = 0
+				command_power < @tier3
+			}
 		}
 	}
 
@@ -7170,6 +9279,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 1
+			modifier = {
+				factor = 0
+				command_power < @tier1
+			}
 		}
 	}
 
@@ -7181,6 +9294,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 2
+			modifier = {
+				factor = 0
+				command_power < @tier2
+			}
 		}
 	}
 
@@ -7192,6 +9309,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 3
+			modifier = {
+				factor = 0
+				command_power < @tier3
+			}
 		}
 	}
 
@@ -7204,6 +9325,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 1
+			modifier = {
+				factor = 0
+				command_power < @tier1
+			}
 		}
 	}
 
@@ -7215,6 +9340,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 2
+			modifier = {
+				factor = 0
+				command_power < @tier2
+			}
 		}
 	}
 
@@ -7226,6 +9355,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 3
+			modifier = {
+				factor = 0
+				command_power < @tier3
+			}
 		}
 	}
 
@@ -7239,6 +9372,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 1
+			modifier = {
+				factor = 0
+				command_power < @tier1
+			}
 		}
 	}
 
@@ -7251,6 +9388,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 2
+			modifier = {
+				factor = 0
+				command_power < @tier2
+			}
 		}
 	}
 
@@ -7263,6 +9404,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 3
+			modifier = {
+				factor = 0
+				command_power < @tier3
+			}
 		}
 	}
 
@@ -7276,6 +9421,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 1
+			modifier = {
+				factor = 0
+				command_power < @tier1
+			}
 		}
 	}
 
@@ -7288,6 +9437,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 2
+			modifier = {
+				factor = 0
+				command_power < @tier2
+			}
 		}
 	}
 
@@ -7300,6 +9453,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 3
+			modifier = {
+				factor = 0
+				command_power < @tier3
+			}
 		}
 	}
 
@@ -7313,6 +9470,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 1
+			modifier = {
+				factor = 0
+				command_power < @tier1
+			}
 		}
 	}
 
@@ -7325,6 +9486,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 2
+			modifier = {
+				factor = 0
+				command_power < @tier2
+			}
 		}
 	}
 
@@ -7337,6 +9502,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 3
+			modifier = {
+				factor = 0
+				command_power < @tier3
+			}
 		}
 	}
 
@@ -7348,6 +9517,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 1
+			modifier = {
+				factor = 0
+				command_power < @tier1
+			}
 		}
 	}
 
@@ -7359,6 +9532,10 @@ leader_traits = {
 
 		ai_will_do = {
 			factor = 2
+			modifier = {
+				factor = 0
+				command_power < @tier2
+			}
 		}
 	}
 
@@ -7374,8 +9551,13 @@ leader_traits = {
 				factor = 0
 				has_navy_size = { unit = carrier size < 1 }
 			}
+			modifier = {
+				factor = 0
+				command_power < @tier3
+			}
 		}
 	}
+
 	evans_deakin_trait = { #at end for save compat
 		random = no
 		equipment_bonus = {
@@ -7410,7 +9592,7 @@ leader_traits = {
 				sub_detection = 0.1 
 				naval_speed = 0.1
 			}
-			ship_hull_light = {
+			ship_hull_light = { #DDs
 				naval_range = 0.3 
 				sub_detection = 0.1 
 				naval_speed = 0.1
@@ -7421,6 +9603,7 @@ leader_traits = {
 			factor = 1
 		}
 	}
+	
 	cautious_arbiter = {
 		random = no
 		political_power_factor = 0.10
@@ -7440,4 +9623,5 @@ leader_traits = {
 			factor = 1
 		}
 	}
+
 }
diff --git a/common/country_leader/BAT_traits.txt b/common/country_leader/BAT_traits.txt
index f35abc2b78b..a49ac504d3e 100644
--- a/common/country_leader/BAT_traits.txt
+++ b/common/country_leader/BAT_traits.txt
@@ -137,7 +137,7 @@ leader_traits = {
 		industrial_capacity_factory = 0.05
 		production_factory_efficiency_gain_factor = 0.05
 		production_speed_buildings_factor = 0.05
-		consumer_goods_factor = -0.02
+		consumer_goods_factor = -0.04
 		ai_will_do = {
 			factor = 1.5
 		}
diff --git a/common/country_leader/CTH_traits.txt b/common/country_leader/CTH_traits.txt
index e8d1c96f123..bbd48421dee 100644
--- a/common/country_leader/CTH_traits.txt
+++ b/common/country_leader/CTH_traits.txt
@@ -19,7 +19,7 @@ leader_traits = {
 	}
 	CTH_baltazar_zakbar_trait = {
 		random = no
-		consumer_goods_factor = -0.025
+		consumer_goods_factor = -0.05
 		research_speed_factor = 0.05
 		trade_opinion_factor = 0.25
 
diff --git a/common/country_leader/HIE_traits.txt b/common/country_leader/HIE_traits.txt
index fa64cd26394..89e492d15a1 100644
--- a/common/country_leader/HIE_traits.txt
+++ b/common/country_leader/HIE_traits.txt
@@ -37,7 +37,7 @@ leader_traits = {
 		conscription_factor = 0.05
 		local_resources_factor = 0.05
 		MONTHLY_POPULATION = 0.10
-		consumer_goods_factor = -0.025
+		consumer_goods_factor = -0.05
 	}
 	
 	HIE_CTH_economic_centraliser = {
@@ -61,7 +61,7 @@ leader_traits = {
 		random = no
 		political_power_cost = 0.1
 		drift_defence_factor = 0.15
-		consumer_goods_factor = -0.03
+		consumer_goods_factor = -0.06
 		custom_modifier_tooltip = HIE_shine_funnitp
 		research_speed_factor = 0.01
 	}
diff --git a/common/country_leader/TRO_traits.txt b/common/country_leader/TRO_traits.txt
index a8f2c1e2b81..171005027c2 100644
--- a/common/country_leader/TRO_traits.txt
+++ b/common/country_leader/TRO_traits.txt
@@ -13,7 +13,7 @@ leader_traits = {
 		random = no
 		political_power_gain = -0.1
 		industrial_capacity_dockyard = 0.05
-		consumer_goods_factor = -0.075
+		consumer_goods_factor = -0.15
 	}
 	TRO_CTH_shama_zurumilki_trait = {
 		random = no
diff --git a/common/country_leader/eaw_traits.txt b/common/country_leader/eaw_traits.txt
index ae7813613ab..7df77358e3c 100644
--- a/common/country_leader/eaw_traits.txt
+++ b/common/country_leader/eaw_traits.txt
@@ -200,7 +200,7 @@ leader_traits = {
 	unstable_coalition = {
 		random = no
 		political_power_factor = -0.10
-		consumer_goods_factor = 0.05
+		consumer_goods_factor = 0.1
 	}
 
 	arkhigos = {
@@ -898,7 +898,7 @@ leader_traits = {
 	corporatist_industrialist = {
 		random = no
 		
-		consumer_goods_factor = -0.03
+		consumer_goods_factor = -0.06
 		fascism_drift = 0.1
 		
 		ai_will_do = {
@@ -1026,7 +1026,7 @@ leader_traits = {
 		}
 	}
 	FAT_depressive_businessman = {
-		consumer_goods_factor = -0.05
+		consumer_goods_factor = -0.1
 		stability_factor = -0.05
 		
 		ai_will_do = {
@@ -1085,7 +1085,7 @@ leader_traits = {
 
 	pumpkin_swirl_trait = {
 		random = no
-		consumer_goods_factor = -0.01
+		consumer_goods_factor = -0.02
 		political_power_factor = -0.05
 
 		ai_will_do = {
@@ -1333,7 +1333,7 @@ leader_traits = {
 		random = no
 		army_artillery_attack_factor = 0.03
 		equipment_bonus = {
-			artillery = {
+			artillery_equipment = {
 				build_cost_ic = -0.1 instant = yes
 				reliability = 0.05
 			}
@@ -1412,7 +1412,7 @@ leader_traits = {
 	corn_lord = {
 		random = no
 		production_factory_max_efficiency_factor = 0.05
-		consumer_goods_factor = -0.02
+		consumer_goods_factor = -0.04
 
 		ai_will_do = {
 			factor = 1
@@ -1780,7 +1780,7 @@ leader_traits = {
 		random = no
 		stability_factor = -0.1
 		political_power_gain = -0.15
-		consumer_goods_factor = 0.05
+		consumer_goods_factor = 0.1
 		
 		ai_will_do = {
 			factor = 0
@@ -1922,7 +1922,7 @@ leader_traits = {
 		random = no
 		political_power_factor = -0.1
 		stability_weekly = -0.001
-		consumer_goods_factor = 0.05
+		consumer_goods_factor = 0.1
 		research_speed_factor = 0.05
 		max_planning = 0.1
 		supply_consumption_factor = -0.05
@@ -2068,7 +2068,7 @@ leader_traits = {
 	bureaucrat = {
 		random = no
 		political_power_factor = -0.10
-		consumer_goods_factor = -0.05
+		consumer_goods_factor = -0.1
 
 		ai_will_do = {
 			factor = 1
@@ -2117,7 +2117,7 @@ leader_traits = {
 
 	MAN_state_investor_1 = {
 		research_speed_factor = 0.025
-		consumer_goods_factor = -0.025
+		consumer_goods_factor = -0.05
 		license_purchase_cost = -0.05
 		trade_opinion_factor = 0.05
 
@@ -2128,7 +2128,7 @@ leader_traits = {
 
 	MAN_state_investor_2 = {
 		research_speed_factor = 0.025
-		consumer_goods_factor = -0.05
+		consumer_goods_factor = -0.1
 		license_purchase_cost = -0.1
 		trade_opinion_factor = 0.1
 
@@ -2405,7 +2405,7 @@ apn_time_queen= {
 		local_resources_factor = 0.1
 		industrial_capacity_factory = 0.05
 		industrial_capacity_dockyard = 0.05
-		consumer_goods_factor = -0.025
+		consumer_goods_factor = -0.05
 
 		ai_will_do = {
 			factor = 1
@@ -2458,7 +2458,7 @@ apn_time_queen= {
 
 	ruthless_capitalist = {
 		random = no
-		consumer_goods_factor = -0.05
+		consumer_goods_factor = -0.1
 		political_power_gain = -0.20
 
 		ai_will_do = {
@@ -2572,7 +2572,7 @@ apn_time_queen= {
 	}
 	OLV_criminal_trait = {
 		random = no
-		consumer_goods_factor = -0.02
+		consumer_goods_factor = -0.04
 		opinion_gain_monthly_factor = -0.15
 		justify_war_goal_time = -0.05
 	}
@@ -2626,7 +2626,7 @@ apn_time_queen= {
 		random = no
 		stability_factor = 0.05
 		war_support_factor = 0.05
-		consumer_goods_factor = -0.03
+		consumer_goods_factor = -0.06
 	}
 	OLV_viking_trait = {
 		random = no
@@ -2754,25 +2754,25 @@ apn_time_queen= {
 	
 	VED_No_Charity_Teaching_Trait = {
 		random = no
-		consumer_goods_factor = -0.02
+		consumer_goods_factor = -0.04
 	}
 	
 	VED_StateCraft_Level_1 = {
 		random = no
-		consumer_goods_factor = -0.03
+		consumer_goods_factor = -0.06
 		surrender_limit = 0.1
 	}
 	
 	VED_StateCraft_Level_2 = {
 		random = no
-		consumer_goods_factor = -0.03
+		consumer_goods_factor = -0.06
 		stability_factor = 0.05
 		surrender_limit = 0.1
 	}
 	
 	VED_StateCraft_Level_3 = {
 		random = no
-		consumer_goods_factor = -0.03
+		consumer_goods_factor = -0.06
 		stability_factor = 0.05
 		local_resources_factor = 0.05
 		surrender_limit = 0.1
@@ -2780,7 +2780,7 @@ apn_time_queen= {
 	
 	VED_StateCraft_Level_4 = {
 		random = no
-		consumer_goods_factor = -0.03
+		consumer_goods_factor = -0.06
 		stability_factor = 0.05
 		production_speed_buildings_factor = 0.05
 		local_resources_factor = 0.05
@@ -2790,7 +2790,7 @@ apn_time_queen= {
 	
 	VED_StateCraft_Level_5 = {
 		random = no
-		consumer_goods_factor = -0.03
+		consumer_goods_factor = -0.06
 		stability_factor = 0.05
 		production_speed_buildings_factor = 0.05
 		command_power_gain = 0.2
@@ -2801,7 +2801,7 @@ apn_time_queen= {
 	
 	VED_StateCraft_Level_6 = {
 		random = no
-		consumer_goods_factor = -0.03
+		consumer_goods_factor = -0.06
 		stability_factor = 0.10
 		production_speed_buildings_factor = 0.05
 		command_power_gain = 0.2
@@ -2813,7 +2813,7 @@ apn_time_queen= {
 	
 	VED_StateCraft_Level_7 = {
 		random = no
-		consumer_goods_factor = -0.03
+		consumer_goods_factor = -0.06
 		stability_factor = 0.10
 		production_speed_buildings_factor = 0.05
 		command_power_gain = 0.2
@@ -2826,7 +2826,7 @@ apn_time_queen= {
 	
 	VED_StateCraft_Level_8 = {
 		random = no
-		consumer_goods_factor = -0.04
+		consumer_goods_factor = -0.08
 		stability_factor = 0.10
 		production_speed_buildings_factor = 0.05
 		command_power_gain = 0.2
@@ -2860,7 +2860,7 @@ apn_time_queen= {
 	rural_magnate = {
 		random = no
 		MONTHLY_POPULATION = 0.15
-		consumer_goods_factor = -0.03
+		consumer_goods_factor = -0.06
 		ai_will_do = {
 			factor = 1
 		}
@@ -3063,7 +3063,7 @@ apn_time_queen= {
 	}
 	YAL_production_trait = {
 		random = no
-		consumer_goods_factor = -0.02
+		consumer_goods_factor = -0.04
 		industrial_capacity_factory = 0.03
 		ai_will_do = {
 			factor = 1
@@ -3158,7 +3158,7 @@ apn_time_queen= {
 		random = no
 		stability_factor = 0.05
 		political_power_gain = 0.05
-		consumer_goods_factor = 0.03
+		consumer_goods_factor = 0.06
 		ai_will_do = {
 			factor = 1
 		}
@@ -3168,7 +3168,7 @@ apn_time_queen= {
 		random = no
 		stability_factor = 0.08
 		industrial_capacity_factory = 0.05
-		consumer_goods_factor = 0.05
+		consumer_goods_factor = 0.1
 		ai_will_do = {
 			factor = 1
 		}
@@ -3206,7 +3206,7 @@ apn_time_queen= {
 	}
 	BAR_silver_star_archlich = {
 		random = no
-		consumer_goods_factor = -0.05
+		consumer_goods_factor = -0.1
 		surrender_limit = 0.2
 		war_support_factor = 0.2
 		army_morale_factor = 0.1
@@ -5031,7 +5031,7 @@ apn_time_queen= {
 		random = no
 
 		equipment_bonus = {
-			tac_bomber_equipment = {
+			medium_plane_airframe = {
 				air_ground_attack = 0.1
 				air_range = 0.1
 				reliability = 0.2
@@ -5062,7 +5062,7 @@ apn_time_queen= {
 		guarantee_cost = -0.25
 		send_volunteer_factor = 0.5
 		send_volunteer_size = 5
-		air_volunteer_cap = 100
+		air_volunteer_cap = 5
 		experience_gain_army_factor = 0.1
 		special_forces_training_time_factor = -0.25
 		amphibious_invasion = 0.1
@@ -5415,7 +5415,7 @@ apn_time_queen= {
 	WIN_made_mare = {
 		random = no
 		political_power_factor = 0.10
-		consumer_goods_factor = -0.025
+		consumer_goods_factor = -0.05
 
 		ai_will_do = {
 			factor = 1
@@ -5584,7 +5584,7 @@ apn_time_queen= {
 	
 	FST_anti_clerical_crusader = {
 		random = no
-		consumer_goods_factor = -0.03
+		consumer_goods_factor = -0.06
 		political_power_factor = 0.075
 		ai_will_do = {
 			factor = 1
@@ -5592,7 +5592,7 @@ apn_time_queen= {
 	}
 	trading_consortium = {
 		random = no
-		consumer_goods_factor = -0.03
+		consumer_goods_factor = -0.06
 		political_power_factor = 0.075
 		ai_will_do = {
 			factor = 1
@@ -5602,7 +5602,7 @@ apn_time_queen= {
 	TBK_smuggler = {
 		random = no
 		stability_factor = -0.05
-		consumer_goods_factor = -0.03
+		consumer_goods_factor = -0.06
 		political_power_gain = 0.1
 		ai_will_do = {
 			factor = 1
@@ -5687,6 +5687,14 @@ apn_time_queen= {
 		naval_coordination = 0.1
 		naval_morale_factor = 0.1
 	}
+	UESR_lavender_trait = {
+		resistance_damage_to_garrison = -0.25
+		foreign_subversive_activites = -0.3
+		non_core_manpower = 0.02
+		ai_will_do = {
+			factor = 1
+		}
+	}
 	STM_rightful_heir = {
 		random = no
 		army_attack_factor = 0.15
@@ -5826,7 +5834,7 @@ apn_time_queen= {
 	
 	CVA_financial_mastermind = {
 		random = yes
-		consumer_goods_factor = -0.03
+		consumer_goods_factor = -0.06
         trade_laws_cost_factor = -0.10
 		trade_opinion_factor = 0.15
 		ai_will_do = {
@@ -5990,7 +5998,7 @@ apn_time_queen= {
 		war_support_factor = 0.05
 		drift_defence_factor = 0.1
 		resistance_damage_to_garrison = -0.20
-		consumer_goods_factor = -0.05
+		consumer_goods_factor = -0.1
 		political_power_factor = 0.10
 		ai_will_do = {
 			factor = 5
@@ -6394,7 +6402,7 @@ apn_time_queen= {
 
 	comically_corrupt_kleptocrat = {
 		random = no
-		consumer_goods_factor = 0.05
+		consumer_goods_factor = 0.1
 		stability_factor = -0.1
 		industrial_capacity_factory = 0.05
 		industrial_capacity_dockyard = 0.05
@@ -6405,7 +6413,7 @@ apn_time_queen= {
 		political_power_gain = 0.10
 		conversion_cost_civ_to_mil_factor  = -0.10
 		war_support_factor = 0.15
-		consumer_goods_factor = 0.03
+		consumer_goods_factor = 0.06
 
 
 		ai_will_do = {
diff --git a/common/decisions/ANG_decisions.txt b/common/decisions/ANG_decisions.txt
index 124ffbfbfad..58c69e830b8 100644
--- a/common/decisions/ANG_decisions.txt
+++ b/common/decisions/ANG_decisions.txt
@@ -261,12 +261,12 @@ ANG_new_knightly_orders_cat = {
 							knights = { x = 0 y = 1 }
 							knights = { x = 0 y = 2 }
 							knights = { x = 0 y = 3 }
-							knights = { x = 0 y = 4 }
 							knights = { x = 1 y = 0 }
 							knights = { x = 1 y = 1 }
 							knights = { x = 1 y = 2 }
 							knights = { x = 1 y = 3 }
-							knights = { x = 1 y = 4 }
+							knights = { x = 2 y = 0 }
+							knights = { x = 2 y = 1 }					
 						}
 						support = {
 							recon = { x = 0 y = 0 }
@@ -331,12 +331,12 @@ ANG_new_knightly_orders_cat = {
 							knights = { x = 0 y = 1 }
 							knights = { x = 0 y = 2 }
 							knights = { x = 0 y = 3 }
-							knights = { x = 0 y = 4 }
 							knights = { x = 1 y = 0 }
 							knights = { x = 1 y = 1 }
 							knights = { x = 1 y = 2 }
 							knights = { x = 1 y = 3 }
-							knights = { x = 1 y = 4 }
+							knights = { x = 2 y = 0 }
+							knights = { x = 2 y = 1 }					
 						}
 						support = {
 							recon = { x = 0 y = 0 }
@@ -401,12 +401,12 @@ ANG_new_knightly_orders_cat = {
 							knights = { x = 0 y = 1 }
 							knights = { x = 0 y = 2 }
 							knights = { x = 0 y = 3 }
-							knights = { x = 0 y = 4 }
 							knights = { x = 1 y = 0 }
 							knights = { x = 1 y = 1 }
 							knights = { x = 1 y = 2 }
 							knights = { x = 1 y = 3 }
-							knights = { x = 1 y = 4 }
+							knights = { x = 2 y = 0 }
+							knights = { x = 2 y = 1 }					
 						}
 						support = {
 							recon = { x = 0 y = 0 }
@@ -471,12 +471,12 @@ ANG_new_knightly_orders_cat = {
 							knights = { x = 0 y = 1 }
 							knights = { x = 0 y = 2 }
 							knights = { x = 0 y = 3 }
-							knights = { x = 0 y = 4 }
 							knights = { x = 1 y = 0 }
 							knights = { x = 1 y = 1 }
 							knights = { x = 1 y = 2 }
 							knights = { x = 1 y = 3 }
-							knights = { x = 1 y = 4 }
+							knights = { x = 2 y = 0 }
+							knights = { x = 2 y = 1 }					
 						}
 						support = {
 							recon = { x = 0 y = 0 }
@@ -541,12 +541,12 @@ ANG_new_knightly_orders_cat = {
 							knights = { x = 0 y = 1 }
 							knights = { x = 0 y = 2 }
 							knights = { x = 0 y = 3 }
-							knights = { x = 0 y = 4 }
 							knights = { x = 1 y = 0 }
 							knights = { x = 1 y = 1 }
 							knights = { x = 1 y = 2 }
 							knights = { x = 1 y = 3 }
-							knights = { x = 1 y = 4 }
+							knights = { x = 2 y = 0 }
+							knights = { x = 2 y = 1 }					
 						}
 						support = {
 							recon = { x = 0 y = 0 }
@@ -611,12 +611,12 @@ ANG_new_knightly_orders_cat = {
 							knights = { x = 0 y = 1 }
 							knights = { x = 0 y = 2 }
 							knights = { x = 0 y = 3 }
-							knights = { x = 0 y = 4 }
 							knights = { x = 1 y = 0 }
 							knights = { x = 1 y = 1 }
 							knights = { x = 1 y = 2 }
 							knights = { x = 1 y = 3 }
-							knights = { x = 1 y = 4 }
+							knights = { x = 2 y = 0 }
+							knights = { x = 2 y = 1 }					
 						}
 						support = {
 							recon = { x = 0 y = 0 }
@@ -681,12 +681,12 @@ ANG_new_knightly_orders_cat = {
 							knights = { x = 0 y = 1 }
 							knights = { x = 0 y = 2 }
 							knights = { x = 0 y = 3 }
-							knights = { x = 0 y = 4 }
 							knights = { x = 1 y = 0 }
 							knights = { x = 1 y = 1 }
 							knights = { x = 1 y = 2 }
 							knights = { x = 1 y = 3 }
-							knights = { x = 1 y = 4 }
+							knights = { x = 2 y = 0 }
+							knights = { x = 2 y = 1 }
 						}
 						support = {
 							recon = { x = 0 y = 0 }
@@ -751,12 +751,12 @@ ANG_new_knightly_orders_cat = {
 							knights = { x = 0 y = 1 }
 							knights = { x = 0 y = 2 }
 							knights = { x = 0 y = 3 }
-							knights = { x = 0 y = 4 }
 							knights = { x = 1 y = 0 }
 							knights = { x = 1 y = 1 }
 							knights = { x = 1 y = 2 }
 							knights = { x = 1 y = 3 }
-							knights = { x = 1 y = 4 }
+							knights = { x = 2 y = 0 }
+							knights = { x = 2 y = 1 }
 						}
 						support = {
 							recon = { x = 0 y = 0 }
@@ -821,12 +821,12 @@ ANG_new_knightly_orders_cat = {
 							knights = { x = 0 y = 1 }
 							knights = { x = 0 y = 2 }
 							knights = { x = 0 y = 3 }
-							knights = { x = 0 y = 4 }
 							knights = { x = 1 y = 0 }
 							knights = { x = 1 y = 1 }
 							knights = { x = 1 y = 2 }
 							knights = { x = 1 y = 3 }
-							knights = { x = 1 y = 4 }
+							knights = { x = 2 y = 0 }
+							knights = { x = 2 y = 1 }
 						}
 						support = {
 							recon = { x = 0 y = 0 }
diff --git a/common/decisions/BAR_decisions.txt b/common/decisions/BAR_decisions.txt
index e0cf19d4465..f408548bb74 100644
--- a/common/decisions/BAR_decisions.txt
+++ b/common/decisions/BAR_decisions.txt
@@ -6864,7 +6864,7 @@ BAR_unicorn_improvement = {
 		days_remove = 60
 		cost = 50
 		modifier = {
-			consumer_goods_factor = 0.05
+			consumer_goods_factor = 0.1
 			research_speed_factor = -0.1
 		}
 		remove_effect = {
@@ -6891,7 +6891,7 @@ BAR_unicorn_improvement = {
 		days_remove = 60
 		cost = 50
 		modifier = {
-			consumer_goods_factor = 0.05
+			consumer_goods_factor = 0.1
 			research_speed_factor = -0.1
 		}
 		remove_effect = {
@@ -6918,7 +6918,7 @@ BAR_unicorn_improvement = {
 		days_remove = 60
 		cost = 50
 		modifier = {
-			consumer_goods_factor = 0.05
+			consumer_goods_factor = 0.1
 			research_speed_factor = -0.1
 		}
 		remove_effect = {
@@ -6945,7 +6945,7 @@ BAR_unicorn_improvement = {
 		days_remove = 60
 		cost = 50
 		modifier = {
-			consumer_goods_factor = 0.05
+			consumer_goods_factor = 0.1
 			research_speed_factor = -0.1
 		}
 		remove_effect = {
@@ -6972,7 +6972,7 @@ BAR_unicorn_improvement = {
 		days_remove = 60
 		cost = 50
 		modifier = {
-			consumer_goods_factor = 0.05
+			consumer_goods_factor = 0.1
 			research_speed_factor = -0.1
 		}
 		remove_effect = {
@@ -10944,10 +10944,10 @@ BAR_viira_puppets = {
 					remove_ideas = DED_Special_Game_Rule_Buff
 					remove_ideas = DED_AP_magehold
 					remove_ideas = DED_APN_no_conscription
-					remove_ideas = DED_APN_fight
+					remove_ideas = DED_APN_fight_idea
 					remove_ideas = DED_APN_no_fatigue
 					remove_ideas = DED_APN_no_fear_hunger
-					remove_ideas = DED_APN_never_fall
+					remove_ideas = DED_APN_never_fall_idea
 					remove_ideas = DED_APN_death_no_meaning
 					remove_ideas = DED_APN_annihilation_of_individuality_idea
 					remove_ideas = DED_APN_muscles_above_cogs_and_gears_idea
diff --git a/common/decisions/BRZ_decisions.txt b/common/decisions/BRZ_decisions.txt
index d396b3d22c3..02fc0555e06 100644
--- a/common/decisions/BRZ_decisions.txt
+++ b/common/decisions/BRZ_decisions.txt
@@ -3179,7 +3179,7 @@ BRZ_army_pensions_cat = {
 		}
 
 		modifier = {
-			consumer_goods_factor = 0.05
+			consumer_goods_factor = 0.1
 			weekly_manpower = 500
 		}
 
@@ -3222,7 +3222,7 @@ BRZ_army_pensions_cat = {
 		}
 
 		modifier = {
-			consumer_goods_factor = 0.1
+			consumer_goods_factor = 0.2
 			weekly_manpower = 1000
 		}
 
@@ -3265,7 +3265,7 @@ BRZ_army_pensions_cat = {
 		}
 
 		modifier = {
-			consumer_goods_factor = 0.15
+			consumer_goods_factor = 0.3
 			weekly_manpower = 1500
 		}
 
diff --git a/common/decisions/BUF_decisions.txt b/common/decisions/BUF_decisions.txt
index 9a41aa074a6..6f2f310d635 100644
--- a/common/decisions/BUF_decisions.txt
+++ b/common/decisions/BUF_decisions.txt
@@ -595,14 +595,14 @@ political_actions = {
 			}
 			SCS = {
 				exists = yes
-				has_country_leader = { ruling_only = yes character = SCS_braeburn }
+				has_country_leader = { ruling_only = yes character = EQS_braeburn }
 			}
 		}
 		visible = {
 			has_country_leader = { ruling_only = yes character = BUF_chieftess_strongheart }
 				SCS = {
 					exists = yes
-					has_country_leader = { ruling_only = yes character = SCS_braeburn }
+					has_country_leader = { ruling_only = yes character = EQS_braeburn }
 				}
 			}
 		fire_only_once = yes
diff --git a/common/decisions/CHN_decisions.txt b/common/decisions/CHN_decisions.txt
index f3185bf1ec3..22e8009f83f 100644
--- a/common/decisions/CHN_decisions.txt
+++ b/common/decisions/CHN_decisions.txt
@@ -4108,7 +4108,7 @@ CHN_superweapon = {
 		fire_only_once = yes
 		days_remove = 30
 		modifier = {
-			consumer_goods_factor = 0.05
+			consumer_goods_factor = 0.1
 		}
 		remove_effect = {
 			log = "[GetDateText]: [Root.GetName]: Decision remove CHN_railway_gun_plans"
@@ -4134,7 +4134,7 @@ CHN_superweapon = {
 		fire_only_once = yes
 		days_remove = 60 
 		modifier = {
-			consumer_goods_factor = 0.15
+			consumer_goods_factor = 0.3
 		}
 		remove_effect = {
 			log = "[GetDateText]: [Root.GetName]: Decision remove CHN_railway_gun_build"
diff --git a/common/decisions/CRY_decisions.txt b/common/decisions/CRY_decisions.txt
index 58883d7917f..cd4cd45231c 100644
--- a/common/decisions/CRY_decisions.txt
+++ b/common/decisions/CRY_decisions.txt
@@ -70,8 +70,21 @@ economy_decisions = {
 		}
 		complete_effect = {
 			log = "[GetDateText]: [Root.GetName]: Decision CRY_naval_concern_decision"
-			custom_effect_tooltip = available_designer
-			show_ideas_tooltip = manehattan_concern_navy
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}    
+				custom_effect_tooltip = available_mio_tt
+				show_mio_tooltip = CRY_manehattan_concern_navy_organization
+				mio:CRY_manehattan_concern_navy_organization = {
+					add_mio_size = 1
+					add_mio_funds = 500
+				}
+			}
+			else = {
+				custom_effect_tooltip = available_designer
+				show_ideas_tooltip = manehattan_concern_navy
+			}
 			hidden_effect = { set_country_flag = CRY_naval_concern }
 		}
 	}
diff --git a/common/decisions/CTH_decisions.txt b/common/decisions/CTH_decisions.txt
index d09fb27aa01..e31ff829498 100644
--- a/common/decisions/CTH_decisions.txt
+++ b/common/decisions/CTH_decisions.txt
@@ -1213,7 +1213,7 @@ CTH_internal_factions = {
 			}
 		}
 		modifier = {
-			consumer_goods_factor = 0.1
+			consumer_goods_factor = 0.2
 			research_speed_factor = -0.2
 		}
 
@@ -1576,7 +1576,7 @@ CTH_internal_factions = {
 			}
 		}
 		modifier = {
-			consumer_goods_factor = 0.05
+			consumer_goods_factor = 0.1
 			political_power_gain = -0.25
 		}
 
@@ -7690,7 +7690,7 @@ CTH_federal_states_cat = {
 		days_remove = 30
 		
 		modifier = { 
-			consumer_goods_factor = 0.05
+			consumer_goods_factor = 0.1
 		}
 		
 		remove_effect = {
diff --git a/common/decisions/CTL_decisions.txt b/common/decisions/CTL_decisions.txt
index 8767fa59b2c..7903b1b97f3 100644
--- a/common/decisions/CTL_decisions.txt
+++ b/common/decisions/CTL_decisions.txt
@@ -228,7 +228,7 @@ CTL_wild_world_of_politics = {
 		set_country_flag = CRA_decision_block
 		}
 		modifier = {
-			consumer_goods_factor = 0.05
+			consumer_goods_factor = 0.1
 			communism_drift = -0.02
 		}
 
@@ -372,7 +372,7 @@ CTL_wild_world_of_politics = {
 		}
 		modifier = {
 			political_power_factor = -0.10
-			consumer_goods_factor = -0.05
+			consumer_goods_factor = -0.1
 			war_support_factor = -0.05
 		}
 
diff --git a/common/decisions/CVA_decisions.txt b/common/decisions/CVA_decisions.txt
index bfff057ac37..c750b2015f6 100644
--- a/common/decisions/CVA_decisions.txt
+++ b/common/decisions/CVA_decisions.txt
@@ -1907,7 +1907,7 @@ CVA_decentralized_economic_projects = {
         modifier = {
 			civilian_factory_use = 3
 			industrial_capacity_factory = -0.025
-			consumer_goods_factor = 0.005
+			consumer_goods_factor = 0.01
 		}
 		remove_effect = {
 			log = "[GetDateText]: [Root.GetName]: Decision remove CVA_CTH_702_project_1"
@@ -1958,7 +1958,7 @@ CVA_decentralized_economic_projects = {
         modifier = {
 			civilian_factory_use = 3
 			industrial_capacity_factory = -0.025
-			consumer_goods_factor = 0.005
+			consumer_goods_factor = 0.01
 		}
 		remove_effect = {
 			log = "[GetDateText]: [Root.GetName]: Decision remove CVA_CTH_702_project_2"
@@ -2011,7 +2011,7 @@ CVA_decentralized_economic_projects = {
         modifier = {
 			civilian_factory_use = 1
 			industrial_capacity_factory = -0.025
-			consumer_goods_factor = 0.005
+			consumer_goods_factor = 0.01
 		}
 		remove_effect = {
 			log = "[GetDateText]: [Root.GetName]: Decision remove CVA_CTH_702_project_1"
@@ -2073,7 +2073,7 @@ CVA_decentralized_economic_projects = {
         modifier = {
 			civilian_factory_use = 2
 			industrial_capacity_factory = -0.025
-			consumer_goods_factor = 0.005
+			consumer_goods_factor = 0.01
 		}
 		remove_effect = {
 			log = "[GetDateText]: [Root.GetName]: Decision remove CVA_CTH_702_project_1"
@@ -2132,7 +2132,7 @@ CVA_decentralized_economic_projects = {
         modifier = {
 			civilian_factory_use = 3
 			industrial_capacity_factory = -0.025
-			consumer_goods_factor = 0.005
+			consumer_goods_factor = 0.01
 		}
 		remove_effect = {
 			log = "[GetDateText]: [Root.GetName]: Decision remove CVA_CTH_702_project_3"
@@ -2194,7 +2194,7 @@ CVA_decentralized_economic_projects = {
         modifier = {
 			civilian_factory_use = 3
 			industrial_capacity_factory = -0.025
-			consumer_goods_factor = 0.005
+			consumer_goods_factor = 0.01
 		}
 		remove_effect = {
 			log = "[GetDateText]: [Root.GetName]: Decision remove CVA_CTH_700_project_1"
@@ -2245,7 +2245,7 @@ CVA_decentralized_economic_projects = {
         modifier = {
 			civilian_factory_use = 2
 			industrial_capacity_factory = -0.025
-			consumer_goods_factor = 0.005
+			consumer_goods_factor = 0.01
 		}
 		remove_effect = {
 			log = "[GetDateText]: [Root.GetName]: Decision remove CVA_CTH_700_project_2"
@@ -2293,7 +2293,7 @@ CVA_decentralized_economic_projects = {
         modifier = {
 			civilian_factory_use = 3
 			industrial_capacity_factory = -0.025
-			consumer_goods_factor = 0.005
+			consumer_goods_factor = 0.01
 		}
 		remove_effect = {
 			log = "[GetDateText]: [Root.GetName]: Decision remove CVA_CTH_709_project_1"
@@ -2715,7 +2715,7 @@ CVA_decentralized_economic_projects = {
         modifier = {
 			civilian_factory_use = 4
 			industrial_capacity_factory = -0.025
-			consumer_goods_factor = 0.005
+			consumer_goods_factor = 0.01
 		}
 		remove_effect = {
 			log = "[GetDateText]: [Root.GetName]: Decision remove CVA_CTH_699_project_1"
@@ -2771,7 +2771,7 @@ CVA_decentralized_economic_projects = {
         modifier = {
 			civilian_factory_use = 3
 			industrial_capacity_factory = -0.025
-			consumer_goods_factor = 0.005
+			consumer_goods_factor = 0.01
 		}
 		remove_effect = {
 			log = "[GetDateText]: [Root.GetName]: Decision remove CVA_CTH_706_project_2"
@@ -2820,7 +2820,7 @@ CVA_decentralized_economic_projects = {
         modifier = {
 			civilian_factory_use = 3
 			industrial_capacity_factory = -0.025
-			consumer_goods_factor = 0.005
+			consumer_goods_factor = 0.01
 		}
 		remove_effect = {
 			log = "[GetDateText]: [Root.GetName]: Decision remove CVA_CTH_852_project_2"
@@ -2870,7 +2870,7 @@ CVA_decentralized_economic_projects = {
         modifier = {
 			civilian_factory_use = 2
 			industrial_capacity_factory = -0.025
-			consumer_goods_factor = 0.005
+			consumer_goods_factor = 0.01
 		}
 		remove_effect = {
 			log = "[GetDateText]: [Root.GetName]: Decision remove CVA_CTH_877_project_1"
@@ -2921,7 +2921,7 @@ CVA_decentralized_economic_projects = {
         modifier = {
 			civilian_factory_use = 3
 			industrial_capacity_factory = -0.025
-			consumer_goods_factor = 0.005
+			consumer_goods_factor = 0.01
 		}
 		remove_effect = {
 			log = "[GetDateText]: [Root.GetName]: Decision remove CVA_CTH_877_project_2"
@@ -2980,7 +2980,7 @@ CVA_decentralized_economic_projects = {
         modifier = {
 			civilian_factory_use = 3
 			industrial_capacity_factory = -0.025
-			consumer_goods_factor = 0.005
+			consumer_goods_factor = 0.01
 		}
 		remove_effect = {
 			log = "[GetDateText]: [Root.GetName]: Decision remove CVA_CTH_877_project_3"
@@ -3380,7 +3380,7 @@ CVA_decentralized_economic_projects = {
         modifier = {
 			civilian_factory_use = 7
 			industrial_capacity_factory = -0.05
-			consumer_goods_factor = 0.025
+			consumer_goods_factor = 0.01
 		}
 		remove_effect = {
 			log = "[GetDateText]: [Root.GetName]: Decision remove CVA_CTH_875_project_1"
@@ -3444,7 +3444,7 @@ CVA_decentralized_economic_projects = {
         modifier = {
 			civilian_factory_use = 4
 			industrial_capacity_factory = -0.025
-			consumer_goods_factor = 0.005
+			consumer_goods_factor = 0.01
 		}
 		remove_effect = {
 			log = "[GetDateText]: [Root.GetName]: Decision remove CVA_CTH_701_project_1"
@@ -3503,7 +3503,7 @@ CVA_decentralized_economic_projects = {
         modifier = {
 			civilian_factory_use = 4
 			industrial_capacity_factory = -0.025
-			consumer_goods_factor = 0.005
+			consumer_goods_factor = 0.01
 		}
 		remove_effect = {
 			log = "[GetDateText]: [Root.GetName]: Decision remove CVA_CTH_701_project_2"
@@ -3560,7 +3560,7 @@ CVA_decentralized_economic_projects = {
         modifier = {
 			civilian_factory_use = 4
 			industrial_capacity_factory = -0.025
-			consumer_goods_factor = 0.005
+			consumer_goods_factor = 0.01
 		}
 		remove_effect = {
 			log = "[GetDateText]: [Root.GetName]: Decision remove CVA_CTH_701_project_3"
@@ -3610,7 +3610,7 @@ CVA_decentralized_economic_projects = {
         modifier = {
 			civilian_factory_use = 4
 			industrial_capacity_factory = -0.025
-			consumer_goods_factor = 0.005
+			consumer_goods_factor = 0.01
 		}
 		remove_effect = {
 			log = "[GetDateText]: [Root.GetName]: Decision remove CVA_CTH_703_project_1"
@@ -3669,7 +3669,7 @@ CVA_decentralized_economic_projects = {
         modifier = {
 			civilian_factory_use = 3
 			industrial_capacity_factory = -0.025
-			consumer_goods_factor = 0.005
+			consumer_goods_factor = 0.01
 		}
 		remove_effect = {
 			log = "[GetDateText]: [Root.GetName]: Decision remove CVA_CTH_703_project_2"
@@ -3725,7 +3725,7 @@ CVA_decentralized_economic_projects = {
         modifier = {
 			civilian_factory_use = 3
 			industrial_capacity_factory = -0.025
-			consumer_goods_factor = 0.005
+			consumer_goods_factor = 0.01
 		}
 		remove_effect = {
 			log = "[GetDateText]: [Root.GetName]: Decision remove CVA_CTH_703_project_3"
@@ -4125,7 +4125,7 @@ CVA_decentralized_economic_projects = {
 	    modifier = {
 			civilian_factory_use = 1
 			industrial_capacity_factory = -0.025
-			consumer_goods_factor = 0.005
+			consumer_goods_factor = 0.01
 		}
         remove_effect = {
             log = "[GetDateText]: [Root.GetName]: Decision remove CVA_CTH_704_705_706_project_1"
@@ -4177,7 +4177,7 @@ CVA_decentralized_economic_projects = {
         modifier = {
 			civilian_factory_use = 3
 			industrial_capacity_factory = -0.025
-			consumer_goods_factor = 0.005
+			consumer_goods_factor = 0.01
 		}
 		remove_effect = {
 			log = "[GetDateText]: [Root.GetName]: Decision remove CVA_CTH_704_project_2"
@@ -4236,7 +4236,7 @@ CVA_decentralized_economic_projects = {
         modifier = {
 			civilian_factory_use = 4
 			industrial_capacity_factory = -0.025
-			consumer_goods_factor = 0.005
+			consumer_goods_factor = 0.01
 		}
 		remove_effect = {
 			log = "[GetDateText]: [Root.GetName]: Decision remove CVA_CTH_705_project_2"
@@ -4293,7 +4293,7 @@ CVA_decentralized_economic_projects = {
         modifier = {
 			civilian_factory_use = 2
 			industrial_capacity_factory = -0.025
-			consumer_goods_factor = 0.005
+			consumer_goods_factor = 0.01
 		}
 		remove_effect = {
 			log = "[GetDateText]: [Root.GetName]: Decision remove CVA_CTH_706_project_2"
@@ -4341,7 +4341,7 @@ CVA_decentralized_economic_projects = {
         modifier = {
 			civilian_factory_use = 3
 			industrial_capacity_factory = -0.025
-			consumer_goods_factor = 0.005
+			consumer_goods_factor = 0.01
 		}
 		remove_effect = {
 			log = "[GetDateText]: [Root.GetName]: Decision remove CVA_CTH_714_project_1"
@@ -4771,7 +4771,7 @@ CVA_decentralized_economic_projects = {
 	    modifier = {
 			civilian_factory_use = 1
 			industrial_capacity_factory = -0.025
-			consumer_goods_factor = 0.005
+			consumer_goods_factor = 0.01
 		}
         remove_effect = {
             log = "[GetDateText]: [Root.GetName]: Decision remove CVA_CTH_933_1092_1093_1094_1095_project_1"
@@ -4822,7 +4822,7 @@ CVA_decentralized_economic_projects = {
         modifier = {
 			civilian_factory_use = 2
 			industrial_capacity_factory = -0.025
-			consumer_goods_factor = 0.005
+			consumer_goods_factor = 0.01
 		}
 		remove_effect = {
 			log = "[GetDateText]: [Root.GetName]: Decision remove CVA_CTH_933_project_2"
@@ -4871,7 +4871,7 @@ CVA_decentralized_economic_projects = {
         modifier = {
 			civilian_factory_use = 3
 			industrial_capacity_factory = -0.025
-			consumer_goods_factor = 0.005
+			consumer_goods_factor = 0.01
 		}
 		remove_effect = {
 			log = "[GetDateText]: [Root.GetName]: Decision remove CVA_CTH_1092_project_2"
@@ -4924,7 +4924,7 @@ CVA_decentralized_economic_projects = {
         modifier = {
 			civilian_factory_use = 4
 			industrial_capacity_factory = -0.025
-			consumer_goods_factor = 0.005
+			consumer_goods_factor = 0.01
 		}
 		remove_effect = {
 			log = "[GetDateText]: [Root.GetName]: Decision remove CVA_CTH_1093_project_2"
@@ -4977,7 +4977,7 @@ CVA_decentralized_economic_projects = {
         modifier = {
 			civilian_factory_use = 2
 			industrial_capacity_factory = -0.025
-			consumer_goods_factor = 0.005
+			consumer_goods_factor = 0.01
 		}
 		remove_effect = {
 			log = "[GetDateText]: [Root.GetName]: Decision remove CVA_CTH_1094_project_2"
@@ -5035,7 +5035,7 @@ CVA_decentralized_economic_projects = {
         modifier = {
 			civilian_factory_use = 3
 			industrial_capacity_factory = -0.025
-			consumer_goods_factor = 0.005
+			consumer_goods_factor = 0.01
 		}
 		remove_effect = {
 			log = "[GetDateText]: [Root.GetName]: Decision remove CVA_CTH_1095_project_2"
@@ -5475,7 +5475,7 @@ CVA_decentralized_economic_projects = {
 	    modifier = {
 			civilian_factory_use = 1
 			industrial_capacity_factory = -0.025
-			consumer_goods_factor = 0.005
+			consumer_goods_factor = 0.01
 		}
         remove_effect = {
             log = "[GetDateText]: [Root.GetName]: Decision remove CVA_CTH_707_708_751_1089_project_1"
@@ -5526,7 +5526,7 @@ CVA_decentralized_economic_projects = {
         modifier = {
 			civilian_factory_use = 3
 			industrial_capacity_factory = -0.025
-			consumer_goods_factor = 0.005
+			consumer_goods_factor = 0.01
 		}
 		remove_effect = {
 			log = "[GetDateText]: [Root.GetName]: Decision remove CVA_CTH_707_project_2"
@@ -5575,7 +5575,7 @@ CVA_decentralized_economic_projects = {
         modifier = {
 			civilian_factory_use = 3
 			industrial_capacity_factory = -0.025
-			consumer_goods_factor = 0.005
+			consumer_goods_factor = 0.01
 		}
 		remove_effect = {
 			log = "[GetDateText]: [Root.GetName]: Decision remove CVA_CTH_707_project_3"
@@ -5624,7 +5624,7 @@ CVA_decentralized_economic_projects = {
         modifier = {
 			civilian_factory_use = 4
 			industrial_capacity_factory = -0.025
-			consumer_goods_factor = 0.005
+			consumer_goods_factor = 0.01
 		}
 		remove_effect = {
 			log = "[GetDateText]: [Root.GetName]: Decision remove CVA_CTH_708_project_2"
@@ -5683,7 +5683,7 @@ CVA_decentralized_economic_projects = {
         modifier = {
 			civilian_factory_use = 6
 			industrial_capacity_factory = -0.025
-			consumer_goods_factor = 0.005
+			consumer_goods_factor = 0.01
 		}
 		remove_effect = {
 			log = "[GetDateText]: [Root.GetName]: Decision remove CVA_CTH_1089_project_2"
@@ -5747,7 +5747,7 @@ CVA_decentralized_economic_projects = {
         modifier = {
 			civilian_factory_use = 3
 			industrial_capacity_factory = -0.025
-			consumer_goods_factor = 0.005
+			consumer_goods_factor = 0.01
 		}
 		remove_effect = {
 			log = "[GetDateText]: [Root.GetName]: Decision remove CVA_CTH_751_project_2"
diff --git a/common/decisions/EQC_decisions.txt b/common/decisions/EQC_decisions.txt
index 99f8b7eb361..cec0e399f81 100644
--- a/common/decisions/EQC_decisions.txt
+++ b/common/decisions/EQC_decisions.txt
@@ -973,7 +973,7 @@ EQC_economic_policy_decisions = {
 
 		modifier = {
 			civilian_factory_use = 3
-			consumer_goods_factor = 0.03
+			consumer_goods_factor = 0.06
 		}
 
 		fire_only_once = yes
@@ -1033,7 +1033,7 @@ EQC_economic_policy_decisions = {
 
 		modifier = {
 			civilian_factory_use = 1
-			consumer_goods_factor = 0.02
+			consumer_goods_factor = 0.04
 		}
 
 		fire_only_once = yes
@@ -1093,7 +1093,7 @@ EQC_economic_policy_decisions = {
 
 		modifier = {
 			civilian_factory_use = 3
-			consumer_goods_factor = 0.03
+			consumer_goods_factor = 0.06
 		}
 
 		fire_only_once = yes
diff --git a/common/decisions/FAT_decisions.txt b/common/decisions/FAT_decisions.txt
index 01a054fe3dd..2ae883307be 100644
--- a/common/decisions/FAT_decisions.txt
+++ b/common/decisions/FAT_decisions.txt
@@ -609,6 +609,9 @@ foreign_politics = {
 				NOT = { has_war_with = ROOT }
 			}
 		}
+		ai_will_do = {
+			factor = 10
+		}
 		available = {
 			is_subject = no
 		}
diff --git a/common/decisions/FRN_decisions.txt b/common/decisions/FRN_decisions.txt
index 11b2379355a..e24c81611e4 100644
--- a/common/decisions/FRN_decisions.txt
+++ b/common/decisions/FRN_decisions.txt
@@ -1551,6 +1551,26 @@ FRN_food_trade_cat = {
 			}
 			custom_effect_tooltip = FRN_75_food
 			add_political_power = -25
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_equipment_subsidy = {
+					cic = 250
+					equipment_type = infantry_equipment
+					seller_tags = { EQC WNG TAL JES ARA FAL SIC MIT CYA }
+				}
+				add_equipment_subsidy = {
+					cic = 250
+					equipment_type = infantry_equipment
+					seller_tags = { JER JFT VIN JRR JEB TRD FEZ AET HEL FLO POM }
+				}
+				add_equipment_subsidy = {
+					cic = 250
+					equipment_type = infantry_equipment
+					seller_tags = { GRI STW ANG FEA BRZ PYT YAL KAT ROU }
+				}
+			}
 			subtract_from_variable = {
 				var = FRN_food
 				value = 75
@@ -1594,6 +1614,26 @@ FRN_food_trade_cat = {
 				amount = 100
 				producer = GRI
 			}
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_equipment_subsidy = {
+					cic = 250
+					equipment_type = support_equipment
+					seller_tags = { EQC WNG TAL JES ARA FAL SIC MIT CYA }
+				}
+				add_equipment_subsidy = {
+					cic = 250
+					equipment_type = support_equipment
+					seller_tags = { JER JFT VIN JRR JEB TRD FEZ AET HEL FLO POM }
+				}
+				add_equipment_subsidy = {
+					cic = 250
+					equipment_type = support_equipment
+					seller_tags = { GRI STW ANG FEA BRZ PYT YAL KAT ROU }
+				}
+			}
 			custom_effect_tooltip = FRN_75_food
 			add_political_power = -25
 			subtract_from_variable = {
@@ -1639,6 +1679,26 @@ FRN_food_trade_cat = {
 				amount = 200
 				producer = GRI
 			}
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_equipment_subsidy = {
+					cic = 250
+					equipment_type = artillery_equipment
+					seller_tags = { EQC WNG TAL JES ARA FAL SIC MIT CYA }
+				}
+				add_equipment_subsidy = {
+					cic = 250
+					equipment_type = artillery_equipment
+					seller_tags = { JER JFT VIN JRR JEB TRD FEZ AET HEL FLO POM }
+				}
+				add_equipment_subsidy = {
+					cic = 250
+					equipment_type = artillery_equipment
+					seller_tags = { GRI STW ANG FEA BRZ PYT YAL KAT ROU }
+				}
+			}
 			custom_effect_tooltip = FRN_75_food
 			add_political_power = -25
 			subtract_from_variable = {
@@ -1692,6 +1752,16 @@ FRN_food_trade_cat = {
 					amount = 450
 					producer = GRI
 				}
+				if = {
+					limit = {
+						has_dlc = "Arms Against Tyranny"
+					}
+					add_equipment_subsidy = {
+						cic = 500
+						equipment_type = anti_tank_equipment
+						seller_tags = { GRI STW ANG FEA BRZ PYT YAL KAT ROU }
+					}
+				}
 			}
 			else_if = {
 				limit = {
@@ -1704,6 +1774,16 @@ FRN_food_trade_cat = {
 					amount = 450
 					producer = WNG
 				}
+				if = {
+					limit = {
+						has_dlc = "Arms Against Tyranny"
+					}
+					add_equipment_subsidy = {
+						cic = 500
+						equipment_type = anti_tank_equipment
+						seller_tags = { EQC WNG TAL JES ARA FAL SIC MIT CYA }
+					}
+				}
 			}
 			else_if = {
 				limit = {
@@ -1716,6 +1796,16 @@ FRN_food_trade_cat = {
 					amount = 450
 					producer = JER
 				}
+				if = {
+					limit = {
+						has_dlc = "Arms Against Tyranny"
+					}
+					add_equipment_subsidy = {
+						cic = 500
+						equipment_type = anti_tank_equipment
+						seller_tags = { JER JFT VIN JRR JEB TRD FEZ AET HEL FLO POM }
+					}
+				}
 			}
 			else = {
 				add_equipment_to_stockpile = {
@@ -1778,6 +1868,16 @@ FRN_food_trade_cat = {
 					amount = 450
 					producer = GRI
 				}
+				if = {
+					limit = {
+						has_dlc = "Arms Against Tyranny"
+					}
+					add_equipment_subsidy = {
+						cic = 500
+						equipment_type = anti_tank_equipment
+						seller_tags = { GRI STW ANG FEA BRZ PYT YAL KAT ROU }
+					}
+				}
 			}
 			else_if = {
 				limit = {
@@ -1790,6 +1890,16 @@ FRN_food_trade_cat = {
 					amount = 450
 					producer = WNG
 				}
+				if = {
+					limit = {
+						has_dlc = "Arms Against Tyranny"
+					}
+					add_equipment_subsidy = {
+						cic = 500
+						equipment_type = anti_tank_equipment
+						seller_tags = { EQC WNG TAL JES ARA FAL SIC MIT CYA }
+					}
+				}
 			}
 			else_if = {
 				limit = {
@@ -1802,6 +1912,16 @@ FRN_food_trade_cat = {
 					amount = 450
 					producer = JER
 				}
+				if = {
+					limit = {
+						has_dlc = "Arms Against Tyranny"
+					}
+					add_equipment_subsidy = {
+						cic = 500
+						equipment_type = anti_tank_equipment
+						seller_tags = { JER JFT VIN JRR JEB TRD FEZ AET HEL FLO POM }
+					}
+				}
 			}
 			else = {
 				add_equipment_to_stockpile = {
diff --git a/common/decisions/GRU_decisions.txt b/common/decisions/GRU_decisions.txt
index 3d449da950c..fbcdf332866 100644
--- a/common/decisions/GRU_decisions.txt
+++ b/common/decisions/GRU_decisions.txt
@@ -533,6 +533,7 @@ GRU_the_northern_crusade = {
 				set_party_name = { 
 					ideology = fascism
 					name = GRU_kingdom_puppet_party
+					long_name = GRU_kingdom_puppet_party
 				}
 				add_country_leader_role = {
 					character = GRU_coast_leader
@@ -607,6 +608,7 @@ GRU_the_northern_crusade = {
 				set_party_name = { 
 					ideology = fascism
 					name = GRU_kingdom_puppet_party
+					long_name = GRU_kingdom_puppet_party
 				}
 				add_country_leader_role = {
 					character = GRU_dog_leader
@@ -658,6 +660,7 @@ GRU_the_northern_crusade = {
 				set_party_name = { 
 					ideology = fascism
 					name = GRU_kingdom_puppet_party
+					long_name = GRU_kingdom_puppet_party
 				}
 				add_country_leader_role = {
 					character = GRU_city_leader
diff --git a/common/decisions/GRY_decisions.txt b/common/decisions/GRY_decisions.txt
index d6e42cc1bf2..979bb03dc4f 100644
--- a/common/decisions/GRY_decisions.txt
+++ b/common/decisions/GRY_decisions.txt
@@ -598,7 +598,7 @@ GRY_modernisation_decisions = {
 			factor = 125
 		}
 		modifier = {
-			consumer_goods_factor = 0.15
+			consumer_goods_factor = 0.3
 		}
 		days_remove = 365
 		remove_effect = {
diff --git a/common/decisions/HEL_decisions.txt b/common/decisions/HEL_decisions.txt
index 7d8d2f057d5..cb3a6f43834 100644
--- a/common/decisions/HEL_decisions.txt
+++ b/common/decisions/HEL_decisions.txt
@@ -42,7 +42,7 @@ HEL_capitalism_decisions = {
 		cost = 50
 		fire_only_once = yes
 		complete_effect = {
-			custom_effect_tooltip = available_designer
+			custom_effect_tooltip = available_industrial_concern
 			show_ideas_tooltip = HEL_old_ones
 			set_country_flag = HEL_chose_TRD
 		}
@@ -65,7 +65,7 @@ HEL_capitalism_decisions = {
 		cost = 50
 		fire_only_once = yes
 		complete_effect = {
-			custom_effect_tooltip = available_designer
+			custom_effect_tooltip = available_industrial_concern
 			show_ideas_tooltip = HEL_flowena_company
 			set_country_flag = HEL_chose_FLO
 		}
@@ -89,7 +89,7 @@ HEL_capitalism_decisions = {
 		cost = 50
 		fire_only_once = yes
 		complete_effect = {
-			custom_effect_tooltip = available_designer
+			custom_effect_tooltip = available_industrial_concern
 			show_ideas_tooltip = HEL_feathisia_company
 			set_country_flag = HEL_chose_FEA_1
 		}
@@ -113,7 +113,7 @@ HEL_capitalism_decisions = {
 		cost = 50
 		fire_only_once = yes
 		complete_effect = {
-			custom_effect_tooltip = available_designer
+			custom_effect_tooltip = available_industrial_concern
 			show_ideas_tooltip = HEL_feathisia_company2
 			set_country_flag = HEL_chose_FEA_2
 		}
diff --git a/common/decisions/HIE_decisions.txt b/common/decisions/HIE_decisions.txt
index 72f1d9694ed..832778cf385 100644
--- a/common/decisions/HIE_decisions.txt
+++ b/common/decisions/HIE_decisions.txt
@@ -174,7 +174,7 @@ HIE_CTH_economics_category = {
         modifier = {
 			civilian_factory_use = 1
 			industrial_capacity_factory = -0.025
-			consumer_goods_factor = 0.005
+			consumer_goods_factor = 0.01
 		}
     
         remove_effect = {
@@ -470,7 +470,7 @@ HIE_CTH_economics_category = {
         modifier = {
 			civilian_factory_use = 2
 			industrial_capacity_factory = -0.025
-			consumer_goods_factor = 0.005
+			consumer_goods_factor = 0.01
 		}
     
         remove_effect = {
@@ -773,7 +773,7 @@ HIE_CTH_economics_category = {
         modifier = {
 			civilian_factory_use = 3
 			industrial_capacity_factory = -0.025
-			consumer_goods_factor = 0.005
+			consumer_goods_factor = 0.01
 		}
     
         remove_effect = {
@@ -1136,7 +1136,7 @@ HIE_CTH_economics_category = {
         modifier = {
 			civilian_factory_use = 1
 			industrial_capacity_factory = -0.025
-			consumer_goods_factor = 0.005
+			consumer_goods_factor = 0.01
 		}
     
         remove_effect = {
@@ -1432,7 +1432,7 @@ HIE_CTH_economics_category = {
         modifier = {
 			civilian_factory_use = 2
 			industrial_capacity_factory = -0.025
-			consumer_goods_factor = 0.005
+			consumer_goods_factor = 0.01
 		}
     
         remove_effect = {
@@ -1704,7 +1704,7 @@ HIE_CTH_economics_category = {
         modifier = {
 			civilian_factory_use = 3
 			industrial_capacity_factory = -0.025
-			consumer_goods_factor = 0.005
+			consumer_goods_factor = 0.01
 		}
     
         remove_effect = {
diff --git a/common/decisions/HIP_decisions.txt b/common/decisions/HIP_decisions.txt
index a96cc95e2d9..f38fde71d39 100644
--- a/common/decisions/HIP_decisions.txt
+++ b/common/decisions/HIP_decisions.txt
@@ -2086,7 +2086,7 @@ military_training_category = {
 		modifier = {army_org_factor = -0.10}
 		remove_effect = {
 			hidden_effect = {set_technology = {HIP_sfp_barrage = 1}}
-			add_ideas = HIP_SPF_idea
+			add_ideas = HIP_SFP_idea
 			custom_effect_tooltip = HIP_unlock_barrage_tt
 		}
 	}
@@ -3859,7 +3859,7 @@ HIP_anti_harmonic_activities_committee_cat = {
 		}
 		modifier = {
 			political_power_gain = -0.1
-			consumer_goods_factor = 0.05
+			consumer_goods_factor = 0.1
 		}
 		ai_will_do = {
 			factor = 1
@@ -4808,7 +4808,7 @@ HIP_zebra_tech_research = {
 		days_remove = 160
 		modifier = {
 			research_speed_factor = -0.1
-			consumer_goods_factor = 0.05
+			consumer_goods_factor = 0.1
 		}
 		available = {
 			NOT = {
@@ -4841,7 +4841,7 @@ HIP_zebra_tech_research = {
 		days_remove = 160
 		modifier = {
 			research_speed_factor = -0.1
-			consumer_goods_factor = 0.05
+			consumer_goods_factor = 0.1
 		}
 		visible = {
 			has_tech = tech_zebra_crafting
@@ -4877,7 +4877,7 @@ HIP_zebra_tech_research = {
 		days_remove = 160
 		modifier = {
 			research_speed_factor = -0.1
-			consumer_goods_factor = 0.05
+			consumer_goods_factor = 0.1
 		}
 		visible = {
 			has_tech = zebra_pragmatic_production
@@ -4915,7 +4915,7 @@ HIP_zebra_tech_research = {
 		days_remove = 160
 		modifier = {
 			research_speed_factor = -0.1
-			consumer_goods_factor = 0.05
+			consumer_goods_factor = 0.1
 		}
 		available = {
 			NOT = {
@@ -4947,7 +4947,7 @@ HIP_zebra_tech_research = {
 		days_remove = 160
 		modifier = {
 			research_speed_factor = -0.1
-			consumer_goods_factor = 0.05
+			consumer_goods_factor = 0.1
 		}
 
 		available = {
@@ -4984,7 +4984,7 @@ HIP_zebra_tech_research = {
 		days_remove = 160
 		modifier = {
 			research_speed_factor = -0.1
-			consumer_goods_factor = 0.05
+			consumer_goods_factor = 0.1
 		}
 
 		available = {
@@ -5261,7 +5261,7 @@ HIP_exotic_weapons_cat = {
 		}
 		modifier = {
 			research_speed_factor = -0.1
-			consumer_goods_factor = 0.05
+			consumer_goods_factor = 0.1
 		}
 		complete_effect = {
 			log = "[GetDateText]: [Root.GetName]: Decision HIP_future_infantry_rifle"
@@ -5300,7 +5300,7 @@ HIP_exotic_weapons_cat = {
 		}
 		modifier = {
 			research_speed_factor = -0.1
-			consumer_goods_factor = 0.05
+			consumer_goods_factor = 0.1
 		}
 		complete_effect = {
 			log = "[GetDateText]: [Root.GetName]: Decision HIP_helicopter_assault"
@@ -5339,7 +5339,7 @@ HIP_exotic_weapons_cat = {
 		}
 		modifier = {
 			research_speed_factor = -0.1
-			consumer_goods_factor = 0.05
+			consumer_goods_factor = 0.1
 		}
 		complete_effect = {
 			log = "[GetDateText]: [Root.GetName]: Decision HIP_future_tank"
@@ -5379,7 +5379,7 @@ HIP_exotic_weapons_cat = {
 		}
 		modifier = {
 			research_speed_factor = -0.1
-			consumer_goods_factor = 0.05
+			consumer_goods_factor = 0.1
 		}
 		complete_effect = {
 			log = "[GetDateText]: [Root.GetName]: Decision HIP_ground_effect_vehicle"
@@ -5431,7 +5431,7 @@ HIP_exotic_weapons_cat = {
 		}
 		modifier = {
 			research_speed_factor = -0.1
-			consumer_goods_factor = 0.05
+			consumer_goods_factor = 0.1
 		}
 		complete_effect = {
 			log = "[GetDateText]: [Root.GetName]: Decision HIP_nuclear_depth_charges"
@@ -5476,7 +5476,7 @@ HIP_exotic_weapons_cat = {
 		}
 		modifier = {
 			research_speed_factor = -0.1
-			consumer_goods_factor = 0.05
+			consumer_goods_factor = 0.1
 		}
 		complete_effect = {
 			log = "[GetDateText]: [Root.GetName]: Decision HIP_nuclear_naval_mines"
@@ -5517,7 +5517,7 @@ HIP_exotic_weapons_cat = {
 		}
 		modifier = {
 			research_speed_factor = -0.1
-			consumer_goods_factor = 0.05
+			consumer_goods_factor = 0.1
 		}
 		visible = {
 			has_completed_focus = HIP_unconventional_nuclear_uses
@@ -5564,7 +5564,7 @@ HIP_exotic_weapons_cat = {
 		}
 		modifier = {
 			research_speed_factor = -0.1
-			consumer_goods_factor = 0.05
+			consumer_goods_factor = 0.1
 		}
 		complete_effect = {
 			log = "[GetDateText]: [Root.GetName]: Decision HIP_nuclear_air_to_air_missiles"
@@ -5608,7 +5608,7 @@ HIP_exotic_weapons_cat = {
 		}
 		modifier = {
 			research_speed_factor = -0.1
-			consumer_goods_factor = 0.05
+			consumer_goods_factor = 0.1
 		}
 		complete_effect = {
 			log = "[GetDateText]: [Root.GetName]: Decision HIP_nuclear_land_mines"
@@ -5649,7 +5649,7 @@ HIP_exotic_weapons_cat = {
 		}
 		modifier = {
 			research_speed_factor = -0.1
-			consumer_goods_factor = 0.05
+			consumer_goods_factor = 0.1
 		}
 		visible = {
 			has_completed_focus = HIP_war_plan_hydrogen
@@ -5697,7 +5697,7 @@ HIP_exotic_weapons_cat = {
 		}
 		modifier = {
 			research_speed_factor = -0.1
-			consumer_goods_factor = 0.05
+			consumer_goods_factor = 0.1
 		}
 		complete_effect = {
 			log = "[GetDateText]: [Root.GetName]: Decision HIP_air_launched_cruise_missiles"
@@ -5741,7 +5741,7 @@ HIP_exotic_weapons_cat = {
 		}
 		modifier = {
 			research_speed_factor = -0.1
-			consumer_goods_factor = 0.05
+			consumer_goods_factor = 0.1
 		}
 		complete_effect = {
 			log = "[GetDateText]: [Root.GetName]: Decision HIP_personal_grenade_launcher"
@@ -5792,7 +5792,7 @@ HIP_exotic_weapons_cat = {
 		}
 		modifier = {
 			research_speed_factor = -0.1
-			consumer_goods_factor = 0.05
+			consumer_goods_factor = 0.1
 		}
 		complete_effect = {
 			log = "[GetDateText]: [Root.GetName]: Decision HIP_future_bomber"
@@ -5826,7 +5826,7 @@ HIP_organize_the_left = {
 		fire_only_once = yes
 		days_remove = 30
 		modifier = {
-			consumer_goods_factor = 0.05
+			consumer_goods_factor = 0.1
 			research_speed_factor = 0.1
 		}
 		ai_will_do = {
@@ -11107,9 +11107,28 @@ HIP_SIR_siren_research_department = {
 		}
 		remove_effect = {
 			log = "[GetDateText]: [Root.GetName]: Decision remove HIP_SIR_form_the_tank_merger"
-			set_country_flag = HIP_SIR_designer_tanks_merged
-			add_ideas = HIP_SIR_siren_tank_merger
-			custom_effect_tooltip = HIP_SIR_unremovable_merger_tt
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				mio:HIP_marbreeze_herring_organization = {
+					add_mio_size = 3
+					add_mio_funds = 500
+				}
+				mio:HIP_crystalstar_corporation_organization = {
+					add_mio_size = 3
+					add_mio_funds = 500
+				}
+				mio:HIP_army_ordnance_department_organization = {
+					add_mio_size = 3
+					add_mio_funds = 500
+				}
+			}
+			else = {
+				set_country_flag = HIP_SIR_designer_tanks_merged
+				add_ideas = HIP_SIR_siren_tank_merger
+				custom_effect_tooltip = HIP_SIR_unremovable_merger_tt
+			}
 		}
 	}
 	HIP_SIR_form_the_material_merger = {
@@ -11134,9 +11153,28 @@ HIP_SIR_siren_research_department = {
 		}
 		remove_effect = {
 			log = "[GetDateText]: [Root.GetName]: Decision remove HIP_SIR_form_the_material_merger"
-			set_country_flag = HIP_SIR_designer_material_merged
-			add_ideas = HIP_SIR_siren_material_merger
-			custom_effect_tooltip = HIP_SIR_unremovable_merger_tt
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				mio:HIP_summershores_armory_organization = {
+					add_mio_size = 3
+					add_mio_funds = 500
+				}
+				mio:HIP_lightstar_motor_company_organization = {
+					add_mio_size = 3
+					add_mio_funds = 500
+				}
+				mio:HIP_royal_island_arsenal_organization = {
+					add_mio_size = 3
+					add_mio_funds = 500
+				}
+			}
+			else = {
+				set_country_flag = HIP_SIR_designer_material_merged
+				add_ideas = HIP_SIR_siren_material_merger
+				custom_effect_tooltip = HIP_SIR_unremovable_merger_tt
+			}
 		}
 	}
 	HIP_SIR_form_the_industrial_merger = {
@@ -11188,9 +11226,44 @@ HIP_SIR_siren_research_department = {
 		}
 		remove_effect = {
 			log = "[GetDateText]: [Root.GetName]: Decision remove HIP_SIR_form_the_aircraft_merger"
-			set_country_flag = HIP_SIR_designer_aircraft_merged
-			add_ideas = HIP_SIR_siren_aircraft_merger
-			custom_effect_tooltip = HIP_SIR_unremovable_merger_tt
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				mio:HIP_national_aeronautical_association_organization = {
+					add_mio_size = 3
+					add_mio_funds = 500
+				}
+				mio:HIP_lightning_organization = {
+					add_mio_size = 3
+					add_mio_funds = 500
+				}
+				mio:HIP_bluewing_organization = {
+					add_mio_size = 3
+					add_mio_funds = 500
+				}
+				mio:HIP_gunmare_organization= {
+					add_mio_size = 3
+					add_mio_funds = 500
+				}
+				mio:HIP_bellbreeze_aircraft_corporation_organization= {
+					add_mio_size = 3
+					add_mio_funds = 500
+				}
+				mio:HIP_downwind_aircraft_company_organization= {
+					add_mio_size = 3
+					add_mio_funds = 500
+				}
+				mio:HIP_consolidated_aircraft_organization= {
+					add_mio_size = 3
+					add_mio_funds = 500
+				}
+			}
+			else = {
+				set_country_flag = HIP_SIR_designer_aircraft_merged
+				add_ideas = HIP_SIR_siren_aircraft_merger
+				custom_effect_tooltip = HIP_SIR_unremovable_merger_tt
+			}
 		}
 	}
 	HIP_SIR_form_the_naval_merger = {
@@ -11215,9 +11288,32 @@ HIP_SIR_siren_research_department = {
 		}
 		remove_effect = {
 			log = "[GetDateText]: [Root.GetName]: Decision remove HIP_SIR_form_the_naval_merger"
-			set_country_flag = HIP_SIR_designer_naval_merged
-			add_ideas = HIP_SIR_siren_naval_merger
-			custom_effect_tooltip = HIP_SIR_unremovable_merger_tt
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				mio:HIP_clawes_naval_yard_organization = {
+					add_mio_size = 3
+					add_mio_funds = 500
+				}
+				mio:HIP_electric_boat_company_organization = {
+					add_mio_size = 3
+					add_mio_funds = 500
+				}
+				mio:HIP_aris_trench_naval_yard_organization = {
+					add_mio_size = 3
+					add_mio_funds = 500
+				}
+				mio:HIP_northpoint_national_shipbuilding_organization= {
+					add_mio_size = 3
+					add_mio_funds = 500
+				}
+			}
+			else = {
+				set_country_flag = HIP_SIR_designer_naval_merged
+				add_ideas = HIP_SIR_siren_naval_merger
+				custom_effect_tooltip = HIP_SIR_unremovable_merger_tt
+			}
 		}
 	}
 	HIP_SIR_infantry_weapon_research = {
@@ -11262,11 +11358,30 @@ HIP_SIR_siren_research_department = {
 			log = "[GetDateText]: [Root.GetName]: Decision HIP_SIR_special_forces_research"
 			set_temp_variable = { HIP_SIR_magic_change_var = -40 }
 			HIP_SIR_magic_change = yes
-			add_tech_bonus = {
-				name = special_forces_bonus
-				bonus = 1
-				uses = 1
-				category = special_forces_tech
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_doctrine_cost_reduction = {
+					name = special_forces_bonus
+					cost_reduction = 0.75
+					uses = 1
+					category = special_forces_doctrine
+				}
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 0.75
+					uses = 1
+					category = special_forces_tech
+				}
+			}
+			else = {
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 1.0
+					uses = 1
+					category = special_forces_tech
+				}
 			}
 		}
 	}
@@ -12093,7 +12208,7 @@ HIP_synthetic_crystals_category = {
 			has_tech = synth_oil_experiments
 		}
 		modifier = {
-			consumer_goods_factor = 0.05
+			consumer_goods_factor = 0.1
 		}
 		cost = 10
 		fire_only_once = yes
@@ -12126,7 +12241,7 @@ HIP_synthetic_crystals_category = {
 			has_country_flag = HIP_crystal_conversion
 		}
 		modifier = {
-			consumer_goods_factor = 0.05
+			consumer_goods_factor = 0.1
 		}
 		cost = 10
 		fire_only_once = yes
@@ -12159,7 +12274,7 @@ HIP_synthetic_crystals_category = {
 			has_country_flag = HIP_crystal_conversion_2
 		}
 		modifier = {
-			consumer_goods_factor = 0.05
+			consumer_goods_factor = 0.1
 		}
 		cost = 10
 		fire_only_once = yes
@@ -12188,7 +12303,7 @@ HIP_synthetic_crystals_category = {
 			tag = HIP
 		}
 		modifier = {
-			consumer_goods_factor = 0.05
+			consumer_goods_factor = 0.1
 		}
 		available = {
 			has_tech = advanced_rubber_processing
@@ -12221,7 +12336,7 @@ HIP_synthetic_crystals_category = {
 			tag = HIP
 		}
 		modifier = {
-			consumer_goods_factor = 0.05
+			consumer_goods_factor = 0.1
 		}
 		available = {
 			has_tech = modern_rubber_processing
@@ -12258,7 +12373,7 @@ HIP_synthetic_crystals_category = {
 			has_country_flag = HIP_crystal_conversion_5
 		}	
 		modifier = {
-			consumer_goods_factor = 0.05
+			consumer_goods_factor = 0.1
 		}
 		cost = 10
 		fire_only_once = yes
@@ -12291,7 +12406,7 @@ HIP_synthetic_crystals_category = {
 			has_country_flag = HIP_crystal_conversion_6
 		}		
 		modifier = {
-			consumer_goods_factor = 0.05
+			consumer_goods_factor = 0.1
 		}
 		cost = 10
 		fire_only_once = yes
@@ -12324,7 +12439,7 @@ HIP_synthetic_crystals_category = {
 			has_country_flag = HIP_crystal_conversion_7
 		}		
 		modifier = {
-			consumer_goods_factor = 0.05
+			consumer_goods_factor = 0.1
 		}
 		cost = 10
 		fire_only_once = yes
@@ -12357,7 +12472,7 @@ HIP_synthetic_crystals_category = {
 			has_country_flag = HIP_crystal_conversion_8
 		}
 		modifier = {
-			consumer_goods_factor = 0.05
+			consumer_goods_factor = 0.1
 		}
 		cost = 10
 		fire_only_once = yes
diff --git a/common/decisions/JER_parliament_decisions.txt b/common/decisions/JER_parliament_decisions.txt
index a620f9fbec0..2da90c089aa 100644
--- a/common/decisions/JER_parliament_decisions.txt
+++ b/common/decisions/JER_parliament_decisions.txt
@@ -1650,7 +1650,7 @@ JER_executive_category = {
 		days_remove = 240
 		
 		modifier = {
-			consumer_goods_factor = -0.03
+			consumer_goods_factor = -0.06
 			local_resources_factor = 0.05
 			MONTHLY_POPULATION = 0.15
 			stability_factor = -0.10
diff --git a/common/decisions/JES_decisions.txt b/common/decisions/JES_decisions.txt
index 5f6ad32b44f..e3e6cc72c63 100644
--- a/common/decisions/JES_decisions.txt
+++ b/common/decisions/JES_decisions.txt
@@ -1077,7 +1077,7 @@ JES_infilrtration_category = {
 						infantry = { x = 0 y = 1 }
 						infantry = { x = 0 y = 2 }
 						infantry = { x = 0 y = 3 }
-						infantry = { x = 0 y = 4 }
+						infantry = { x = 1 y = 0 }
 					}
 					support = {
 						recon = { x = 0 y = 0 }
diff --git a/common/decisions/JRR_decisions.txt b/common/decisions/JRR_decisions.txt
index 19367d3403a..8d8332d309c 100644
--- a/common/decisions/JRR_decisions.txt
+++ b/common/decisions/JRR_decisions.txt
@@ -565,7 +565,7 @@ JER_revolution_JRR_category = {
 		days_remove = 14
 
 		modifier = {
-			consumer_goods_factor = 0.05
+			consumer_goods_factor = 0.1
 			political_power_factor = -0.5
 		}
 
@@ -634,7 +634,7 @@ JER_revolution_JRR_category = {
 		days_re_enable = 14
 
 		modifier = {
-			consumer_goods_factor = 0.05
+			consumer_goods_factor = 0.1
 			political_power_factor = -0.5
 		}
 
diff --git a/common/decisions/KAT_decisions.txt b/common/decisions/KAT_decisions.txt
index b01959aa293..f9844fd162a 100644
--- a/common/decisions/KAT_decisions.txt
+++ b/common/decisions/KAT_decisions.txt
@@ -277,7 +277,7 @@ KAT_katerintreue_reforms = {
 		}
 
 		modifier = {
-			consumer_goods_factor = -0.1
+			consumer_goods_factor = -0.2
 		}
 
 		fire_only_once = yes
diff --git a/common/decisions/KIR_decisions.txt b/common/decisions/KIR_decisions.txt
index 121866c5635..f4d76e7fbbf 100644
--- a/common/decisions/KIR_decisions.txt
+++ b/common/decisions/KIR_decisions.txt
@@ -971,6 +971,13 @@ KIR_great_leap_forward_category = {
 				start_province = 20362
 				target_province = 20368
 			}
+			build_railway = {
+				level = 1
+				build_only_on_allied = yes
+				fallback = yes
+				start_province = 20368
+				target_province = 20626
+			}
 		}
 	}
 	KIR_investigate_incendiaries_decision = {
@@ -1253,6 +1260,16 @@ KIR_great_leap_forward_category = {
 		remove_effect = {
 			log = "[GetDateText]: [Root.GetName]: Decision remove KIR_mil_decision_2"
 			add_equipment_to_stockpile = { type = infantry_equipment amount = 1000 producer = EQS }
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_equipment_subsidy = {
+					cic = 500
+					equipment_type = infantry_equipment
+					seller_tags = { EQS CRY NLR VAN SCS LSP NMS CES JUN BAL TEM BUF }
+				}
+			}
 			multiply_variable = { KIR_mil_decision_2_cost_var = 1.5 } 
 		}
 	}
@@ -1278,6 +1295,16 @@ KIR_great_leap_forward_category = {
 		remove_effect = {
 			log = "[GetDateText]: [Root.GetName]: Decision remove KIR_mil_decision_3"
 			add_equipment_to_stockpile = { type = infantry_equipment_0 amount = 1000 producer = EQS }
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_equipment_subsidy = {
+					cic = 500
+					equipment_type = infantry_equipment
+					seller_tags = { EQS CRY NLR VAN SCS LSP NMS CES JUN BAL TEM BUF }
+				}
+			}
 			multiply_variable = { KIR_mil_decision_3_cost_var = 1.2 } 
 		}
 	}
@@ -2129,7 +2156,9 @@ propaganda_efforts = {
 		allowed = { original_tag = KIR } 
 		visible = {
 			KIS = {
+				exists = yes
 				has_country_flag = KIS_northern_compact_plebiscite_ongoing_flag
+				has_country_leader = { character = KIR_fickle_current ruling_only = yes }
 			}
 		}
 		
@@ -2194,7 +2223,9 @@ propaganda_efforts = {
 		allowed = { original_tag = KIR } 
 		visible = {
 			KIS = {
+				exists = yes
 				has_country_flag = KIS_northern_compact_plebiscite_ongoing_flag
+				has_country_leader = { character = KIR_fickle_current ruling_only = yes }
 			}
 		}
 		
@@ -3050,6 +3081,16 @@ KIR_nakp_treasury_category = {
 					}
 				}
 				add_equipment_to_stockpile = { type = infantry_equipment_0 amount = 1500 producer = GRI }
+				if = {
+					limit = {
+						has_dlc = "Arms Against Tyranny"
+					}
+					add_equipment_subsidy = {
+						cic = 500
+						equipment_type = infantry_equipment
+						seller_tags = { GRI STW ANG FEA BRZ PYT YAL KAT ROU }
+					}
+				}
 			}
 			if = {
 				limit = {
@@ -3064,6 +3105,16 @@ KIR_nakp_treasury_category = {
 					}
 				}
 				add_equipment_to_stockpile = { type = infantry_equipment_1 amount = 1500 producer = GRI }
+				if = {
+					limit = {
+						has_dlc = "Arms Against Tyranny"
+					}
+					add_equipment_subsidy = {
+						cic = 500
+						equipment_type = infantry_equipment
+						seller_tags = { GRI STW ANG FEA BRZ PYT YAL KAT ROU }
+					}
+				}
 			}
 			if = {
 				limit = {
@@ -3077,6 +3128,16 @@ KIR_nakp_treasury_category = {
 					}
 				}
 				add_equipment_to_stockpile = { type = infantry_equipment_2 amount = 1500 producer = GRI }
+				if = {
+					limit = {
+						has_dlc = "Arms Against Tyranny"
+					}
+					add_equipment_subsidy = {
+						cic = 500
+						equipment_type = infantry_equipment
+						seller_tags = { GRI STW ANG FEA BRZ PYT YAL KAT ROU }
+					}
+				}
 			}
 			if = {
 				limit = {
@@ -3089,6 +3150,16 @@ KIR_nakp_treasury_category = {
 					}
 				}
 				add_equipment_to_stockpile = { type = infantry_equipment_3 amount = 1500 producer = GRI }
+				if = {
+					limit = {
+						has_dlc = "Arms Against Tyranny"
+					}
+					add_equipment_subsidy = {
+						cic = 500
+						equipment_type = infantry_equipment
+						seller_tags = { GRI STW ANG FEA BRZ PYT YAL KAT ROU }
+					}
+				}
 			}
 			if = {
 				limit = {
@@ -3100,6 +3171,16 @@ KIR_nakp_treasury_category = {
 					}
 				}
 				add_equipment_to_stockpile = { type = infantry_equipment_x amount = 1500 producer = GRI }
+				if = {
+					limit = {
+						has_dlc = "Arms Against Tyranny"
+					}
+					add_equipment_subsidy = {
+						cic = 500
+						equipment_type = infantry_equipment
+						seller_tags = { GRI STW ANG FEA BRZ PYT YAL KAT ROU }
+					}
+				}
 			}
 			if = {
 				limit = {
@@ -3108,6 +3189,16 @@ KIR_nakp_treasury_category = {
 					}
 				}
 				add_equipment_to_stockpile = { type = infantry_equipment_x_2 amount = 1500 producer = GRI }
+				if = {
+					limit = {
+						has_dlc = "Arms Against Tyranny"
+					}
+					add_equipment_subsidy = {
+						cic = 500
+						equipment_type = infantry_equipment
+						seller_tags = { GRI STW ANG FEA BRZ PYT YAL KAT ROU }
+					}
+				}
 			}
 		}
 		complete_effect = {
@@ -6739,6 +6830,7 @@ operations = {
 				exists = yes 
 				NOT = {
 					has_war_with = KIS
+					is_subject_of = KIS
 				}
 			}
 		}
@@ -6833,6 +6925,7 @@ operations = {
 				exists = yes 
 				NOT = {
 					has_war_with = KIS
+					is_subject_of = KIS
 				}
 			}
 		}
@@ -6927,6 +7020,7 @@ operations = {
 				exists = yes 
 				NOT = {
 					has_war_with = KIS
+					is_subject_of = KIS
 				}
 			}
 		}
@@ -7021,6 +7115,7 @@ operations = {
 				exists = yes 
 				NOT = {
 					has_war_with = KIS
+					is_subject_of = KIS
 				}
 			}
 		}
@@ -7115,6 +7210,7 @@ operations = {
 				exists = yes 
 				NOT = {
 					has_war_with = KIS
+					is_subject_of = KIS
 				}
 			}
 		}
@@ -7221,6 +7317,7 @@ operations = {
 				exists = yes 
 				NOT = {
 					has_war_with = KIS
+					is_subject_of = KIS
 				}
 			}
 		}
@@ -7315,6 +7412,7 @@ operations = {
 				exists = yes 
 				NOT = {
 					has_war_with = KIS
+					is_subject_of = KIS
 				}
 			}
 		}
@@ -7409,6 +7507,7 @@ operations = {
 				exists = yes 
 				NOT = {
 					has_war_with = KIS
+					is_subject_of = KIS
 				}
 			}
 		}
@@ -13767,6 +13866,9 @@ KIC_roaring_fire_category = {
 					}
 				}
 			}
+			NOT = {
+				has_country_flag = KIC_mission_removed_dayspring_rose_flag
+			}
 			hidden_trigger = {
 				NOT = { has_country_flag = nirik_state_flag }
 			}
@@ -13829,6 +13931,9 @@ KIC_roaring_fire_category = {
 					}
 				}
 			}
+			NOT = {
+				has_country_flag = KIC_mission_removed_dayspring_rose_flag
+			}
 			hidden_trigger = {
 				NOT = { has_country_flag = nirik_state_flag }
 			}
@@ -13893,6 +13998,9 @@ KIC_roaring_fire_category = {
 					is_controlled_by = KIC
 				}
 			}
+			NOT = {
+				has_country_flag = KIC_mission_removed_dayspring_rose_flag
+			}
 			hidden_trigger = {
 				NOT = { has_country_flag = nirik_state_flag }
 			}
@@ -13965,6 +14073,9 @@ KIC_roaring_fire_category = {
 		}
 		available = {
 			has_completed_focus = KIR_republic_focus_BH_3C
+			NOT = {
+				has_country_flag = KIC_mission_removed_dayspring_rose_flag
+			}
 			hidden_trigger = {
 				NOT = { has_country_flag = nirik_state_flag }
 			}
@@ -14280,7 +14391,7 @@ KIR_power_struggle_category = {
 				}
 			}
 		}
-		cost = 75
+		cost = KIR_power_struggle_cost
 		ai_will_do = {
 			factor = 200
 		}
@@ -14322,7 +14433,7 @@ KIR_power_struggle_category = {
 				}
 			}
 		}
-		cost = 75
+		cost = KIR_power_struggle_cost
 		ai_will_do = {
 			factor = 200
 		}
@@ -19805,6 +19916,7 @@ CFR_infiltration_category = {
 									transfer_units_fraction = {
 										target = PREV
 										size = [CFR_civil_war_transfer_units_fraction]
+										keep_unit_leaders_trigger = { always = yes } 
 									}
 								}
 								CFR_civil_war_transfer_units_fraction = "[?CFR_civil_war_transfer_units_fraction_var]"
@@ -20117,15 +20229,24 @@ CFR_infiltration_category = {
 				has_country_flag = CFR_infiltrate_country_visible
 				OR = {
 					any_allied_country = {
-						check_variable = { closest_distance_to@FROM < 120 }
+						OR = {
+							check_variable = { closest_distance_to@FROM < 150 }
+							is_neighbor_of = FROM
+						}
 					}
 					any_of_scopes = {
 						array = subjects
-						check_variable = { closest_distance_to@FROM < 120 }
+						OR = {
+							check_variable = { closest_distance_to@FROM < 150 }
+							is_neighbor_of = FROM
+						}
 					}
 					any_of_scopes = {
 						array = CFR_infiltrated_countries_array
-						check_variable = { closest_distance_to@FROM < 120 }
+						OR = {
+							check_variable = { closest_distance_to@FROM < 150 }
+							is_neighbor_of = FROM
+						}
 					}
 					FROM = {
 						capital_scope = {
@@ -23059,7 +23180,7 @@ KIR_guardian_of_zebrica = {
 		target_array = KIR.enemies_of_harmony
 		
 		cost = 75
-		fire_only_once = yes
+		days_re_enable = 365
 		
 		complete_effect = {
 			log = "[GetDateText]: [Root.GetName]: Decision KIR_demand_disarmament target: [From.GetName]"
@@ -23330,6 +23451,18 @@ foreign_politics = {
 			log = "[GetDateText]: [Root.GetName]: Decision timeout reduce_army_size_KIR"
 			KIR = {
 				country_event = { id = kirin.84 days = 1 }
+				effect_tooltip = {
+					if = {
+						limit = {
+							has_non_aggression_pact_with = ROOT
+						}
+						diplomatic_relation = {
+							country = ROOT
+							relation = non_aggression_pact
+							active = no
+						}
+					}
+				}
 				create_wargoal = { type = puppet_wargoal_focus target = ROOT }
 			}
 		}
@@ -24075,8 +24208,11 @@ KIR_FS_WAR_TITLE = {
 		remove_effect = {
 			log = "[GetDateText]: [Root.GetName]: Decision remove KIR_FS_DEC_A1"
 			country_event = { id = kirin.310 hours = 1 }
-			custom_effect_tooltip = KIC_concentration_camps_unlock_tt
-			set_country_flag = KIR_unlocked_concentration_camps
+			set_country_flag = KIR_FSW_Internment_Camps ## For narrative purposes only.
+			set_country_flag = unlocked_forced_labor_occupation_improved_EaW
+			set_country_flag = unlocked_harsh_quotas_occupation_improved_EaW
+			custom_effect_tooltip = forced_labor_occupation_improved_EaW_tt
+			custom_effect_tooltip = harsh_quotas_occupation_improved_EaW_tt
 		}
 	}
 	KIR_FS_DEC_A2 = {
diff --git a/common/decisions/LCT_decisions.txt b/common/decisions/LCT_decisions.txt
index 7af00ba6897..01b38b487b5 100644
--- a/common/decisions/LCT_decisions.txt
+++ b/common/decisions/LCT_decisions.txt
@@ -621,7 +621,7 @@ LCT_improve_industry = {
 
 		modifier = {
 			civilian_factory_use = 5
-			consumer_goods_factor = 0.03
+			consumer_goods_factor = 0.06
 		}
 
 		fire_only_once = yes
@@ -676,7 +676,7 @@ LCT_improve_industry = {
 		}
 
 		modifier = {
-			consumer_goods_factor = 0.03
+			consumer_goods_factor = 0.06
 		}
 
 		fire_only_once = yes
@@ -711,7 +711,7 @@ LCT_improve_industry = {
 		}
 
 		modifier = {
-			consumer_goods_factor = 0.03
+			consumer_goods_factor = 0.06
 		}
 
 		fire_only_once = yes
diff --git a/common/decisions/LNS_decisions.txt b/common/decisions/LNS_decisions.txt
index badc8d10b3d..e62c6711dbe 100644
--- a/common/decisions/LNS_decisions.txt
+++ b/common/decisions/LNS_decisions.txt
@@ -261,7 +261,7 @@ LNS_griffon_tech_research = {
 		days_remove = LSC_research_decision_time?200
 		modifier = {
 			research_speed_factor = -0.1
-			consumer_goods_factor = 0.05
+			consumer_goods_factor = 0.1
 		}
 		available = {
 			NOT = {
@@ -293,7 +293,7 @@ LNS_griffon_tech_research = {
 		days_remove = LSC_research_decision_time?200
 		modifier = {
 			research_speed_factor = -0.1
-			consumer_goods_factor = 0.05
+			consumer_goods_factor = 0.1
 		}
 		available = {
 			NOT = {
@@ -327,7 +327,7 @@ LNS_griffon_tech_research = {
 		days_remove = LSC_research_decision_time?200
 		modifier = {
 			research_speed_factor = -0.1
-			consumer_goods_factor = 0.05
+			consumer_goods_factor = 0.1
 		}
 		available = {
 			NOT = {
@@ -1804,7 +1804,7 @@ LSM_knights_research = {
 		days_remove = 200
 		modifier = {
 			research_speed_factor = -0.1
-			consumer_goods_factor = 0.05
+			consumer_goods_factor = 0.1
 		}
 		available = {
 			NOT = {
@@ -1836,7 +1836,7 @@ LSM_knights_research = {
 		days_remove = 200
 		modifier = {
 			research_speed_factor = -0.1
-			consumer_goods_factor = 0.05
+			consumer_goods_factor = 0.1
 		}
 		available = {
 			NOT = {
@@ -1868,7 +1868,7 @@ LSM_knights_research = {
 		days_remove = 200
 		modifier = {
 			research_speed_factor = -0.1
-			consumer_goods_factor = 0.05
+			consumer_goods_factor = 0.1
 		}
 		available = {
 			NOT = {
@@ -1900,7 +1900,7 @@ LSM_knights_research = {
 		days_remove = 200
 		modifier = {
 			industrial_capacity_factory = -0.1
-			consumer_goods_factor = 0.1
+			consumer_goods_factor = 0.2
 		}
 		available = {
 			OR = {
@@ -1930,12 +1930,12 @@ LSM_knights_research = {
 					knights = { x = 0 y = 1 }
 					knights = { x = 0 y = 2 }
 					knights = { x = 0 y = 3 }
-					knights = { x = 0 y = 4 }
 					knights = { x = 1 y = 0 }
 					knights = { x = 1 y = 1 }
 					knights = { x = 1 y = 2 }
 					knights = { x = 1 y = 3 }
-					heavy_armor = { x = 2 y = 0 }
+					knights = { x = 2 y = 0 }
+					heavy_armor = { x = 3 y = 1 }
 				}
 				priority = 2
 			}
diff --git a/common/decisions/MAN&ELF_decisions.txt b/common/decisions/MAN&ELF_decisions.txt
index 9b47cff67a4..f19f3233b15 100644
--- a/common/decisions/MAN&ELF_decisions.txt
+++ b/common/decisions/MAN&ELF_decisions.txt
@@ -5469,7 +5469,7 @@ MAN_superweapon = {
 		days_remove = 60 
 		modifier = {
 			experience_gain_army_factor = -0.25
-			consumer_goods_factor = 0.25
+			consumer_goods_factor = 0.5
 		}
 		remove_effect = {
 			log = "[GetDateText]: [Root.GetName]: Decision remove MAN_railway_gun_build"
diff --git a/common/decisions/MIT_decisions.txt b/common/decisions/MIT_decisions.txt
index 85679e6ec85..c5c4355d431 100644
--- a/common/decisions/MIT_decisions.txt
+++ b/common/decisions/MIT_decisions.txt
@@ -115,19 +115,20 @@ MIT_SIC_business_investment_decisions_category = {
 			custom_effect_tooltip = SIC_upgrade_company_tooltip
 			add_to_variable = { global.eritonaval_lvl = 1 }
 			if = {
-				limit = { check_variable = { global.eritonaval_lvl = 4 } }
-				country_event = asterion.22
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				mio:SIC_eritonaval_organization = {
+					add_mio_funds = 300
+				}
 			}
-			else_if = {
-				limit = { check_variable = { global.eritonaval_lvl = 6 } }
+			else = {
 				if = {
-					limit = { has_idea = eritonaval }
-					swap_ideas = {
-						remove_idea = eritonaval
-						add_idea = eritonaval_lvl2
-					}
+					limit = { check_variable = { global.eritonaval_lvl = 4 } }
+					country_event = asterion.22
 				}
-				FROM = {
+				else_if = {
+					limit = { check_variable = { global.eritonaval_lvl = 6 } }
 					if = {
 						limit = { has_idea = eritonaval }
 						swap_ideas = {
@@ -135,22 +136,22 @@ MIT_SIC_business_investment_decisions_category = {
 							add_idea = eritonaval_lvl2
 						}
 					}
-				}
-			}
-			else_if = {
-				limit = { check_variable = { global.eritonaval_lvl = 8 } }
-				country_event = asterion.22
-			}
-			else_if = {
-				limit = { check_variable = { global.eritonaval_lvl = 9 } }
-				if = {
-					limit = { has_idea = eritonaval_lvl2 }
-					swap_ideas = {
-						remove_idea = eritonaval_lvl2
-						add_idea = eritonaval_lvl3
+					FROM = {
+						if = {
+							limit = { has_idea = eritonaval }
+							swap_ideas = {
+								remove_idea = eritonaval
+								add_idea = eritonaval_lvl2
+							}
+						}
 					}
 				}
-				FROM = {
+				else_if = {
+					limit = { check_variable = { global.eritonaval_lvl = 8 } }
+					country_event = asterion.22
+				}
+				else_if = {
+					limit = { check_variable = { global.eritonaval_lvl = 9 } }
 					if = {
 						limit = { has_idea = eritonaval_lvl2 }
 						swap_ideas = {
@@ -158,6 +159,15 @@ MIT_SIC_business_investment_decisions_category = {
 							add_idea = eritonaval_lvl3
 						}
 					}
+					FROM = {
+						if = {
+							limit = { has_idea = eritonaval_lvl2 }
+							swap_ideas = {
+								remove_idea = eritonaval_lvl2
+								add_idea = eritonaval_lvl3
+							}
+						}
+					}
 				}
 			}
 		}
@@ -287,19 +297,20 @@ MIT_SIC_business_investment_decisions_category = {
 			custom_effect_tooltip = SIC_upgrade_company_tooltip
 			add_to_variable = { global.estrella_lvl = 1 }
 			if = {
-				limit = { check_variable = { global.estrella_lvl = 4 } }
-				country_event = asterion.24
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				mio:SIC_eritonaval_organization = {
+					add_mio_funds = 300
+				}
 			}
-			else_if = {
-				limit = { check_variable = { global.estrella_lvl = 6 } }
+			else = {
 				if = {
-					limit = { has_idea = estrella }
-					swap_ideas = {
-						remove_idea = estrella
-						add_idea = estrella_lvl2
-					}
+					limit = { check_variable = { global.estrella_lvl = 4 } }
+					country_event = asterion.24
 				}
-				FROM = {
+				else_if = {
+					limit = { check_variable = { global.estrella_lvl = 6 } }
 					if = {
 						limit = { has_idea = estrella }
 						swap_ideas = {
@@ -307,22 +318,22 @@ MIT_SIC_business_investment_decisions_category = {
 							add_idea = estrella_lvl2
 						}
 					}
-				}
-			}
-			else_if = {
-				limit = { check_variable = { global.estrella_lvl = 8 } }
-				country_event = asterion.24
-			}
-			else_if = {
-				limit = { check_variable = { global.estrella_lvl = 9 } }
-				if = {
-					limit = { has_idea = estrella_lvl2 }
-					swap_ideas = {
-						remove_idea = estrella_lvl2
-						add_idea = estrella_lvl3
+					FROM = {
+						if = {
+							limit = { has_idea = estrella }
+							swap_ideas = {
+								remove_idea = estrella
+								add_idea = estrella_lvl2
+							}
+						}
 					}
 				}
-				FROM = {
+				else_if = {
+					limit = { check_variable = { global.estrella_lvl = 8 } }
+					country_event = asterion.24
+				}
+				else_if = {
+					limit = { check_variable = { global.estrella_lvl = 9 } }
 					if = {
 						limit = { has_idea = estrella_lvl2 }
 						swap_ideas = {
@@ -330,6 +341,15 @@ MIT_SIC_business_investment_decisions_category = {
 							add_idea = estrella_lvl3
 						}
 					}
+					FROM = {
+						if = {
+							limit = { has_idea = estrella_lvl2 }
+							swap_ideas = {
+								remove_idea = estrella_lvl2
+								add_idea = estrella_lvl3
+							}
+						}
+					}
 				}
 			}
 		}
@@ -635,7 +655,7 @@ MIT_mic_decisions_cat = {
 		}
 
 		modifier = {
-			consumer_goods_factor = 0.05
+			consumer_goods_factor = 0.1
 		}
 
 		fire_only_once = no
@@ -698,7 +718,7 @@ MIT_mic_decisions_cat = {
 		fire_only_once = no
 
 		modifier = {
-			consumer_goods_factor = -0.12
+			consumer_goods_factor = -0.24
 			political_power_factor = -0.5
 		}
 
diff --git a/common/decisions/PLB_decisions.txt b/common/decisions/PLB_decisions.txt
index 9f59bc43811..d762b4f3c88 100644
--- a/common/decisions/PLB_decisions.txt
+++ b/common/decisions/PLB_decisions.txt
@@ -204,7 +204,7 @@ PLB_great_northern_war_category = {
 			
 		}
 		modifier = {
-        	consumer_goods_factor = 0.2
+        	consumer_goods_factor = 0.4
 		}
 
 		remove_effect = {
@@ -219,6 +219,16 @@ PLB_great_northern_war_category = {
 					amount = 2000
 					producer = YAK
 				}
+				if = {
+					limit = {
+						has_dlc = "Arms Against Tyranny"
+					}
+					add_equipment_subsidy = {
+						cic = 500
+						equipment_type = infantry_equipment
+						seller_tags = { YAK JAK GRF GFF PNG STG STL }
+					}
+				}
 			}
 			else = {
 				add_equipment_to_stockpile = {
@@ -226,6 +236,16 @@ PLB_great_northern_war_category = {
 					amount = 2000
 					producer = JAK
 				}
+				if = {
+					limit = {
+						has_dlc = "Arms Against Tyranny"
+					}
+					add_equipment_subsidy = {
+						cic = 500
+						equipment_type = infantry_equipment
+						seller_tags = { YAK JAK GRF GFF PNG STG STL }
+					}
+				}
 			}
 		}
 
@@ -266,7 +286,7 @@ PLB_great_northern_war_category = {
 			
 		}
 		modifier = {
-        		consumer_goods_factor = 0.2
+        		consumer_goods_factor = 0.4
 		}
 
 		remove_effect = {
@@ -275,6 +295,16 @@ PLB_great_northern_war_category = {
 				amount = 250
 				producer = STG
 			}
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_equipment_subsidy = {
+					cic = 500
+					equipment_type = artillery_equipment
+					seller_tags = { YAK JAK GRF GFF PNG STG STL }
+				}
+			}
 		}
 
 		ai_will_do = {
@@ -314,7 +344,7 @@ PLB_great_northern_war_category = {
 			
 		}
 		modifier = {
-        	consumer_goods_factor = 0.2
+        	consumer_goods_factor = 0.4
 		}
 
 		remove_effect = {
@@ -323,6 +353,16 @@ PLB_great_northern_war_category = {
 				amount = 250
 				producer = EQS
 			}
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_equipment_subsidy = {
+					cic = 500
+					equipment_type = support_equipment
+					seller_tags = { EQS CRY NLR VAN SCS LSP NMS CES JUN BAL TEM BUF }
+				}
+			}
 		}
 
 		ai_will_do = {
@@ -359,7 +399,7 @@ PLB_great_northern_war_category = {
 			
 		}
 		modifier = {
-        	consumer_goods_factor = 0.2
+        	consumer_goods_factor = 0.4
 		}
 
 		remove_effect = {
@@ -368,6 +408,16 @@ PLB_great_northern_war_category = {
 				amount = 250
 				producer = STG
 			}
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_equipment_subsidy = {
+					cic = 500
+					equipment_type = anti_tank_equipment
+					seller_tags = { YAK JAK GRF GFF PNG STG STL }
+				}
+			}
 		}
 
 		ai_will_do = {
@@ -529,16 +579,16 @@ foreign_politics = {
 		available = {
 			has_capitulated = no
 			if = {
-				is_ai = yes
+				limit = {
+					is_ai = yes
+				}
 				FROM = {
 					NOT = { has_war_with = DED }	
 					surrender_progress > 0.20
 				}
 			}
-			else = {
 				has_army_manpower = { size > 99999 }
 			}
-		}
 		visible = {
 			is_subject_of = FROM
 			FROM = {
@@ -831,7 +881,7 @@ economy_decisions = {
 		days_remove = 180
 		fire_only_once = yes
 		modifier = {
-			consumer_goods_factor = 0.05
+			consumer_goods_factor = 0.1
 		}
 		remove_effect = {
 			decrease_illiteracy = yes
@@ -1400,7 +1450,7 @@ PLB_great_crusade = {
 				load_focus_tree = generic_griffon_focus
 				set_politics = { ruling_party = neutrality elections_allowed = no }
 				add_country_leader_role = {
-					character = JHZ_grand_guard_benthe
+					character = JHZ_grandmaster_benthe
 					country_leader = {
 						desc = ""
 						expire = "1965.1.1"
@@ -2303,5 +2353,158 @@ political_actions = {
 	}
 }
 
+PLB_jagers_research = {
+	PLB_jagers2 = {
+		icon = rifles
+		visible = {
+			has_tech = tech_jager
+		}
+		available = {
+			has_tech = tech_jager
+		}
+		cost = 50
+		days_remove = 70
+		modifier = {
+			experience_gain_army_factor = -0.1
+			research_speed_factor = -0.05
+			consumer_goods_factor = 0.05
+		}
+		fire_only_once = yes
+		remove_effect = {
+			log = "[GetDateText]: [Root.GetName]: Decision remove PLB_jagers2"
+			set_technology = { tech_jager2 = 1 }
+		}
+		ai_will_do = {
+			factor = 15
+		}
+	}
+	PLB_jagers_armored = {
+		icon = rifles
+		visible = {
+			has_tech = tech_jager
+		}
+		available = {
+			has_tech = tech_jager
+		}
+		cost = 50
+		days_remove = 150
+		modifier = {
+			experience_gain_army_factor = -0.1
+			research_speed_factor = -0.05
+			consumer_goods_factor = 0.05
+		}
+		fire_only_once = yes
+		remove_effect = {
+			log = "[GetDateText]: [Root.GetName]: Decision remove PLB_jagers_armored"
+			set_technology = { TBK_griffon_armour = 1 }
+			custom_effect_tooltip = TBK_griffon_armour_tech_tp
+			custom_effect_tooltip = percentage_increase_notice
+		}
+		ai_will_do = {
+			factor = 15
+		}
+	}
+	PLB_jagers_elite = {
+		icon = rifles
+		visible = {
+			has_tech = tech_jager
+		}
+		available = {
+			has_tech = tech_jager
+		}
+		cost = 50
+		days_remove = 150
+		modifier = {
+			experience_gain_army_factor = -0.1
+			research_speed_factor = -0.05
+			consumer_goods_factor = 0.05
+		}
+		fire_only_once = yes
+		remove_effect = {
+			log = "[GetDateText]: [Root.GetName]: Decision remove PLB_jagers_elite"
+			set_technology = { PLB_elite_among_elite_Tech = 1 }
+			custom_effect_tooltip = PLB_jagers_elite_tt
+		}
+		ai_will_do = {
+			factor = 15
+		}
+	}
+
+	PLB_jagers3 = {
+		icon = rifles
+		visible = {
+			has_tech = tech_jager
+		}
+		available = {
+			has_tech = tech_jager2
+		}
+		cost = 50
+		days_remove = 70
+		modifier = {
+			experience_gain_army_factor = -0.1
+			research_speed_factor = -0.05
+			consumer_goods_factor = 0.05
+		}
+		fire_only_once = yes
+		remove_effect = {
+			log = "[GetDateText]: [Root.GetName]: Decision removePLB_jagers3"
+			set_technology = { tech_jager3 = 1 }
+		}
+		ai_will_do = {
+			factor = 15
+		}
+	}
+		
+	PLB_jagers4 = {
+		icon = rifles
+		visible = {
+			has_tech = tech_jager
+		}
+		available = {
+			has_tech = tech_jager3
+		}
+		cost = 50
+		days_remove = 70
+		modifier = {
+			experience_gain_army_factor = -0.1
+			research_speed_factor = -0.05
+			consumer_goods_factor = 0.05
+		}
+		fire_only_once = yes
+		remove_effect = {
+			log = "[GetDateText]: [Root.GetName]: Decision remove PLB_jagers4 "
+			set_technology = { tech_jager_a = 1 }
+		}
+		ai_will_do = {
+			factor = 15
+		}
+	}
+		
+	PLB_jagers5 = {
+		icon = rifles
+		visible = {
+			has_tech = tech_jager
+		}
+		available = {
+			has_tech = tech_jager_a
+		}
+		cost = 50
+		days_remove = 70
+		modifier = {
+			experience_gain_army_factor = -0.1
+			research_speed_factor = -0.05
+			consumer_goods_factor = 0.05
+		}
+		fire_only_once = yes
+		remove_effect = {
+			log = "[GetDateText]: [Root.GetName]: Decision remove PLB_jagers5"
+			set_technology = { tech_jager_b = 1 }
+		}
+		ai_will_do = {
+			factor = 15
+		}
+	}
+}
+
 
 
diff --git a/common/decisions/SIC_decisions.txt b/common/decisions/SIC_decisions.txt
index 7566a479fdc..d9c7e00893e 100644
--- a/common/decisions/SIC_decisions.txt
+++ b/common/decisions/SIC_decisions.txt
@@ -2848,6 +2848,7 @@ SIC_MIT_business_investment_decisions_category = {
 		}
 		target_root_trigger = {
 			check_variable = { global.amphibious_tank_designer_lvl < 10 }
+			has_dlc = "Man the Guns"
 		}
 		targets = { MIT }
 		targets_dynamic = yes
@@ -2860,19 +2861,20 @@ SIC_MIT_business_investment_decisions_category = {
 			custom_effect_tooltip = SIC_upgrade_company_tooltip
 			add_to_variable = { global.amphibious_tank_designer_lvl = 1 }
 			if = {
-				limit = { check_variable = { global.amphibious_tank_designer_lvl = 4 } }
-				country_event = sicameon.74
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				mio:placeholder_name_amphibious_tank_designer_organization = {
+					add_mio_funds = 300
+				}
 			}
-			else_if = {
-				limit = { check_variable = { global.amphibious_tank_designer_lvl = 6 } }
+			else = {
 				if = {
-					limit = { has_idea = placeholder_name_amphibious_tank_designer }
-					swap_ideas = {
-						remove_idea = placeholder_name_amphibious_tank_designer
-						add_idea = placeholder_name_amphibious_tank_designerlvl2
-					}
+					limit = { check_variable = { global.amphibious_tank_designer_lvl = 4 } }
+					country_event = sicameon.74
 				}
-				FROM = {
+				else_if = {
+					limit = { check_variable = { global.amphibious_tank_designer_lvl = 6 } }
 					if = {
 						limit = { has_idea = placeholder_name_amphibious_tank_designer }
 						swap_ideas = {
@@ -2880,22 +2882,22 @@ SIC_MIT_business_investment_decisions_category = {
 							add_idea = placeholder_name_amphibious_tank_designerlvl2
 						}
 					}
-				}
-			}
-			else_if = {
-				limit = { check_variable = { global.amphibious_tank_designer_lvl = 8 } }
-				country_event = sicameon.74
-			}
-			else_if = {
-				limit = { check_variable = { global.amphibious_tank_designer_lvl = 9 } }
-				if = {
-					limit = { has_idea = placeholder_name_amphibious_tank_designerlvl2 }
-					swap_ideas = {
-						remove_idea = placeholder_name_amphibious_tank_designerlvl2
-						add_idea = placeholder_name_amphibious_tank_designerlvl3
+					FROM = {
+						if = {
+							limit = { has_idea = placeholder_name_amphibious_tank_designer }
+							swap_ideas = {
+								remove_idea = placeholder_name_amphibious_tank_designer
+								add_idea = placeholder_name_amphibious_tank_designerlvl2
+							}
+						}
 					}
 				}
-				FROM = {
+				else_if = {
+					limit = { check_variable = { global.amphibious_tank_designer_lvl = 8 } }
+					country_event = sicameon.74
+				}
+				else_if = {
+					limit = { check_variable = { global.amphibious_tank_designer_lvl = 9 } }
 					if = {
 						limit = { has_idea = placeholder_name_amphibious_tank_designerlvl2 }
 						swap_ideas = {
@@ -2903,6 +2905,15 @@ SIC_MIT_business_investment_decisions_category = {
 							add_idea = placeholder_name_amphibious_tank_designerlvl3
 						}
 					}
+					FROM = {
+						if = {
+							limit = { has_idea = placeholder_name_amphibious_tank_designerlvl2 }
+							swap_ideas = {
+								remove_idea = placeholder_name_amphibious_tank_designerlvl2
+								add_idea = placeholder_name_amphibious_tank_designerlvl3
+							}
+						}
+					}
 				}
 			}
 		}
@@ -3031,19 +3042,20 @@ SIC_MIT_business_investment_decisions_category = {
 			custom_effect_tooltip = SIC_upgrade_company_tooltip
 			add_to_variable = { global.air_designer_lvl = 1 }
 			if = {
-				limit = { check_variable = { global.air_designer_lvl = 4 } }
-				country_event = sicameon.76
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				mio:MIT_placeholder_name_air_designer_organization = {
+					add_mio_funds = 300
+				}
 			}
-			else_if = {
-				limit = { check_variable = { global.air_designer_lvl = 6 } }
+			else = {
 				if = {
-					limit = { has_idea = placeholder_name_air_designer }
-					swap_ideas = {
-						remove_idea = placeholder_name_air_designer
-						add_idea = placeholder_name_air_designerlvl2
-					}
+					limit = { check_variable = { global.air_designer_lvl = 4 } }
+					country_event = sicameon.76
 				}
-				FROM = {
+				else_if = {
+					limit = { check_variable = { global.air_designer_lvl = 6 } }
 					if = {
 						limit = { has_idea = placeholder_name_air_designer }
 						swap_ideas = {
@@ -3051,22 +3063,22 @@ SIC_MIT_business_investment_decisions_category = {
 							add_idea = placeholder_name_air_designerlvl2
 						}
 					}
-				}
-			}
-			else_if = {
-				limit = { check_variable = { global.air_designer_lvl = 8 } }
-				country_event = sicameon.76
-			}
-			else_if = {
-				limit = { check_variable = { global.air_designer_lvl = 9 } }
-				if = {
-					limit = { has_idea = placeholder_name_air_designerlvl2 }
-					swap_ideas = {
-						remove_idea = placeholder_name_air_designerlvl2
-						add_idea = placeholder_name_air_designerlvl3
+					FROM = {
+						if = {
+							limit = { has_idea = placeholder_name_air_designer }
+							swap_ideas = {
+								remove_idea = placeholder_name_air_designer
+								add_idea = placeholder_name_air_designerlvl2
+							}
+						}
 					}
 				}
-				FROM = {
+				else_if = {
+					limit = { check_variable = { global.air_designer_lvl = 8 } }
+					country_event = sicameon.76
+				}
+				else_if = {
+					limit = { check_variable = { global.air_designer_lvl = 9 } }
 					if = {
 						limit = { has_idea = placeholder_name_air_designerlvl2 }
 						swap_ideas = {
@@ -3074,7 +3086,17 @@ SIC_MIT_business_investment_decisions_category = {
 							add_idea = placeholder_name_air_designerlvl3
 						}
 					}
+					FROM = {
+						if = {
+							limit = { has_idea = placeholder_name_air_designerlvl2 }
+							swap_ideas = {
+								remove_idea = placeholder_name_air_designerlvl2
+								add_idea = placeholder_name_air_designerlvl3
+							}
+						}
+					}
 				}
+	
 			}
 		}
 		complete_effect = {
@@ -3170,7 +3192,7 @@ SIC_patriotism_campaigns_category = {
 
 		cost = 75
 		modifier = {
-			consumer_goods_factor = -0.05
+			consumer_goods_factor = -0.1
 			communism_drift = -0.1
 		}
 		days_remove = 180
diff --git a/common/decisions/SRS_decisions.txt b/common/decisions/SRS_decisions.txt
index 7e4f01c9f11..ab01e1f72bd 100644
--- a/common/decisions/SRS_decisions.txt
+++ b/common/decisions/SRS_decisions.txt
@@ -168,7 +168,7 @@ SRS_political_discussion = {
 						militia = { x = 0 y = 1 }
 						militia = { x = 0 y = 2 }
 						militia = { x = 0 y = 3 }
-						militia = { x = 0 y = 4 }
+						militia = { x = 1 y = 0 }
 					}
 				}
 				random_owned_controlled_state = {
@@ -221,7 +221,7 @@ SRS_political_discussion = {
 		modifier = {
 			political_power_factor = -0.1
 			production_factory_max_efficiency_factor = 0.1
-			consumer_goods_factor = -0.05
+			consumer_goods_factor = -0.1
 		}
 		complete_effect = {
 			log = "[GetDateText]: [Root.GetName]: Decision SRS_coopt_communal_manufactories"
@@ -2241,8 +2241,21 @@ SRS_political_discussion = {
 		remove_effect = {
 			log = "[GetDateText]: [Root.GetName]: Decision remove SRS_support_plover_cove_shipwrights"
 			set_country_flag = SRS_unlocked_shipwrights_collective_as_naval_designer
-			custom_effect_tooltip = available_designer
-			show_ideas_tooltip = plover_cove_shipwrights_collective
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}    
+				custom_effect_tooltip = available_mio_tt
+				show_mio_tooltip = SRS_plover_cove_shipwrights_collective_organization
+				mio:SRS_plover_cove_shipwrights_collective_organization = {
+					add_mio_size = 1
+					add_mio_funds = 350
+				}
+			}
+			else = {
+				custom_effect_tooltip = available_designer
+				show_ideas_tooltip = plover_cove_shipwrights_collective
+			}
 		}
 	}
 	SRS_support_automobile_collective = {
diff --git a/common/decisions/TBK_decisions.txt b/common/decisions/TBK_decisions.txt
index 610481160cd..e10104203f0 100644
--- a/common/decisions/TBK_decisions.txt
+++ b/common/decisions/TBK_decisions.txt
@@ -1638,6 +1638,16 @@ TBK_leftover_bribes_money = {
 				amount = 750
 				producer = TRD
 			}
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_equipment_subsidy = {
+					cic = 500
+					equipment_type = infantry_equipment
+					seller_tags = { JER JFT VIN JRR JEB TRD FEZ AET HEL FLO POM }
+				}
+			}
 		}
 	}
 
@@ -1699,6 +1709,16 @@ TBK_leftover_bribes_money = {
 				amount = 350
 				producer = EQC
 			}
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_equipment_subsidy = {
+					cic = 500
+					equipment_type = support_equipment
+					seller_tags = { EQC WNG TAL JES ARA FAL SIC MIT CYA FRN FEA FEA FEA }
+				}
+			}
 		}
 	}
 
@@ -1760,6 +1780,16 @@ TBK_leftover_bribes_money = {
 				amount = 150
 				producer = MIT
 			}
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_equipment_subsidy = {
+					cic = 500
+					equipment_type = artillery_equipment
+					seller_tags = { EQC WNG TAL JES ARA FAL SIC MIT CYA FRN }
+				}
+			}
 		}
 	}
 
@@ -2005,6 +2035,16 @@ TBK_leftover_bribes_money = {
 					producer = TRD
 				}
 			}
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_equipment_subsidy = {
+					cic = 500
+					equipment_type = small_plane_airframe
+					seller_tags = { JER JFT VIN JRR JEB TRD FEZ AET HEL FLO POM }
+				}
+			}
 			if = {
 	            limit = {
 	                has_dlc = "By Blood Alone"
@@ -7397,10 +7437,12 @@ foreign_politics = {
 				FROM = { has_subject = WAR }
 			}
 			else_if = {
-				FROM = {
-					is_in_faction_with = WAR
-					is_faction_leader = yes
+				limit = {
+					FROM = {
+						is_faction_leader = yes
+					}
 				}
+				is_in_faction_with = WAR
 			}
 			FROM = {
 				has_war_with = ROOT
@@ -7445,8 +7487,10 @@ foreign_politics = {
 					FROM = { has_subject = WAR }
 				}
 				else_if = {
-					FROM = {
+					limit = {
 						is_in_faction_with = WAR
+					}
+					FROM = {
 						is_faction_leader = yes
 					}
 				}
diff --git a/common/decisions/TRD_decisions.txt b/common/decisions/TRD_decisions.txt
index f60ef83c8cf..3b1faac40d5 100644
--- a/common/decisions/TRD_decisions.txt
+++ b/common/decisions/TRD_decisions.txt
@@ -2586,6 +2586,16 @@ military_training_category = {
 			    amount = 60
 			    producer = CHN
 		    }
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_equipment_subsidy = {
+					cic = 500
+					equipment_type = light_tank_chassis
+					seller_tags = { CHN CCN OLE PLB }
+				}
+			}
 		}
 	}
 	
@@ -2719,6 +2729,16 @@ military_training_category = {
 					producer = CHN
 				}
 			}	
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_equipment_subsidy = {
+					cic = 500
+					equipment_type = small_plane_airframe
+					seller_tags = { CHN CCN OLE PLB }
+				}
+			}
 		}
 	}
 	
@@ -2857,6 +2877,16 @@ military_training_category = {
 					producer = CHN
 				}
 			}
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_equipment_subsidy = {
+					cic = 500
+					equipment_type = medium_plane_airframe
+					seller_tags = { CHN CCN OLE PLB }
+				}
+			}
 		}
 	}
 }
diff --git a/common/decisions/TRO_decisions.txt b/common/decisions/TRO_decisions.txt
index 7ce9e9c54a5..a0c1a512569 100644
--- a/common/decisions/TRO_decisions.txt
+++ b/common/decisions/TRO_decisions.txt
@@ -568,7 +568,7 @@ TRO_CTH_drugs_deccat = {
 			set_variable = { TRO_CTH_friendly_grant_licenses_CARTEL = selected_cartel }
 		}
 		modifier = {
-			consumer_goods_factor = 0.05
+			consumer_goods_factor = 0.1
 		}
 		remove_effect = {
 			clr_country_flag = TRO_doing_drugs_decision_0
@@ -595,7 +595,7 @@ TRO_CTH_drugs_deccat = {
 			set_variable = { TRO_CTH_friendly_grant_licenses_CARTEL = selected_cartel }
 		}
 		modifier = {
-			consumer_goods_factor = 0.05
+			consumer_goods_factor = 0.1
 		}
 		remove_effect = {
 			clr_country_flag = TRO_doing_drugs_decision_1
@@ -622,7 +622,7 @@ TRO_CTH_drugs_deccat = {
 			set_variable = { TRO_CTH_friendly_grant_licenses_CARTEL = selected_cartel }
 		}
 		modifier = {
-			consumer_goods_factor = 0.05
+			consumer_goods_factor = 0.1
 		}
 		remove_effect = {
 			clr_country_flag = TRO_doing_drugs_decision_2
@@ -649,7 +649,7 @@ TRO_CTH_drugs_deccat = {
 			set_variable = { TRO_CTH_friendly_grant_licenses_CARTEL = selected_cartel }
 		}
 		modifier = {
-			consumer_goods_factor = 0.05
+			consumer_goods_factor = 0.1
 		}
 		remove_effect = {
 			clr_country_flag = TRO_doing_drugs_decision_3
@@ -676,7 +676,7 @@ TRO_CTH_drugs_deccat = {
 			set_variable = { TRO_CTH_friendly_grant_licenses_CARTEL = selected_cartel }
 		}
 		modifier = {
-			consumer_goods_factor = 0.05
+			consumer_goods_factor = 0.1
 		}
 		remove_effect = {
 			clr_country_flag = TRO_doing_drugs_decision_4
diff --git a/common/decisions/WIT_decisions.txt b/common/decisions/WIT_decisions.txt
index f5916985067..1241b21d2e9 100644
--- a/common/decisions/WIT_decisions.txt
+++ b/common/decisions/WIT_decisions.txt
@@ -745,7 +745,7 @@ WIT_national_spells_cat = {
 			}
 		}
 		modifier = {
-			consumer_goods_factor = -0.1
+			consumer_goods_factor = -0.2
 			political_power_factor = 0.15
 		}
 		remove_effect = {
@@ -1234,7 +1234,7 @@ WIT_national_spells_cat = {
 						light_dragons = { x = 0 y = 1 }
 						light_dragons = { x = 0 y = 2 }
 						light_dragons = { x = 0 y = 3 }
-						light_dragons = { x = 0 y = 4 }
+						light_dragons = { x = 1 y = 0 }
 					}
 					support = {
 						unicorn_company = { x = 0 y = 0 }
diff --git a/common/decisions/WNG_decisions.txt b/common/decisions/WNG_decisions.txt
index f6535d915d7..ab72cf82adb 100644
--- a/common/decisions/WNG_decisions.txt
+++ b/common/decisions/WNG_decisions.txt
@@ -2380,7 +2380,7 @@ WNG_wingbardian_parliament_cat = {
 			WNG_small_support_for_government = yes
 		}
 		modifier = {
-			consumer_goods_factor = 0.02
+			consumer_goods_factor = 0.04
 		}
 	}
 	WNG_launch_the_coup = {
diff --git a/common/decisions/YAL_decisions.txt b/common/decisions/YAL_decisions.txt
index 0d219b26774..53815dd27ae 100644
--- a/common/decisions/YAL_decisions.txt
+++ b/common/decisions/YAL_decisions.txt
@@ -1446,7 +1446,7 @@ YAL_gerhard_line = {
 			stability_factor = -0.2
 			political_power_gain = -0.75
 			production_speed_buildings_factor = -0.75
-			consumer_goods_factor = -0.5
+			consumer_goods_factor = -1
 			production_speed_bunker_factor = 1.2
 
 		}
@@ -1530,7 +1530,7 @@ YAL_intergrate_hlq_and_other = {
 		modifier = {
 			stability_factor = -0.2
 			political_power_gain = -0.225
-			consumer_goods_factor = 0.1
+			consumer_goods_factor = 0.2
 		}
 		#complete_effect = {
 		#	add_offsite_building = { type = industrial_complex level = 30 }
diff --git a/common/decisions/ZAR_decisions.txt b/common/decisions/ZAR_decisions.txt
index 5eb800155e9..9a705f0b085 100644
--- a/common/decisions/ZAR_decisions.txt
+++ b/common/decisions/ZAR_decisions.txt
@@ -320,7 +320,7 @@ ZAR_trade_cat = {
 		targets = { HIP BAT }
 		target_array = neighbors
 		modifier = {
-			consumer_goods_factor = 0.05
+			consumer_goods_factor = 0.1
 			political_power_factor = -0.1
 		}
 		target_root_trigger = {
@@ -1575,7 +1575,7 @@ ZAR_empire_coring = {
 
 			add_to_variable = { ZAR_hegemons_benefits_conscription_factor = 0.02 }
 			add_to_variable = { ZAR_hegemons_benefits_political_power_gain = 0.08 }
-			add_to_variable = { ZAR_hegemons_benefits_consumer_goods_factor = -0.01 }
+			add_to_variable = { ZAR_hegemons_benefits_consumer_goods_factor = -0.02 }
 			add_to_variable = { ZAR_hegemons_benefits_industrial_capacity_factory = 0.02 }
 
 
@@ -1635,7 +1635,7 @@ ZAR_empire_coring = {
 
 			add_to_variable = { ZAR_hegemons_benefits_conscription_factor = 0.01 }
 			add_to_variable = { ZAR_hegemons_benefits_political_power_gain = 0.05 }
-			add_to_variable = { ZAR_hegemons_benefits_consumer_goods_factor = -0.005 }
+			add_to_variable = { ZAR_hegemons_benefits_consumer_goods_factor = -0.01 }
 			add_to_variable = { ZAR_hegemons_benefits_industrial_capacity_factory = 0.015 }
 
 
@@ -1701,7 +1701,7 @@ ZAR_empire_coring = {
 
 			add_to_variable = { ZAR_hegemons_benefits_conscription_factor = 0.01 }
 			add_to_variable = { ZAR_hegemons_benefits_political_power_gain = 0.05 }
-			add_to_variable = { ZAR_hegemons_benefits_consumer_goods_factor = -0.005 }
+			add_to_variable = { ZAR_hegemons_benefits_consumer_goods_factor = -0.01 }
 			add_to_variable = { ZAR_hegemons_benefits_industrial_capacity_factory = 0.015 }
 
 
@@ -1767,7 +1767,7 @@ ZAR_empire_coring = {
 
 			add_to_variable = { ZAR_hegemons_benefits_conscription_factor = 0.02 }
 			add_to_variable = { ZAR_hegemons_benefits_political_power_gain = 0.10 }
-			add_to_variable = { ZAR_hegemons_benefits_consumer_goods_factor = -0.01 }
+			add_to_variable = { ZAR_hegemons_benefits_consumer_goods_factor = -0.02 }
 			add_to_variable = { ZAR_hegemons_benefits_industrial_capacity_factory = 0.03 }
 
 			hidden_effect = {
@@ -1806,7 +1806,7 @@ ZAR_empire_coring = {
 
 					add_to_variable = { ZAR_hegemons_benefits_conscription_factor = 0.01 }
 					add_to_variable = { ZAR_hegemons_benefits_political_power_gain = 0.05 }
-					add_to_variable = { ZAR_hegemons_benefits_consumer_goods_factor = -0.005 }
+					add_to_variable = { ZAR_hegemons_benefits_consumer_goods_factor = -0.01 }
 					add_to_variable = { ZAR_hegemons_benefits_industrial_capacity_factory = 0.015 }
 
 				
@@ -1889,7 +1889,7 @@ ZAR_empire_coring = {
 
 			add_to_variable = { ZAR_hegemons_benefits_conscription_factor = 0.02 }
 			add_to_variable = { ZAR_hegemons_benefits_political_power_gain = 0.12 }
-			add_to_variable = { ZAR_hegemons_benefits_consumer_goods_factor = -0.01 }
+			add_to_variable = { ZAR_hegemons_benefits_consumer_goods_factor = -0.02 }
 			add_to_variable = { ZAR_hegemons_benefits_industrial_capacity_factory = 0.04 }
 
 
@@ -1928,7 +1928,7 @@ ZAR_empire_coring = {
 
 					add_to_variable = { ZAR_hegemons_benefits_conscription_factor = 0.01 }
 					add_to_variable = { ZAR_hegemons_benefits_political_power_gain = 0.05 }
-					add_to_variable = { ZAR_hegemons_benefits_consumer_goods_factor = -0.005 }
+					add_to_variable = { ZAR_hegemons_benefits_consumer_goods_factor = -0.01 }
 					add_to_variable = { ZAR_hegemons_benefits_industrial_capacity_factory = 0.015 }
 
 					
@@ -1994,7 +1994,7 @@ ZAR_empire_coring = {
 
 			add_to_variable = { ZAR_hegemons_benefits_conscription_factor = 0.01 }
 			add_to_variable = { ZAR_hegemons_benefits_political_power_gain = 0.05 }
-			add_to_variable = { ZAR_hegemons_benefits_consumer_goods_factor = -0.005 }
+			add_to_variable = { ZAR_hegemons_benefits_consumer_goods_factor = -0.01 }
 			add_to_variable = { ZAR_hegemons_benefits_industrial_capacity_factory = 0.015 }
 
 			
@@ -2137,7 +2137,7 @@ ZAR_umalez_rituals_deccat = {
 		}
 		modifier = {
 			production_speed_buildings_factor = 0.20
-			consumer_goods_factor = -0.05
+			consumer_goods_factor = -0.1
 		}
 		remove_effect = {
 			clr_country_flag = ZAR_umalez_doing_ritual
@@ -2184,7 +2184,7 @@ ZAR_trans_zebharan_project_cat = {
 		fire_only_once = yes
 
 		modifier = {
-			consumer_goods_factor = 0.05
+			consumer_goods_factor = 0.1
 			political_power_factor = -0.1
 		}
 		remove_effect = {
@@ -2235,7 +2235,7 @@ ZAR_trans_zebharan_project_cat = {
 		fire_only_once = yes
 
 		modifier = {
-			consumer_goods_factor = 0.05
+			consumer_goods_factor = 0.1
 			political_power_factor = -0.1
 		}
 		remove_effect = {
@@ -2264,7 +2264,7 @@ ZAR_trans_zebharan_project_cat = {
 				custom_effect_tooltip = ZAR_trans_zebharan_project_added_modifier_tt
 			}
 			
-			add_to_variable = { ZAR_trans_zebharan_project_consumer_goods_factor = -0.005 }
+			add_to_variable = { ZAR_trans_zebharan_project_consumer_goods_factor = -0.01 }
 			add_to_variable = { ZAR_trans_zebharan_project_industrial_capacity_factory = 0.02 }
 			custom_effect_tooltip = ZAR_trans_zebharan_project_added_new_nation_tt
 			hidden_effect = {
@@ -2313,7 +2313,7 @@ ZAR_trans_zebharan_project_cat = {
 		fire_only_once = yes
 
 		modifier = {
-			consumer_goods_factor = 0.05
+			consumer_goods_factor = 0.1
 			political_power_factor = -0.1
 		}
 		remove_effect = {
@@ -2342,7 +2342,7 @@ ZAR_trans_zebharan_project_cat = {
 				custom_effect_tooltip = ZAR_trans_zebharan_project_added_modifier_tt
 			}
 			
-			add_to_variable = { ZAR_trans_zebharan_project_consumer_goods_factor = -0.005 }
+			add_to_variable = { ZAR_trans_zebharan_project_consumer_goods_factor = -0.01 }
 			add_to_variable = { ZAR_trans_zebharan_project_industrial_capacity_factory = 0.02 }
 			custom_effect_tooltip = ZAR_trans_zebharan_project_added_new_nation_tt
 			hidden_effect = {
@@ -2391,7 +2391,7 @@ ZAR_trans_zebharan_project_cat = {
 		fire_only_once = yes
 
 		modifier = {
-			consumer_goods_factor = 0.05
+			consumer_goods_factor = 0.1
 			political_power_factor = -0.1
 		}
 		remove_effect = {
@@ -2420,7 +2420,7 @@ ZAR_trans_zebharan_project_cat = {
 				custom_effect_tooltip = ZAR_trans_zebharan_project_added_modifier_tt
 			}
 			
-			add_to_variable = { ZAR_trans_zebharan_project_consumer_goods_factor = -0.005 }
+			add_to_variable = { ZAR_trans_zebharan_project_consumer_goods_factor = -0.01 }
 			add_to_variable = { ZAR_trans_zebharan_project_industrial_capacity_factory = 0.02 }
 			custom_effect_tooltip = ZAR_trans_zebharan_project_added_new_nation_tt
 			hidden_effect = {
@@ -2469,7 +2469,7 @@ ZAR_trans_zebharan_project_cat = {
 		fire_only_once = yes
 
 		modifier = {
-			consumer_goods_factor = 0.05
+			consumer_goods_factor = 0.1
 			political_power_factor = -0.1
 		}
 		remove_effect = {
@@ -2498,7 +2498,7 @@ ZAR_trans_zebharan_project_cat = {
 				custom_effect_tooltip = ZAR_trans_zebharan_project_added_modifier_tt
 			}
 			
-			add_to_variable = { ZAR_trans_zebharan_project_consumer_goods_factor = -0.005 }
+			add_to_variable = { ZAR_trans_zebharan_project_consumer_goods_factor = -0.01 }
 			add_to_variable = { ZAR_trans_zebharan_project_industrial_capacity_factory = 0.02 }
 			custom_effect_tooltip = ZAR_trans_zebharan_project_added_new_nation_tt
 			hidden_effect = {
@@ -2547,7 +2547,7 @@ ZAR_trans_zebharan_project_cat = {
 		fire_only_once = yes
 
 		modifier = {
-			consumer_goods_factor = 0.05
+			consumer_goods_factor = 0.1
 			political_power_factor = -0.1
 		}
 		remove_effect = {
@@ -2576,7 +2576,7 @@ ZAR_trans_zebharan_project_cat = {
 				custom_effect_tooltip = ZAR_trans_zebharan_project_added_modifier_tt
 			}
 			
-			add_to_variable = { ZAR_trans_zebharan_project_consumer_goods_factor = -0.005 }
+			add_to_variable = { ZAR_trans_zebharan_project_consumer_goods_factor = -0.01 }
 			add_to_variable = { ZAR_trans_zebharan_project_industrial_capacity_factory = 0.02 }
 			custom_effect_tooltip = ZAR_trans_zebharan_project_added_new_nation_tt
 			hidden_effect = {
diff --git a/common/decisions/ZES_decisions.txt b/common/decisions/ZES_decisions.txt
index 3b9473e2996..d9ed46014e7 100644
--- a/common/decisions/ZES_decisions.txt
+++ b/common/decisions/ZES_decisions.txt
@@ -120,7 +120,7 @@ ZES_coring_decisions = {
 
 		modifier = {
 			political_power_factor = -0.10
-			consumer_goods_factor = 0.05
+			consumer_goods_factor = 0.1
 		}
 
 		cost = 25
@@ -161,7 +161,7 @@ ZES_coring_decisions = {
 
 		modifier = {
 			political_power_factor = -0.10
-			consumer_goods_factor = 0.05
+			consumer_goods_factor = 0.1
 		}
 
 		cost = 25
@@ -326,7 +326,7 @@ ZES_coring_decisions = {
 
 		modifier = {
 			political_power_factor = -0.10
-			consumer_goods_factor = 0.05
+			consumer_goods_factor = 0.1
 		}
 
 		cost = 50
@@ -385,7 +385,7 @@ ZES_coring_decisions = {
 
 		modifier = {
 			political_power_factor = -0.10
-			consumer_goods_factor = 0.05
+			consumer_goods_factor = 0.1
 		}
 
 		cost = 50
@@ -445,7 +445,7 @@ ZES_coring_decisions = {
 
 		modifier = {
 			political_power_factor = -0.15
-			consumer_goods_factor = 0.10
+			consumer_goods_factor = 0.2
 		}
 
 		cost = 50
@@ -506,7 +506,7 @@ ZES_coring_decisions = {
 
 		modifier = {
 			political_power_factor = -0.15
-			consumer_goods_factor = 0.10
+			consumer_goods_factor = 0.2
 		}
 
 		cost = 50
@@ -568,7 +568,7 @@ ZES_coring_decisions = {
 
 		modifier = {
 			political_power_factor = -0.15
-			consumer_goods_factor = 0.10
+			consumer_goods_factor = 0.2
 		}
 
 		cost = 50
@@ -622,7 +622,7 @@ ZES_coring_decisions = {
 
 		modifier = {
 			political_power_factor = -0.15
-			consumer_goods_factor = 0.10
+			consumer_goods_factor = 0.2
 		}
 
 		cost = 50
@@ -674,7 +674,7 @@ ZES_coring_decisions = {
 
 		modifier = {
 			political_power_factor = -0.15
-			consumer_goods_factor = 0.10
+			consumer_goods_factor = 0.20
 		}
 
 		cost = 50
@@ -745,7 +745,7 @@ ZES_coring_decisions = {
 
 		modifier = {
 			political_power_factor = -0.15
-			consumer_goods_factor = 0.10
+			consumer_goods_factor = 0.20
 		}
 
 		cost = 50
@@ -788,7 +788,7 @@ ZES_coring_decisions = {
 
 		modifier = {
 			political_power_factor = -0.15
-			consumer_goods_factor = 0.10
+			consumer_goods_factor = 0.20
 		}
 
 		cost = 50
@@ -831,7 +831,7 @@ ZES_coring_decisions = {
 
 		modifier = {
 			political_power_factor = -0.15
-			consumer_goods_factor = 0.10
+			consumer_goods_factor = 0.20
 		}
 
 		cost = 50
@@ -893,7 +893,7 @@ ZES_coring_decisions = {
 
 		modifier = {
 			political_power_factor = -0.15
-			consumer_goods_factor = 0.10
+			consumer_goods_factor = 0.20
 		}
 
 		cost = 50
@@ -1621,7 +1621,7 @@ ZES_invite_the_world_category = {
 		days_remove = 100
 
 		modifier = {
-			consumer_goods_factor = 0.10
+			consumer_goods_factor = 0.20
 			political_power_factor = -0.05
 		}
 
@@ -2292,7 +2292,7 @@ ZES_fleet_dec = {
 		cost = 200
 		days_remove = 210
 		modifier = {
-			consumer_goods_factor = 0.4
+			consumer_goods_factor = 0.8
 			political_power_gain = -1
 		}
 		complete_effect = {
diff --git a/common/decisions/_generic_decisions.txt b/common/decisions/_generic_decisions.txt
index 11860461d00..2659cd69a9b 100644
--- a/common/decisions/_generic_decisions.txt
+++ b/common/decisions/_generic_decisions.txt
@@ -130,7 +130,7 @@ political_actions = {
 
 		modifier = {
 			stability_weekly = 0.005
-			consumer_goods_factor = 0.05
+			consumer_goods_factor = 0.10
 			industrial_capacity_factory = -0.1
 		}
 
@@ -239,6 +239,37 @@ economy_decisions = {
 			add_stability = -0.05
 		}
 	}			
+	seize_some_trucks_woo = { #repeating truck seize
+	icon = GFX_decision_hol_draw_up_staff_plans
+
+		visible = { 
+			num_of_factories < 60
+		}
+		
+		available = {
+			has_equipment = { motorized_equipment < 2001 }
+			has_tech = tech_trucks
+		}
+		
+		days_remove = 180
+
+		ai_will_do = {
+			base = 0
+			modifier = {
+				add = 1
+				has_stability > 0.74
+			}
+		}
+
+		complete_effect = {
+			add_equipment_to_stockpile = {
+				type = motorized_equipment
+				amount = 500
+			}
+			add_stability = -0.05
+		}
+	}			
+
 
 }
 
@@ -765,7 +796,7 @@ war_measures = {
 		cost = GER_war_bonds_var?50
 
 		modifier = {
-			consumer_goods_factor = -0.05
+			consumer_goods_factor = -0.20
 		}
 
 		ai_will_do = {
@@ -834,6 +865,29 @@ war_measures = {
 			}
 		}
     }
+	diversify_special_forces = {
+
+		icon = GFX_decision_generic_military
+
+		available = {
+			date > 1011.1.1
+		}
+
+		visible = {
+			has_dlc = "Arms Against Tyranny"
+		}
+
+		fire_only_once = yes
+
+		cost = 50
+
+		complete_effect = {
+			add_potential_special_forces_tree = yes
+		}
+		ai_will_do = {
+			factor = 201
+		}
+	}
 }
 
 foreign_politics = {
@@ -1117,7 +1171,6 @@ foreign_politics = {
 			num_of_civilian_factories_available_for_projects > 0
 			NOT = {
 				has_railway_connection = {
-					build_only_on_allied = yes
 					start_province = 11617
 					target_province = 3653
 				}
@@ -1150,7 +1203,6 @@ foreign_politics = {
 		cancel_trigger = {
 			OR = {
 				has_railway_connection = {
-					build_only_on_allied = yes
 					start_province = 11617
 					target_province = 3653
 				}
@@ -1201,7 +1253,6 @@ foreign_politics = {
 			num_of_civilian_factories_available_for_projects > 0
 			NOT = {
 				has_railway_connection = {
-					build_only_on_allied = yes
 					start_province = 1118
 					target_province = 9694
 				}
@@ -1234,7 +1285,6 @@ foreign_politics = {
 		cancel_trigger = {
 			OR = {
 				has_railway_connection = {
-					build_only_on_allied = yes
 					start_province = 1118
 					target_province = 9694
 				}
@@ -1283,7 +1333,6 @@ foreign_politics = {
 			num_of_civilian_factories_available_for_projects > 0
 			NOT = {
 				has_railway_connection = {
-					build_only_on_allied = yes
 					start_province = 4117
 					target_province = 705
 				}
@@ -1316,7 +1365,6 @@ foreign_politics = {
 		cancel_trigger = {
 			OR = {
 				has_railway_connection = {
-					build_only_on_allied = yes
 					start_province = 4117
 					target_province = 705
 				}
@@ -1368,7 +1416,6 @@ foreign_politics = {
 			num_of_civilian_factories_available_for_projects > 0
 			NOT = {
 				has_railway_connection = {
-					build_only_on_allied = yes
 					start_province = 12501
 					target_province = 10477
 				}
@@ -1402,7 +1449,6 @@ foreign_politics = {
 		cancel_trigger = {
 			OR = {
 				has_railway_connection = {
-					build_only_on_allied = yes
 					start_province = 12501
 					target_province = 10477
 				}
@@ -1456,7 +1502,6 @@ foreign_politics = {
 			num_of_civilian_factories_available_for_projects > 0
 			NOT = {
 				has_railway_connection = {
-					build_only_on_allied = yes
 					start_province = 7536
 					target_province = 13217
 				}
@@ -1490,7 +1535,6 @@ foreign_politics = {
 		cancel_trigger = {
 			OR = {
 				has_railway_connection = {
-					build_only_on_allied = yes
 					start_province = 7536
 					target_province = 13217
 				}
diff --git a/common/decisions/_society_advancement_decisions.txt b/common/decisions/_society_advancement_decisions.txt
index 23b8fc490e4..c980ddfea9f 100644
--- a/common/decisions/_society_advancement_decisions.txt
+++ b/common/decisions/_society_advancement_decisions.txt
@@ -20,7 +20,7 @@ economy_decisions = {
 
 		modifier = {
 			political_power_factor = -0.15
-			consumer_goods_factor = 0.1
+			consumer_goods_factor = 0.2
 		}
 
 		remove_effect = {
@@ -55,7 +55,7 @@ economy_decisions = {
 
 		modifier = {
 			political_power_factor = -0.15
-			consumer_goods_factor = 0.05
+			consumer_goods_factor = 0.1
 		}
 
 		remove_effect = {
@@ -90,7 +90,7 @@ economy_decisions = {
 
 		modifier = {
 			political_power_factor = -0.15
-			consumer_goods_factor = 0.03
+			consumer_goods_factor = 0.06
 		}
 
 		remove_effect = {
diff --git a/common/decisions/aat_mio_decisions.txt b/common/decisions/aat_mio_decisions.txt
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/common/decisions/categories/00_decision_categories.txt b/common/decisions/categories/00_decision_categories.txt
index ea8ddc3a23f..38464f9fc8e 100644
--- a/common/decisions/categories/00_decision_categories.txt
+++ b/common/decisions/categories/00_decision_categories.txt
@@ -50,6 +50,7 @@ war_measures = {
 	}
 	visible = {
 		has_war = yes
+		has_war_with_non_exiled_country = yes  
 	}
 }
 
@@ -241,4 +242,12 @@ lar_local_recruitment = {
 	}
 
 	visibility_type = map_and_decisions_view
-}
\ No newline at end of file
+}
+foreign_mio_decisions_category = {
+	picture = generic_economy
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+	}
+	priority = 5
+}
+
diff --git a/common/decisions/categories/PLB_decision_categories.txt b/common/decisions/categories/PLB_decision_categories.txt
index af5b4c3621d..75ea07a4ac7 100644
--- a/common/decisions/categories/PLB_decision_categories.txt
+++ b/common/decisions/categories/PLB_decision_categories.txt
@@ -79,3 +79,12 @@ PLB_schizo_forming_decisions = {
 		tag = PLB
 	}
 }
+PLB_jagers_research = {
+	icon = generic_research
+	
+	allowed = { original_tag = PLB }
+	
+	visible = {
+		has_completed_focus = PLB_our_own_ambitions
+	}
+}
\ No newline at end of file
diff --git a/common/decisions/favor_decisions.txt b/common/decisions/favor_decisions.txt
index 72a25a6c1f6..40a4b6e51d1 100644
--- a/common/decisions/favor_decisions.txt
+++ b/common/decisions/favor_decisions.txt
@@ -5,7 +5,7 @@ favor_category = {
 		days_re_enable = 75
 		days_remove = 25
 		modifier = {
-			consumer_goods_factor = 0.05
+			consumer_goods_factor = 0.1
 		}
 		remove_effect = {
 			log = "[GetDateText]: [Root.GetName]: Decision remove favor_pp2"
diff --git a/common/decisions/resource_prospecting.txt b/common/decisions/resource_prospecting.txt
index dd2dc2f01cd..dfeb3da1926 100644
--- a/common/decisions/resource_prospecting.txt
+++ b/common/decisions/resource_prospecting.txt
@@ -3325,7 +3325,9 @@ prospect_for_resources = {
 		}
 
 		highlight_states = {
-			state = 696
+			highlight_state_targets = {
+				state = 696
+			}
 		}
 
 		available = {
diff --git a/common/defines/eaw_defines.lua b/common/defines/eaw_defines.lua
index a2243f2a56a..5aa52a57c87 100644
--- a/common/defines/eaw_defines.lua
+++ b/common/defines/eaw_defines.lua
@@ -42,6 +42,10 @@ NDefines.NMilitary.BASE_FEMALE_DIVISIONAL_COMMANDER_CHANCE = 0.5 -- 50% of time
 
 NDefines.NNavy.SHORE_BOMBARDMENT_CAP = 0.3 -- Vanilla is 0.25
 NDefines.NNavy.SCREENS_TO_CAPITAL_RATIO = 3.0 -- Vanilla is 4.0, mostly AI stuff
+NDefines.NNavy.NAVAL_MINES_NAVAL_SUPREMACY_FACTOR = 0.5 -- Vanilla is 1.0, cut in half
+NDefines.NNavy.NAVAL_MINES_INTEL_DIFF_FACTOR = 0.1 -- Vanilla is 0.5, reverted to pre-AAT value
+NDefines.NNavy.NAVAL_MINES_ACCIDENT_STRENGTH_LOSS = 75.0 -- Vanilla is 50.0, reverted to pre-AAT value
+NDefines.NNavy.NAVAL_MINES_ACCIDENT_ORG_LOSS_FACTOR = 0.6	-- Vanilla is 0.5, reverted to pre-AAT value
 
 NDefines.NAir.NAVAL_COMBAT_EXTERNAL_PLANES_JOIN_RATIO = 0.03 	-- Max planes that can join a combat comparing to the total strength of the ships, vanilla is 0.05
 
diff --git a/common/difficulty_settings/00_difficulty.txt b/common/difficulty_settings/00_difficulty.txt
index 77b83fad769..bd52cd363c7 100644
--- a/common/difficulty_settings/00_difficulty.txt
+++ b/common/difficulty_settings/00_difficulty.txt
@@ -113,6 +113,24 @@ difficulty_settings = {
 		countries = { CTH }
 		multiplier = 2.0
 	}
+	difficulty_setting = {
+		key = "custom_diff_strong_ROA"
+		modifier = diff_strong_ai_generic
+		countries = { ROA }
+		multiplier = 2.0
+	}
+	difficulty_setting = {
+		key = "custom_diff_strong_TSV"
+		modifier = diff_strong_ai_generic
+		countries = { TSV }
+		multiplier = 2.0
+	}
+	difficulty_setting = {
+		key = "custom_diff_strong_KXN"
+		modifier = diff_strong_ai_generic
+		countries = { KXN }
+		multiplier = 2.0
+	}
 	difficulty_setting = {
 		key = "custom_diff_strong_KIR"
 		modifier = diff_strong_ai_generic
diff --git a/common/dynamic_modifiers/aat_dynamic_modifiers.txt b/common/dynamic_modifiers/aat_dynamic_modifiers.txt
new file mode 100644
index 00000000000..b972a990c25
--- /dev/null
+++ b/common/dynamic_modifiers/aat_dynamic_modifiers.txt
@@ -0,0 +1,1368 @@
+#	Example:
+#
+#	example_dynamic_modifier = {
+#		icon = "GFX_idea_unknown" # optional, will show up in guis if icon is specified
+#		enable = { always = yes } #optional, the modifier won't apply if not enabled
+#		remove_trigger = { always = no } #optional, will remove the modifier if true
+#       attacker_modifier = no  # if yes this modifier will also be read in combat for
+#                               # people engaging in the combat even if not in the state
+#
+#		# list of modifiers
+#		fuel_cost = 321
+#		max_fuel = var_max_fuel # will be taken from a variable
+#	}
+#
+#
+#	In a script file:
+#
+#	effect = {
+#		add_dynamic_modifier = {
+#			modifier = example_dynamic_modifier
+#			scope = GER # optional, if you specify this your dynamic modifier scoped to this scope (root is the effect scope)
+#			days = 14 # optional, will be removed after this many days passes
+#		}
+#	}
+#
+#	can be added to countries, states or unit leaders
+#	will only updated daily, unless forced by force_update_dynamic_modifier effect
+
+###################################
+
+GER_poor_iron_quality = {
+	enable = { always = yes }
+	icon = GFX_modifiers_SOV_civilian_labor_in_defense
+
+	state_resource_steel = iron_ore_scale
+}
+
+################################
+
+###  ##  ### #    ##  #  # ###  
+ #  #  # #   #   #  # ## # #  # 
+ #  #    ##  #   #### # ## #  # 
+ #  #  # #   #   #  # #  # #  # 
+###  ##  ### ### #  # #  # ###  
+
+################################
+
+ICE_the_icelandic_economy_modifier = {
+	enable = { always = yes }
+	icon = GFX_idea_tur_balkan_central_bank_wealthy_greece 
+
+	research_speed_factor = ICE_economy_research_speed_factor
+	production_factory_max_efficiency_factor = ICE_economy_production_factory_max_efficiency_factor
+	production_speed_buildings_factor = ICE_economy_production_speed_buildings_factor
+	consumer_goods_factor = ICE_economy_consumer_goods_factor
+	industrial_capacity_dockyard = ICE_economy_industrial_capacity_dockyard
+	industrial_capacity_factory = ICE_economy_industrial_capacity_factory
+}
+
+ICE_transformation_of_nature_state_modifier = {
+	enable = { always = yes }
+	icon = GFX_modifiers_ETH_state_development #GFX_decision_generic_electricity
+
+	state_production_speed_buildings_factor = 0.15
+	state_resources_factor = 0.1
+	local_factories = 0.15
+}
+
+
+
+##################################################################
+##################################################################
+##################################################################
+
+    ##    ##  #######  ########  ##      ##    ###    ##    ## 
+    ###   ## ##     ## ##     ## ##  ##  ##   ## ##    ##  ##  
+    ####  ## ##     ## ##     ## ##  ##  ##  ##   ##    ####   
+    ## ## ## ##     ## ########  ##  ##  ## ##     ##    ##    
+    ##  #### ##     ## ##   ##   ##  ##  ## #########    ##    
+    ##   ### ##     ## ##    ##  ##  ##  ## ##     ##    ##    
+    ##    ##  #######  ##     ##  ###  ###  ##     ##    ##    
+
+##################################################################
+##################################################################
+##################################################################
+
+#### State Modifiers ####
+  ### Historical Democratic ###
+NOR_prep_his_dmod_1 = {
+	enable = {
+		
+	}
+	remove_trigger = {
+		
+	}
+	icon = GFX_modifiers_ETH_state_development   #TODO_Carlo: change
+	# Positive 
+	state_production_speed_industrial_complex_factor = 0.25
+	local_manpower = 0.1 
+	# Negative
+	state_production_speed_bunker_factor = -0.1 
+	state_production_speed_coastal_bunker_factor = -0.1 
+}
+
+NOR_prep_his_dmod_2 = {
+	enable = {
+		
+	}
+	remove_trigger = {
+	
+	}
+	icon = GFX_modifiers_ETH_state_development   #TODO_Carlo: change
+	# Positive
+	local_manpower = 0.1
+	state_production_speed_industrial_complex_factor = 0.25
+	state_production_speed_rail_way_factor = 0.15
+	local_resources = 0.1
+	# Negative
+	max_dig_in_factor = -0.2
+	state_production_speed_bunker_factor = -0.1 
+	state_production_speed_coastal_bunker_factor = -0.1
+	state_production_speed_arms_factory_factor = -0.15 
+}
+
+NOR_prep_his_dmod_3 = {
+	enable = {
+		
+	}
+	remove_trigger = {
+		
+	}
+	icon = GFX_modifiers_ETH_state_development   #TODO_Carlo: change
+	# Positive
+	local_manpower = 0.1
+	state_production_speed_industrial_complex_factor = 0.25
+	state_production_speed_rail_way_factor = 0.2
+	local_resources = 0.1
+	state_production_speed_dockyard_factor = 0.15
+	state_production_speed_air_base_factor = 0.25
+	# Negative
+	local_org_regain = -0.1
+	local_supplies = -0.1
+	max_dig_in_factor = -0.2
+	state_production_speed_bunker_factor = -0.1 
+	state_production_speed_coastal_bunker_factor = -0.1 
+	state_production_speed_arms_factory_factor = -0.15
+}
+
+NOR_prep_resistance_dmod = {
+	enable = { always = yes }
+	icon =  GFX_modifiers_generic_defense #TODO_Carlo placeholder
+	resistance_activity = 0.2
+	resistance_growth = 0.15
+	resistance_decay = -0.2
+}
+
+NOR_defend_state_dmod = { #Added when deploying Level 1 Prep 
+	enable = { always = yes }
+	
+	icon = GFX_modifiers_generic_defense  #TODO_Carlo: Change this later maybe
+	
+	remove_trigger = {
+
+	}
+	army_morale_factor = 0.1
+	dig_in_speed_factor = 0.25
+	max_dig_in_factor = 0.15
+	pocket_penalty = -0.25
+}
+
+  ### Fascist ###
+
+NOR_prep_fasc_dmod_1 = {
+	enable = {
+		always = yes   
+	}
+	remove_trigger = {
+		
+	}
+	icon = GFX_modifiers_generic_defense  #TODO_Carlo:  Change this  
+	# Positive
+	recruitable_population_factor = 0.05
+	# Negative
+	state_production_speed_buildings_factor = -0.15
+	local_factories = NOR_prep_fasc_dmod_factories #-0.2  
+	local_supplies =  NOR_prep_fasc_dmod_local_supplies #-0.15
+
+}
+
+NOR_prep_fasc_dmod_2 = {
+	enable = {
+		always = yes  
+	}
+	remove_trigger = {
+		
+	}
+	icon = GFX_modifiers_generic_defense  #TODO_Carlo:  Change this  
+	# Positive
+	recruitable_population_factor = 0.05
+	# Negative
+	state_production_speed_buildings_factor = -0.15
+	local_factories = NOR_prep_fasc_dmod_factories #-0.15   
+	local_supplies =  NOR_prep_fasc_dmod_local_supplies #-0.15
+}
+
+NOR_prep_fasc_dmod_3 = {
+	enable = {
+		always = yes  
+	}
+	remove_trigger = {
+		
+	}
+	icon = GFX_modifiers_generic_defense  #TODO_Carlo:  Change this  
+	# Positive
+	recruitable_population_factor = 0.05
+	# Negative
+	state_production_speed_buildings_factor = -0.15
+	local_factories = NOR_prep_fasc_dmod_factories #-0.12   
+	local_supplies =  NOR_prep_fasc_dmod_local_supplies #-0.15
+}
+
+#### Monarchist ##### 
+NOR_royal_defenses = {
+	enable = {
+		always = yes 
+	}	
+	remove_trigger = {
+		
+	}
+
+	icon = GFX_modifiers_generic_defense
+
+	state_production_speed_bunker_factor = 0.4
+	state_production_speed_coastal_bunker_factor = 0.4
+	state_production_speed_infrastructure_factor = -0.2
+	state_production_speed_industrial_complex_factor = -0.2
+	state_production_speed_arms_factory_factor = -0.2
+}
+
+### Country Modifiers ###
+
+NOR_independent_norway_dmod = { # Added at the start of the Civilian Industrial branch and improved throughout it
+	enable = {
+		 
+	}
+
+	remove_trigger = {
+		
+	}
+
+	icon = GFX_idea_generic_morale_bonus
+
+	political_power_factor = 0.1 # Making this one a number so I don't need to make a tooltip just for this.  
+	consumer_goods_factor = NOR.NOR_independent_norway_dmod_consumer_goods_factor #-0.1
+	production_speed_industrial_complex_factor = NOR.NOR_independent_norway_dmod_production_speed_industrial_complex_factor #0.15 then 0.30
+	production_speed_infrastructure_factor = NOR.NOR_independent_norway_dmod_production_speed_infrastructure_factor #0.2
+	research_speed_factor = NOR.NOR_independent_norway_dmod_research_speed_factor #0.05 then 0.1
+	production_speed_supply_node_factor = NOR.NOR_independent_norway_dmod_production_speed_supply_node #0.15
+}
+
+NOR_army_air_force_dmod = { # Remeber to copy any change to the royal version. 
+	enable = {
+		 
+	}
+
+	icon = GFX_idea_tur_balkan_central_bank_wealthy_greece  #TODO_Carlo: Placeholder  
+
+	air_mission_efficiency = 0.1 # Starting bonus
+	air_mission_xp_gain_factor = 0.12 # Starting bonus
+	license_air_purchase_cost = NOR.NOR_army_air_force_dmod_license_air_purchase_cost #-0.4
+	production_speed_air_base_factor = NOR.NOR_army_air_force_dmod_production_speed_air_base_factor #0.45   
+	production_speed_anti_air_building_factor = NOR.NOR_army_air_force_dmod_production_speed_anti_air_building_factor #0.25
+	air_doctrine_cost_factor = NOR.NOR_army_air_force_dmod_air_doctrine_cost_factor #-0.1 then -0.2
+	air_ace_bonuses_factor = NOR.NOR_army_air_force_dmod_air_ace_bonuses_factor #0.15 
+	air_ace_generation_chance_factor = NOR.NOR_army_air_force_dmod_air_ace_generation_chance_factor # 0.25
+	air_attack_factor = NOR.NOR_army_air_force_dmod_air_attack_factor #0.1
+	air_defence_factor = NOR.NOR_army_air_force_dmod_air_defence_factor #0.1
+	air_nav_efficiency = NOR.NOR_army_air_force_dmod_air_nav_efficiency #0.25
+}
+
+NOR_royal_air_force_dmod = { #This is a duplicate of the army arforce one right above so we can change name 
+	
+	icon = GFX_idea_NOR_luftforsvaret_ns
+
+	enable = {
+		
+	}
+
+	icon = GFX_idea_tur_balkan_central_bank_wealthy_greece  #TODO_Carlo: Placeholder  
+
+	air_mission_efficiency = 0.1 # Starting bonus
+	air_mission_xp_gain_factor = 0.12 # Starting bonus
+	license_air_purchase_cost = NOR.NOR_army_air_force_dmod_license_air_purchase_cost #-0.4
+	production_speed_air_base_factor = NOR.NOR_army_air_force_dmod_production_speed_air_base_factor #0.45   
+	production_speed_anti_air_building_factor = NOR.NOR_army_air_force_dmod_production_speed_anti_air_building_factor #0.25
+	air_doctrine_cost_factor = NOR.NOR_army_air_force_dmod_air_doctrine_cost_factor #-0.1 then -0.2
+	air_ace_bonuses_factor = NOR.NOR_army_air_force_dmod_air_ace_bonuses_factor #0.15 
+	air_ace_generation_chance_factor = NOR.NOR_army_air_force_dmod_air_ace_generation_chance_factor # 0.25
+	air_attack_factor = NOR.NOR_army_air_force_dmod_air_attack_factor #0.1
+	air_defence_factor = NOR.NOR_army_air_force_dmod_air_defence_factor #0.1
+	air_nav_efficiency = NOR.NOR_army_air_force_dmod_air_nav_efficiency #0.25
+}
+
+NOR_royal_navy_dmod = {
+	
+	icon = GFX_idea_NOR_royal_navy_dmod
+	
+	enable = {
+		 
+	}
+
+	icon =  GFX_idea_tur_balkan_central_bank_wealthy_greece  #TODO_Carlo: Placeholder
+	
+	naval_coordination = 0.1 # Starting bonus
+	naval_morale_factor = 0.1 # Starting bonus 
+	industrial_capacity_dockyard = NOR.NOR_royal_navy_dmod_industrial_capacity_dockyard
+	convoy_escort_efficiency = NOR.NOR_royal_navy_dmod_convoy_escort_efficiency #0.3
+	naval_strike_attack_factor = NOR.NOR_royal_navy_dmod_naval_strike_attack_factor #0.25
+	naval_strike_targetting_factor = NOR.NOR_royal_navy_dmod_naval_strike_targetting_factor #0.2 
+	spotting_chance = NOR.NOR_royal_navy_dmod_spotting_chance # 0.25
+	sortie_efficiency = NOR.NOR_royal_navy_dmod_sortie_efficiency #0.2
+	mines_planting_by_fleets_factor = NOR.NOR_royal_navy_dmod_mines_planting_by_fleets_factor # 0.35
+	naval_torpedo_reveal_chance_factor = NOR.NOR_royal_navy_dmod_naval_torpedo_reveal_chance_factor # 0.3
+	naval_doctrine_cost_factor = NOR.NOR_royal_navy_dmod_naval_doctrine_cost_factor # -0.15
+	experience_gain_navy = NOR.NOR_royal_navy_dmod_experience_gain_navy # 0.12
+	convoy_retreat_speed = NOR.NOR_royal_navy_dmod_convoy_retreat_speed # 0.2
+}
+
+NOR_administrative_council_dmod = { # Added in the Historical side of the Fascist Path 
+	enable = {
+		
+	}
+
+	remove_trigger = {
+		
+	}
+
+	icon = GFX_idea_generic_morale_bonus
+
+	required_garrison_factor = -0.1
+	stability_factor = 0.05
+	consumer_goods_factor = -0.1
+}
+
+NOR_oppressed_civilians_dmod = {
+		enable = {
+			 
+		}
+		remove_trigger = {
+			NOT = { has_government = fascism }
+		}
+
+		icon = GFX_idea_generic_oppression
+
+		resistance_growth = -0.15
+		resistance_target = -0.1
+		stability_factor = 0.2
+		consumer_goods_factor = 0.1	
+		conscription_factor = NOR.NOR_oppressed_civilians_dmod_recruitable_population_factor #0.15
+}
+
+NOR_kingdom_of_norway_dmod = {
+	enable = {
+		 
+	}
+	remove_trigger = {
+		NOT = {	has_government = neutrality	}
+	}
+
+	icon = GFX_idea_generic_monarchist_uprising
+
+	military_leader_cost_factor = -0.5
+	naval_defense_factor = 0.15
+	army_defence_against_major_factor = 0.25
+	consumer_goods_factor = NOR_kingdom_of_norway_dmod_consumer_goods_factor # -0.2 0.25
+	research_speed_factor = NOR_kingdom_of_norway_dmod_research_speed # 0.08
+	special_forces_min = NOR_kingdom_of_norway_dmod_special_forces_min # 0.20
+	special_forces_training_time_factor = NOR_kingdom_of_norway_dmod_special_forces_training_time_factor # -0.1
+	conscription_factor = NOR_kingdom_of_norway_dmod_recruitable_population_factor # 0.2
+	army_defence_factor = NOR_kingdom_of_norway_dmod_army_defence_factor # 0.2 
+	army_morale_factor = NOR_kingdom_of_norway_dmod_army_morale_factor # 0.15 
+	army_org_factor = NOR_kingdom_of_norway_dmod_army_org_factor # 0.15
+	justify_war_goal_time = NOR_kingdom_of_norway_dmod_justify_war_goal_time # -0.2
+	production_speed_coastal_bunker_factor =  NOR_kingdom_of_norway_dmod_production_speed_coastal_bunker_factor # 0.35
+	production_speed_naval_base_factor = NOR_kingdom_of_norway_dmod_production_speed_naval_base_factor # 0.4
+	production_speed_dockyard_factor = NOR_kingdom_of_norway_dmod_production_speed_dockyard_factor # 0.2 
+	naval_mines_damage_factor = NOR_kingdom_of_norway_dmod_naval_mines_damage_factor # 0.2
+	spotting_chance = NOR_kingdom_of_norway_dmod_spotting_chance # 0.35
+	navy_max_range_factor = NOR_kingdom_of_norway_dmod_navy_max_range_factor # 0.15
+}
+
+SF_PARA_dispersed_drop = {
+	enable = { always = yes }
+	icon = GFX_idea_generic_air_bonus
+}
+
+SF_PARA_combat_drop = {
+	enable = { always = yes }
+	icon = GFX_idea_air_support_focus
+}
+
+SWE_folkhemmet = {
+	enable = { always = yes }
+	icon = GFX_idea_SWE_folkhemmet
+
+	stability_factor = folkhemmet_stability
+	production_speed_industrial_complex_factor = folkhemmet_civ
+	production_speed_infrastructure_factor = folkhemmet_infra
+	war_support_factor = folkhemmet_war_support
+	production_speed_arms_factory_factor = folkhemmet_mil
+	production_speed_dockyard_factor = folkhemmet_dockyard
+}
+
+SWE_folkhemmet_communism = {
+	enable = { always = yes }
+	icon = GFX_idea_SWE_folkhemmet
+
+	stability_factor = folkhemmet_stability
+	production_speed_industrial_complex_factor = folkhemmet_civ
+	war_support_factor = folkhemmet_war_support
+	production_speed_arms_factory_factor = folkhemmet_mil
+	production_speed_dockyard_factor = folkhemmet_dockyard
+	production_factory_max_efficiency_factor = folkhemmet_max_cap
+	research_speed_factor = folkhemmet_research_speed
+}
+
+SWE_hygenic_housing_output_bonus = {
+	enable = { always = yes }
+	icon = GFX_modifiers_SWE_hygienic_housing
+	state_production_speed_industrial_complex_factor = 0.1
+}
+
+SWE_blown_up_mines = {
+		enable = { always = yes }
+		icon = GFX_modifiers_sabotaged_resource
+
+		state_resources_factor = -1
+}
+
+
+SWE_hygenic_housing_resource_bonus = {
+	enable = { always = yes }
+	icon = GFX_modifiers_SWE_hygienic_housing
+	local_resources_factor = 0.12
+
+}
+
+SWE_sami_trackers = {
+	enable = { always = yes }
+	icon = GFX_modifiers_SWE_sami_trackers
+	army_speed_factor = 0.15
+}
+
+SWE_bus = { #The bus
+	icon = GFX_peace_conf_icons
+	army_defence_factor = 0.05
+}
+
+SWE_rationing_policies = { #
+	icon = GFX_idea_raj_risk_of_famine
+	base_fuel_gain_factor = SWE_rationing_fuel_gain
+	war_stability_factor = SWE_rationing_war_stability_factor
+	weekly_bombing_war_support = SWE_rationing_bombing_war_support
+	consumer_goods_factor = SWE_rationing_consumer_goods
+}
+
+SWE_ball_bearing_food_exchange = {
+	icon = GFX_idea_generic_agrarian_society
+	stability_factor = SWE_ball_bearing_food_exchange_stab_factor
+	weekly_manpower = SWE_ball_bearing_food_exchange_weekly_manpower
+}
+
+SWE_nordic_defense_council_military_overhead = {
+	icon = GFX_idea_chi_incompetent_officers
+	political_power_factor = SWE_nordic_defense_council_military_overhead_pp
+	command_abilities_cost_factor = SWE_nordic_defense_council_military_overhead_cp_ability_cost
+	command_power_gain_mult = SWE_nordic_defense_council_military_overhead_cp_gain
+	planning_speed = SWE_nordic_defense_council_military_overhead_planning_speed
+}
+
+SWE_neither_death_nor_dishonor = {
+	icon = GFX_idea_SWE_neither_death_nor_dishonor
+
+	army_core_defence_factor = SWE_nordic_defense_council_military_core_defense_factor
+	army_core_attack_factor = SWE_nordic_defense_council_military_core_attack_factor
+	industrial_capacity_factory = SWE_nordic_defense_council_factory_capacity_factor
+	industrial_capacity_dockyard  = SWE_nordic_defense_council_dockyard_capacity_factor
+}
+
+SWE_the_cross_we_bear_idea = {
+	icon = GFX_focus_generic_scandinavian_alliance
+
+	org_loss_at_low_org_factor = SWE_cross_we_bear_org_loss_at_low_org_factor
+	org_loss_when_moving = SWE_cross_we_bear_org_loss_when_moving
+	special_forces_cap = SWE_cross_we_bear_org_special_forces_cap
+	coordination_bonus = SWE_cross_we_bear_coordination_bonus
+	army_morale_factor = SWE_cross_we_bear_army_morale_factor
+	conscription = SWE_cross_we_bear_conscription
+}
+
+SWE_royal_visit_modifier = { #From neutrality path
+	icon = GFX_modifiers_NOR_monarchism #Borrowing
+	local_manpower = 0.25
+}
+
+
+
+
+#################
+#################
+#### DENMARK ####
+#################
+#################
+
+#NATIONAL SPIRITS
+DEN_neglected_military_dynamic_modifier = {
+	enable = { always = yes }
+	icon = GFX_idea_generic_neglected_military
+
+	remove_trigger = {
+		
+	}
+
+	mobilization_speed = DEN_neglected_military_mobilization_speed #-0.2
+	surrender_limit = DEN_neglected_military_surrender_limit #-0.2
+	planning_speed = DEN_neglected_military_planning_speed # -0.1
+}
+
+DEN_economic_crisis_dynamic_modifier = { 
+	enable = { always = yes }
+	icon = GFX_idea_generic_economic_crisis
+
+	remove_trigger = {
+		
+	}
+
+	monthly_population = DEN_economic_crisis_monthly_population #-0.1
+	stability_weekly = DEN_economic_crisis_stability_weekly #-0.001
+	neutrality_drift = DEN_economic_crisis_neutrality_drift #0.02
+	democratic_drift = DEN_economic_crisis_democratic_drift #-0.05
+}
+
+DEN_industrial_capability_dynamic_modifier = {
+	enable = { always = yes }
+	icon = GFX_idea_SOV_second_five_year_plan
+
+	local_resources_factor = DEN_industrial_capability_local_resources #0
+	consumer_goods_factor = DEN_industrial_capabilities_consumer_goods #0.3
+	global_building_slots_factor = DEN_industrial_capabilities_global_building_slots #0
+	line_change_production_efficiency_factor = DEN_industrial_capabilities_retention_efficiency #0
+	industrial_capacity_factory = DEN_industrial_capabilities_factory_output #-0.1
+	industrial_capacity_dockyard = DEN_industrial_capabilities_dockyard_output #-0.1
+	industry_repair_factor = DEN_industrial_capabilities_industry_repair #0
+	equipment_conversion_speed = DEN_industrial_capabilities_equipment_conversion #0
+	license_production_speed = DEN_industrial_capabilities_license_production #0
+	refit_speed = DEN_industrial_capabilities_refit_speed #0
+	repair_speed_factor = DEN_industrial_capabilities_ship_repair #0
+	min_export = DEN_industrial_capability_resources_to_market #0
+}
+
+DEN_industrial_capability_dynamic_modifier_improved = {
+	enable = { always = yes }
+	icon = GFX_idea_SOV_third_five_year_plan
+
+	local_resources_factor = DEN_industrial_capability_local_resources #0
+	consumer_goods_factor = DEN_industrial_capabilities_consumer_goods #0.3
+	global_building_slots_factor = DEN_industrial_capabilities_global_building_slots #0
+	line_change_production_efficiency_factor = DEN_industrial_capabilities_retention_efficiency #0
+	industrial_capacity_factory = DEN_industrial_capabilities_factory_output #-0.1
+	industrial_capacity_dockyard = DEN_industrial_capabilities_dockyard_output #-0.1
+	industry_repair_factor = DEN_industrial_capabilities_industry_repair #0
+	equipment_conversion_speed = DEN_industrial_capabilities_equipment_conversion #0
+	license_production_speed = DEN_industrial_capabilities_license_production #0
+	refit_speed = DEN_industrial_capabilities_refit_speed #0
+	repair_speed_factor = DEN_industrial_capabilities_ship_repair #0
+	min_export = DEN_industrial_capability_resources_to_market #0
+}
+
+DEN_industrial_capability_dynamic_modifier_max_improved = {
+	enable = { always = yes }
+	icon = GFX_idea_generic_improved_industries
+
+	local_resources_factor = DEN_industrial_capability_local_resources #0
+	consumer_goods_factor = DEN_industrial_capabilities_consumer_goods #0.3
+	global_building_slots_factor = DEN_industrial_capabilities_global_building_slots #0
+	line_change_production_efficiency_factor = DEN_industrial_capabilities_retention_efficiency #0
+	industrial_capacity_factory = DEN_industrial_capabilities_factory_output #-0.1
+	industrial_capacity_dockyard = DEN_industrial_capabilities_dockyard_output #-0.1
+	industry_repair_factor = DEN_industrial_capabilities_industry_repair #0
+	equipment_conversion_speed = DEN_industrial_capabilities_equipment_conversion #0
+	license_production_speed = DEN_industrial_capabilities_license_production #0
+	refit_speed = DEN_industrial_capabilities_refit_speed #0
+	repair_speed_factor = DEN_industrial_capabilities_ship_repair #0
+	min_export = DEN_industrial_capability_resources_to_market #0
+}
+
+DEN_industrial_capability_dynamic_modifier_light_regulation = {
+	enable = { always = yes }
+	icon = GFX_idea_SOV_second_five_year_plan
+
+	custom_modifier_tooltip = DEN_industrial_research_bonus_tt
+	local_resources_factor = DEN_industrial_capability_local_resources #0
+	consumer_goods_factor = DEN_industrial_capabilities_consumer_goods #0.3
+	global_building_slots_factor = DEN_industrial_capabilities_global_building_slots #0
+	line_change_production_efficiency_factor = DEN_industrial_capabilities_retention_efficiency #0
+	industrial_capacity_factory = DEN_industrial_capabilities_factory_output #-0.1
+	industrial_capacity_dockyard = DEN_industrial_capabilities_dockyard_output #-0.1
+	industry_repair_factor = DEN_industrial_capabilities_industry_repair #0
+	equipment_conversion_speed = DEN_industrial_capabilities_equipment_conversion #0
+	license_production_speed = DEN_industrial_capabilities_license_production #0
+	refit_speed = DEN_industrial_capabilities_refit_speed #0
+	repair_speed_factor = DEN_industrial_capabilities_ship_repair #0
+	min_export = DEN_industrial_capability_resources_to_market #0
+}
+
+DEN_industrial_capability_dynamic_modifier_light_regulation_improved = {
+	enable = { always = yes }
+	icon = GFX_idea_SOV_third_five_year_plan
+
+	custom_modifier_tooltip = DEN_industrial_research_bonus_tt
+	local_resources_factor = DEN_industrial_capability_local_resources #0
+	consumer_goods_factor = DEN_industrial_capabilities_consumer_goods #0.3
+	global_building_slots_factor = DEN_industrial_capabilities_global_building_slots #0
+	line_change_production_efficiency_factor = DEN_industrial_capabilities_retention_efficiency #0
+	industrial_capacity_factory = DEN_industrial_capabilities_factory_output #-0.1
+	industrial_capacity_dockyard = DEN_industrial_capabilities_dockyard_output #-0.1
+	industry_repair_factor = DEN_industrial_capabilities_industry_repair #0
+	equipment_conversion_speed = DEN_industrial_capabilities_equipment_conversion #0
+	license_production_speed = DEN_industrial_capabilities_license_production #0
+	refit_speed = DEN_industrial_capabilities_refit_speed #0
+	repair_speed_factor = DEN_industrial_capabilities_ship_repair #0
+	min_export = DEN_industrial_capability_resources_to_market #0
+}
+
+DEN_industrial_capability_dynamic_modifier_light_regulation_max_improved = {
+	enable = { always = yes }
+	icon = GFX_idea_generic_improved_industries
+
+	custom_modifier_tooltip = DEN_industrial_research_bonus_tt
+	local_resources_factor = DEN_industrial_capability_local_resources #0
+	consumer_goods_factor = DEN_industrial_capabilities_consumer_goods #0.3
+	global_building_slots_factor = DEN_industrial_capabilities_global_building_slots #0
+	line_change_production_efficiency_factor = DEN_industrial_capabilities_retention_efficiency #0
+	industrial_capacity_factory = DEN_industrial_capabilities_factory_output #-0.1
+	industrial_capacity_dockyard = DEN_industrial_capabilities_dockyard_output #-0.1
+	industry_repair_factor = DEN_industrial_capabilities_industry_repair #0
+	equipment_conversion_speed = DEN_industrial_capabilities_equipment_conversion #0
+	license_production_speed = DEN_industrial_capabilities_license_production #0
+	refit_speed = DEN_industrial_capabilities_refit_speed #0
+	repair_speed_factor = DEN_industrial_capabilities_ship_repair #0
+	min_export = DEN_industrial_capability_resources_to_market #0
+}
+
+DEN_war_preparations_dynamic_modifier = {
+	enable = { always = yes }
+	icon = GFX_idea_generic_stockpile_preparation
+
+	production_lack_of_resource_penalty_factor = DEN_war_preparations_lack_of_resource_penalty #0
+	defensive_war_stability_factor = DEN_war_preparations_defensive_war_stability
+	fuel_gain_factor = DEN_war_preparations_fuel_gain #0
+	max_fuel_factor = DEN_war_preparations_max_fuel #0
+	civilian_intel_to_others = DEN_war_preparations_civilian_intel_to_others
+	army_intel_to_others = DEN_war_preparations_army_intel_to_others
+	navy_intel_to_others = DEN_war_preparations_navy_intel_to_others
+	weekly_casualties_war_support = DEN_war_preparations_weekly_casualties_war_support
+	weekly_convoys_war_support = DEN_war_preparations_weekly_convoys_war_support
+	weekly_bombing_war_support = DEN_war_preparations_weekly_bombing_war_support
+	production_speed_fuel_silo_factor = DEN_war_preparations_fuel_silo_speed #0
+	offensive_war_stability_factor = DEN_war_preparations_offensive_war_stability
+}
+
+DEN_political_edicts_dynamic_modifier = {
+	enable = { always = yes }
+	icon = GFX_idea_generic_constitutional_guarantees
+	
+	drift_defence_factor = DEN_political_edicts_drift_defence_factor #0
+	conscription_factor = DEN_political_edicts_conscription_factor #0
+	operative_slot = DEN_political_edicts_operative_slot #0
+}
+
+DEN_occupation_laws_dynamic_modifier = {
+	enable = { always = yes }
+	icon = GFX_idea_DEN_occupation_laws
+	
+	cic_to_overlord_factor = DEN_occupation_laws_cic_to_overlord
+	mic_to_overlord_factor = DEN_occupation_laws_mic_to_overlord
+	autonomy_manpower_share = DEN_occupation_laws_autonomy_manpower_share
+	master_ideology_drift = DEN_occupation_laws_master_ideology_drift
+	autonomy_gain = DEN_occupation_laws_autonomy_gain
+}
+
+DEN_resistance_dynamic_modifier = { #Make sure to change all effects for both versions
+	enable = { always = yes }
+	icon = GFX_idea_DEN_resistance
+
+	air_mission_efficiency = DEN_resistance_air_mission_efficiency
+	weekly_manpower = DEN_resistance_weekly_manpower
+	mobilization_speed = DEN_resistance_mobilization_speed
+	air_attack_factor = DEN_resistance_air_attack_factor
+	air_agility_factor = DEN_resistance_air_agility_factor
+	air_home_defence_factor = DEN_resistance_air_home_defence
+	power_balance_weekly = DEN_resistance_power_balance_weekly
+	naval_damage_factor = DEN_resistance_naval_damage
+	naval_defense_factor = DEN_resistance_naval_defense
+	naval_enemy_fleet_size_ratio_penalty_factor = DEN_resistance_enemy_fleet_size_ratio_penalty
+	resistance_target_on_our_occupied_states = DEN_resistance_target_on_our_occupied_states
+	compliance_growth_on_our_occupied_states = DEN_resistance_compliance_growth_on_our_occupied_states
+	resistance_damage_to_garrison_on_our_occupied_states = DEN_resistance_damage_to_garrison_on_our_occupied_states
+}
+
+DEN_resistance_dynamic_modifier_improved = { #Make sure to change all effects for both versions
+	enable = { always = yes }
+	icon = GFX_idea_DEN_resistance
+
+	custom_modifier_tooltip = DEN_targeted_attack_and_defense_tt #for targeted_modifier when it works
+
+	air_mission_efficiency = DEN_resistance_air_mission_efficiency
+	weekly_manpower = DEN_resistance_weekly_manpower
+	mobilization_speed = DEN_resistance_mobilization_speed
+	air_attack_factor = DEN_resistance_air_attack_factor
+	air_agility_factor = DEN_resistance_air_agility_factor
+	air_home_defence_factor = DEN_resistance_air_home_defence
+	power_balance_weekly = DEN_resistance_power_balance_weekly
+	naval_damage_factor = DEN_resistance_naval_damage
+	naval_defense_factor = DEN_resistance_naval_defense
+	naval_enemy_fleet_size_ratio_penalty_factor = DEN_resistance_enemy_fleet_size_ratio_penalty
+	resistance_target_on_our_occupied_states = DEN_resistance_target_on_our_occupied_states
+	compliance_growth_on_our_occupied_states = DEN_resistance_compliance_growth_on_our_occupied_states
+	resistance_damage_to_garrison_on_our_occupied_states = DEN_resistance_damage_to_garrison_on_our_occupied_states
+}
+
+DEN_haeren_dynamic_modifier = { #Make sure to change all effects for all 3 versions
+	enable = { always = yes }
+	icon = GFX_idea_DEN_haeren_1
+
+
+	army_attack_against_minor_factor = DEN_haeren_army_attack_against_minor
+	army_speed_factor = DEN_haeren_army_speed
+	army_org_factor = DEN_haeren_army_org
+	org_loss_when_moving = DEN_haeren_org_loss_when_moving
+	army_attack_factor = DEN_haeren_army_attack
+	army_defence_factor = DEN_haeren_army_defence
+	army_core_attack_factor = DEN_haeren_army_core_attack
+	army_core_defence_factor = DEN_haeren_army_core_defence
+	army_armor_attack_factor = DEN_haeren_army_armor_attack
+	army_armor_defence_factor = DEN_haeren_army_armor_defence
+	army_artillery_defence_factor = DEN_haeren_army_artillery_defence
+	army_artillery_attack_factor = DEN_haeren_army_artillery_attack
+	army_attack_against_major_factor = DEN_haeren_army_attack_against_major
+	army_defence_against_major_factor = DEN_haeren_army_defence_against_major
+}
+DEN_haeren_dynamic_modifier_improved = { #Make sure to change all effects for all 3 versions
+	enable = { always = yes }
+	icon = GFX_idea_DEN_haeren_2
+
+	army_attack_against_minor_factor = DEN_haeren_army_attack_against_minor
+	army_speed_factor = DEN_haeren_army_speed
+	army_org_factor = DEN_haeren_army_org
+	org_loss_when_moving = DEN_haeren_org_loss_when_moving
+	army_attack_factor = DEN_haeren_army_attack
+	army_defence_factor = DEN_haeren_army_defence
+	army_core_attack_factor = DEN_haeren_army_core_attack
+	army_core_defence_factor = DEN_haeren_army_core_defence
+	army_armor_attack_factor = DEN_haeren_army_armor_attack
+	army_armor_defence_factor = DEN_haeren_army_armor_defence
+	army_artillery_defence_factor  = DEN_haeren_army_artillery_defence
+	army_artillery_attack_factor = DEN_haeren_army_artillery_attack
+	army_attack_against_major_factor = DEN_haeren_army_attack_against_major
+	army_defence_against_major_factor = DEN_haeren_army_defence_against_major
+}
+DEN_haeren_dynamic_modifier_max_improved = { #Make sure to change all effects for all 3 versions
+	enable = { always = yes }
+	icon = GFX_idea_DEN_haeren_3
+
+	army_attack_against_minor_factor = DEN_haeren_army_attack_against_minor
+	army_speed_factor = DEN_haeren_army_speed
+	army_org_factor = DEN_haeren_army_org
+	org_loss_when_moving = DEN_haeren_org_loss_when_moving
+	army_attack_factor = DEN_haeren_army_attack
+	army_defence_factor = DEN_haeren_army_defence
+	army_core_attack_factor = DEN_haeren_army_core_attack
+	army_core_defence_factor = DEN_haeren_army_core_defence
+	army_armor_attack_factor = DEN_haeren_army_armor_attack
+	army_armor_defence_factor = DEN_haeren_army_armor_defence
+	army_artillery_defence_factor  = DEN_haeren_army_artillery_defence
+	army_artillery_attack_factor = DEN_haeren_army_artillery_attack
+	army_attack_against_major_factor = DEN_haeren_army_attack_against_major
+	army_defence_against_major_factor = DEN_haeren_army_defence_against_major
+}
+
+DEN_sovaernet_dynamic_modifier = { #Make sure to change all effects for all 3 versions
+	enable = { always = yes }
+	icon = GFX_idea_DEN_sovaernet_1
+
+	naval_coordination = DEN_sovaernet_naval_coordination
+	naval_detection = DEN_sovaernet_naval_detection
+	navy_org_factor = DEN_sovaernet_navy_org
+	naval_morale_factor = DEN_sovaernet_naval_morale
+	navy_anti_air_attack_factor = DEN_sovaernet_navy_anti_air
+	navy_capital_ship_defence_factor = DEN_sovaernet_capital_ship_defence
+	navy_screen_attack_factor = DEN_sovaernet_navy_screen_attack
+	navy_screen_defence_factor = DEN_sovaernet_navy_screen_defence
+	naval_accidents_chance = DEN_sovaernet_naval_accidents
+	screening_efficiency = DEN_sovaernet_screening_efficiency
+	positioning =  DEN_sovaernet_positioning
+	naval_critical_score_chance_factor = DEN_sovaernet_naval_critical_score_chance
+}
+DEN_sovaernet_dynamic_modifier_improved = { #Make sure to change all effects for all 3 versions
+	enable = { always = yes }
+	icon = GFX_idea_DEN_sovaernet_2
+
+	naval_coordination = DEN_sovaernet_naval_coordination
+	naval_detection = DEN_sovaernet_naval_detection
+	navy_org_factor = DEN_sovaernet_navy_org
+	naval_morale_factor = DEN_sovaernet_naval_morale
+	navy_anti_air_attack_factor = DEN_sovaernet_navy_anti_air
+	navy_capital_ship_defence_factor = DEN_sovaernet_capital_ship_defence
+	navy_screen_attack_factor = DEN_sovaernet_navy_screen_attack
+	navy_screen_defence_factor = DEN_sovaernet_navy_screen_defence
+	naval_accidents_chance = DEN_sovaernet_naval_accidents
+	screening_efficiency = DEN_sovaernet_screening_efficiency
+	positioning =  DEN_sovaernet_positioning
+	naval_critical_score_chance_factor = DEN_sovaernet_naval_critical_score_chance
+}
+DEN_sovaernet_dynamic_modifier_max_improved = { #Make sure to change all effects for all 3 versions
+	enable = { always = yes }
+	icon = GFX_idea_DEN_sovaernet_3
+
+	naval_coordination = DEN_sovaernet_naval_coordination
+	naval_detection = DEN_sovaernet_naval_detection
+	navy_org_factor = DEN_sovaernet_navy_org
+	naval_morale_factor = DEN_sovaernet_naval_morale
+	navy_anti_air_attack_factor = DEN_sovaernet_navy_anti_air
+	navy_capital_ship_defence_factor = DEN_sovaernet_capital_ship_defence
+	navy_screen_attack_factor = DEN_sovaernet_navy_screen_attack
+	navy_screen_defence_factor = DEN_sovaernet_navy_screen_defence
+	naval_accidents_chance = DEN_sovaernet_naval_accidents
+	screening_efficiency = DEN_sovaernet_screening_efficiency
+	positioning =  DEN_sovaernet_positioning
+	naval_critical_score_chance_factor = DEN_sovaernet_naval_critical_score_chance
+}
+
+DEN_flyvevabnet_dynamic_modifier = { #Make sure to change all effects for all 3 versions
+	enable = { always = yes }
+	icon = GFX_idea_DEN_flyvevabnet_1
+
+	air_bombing_targetting = DEN_flyvevabnet_air_bombing_targetting #bombers
+	air_ace_generation_chance_factor = DEN_flyvevabnet_ace_generation_chance #skolen
+	air_strategic_bomber_bombing_factor = DEN_flyvevabnet_strategic_bomber #bombers
+	air_escort_efficiency = DEN_flyvevabnet_escort_efficiency #fighter
+	air_intercept_efficiency = DEN_flyvevabnet_intercept_efficiency #fighter
+	air_cas_efficiency = DEN_flyvevabnet_cas_efficiency #cas
+	air_mission_efficiency = DEN_flyvevabnet_mission_efficiency #skolen
+	naval_strike_targetting_factor = DEN_flyvevabnet_naval_strike_targetting #naval
+	air_accidents_factor = DEN_flyvevabnet_air_accidents #kommando
+	air_agility_factor = DEN_flyvevabnet_air_agility #skolen
+	ground_attack_factor = DEN_flyvevabnet_ground_attack #cas
+	air_night_penalty = DEN_flyvevabnet_air_night_penalty #kommando
+	air_weather_penalty = DEN_flyvevabnet_air_weather_penalty #kommando
+}
+DEN_flyvevabnet_dynamic_modifier_improved = { #Make sure to change all effects for all 3 versions
+	enable = { always = yes }
+	icon = GFX_idea_DEN_flyvevabnet_2
+
+	air_bombing_targetting = DEN_flyvevabnet_air_bombing_targetting #bombers
+	air_ace_generation_chance_factor = DEN_flyvevabnet_ace_generation_chance #skolen
+	air_strategic_bomber_bombing_factor = DEN_flyvevabnet_strategic_bomber #bombers
+	air_escort_efficiency = DEN_flyvevabnet_escort_efficiency #fighter
+	air_intercept_efficiency = DEN_flyvevabnet_intercept_efficiency #fighter
+	air_cas_efficiency = DEN_flyvevabnet_cas_efficiency #cas
+	air_mission_efficiency = DEN_flyvevabnet_mission_efficiency #skolen
+	naval_strike_targetting_factor = DEN_flyvevabnet_naval_strike_targetting #naval
+	air_accidents_factor = DEN_flyvevabnet_air_accidents #kommando
+	air_agility_factor = DEN_flyvevabnet_air_agility #skolen
+	ground_attack_factor = DEN_flyvevabnet_ground_attack #cas
+	air_night_penalty = DEN_flyvevabnet_air_night_penalty #kommando
+	air_weather_penalty = DEN_flyvevabnet_air_weather_penalty #kommando
+}
+DEN_flyvevabnet_dynamic_modifier_max_improved = { #Make sure to change all effects for all 3 versions
+	enable = { always = yes }
+	icon = GFX_idea_DEN_flyvevabnet_3
+
+	air_bombing_targetting = DEN_flyvevabnet_air_bombing_targetting #bombers
+	air_ace_generation_chance_factor = DEN_flyvevabnet_ace_generation_chance #skolen
+	air_strategic_bomber_bombing_factor = DEN_flyvevabnet_strategic_bomber #bombers
+	air_escort_efficiency = DEN_flyvevabnet_escort_efficiency #fighter
+	air_intercept_efficiency = DEN_flyvevabnet_intercept_efficiency #fighter
+	air_cas_efficiency = DEN_flyvevabnet_cas_efficiency #cas
+	air_mission_efficiency = DEN_flyvevabnet_mission_efficiency #skolen
+	naval_strike_targetting_factor = DEN_flyvevabnet_naval_strike_targetting #naval
+	air_accidents_factor = DEN_flyvevabnet_air_accidents #kommando
+	air_agility_factor = DEN_flyvevabnet_air_agility #skolen
+	ground_attack_factor = DEN_flyvevabnet_ground_attack #cas
+	air_night_penalty = DEN_flyvevabnet_air_night_penalty #kommando
+	air_weather_penalty = DEN_flyvevabnet_air_weather_penalty #kommando
+}
+#### STATE MODIFIERS ####
+DEN_development_projects_state_modifier = {
+	enable = { always = yes }
+	icon = GFX_modifiers_ETH_state_development #TODO_DANNE CHANGE!
+
+	remove_trigger = {
+		ROOT = { NOT = { is_core_of = ROOT.controller } } # ROOT refers to the state on which the modifier is added
+	}
+
+	state_production_speed_industrial_complex_factor = 0.15
+	state_production_speed_synthetic_refinery_factor = 0.15
+	state_production_speed_infrastructure_factor = 0.15
+	state_production_speed_rail_way_factor = 0.15
+	local_building_slots = 2
+}
+
+DEN_development_projects_mainland_state_modifier = {
+	enable = { always = yes }
+	icon = GFX_modifiers_ETH_state_development #TODO_DANNE CHANGE!
+
+	remove_trigger = {
+		ROOT = { NOT = { is_core_of = ROOT.controller } } # ROOT refers to the state on which the modifier is added
+	}
+
+	state_production_speed_industrial_complex_factor = 0.1
+	state_production_speed_synthetic_refinery_factor = 0.1
+	state_production_speed_infrastructure_factor = 0.1
+	state_production_speed_rail_way_factor = 0.1
+	local_building_slots = 2
+}
+
+DEN_military_projects_state_modifier = {
+	enable = { always = yes }
+	icon = GFX_modifiers_generic_military_industry #TODO_DANNE CHANGE!
+
+	remove_trigger = {
+		ROOT = { NOT = { is_core_of = ROOT.controller } } # ROOT refers to the state on which the modifier is added
+	}
+
+	state_production_speed_arms_factory_factor = 0.1
+	state_production_speed_dockyard_factor = 0.1
+	state_production_speed_air_base_factor = 0.1
+	state_production_speed_naval_base_factor = 0.1
+	state_production_speed_supply_node_factor = 0.1
+}
+
+DEN_home_guard_state_modifier = {
+	enable = { always = yes }
+	icon = GFX_modifiers_generic_military_plans #TODO_DANNE CHANGE!
+
+	remove_trigger = {
+		ROOT = { NOT = { is_core_of = ROOT.controller } } # ROOT refers to the state on which the modifier is added
+	}
+
+	army_core_attack_factor = 0.05
+	army_core_defence_factor = 0.1
+	dig_in_speed_factor = 0.2
+	max_dig_in_factor = 0.1
+	recon_factor = 0.1
+	enemy_army_speed_factor = -0.1
+	enemy_local_supplies = -0.1
+	enemy_attrition = 0.1
+}
+
+DEN_pan_scandinavianism_modifier = {
+	enable = { always = yes }
+	icon = GFX_modifiers_generic_military_plans #TODO_DANNE CHANGE!
+
+	remove_trigger = {
+		ROOT = { NOT = { is_controlled_by = ROOT.owner } } # ROOT refers to the state on which the modifier is added
+	}
+
+	non_core_manpower = 0.25
+	local_resources_factor = 0.15
+	production_speed_industrial_complex_factor = 0.1
+	production_speed_infrastructure_factor = 0.1
+	production_speed_arms_factory_factor = 0.1
+	dig_in_speed_factor = 0.1
+	max_dig_in_factor = 0.1
+	compliance_growth = 0.1
+}
+
+
+
+
+###################################################################################################
+###################################################################################################
+###################################################################################################
+
+######## #### ##    ## ##          ###    ##    ## ########  
+##        ##  ###   ## ##         ## ##   ###   ## ##     ## 
+##        ##  ####  ## ##        ##   ##  ####  ## ##     ## 
+######    ##  ## ## ## ##       ##     ## ## ## ## ##     ## 
+##        ##  ##  #### ##       ######### ##  #### ##     ## 
+##        ##  ##   ### ##       ##     ## ##   ### ##     ## 
+##       #### ##    ## ######## ##     ## ##    ## ########  
+
+###################################################################################################
+###################################################################################################
+###################################################################################################
+
+
+#############################
+##### NATIONAL SPIRITS ######
+#############################
+
+
+FIN_finnish_army = {
+	enable = { always = yes }
+
+	icon = GFX_idea_FIN_finnish_army
+
+	experience_gain_army_factor = FIN_finnish_army_experience_gain_army_factor #0.05
+	land_reinforce_rate = FIN_finnish_army_land_reinforce_rate #0.05
+	acclimatization_cold_climate_gain_factor = FIN_finnish_army_acclimatization_cold_climate_gain_factor #0.05
+	army_spirit_category_type_cost_factor = FIN_finnish_army_army_spirit_category_type_cost_factor #-0.1
+
+	#LATER MODIFIERS
+	custom_modifier_tooltip = FIN_finnish_army_dynamic_modifier_tt #Bonuses applied via hidden NS or tech (molotov_cocktails_tech)
+	dig_in_speed_factor = FIN_finnish_army_dig_in_speed_factor #0.05
+	max_dig_in_factor = FIN_finnish_army_max_dig_in_factor #0.1
+	training_time_factor = FIN_finnish_army_training_time_factor #-0.1
+	mobilization_speed = FIN_finnish_army_mobilization_speed #0.1
+	conscription_factor = FIN_finnish_army_conscription_factor #0.1
+	cas_damage_reduction = FIN_finnish_army_cas_damage_reduction #0.15
+	winter_attrition_factor = FIN_finnish_army_winter_attrition_factor #-0.15
+	army_org_factor = FIN_finnish_army_army_org_factor #0.1
+	special_forces_cap = FIN_finnish_army_special_forces_cap #0.15
+	breakthrough_factor = FIN_finnish_army_breakthrough_factor #0.05
+	special_forces_out_of_supply_factor = FIN_finnish_army_special_forces_out_of_supply_factor #-0.1
+	equipment_capture_factor = FIN_finnish_army_equipment_capture_factor #0.3
+	equipment_conversion_speed = FIN_finnish_army_equipment_conversion_speed #0.3
+	production_lack_of_resource_penalty_factor = FIN_finnish_army_production_lack_of_resource_penalty_factor #-0.15
+	supply_combat_penalties_on_core_factor = FIN_finnish_army_supply_combat_penalties_on_core_factor #-0.15
+	org_loss_when_moving = FIN_finnish_army_org_loss_when_moving #-0.15
+	recon_factor_while_entrenched = FIN_finnish_army_recon_factor_while_entrenched #0.1
+	army_attack_speed_factor = FIN_finnish_army_army_attack_speed_factor #0.1
+	intel_from_combat_factor = FIN_finnish_army_intel_from_combat_factor #0.1
+	initiative_factor = FIN_finnish_army_initiative_factor #0.02
+	modifier_army_sub_unit_long_range_patrol_support_attack_factor = FIN_finnish_army_modifier_army_sub_unit_long_range_patrol_support_attack_factor
+	modifier_army_sub_unit_long_range_patrol_support_defence_factor = FIN_finnish_army_modifier_army_sub_unit_long_range_patrol_support_defence_factor
+}
+
+FIN_finnish_airforce = {
+	enable = { always = yes }
+
+	icon = GFX_idea_FIN_finnish_airforce #Needs to match any hidden NS associated to this, such as FIN_hidden_cas_production_ns, FIN_hidden_fighter_production_ns and FIN_hidden_naval_bomber_production_ns
+
+	experience_gain_air_factor = FIN_finnish_airforce_experience_gain_air_factor #0.05
+	air_weather_penalty = FIN_finnish_airforce_air_weather_penalty #-0.05
+	air_untrained_pilots_penalty_factor = FIN_finnish_airforce_air_untrained_pilots_penalty_factor #-0.2
+	air_spirit_category_type_cost_factor = FIN_finnish_airforce_air_spirit_category_type_cost_factor #-0.1
+
+	#LATER MODIFIERS
+	custom_modifier_tooltip = FIN_finnish_airforce_dynamic_modifier_tt #Bonuses applied via hidden NS (FIN_hidden_cas_production_ns, FIN_hidden_fighter_production_ns, FIN_hidden_naval_bomber_production_ns)
+	air_ace_generation_chance_factor = FIN_finnish_airforce_air_ace_generation_chance_factor #0.1
+	air_home_defence_factor = FIN_finnish_airforce_air_home_defence_factor #0.1
+	ace_effectiveness_factor = FIN_finnish_airforce_ace_effectiveness_factor #0.1
+	air_mission_efficiency = FIN_finnish_airforce_air_mission_efficiency #0.05
+	naval_strike_targetting_factor = FIN_finnish_airforce_naval_strike_targetting_factor #0.1
+	air_cas_efficiency = FIN_finnish_airforce_air_cas_efficiency #0.1
+	air_superiority_efficiency = FIN_finnish_airforce_air_superiority_efficiency #0.1
+}
+
+FIN_finnish_navy = {
+	enable = { always = yes }
+
+	icon = GFX_idea_FIN_finnish_navy #Needs to match any hidden NS associated to this, such as FIN_hidden_dd_and_coastal_defense_production_ns and FIN_hidden_dd_and_coastal_defense_production_ns_no_mtg
+
+	experience_gain_navy_factor = FIN_finnish_navy_experience_gain_navy_factor #0.05
+	mines_planting_by_fleets_factor = FIN_finnish_navy_mines_planting_by_fleets_factor #0.05
+	navy_anti_air_attack_factor = FIN_finnish_navy_navy_anti_air_attack_factor #0.05
+	navy_spirit_category_type_cost_factor = FIN_finnish_navy_navy_spirit_category_type_cost_factor #-0.1
+
+	#LATER MODIFIERS
+	custom_modifier_tooltip = FIN_finnish_navy_dynamic_modifier_tt #Bonuses applied via hidden NS (FIN_hidden_cas_production_ns, FIN_hidden_fighter_production_ns, FIN_hidden_naval_bomber_production_ns)
+	convoy_retreat_speed = FIN_finnish_navy_convoy_retreat_speed #0.1
+	refit_speed = FIN_finnish_navy_refit_speed #0.1
+	spotting_chance = FIN_finnish_navy_spotting_chance #0.05
+	repair_speed_factor = FIN_finnish_navy_repair_speed_factor #0.1
+	production_speed_dockyard_factor = FIN_finnish_navy_production_speed_dockyard_factor #0.1
+	industrial_capacity_dockyard = FIN_finnish_navy_industrial_capacity_dockyard #0.1
+	extra_marine_supply_grace = FIN_finnish_navy_extra_marine_supply_grace #48
+	naval_invasion_capacity = FIN_finnish_navy_naval_invasion_capacity #15
+	naval_mines_effect_reduction = FIN_finnish_navy_naval_mines_effect_reduction #0.15
+	experience_gain_navy_unit_factor = FIN_finnish_navy_experience_gain_navy_unit_factor #0.1
+	naval_coordination = FIN_finnish_navy_naval_coordination #0.05
+	naval_equipment_upgrade_xp_cost = FIN_finnish_navy_naval_equipment_upgrade_xp_cost #-0.1
+}
+
+FIN_fascist_regime = {
+	enable = { always = yes }
+
+	icon = GFX_idea_FIN_a_fascist_regime
+
+	war_support_factor = FIN_fascist_regime_war_support_factor #0.05
+	send_volunteer_size = FIN_fascist_regime_send_volunteer_size #3
+
+	#LATER MODIFIERS
+	army_org_factor = FIN_fascist_regime_army_org_factor #0.05
+	max_command_power = FIN_fascist_regime_max_command_power #25
+	special_forces_cap = FIN_fascist_regime_special_forces_cap #0.3
+	special_forces_no_supply_grace = FIN_fascist_regime_special_forces_no_supply_grace #24
+	special_forces_out_of_supply_factor = FIN_fascist_regime_special_forces_out_of_supply_factor #-0.15
+	special_forces_attack_factor = FIN_fascist_regime_special_forces_attack_factor #0.10
+	special_forces_training_time_factor = FIN_fascist_regime_special_forces_training_time_factor #0.2
+	justify_war_goal_time = FIN_fascist_regime_justify_war_goal_time # -0.35
+	military_industrial_organization_research_bonus = FIN_fascist_regime_military_industrial_organization_research_bonus #0.1
+	consumer_goods_factor = FIN_fasicst_regime_consumer_goods_factor #-0.1
+}
+
+
+############################
+##### STATE MODIFIERS ######
+############################
+
+FIN_mannerheim_line_expansion_modifier = {
+	enable = { always = yes }
+	icon = GFX_modifiers_SOV_civilian_labor_in_defense
+
+	remove_trigger = {
+		ROOT = { NOT = { is_core_of = ROOT.controller } } # ROOT refers to the state on which the modifier is added
+	}
+
+	army_core_defence_factor = 0.05
+	production_speed_bunker_factor = 0.1
+	production_speed_coastal_bunker_factor = 0.1
+	local_supplies = 0.1
+}
+
+FIN_motti_tactics_modifier = { #Gets removed via on_action
+	enable = { always = yes }
+	icon = GFX_modifiers_FIN_motti_tactics_modifier
+
+	army_speed_factor_for_controller = 0.15
+	attrition_for_controller = -0.1
+	local_supplies_for_controller = 0.15
+
+	equipment_capture_for_controller = 0.5
+	#equipment_capture_factor_for_controller = 0.1 #TODO_Manu: Potentially not necessary
+	enemy_army_speed_factor = -0.15
+	enemy_local_supplies = -0.15
+	enemy_attrition = 0.15
+	enemy_truck_attrition_factor = 0.15
+}
+
+FIN_weapon_caches_modifier = { #Gets removed via on_action
+	enable = { always = yes }
+	icon = GFX_modifiers_FIN_weapon_caches
+
+	starting_compliance = -0.5
+	resistance_decay = -0.5
+	resistance_target = 0.15
+	resistance_damage_to_garrison = 0.35
+	resistance_garrison_penetration_chance = 0.25
+	local_non_core_supply_impact_factor = 0.25
+}
+
+FIN_anti_soviet_sentiment = {
+	enable = { always = yes }
+	icon = GFX_modifiers_generic_fascist_corporatism
+
+	local_factory_sabotage = 0.1
+	local_manpower = -0.2
+	local_supplies = -0.2
+	state_resources_factor = -0.2
+}
+
+FIN_confederation_of_finno_russian_republics_dm = {
+	enable = { always = yes }
+	icon = GFX_modifiers_bul_arranged_territorial_expansion
+
+	compliance_gain = 0.25
+}
+
+
+###########################################################
+###########################################################
+###########################################################
+
+    ##    ##  #######  ########  ########  ####  ######  
+    ###   ## ##     ## ##     ## ##     ##  ##  ##    ## 
+    ####  ## ##     ## ##     ## ##     ##  ##  ##       
+    ## ## ## ##     ## ########  ##     ##  ##  ##       
+    ##  #### ##     ## ##   ##   ##     ##  ##  ##       
+    ##   ### ##     ## ##    ##  ##     ##  ##  ##    ## 
+    ##    ##  #######  ##     ## ########  ####  ######  
+
+###########################################################
+###########################################################
+###########################################################
+
+############################
+##### STATE MODIFIERS ######
+############################
+
+NORDIC_efficient_resource_extraction = {
+	enable = { always = yes }
+	icon = GFX_modifiers_ETH_state_development  #TODO_Carlo:  change this later 
+	
+	state_resources_factor = 0.1
+}
+
+NORDIC_military_industry_hub_leader_dmod = {
+	enable = { always = yes }
+	icon = GFX_modifiers_ETH_state_development  #TODO_Carlo: Change this later 
+
+	production_speed_arms_factory_factor = 0.3
+}
+
+NORDIC_military_industry_hub_member_dmod = {
+	enable = { always = yes }
+	icon = GFX_modifiers_ETH_state_development  #TODO_Carlo: Change this later 
+
+	production_speed_arms_factory_factor = 0.2
+}
+
+############################
+#### COUNTRY MODIFIERS #####
+############################
+
+NORDIC_airforces_originator_dmod = {
+	enable = { always = yes }
+	icon = GFX_idea_generic_air_bonus
+
+	experience_gain_air = 0.2
+	air_cas_present_factor = NORDIC_airforces_originator_dmod_cas_factor #0.25
+	air_strategic_bomber_bombing_factor = NORDIC_airforces_originator_dmod_strat_bombing_factor #0.35 
+	air_intercept_efficiency = NORDIC_airforces_originator_dmod_intercept_efficiency #0.25
+	air_superiority_efficiency = NORDIC_airforces_originator_dmod_superiority_efficiency #0.25
+	air_range_factor = NORDIC_airforces_originator_dmod_range_factor # 0.3
+	production_speed_air_base_factor = NORDIC_airforces_originator_dmod_air_base_production # 0.3
+	air_accidents_factor = NORDIC_airforces_originator_dmod_air_accidents_factor # -0.4
+	custom_modifier_tooltip = NORDIC_airforces_dmod_production_cost_TT
+	custom_modifier_tooltip = NORDIC_airforces_dmod_naval_TT
+}
+
+NORDIC_airforces_member_dmod = {
+	enable = { always = yes }
+	icon = GFX_idea_generic_air_bonus
+
+	experience_gain_air = 0.1
+	air_cas_present_factor = NORDIC_airforces_member_dmod_cas_factor #0.15
+	air_strategic_bomber_bombing_factor = NORDIC_airforces_member_dmod_strat_bombing_factor #0.2 
+	air_intercept_efficiency = NORDIC_airforces_member_dmod_intercept_efficiency #0.15
+	air_superiority_efficiency = NORDIC_airforces_member_dmod_superiority_efficiency #0.15
+	air_range_factor = NORDIC_airforces_member_dmod_range_factor # 0.2
+	production_speed_air_base_factor = NORDIC_airforces_member_dmod_air_base_production # 0.2
+	air_accidents_factor =  NORDIC_airforces_member_dmod_air_accidents_factor # -0.25
+	custom_modifier_tooltip = NORDIC_airforces_dmod_production_cost_TT # 0.15
+	custom_modifier_tooltip = NORDIC_airforces_dmod_naval_TT #0.2
+}
+
+NORDIC_navy_originator_dmod = {
+	enable = { always = yes }
+	icon = GFX_idea_generic_navy_bonus
+
+	experience_gain_navy = 0.2
+	naval_doctrine_cost_factor = NORDIC_navy_originator_dmod_naval_doctrine_cost_factor #-0.10
+	repair_speed_factor = NORDIC_navy_originator_dmod_naval_repair_speed_factor # 0.35
+	navy_leader_cost_factor = NORDIC_navy_originator_dmod_navy_leader_cost_factor # - 0.30
+}
+
+NORDIC_navy_member_dmod = {
+	enable = { always = yes }
+	icon = GFX_idea_generic_navy_bonus
+
+	experience_gain_navy = 0.1
+	naval_doctrine_cost_factor = NORDIC_navy_member_dmod_naval_doctrine_cost_factor # -0.075
+	repair_speed_factor = NORDIC_navy_member_dmod_naval_repair_speed_factor # 0.25
+	navy_leader_cost_factor = NORDIC_navy_member_dmod_navy_leader_cost_factor # -0.2
+}
+
+NORDIC_mil_industry_originator_dmod = {
+	enable = { always = yes }
+	icon = GFX_idea_generic_production_bonus
+
+	production_factory_max_efficiency_factor = 0.1
+	production_speed_arms_factory_factor = NORDIC_mil_industry_originator_production_speed_arms_factory_factor # 0.15
+	production_factory_efficiency_gain_factor = NORDIC_mil_industry_originator_dmod_efficiency_gain_factor # 0.2
+	equipment_conversion_speed = NORDIC_mil_industry_originator_dmod_equipment_conversion_speed # 0.25 
+	production_factory_start_efficiency_factor = NORDIC_mil_industry_originator_dmod_start_efficiency_factor # 0.2
+}
+
+NORDIC_mil_industry_member_dmod = {
+	enable = { always = yes }
+	icon = GFX_idea_generic_production_bonus
+
+	production_factory_max_efficiency_factor = 0.1
+	production_speed_arms_factory_factor = NORDIC_mil_industry_member_production_speed_arms_factory_factor # 0.1
+	production_factory_efficiency_gain_factor = NORDIC_mil_industry_member_dmod_efficiency_gain_factor # 0.1
+	equipment_conversion_speed = NORDIC_mil_industry_member_dmod_equipment_conversion_speed # 0.15
+	production_factory_start_efficiency_factor = NORDIC_mil_industry_member_dmod_start_efficiency_factor # 0.1
+}
+
+
+NORDIC_democratic_alliance_leader_dmod = {
+	enable = { always = yes }
+	icon = GFX_idea_NORDIC_nordic_council
+
+	democratic_drift = 0.025
+	production_speed_buildings_factor = 0.15
+	consumer_goods_factor = 0.2
+	research_speed_factor = NORDIC_democratic_alliance_leader_dmod_research # 0.075 
+	training_time_factor = NORDIC_democratic_alliance_leader_dmod_training_time # 0.12
+	production_factory_start_efficiency_factor = NORDIC_democratic_alliance_leader_dmod_prod_eff_start # 0.2
+	war_support_factor = NORDIC_democratic_alliance_leader_dmod_war_support # -0.15
+}
+
+NORDIC_democratic_alliance_member_dmod = {
+	enable = { always = yes }
+	icon = GFX_idea_NORDIC_nordic_council
+
+	democratic_drift = 0.015
+	production_speed_buildings_factor = 0.10
+	consumer_goods_factor = 0.12
+	research_speed_factor = NORDIC_democratic_alliance_member_dmod_research # 0.05 
+	training_time_factor = NORDIC_democratic_alliance_member_dmod_training_time # 0.08
+	production_factory_start_efficiency_factor = NORDIC_democratic_alliance_member_dmod_prod_eff_start # 0.15	
+	war_support_factor = NORDIC_democratic_alliance_member_dmod_war_support # -0.1
+}
+
+NORDIC_communist_alliance_leader_dmod = {
+	enable = { always = yes }
+	icon = GFX_idea_NORDIC_northern_union
+
+	communism_drift = 0.025
+	weekly_manpower = 350
+	dig_in_speed_factor = -0.15
+	production_factory_max_efficiency_factor = NORDIC_communist_alliance_leader_dmod_max_eff # 0.15
+	max_planning_factor = NORDIC_communist_alliance_leader_dmod_max_planning # -0.1
+	research_speed_factor = NORDIC_communist_alliance_leader_dmod_research # 0.075
+	production_lack_of_resource_penalty_factor = NORDIC_communist_alliance_leader_dmod_resource_penalty # 0.1
+}
+
+NORDIC_communist_alliance_member_dmod = {
+	enable = { always = yes }
+	 icon = GFX_idea_NORDIC_northern_union
+
+	communism_drift = 0.015
+	weekly_manpower = 200
+	dig_in_speed_factor = -0.10
+	production_factory_max_efficiency_factor = NORDIC_democratic_alliance_member_dmod_max_eff # 0.1
+	max_planning_factor = NORDIC_communist_alliance_member_dmod_max_planning # -0.08
+	research_speed_factor = NORDIC_communist_alliance_member_dmod_research # 0.05
+	production_lack_of_resource_penalty_factor = NORDIC_communist_alliance_member_dmod_resource_penalty # 0.06
+}
+NORDIC_monarchist_alliance_leader_dmod = {	
+	enable = { always = yes }
+	 icon = GFX_idea_NORDIC_kalmar_league
+
+	neutrality_drift = 0.015
+	political_power_gain = 0.7
+	research_speed_factor = -0.03
+	production_factory_efficiency_gain_factor = NORDIC_monarchist_alliance_leader_dmod_prod_eff_gain # 0.25
+	production_speed_buildings_factor = NORDIC_monarchist_alliance_leader_dmod_construction # -0.1
+	army_org_factor = NORDIC_monarchist_alliance_leader_dmod_max_org # 0.2
+	fascism_drift = NORDIC_monarchist_alliance_leader_dmod_drift_defense # -0.15 
+}
+
+NORDIC_monarchist_alliance_member_dmod = {	
+	enable = { always = yes }
+	icon = GFX_idea_NORDIC_kalmar_league
+
+	neutrality_drift = 0.015
+	political_power_gain = 0.4
+	research_speed_factor = -0.02
+	production_factory_efficiency_gain_factor = NORDIC_monarchist_alliance_member_dmod_prod_eff_gain # 0.17
+	production_speed_buildings_factor = NORDIC_monarchist_alliance_member_dmod_construction # -0.7
+	army_org_factor = NORDIC_monarchist_alliance_member_dmod_max_org # 0.12
+	fascism_drift = NORDIC_monarchist_alliance_member_dmod_drift_defense # -0.1  
+}
\ No newline at end of file
diff --git a/common/dynamic_modifiers/bba_dynamic_modifiers.txt b/common/dynamic_modifiers/bba_dynamic_modifiers.txt
index a56d48159f6..c2d7c9a4faf 100644
--- a/common/dynamic_modifiers/bba_dynamic_modifiers.txt
+++ b/common/dynamic_modifiers/bba_dynamic_modifiers.txt
@@ -1339,12 +1339,12 @@ ITA_established_mafia = {
 
 ITA_novus_ordo_modifier = {
 	enable = { always = yes  }
-	icon = modifiers_generic_military_industry
+	icon = GFX_modifiers_generic_military_industry
 	local_non_core_manpower = 0.25
 	local_resources_factor = 0.15
 	compliance_growth = 0.1
 	resistance_decay = 0.05
-	production_speed_arms_factory_factor = 0.2
+	state_production_speed_arms_factory_factor = 0.2
 	local_factories = 0.5
 }
 
diff --git a/common/equipment_groups/mio_equipment_groups.txt b/common/equipment_groups/mio_equipment_groups.txt
new file mode 100644
index 00000000000..912c8ed13f1
--- /dev/null
+++ b/common/equipment_groups/mio_equipment_groups.txt
@@ -0,0 +1,209 @@
+
+
+########    ###    ##    ## ##    ##     ######   ########   #######  ##     ## ########   ######  
+   ##      ## ##   ###   ## ##   ##     ##    ##  ##     ## ##     ## ##     ## ##     ## ##    ## 
+   ##     ##   ##  ####  ## ##  ##      ##        ##     ## ##     ## ##     ## ##     ## ##       
+   ##    ##     ## ## ## ## #####       ##   #### ########  ##     ## ##     ## ########   ######  
+   ##    ######### ##  #### ##  ##      ##    ##  ##   ##   ##     ## ##     ## ##              ## 
+   ##    ##     ## ##   ### ##   ##     ##    ##  ##    ##  ##     ## ##     ## ##        ##    ## 
+   ##    ##     ## ##    ## ##    ##     ######   ##     ##  #######   #######  ##         ######  
+
+
+mio_cat_eq_all_light_tank = { #Includes (standalone) Amphibious Tank Chassis
+	equipment_type = {
+		light_tank_chassis
+		amphibious_tank_chassis
+	}	
+}
+
+mio_cat_eq_all_medium_tank = { #Includes Modern Tank Chassis
+	equipment_type = {
+		medium_tank_chassis
+		modern_tank_chassis
+	}
+}
+
+mio_cat_eq_all_heavy_tank = { #Includes Super Heavy Tank Chassis
+	equipment_type = {
+		heavy_tank_chassis
+		super_heavy_tank_chassis
+	}
+}
+
+mio_cat_eq_all_main_battle_tank = { #Includes Medium Tank Chassis
+	# Same as medium, used for unique icon
+	equipment_type = {
+		medium_tank_chassis
+		modern_tank_chassis
+	}
+}
+
+mio_cat_eq_all_super_heavy_tank = { #Includes Heavy Tank Chassis
+	# Same as heavy, used for unique icon
+	equipment_type = {
+		heavy_tank_chassis
+		super_heavy_tank_chassis
+	}
+}
+
+mio_cat_eq_all_tank_destroyers = { #Includes Super Heavy Tank Chassis
+	equipment_type = {
+		light_tank_destroyer_chassis 
+		medium_tank_destroyer_chassis
+		heavy_tank_destroyer_chassis
+		super_heavy_tank_destroyer_chassis
+		modern_tank_destroyer_chassis
+	}
+}
+
+mio_cat_eq_all_amphibious_tank = { #Amphibious Tanks (EAW SPECIFIC)
+	equipment_type = {
+		amphibious_tank_chassis
+		light_tank_amphibious_chassis
+		medium_tank_amphibious_chassis
+		heavy_tank_amphibious_chassis
+		modern_tank_amphibious_chassis
+	}
+}
+
+
+ ######  ##     ## #### ########      ######   ########   #######  ##     ## ########   ######  
+##    ## ##     ##  ##  ##     ##    ##    ##  ##     ## ##     ## ##     ## ##     ## ##    ## 
+##       ##     ##  ##  ##     ##    ##        ##     ## ##     ## ##     ## ##     ## ##       
+ ######  #########  ##  ########     ##   #### ########  ##     ## ##     ## ########   ######  
+      ## ##     ##  ##  ##           ##    ##  ##   ##   ##     ## ##     ## ##              ## 
+##    ## ##     ##  ##  ##           ##    ##  ##    ##  ##     ## ##     ## ##        ##    ## 
+ ######  ##     ## #### ##            ######   ##     ##  #######   #######  ##         ######  
+
+mio_cat_eq_all_carrier = { #Includes all CV --- Used due to custom loc capabilities
+	equipment_type = {
+		ship_hull_carrier
+	}
+}
+
+mio_cat_eq_all_cruiser = { #Includes all Cruiser (CA, CL, Coastal Defense, Torpedo Cruiser, Panzerschiff) --- Used due to custom loc capabilities
+	equipment_type = {
+		ship_hull_cruiser
+	}
+}
+
+mio_cat_eq_all_destroyer = { #Includes all Destroyers --- Used due to custom loc capabilities (loc for ship_hull_light just sucks)
+	equipment_type = {
+		ship_hull_light
+	}
+}
+
+mio_cat_eq_all_battleship = { #Includes all Battleships (BB, BC, SHBB, Pre-Dreadnought)
+	equipment_type = {
+		ship_hull_heavy
+	}
+}
+
+########  ##          ###    ##    ## ########     ######   ########   #######  ##     ## ########   ######  
+##     ## ##         ## ##   ###   ## ##          ##    ##  ##     ## ##     ## ##     ## ##     ## ##    ## 
+##     ## ##        ##   ##  ####  ## ##          ##        ##     ## ##     ## ##     ## ##     ## ##       
+########  ##       ##     ## ## ## ## ######      ##   #### ########  ##     ## ##     ## ########   ######  
+##        ##       ######### ##  #### ##          ##    ##  ##   ##   ##     ## ##     ## ##              ## 
+##        ##       ##     ## ##   ### ##          ##    ##  ##    ##  ##     ## ##     ## ##        ##    ## 
+##        ######## ##     ## ##    ## ########     ######   ##     ##  #######   #######  ##         ######  
+
+mio_cat_eq_all_small_plane = { #Includes all Small Aircraft (Fighter, CAS, Nav) and CV versions --- Used due to custom loc capabilities
+	equipment_type = {
+		small_plane_airframe
+		cv_small_plane_airframe
+	}
+}
+
+mio_cat_eq_all_medium_plane = { #Includes all Medium Aircraft (Tactical Bomber, Heavy Fighter, Scout) --- Used due to custom loc capabilities
+	equipment_type = {
+		medium_plane_airframe
+	}
+}
+
+mio_cat_eq_all_large_plane = { #Includes all Heavy Aircraft (Strategic Bomber, Maritime Patrol) --- Used due to custom loc capabilities
+	equipment_type = {
+		large_plane_airframe
+	}
+}
+
+mio_cat_eq_all_cv_aircraft = { #Includes all CV aircraft (Fighter, CAS, Nav) --- Needed because plane designer is a gift to us all
+	equipment_type = {
+		cv_small_plane_airframe
+	}
+}
+
+mio_cat_eq_only_light_fighter = { #Includes Small Fighter and CV Fighter (no CAS, no Nav...) --- Needed because plane designer is a gift to us all
+	equipment_type = {
+		small_plane_airframe_0
+		small_plane_airframe_1
+		small_plane_airframe_2
+		small_plane_airframe_3
+		small_plane_airframe_4
+		small_plane_airframe_5
+		cv_small_plane_airframe_0
+		cv_small_plane_airframe_1
+		cv_small_plane_airframe_2
+		cv_small_plane_airframe_3
+		cv_small_plane_airframe_4
+		cv_small_plane_airframe_5
+		fighter_equipment_0
+		fighter_equipment_1
+		fighter_equipment_2
+		fighter_equipment_3
+		cv_fighter_equipment_0
+		cv_fighter_equipment_1
+		cv_fighter_equipment_2
+		cv_fighter_equipment_3
+		jet_fighter_equipment
+		rocket_interceptor_equipment
+	}
+}
+
+mio_cat_eq_only_light_fighter_no_cv = { #Includes only Small Fighter (No CV, no CAS, no Nav...) --- Needed because plane designer is a gift to us all
+	equipment_type = {
+		small_plane_airframe_0
+		small_plane_airframe_1
+		small_plane_airframe_2
+		small_plane_airframe_3
+		small_plane_airframe_4
+		small_plane_airframe_5
+		fighter_equipment_0
+		fighter_equipment_1
+		fighter_equipment_2
+		fighter_equipment_3
+		jet_fighter_equipment
+		rocket_interceptor_equipment
+	}
+}
+
+mio_cat_eq_only_tactical_bomber = { #Includes only Tactical Bomber (Heavy Fighter, No Scout...) --- Needed because plane designer is a gift to us all
+	equipment_type = {
+		medium_plane_airframe_0
+		medium_plane_airframe_1
+		medium_plane_airframe_2
+		medium_plane_airframe_3
+		medium_plane_airframe_4
+		medium_plane_airframe_5
+		tac_bomber_equipment_0
+		tac_bomber_equipment_1
+		tac_bomber_equipment_2
+		tac_bomber_equipment_3
+		jet_tac_bomber_equipment
+	}
+}
+
+mio_cat_eq_only_strategic_bomber = { #Includes only Strategic Bomber (No Maritime Patrol) --- Needed because plane designer is a gift to us all
+	equipment_type = {
+		large_plane_airframe_0
+		large_plane_airframe_1
+		large_plane_airframe_2
+		large_plane_airframe_3
+		large_plane_airframe_4
+		large_plane_airframe_5
+		super_large_plane_airframe_1
+		strat_bomber_equipment_1
+		strat_bomber_equipment_2
+		strat_bomber_equipment_3
+		jet_strat_bomber_equipment
+	}
+}
\ No newline at end of file
diff --git a/common/ideas/zzz_EQS_ideas.txt b/common/ideas/EQS_ideas.txt
similarity index 99%
rename from common/ideas/zzz_EQS_ideas.txt
rename to common/ideas/EQS_ideas.txt
index bcc1730f3e0..dddcb751cca 100644
--- a/common/ideas/zzz_EQS_ideas.txt
+++ b/common/ideas/EQS_ideas.txt
@@ -499,7 +499,7 @@ ideas = {
 			modifier = {
 				stability_factor = 0.1
 				war_support_factor = -0.15
-				consumer_goods_factor = 0.3
+				consumer_goods_factor = 0.6
 				political_power_gain = -0.75
 				research_speed_factor = -0.35
 				lend_lease_tension = 0.5
@@ -528,7 +528,7 @@ ideas = {
 			modifier = {
 				war_support_factor = -0.075
 				stability_factor = 0.07
-				consumer_goods_factor = 0.15
+				consumer_goods_factor = 0.3
 				political_power_gain = -0.2
 				research_speed_factor = -0.15
 				lend_lease_tension = 0.1
@@ -553,7 +553,7 @@ ideas = {
 			picture = EQS_harmonic_stagnation3
 			modifier = {
 				stability_factor = 0.05
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				research_speed_factor = -0.05
 				send_volunteers_tension = 0.65
 				guarantee_tension = 0.1
@@ -849,7 +849,7 @@ ideas = {
 			removal_cost = -1
 			picture = EQS_war_plan_equestria
 			modifier = {
-				consumer_goods_factor = -0.15
+				consumer_goods_factor = -0.3
 				conscription = 0.03
 				conversion_cost_civ_to_mil_factor = -0.15
 				production_speed_arms_factory_factor = 0.15
@@ -874,7 +874,7 @@ ideas = {
 			removal_cost = -1
 			picture = EQS_war_plan_equestria
 			modifier = {
-				consumer_goods_factor = -0.10
+				consumer_goods_factor = -0.2
 				conversion_cost_civ_to_mil_factor = -0.1
 				production_speed_arms_factory_factor = 0.1
 				industrial_capacity_factory = 0.05
@@ -900,7 +900,7 @@ ideas = {
 			picture = EQS_war_plan_equestria
 			modifier = {
 				fascism_drift = 0.01
-				consumer_goods_factor = -0.20
+				consumer_goods_factor = -0.4
 				conscription = 0.05
 				conversion_cost_civ_to_mil_factor = -0.2
 				production_speed_arms_factory_factor = 0.2
@@ -1132,7 +1132,7 @@ ideas = {
 				stability_factor = -0.1
 				conscription = -0.002
 				industrial_capacity_factory = 0.07
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 	}
@@ -1508,7 +1508,7 @@ ideas = {
 			removal_cost = -1
 			picture = FRA_factory_strikes
 			modifier = {
-				consumer_goods_factor = 0.20
+				consumer_goods_factor = 0.4
 				production_speed_buildings_factor = -0.5
 			}
 		}
@@ -1837,7 +1837,7 @@ ideas = {
 			modifier = {
 				local_resources_factor = 0.05
 				production_factory_efficiency_gain_factor = 0.05
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 			}
 		}
 	}
@@ -1915,7 +1915,7 @@ ideas = {
 			modifier = {
 				industry_free_repair_factor = 0.05
 				line_change_production_efficiency_factor = 0.025
-				consumer_goods_factor = -0.005
+				consumer_goods_factor = -0.01
 			}
 		}
 	}
@@ -1951,7 +1951,7 @@ ideas = {
 			removal_cost = -1
 			picture = generic_foreign_capital
 			modifier = {
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 				political_power_gain = -0.15
 			}
 		}
@@ -2133,7 +2133,7 @@ ideas = {
 				army_core_defence_factor = -0.05
 				land_night_attack = -0.15
 				political_power_gain = -0.05
-				consumer_goods_factor = 0.02
+				consumer_goods_factor = 0.04
 			}
 		}
 	}
@@ -2156,7 +2156,7 @@ ideas = {
 				army_core_defence_factor = -0.025
 				land_night_attack = -0.10
 				political_power_gain = -0.025
-				consumer_goods_factor = 0.01
+				consumer_goods_factor = 0.02
 			}
 		}
 	}
diff --git a/common/ideas/ZZZ_WAR_ideas.txt b/common/ideas/ZZZ_WAR_ideas.txt
index c6d95d03488..4b96799dcc8 100644
--- a/common/ideas/ZZZ_WAR_ideas.txt
+++ b/common/ideas/ZZZ_WAR_ideas.txt
@@ -58,7 +58,7 @@ ideas = {
 			
 			modifier = {
 				production_speed_buildings_factor = 0.05
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				production_factory_max_efficiency_factor = 0.05
 			}
 			targeted_modifier = {
@@ -85,7 +85,7 @@ ideas = {
 			
 			modifier = {
 				production_speed_buildings_factor = 0.1
-				consumer_goods_factor = -0.1
+				consumer_goods_factor = -0.2
 				production_factory_max_efficiency_factor = 0.1
 			}
 			targeted_modifier = {
@@ -113,7 +113,7 @@ ideas = {
 			
 			modifier = {
 				production_speed_buildings_factor = 0.15
-				consumer_goods_factor = -0.15
+				consumer_goods_factor = -0.3
 				production_factory_max_efficiency_factor = 0.15
 			}
 			targeted_modifier = {
@@ -135,7 +135,7 @@ ideas = {
 			}
 			
 			modifier = {
-				consumer_goods_factor = 0.15
+				consumer_goods_factor = 0.3
 				political_power_cost = 0.1
 				industrial_capacity_factory = -0.025
 				research_speed_factor = -0.05
@@ -155,7 +155,7 @@ ideas = {
 			}
 			
 			modifier = {
-				consumer_goods_factor = 0.1
+				consumer_goods_factor = 0.2
 				political_power_cost = 0.05
 				research_speed_factor = -0.05
 			}
@@ -173,7 +173,7 @@ ideas = {
 			}
 			
 			modifier = {
-				consumer_goods_factor = 0.1
+				consumer_goods_factor = 0.2
 				war_support_weekly = 0.005
 				stability_weekly = 0.005
 			}
@@ -408,7 +408,7 @@ ideas = {
 			
 			modifier = {
 				production_speed_buildings_factor = 0.15
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 		WAR_foreign_corporation_tax = {
@@ -428,7 +428,7 @@ ideas = {
 				production_factory_max_efficiency_factor = 0.05
 				production_lack_of_resource_penalty_factor = -0.25
 				local_resources_factor = 0.25
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 			}
 		}
 		WAR_a_desperate_defense = {
@@ -613,7 +613,7 @@ ideas = {
 			
 			modifier = {
 				production_speed_buildings_factor = 0.05
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				production_factory_max_efficiency_factor = 0.05
 			}
 		}
diff --git a/common/ideas/_economic.txt b/common/ideas/_economic.txt
index bbe9cd0a32e..cd89c2a3604 100644
--- a/common/ideas/_economic.txt
+++ b/common/ideas/_economic.txt
@@ -43,7 +43,7 @@ ideas = {
 			removal_cost = -1
 
 			modifier = {
-				consumer_goods_factor = 0.50
+				consumer_goods_expected_value = 0.50
 				production_speed_industrial_complex_factor = -0.5
 				production_speed_arms_factory_factor = -0.5
 				production_speed_dockyard_factor = -0.5
@@ -142,7 +142,7 @@ ideas = {
 			removal_cost = -1
 
 			modifier = {
-				consumer_goods_factor = 0.4
+				consumer_goods_expected_value = 0.4
 				production_speed_industrial_complex_factor = -0.4
 				production_speed_arms_factory_factor = -0.4
 				production_speed_dockyard_factor = -0.4
@@ -151,6 +151,7 @@ ideas = {
 				generate_wargoal_tension = 1.00
 				join_faction_tension = 0.20
 				send_volunteers_tension = 0.20
+				lend_lease_tension = 0.10
 				guarantee_tension = 0.5
 				max_fuel_factor = -0.35
 				fuel_gain_factor = -0.5
@@ -176,7 +177,7 @@ ideas = {
 			removal_cost = -1
 
 			modifier = {
-				consumer_goods_factor = 0.40
+				consumer_goods_expected_value = 0.40
 				production_speed_industrial_complex_factor = -0.40
 				production_speed_arms_factory_factor = -0.40
 				conversion_cost_civ_to_mil_factor= 0.40
@@ -205,7 +206,7 @@ ideas = {
 			removal_cost = -1
 
 			modifier = {
-				consumer_goods_factor = 0.20
+				consumer_goods_expected_value = 0.20
                 fuel_gain_factor = 0.20
                 industrial_capacity_factory = 0.20
                 production_speed_industrial_complex_factor = -0.20
@@ -233,7 +234,7 @@ ideas = {
 			removal_cost = -1
 
 			modifier = {
-				consumer_goods_factor = 0.25
+				consumer_goods_expected_value = 0.25
                 fuel_gain_factor = -0.10
                 industrial_capacity_factory = -0.10
 				production_factory_efficiency_gain_factor = -0.10
@@ -270,7 +271,7 @@ ideas = {
 			removal_cost = -1
 
 			modifier = {
-				consumer_goods_factor = 0.25
+				consumer_goods_expected_value = 0.25
 			}
 			default = no
 
@@ -295,7 +296,7 @@ ideas = {
 			removal_cost = -1
 
 			modifier = {
-				consumer_goods_factor = 0.20
+				consumer_goods_expected_value = 0.20
 				production_speed_arms_factory_factor = -0.10
 				production_speed_industrial_complex_factor = 0.15
 				production_speed_infrastructure_factor = 0.20
@@ -327,7 +328,7 @@ ideas = {
 			modifier = {
 				stability_factor = -0.1
 				war_support_factor = -0.1
-				consumer_goods_factor = 0.20
+				consumer_goods_expected_value = 0.20
 				production_speed_buildings_factor = 0.10
 			}
 			default = no
@@ -356,7 +357,7 @@ ideas = {
 				stability_factor = -0.25
 				war_support_factor = -0.25
 				political_power_gain = -0.2
-				consumer_goods_factor = 0.20
+				consumer_goods_expected_value = 0.20
 				production_speed_buildings_factor = 0.10
 				local_resources_factor = 0.15
 			}
@@ -386,7 +387,7 @@ ideas = {
 				stability_factor = -0.15
 				war_support_factor = -0.15
 				political_power_gain = -0.1
-				consumer_goods_factor = 0.15
+				consumer_goods_expected_value = 0.15
 				production_speed_buildings_factor = 0.2
 				local_resources_factor = 0.25
 			}
@@ -415,7 +416,7 @@ ideas = {
 			removal_cost = -1
 
 			modifier = {
-				consumer_goods_factor = 0.15
+				consumer_goods_expected_value = 0.15
 				production_speed_arms_factory_factor = 0.1
 				conversion_cost_civ_to_mil_factor= -0.1
 				conversion_cost_mil_to_civ_factor = -0.1
@@ -444,7 +445,7 @@ ideas = {
 			removal_cost = -1
 			
 			modifier = {
-				consumer_goods_factor = 0.25
+				consumer_goods_expected_value = 0.25
 			}
 			default = no
 			
@@ -502,7 +503,7 @@ ideas = {
 			removal_cost = -1
 
 			modifier = {
-				consumer_goods_factor = 0.35
+				consumer_goods_expected_value = 0.35
 				production_speed_industrial_complex_factor = -0.3
 				production_speed_arms_factory_factor = -0.3
 				conversion_cost_civ_to_mil_factor= 0.3
@@ -545,7 +546,7 @@ ideas = {
 			removal_cost = -1
 
 			modifier = {
-				consumer_goods_factor = 0.3
+				consumer_goods_expected_value = 0.3
 				production_speed_industrial_complex_factor = -0.1
 				production_speed_arms_factory_factor = -0.1
 				production_speed_infrastructure_factor = 0.05
@@ -620,7 +621,7 @@ ideas = {
 			removal_cost = -1
 
 			modifier = {
-				consumer_goods_factor = 0.25
+				consumer_goods_expected_value = 0.25
 				production_speed_arms_factory_factor = 0.1
 				conversion_cost_civ_to_mil_factor= -0.1
 				conversion_cost_mil_to_civ_factor = -0.1
@@ -707,7 +708,7 @@ ideas = {
 			removal_cost = -1
 
 			modifier = {
-				consumer_goods_factor = 0.2
+				consumer_goods_expected_value = 0.2
 				production_speed_arms_factory_factor = 0.2
 				conversion_cost_civ_to_mil_factor= -0.2
 				conversion_cost_mil_to_civ_factor = -0.2
@@ -859,7 +860,7 @@ ideas = {
 			removal_cost = -1
 
 			modifier = {
-				consumer_goods_factor = 0.10
+				consumer_goods_expected_value = 0.10
 				conscription = -0.03
 				production_speed_arms_factory_factor = 0.3
 				conversion_cost_civ_to_mil_factor= -0.3
@@ -883,7 +884,7 @@ ideas = {
 		
 			modifier = {
 				resistance_target = -0.2
-				consumer_goods_factor = 0.15
+				consumer_goods_expected_value = 0.15
 				production_speed_industrial_complex_factor = 0.15
 				production_speed_arms_factory_factor = 0.3
 				conversion_cost_civ_to_mil_factor= -0.3
@@ -921,7 +922,7 @@ ideas = {
 			removal_cost = -1
 
 			modifier = {
-				consumer_goods_factor = 0.15
+				consumer_goods_expected_value = 0.15
 				production_speed_buildings_factor = -0.15
 
 			}
@@ -950,7 +951,7 @@ ideas = {
 			removal_cost = -1
 
 			modifier = {
-				consumer_goods_factor = 0.10
+				consumer_goods_expected_value = 0.10
 				production_speed_buildings_factor = -0.2
 				global_building_slots_factor = 0.1
 			}
@@ -978,7 +979,7 @@ ideas = {
 		
 			modifier = {
 				min_export = 0.25
-				consumer_goods_factor = 0.05
+				consumer_goods_expected_value = 0.05
 				civilian_intel_to_others = 40.0
 				navy_intel_to_others = 40.0
 				agency_upgrade_time = 0.15
@@ -1095,6 +1096,7 @@ ideas = {
 				trade_opinion_factor = 0.3
 				civilian_intel_to_others = 40.0
 				navy_intel_to_others = 20.0
+				cic_construction_boost_factor = 0.05
 			}
 
 			cancel_if_invalid = no
@@ -1206,6 +1208,7 @@ ideas = {
 				research_speed_factor = 0.05
 				civilian_intel_to_others = 20.0
 				navy_intel_to_others = 10.0
+				cic_construction_boost_factor = 0.1
 			}
 
 			default = yes
@@ -1324,6 +1327,8 @@ ideas = {
 				trade_opinion_factor = -0.30
 				civilian_intel_to_others = 10.0
 				navy_intel_to_others = 5
+				lend_lease_tension = 0.20
+				cic_construction_boost = -0.05
 			}
 
 			cancel_if_invalid = no
@@ -1428,6 +1433,11 @@ ideas = {
 					}
 				}
 			}
+			rule = {
+				can_access_market = no
+				desc = can_not_access_market_closed_economy
+			}
+
 			cost = 150
 			removal_cost = -1
 
@@ -1435,6 +1445,8 @@ ideas = {
 			modifier = {
 				min_export = 0
 				trade_opinion_factor = -0.75
+				lend_lease_tension = 0.40
+				cic_construction_boost = -0.1
 			}
 
 			on_add = {
@@ -1491,6 +1503,10 @@ ideas = {
 			on_add = {
 				custom_effect_tooltip = closed_economy_TT
 			}
+			rule = {
+				can_access_market = no
+				desc = can_not_access_market_closed_economy
+			}
 			modifier = {
 				min_export = 0
 				trade_opinion_factor = -1
@@ -1498,6 +1514,8 @@ ideas = {
 				navy_intel_to_others = -10.0
 				army_intel_to_others = -10.0
 				airforce_intel_to_others = -10.0
+				lend_lease_tension = 0.40
+				cic_construction_boost = -0.1
 			}
 			allowed_to_remove = {
 				always = no
@@ -1561,6 +1579,7 @@ ideas = {
 				trade_opinion_factor = 0.8
 				civilian_intel_to_others = 40.0
 				navy_intel_to_others = 20.0
+				cic_construction_boost_factor = 0.15
 			}
 
 			allowed_to_remove = { 
@@ -1593,6 +1612,7 @@ ideas = {
 				trade_opinion_factor = 0.40
 				civilian_intel_to_others = 30.0
 				navy_intel_to_others = 20.0
+				cic_construction_boost_factor = 0.1
 			}
 			allowed_to_remove = {
 				always = no
@@ -1620,6 +1640,7 @@ ideas = {
 				trade_opinion_factor = 0.50
 				civilian_intel_to_others = 30.0
 				navy_intel_to_others = 20.0
+				cic_construction_boost_factor = 0.1
 			}
 			allowed_to_remove = {
 				always = no
@@ -1649,6 +1670,8 @@ ideas = {
 				navy_intel_to_others = -10.0
 				army_intel_to_others = -10.0
 				airforce_intel_to_others = -10.0
+				lend_lease_tension = 0.20
+				cic_construction_boost = -0.05
 			}
 			targeted_modifier = {
 				tag = BAT
@@ -1743,6 +1766,8 @@ ideas = {
 				min_export = 0.25
 				civilian_intel_to_others = 5.0
 				navy_intel_to_others = 5.0
+				lend_lease_tension = 0.20
+				cic_construction_boost = -0.05
 			}
 			allowed_to_remove = {
 				always = no
@@ -1771,6 +1796,12 @@ ideas = {
 				navy_intel_to_others = -10.0
 				army_intel_to_others = -10.0
 				airforce_intel_to_others = -10.0
+				lend_lease_tension = 0.40
+				cic_construction_boost = -0.1
+			}
+			rule = {
+				can_access_market = no
+				desc = can_not_access_market_closed_economy
 			}
 			allowed_to_remove = {
 				always = no
@@ -1798,6 +1829,12 @@ ideas = {
 				navy_intel_to_others = -10.0
 				army_intel_to_others = -10.0
 				airforce_intel_to_others = -10.0
+				lend_lease_tension = 0.40
+				cic_construction_boost = -0.1
+			}
+			rule = {
+				can_access_market = no
+				desc = can_not_access_market_closed_economy
 			}
 			allowed_to_remove = {
 				always = no
diff --git a/common/ideas/_event.txt b/common/ideas/_event.txt
index f27a39d3222..ca8cf6e4944 100644
--- a/common/ideas/_event.txt
+++ b/common/ideas/_event.txt
@@ -1,5 +1,20 @@
 ideas = {
-
+	hidden_ideas = {
+		GEN_cheaper_amphib = {
+			allowed = {
+				always = no # Triggered via tech
+			}
+			picture = generic_fascism_drift_bonus
+			equipment_bonus = {
+				amphibious_mechanized_equipment = {
+					build_cost_ic = -0.15 instant = yes
+				}
+			}
+			ai_will_do = {
+				factor = 0
+			}
+		}
+	}
 	country = {
 		fascist_assault_divisions = {
 
diff --git a/common/ideas/_poverty_ideas.txt b/common/ideas/_poverty_ideas.txt
index 5167049ead9..25d73f3b9ee 100644
--- a/common/ideas/_poverty_ideas.txt
+++ b/common/ideas/_poverty_ideas.txt
@@ -62,7 +62,7 @@ ideas = {
 				MONTHLY_POPULATION = -0.04
 				production_speed_buildings_factor = -0.05
 				industry_repair_factor = -0.05
-				consumer_goods_factor = 0.025
+				consumer_goods_factor = 0.05
 				conscription_factor = 0.15
 			}
 		}
@@ -87,7 +87,7 @@ ideas = {
 				MONTHLY_POPULATION = -0.04
 				production_speed_buildings_factor = -0.05
 				industry_repair_factor = -0.05
-				consumer_goods_factor = 0.04
+				consumer_goods_factor = 0.08
 			}
 		}
 
@@ -110,7 +110,7 @@ ideas = {
 				MONTHLY_POPULATION = -0.07
 				production_speed_buildings_factor = -0.10
 				industry_repair_factor = -0.1
-				consumer_goods_factor = 0.07
+				consumer_goods_factor = 0.14
 				research_speed_factor = -0.025
 			}
 		}
@@ -162,7 +162,7 @@ ideas = {
 				MONTHLY_POPULATION = -0.12
 				production_speed_buildings_factor = -0.15
 				industry_repair_factor = -0.15
-				consumer_goods_factor = 0.10
+				consumer_goods_factor = 0.20
 				research_speed_factor = -0.05
 			}
 		}
@@ -186,7 +186,7 @@ ideas = {
 				MONTHLY_POPULATION = -0.13
 				production_speed_buildings_factor = -0.16
 				industry_repair_factor = -0.16
-				consumer_goods_factor = 0.11
+				consumer_goods_factor = 0.22
 				research_speed_factor = -0.075
 			}
 		}
@@ -209,7 +209,7 @@ ideas = {
 				MONTHLY_POPULATION = -0.14
 				production_speed_buildings_factor = -0.18
 				industry_repair_factor = -0.18
-				consumer_goods_factor = 0.13
+				consumer_goods_factor = 0.26
 				research_speed_factor = -0.1
 			}
 		}
@@ -233,7 +233,7 @@ ideas = {
 				MONTHLY_POPULATION = -0.15
 				production_speed_buildings_factor = -0.20
 				industry_repair_factor = -0.2
-				consumer_goods_factor = 0.15
+				consumer_goods_factor = 0.3
 				conscription = -0.009
 				research_speed_factor = -0.15
 			}
diff --git a/common/ideas/_society_development_ideas.txt b/common/ideas/_society_development_ideas.txt
index c3cf716be4a..1d6bd25c714 100644
--- a/common/ideas/_society_development_ideas.txt
+++ b/common/ideas/_society_development_ideas.txt
@@ -380,6 +380,9 @@ ideas = {
 				max_fuel_factor = -0.02
 				supply_consumption_factor = -0.35
 			}
+			rule = {
+				can_access_market = no
+			}
 		}
 		agrarian_society5 = {
 			
@@ -406,6 +409,9 @@ ideas = {
 				max_fuel_factor = -0.03
 				supply_consumption_factor = -0.4
 			}
+			rule = {
+				can_access_market = no
+			}
 		}
 		agrarian_society4 = {
 			
@@ -432,6 +438,9 @@ ideas = {
 				max_fuel_factor = -0.05
 				supply_consumption_factor = -0.45
 			}
+			rule = {
+				can_access_market = no
+			}
 		}
 		agrarian_society3 = {
 			
@@ -458,6 +467,9 @@ ideas = {
 				max_fuel_factor = -0.1
 				supply_consumption_factor = -0.5
 			}
+			rule = {
+				can_access_market = no
+			}
 		}
 		agrarian_society2 = {
 			
@@ -484,6 +496,9 @@ ideas = {
 				max_fuel_factor = -0.15
 				supply_consumption_factor = -0.55
 			}
+			rule = {
+				can_access_market = no
+			}
 		}
 		agrarian_society = {
 			
@@ -514,6 +529,9 @@ ideas = {
 				max_fuel_factor = -0.2
 				supply_consumption_factor = -0.6
 			}
+			rule = {
+				can_access_market = no
+			}
 		}
 
 		tribal_society4 = {
@@ -531,6 +549,7 @@ ideas = {
 				can_send_volunteers = no
 				can_join_factions = no
 				can_create_factions = no
+				can_access_market = no
 			}
 			modifier = {
 				stability_factor = -0.025
@@ -562,6 +581,7 @@ ideas = {
 				can_send_volunteers = no
 				can_join_factions = no
 				can_create_factions = no
+				can_access_market = no
 			}
 			modifier = {
 				stability_factor = -0.05
@@ -591,6 +611,7 @@ ideas = {
 				can_send_volunteers = no
 				can_join_factions = no
 				can_create_factions = no
+				can_access_market = no
 			}
 			removal_cost = -1
 			
@@ -628,6 +649,7 @@ ideas = {
 				can_send_volunteers = no
 				can_join_factions = no
 				can_create_factions = no
+				can_access_market = no
 			}
 			modifier = {
 				stability_factor = -0.1
@@ -659,6 +681,9 @@ ideas = {
 			cost = -1
 			removal_cost = -1
 			
+			rule = {
+				can_access_market = no
+			}
 			modifier = {
 				army_core_defence_factor = 0.15
 				army_core_attack_factor = 0.15
@@ -698,6 +723,7 @@ ideas = {
 				can_join_factions = no
 				can_create_factions = no
 				can_puppet = no
+				can_access_market = no
 			}
 			modifier = {
 				production_factory_max_efficiency_factor = -0.10
@@ -746,6 +772,9 @@ ideas = {
 				tag = ZAR
 				has_country_flag = ZAR_wormy
 			}
+			rule = {
+				can_access_market = no
+			}
 			
 			picture = agrarian_society
 			removal_cost = -1
@@ -781,6 +810,9 @@ ideas = {
 				has_country_flag = ZAR_wormy
 			}
 			
+			rule = {
+				can_access_market = no
+			}
 			picture = agrarian_society
 			removal_cost = -1
 			
@@ -812,6 +844,9 @@ ideas = {
 			available = {
 				has_idea = ZAR_regressing_society
 			}
+			rule = {
+				can_access_market = no
+			}
 			visible = {
 				tag = ZAR
 				has_country_flag = ZAR_wormy
diff --git a/common/ideas/air_spirits.txt b/common/ideas/air_spirits.txt
index 778aa97df42..9b3d475725c 100644
--- a/common/ideas/air_spirits.txt
+++ b/common/ideas/air_spirits.txt
@@ -77,7 +77,6 @@ ideas = {
 				light_air = 0.15
 				medium_air = 0.15
 				heavy_air = 0.15
-				naval_air = 0.15
 			}
 			ai_will_do = {
 				factor = 1
diff --git a/common/ideas/army_spirits.txt b/common/ideas/army_spirits.txt
index fd17045dd27..265a3fa7ac7 100644
--- a/common/ideas/army_spirits.txt
+++ b/common/ideas/army_spirits.txt
@@ -176,6 +176,30 @@ ideas = {
 				}
 			}
 		}
+		NOR_flexible_officers_academy_spirit = {
+			ledger = army
+			available = { 
+				always = no
+			}
+			visible = { 
+				always = no 
+			}
+			modifier = {
+				army_leader_start_level = 2
+				promote_cost_factor = -0.3
+				reassignment_duration_factor = -0.3 
+				skill_bonus_factor = 0.1
+			}
+			ai_will_do = {
+				base = 1
+
+				modifier = {
+					factor = 0
+					NOT = { has_dlc = "No Step Back" }
+				}
+			}
+
+		}
 		# EAW Custom #
 		traditionalism_academy_spirit = {
 			ledger = army
@@ -380,13 +404,12 @@ ideas = {
 			visible = { has_tech = trench_warfare }
 			ledger = army
 			modifier = {
-				unit_marine_design_cost_factor = -1
-				unit_mountaineers_design_cost_factor = -1
-				unit_paratrooper_design_cost_factor = -1
-				naval_invasion_capacity = 10
+				unit_marine_design_cost_factor = -0.5
+				unit_mountaineers_design_cost_factor = -0.5
+				unit_paratrooper_design_cost_factor = -0.5
+				special_forces_cap_flat = 24
 				extra_paratrooper_supply_grace = 24
 				extra_marine_supply_grace = 24
-				naval_invasion_planning_bonus_speed = 0.2
 			}
 			ai_will_do = {
 				factor = 1.5
diff --git a/common/ideas/southern_zebra_ideas.txt b/common/ideas/southern_zebra_ideas.txt
index c3651998943..f8c291e432b 100644
--- a/common/ideas/southern_zebra_ideas.txt
+++ b/common/ideas/southern_zebra_ideas.txt
@@ -15,7 +15,7 @@ ideas = {
 				war_support_factor = -0.15
 				research_speed_factor = 0.1
 				industrial_capacity_factory = 0.25
-				consumer_goods_factor = -0.1
+				consumer_goods_factor = -0.2
 				production_speed_buildings_factor = 0.25
 			}
 		}
@@ -33,7 +33,7 @@ ideas = {
 				stability_factor = -0.05
 				political_power_factor = -0.05
 				war_support_factor = -0.25
-				consumer_goods_factor = -0.05 ## the ruins of the Golden City still contain much valuable loot
+				consumer_goods_factor = -0.1 ## the ruins of the Golden City still contain much valuable loot
 			}
 		}
 		temporary_supply_bonus = {
@@ -47,8 +47,8 @@ ideas = {
 			removal_cost = -1
 			
 			modifier = {
-				supply_node_range = 0.15
-				out_of_supply_factor = -0.05
+				supply_node_range = 0.45
+				out_of_supply_factor = -0.25
 				consumer_goods_factor = 0.025
 			}
 		}
diff --git a/common/ideas/zzz_AET_ideas.txt b/common/ideas/zzz_AET_ideas.txt
index e11a3fa4016..9dc18f092d7 100644
--- a/common/ideas/zzz_AET_ideas.txt
+++ b/common/ideas/zzz_AET_ideas.txt
@@ -499,7 +499,7 @@ ideas = {
 
 			modifier = {
 				production_oil_factor = 0.10
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 		AET_recylce_muskets = {
diff --git a/common/ideas/zzz_ANG_ideas.txt b/common/ideas/zzz_ANG_ideas.txt
index bbe8c80d876..2899bba5c63 100644
--- a/common/ideas/zzz_ANG_ideas.txt
+++ b/common/ideas/zzz_ANG_ideas.txt
@@ -453,7 +453,7 @@ ideas = {
 				production_factory_efficiency_gain_factor = -0.10
 				industrial_capacity_factory = -0.10
 				production_speed_buildings_factor = -0.15
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 			}
 		}
 
@@ -609,7 +609,7 @@ ideas = {
 			removal_cost = -1
 
 			modifier = {
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 				production_speed_industrial_complex_factor = 0.10
 			}
 		}
@@ -627,7 +627,7 @@ ideas = {
 			removal_cost = -1
 
 			modifier = {
-				consumer_goods_factor = -0.04
+				consumer_goods_factor = -0.08
 				production_speed_industrial_complex_factor = 0.05
 				production_speed_arms_factory_factor = 0.10
 			}
@@ -716,7 +716,7 @@ ideas = {
 			modifier = {
 				stability_factor = 0.05
 				political_power_gain = 0.10
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 
@@ -921,7 +921,7 @@ ideas = {
 				production_factory_efficiency_gain_factor = -0.05
 				industrial_capacity_factory = 0.10
 				production_speed_buildings_factor = 0.10
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 
@@ -948,7 +948,7 @@ ideas = {
 				stability_factor = 0.05
 				war_support_factor = 0.05
 				neutrality_drift = 0.01
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 
@@ -1151,7 +1151,7 @@ ideas = {
 			modifier = {
 				production_factory_max_efficiency_factor = 0.10
 				production_factory_efficiency_gain_factor = 0.05
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 
@@ -1198,7 +1198,7 @@ ideas = {
 				political_power_gain = 0.15
 				fascism_drift = 0.01
 				party_popularity_stability_factor = 0.15
-				consumer_goods_factor = 0.025
+				consumer_goods_factor = 0.05
 			}
 		}
 
@@ -1243,7 +1243,7 @@ ideas = {
 
 			modifier = {
 				political_power_gain = 0.1
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 				production_speed_buildings_factor = 0.1
 				stability_factor = -0.05
 			}
@@ -1329,7 +1329,7 @@ ideas = {
 
 			modifier = {
 				political_power_gain = 0.15
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				local_resources_factor = 0.15
 				production_speed_buildings_factor = 0.15
 				stability_factor = -0.1
@@ -1354,7 +1354,7 @@ ideas = {
 
 			modifier = {
 				political_power_gain = 0.15
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				local_resources_factor = 0.15
 				production_speed_buildings_factor = 0.15
 				stability_factor = -0.1
@@ -1697,7 +1697,7 @@ ideas = {
 				stability_factor = 0.05
 				political_power_gain = 0.05
 				MONTHLY_POPULATION = 0.10
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 			}
 		}
 
@@ -1763,7 +1763,7 @@ ideas = {
 				political_power_gain = 0.10
 				industrial_capacity_factory = 0.05
 				production_speed_buildings_factor = 0.05
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 
@@ -1899,7 +1899,7 @@ ideas = {
 			modifier = {
 				local_resources_factor = 0.15
 				conscription_factor = 0.10
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 			}
 		}
 
@@ -1943,7 +1943,7 @@ ideas = {
 			modifier = {
 				stability_factor = -0.05
 				political_power_gain = -0.15
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 
@@ -2138,7 +2138,7 @@ ideas = {
 				production_factory_max_efficiency_factor = 0.10
 				production_factory_efficiency_gain_factor = 0.10
 				line_change_production_efficiency_factor = 0.05
-				consumer_goods_factor = -0.07
+				consumer_goods_factor = -0.14
 			}
 		}
 
@@ -2459,7 +2459,7 @@ ideas = {
 			removal_cost = -1
 
 			modifier = {
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				political_power_factor = 0.10
 				drift_defence_factor = 0.15
 			}
@@ -2644,7 +2644,7 @@ ideas = {
 			removal_cost = -1
 
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				production_speed_buildings_factor = 0.15
 				production_factory_efficiency_gain_factor = 0.10
 			}
@@ -2663,7 +2663,7 @@ ideas = {
 			removal_cost = -1
 
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				production_speed_industrial_complex_factor = 0.10
 				production_speed_arms_factory_factor = 0.15
 			}
diff --git a/common/ideas/zzz_ARA_ideas.txt b/common/ideas/zzz_ARA_ideas.txt
index d848bd8a70c..085161bcc5a 100644
--- a/common/ideas/zzz_ARA_ideas.txt
+++ b/common/ideas/zzz_ARA_ideas.txt
@@ -323,7 +323,7 @@ ideas = {
 			removal_cost = -1
 
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				political_power_gain = -0.10
 				production_speed_buildings_factor = 0.05
 			}
@@ -345,7 +345,7 @@ ideas = {
 			removal_cost = -1
 
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				political_power_gain = 0.10
 				stability_factor = 0.05
 			}
diff --git a/common/ideas/zzz_AVI_ideas.txt b/common/ideas/zzz_AVI_ideas.txt
index 7d32589bbe5..d54ee57b064 100644
--- a/common/ideas/zzz_AVI_ideas.txt
+++ b/common/ideas/zzz_AVI_ideas.txt
@@ -116,7 +116,7 @@ ideas = {
 				production_factory_max_efficiency_factor = 0.15
 				local_resources_factor = 0.15
 				min_export = -0.05
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				global_building_slots_factor = 0.05
 			}
 		}
@@ -212,7 +212,7 @@ ideas = {
 			removal_cost = -1
 			picture = generic_infantry_bonus
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				MONTHLY_POPULATION = 0.05
 			}
 		}	
@@ -224,7 +224,7 @@ ideas = {
 			picture = chi_hyper_inflation5
 			modifier = {
 				min_export = -0.05
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 		AVI_sca = {
@@ -518,7 +518,7 @@ ideas = {
 				production_factory_max_efficiency_factor = 0.15
 				local_resources_factor = 0.15
 				min_export = -0.10
-				consumer_goods_factor = -0.10
+				consumer_goods_factor = -0.20
 				global_building_slots_factor = 0.05
 			}
 		}
@@ -578,7 +578,7 @@ ideas = {
 				production_factory_max_efficiency_factor = 0.15
 				local_resources_factor = 0.15
 				min_export = -0.10
-				consumer_goods_factor = -0.10
+				consumer_goods_factor = -0.20
 				global_building_slots_factor = 0.05
 			}
 		}
diff --git a/common/ideas/zzz_BAK_ideas.txt b/common/ideas/zzz_BAK_ideas.txt
index 73594c38990..3faaa0894be 100644
--- a/common/ideas/zzz_BAK_ideas.txt
+++ b/common/ideas/zzz_BAK_ideas.txt
@@ -1,4 +1,17 @@
 ideas = {
+	hidden_ideas = {
+		BAK_tailvoz_hidden = {
+			allowed = {
+				always = no
+			}
+
+			removal_cost = -1
+			picture = generic_purge
+			modifier = {
+				production_speed_infrastructure_factor = 0.05
+			}
+		}
+   	}
 	tank_manufacturer = {
 		designer = yes
 
@@ -1653,7 +1666,7 @@ ideas = {
 			}
 			picture = ROM_king_carol_emptied_accounts
 			modifier = {
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 				political_power_gain = 0.05
 			}
 		}
@@ -1670,7 +1683,7 @@ ideas = {
 			}
 			picture = ROM_king_carol_emptied_accounts
 			modifier = {
-				consumer_goods_factor = -0.04
+				consumer_goods_factor = -0.08
 				political_power_gain = 0.075
 			}
 		}
@@ -1764,7 +1777,7 @@ ideas = {
 			picture = chi_hyper_inflation3
 			modifier = {
 				political_power_factor = 0.05
-				consumer_goods_factor = -0.01
+				consumer_goods_factor = -0.02
 				production_factory_efficiency_gain_factor = 0.075
 			}
 		}
@@ -1782,7 +1795,7 @@ ideas = {
 			picture = chi_hyper_inflation3
 			modifier = {
 				political_power_factor = 0.075
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 				production_factory_efficiency_gain_factor = 0.10
 			}
 		}
@@ -2343,7 +2356,7 @@ ideas = {
 			}
 			picture = ROM_king_carol_emptied_accounts
 			modifier = {
-				consumer_goods_factor = 0.10
+				consumer_goods_factor = 0.20
 				stability_factor = 0.05
 				political_power_factor = 0.15
 			}
@@ -2645,7 +2658,7 @@ ideas = {
 			picture = ROM_king_carol_ii_hedonist
 			modifier = {
 				industrial_capacity_factory = 0.075
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 			}
 		}
 
@@ -2666,7 +2679,7 @@ ideas = {
 			picture = ROM_king_carol_ii_hedonist
 			modifier = {
 				industrial_capacity_factory = 0.10
-				consumer_goods_factor = -0.03
+				consumer_goods_factor = -0.06
 			}
 		}
 
diff --git a/common/ideas/zzz_BAL_ideas.txt b/common/ideas/zzz_BAL_ideas.txt
index b02f3d52c02..da00160c7fa 100644
--- a/common/ideas/zzz_BAL_ideas.txt
+++ b/common/ideas/zzz_BAL_ideas.txt
@@ -13,7 +13,7 @@ ideas = {
 			picture = great_depression
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.15
+				consumer_goods_factor = 0.3
 				political_power_factor = -0.15
 				local_resources_factor = -0.15
 				industrial_capacity_factory = -0.15
@@ -36,7 +36,7 @@ ideas = {
 			picture = great_depression
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.1
+				consumer_goods_factor = 0.2
 				political_power_factor = -0.1
 				local_resources_factor = -0.1
 				industrial_capacity_factory = -0.1
@@ -56,7 +56,7 @@ ideas = {
 			picture = great_depression
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				political_power_factor = -0.05
 				local_resources_factor = -0.05
 				industrial_capacity_factory = -0.05
@@ -311,7 +311,7 @@ ideas = {
 			modifier = {
 				trade_opinion_factor = -0.25
 				political_power_factor = 0.05
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 			}
 		}
 		BAL_state_capitalism_idea = {
@@ -447,7 +447,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				stability_factor = 0.05
-				consumer_goods_factor = -0.03
+				consumer_goods_factor = -0.06
 				production_factory_max_efficiency_factor = -0.05
 			}
 		}
@@ -776,7 +776,7 @@ ideas = {
 			picture = jap_the_unthinkable_option
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.10
+				consumer_goods_factor = 0.20
 				industrial_capacity_factory = -0.10
 				industrial_capacity_dockyard = -0.10
 				production_speed_buildings_factor = -0.15
@@ -795,7 +795,7 @@ ideas = {
 			picture = eng_spirit_of_the_industrial_revolution
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				industrial_capacity_factory = -0.20
 				industrial_capacity_dockyard = -0.20
 				production_speed_buildings_factor = -0.075
@@ -814,7 +814,7 @@ ideas = {
 			picture = jap_the_unthinkable_option
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.10
+				consumer_goods_factor = 0.2
 				production_speed_buildings_factor = -0.15
 			}
 		}
@@ -884,7 +884,7 @@ ideas = {
 			modifier = {
 				trade_opinion_factor = -0.25
 				political_power_factor = 0.15
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 		BAL_continued_collectivization_contrib = {
@@ -1001,7 +1001,7 @@ ideas = {
 			picture = generic_foreign_capital
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				political_power_factor = -0.1
 			}
 		}
@@ -1018,7 +1018,7 @@ ideas = {
 			picture = eng_spirit_of_the_industrial_revolution
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				production_speed_buildings_factor = -0.075
 			}
 		}
@@ -1052,7 +1052,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				MONTHLY_POPULATION = 0.25
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 		BAL_continued_nationalization_control = {
@@ -1068,7 +1068,7 @@ ideas = {
 			picture = eng_spirit_of_the_industrial_revolution
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				industrial_capacity_factory = -0.20
 				industrial_capacity_dockyard = -0.20
 			}
@@ -1086,7 +1086,7 @@ ideas = {
 			picture = eng_spirit_of_the_industrial_revolution
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 			}
 		}
 		BAL_weather_micromanagement_idea = {
@@ -1120,7 +1120,7 @@ ideas = {
 			picture = raj_risk_of_famine
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				production_factory_max_efficiency_factor = 0.1
 				production_speed_industrial_complex_factor = -0.1
 			}
diff --git a/common/ideas/zzz_BAN_ideas.txt b/common/ideas/zzz_BAN_ideas.txt
index 73092136004..f7eae6dc8a6 100644
--- a/common/ideas/zzz_BAN_ideas.txt
+++ b/common/ideas/zzz_BAN_ideas.txt
@@ -187,7 +187,7 @@ ideas = {
 			picture = ROM_king_carol_emptied_accounts
 			modifier = {
 				production_speed_buildings_factor = 0.10
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				stability_factor = 0.05
 			}
 		}
@@ -206,7 +206,7 @@ ideas = {
 			picture = great_depression
 			modifier = {
 				production_speed_buildings_factor = -0.10
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				stability_factor = -0.05
 			}
 		}
@@ -220,7 +220,7 @@ ideas = {
 			picture = generic_goods_red_bonus
 			modifier = {
 				stability_factor = -0.10
-				consumer_goods_factor = 0.04
+				consumer_goods_factor = 0.08
 				political_power_gain = -0.20
 			}
 		}
@@ -242,7 +242,7 @@ ideas = {
 			picture = generic_agrarian_society
 			modifier = {
 				stability_factor = -0.05
-				consumer_goods_factor = 0.02
+				consumer_goods_factor = 0.04
 				production_factory_max_efficiency_factor = -0.05
 				political_power_gain = -0.10
 			}
@@ -280,7 +280,7 @@ ideas = {
 			picture = generic_agrarian_society
 			modifier = {
 				stability_factor = 0.05
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 				production_factory_max_efficiency_factor = 0.05
 				political_power_gain = 0.10
 			}
@@ -294,7 +294,7 @@ ideas = {
 			picture = generic_agrarian_society
 			modifier = {
 				stability_factor = 0.10
-				consumer_goods_factor = -0.04
+				consumer_goods_factor = -0.08
 				production_factory_max_efficiency_factor = 0.10
 				political_power_gain = 0.20
 			}
@@ -488,7 +488,7 @@ ideas = {
 			removal_cost = -1
 			picture = triumphant_will
 			modifier = {
-				consumer_goods_factor = -0.1
+				consumer_goods_factor = -0.2
 				stability_factor = 0.05
 				political_power_gain = 0.05
 			}
diff --git a/common/ideas/zzz_BAR_ideas.txt b/common/ideas/zzz_BAR_ideas.txt
index 16ceea8a80e..6d65e5d848e 100644
--- a/common/ideas/zzz_BAR_ideas.txt
+++ b/common/ideas/zzz_BAR_ideas.txt
@@ -149,7 +149,7 @@ ideas = {
 				}
 			}
 			research_bonus = {
-				infantry_weapons = 0.15
+				magical_tech = 0.15
 			}
 			equipment_bonus = {
 				magical_equipment = {
@@ -240,7 +240,7 @@ ideas = {
 				}
 			}
 			research_bonus = {
-				infantry_weapons = 0.15
+				magical_tech = 0.15
 			}
 			equipment_bonus = {
 				magical_equipment = {
@@ -497,6 +497,47 @@ ideas = {
 			allowed = {
 				original_tag = BAR
 			}
+			visible = {
+				hidden_trigger = {
+					NOT = {
+						has_country_flag = BAR_advisors_killed
+					}
+				}
+			}
+			available = { 
+				hidden_trigger = {
+					NOT = {
+						has_country_flag = BAR_advisors_killed
+					}
+				}
+			}
+			traits = { naval_manufacturer }
+			equipment_bonus = {
+				ship_hull_cruiser = {
+					armor_value = 0.05
+					anti_air_attack = 0.07
+					surface_visibility = -0.05
+					naval_speed = 0.05
+					instant = yes
+				}
+			}
+		}
+		BAR_ded_shipyard = {
+			picture = BAR_undead_advisor
+
+			allowed = {
+				original_tag = BAR
+			}
+			visible = {
+				hidden_trigger = {
+					has_country_flag = BAR_undead_science
+				}
+			}
+			available = { 
+				hidden_trigger = {
+					has_country_flag = BAR_undead_science
+				}
+			}
 			traits = { naval_manufacturer }
 			equipment_bonus = {
 				ship_hull_cruiser = {
@@ -525,7 +566,7 @@ ideas = {
 			picture = BAR_money_party
 
 			modifier = {
-				consumer_goods_factor = 0.1
+				consumer_goods_factor = 0.2
 			}
 		}
 		BAR_ambrosius_research_negative = {
@@ -658,7 +699,7 @@ ideas = {
 				production_speed_buildings_factor = 0.1
 				industrial_capacity_factory = 0.05
 				industrial_capacity_dockyard = 0.05	
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 			}
 		}
 		BAR_temple_construct_z_l_g = {
@@ -666,7 +707,7 @@ ideas = {
 			modifier = {
 				production_speed_buildings_factor = 0.1
 				local_resources_factor = 0.10
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 			}
 		}
 		BAR_temple_construct_d_f_p = {
@@ -695,7 +736,7 @@ ideas = {
 				global_building_slots_factor = 0.10 
 				industrial_capacity_factory = 0.05
 				industrial_capacity_dockyard = 0.05	
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 			}
 		}
 		BAR_temple_construct_d_l_g = {
@@ -704,7 +745,7 @@ ideas = {
 				production_speed_buildings_factor = 0.075
 				global_building_slots_factor = 0.10 
 				local_resources_factor = 0.10
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 			}
 		}
 		BAR_relations_asinti_silver_positive = {
@@ -803,7 +844,7 @@ ideas = {
 			modifier = {	
 				industrial_capacity_factory = 0.05
 				industrial_capacity_dockyard = 0.05	
-				consumer_goods_factor = -0.03
+				consumer_goods_factor = -0.06
 			}
 		}
 		BAR_undead_army_1 = {
@@ -1388,7 +1429,7 @@ ideas = {
 		barrad_demon_economy = {
 			picture = partial_economic_mobilisation_red
 			modifier = {
-				consumer_goods_factor = -0.25
+				consumer_goods_factor = -0.5
 				conversion_cost_civ_to_mil_factor = -1
 				production_speed_arms_factory_factor = 0.6
 				fuel_gain_factor = 0.4
@@ -1507,7 +1548,7 @@ ideas = {
 			modifier = {
 				supply_consumption_factor = -0.1
 				army_org_factor = 0.1
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 			}
 		}
 		BAR_temple_builded_z_l_g = {
@@ -1515,7 +1556,7 @@ ideas = {
 			modifier = {
 				supply_consumption_factor = -0.1
 				land_reinforce_rate = 0.15
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 			}
 		}
 		BAR_temple_builded_d_f_p = {
@@ -1539,7 +1580,7 @@ ideas = {
 			modifier = {
 				winter_attrition_factor = -0.4
 				army_org_factor = 0.1
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 			}
 		}
 		BAR_temple_builded_d_l_g = {
@@ -1547,7 +1588,7 @@ ideas = {
 			modifier = {
 				winter_attrition_factor = -0.4
 				land_reinforce_rate = 0.15
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 			}
 		}
 		BAR_leopold_partial = {
@@ -1780,7 +1821,7 @@ ideas = {
 		BAR_viira_decadency = {
 			picture = viiraluxury
 			modifier = {
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				industrial_capacity_factory = 0.2
 				industrial_capacity_dockyard = 0.2
 			}
@@ -1835,7 +1876,7 @@ ideas = {
 			modifier = {
 				monthly_population = -0.10
 				political_power_factor = -0.10
-				consumer_goods_factor = 0.20
+				consumer_goods_factor = 0.40
 				min_export = 0.15
 			}
 			targeted_modifier = {
@@ -1949,7 +1990,7 @@ ideas = {
 		BAR_viira_jewel = {
 			picture = viirajewel
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				industrial_capacity_factory = 0.1
 				production_speed_buildings_factor = 0.1
 				global_building_slots_factor = 0.1
@@ -1958,7 +1999,7 @@ ideas = {
 			}
 			targeted_modifier = {
 				tag = BAR
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 				industrial_capacity_factory = 0.05
 				production_speed_buildings_factor = 0.05
 				global_building_slots_factor = 0.05
@@ -2030,7 +2071,7 @@ ideas = {
 				}
 			}
 			modifier = {
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 				industrial_capacity_factory = 0.05
 				production_speed_buildings_factor = 0.05
 				global_building_slots_factor = 0.05
@@ -2123,7 +2164,7 @@ ideas = {
 		BAR_ambrosius_muns = {
 			picture = LEC_staggering_reserves
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 		BAR_school_applied_science = {
@@ -2182,7 +2223,7 @@ ideas = {
 		BAR_asceticism = {
 			picture = severe_famine
 			modifier = {
-				consumer_goods_factor = -0.15
+				consumer_goods_factor = -0.3
 			}
 		}
 		BAR_desperate_defence_idea = {
diff --git a/common/ideas/zzz_BAT_ideas.txt b/common/ideas/zzz_BAT_ideas.txt
index e94e8184ac1..ec6385371f3 100644
--- a/common/ideas/zzz_BAT_ideas.txt
+++ b/common/ideas/zzz_BAT_ideas.txt
@@ -2062,7 +2062,7 @@ ideas = {
 			picture = Generic_bank_idea_icon 
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.03
+				consumer_goods_factor = -0.06
 			}
 		}
 	}
@@ -2087,7 +2087,7 @@ ideas = {
 			picture = Generic_bank_idea_icon 
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				stability_factor = 0.05
 				compliance_growth = 0.05
 				neutrality_drift = 0.01
@@ -2115,7 +2115,7 @@ ideas = {
 			picture = Generic_bank_idea_icon 
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				stability_factor = 0.05
 				compliance_growth = 0.05
 			}
@@ -2496,7 +2496,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 			    production_speed_buildings_factor = 0.10
-				consumer_goods_factor = -0.015
+				consumer_goods_factor = -0.03
 				stability_factor = -0.05
 			}
 		}
@@ -2519,7 +2519,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 			    production_speed_buildings_factor = 0.125
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 				stability_factor = -0.10
 			}
 		}
@@ -2716,7 +2716,7 @@ ideas = {
 				industrial_capacity_dockyard = -0.30
 				production_factory_max_efficiency_factor = -0.30
 			    MONTHLY_POPULATION = -0.30
-				consumer_goods_factor = 0.15
+				consumer_goods_factor = 0.3
 			}
 		}
 	}
@@ -2741,7 +2741,7 @@ ideas = {
 				industrial_capacity_dockyard = -0.20
 				production_factory_max_efficiency_factor = -0.20
 			    MONTHLY_POPULATION = -0.20
-				consumer_goods_factor = 0.10
+				consumer_goods_factor = 0.20
 			}
 		}
 	}
@@ -2766,7 +2766,7 @@ ideas = {
 				industrial_capacity_dockyard = -0.10
 				production_factory_max_efficiency_factor = -0.10
 			    MONTHLY_POPULATION = -0.10
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 			}
 		}
 	}
@@ -2806,7 +2806,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 			    MONTHLY_POPULATION = 0.10
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 				trade_opinion_factor = 0.15
 				local_resources_factor = 0.025
 			}
@@ -2828,7 +2828,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 			    MONTHLY_POPULATION = 0.15
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				trade_opinion_factor = 0.20
 				local_resources_factor = 0.05
 				line_change_production_efficiency_factor = 0.10
@@ -2851,7 +2851,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 			    MONTHLY_POPULATION = 0.20
-				consumer_goods_factor = -0.075
+				consumer_goods_factor = -0.15
 				trade_opinion_factor = 0.25
 				local_resources_factor = 0.10
 				line_change_production_efficiency_factor = 0.10
@@ -2874,7 +2874,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 			    MONTHLY_POPULATION = 0.225
-				consumer_goods_factor = -0.075
+				consumer_goods_factor = -0.15
 				trade_opinion_factor = 0.25
 				local_resources_factor = 0.125
 				line_change_production_efficiency_factor = 0.125
@@ -2897,7 +2897,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 			    MONTHLY_POPULATION = 0.25
-				consumer_goods_factor = -0.075
+				consumer_goods_factor = -0.15
 				trade_opinion_factor = 0.25
 				local_resources_factor = 0.15
 				line_change_production_efficiency_factor = 0.15
@@ -2944,7 +2944,7 @@ ideas = {
 			    neutrality_drift = 0.05
 			    fascism_drift = 0.05
 				political_power_factor = 0.15
-				consumer_goods_factor = -0.10
+				consumer_goods_factor = -0.20
 				war_support_weekly = 0.005
 			}
 		}
@@ -3096,7 +3096,7 @@ ideas = {
 			modifier = {
 			    political_power_factor = 0.10
 				stability_factor = 0.10
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 			}
 		}
 	}
@@ -3136,7 +3136,7 @@ ideas = {
 			picture = CRY_medicine 
 			removal_cost = -1
 			modifier = { 
-			    consumer_goods_factor = 0.025
+			    consumer_goods_factor = 0.05
 				supply_consumption_factor = -0.075
 				conscription_factor = 0.05
 				monthly_population = 0.2
@@ -3158,7 +3158,7 @@ ideas = {
 			picture = CRY_medicine 
 			removal_cost = -1
 			modifier = { 
-			    consumer_goods_factor = 0.05
+			    consumer_goods_factor = 0.1
 				supply_consumption_factor = -0.10
 				conscription_factor = 0.075
 				monthly_population = 0.3
@@ -3961,7 +3961,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				democratic_drift = 0.03
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				stability_weekly = 0.0025
 				custom_modifier_tooltip = BAT_reclamation_tp
 			}
@@ -4696,7 +4696,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 			    research_speed_factor = 0.05
-				consumer_goods_factor = 0.015
+				consumer_goods_factor = 0.03
 			}
 			research_bonus = {
 				unicorn_tech = 0.05
@@ -4720,7 +4720,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 			    research_speed_factor = 0.075
-				consumer_goods_factor = 0.025
+				consumer_goods_factor = 0.05
 			}
 			research_bonus = {
 				unicorn_tech = 0.10
@@ -5518,7 +5518,7 @@ ideas = {
 			
 			modifier = {
 			    political_power_factor = -0.05
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 				political_advisor_cost_factor = -0.15
 				high_command_cost_factor = -0.15
 				air_chief_cost_factor = -0.15
@@ -5842,7 +5842,7 @@ ideas = {
 			picture = BAT_dusksoc 
 			removal_cost = -1
 			modifier = {
-			    consumer_goods_factor = 0.025
+			    consumer_goods_factor = 0.05
 				research_speed_factor = 0.05
 				political_power_factor = 0.075
 				industrial_capacity_factory = 0.025
@@ -5864,7 +5864,7 @@ ideas = {
 			picture = BAT_dusksoc
 			removal_cost = -1
 			modifier = {
-			    consumer_goods_factor = 0.05
+			    consumer_goods_factor = 0.1
 				research_speed_factor = 0.075
 				political_power_factor = 0.10
 				industrial_capacity_factory = 0.05
@@ -5886,7 +5886,7 @@ ideas = {
 			picture = BAT_dusksoc
 			removal_cost = -1
 			modifier = {
-			    consumer_goods_factor = 0.075
+			    consumer_goods_factor = 0.15
 				research_speed_factor = 0.10
 				political_power_factor = 0.10
 				industrial_capacity_factory = 0.075
@@ -6000,7 +6000,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 			    custom_modifier_tooltip = TRO_CTH_disappear_tp
-				consumer_goods_factor = -0.03
+				consumer_goods_factor = -0.06
 				military_factory_donations = 4
 				production_speed_buildings_factor = 0.075
 			}
@@ -6028,7 +6028,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 			    custom_modifier_tooltip = TRO_CTH_disappear_tp
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 				military_factory_donations = 3
 				production_speed_buildings_factor = 0.05
 			}
@@ -6056,7 +6056,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 			    custom_modifier_tooltip = TRO_CTH_disappear_tp
-				consumer_goods_factor = -0.01
+				consumer_goods_factor = -0.02
 				military_factory_donations = 2
 				production_speed_buildings_factor = 0.025
 			}
@@ -6234,7 +6234,7 @@ ideas = {
 			picture = EQS_UESR_education 
 			removal_cost = -1
 			modifier = {
-			    consumer_goods_factor = 0.025
+			    consumer_goods_factor = 0.05
 				research_speed_factor = 0.025
 				political_power_factor = 0.075
 				production_factory_efficiency_gain_factor = 0.025
@@ -6256,7 +6256,7 @@ ideas = {
 			picture = EQS_UESR_education 
 			removal_cost = -1
 			modifier = {
-			    consumer_goods_factor = 0.05
+			    consumer_goods_factor = 0.1
 				research_speed_factor = 0.05
 				political_power_factor = 0.10
 				production_factory_efficiency_gain_factor = 0.05
@@ -6278,7 +6278,7 @@ ideas = {
 			picture = EQS_UESR_education 
 			removal_cost = -1
 			modifier = {
-			    consumer_goods_factor = 0.05
+			    consumer_goods_factor = 0.1
 				research_speed_factor = 0.05
 				political_power_factor = 0.10
 				production_factory_efficiency_gain_factor = 0.075
@@ -6301,7 +6301,7 @@ ideas = {
 			picture = EQS_UESR_education 
 			removal_cost = -1
 			modifier = {
-			    consumer_goods_factor = 0.05
+			    consumer_goods_factor = 0.1
 				research_speed_factor = 0.075
 				political_power_factor = 0.10
 				production_factory_efficiency_gain_factor = 0.10
@@ -6601,7 +6601,7 @@ ideas = {
 			picture = EQS_UESR_education 
 			removal_cost = -1
 			modifier = {
-			    consumer_goods_factor = -0.015
+			    consumer_goods_factor = -0.03
 				production_factory_efficiency_gain_factor = 0.025
 			}
 		}
@@ -6621,7 +6621,7 @@ ideas = {
 			picture = EQS_UESR_education 
 			removal_cost = -1
 			modifier = {
-			    consumer_goods_factor = -0.02
+			    consumer_goods_factor = -0.04
 				production_factory_efficiency_gain_factor = 0.05
 				conscription_factor = 0.025
 			}
@@ -6642,7 +6642,7 @@ ideas = {
 			picture = EQS_UESR_education 
 			removal_cost = -1
 			modifier = {
-			    consumer_goods_factor = -0.025
+			    consumer_goods_factor = -0.05
 				production_factory_efficiency_gain_factor = 0.075
 				conscription_factor = 0.05
 				compliance_growth = 0.025
@@ -6664,7 +6664,7 @@ ideas = {
 			picture = EQS_UESR_education 
 			removal_cost = -1
 			modifier = {
-			    consumer_goods_factor = -0.03
+			    consumer_goods_factor = -0.06
 				production_factory_efficiency_gain_factor = 0.10
 				conscription_factor = 0.075
 				compliance_growth = 0.05 
diff --git a/common/ideas/zzz_BRF_ideas.txt b/common/ideas/zzz_BRF_ideas.txt
index 2d375daa26b..e73bc0691a1 100644
--- a/common/ideas/zzz_BRF_ideas.txt
+++ b/common/ideas/zzz_BRF_ideas.txt
@@ -321,7 +321,7 @@ ideas = {
 				conscription = -0.015
 				war_support_factor = 0.05
 				stability_factor = 0.05
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 	}
@@ -341,7 +341,7 @@ ideas = {
 				conscription = -0.025
 				war_support_factor = -0.15
 				stability_factor = -0.15
-				consumer_goods_factor = -0.10
+				consumer_goods_factor = -0.20
 			}
 		}
 	}
diff --git a/common/ideas/zzz_BRF_rw_ideas.txt b/common/ideas/zzz_BRF_rw_ideas.txt
index 6f29a9cd3f2..7814e16ecef 100644
--- a/common/ideas/zzz_BRF_rw_ideas.txt
+++ b/common/ideas/zzz_BRF_rw_ideas.txt
@@ -406,7 +406,7 @@ ideas = {
 				production_speed_industrial_complex_factor = 0.05
 				war_support_factor = -0.25
 				production_speed_arms_factory_factor = -0.4
-				consumer_goods_factor = 0.10				
+				consumer_goods_factor = 0.20				
 			}
 		}
 		
@@ -460,7 +460,7 @@ ideas = {
 				production_speed_buildings_factor = 0.2
 				production_speed_industrial_complex_factor = 0.15
 				production_speed_arms_factory_factor = -0.40
-				consumer_goods_factor = 0.10							
+				consumer_goods_factor = 0.20							
 			}
 		}
 		
@@ -527,7 +527,7 @@ ideas = {
 				political_power_gain = 0.25
 				stability_factor = 0.1
 				war_support_factor = -0.1
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 			}
 		}
 		
@@ -823,7 +823,7 @@ ideas = {
 			removal_cost = -1
 			modifier = { 
 				conscription_factor = 0.2
-				consumer_goods_factor = 0.1
+				consumer_goods_factor = 0.2
 			}
 		}
 		
@@ -838,7 +838,7 @@ ideas = {
 			removal_cost = -1
 			modifier = { 
 				conscription_factor = 0.1
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 			}
 		}
 		
@@ -1033,7 +1033,7 @@ ideas = {
 			picture = ROM_king_carol_emptied_accounts
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.1
+				consumer_goods_factor = 0.2
 			}
 		}
 		
@@ -1041,7 +1041,7 @@ ideas = {
 			picture = ROM_king_carol_emptied_accounts
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.1
+				consumer_goods_factor = -0.2
 			}
 		}
 		
@@ -1069,7 +1069,7 @@ ideas = {
 			}
 			removal_cost = -1
 			modifier = { 
-				consumer_goods_factor = -0.03
+				consumer_goods_factor = -0.06
 			}
 		}
 		
@@ -1228,7 +1228,7 @@ ideas = {
 				}
 			}
 			modifier = { 
-				consumer_goods_factor = -0.09
+				consumer_goods_factor = -0.18
 			}
 		}
 		
diff --git a/common/ideas/zzz_BRZ_ideas.txt b/common/ideas/zzz_BRZ_ideas.txt
index 31f87bbbfe8..2d8fe6d8a47 100644
--- a/common/ideas/zzz_BRZ_ideas.txt
+++ b/common/ideas/zzz_BRZ_ideas.txt
@@ -13,7 +13,7 @@ ideas = {
 
 			modifier = {
 				political_power_factor = -0.15
-				consumer_goods_factor = 0.1
+				consumer_goods_factor = 0.2
 				min_export = 0.15
 			}
 			targeted_modifier = {
@@ -36,7 +36,7 @@ ideas = {
 
 			modifier = {
 				political_power_factor = -0.15
-				consumer_goods_factor = 0.1
+				consumer_goods_factor = 0.2
 				min_export = 0.15
 			}
 		}
@@ -53,7 +53,7 @@ ideas = {
 			picture = capital_outflow
 
 			modifier = {
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				min_export = 0.05
 			}
 			targeted_modifier = {
@@ -75,7 +75,7 @@ ideas = {
 			picture = capital_outflow
 
 			modifier = {
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				min_export = 0.05
 			}
 		}
@@ -92,7 +92,7 @@ ideas = {
 
 			modifier = {
 				political_power_factor = 0.05
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 
@@ -122,7 +122,7 @@ ideas = {
 			picture = generic_goods_red_bonus
 
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				MONTHLY_POPULATION = 0.15
 				supply_consumption_factor = -0.05
 			}
@@ -139,7 +139,7 @@ ideas = {
 			picture = generic_goods_red_bonus
 
 			modifier = {
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 			}
 		}
 
@@ -981,7 +981,7 @@ ideas = {
 			picture = generic_foreign_capital
 
 			modifier = {
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 			}
 		}
 
@@ -1226,7 +1226,7 @@ ideas = {
 			modifier = {
 				industrial_capacity_factory = 0.05
 				production_factory_start_efficiency_factor = 0.05
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 			}
 		}
 
@@ -1293,7 +1293,7 @@ ideas = {
 			modifier = {
 				production_factory_efficiency_gain_factor = 0.1
 				industrial_capacity_factory = 0.15
-				consumer_goods_factor = -0.03
+				consumer_goods_factor = -0.06
 			}
 		}
 
@@ -1326,7 +1326,7 @@ ideas = {
 			modifier = {
 				production_factory_max_efficiency_factor = 0.05
 				production_factory_efficiency_gain_factor = 0.10
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 		
@@ -1680,7 +1680,7 @@ ideas = {
 			picture = generic_production_bonus
 
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				stability_factor = -0.1
 			}
 		}
diff --git a/common/ideas/zzz_BUF_ideas.txt b/common/ideas/zzz_BUF_ideas.txt
index 686e4f24d20..f78e04fcf02 100644
--- a/common/ideas/zzz_BUF_ideas.txt
+++ b/common/ideas/zzz_BUF_ideas.txt
@@ -637,7 +637,7 @@ ideas = {
 				original_tag = BUF
 			}
 			modifier = {
-				consumer_goods_factor = 0.2
+				consumer_goods_factor = 0.4
 			}
 		}
 	}
@@ -647,7 +647,7 @@ ideas = {
 				original_tag = BUF
 			}
 			modifier = {
-				consumer_goods_factor = 0.25
+				consumer_goods_factor = 0.5
 				conscription_factor = -0.3
 				political_power_gain = -0.5
 				stability_factor = -0.3
@@ -684,7 +684,7 @@ ideas = {
 				original_tag = BUF
 			}
 			modifier = {
-				consumer_goods_factor = -0.1
+				consumer_goods_factor = -0.2
 				conscription = 0.15
 				fascism_drift = 0.05
 				mobilization_speed = 0.1
@@ -788,7 +788,7 @@ ideas = {
 			modifier = {
 				production_speed_arms_factory_factor = 0.1
 				industrial_capacity_factory = 0.1
-				consumer_goods_factor = -0.03
+				consumer_goods_factor = -0.06
 			}
 		}
 	}
@@ -811,7 +811,7 @@ ideas = {
 				original_tag = BUF
 			}
 			modifier = {
-				consumer_goods_factor = -0.01
+				consumer_goods_factor = -0.02
 				local_resources_factor = 0.3
 				production_speed_synthetic_refinery_factor = 0.2
 			}
@@ -828,7 +828,7 @@ ideas = {
 				EQS = { exists = yes }
 			}
 			modifier = {
-				consumer_goods_factor = -0.3
+				consumer_goods_factor = -0.6
 				local_resources_factor = 0.4
 				production_speed_infrastructure_factor = 0.2
 				production_speed_buildings_factor = 0.2
diff --git a/common/ideas/zzz_CCN_ideas.txt b/common/ideas/zzz_CCN_ideas.txt
index e56724f72ae..1271e5380fc 100644
--- a/common/ideas/zzz_CCN_ideas.txt
+++ b/common/ideas/zzz_CCN_ideas.txt
@@ -349,7 +349,7 @@ ideas = {
 				industrial_capacity_factory = -0.2
 				production_speed_buildings_factor = -0.5
 				min_export = -0.3
-				consumer_goods_factor = 0.04
+				consumer_goods_factor = 0.08
 				communism_drift = 0.02
 			}
 
@@ -368,7 +368,7 @@ ideas = {
 				industrial_capacity_factory = -0.1
 				production_speed_buildings_factor = -0.1
 				min_export = -0.1
-				consumer_goods_factor = 0.01
+				consumer_goods_factor = 0.02
 				communism_drift = 0.01
 			}
 
@@ -398,7 +398,7 @@ ideas = {
 			}
 
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				research_speed_factor = 0.05
 			}
 
@@ -413,7 +413,7 @@ ideas = {
 			}
 
 			modifier = {
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 				industrial_capacity_factory = 0.1
 			}
 
@@ -614,7 +614,7 @@ ideas = {
 				industrial_capacity_factory = 0.05
 				production_factory_max_efficiency_factor = 0.05
 				production_factory_efficiency_gain_factor = 0.05
-				consumer_goods_factor = -0.10
+				consumer_goods_factor = -0.20
 			}
 		}
 		CCN_Naval_Buildup = {
@@ -627,7 +627,7 @@ ideas = {
 				always = yes
 			}
 			modifier = {
-				consumer_goods_factor = 0.07
+				consumer_goods_factor = 0.14
 				production_speed_naval_base_factor = -0.5
 				production_factory_max_efficiency_factor = -0.05
 			}
diff --git a/common/ideas/zzz_CHN_ideas.txt b/common/ideas/zzz_CHN_ideas.txt
index e8e4d4c77cf..434723f3a1c 100644
--- a/common/ideas/zzz_CHN_ideas.txt
+++ b/common/ideas/zzz_CHN_ideas.txt
@@ -444,7 +444,7 @@ ideas = {
 				political_power_gain = -0.5
 				stability_factor = -0.2
 				war_support_factor = -0.2
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				custom_modifier_tooltip = ZES_military_blocked_tp
 			}
 			on_add = {
@@ -545,7 +545,7 @@ ideas = {
 			modifier = {
 				war_support_weekly = -0.001
 				stability_weekly = -0.001
-				consumer_goods_factor = -0.1
+				consumer_goods_factor = -0.2
 				democratic_drift = 0.01
 				communism_drift = 0.01
 				industry_repair_factor = 0.1
@@ -835,7 +835,7 @@ ideas = {
 			removal_cost = -1
 			picture = generic_production_bonus
 			modifier = {
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 				global_building_slots_factor = 0.04
 				stability_factor = 0.07
 				MONTHLY_POPULATION = 0.03
@@ -870,7 +870,7 @@ ideas = {
 				production_speed_buildings_factor = 0.1
 				industrial_capacity_factory = 0.15
 				industrial_capacity_dockyard = 0.15
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 		CHN_celestial_resistance = {
@@ -953,7 +953,7 @@ ideas = {
 			removal_cost = -1
 			picture = gre_schachtplan
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				production_speed_buildings_factor = 0.15
 			}
 		}
@@ -1229,7 +1229,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				production_speed_buildings_factor = 0.1
-				consumer_goods_factor = -0.01
+				consumer_goods_factor = -0.02
 				non_core_manpower = -0.01
 			}
 		}
@@ -1603,7 +1603,7 @@ ideas = {
 			}
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				industrial_capacity_factory = 0.05
 				industrial_capacity_dockyard = 0.05
 				land_equipment_upgrade_xp_cost = -0.5
diff --git a/common/ideas/zzz_CRY_SOL_ideas.txt b/common/ideas/zzz_CRY_SOL_ideas.txt
index 21ece68bf95..fc02babc864 100644
--- a/common/ideas/zzz_CRY_SOL_ideas.txt
+++ b/common/ideas/zzz_CRY_SOL_ideas.txt
@@ -77,7 +77,7 @@ ideas = {
 
 			modifier = {
 				war_support_factor = 0.15
-				consumer_goods_factor = -0.03
+				consumer_goods_factor = -0.06
 				conscription_factor = 0.1
 				fascism_drift = 0.03
 			}
@@ -97,7 +97,7 @@ ideas = {
 
 			modifier = {
 				war_support_factor = 0.2
-				consumer_goods_factor = -0.03
+				consumer_goods_factor = -0.06
 				conscription_factor = 0.15
 				industrial_capacity_factory = 0.1
 				industrial_capacity_dockyard = 0.1
@@ -261,7 +261,7 @@ ideas = {
 
 			modifier = {
 				war_support_factor = 0.15
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 				mobilization_speed = 0.2
 				political_power_factor = 0.2
 				enemy_operative_detection_chance_factor = 0.15
diff --git a/common/ideas/zzz_CRY_ideas.txt b/common/ideas/zzz_CRY_ideas.txt
index 17c9c3b1729..36e5d57287d 100644
--- a/common/ideas/zzz_CRY_ideas.txt
+++ b/common/ideas/zzz_CRY_ideas.txt
@@ -824,7 +824,7 @@ ideas = {
 				mobilization_laws_cost_factor = -0.25
 				production_speed_arms_factory_factor = 0.25
 				production_speed_industrial_complex_factor = 0.15
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 		sombra_military_effort_lar = {
@@ -849,7 +849,7 @@ ideas = {
 				mobilization_laws_cost_factor = -0.25
 				production_speed_arms_factory_factor = 0.25
 				production_speed_industrial_complex_factor = 0.15
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 	}
@@ -1381,7 +1381,7 @@ ideas = {
 			removal_cost = -1
 			picture = CRY_austerity_measures
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				production_factory_efficiency_gain_factor = 0.05
 
 			}
@@ -1631,7 +1631,7 @@ ideas = {
 			picture = NLR_moonlight
 			modifier = {
 				stability_factor = 0.1
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 		CRY_NLR_loyalty_to_the_moon_idea = {
diff --git a/common/ideas/zzz_CTH_Monzano_ideas.txt b/common/ideas/zzz_CTH_Monzano_ideas.txt
index d01b59b4c94..9efdfe998a0 100644
--- a/common/ideas/zzz_CTH_Monzano_ideas.txt
+++ b/common/ideas/zzz_CTH_Monzano_ideas.txt
@@ -311,7 +311,7 @@ ideas = {
 				industrial_capacity_dockyard = -0.15
 				production_factory_max_efficiency_factor = -0.15
 				MONTHLY_POPULATION = -0.15
-				consumer_goods_factor = 0.15
+				consumer_goods_factor = 0.3
 				political_power_gain = -0.20
 				custom_modifier_tooltip = CTH_MZN_growing_food_supply_tt
 			}
@@ -366,7 +366,7 @@ ideas = {
 
 			modifier = {
 				political_power_gain = -0.20
-				consumer_goods_factor = 0.10
+				consumer_goods_factor = 0.20
 			}
 		}
 		CTH_MZN_race_to_trotkat = {
diff --git a/common/ideas/zzz_CTH_ideas.txt b/common/ideas/zzz_CTH_ideas.txt
index 3c740dd0484..9079af2d11d 100644
--- a/common/ideas/zzz_CTH_ideas.txt
+++ b/common/ideas/zzz_CTH_ideas.txt
@@ -77,7 +77,7 @@ ideas = {
 				send_volunteers_tension = -1
 				send_volunteer_divisions_required = -0.75
 				send_volunteer_size = 3
-				consumer_goods_factor = 0.025
+				consumer_goods_factor = 0.05
 				training_time_army_factor = -0.1
 				army_morale_factor = -0.1
 				army_org_Factor = -0.1
@@ -122,7 +122,7 @@ ideas = {
 				training_time_army_factor = -0.1
 				army_morale_factor = -0.1
 				army_org_Factor = -0.1
-				consumer_goods_factor = -0.1
+				consumer_goods_factor = -0.2
 			}
 		}
 		CTH_army_of_merceneries_3c = {
@@ -142,7 +142,7 @@ ideas = {
 				send_volunteers_tension = -1
 				send_volunteer_divisions_required = -0.75
 				send_volunteer_size = 3
-				consumer_goods_factor = -0.1
+				consumer_goods_factor = -0.2
 			}
 		}
 		CTH_army_of_merceneries_4 = {
@@ -161,7 +161,7 @@ ideas = {
 				send_volunteers_tension = -1
 				send_volunteer_divisions_required = -0.75
 				send_volunteer_size = 3
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 			}
 		}
 
@@ -178,7 +178,7 @@ ideas = {
 			}
 			
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				local_resources_factor = 0.15
 			}
 		}
@@ -197,7 +197,7 @@ ideas = {
 			}
 			
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				local_resources_factor = 0.15
 				production_speed_arms_factory_factor = 0.1
 				production_speed_industrial_complex_factor = 0.1
@@ -219,7 +219,7 @@ ideas = {
 			}
 			
 			modifier = {
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 			}
 		}
 		
@@ -400,7 +400,7 @@ ideas = {
 			}
 			
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 
@@ -501,7 +501,7 @@ ideas = {
 			modifier = {
 				industrial_capacity_factory = -0.2
 				political_power_factor = -0.25
-				consumer_goods_factor = 0.1
+				consumer_goods_factor = 0.2
 			}
 		}
 		CTH_clean_government = {
@@ -516,7 +516,7 @@ ideas = {
 			modifier = {
 				political_power_gain = 0.15
 				stability_factor = 0.05
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 			}
 		}
 		CTH_mechanise_agriculture = {
@@ -525,7 +525,7 @@ ideas = {
 			}
 			picture = LIT_invested_in_farms
 			modifier = {
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 				MONTHLY_POPULATION = 0.25
 			}
 		}
@@ -629,7 +629,7 @@ ideas = {
 			}
 			
 			modifier = {
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				production_speed_industrial_complex_factor = 0.25
 				production_speed_infrastructure_factor = 0.25
 			}
@@ -767,7 +767,7 @@ ideas = {
                 trade_cost_for_target_factor = -0.1
             }
             modifier = {
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 				stability_factor = 0.05
 				political_power_gain = 0.1
             }
@@ -951,7 +951,7 @@ ideas = {
 			modifier = {
 				line_change_production_efficiency_factor = 0.1
 				production_factory_efficiency_gain_factor = 0.1
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 			}
 		}
 		CTH_state_planned_economy = {
@@ -1087,7 +1087,7 @@ ideas = {
 				aircraft_manufacturer_cost_factor = -0.5
 				materiel_manufacturer_cost_factor = -0.5
 				industrial_concern_cost_factor = 0.5
-				consumer_goods_factor = 0.025
+				consumer_goods_factor = 0.05
 			}
 		}
 		CTH_widespread_potion_use = {
@@ -1108,7 +1108,7 @@ ideas = {
 				monthly_population = 0.2
 				industrial_capacity_factory = 0.1
 				industrial_capacity_dockyard = 0.1
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 			}
 		}
 		CTH_wholesome_eugenics_program = {
@@ -1127,7 +1127,7 @@ ideas = {
 			modifier = {
 				stability_factor = -0.05
 				monthly_population = -0.1
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 			}
 		}
 		CTH_wholesome_poverty_relief = {
@@ -1145,7 +1145,7 @@ ideas = {
 
 			modifier = {
 				stability_factor = 0.05
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 			}
 		}
 		CTH_neutrality_proclamation = {
@@ -1414,7 +1414,7 @@ ideas = {
 
 			modifier = {
 				political_power_gain = 0.15
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 		CTH_central_bank = {
@@ -1658,7 +1658,7 @@ ideas = {
 
 			modifier = {
 				production_speed_industrial_complex_factor = 0.1
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 				industrial_capacity_factory = 0.1
 				industrial_capacity_dockyard = 0.1
 				trade_opinion_factor = 0.25
@@ -1681,7 +1681,7 @@ ideas = {
 
 			modifier = {
 				production_speed_industrial_complex_factor = -0.1
-				consumer_goods_factor = 0.025
+				consumer_goods_factor = 0.05
 				industrial_capacity_factory = -0.1
 				industrial_capacity_dockyard = -0.1
 				trade_opinion_factor = -0.25
@@ -2381,7 +2381,7 @@ ideas = {
 
 			modifier = {
 				local_resources_factor = 0.1
-				consumer_goods_factor = 0.025
+				consumer_goods_factor = 0.05
 			}
 		}
 		CTC_foundation_of_professional_army_logi_bonus = {
@@ -2452,7 +2452,7 @@ ideas = {
 
 			modifier = {
 				political_power_gain = 0.15
-				consumer_goods_factor = -0.1
+				consumer_goods_factor = -0.2
 				stability_factor = -0.05
 			}
 		}
@@ -2495,7 +2495,7 @@ ideas = {
 
 			modifier = {
 				political_power_gain = 0.1
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				stability_factor = -0.05
 			}
 		}
diff --git a/common/ideas/zzz_CTL_ideas.txt b/common/ideas/zzz_CTL_ideas.txt
index 7120d370596..c13d30b5750 100644
--- a/common/ideas/zzz_CTL_ideas.txt
+++ b/common/ideas/zzz_CTL_ideas.txt
@@ -14,7 +14,7 @@ ideas = {
 			
 			picture = CTL_neglect
 			modifier = {
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				production_speed_infrastructure_factor = -0.1
 				production_factory_max_efficiency_factor = -0.1
 				local_resources_factor = -0.1
@@ -140,7 +140,7 @@ ideas = {
 			
 			picture = CTL_hindia_sickle
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				production_speed_buildings_factor = 0.05
 				production_factory_max_efficiency_factor = -0.1
 			}
@@ -244,7 +244,7 @@ ideas = {
 			
 			picture = ROM_king_carol_ii_hedonist
 			modifier = {
-				consumer_goods_factor = -0.04
+				consumer_goods_factor = -0.08
 				trade_opinion_factor = 0.2
 			}
 		}
@@ -261,7 +261,7 @@ ideas = {
 			
 			picture = ROM_king_carol_ii_hedonist
 			modifier = {
-				consumer_goods_factor = -0.08
+				consumer_goods_factor = -0.16
 				trade_opinion_factor = 0.4
 			}
 		}
@@ -403,7 +403,7 @@ ideas = {
 			
 			picture = CTL_navalspending
 			modifier = {
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				industrial_capacity_dockyard = 0.1
 				naval_coordination = 0.1
 			}
@@ -438,7 +438,7 @@ ideas = {
 			
 			picture = CTL_navalspending
 			modifier = {
-				consumer_goods_factor = 0.1
+				consumer_goods_factor = 0.2
 				naval_speed_factor = 0.15
 				industrial_capacity_dockyard = 0.075
 				naval_coordination = 0.15
@@ -457,7 +457,7 @@ ideas = {
 			
 			picture = generic_exploit_mines
 			modifier = {
-				consumer_goods_factor = 0.03
+				consumer_goods_factor = 0.06
 				production_speed_infrastructure_factor = -0.05
 				production_factory_max_efficiency_factor = -0.1
 				local_resources_factor = -0.05
@@ -492,7 +492,7 @@ ideas = {
 			
 			picture = generic_exploit_mines
 			modifier = {
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				production_speed_infrastructure_factor = -0.05
 				production_factory_max_efficiency_factor = -0.05
 				local_resources_factor = -0.1
@@ -511,7 +511,7 @@ ideas = {
 
 			picture = generic_exploit_mines
 			modifier = {
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				production_factory_max_efficiency_factor = -0.05
 			}
 		}
@@ -545,7 +545,7 @@ ideas = {
 
 			picture = generic_exploit_mines
 			modifier = {
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				production_speed_infrastructure_factor = 0.15
 				local_resources_factor = 0.05
 				production_factory_efficiency_gain_factor = 0.05
@@ -565,7 +565,7 @@ ideas = {
 
 			picture = HIRA_road
 			modifier = {
-				consumer_goods_factor = 0.03
+				consumer_goods_factor = 0.06
 				production_speed_infrastructure_factor = -0.075
 				production_factory_max_efficiency_factor = -0.075
 				local_resources_factor = -0.075
@@ -584,7 +584,7 @@ ideas = {
 			
 			picture = HIRA_road
 			modifier = {
-				consumer_goods_factor = 0.01
+				consumer_goods_factor = 0.02
 				production_speed_infrastructure_factor = -0.025
 				local_resources_factor = -0.05
 			}
@@ -636,7 +636,7 @@ ideas = {
 
 			picture = chi_hyper_inflation3
 			modifier = {
-				consumer_goods_factor = 0.04
+				consumer_goods_factor = 0.08
 				production_factory_max_efficiency_factor = 0.05
 				line_change_production_efficiency_factor = 0.1
 			}
@@ -707,7 +707,7 @@ ideas = {
 			
 			picture = HIRA_cash
 			modifier = {
-				consumer_goods_factor = -0.03
+				consumer_goods_factor = -0.06
 				production_factory_max_efficiency_factor = -0.05
 				industrial_capacity_factory = 0.1
 			}
@@ -742,7 +742,7 @@ ideas = {
 			
 			picture = HIRA_hammer
 			modifier = {
-				consumer_goods_factor = 0.03
+				consumer_goods_factor = 0.06
 				industrial_capacity_factory = 0.05
 				production_factory_max_efficiency_factor = 0.1
 			}
@@ -1285,7 +1285,7 @@ ideas = {
 
 			picture = generic_foreign_capital
 			modifier = {
-				consumer_goods_factor = -0.06
+				consumer_goods_factor = -0.12
 				trade_laws_cost_factor = -0.2
 				economy_cost_factor = -0.2
 			}
@@ -1640,7 +1640,7 @@ ideas = {
 			
 			picture = HIRA_viking
 			modifier = {
-				consumer_goods_factor = -0.03
+				consumer_goods_factor = -0.06
 				industrial_capacity_dockyard = -0.05	
 				industrial_capacity_factory = 0.05
 			}
@@ -1709,7 +1709,7 @@ ideas = {
 			picture = hol_aloof_neutrality
 			modifier = {
 				political_power_gain = -0.1
-				consumer_goods_factor = -0.03
+				consumer_goods_factor = -0.06
 			}
 		}
 		CTL_influence_of_huddarnen = {
@@ -1847,7 +1847,7 @@ ideas = {
 
 			picture = generic_coastal_navy
 			modifier = {
-			consumer_goods_factor = 0.03
+			consumer_goods_factor = 0.06
 			production_speed_infrastructure_factor = 0.1
 			production_speed_dockyard_factor = 0.15
 			}
@@ -2457,7 +2457,7 @@ ideas = {
 			picture = CTL_service
 			modifier = {
 				monthly_population = -0.15
-				consumer_goods_factor = -0.07
+				consumer_goods_factor = -0.14
 				production_speed_buildings_factor = 0.04
 				production_speed_infrastructure_factor = 0.04
 			}
@@ -2475,7 +2475,7 @@ ideas = {
 
 			picture = chi_hyper_inflation2
 			modifier = {
-				consumer_goods_factor = -0.03
+				consumer_goods_factor = -0.06
 			}
 		}
 		CTL_magical_education = {
@@ -2738,7 +2738,7 @@ ideas = {
 			}
 			modifier = {
 			neutrality_drift = 0.01
-			consumer_goods_factor = -0.025
+			consumer_goods_factor = -0.05
 			}
 			traits = { CTL_a_bride_for_chital }
 			ai_will_do = {
diff --git a/common/ideas/zzz_CVA_ideas.txt b/common/ideas/zzz_CVA_ideas.txt
index 92c5e9791e8..e215b9eb427 100644
--- a/common/ideas/zzz_CVA_ideas.txt
+++ b/common/ideas/zzz_CVA_ideas.txt
@@ -269,7 +269,7 @@ ideas = {
 			picture = STG_collectivization_effort 
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.10
+				consumer_goods_factor = 0.20
 				local_resources_factor = -0.15
 				political_power_factor = -0.05
 			}
@@ -629,7 +629,7 @@ ideas = {
 			picture = generic_agrarian_reform 
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 				political_power_factor = 0.05
 				local_resources_factor = 0.05
 			}
@@ -652,7 +652,7 @@ ideas = {
 			picture = generic_agrarian_reform 
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.03
+				consumer_goods_factor = -0.06
 				political_power_factor = 0.075
 				local_resources_factor = 0.10
 			}
@@ -675,7 +675,7 @@ ideas = {
 			picture = LEC_staggering_reserves 
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				political_power_gain = 0.10
 			}
 		}
@@ -768,7 +768,7 @@ ideas = {
 			modifier = {
 				production_factory_efficiency_gain_factor = 0.10
 				industrial_capacity_factory = 0.10
-				consumer_goods_factor = 0.025
+				consumer_goods_factor = 0.05
 				political_power_factor = -0.05
 			}
 		}
@@ -794,7 +794,7 @@ ideas = {
 				MONTHLY_POPULATION = 0.15
 				army_defence_factor = 0.05
 				attrition = -0.05
-				consumer_goods_factor = 0.025
+				consumer_goods_factor = 0.05
 			}
 		}
 	}
@@ -926,7 +926,7 @@ ideas = {
 				industrial_capacity_dockyard = -0.30
 				production_factory_max_efficiency_factor = -0.30
 				MONTHLY_POPULATION = -0.30
-				consumer_goods_factor = 0.15
+				consumer_goods_factor = 0.3
 			}
 		}
 	}
@@ -955,7 +955,7 @@ ideas = {
 				industrial_capacity_dockyard = -0.25
 				production_factory_max_efficiency_factor = -0.25
 				MONTHLY_POPULATION = -0.25
-				consumer_goods_factor = 0.15
+				consumer_goods_factor = 0.3
 			}
 		}
 	}
@@ -984,7 +984,7 @@ ideas = {
 				industrial_capacity_dockyard = -0.20
 				production_factory_max_efficiency_factor = -0.20
 				MONTHLY_POPULATION = -0.20
-				consumer_goods_factor = 0.10
+				consumer_goods_factor = 0.2
 			}
 		}
 	}
@@ -1013,7 +1013,7 @@ ideas = {
 				industrial_capacity_dockyard = -0.15
 				production_factory_max_efficiency_factor = -0.15
 				MONTHLY_POPULATION = -0.15
-				consumer_goods_factor = 0.10
+				consumer_goods_factor = 0.2
 			}
 		}
 	}
@@ -1042,7 +1042,7 @@ ideas = {
 				industrial_capacity_dockyard = -0.10
 				production_factory_max_efficiency_factor = -0.10
 				MONTHLY_POPULATION = -0.10
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 			}
 		}
 	}
@@ -1134,7 +1134,7 @@ ideas = {
 				custom_modifier_tooltip = CVA_authority_0_25_tp
 				industrial_capacity_factory = 0.05
 				production_speed_buildings_factor = 0.05
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 			}
 		}
 	}
@@ -1156,7 +1156,7 @@ ideas = {
 				custom_modifier_tooltip = CVA_authority_0_25_tp
 				industrial_capacity_factory = 0.05
 				production_speed_buildings_factor = 0.05
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 			}
 		}
 	}
@@ -1177,7 +1177,7 @@ ideas = {
 			modifier = {
 				industrial_capacity_factory = 0.05
 				production_speed_buildings_factor = 0.05
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 			}
 		}
 	}
@@ -1198,7 +1198,7 @@ ideas = {
 			modifier = {
 				industrial_capacity_factory = 0.05
 				production_speed_buildings_factor = 0.10
-				consumer_goods_factor = -0.03
+				consumer_goods_factor = -0.06
 				stability_factor = -0.05
 				political_power_factor = -0.05
 			}
@@ -1221,7 +1221,7 @@ ideas = {
 			modifier = {
 				industrial_capacity_factory = 0.075
 				production_speed_buildings_factor = 0.10
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				stability_factor = -0.10
 				political_power_factor = -0.05
 			}
@@ -1245,7 +1245,7 @@ ideas = {
 				custom_modifier_tooltip = CVA_gain_authority_0_30_tp
 				industrial_capacity_factory = -0.10
 				production_speed_buildings_factor = -0.15
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 			}
 		}
 	}
@@ -1267,7 +1267,7 @@ ideas = {
 				custom_modifier_tooltip = CVA_gain_authority_0_30_tp
 				industrial_capacity_factory = -0.10
 				production_speed_buildings_factor = -0.15
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 			}
 		}
 	}
@@ -1360,7 +1360,7 @@ ideas = {
 				custom_modifier_tooltip = CVA_gain_authority_0_30_tp
 				industrial_capacity_dockyard = -0.90
 				repair_speed_factor = -0.50
-				consumer_goods_factor = 0.10
+				consumer_goods_factor = 0.2
 			}
 		}
 	}
@@ -1383,7 +1383,7 @@ ideas = {
 			modifier = {
 				industrial_capacity_dockyard = -0.90
 				repair_speed_factor = -0.50
-				consumer_goods_factor = 0.10
+				consumer_goods_factor = 0.2
 			}
 		}
 	}
@@ -1502,7 +1502,7 @@ ideas = {
 				custom_modifier_tooltip = CVA_gain_authority_0_30_tp
 				MONTHLY_POPULATION = -0.25
 				conscription_factor = -0.15
-				consumer_goods_factor = 0.10
+				consumer_goods_factor = 0.2
 			}
 		}
 	}
@@ -1565,7 +1565,7 @@ ideas = {
 			picture = Generic_bank_idea_icon
 			
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				production_factory_efficiency_gain_factor = 0.075
 				production_factory_max_efficiency_factor = 0.075
 				min_export = 0.10
@@ -1588,7 +1588,7 @@ ideas = {
 			picture = Generic_bank_idea_icon
 			
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				production_factory_efficiency_gain_factor = 0.10
 				production_factory_max_efficiency_factor = 0.10
 				min_export = 0.15
@@ -1611,7 +1611,7 @@ ideas = {
 			picture = Generic_bank_idea_icon
 			
 			modifier = {
-				consumer_goods_factor = -0.075
+				consumer_goods_factor = -0.15
 				production_factory_efficiency_gain_factor = 0.15
 				production_factory_max_efficiency_factor = 0.15
 				min_export = 0.20
@@ -1705,7 +1705,7 @@ ideas = {
 				industrial_capacity_factory = 0.10
 				local_resources_factor = 0.10
 				political_power_factor = 0.075
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 				min_export = 0.10
 			}
 		}
@@ -1726,7 +1726,7 @@ ideas = {
 			picture = LEC_staggering_reserves
 			
 			modifier = {
-				consumer_goods_factor = 0.10
+				consumer_goods_factor = 0.2
 				political_power_factor = 0.15
 				stability_weekly = 0.0025
 			}
@@ -2274,7 +2274,7 @@ ideas = {
 				global_building_slots_factor = 0.15
 				industrial_capacity_factory = 0.10
 				political_power_factor = -0.10
-				consumer_goods_factor = 0.025
+				consumer_goods_factor = 0.05
 			}
 		}
 	}
@@ -2317,7 +2317,7 @@ ideas = {
 			modifier = {
 				local_resources_factor = 0.10
 				trade_opinion_factor = 0.15
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 				stability_factor = -0.05
 				conscription_factor = -0.05
 			}
@@ -2340,7 +2340,7 @@ ideas = {
 			modifier = {
 				local_resources_factor = 0.10
 				trade_opinion_factor = 0.20
-				consumer_goods_factor = -0.04
+				consumer_goods_factor = -0.08
 				MONTHLY_POPULATION = 0.10
 			}
 		}
@@ -2361,7 +2361,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				stability_factor = 0.05
-				consumer_goods_factor = 0.025
+				consumer_goods_factor = 0.05
 			}
 			research_bonus = {
 				industry = 0.05
@@ -2387,7 +2387,7 @@ ideas = {
 			modifier = {
 				stability_factor = 0.075
 				research_speed_factor = 0.03
-				consumer_goods_factor = 0.04
+				consumer_goods_factor = 0.08
 			}
 			research_bonus = {
 				industry = 0.075
@@ -2414,7 +2414,7 @@ ideas = {
 				stability_factor = 0.10
 				MONTHLY_POPULATION = 0.05
 				research_speed_factor = 0.05
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 			}
 			research_bonus = {
 				industry = 0.10
@@ -2441,7 +2441,7 @@ ideas = {
 				stability_factor = 0.15
 				MONTHLY_POPULATION = 0.10
 				research_speed_factor = 0.075
-				consumer_goods_factor = 0.075
+				consumer_goods_factor = 0.15
 			}
 			research_bonus = {
 				industry = 0.15
@@ -2601,7 +2601,7 @@ ideas = {
 			modifier = {
 				compliance_growth = 0.05
 				resistance_growth = -0.10
-				consumer_goods_factor = 0.025
+				consumer_goods_factor = 0.05
 			}
 		}
 	}
@@ -3557,7 +3557,7 @@ ideas = {
 			picture = severe_famine6 
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.025
+				consumer_goods_factor = 0.05
 				no_supply_grace = -8
 				army_morale_factor = 0.05
 				out_of_supply_factor = -0.10
@@ -3926,7 +3926,7 @@ ideas = {
 				CVA_CTH_Weekly_Pragmatist_Influence = 0.4
 				research_speed_factor = 0.15
 				industrial_capacity_factory = -0.10
-				consumer_goods_factor = 0.10
+				consumer_goods_factor = 0.2
 				neutrality_drift = 0.05
 			}
 		}
@@ -4056,7 +4056,7 @@ ideas = {
 			modifier = {
 				CVA_CTH_Weekly_Pragmatist_Influence = 0.4
 				industrial_capacity_factory = 0.15
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				neutrality_drift = 0.05
 			}
 		}
@@ -4163,7 +4163,7 @@ ideas = {
 			picture = LEC_staggering_reserves 
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				industrial_capacity_factory = 0.10
 				political_power_factor = 0.10
 			}
@@ -4184,7 +4184,7 @@ ideas = {
 			picture = tur_balkan_central_bank_wealthy_greece 
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 				industrial_capacity_factory = 0.05
 				political_power_factor = 0.05
 			}
diff --git a/common/ideas/zzz_CYA_ideas.txt b/common/ideas/zzz_CYA_ideas.txt
index bb70cb36175..ccbd552c4b3 100644
--- a/common/ideas/zzz_CYA_ideas.txt
+++ b/common/ideas/zzz_CYA_ideas.txt
@@ -929,7 +929,7 @@ ideas = {
 				war_support_factor = 0.05
 				production_speed_buildings_factor = 0.05
 				min_export = -0.25
-				consumer_goods_factor = -0.25
+				consumer_goods_factor = -0.5
 			}
 		}
 		CYA_mit_intensified_tribal_conflicts = {
@@ -1259,7 +1259,7 @@ ideas = {
 
 			modifier = {
 				MONTHLY_POPULATION = 0.05
-				consumer_goods_factor = -0.1
+				consumer_goods_factor = -0.2
 				min_export = -0.1
 			}
 		}
diff --git a/common/ideas/zzz_DED_APF_ideas.txt b/common/ideas/zzz_DED_APF_ideas.txt
index 86f07c6be81..d4f3b889531 100644
--- a/common/ideas/zzz_DED_APF_ideas.txt
+++ b/common/ideas/zzz_DED_APF_ideas.txt
@@ -88,7 +88,7 @@ ideas = {
 
 			modifier = {
 				monthly_population = 1
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				production_speed_buildings_factor = 0.25
 			}
 		}
@@ -596,7 +596,7 @@ ideas = {
 			removal_cost = -1
 
 			modifier = {
-				consumer_goods_factor = 0.10
+				consumer_goods_factor = 0.2
 				research_speed_factor = 0.1
 				conversion_cost_civ_to_mil_factor= -0.5
 				conversion_cost_mil_to_civ_factor = -0.5
diff --git a/common/ideas/zzz_DED_ideas.txt b/common/ideas/zzz_DED_ideas.txt
index 28108ff0570..80d202a075e 100644
--- a/common/ideas/zzz_DED_ideas.txt
+++ b/common/ideas/zzz_DED_ideas.txt
@@ -480,7 +480,7 @@ ideas = {
 			picture = generic_research_bonus
 			modifier = {
 				research_speed_factor = 0.3
-				consumer_goods_factor = -0.1
+				consumer_goods_factor = -0.2
 			}
 
 		}
@@ -568,7 +568,7 @@ ideas = {
 			modifier = {
 				production_factory_start_efficiency_factor = 0.10
 				monthly_population = 0.2
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 
 		}
diff --git a/common/ideas/zzz_DMT_ideas.txt b/common/ideas/zzz_DMT_ideas.txt
index 9b0e9325a19..a26bf9c4843 100644
--- a/common/ideas/zzz_DMT_ideas.txt
+++ b/common/ideas/zzz_DMT_ideas.txt
@@ -96,7 +96,7 @@ ideas = {
 			removal_cost = -1
 
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				political_power_factor = -0.1
 				local_resources_factor = 0.1
 			}
@@ -124,7 +124,7 @@ ideas = {
 
 			modifier = {
 				stability_factor = -0.1
-				consumer_goods_factor = -0.07
+				consumer_goods_factor = -0.14
 				political_power_factor = -0.2
 				local_resources_factor = 0.15
 				industrial_capacity_factory = 0.1
@@ -153,7 +153,7 @@ ideas = {
 
 			modifier = {
 				stability_factor = -0.05
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				political_power_factor = -0.1
 				local_resources_factor = -0.15
 				industrial_capacity_factory = -0.1
@@ -273,7 +273,7 @@ ideas = {
 			removal_cost = -1
 
 			modifier = {
-				consumer_goods_factor = -0.1
+				consumer_goods_factor = -0.2
 				political_power_factor = 0.1
 			}
 		}
@@ -478,7 +478,7 @@ ideas = {
 			removal_cost = -1
 
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 
@@ -651,7 +651,7 @@ ideas = {
 			removal_cost = -1
 
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				industrial_capacity_factory = 0.05
 				industrial_capacity_dockyard = 0.05
 			}
diff --git a/common/ideas/zzz_EQC_BNPL_ideas.txt b/common/ideas/zzz_EQC_BNPL_ideas.txt
index 9c163314aae..0f024972332 100644
--- a/common/ideas/zzz_EQC_BNPL_ideas.txt
+++ b/common/ideas/zzz_EQC_BNPL_ideas.txt
@@ -16,7 +16,7 @@ ideas = {
 			picture = ger_mefo_bills
 
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				production_speed_arms_factory_factor = 0.15
 				production_speed_dockyard_factor = 0.15
 				production_speed_naval_base_factor = 0.15
@@ -45,7 +45,7 @@ ideas = {
 			picture = ger_mefo_bills
 
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				production_speed_arms_factory_factor = 0.15
 				production_speed_dockyard_factor = 0.15
 				production_speed_naval_base_factor = 0.15
@@ -74,7 +74,7 @@ ideas = {
 			picture = ger_mefo_bills
 
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				production_speed_arms_factory_factor = 0.15
 				production_speed_dockyard_factor = 0.15
 				production_speed_naval_base_factor = 0.15
@@ -103,7 +103,7 @@ ideas = {
 			picture = ger_mefo_bills
 
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				production_speed_arms_factory_factor = 0.15
 				production_speed_dockyard_factor = 0.15
 				production_speed_naval_base_factor = 0.15
@@ -132,7 +132,7 @@ ideas = {
 			picture = ger_mefo_bills
 
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				production_speed_arms_factory_factor = 0.15
 				production_speed_dockyard_factor = 0.15
 				production_speed_naval_base_factor = 0.15
@@ -161,7 +161,7 @@ ideas = {
 			picture = ger_mefo_bills
 
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				production_speed_arms_factory_factor = 0.15
 				production_speed_dockyard_factor = 0.15
 				production_speed_naval_base_factor = 0.15
@@ -190,7 +190,7 @@ ideas = {
 			picture = ger_mefo_bills
 
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				production_speed_arms_factory_factor = 0.15
 				production_speed_dockyard_factor = 0.15
 				production_speed_naval_base_factor = 0.15
@@ -219,7 +219,7 @@ ideas = {
 			picture = ger_mefo_bills
 
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				production_speed_arms_factory_factor = 0.15
 				production_speed_dockyard_factor = 0.15
 				production_speed_naval_base_factor = 0.15
@@ -248,7 +248,7 @@ ideas = {
 			picture = ger_mefo_bills
 
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				production_speed_arms_factory_factor = 0.15
 				production_speed_dockyard_factor = 0.15
 				production_speed_naval_base_factor = 0.15
@@ -277,7 +277,7 @@ ideas = {
 			picture = ger_mefo_bills
 
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				production_speed_arms_factory_factor = 0.15
 				production_speed_dockyard_factor = 0.15
 				production_speed_naval_base_factor = 0.15
@@ -306,7 +306,7 @@ ideas = {
 			picture = ger_mefo_bills
 
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				production_speed_arms_factory_factor = 0.15
 				production_speed_dockyard_factor = 0.15
 				production_speed_naval_base_factor = 0.15
@@ -335,7 +335,7 @@ ideas = {
 			picture = ger_mefo_bills
 
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				production_speed_arms_factory_factor = 0.15
 				production_speed_dockyard_factor = 0.15
 				production_speed_naval_base_factor = 0.15
@@ -364,7 +364,7 @@ ideas = {
 			picture = ger_mefo_bills
 
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				production_speed_arms_factory_factor = 0.15
 				production_speed_dockyard_factor = 0.15
 				production_speed_naval_base_factor = 0.15
@@ -393,7 +393,7 @@ ideas = {
 			picture = ger_mefo_bills
 
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				production_speed_arms_factory_factor = 0.15
 				production_speed_dockyard_factor = 0.15
 				production_speed_naval_base_factor = 0.15
@@ -422,7 +422,7 @@ ideas = {
 			picture = ger_mefo_bills
 
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				production_speed_arms_factory_factor = 0.15
 				production_speed_dockyard_factor = 0.15
 				production_speed_naval_base_factor = 0.15
@@ -451,7 +451,7 @@ ideas = {
 			picture = ger_mefo_bills
 
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				production_speed_arms_factory_factor = 0.15
 				production_speed_dockyard_factor = 0.15
 				production_speed_naval_base_factor = 0.15
@@ -480,7 +480,7 @@ ideas = {
 			picture = ger_mefo_bills
 
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				production_speed_arms_factory_factor = 0.15
 				production_speed_dockyard_factor = 0.15
 				production_speed_naval_base_factor = 0.15
@@ -509,7 +509,7 @@ ideas = {
 			picture = ger_mefo_bills
 
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				production_speed_arms_factory_factor = 0.15
 				production_speed_dockyard_factor = 0.15
 				production_speed_naval_base_factor = 0.15
@@ -537,7 +537,7 @@ ideas = {
 			picture = ger_mefo_bills_payment
 
 			modifier = {
-				consumer_goods_factor = 0.15
+				consumer_goods_factor = 0.3
 			}
 		}
 	}
diff --git a/common/ideas/zzz_EQC_Equality_ideas.txt b/common/ideas/zzz_EQC_Equality_ideas.txt
index 9134c6a0034..428579ffc99 100644
--- a/common/ideas/zzz_EQC_Equality_ideas.txt
+++ b/common/ideas/zzz_EQC_Equality_ideas.txt
@@ -76,7 +76,7 @@ ideas = {
 			picture = generic_agrarian_society
 
 			modifier = {
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 			}
 		}
 
@@ -133,7 +133,7 @@ ideas = {
 			picture = generic_goods_red_bonus
 
 			modifier = {
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 				min_export = -0.05
 				stability_factor = 0.05
 			}
@@ -225,7 +225,7 @@ ideas = {
 			modifier = {
 				line_change_production_efficiency_factor = 0.1
 				production_factory_start_efficiency_factor = 0.05
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 
diff --git a/common/ideas/zzz_EQC_MARE_ideas.txt b/common/ideas/zzz_EQC_MARE_ideas.txt
index f8477d9c4b3..438b5ab2c99 100644
--- a/common/ideas/zzz_EQC_MARE_ideas.txt
+++ b/common/ideas/zzz_EQC_MARE_ideas.txt
@@ -19,7 +19,7 @@ ideas = {
 				stability_factor = -0.5
 				industrial_capacity_factory = -0.5
 				industrial_capacity_dockyard =  -0.5
-				consumer_goods_factor = 0.5
+				consumer_goods_factor = 1
 				local_resources_factor = -0.5
 				research_speed_factor = -0.5
 				MONTHLY_POPULATION = -0.15
@@ -45,7 +45,7 @@ ideas = {
 				stability_factor = -0.4
 				industrial_capacity_factory = -0.4
 				industrial_capacity_dockyard =  -0.4
-				consumer_goods_factor = 0.4
+				consumer_goods_factor = 0.8
 				local_resources_factor = -0.4
 				research_speed_factor = -0.4
 				MONTHLY_POPULATION = -0.1
@@ -71,7 +71,7 @@ ideas = {
 				stability_factor = -0.25
 				industrial_capacity_factory = -0.25
 				industrial_capacity_dockyard =  -0.25
-				consumer_goods_factor = 0.25
+				consumer_goods_factor = 0.5
 				local_resources_factor = -0.25
 				research_speed_factor = -0.25
 				MONTHLY_POPULATION = -0.05
@@ -97,7 +97,7 @@ ideas = {
 				stability_factor = -0.1
 				industrial_capacity_factory = -0.1
 				industrial_capacity_dockyard =  -0.1
-				consumer_goods_factor = 0.1
+				consumer_goods_factor = 0.2
 				local_resources_factor = -0.1
 				research_speed_factor = -0.1
 				conscription_factor = -0.25
@@ -377,7 +377,7 @@ ideas = {
 			picture = generic_production_bonus
 
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				production_speed_arms_factory_factor = 0.05
 				industrial_capacity_factory = 0.05
 				industrial_capacity_dockyard = 0.05
diff --git a/common/ideas/zzz_EQC_NLR_ideas.txt b/common/ideas/zzz_EQC_NLR_ideas.txt
index a7e20e29af3..5f4cb20f686 100644
--- a/common/ideas/zzz_EQC_NLR_ideas.txt
+++ b/common/ideas/zzz_EQC_NLR_ideas.txt
@@ -116,7 +116,7 @@ ideas = {
 			picture = IRE_heavy_industry
 
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				industrial_capacity_factory = 0.10
 				production_factory_efficiency_gain_factor = 0.05
 				production_factory_max_efficiency_factor = 0.05
diff --git a/common/ideas/zzz_EQC_SOL_ideas.txt b/common/ideas/zzz_EQC_SOL_ideas.txt
index e1a2f43fd7e..07af0608832 100644
--- a/common/ideas/zzz_EQC_SOL_ideas.txt
+++ b/common/ideas/zzz_EQC_SOL_ideas.txt
@@ -17,7 +17,7 @@ ideas = {
 
 			modifier = {
 				stability_factor = 0.05
-				consumer_goods_factor = -0.03
+				consumer_goods_factor = -0.06
 				production_factory_start_efficiency_factor = 0.05
 			}
 		}
@@ -128,7 +128,7 @@ ideas = {
 			modifier = {
 				conscription = 0.02
 				training_time_factor = -0.1
-				consumer_goods_factor = 0.02
+				consumer_goods_factor = 0.04
 			}
 		}
 	}
@@ -401,7 +401,7 @@ ideas = {
 			picture = generic_production_bonus
 			modifier = {
 				local_resources_factor = 0.15
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				production_speed_infrastructure_factor = 0.15
 				industry_free_repair_factor = 0.1
 			}
@@ -431,7 +431,7 @@ ideas = {
 				stability_factor = 0.10
 				war_support_factor = 0.25
 				army_attack_factor = 0.05
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 				research_speed_factor = -0.03
 			}
 		}
diff --git a/common/ideas/zzz_EQC_ideas.txt b/common/ideas/zzz_EQC_ideas.txt
index 4fa046c5871..d765b76a5f3 100644
--- a/common/ideas/zzz_EQC_ideas.txt
+++ b/common/ideas/zzz_EQC_ideas.txt
@@ -41,7 +41,7 @@ ideas = {
 			picture = great_depression
 
 			modifier = {
-				consumer_goods_factor = 0.20
+				consumer_goods_factor = 0.40
 				industrial_capacity_factory = -0.25
 				industrial_capacity_dockyard = -0.25
 				stability_factor = -0.10
@@ -63,7 +63,7 @@ ideas = {
 			picture = great_depression
 
 			modifier = {
-				consumer_goods_factor = 0.15
+				consumer_goods_factor = 0.3
 				industrial_capacity_factory = -0.15
 				industrial_capacity_dockyard = -0.15
 			}
@@ -84,7 +84,7 @@ ideas = {
 			picture = great_depression
 
 			modifier = {
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				industrial_capacity_factory = -0.10
 				industrial_capacity_dockyard = -0.10
 			}
@@ -307,7 +307,7 @@ ideas = {
 
 			modifier = {
 				stability_factor = 0.05
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 			}
 		}
 
@@ -843,7 +843,7 @@ ideas = {
 			picture = generic_volunteer_expedition_bonus
 
 			modifier = {
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 				industrial_capacity_factory = 0.05
 				industrial_capacity_dockyard = 0.05
 				war_support_factor = 0.05
@@ -866,7 +866,7 @@ ideas = {
 			picture = generic_volunteer_expedition_bonus
 
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				industrial_capacity_factory = 0.1
 				industrial_capacity_dockyard = 0.1
 				local_resources_factor = 0.05
@@ -890,7 +890,7 @@ ideas = {
 			picture = generic_volunteer_expedition_bonus
 
 			modifier = {
-				consumer_goods_factor = -0.07
+				consumer_goods_factor = -0.14
 				industrial_capacity_factory = 0.15
 				industrial_capacity_dockyard = 0.15
 				local_resources_factor = 0.1
@@ -933,7 +933,7 @@ ideas = {
 			picture = generic_foreign_capital
 
 			modifier = {
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 				local_resources_factor = 0.04
 				trade_opinion_factor = 0.25
 			}
@@ -954,7 +954,7 @@ ideas = {
 			picture = generic_foreign_capital
 
 			modifier = {
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 			}
 		}
 
@@ -998,7 +998,7 @@ ideas = {
 			picture = generic_foreign_capital
 
 			modifier = {
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 			}
 		}
 
@@ -1022,7 +1022,7 @@ ideas = {
 			picture = generic_foreign_capital
 
 			modifier = {
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 			}
 		}
 		EQC_griffon_money2 = {
@@ -1045,7 +1045,7 @@ ideas = {
 			picture = generic_foreign_capital
 
 			modifier = {
-				consumer_goods_factor = -0.04
+				consumer_goods_factor = -0.08
 			}
 		}
 		EQC_griffon_money3 = {
@@ -1068,7 +1068,7 @@ ideas = {
 			picture = generic_foreign_capital
 
 			modifier = {
-				consumer_goods_factor = -0.06
+				consumer_goods_factor = -0.12
 			}
 		}
 		EQC_griffon_money4 = {
@@ -1091,7 +1091,7 @@ ideas = {
 			picture = generic_foreign_capital
 
 			modifier = {
-				consumer_goods_factor = -0.08
+				consumer_goods_factor = -0.16
 			}
 		}
 		EQC_griffon_money5 = {
@@ -1114,7 +1114,7 @@ ideas = {
 			picture = generic_foreign_capital
 
 			modifier = {
-				consumer_goods_factor = -0.10
+				consumer_goods_factor = -0.2
 			}
 		}
 		EQC_griffon_money6 = {
@@ -1137,7 +1137,7 @@ ideas = {
 			picture = generic_foreign_capital
 
 			modifier = {
-				consumer_goods_factor = -0.12
+				consumer_goods_factor = -0.24
 			}
 		}
 		EQC_griffon_money7 = {
@@ -1160,7 +1160,7 @@ ideas = {
 			picture = generic_foreign_capital
 
 			modifier = {
-				consumer_goods_factor = -0.14
+				consumer_goods_factor = -0.28
 			}
 		}
 		EQC_griffon_money8 = {
@@ -1183,7 +1183,7 @@ ideas = {
 			picture = generic_foreign_capital
 
 			modifier = {
-				consumer_goods_factor = -0.15
+				consumer_goods_factor = -0.3
 			}
 		}
 
@@ -1361,7 +1361,7 @@ ideas = {
 
 			modifier = {
 				stability_factor = 0.10
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 			}
 		}
 
@@ -1594,7 +1594,7 @@ ideas = {
 
 			modifier = {
 				local_resources_factor = 0.10
-				consumer_goods_factor = -0.03
+				consumer_goods_factor = -0.06
 			}
 		}
 
@@ -1613,7 +1613,7 @@ ideas = {
 			picture = generic_goods_red_bonus
 
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				stability_weekly = 0.001
 			}
 		}
@@ -1730,7 +1730,7 @@ ideas = {
 			picture = man_five_year_plan_industry
 
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				industrial_capacity_factory = 0.05
 				political_power_factor = -0.075
 			}
@@ -2084,7 +2084,7 @@ ideas = {
 			picture = generic_foreign_capital
 
 			modifier = {
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				stability_factor = 0.05
 				industrial_capacity_factory = 0.05
 				production_factory_efficiency_gain_factor = 0.05
@@ -2162,7 +2162,7 @@ ideas = {
 
 			modifier = {
 				political_power_factor = -0.10
-				consumer_goods_factor = 0.10
+				consumer_goods_factor = 0.2
 				min_export = 0.15
 			}
 			targeted_modifier = {
diff --git a/common/ideas/zzz_EQS_TNO_ideas.txt b/common/ideas/zzz_EQS_TNO_ideas.txt
index b53ec12898a..44fff7d2e14 100644
--- a/common/ideas/zzz_EQS_TNO_ideas.txt
+++ b/common/ideas/zzz_EQS_TNO_ideas.txt
@@ -106,7 +106,7 @@ ideas = {
 				war_support_factor = 0.1
 				political_power_gain = 0.15
 				research_speed_factor = -0.1
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				industrial_capacity_factory = 0.1
 				industrial_capacity_dockyard = 0.1
 				military_leader_cost_factor = 0.5
@@ -124,7 +124,7 @@ ideas = {
 			modifier = {
 				stability_factor = 0.15
 				political_power_cost = 0.25
-				consumer_goods_factor = 0.1
+				consumer_goods_factor = 0.2
 				resistance_target = -0.05
 				compliance_growth = 0.05
 			}
@@ -449,7 +449,7 @@ ideas = {
 			picture = EQS_UESR_economy
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.15
+				consumer_goods_factor = 0.3
 				political_power_factor = -0.15
 				local_resources_factor = -0.15
 				industrial_capacity_factory = -0.15
@@ -705,7 +705,7 @@ ideas = {
 			picture = EQS_UESR_sharing
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.04
+				consumer_goods_factor = -0.08
 			}
 		}
 		
diff --git a/common/ideas/zzz_FAL_ideas.txt b/common/ideas/zzz_FAL_ideas.txt
index ae00b79c8ba..7c4f2959b30 100644
--- a/common/ideas/zzz_FAL_ideas.txt
+++ b/common/ideas/zzz_FAL_ideas.txt
@@ -490,7 +490,7 @@ ideas = {
 			modifier = {
 				political_power_gain = -0.25
 				stability_factor = -0.15
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 			}
 		}
 		
@@ -507,7 +507,7 @@ ideas = {
 			modifier = {
 				political_power_gain = -0.10
 				stability_factor = -0.05
-				consumer_goods_factor = 0.025
+				consumer_goods_factor = 0.05
 			}
 		}
 		
@@ -657,7 +657,7 @@ ideas = {
 				political_power_factor = -0.4
 				war_support_factor = -0.3
 				army_morale_factor = -0.1
-				consumer_goods_factor = 0.3
+				consumer_goods_factor = 0.6
 			}
 		}
 		
diff --git a/common/ideas/zzz_FAT_ideas.txt b/common/ideas/zzz_FAT_ideas.txt
index a427ae2f5a2..7fdf1420949 100644
--- a/common/ideas/zzz_FAT_ideas.txt
+++ b/common/ideas/zzz_FAT_ideas.txt
@@ -643,7 +643,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				stability_factor = -0.1
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				local_resources_factor = -0.3
 				production_speed_infrastructure_factor = -0.2
 			}
@@ -666,7 +666,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				stability_factor = -0.075
-				consumer_goods_factor = 0.02
+				consumer_goods_factor = 0.04
 				local_resources_factor = -0.2
 				production_speed_infrastructure_factor = -0.15
 			}
@@ -804,7 +804,7 @@ ideas = {
 			}
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 			}
 		}
 	}
@@ -824,7 +824,7 @@ ideas = {
 			}
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				production_speed_buildings_factor = 0.1
 				production_factory_max_efficiency_factor = 0.1
 			}
@@ -1040,7 +1040,7 @@ ideas = {
 			modifier = {
 				stability_factor = 0.05
 				MONTHLY_POPULATION = 0.15
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 			}
 		}
 	}
@@ -1212,7 +1212,7 @@ ideas = {
 			}
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 	}
@@ -1232,7 +1232,7 @@ ideas = {
 			}
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.1
+				consumer_goods_factor = 0.2
 			}
 		}
 	}
@@ -1294,7 +1294,7 @@ ideas = {
 			}
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.03
+				consumer_goods_factor = 0.06
 				stability_factor = 0.05
 				industrial_capacity_factory = 0.1
 			}
@@ -1407,7 +1407,7 @@ ideas = {
 				stability_factor = 0.05
 				political_power_gain = 0.1
 				MONTHLY_POPULATION = 0.15
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 			}
 		}
 	}
@@ -1505,7 +1505,7 @@ ideas = {
 			picture = generic_production_bonus
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.03
+				consumer_goods_factor = 0.06
 				production_factory_max_efficiency_factor = 0.1
 				production_speed_buildings_factor = 0.05
 			}
@@ -1625,7 +1625,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				monthly_population = 0.1
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 			}
 		}
 	}
@@ -1646,7 +1646,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				monthly_population = 0.1
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 				local_resources_factor = 0.1
 			}
 		}
@@ -1668,7 +1668,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				monthly_population = 0.1
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 				local_resources_factor = 0.1
 			}
 		}
@@ -1712,7 +1712,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				monthly_population = 0.1
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 				local_resources_factor = 0.1
 				production_factory_max_efficiency_factor = 0.05
 			}
@@ -1863,7 +1863,7 @@ ideas = {
 			}
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 	}
@@ -2129,7 +2129,7 @@ ideas = {
 			}
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 	}
@@ -2149,7 +2149,7 @@ ideas = {
 			}
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				production_speed_buildings_factor = 0.1
 			}
 		}
@@ -2170,7 +2170,7 @@ ideas = {
 			}
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				production_speed_buildings_factor = 0.15
 				monthly_population = 0.15
 			}
@@ -2192,7 +2192,7 @@ ideas = {
 			}
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.01
+				consumer_goods_factor = 0.02
 				production_factory_max_efficiency_factor = 0.05
 				line_change_production_efficiency_factor = 0.1
 			}
@@ -2304,7 +2304,7 @@ ideas = {
 			modifier = {
 				monthly_population = 0.15
 				stability_factor = 0.05
-				consumer_goods_factor = -0.03
+				consumer_goods_factor = -0.06
 			}
 		}
 	}
@@ -2345,7 +2345,7 @@ ideas = {
 			}
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.045
+				consumer_goods_factor = -0.09
 				industrial_capacity_factory = 0.1
 			}
 		}
@@ -2406,7 +2406,7 @@ ideas = {
 			}
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.03
+				consumer_goods_factor = -0.06
 				production_factory_max_efficiency_factor = 0.075
 				political_power_gain = 0.1
 			}
@@ -2428,7 +2428,7 @@ ideas = {
 			}
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				production_factory_max_efficiency_factor = 0.1
 				political_power_gain = 0.12
 			}
@@ -2795,7 +2795,7 @@ ideas = {
 			}
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.1
+				consumer_goods_factor = -0.2
 				production_speed_buildings_factor = 0.5
 				industrial_capacity_factory = 0.5
 				industrial_capacity_dockyard = 0.5
diff --git a/common/ideas/zzz_FBK_ideas.txt b/common/ideas/zzz_FBK_ideas.txt
index c05c142af1c..576a478f2f5 100644
--- a/common/ideas/zzz_FBK_ideas.txt
+++ b/common/ideas/zzz_FBK_ideas.txt
@@ -449,7 +449,7 @@ ideas = {
 				always = yes
 			}
 			modifier = {
-				consumer_goods_factor = 0.07
+				consumer_goods_factor = 0.14
 			}
 		}
 
@@ -462,7 +462,7 @@ ideas = {
 				always = yes
 			}
 			modifier = {
-				consumer_goods_factor = 0.14
+				consumer_goods_factor = 0.28
 			}
 		}
 		FBK_soldier_pay3 = {
@@ -474,7 +474,7 @@ ideas = {
 				always = yes
 			}
 			modifier = {
-				consumer_goods_factor = 0.21
+				consumer_goods_factor = 0.42
 			}
 		}
 		FBK_slowed_modernisation = {
@@ -571,7 +571,7 @@ ideas = {
 			}
 			modifier = {
 				stability_factor = 0.25
-				consumer_goods_factor = -0.2
+				consumer_goods_factor = -0.40
 				army_core_attack_factor = 0.25
 				army_core_defence_factor = 0.25
 			}
@@ -789,7 +789,7 @@ ideas = {
 
 		FBK_reformed_landowning_idea = {
 			modifier = {
-				consumer_goods_factor = -0.07
+				consumer_goods_factor = -0.14
 			}
 			allowed = {
 				always = no
@@ -809,7 +809,7 @@ ideas = {
 				always = no
 			}
 			modifier = {
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				stability_factor = 0.10
 			}
 			picture = generic_pp_unity_bonus
@@ -1009,7 +1009,7 @@ ideas = {
 		FBK_ind_effort = {
 			modifier = {
 				local_resources_factor = -0.1
-				consumer_goods_factor = 0.3
+				consumer_goods_factor = 0.6
 				political_power_gain = -0.1
 			}
 			allowed_civil_war = {
@@ -1147,7 +1147,7 @@ ideas = {
 		}
 		FBK_lumber = {
 			modifier = {
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 				production_speed_buildings_factor = 0.05
 			}
 			allowed = {
@@ -1216,7 +1216,7 @@ ideas = {
 
 		FBK_river_trade_idea = {
 			modifier = {
-				consumer_goods_factor = -0.03
+				consumer_goods_factor = -0.06
 				trade_opinion_factor = 0.25
 			}
 			allowed = {
@@ -1293,7 +1293,7 @@ ideas = {
 		FBK_immigration = {
 			modifier = {
 				MONTHLY_POPULATION = 0.45
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 			allowed_civil_war = {
 				always = yes
diff --git a/common/ideas/zzz_FEA_ideas.txt b/common/ideas/zzz_FEA_ideas.txt
index 4464b449d95..8410e5b4a21 100644
--- a/common/ideas/zzz_FEA_ideas.txt
+++ b/common/ideas/zzz_FEA_ideas.txt
@@ -307,7 +307,7 @@ ideas = {
 				production_factory_efficiency_gain_factor = -0.30
 				industrial_capacity_factory = -0.40
 				production_speed_buildings_factor = -0.30
-				consumer_goods_factor = 0.25
+				consumer_goods_factor = 0.5
 			}
 		}
 	}
@@ -359,7 +359,7 @@ ideas = {
 				production_factory_efficiency_gain_factor = -0.30
 				industrial_capacity_factory = -0.30
 				production_speed_buildings_factor = -0.05
-				consumer_goods_factor = 0.10
+				consumer_goods_factor = 0.2
 			}
 		}
 	}
@@ -379,7 +379,7 @@ ideas = {
 				production_factory_efficiency_gain_factor = -0.15
 				industrial_capacity_factory = -0.15
 				production_speed_buildings_factor = -0.40
-				consumer_goods_factor = 0.25
+				consumer_goods_factor = 0.5
 			}
 		}
 	}
@@ -402,7 +402,7 @@ ideas = {
 			modifier = {
 				political_power_gain = 0.05
 				trade_opinion_factor = 0.20
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 			}
 		}
 	}
@@ -421,7 +421,7 @@ ideas = {
 				production_factory_max_efficiency_factor = -0.10
 				production_factory_efficiency_gain_factor = -0.10
 				industrial_capacity_factory = -0.05
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 			}
 		}
 	}
@@ -464,7 +464,7 @@ ideas = {
 				stability_factor = 0.05
 				political_power_gain = 0.10
 				MONTHLY_POPULATION = 0.15
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 			}
 		}
 	}
@@ -508,7 +508,7 @@ ideas = {
 			modifier = {
 				stability_factor = 0.05
 				political_power_gain = 0.15
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 	}
@@ -531,7 +531,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				stability_factor = 0.05
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				local_resources_factor = 0.05
 			}
 		}
@@ -1065,7 +1065,7 @@ ideas = {
 			modifier = {
 				political_power_gain = 0.10
 				stability_factor = 0.05
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 	}
@@ -1510,7 +1510,7 @@ ideas = {
 				production_factory_efficiency_gain_factor = -0.45
 				industrial_capacity_factory = -0.45
 				production_speed_buildings_factor = -0.45
-				consumer_goods_factor = 0.30
+				consumer_goods_factor = 0.6
 			}
 		}
 	}
@@ -1652,7 +1652,7 @@ ideas = {
 			picture = FRA_factory_strikes
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				production_speed_buildings_factor = 0.10
 				conversion_cost_civ_to_mil_factor = -0.15
 			}
@@ -1758,7 +1758,7 @@ ideas = {
 				production_factory_efficiency_gain_factor = -0.30
 				industrial_capacity_factory = -0.30
 				production_speed_buildings_factor = -0.30
-				consumer_goods_factor = 0.20
+				consumer_goods_factor = 0.4
 			}
 		}
 	}
@@ -1778,7 +1778,7 @@ ideas = {
 				production_factory_efficiency_gain_factor = -0.15
 				industrial_capacity_factory = -0.15
 				production_speed_buildings_factor = -0.15
-				consumer_goods_factor = 0.10
+				consumer_goods_factor = 0.2
 			}
 		}
 	}
@@ -1798,7 +1798,7 @@ ideas = {
 				production_factory_efficiency_gain_factor = -0.10
 				industrial_capacity_factory = -0.05
 				production_speed_buildings_factor = -0.05
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 			}
 		}
 	}
@@ -1946,7 +1946,7 @@ ideas = {
 			picture = SOV_scientist_defect
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 	}
@@ -1985,7 +1985,7 @@ ideas = {
 			modifier = {
 				communism_drift = 0.01
 				political_power_gain = -0.15
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				production_factory_efficiency_gain_factor = -0.10
 				industrial_capacity_factory = -0.10
 			}
@@ -2155,7 +2155,7 @@ ideas = {
 				stability_factor = 0.05
 				political_power_gain = 0.05
 				trade_opinion_factor = 0.30
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 	}
@@ -2220,7 +2220,7 @@ ideas = {
 				industrial_capacity_factory = -0.05
 				conversion_cost_civ_to_mil_factor = -0.20
 				production_speed_arms_factory_factor = 0.10
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 	}
@@ -2324,7 +2324,7 @@ ideas = {
 				stability_factor = 0.10
 				local_resources_factor = 0.15
 				MONTHLY_POPULATION = 0.05
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 			}
 		}
 	}
@@ -2473,7 +2473,7 @@ ideas = {
 			modifier = {
 				political_power_gain = 0.10
 				stability_factor = 0.05
-				consumer_goods_factor = -0.03
+				consumer_goods_factor = -0.06
 			}
 		}
 	}
diff --git a/common/ideas/zzz_FEZ_ideas.txt b/common/ideas/zzz_FEZ_ideas.txt
index b09af190399..ca8b5cb1c69 100644
--- a/common/ideas/zzz_FEZ_ideas.txt
+++ b/common/ideas/zzz_FEZ_ideas.txt
@@ -458,7 +458,7 @@ ideas = {
 			picture = generic_production_bonus
 			
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 
@@ -552,7 +552,7 @@ ideas = {
 			picture = capital_outflow
 			
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 		
diff --git a/common/ideas/zzz_FIR_ideas.txt b/common/ideas/zzz_FIR_ideas.txt
index 4d49691a97a..86b942b31fa 100644
--- a/common/ideas/zzz_FIR_ideas.txt
+++ b/common/ideas/zzz_FIR_ideas.txt
@@ -749,7 +749,7 @@ ideas = {
 		FIR_raw_material_economy = {
 			modifier = {
 				local_resources_factor = 0.15
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				production_speed_buildings_factor = 0.10
 			}
 			available = {
@@ -761,7 +761,7 @@ ideas = {
 
 		FIR_magic_crystal_economy = {
 			modifier = {
-				consumer_goods_factor = -0.07
+				consumer_goods_factor = -0.14
 				production_factory_max_efficiency_factor = 0.10
 			}
 			available = {
@@ -773,7 +773,7 @@ ideas = {
 
 		FIR_banditry_economy = {
 			modifier = {
-				consumer_goods_factor = -0.10
+				consumer_goods_factor = -0.2
 				army_speed_factor = 0.10
 			}
 			available = {
@@ -1083,7 +1083,7 @@ ideas = {
 		FIR_spirit_productivity = {
 
 			modifier = {
-				consumer_goods_factor = -0.10
+				consumer_goods_factor = -0.2
 				industrial_capacity_factory = 0.10
 			}
 			allowed_civil_war = {
@@ -1117,7 +1117,7 @@ ideas = {
 
 		FIR_necro_labor = {
 			modifier = {
-				consumer_goods_factor = -0.20
+				consumer_goods_factor = -0.4
 			}
 			allowed_civil_war = {
 				always = yes
@@ -1150,7 +1150,7 @@ ideas = {
 
 		FIR_riv_trade_idea = {
 			modifier = {
-				consumer_goods_factor = -0.10
+				consumer_goods_factor = -0.2
 				industrial_capacity_factory = 0.10
 			}
 			allowed_civil_war = {
diff --git a/common/ideas/zzz_FLO_ideas.txt b/common/ideas/zzz_FLO_ideas.txt
index 91a4930e17b..0b084a081d9 100644
--- a/common/ideas/zzz_FLO_ideas.txt
+++ b/common/ideas/zzz_FLO_ideas.txt
@@ -315,7 +315,7 @@ ideas = {
 			removal_cost = -1
 
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				trade_opinion_factor = 0.25
 				trade_laws_cost_factor = -0.25
 				economy_cost_factor = -0.25
@@ -345,7 +345,7 @@ ideas = {
 			removal_cost = -1
 
 			modifier = {
-				consumer_goods_factor = 0.2
+				consumer_goods_factor = 0.4
 			}
 		}
 		FLO_wet_plague = {
@@ -371,7 +371,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				production_speed_buildings_factor = 0.05
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 				research_speed_factor = 0.025
 			}
 		}
@@ -397,7 +397,7 @@ ideas = {
 				industrial_capacity_factory = 0.05
 				trade_opinion_factor = 0.25
 				production_speed_buildings_factor = 0.05
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				research_speed_factor = 0.05
 			}
 		}
@@ -411,7 +411,7 @@ ideas = {
 			modifier = {
 				production_speed_buildings_factor = 0.15
 				industry_repair_factor = 0.25
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 		FLO_workers_rights = {
@@ -422,7 +422,7 @@ ideas = {
 			}
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				industrial_capacity_factory = 0.1
 				local_resources_factor = 0.2
 			}
@@ -435,7 +435,7 @@ ideas = {
 			}
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 				industrial_capacity_factory = 0.1
 			}
 		}
@@ -454,7 +454,7 @@ ideas = {
 			}
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.025
+				consumer_goods_factor = 0.05
 			}
 		}
 		FLO_oil_profits = {
@@ -470,7 +470,7 @@ ideas = {
 			}
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				industrial_capacity_factory = 0.05
 			}
 		}
@@ -483,7 +483,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				trade_opinion_factor = 0.25
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 			}
 		}
 		FLO_migrant_workers = {
@@ -549,7 +549,7 @@ ideas = {
 			modifier = {
 				experience_gain_air = 0.05
 				enemy_army_bonus_air_superiority_factor = -0.25
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 		FLO_department_of_affairs_idea = {
@@ -572,7 +572,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				political_power_factor = 0.2
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 		FLO_armed_neutrality_idea = {
@@ -650,7 +650,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				political_power_factor = 0.1
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				production_factory_efficiency_gain_factor = 0.1
 				production_speed_buildings_factor = 0.05
 			}
@@ -739,7 +739,7 @@ ideas = {
 			}
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				stability_factor = 0.10
 			}
 		}
@@ -827,7 +827,7 @@ ideas = {
 			modifier = {
 				production_factory_max_efficiency_factor = -0.1
 				political_power_factor = 0.1
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 			}
 		}
 		FLO_public_healthcare_idea = {
@@ -845,7 +845,7 @@ ideas = {
 			modifier = {
 				stability_factor = 0.05
 				MONTHLY_POPULATION = 0.25
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 			}
 		}
 		FLO_affordable_design_idea = {
@@ -904,7 +904,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				opinion_gain_monthly_factor = 0.1
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 				trade_opinion_factor = 0.1
 			}
 		}
@@ -922,7 +922,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				opinion_gain_monthly_factor = 0.25
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				trade_opinion_factor = 0.25
 			}
 		}
@@ -1010,7 +1010,7 @@ ideas = {
 			available = { has_government = communism }
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				stability_factor = 0.05
 			}
 		}
@@ -1217,7 +1217,7 @@ ideas = {
 			}
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				stability_factor = 0.05
 				political_power_factor = 0.05
 			}
diff --git a/common/ideas/zzz_FRE_ideas.txt b/common/ideas/zzz_FRE_ideas.txt
index 2c0f129da20..d52866e2936 100644
--- a/common/ideas/zzz_FRE_ideas.txt
+++ b/common/ideas/zzz_FRE_ideas.txt
@@ -54,7 +54,7 @@ ideas = {
 			removal_cost = -1
 
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				MONTHLY_POPULATION = 0.15
 			}
 		}
@@ -220,7 +220,7 @@ ideas = {
 			removal_cost = -1
 
 			modifier = {
-				consumer_goods_factor = 0.15
+				consumer_goods_factor = 0.3
 				production_speed_buildings_factor = -0.20
 			}
 		}
diff --git a/common/ideas/zzz_FRN_ideas.txt b/common/ideas/zzz_FRN_ideas.txt
index 3a28b5c6f41..28d18eac395 100644
--- a/common/ideas/zzz_FRN_ideas.txt
+++ b/common/ideas/zzz_FRN_ideas.txt
@@ -231,7 +231,7 @@ ideas = {
 			}
 
 			modifier = {
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 			}
 			research_bonus = {
 				excavation_tech = 0.30
@@ -602,7 +602,7 @@ ideas = {
 			picture = neutrality_idea
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.025
+				consumer_goods_factor = 0.05
 				industrial_capacity_factory = 0.05
 				production_speed_buildings_factor = 0.1
 			}
@@ -637,7 +637,7 @@ ideas = {
 			modifier = {
 				political_power_gain = 0.10
 				trade_opinion_factor = 0.10
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 			}
 		}
 		FRN_knight_traditions_idea = {
@@ -674,7 +674,7 @@ ideas = {
 			}
 			picture = LIT_invested_in_farms
 			modifier = {
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 				MONTHLY_POPULATION = 0.25
 			}
 		}
@@ -744,7 +744,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				stability_factor = 0.05
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 				political_power_gain = 0.1
 			}
 		}
@@ -762,7 +762,7 @@ ideas = {
 			picture = generic_political_support
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 				production_factory_max_efficiency_factor = 0.1 
 				max_planning = 0.1
 				experience_gain_army = 0.05
@@ -783,7 +783,7 @@ ideas = {
 			picture = can_wartime_prices_and_trade_board
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 				trade_opinion_factor = 0.25
 				production_speed_buildings_factor = 0.1
 			}
@@ -836,7 +836,7 @@ ideas = {
 			picture = ROM_king_carol_emptied_accounts
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 		FRN_normal_payment_paid = {
@@ -849,7 +849,7 @@ ideas = {
 			picture = EST_exploit_the_banks
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 			}
 		}
 		FRN_big_payment = {
@@ -862,7 +862,7 @@ ideas = {
 			picture = ROM_king_carol_emptied_accounts
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.1
+				consumer_goods_factor = -0.2
 			}
 		}
 		FRN_big_payment_paid = {
@@ -875,7 +875,7 @@ ideas = {
 			picture = EST_exploit_the_banks
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.1
+				consumer_goods_factor = 0.2
 			}
 		}
 		FRN_joint_exercise = {
@@ -1223,7 +1223,7 @@ ideas = {
 			modifier = {
 				industrial_capacity_factory = 0.1
 				political_power_gain = 0.1
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 			}
 		}
 		FRN_harmonic_resistance = {
@@ -1268,7 +1268,7 @@ ideas = {
 				stability_factor = -0.1
 				political_power_gain = -0.1
 				production_speed_buildings_factor = -0.1
-				consumer_goods_factor = 0.1
+				consumer_goods_factor = 0.2
 				local_resources_factor = -0.25
 			}
 		}
@@ -1340,7 +1340,7 @@ ideas = {
 				local_resources_factor = 0.15
 				industrial_capacity_factory = 0.1
 				political_power_gain = 0.2
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 			}
 		}
 		FRN_disbanded_order = {
@@ -1421,7 +1421,7 @@ ideas = {
 				production_factory_max_efficiency_factor = 0.1
 				industrial_capacity_factory = 0.1
 				political_power_gain = 0.2
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 				local_resources_factor = 0.15
 				materiel_manufacturer_cost_factor = -0.25
 			}
@@ -1549,7 +1549,7 @@ ideas = {
 				stability_factor = -0.1
 				production_factory_max_efficiency_factor = -0.25
 				local_resources_factor = -0.25
-				consumer_goods_factor = 0.1
+				consumer_goods_factor = 0.2
 				MONTHLY_POPULATION = -0.75
 			}
 		}
@@ -1568,7 +1568,7 @@ ideas = {
 			modifier = {
 				stability_factor = 0.05
 				MONTHLY_POPULATION = 0.25
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 			}
 		}
 		FRN_rural_communes_idea = {
@@ -1585,7 +1585,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				min_export = -0.10
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 				conscription_factor = 0.15
 			}
 		}
@@ -1602,7 +1602,7 @@ ideas = {
 			picture = great_depression
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 				industrial_capacity_factory = 0.1
 				production_speed_buildings_factor = 0.1
 			}
@@ -1659,7 +1659,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				min_export = -0.10
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 				conscription_factor = 0.15
 				local_resources_factor = 0.2
 				production_factory_max_efficiency_factor = 0.1
@@ -1720,7 +1720,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				min_export = -0.10
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 				conscription_factor = 0.15
 				local_resources_factor = 0.5
 				production_factory_max_efficiency_factor = 0.2
@@ -1761,7 +1761,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				min_export = -0.10
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 				conscription_factor = 0.15
 				local_resources_factor = 0.5
 				production_factory_max_efficiency_factor = 0.2
@@ -1805,7 +1805,7 @@ ideas = {
 				stability_factor = -0.05
 				political_power_gain = -0.05
 				production_speed_buildings_factor = -0.05
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				local_resources_factor = -0.1
 			}
 		}
@@ -1947,7 +1947,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				stability_factor = 0.05
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 				MONTHLY_POPULATION = 0.25
 			}
 		}
diff --git a/common/ideas/zzz_GEU_ideas.txt b/common/ideas/zzz_GEU_ideas.txt
index 39bf71d6176..e2c3112c5be 100644
--- a/common/ideas/zzz_GEU_ideas.txt
+++ b/common/ideas/zzz_GEU_ideas.txt
@@ -47,7 +47,7 @@ ideas = {
 			modifier = {
 				production_factory_max_efficiency_factor = 0.15
 				industrial_capacity_factory = 0.15
-				consumer_goods_factor = -0.10
+				consumer_goods_factor = -0.2
 			}
 		}
 	}
@@ -65,7 +65,7 @@ ideas = {
 			modifier = {
 				production_factory_max_efficiency_factor = 0.10
 				industrial_capacity_factory = 0.10
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 			}
 		}
 	}
@@ -99,7 +99,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				production_speed_buildings_factor = 0.15
-				consumer_goods_factor = -0.10
+				consumer_goods_factor = -0.2
 			}
 		}
 	}
diff --git a/common/ideas/zzz_GFF_ideas.txt b/common/ideas/zzz_GFF_ideas.txt
index 348ba817397..2e0ea391434 100644
--- a/common/ideas/zzz_GFF_ideas.txt
+++ b/common/ideas/zzz_GFF_ideas.txt
@@ -86,7 +86,7 @@ ideas = {
 			picture = generic_foreign_capital
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.10
+				consumer_goods_factor = -0.20
 				production_factory_max_efficiency_factor = 0.10
 				industrial_capacity_factory = 0.20
 			}
@@ -104,7 +104,7 @@ ideas = {
 			picture = FRA_factory_strikes
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.10
+				consumer_goods_factor = -0.20
 			}
 		}
 	}
@@ -144,7 +144,7 @@ ideas = {
 				production_factory_max_efficiency_factor = 0.15
 				industrial_capacity_factory = 0.15
 				production_speed_buildings_factor = 0.15
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 	}
@@ -304,7 +304,7 @@ ideas = {
 				production_factory_max_efficiency_factor = 0.05
 				industrial_capacity_factory = 0.05
 				production_speed_buildings_factor = 0.10
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 	}
diff --git a/common/ideas/zzz_GRF_ideas.txt b/common/ideas/zzz_GRF_ideas.txt
index a8306386e92..f566e324d8a 100644
--- a/common/ideas/zzz_GRF_ideas.txt
+++ b/common/ideas/zzz_GRF_ideas.txt
@@ -460,7 +460,7 @@ ideas = {
 			picture = generic_goods_red_bonus
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.20
+				consumer_goods_factor = 0.4
 			}
 		}
 	}
@@ -569,7 +569,7 @@ ideas = {
 				production_factory_max_efficiency_factor = -0.20
 				industrial_capacity_factory = -0.1
 				production_speed_buildings_factor = -0.1
-				consumer_goods_factor = 0.15
+				consumer_goods_factor = 0.3
 			}
 		}
 	}
@@ -784,7 +784,7 @@ ideas = {
 				stability_factor = -0.1
 				war_support_factor = -0.1
 				production_factory_max_efficiency_factor = -0.10
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 			}
 
 		}
@@ -803,7 +803,7 @@ ideas = {
 				production_factory_max_efficiency_factor = 0.05
 				industrial_capacity_factory = 0.05
 				production_speed_buildings_factor = 0.10
-				consumer_goods_factor = -0.03
+				consumer_goods_factor = -0.06
 			}
 
 		}
@@ -1119,7 +1119,7 @@ ideas = {
 			picture = generic_foreign_capital
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				production_factory_max_efficiency_factor = 0.10
 			}
 			targeted_modifier = {
@@ -1399,7 +1399,7 @@ ideas = {
 				is_subject = no
 			}
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				production_factory_max_efficiency_factor = 0.10
 				industrial_capacity_factory = 0.10
 				production_speed_buildings_factor = 0.10
@@ -1502,7 +1502,7 @@ ideas = {
 			picture = generic_foreign_capital
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				MONTHLY_POPULATION = 0.15
 			}
 		}
@@ -1673,7 +1673,7 @@ ideas = {
 			picture = generic_pp_unity_bonus
 			removal_cost = -1
 			modifier = {
-			    consumer_goods_factor = 0.05
+			    consumer_goods_factor = 0.1
 				stability_factor = 0.05
 				political_power_factor = 0.05
 				MONTHLY_POPULATION = 0.10
@@ -1820,7 +1820,7 @@ ideas = {
 			picture = man_five_year_plan_industry
 			removal_cost = -1
 			modifier = {
-			    consumer_goods_factor = 0.10
+			    consumer_goods_factor = 0.2
 				industrial_capacity_factory = 0.10
 				production_speed_buildings_factor = 0.15
 			}
@@ -2017,7 +2017,7 @@ ideas = {
 			picture = generic_foreign_capital
 			removal_cost = -1
 			modifier = {
-			    consumer_goods_factor = -0.03
+			    consumer_goods_factor = -0.06
 				industrial_capacity_factory = 0.05
 			}
 		}
@@ -2051,7 +2051,7 @@ ideas = {
 			picture = generic_foreign_capital
 			removal_cost = -1
 			modifier = {
-			    consumer_goods_factor = -0.05
+			    consumer_goods_factor = -0.1
 				industrial_capacity_factory = 0.10
 			}
 		}
diff --git a/common/ideas/zzz_GRI_ideas.txt b/common/ideas/zzz_GRI_ideas.txt
index 74f47aa4d1b..e619929964b 100644
--- a/common/ideas/zzz_GRI_ideas.txt
+++ b/common/ideas/zzz_GRI_ideas.txt
@@ -411,7 +411,6 @@ ideas = {
 			allowed = {
 				original_tag = GRI
 			}
-			picture = generic_air_manufacturer_1
 			research_bonus = {
 				air_equipment = 0.15
 			}
@@ -782,7 +781,7 @@ ideas = {
 				production_factory_max_efficiency_factor = 0.05
 				industrial_capacity_factory = 0.05
 				industrial_capacity_dockyard = 0.05
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 	}
@@ -889,7 +888,7 @@ ideas = {
 			modifier = {
 				stability_factor = 0.05
 				local_resources_factor = 0.15
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 			}
 		}
 	}
@@ -926,7 +925,7 @@ ideas = {
 			modifier = {
 				production_factory_max_efficiency_factor = 0.10
 				industrial_capacity_factory = 0.10
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 	}
@@ -979,7 +978,7 @@ ideas = {
 			modifier = {
 				production_factory_max_efficiency_factor = 0.10
 				industrial_capacity_factory = 0.10
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				trade_opinion_factor = 0.50
 			}
 			equipment_bonus = {
@@ -1037,7 +1036,7 @@ ideas = {
 				production_speed_buildings_factor = 0.10
 				production_factory_efficiency_gain_factor = 0.05
 				industrial_capacity_factory = 0.05
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 			}
 		}
 	}
@@ -1091,7 +1090,7 @@ ideas = {
 			modifier = {
 				industrial_capacity_dockyard = -0.50
 				production_speed_dockyard_factor = -0.25
-				consumer_goods_factor = 0.10
+				consumer_goods_factor = 0.2
 			}
 		}
 	}
@@ -1124,7 +1123,7 @@ ideas = {
 			picture = generic_navy_bonus
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.03
+				consumer_goods_factor = -0.06
 			}
 			equipment_bonus = {
 				convoy = {
@@ -1550,7 +1549,7 @@ ideas = {
 			picture = trade
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				trade_opinion_factor = 0.25
 				political_advisor_cost_factor = -0.10
 			}
@@ -1587,7 +1586,7 @@ ideas = {
 			modifier = {
 				fascism_drift = 0.01
 				political_power_gain = 0.05
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
     	    }
 		}
 	}
@@ -1791,7 +1790,7 @@ ideas = {
 				production_speed_arms_factory_factor = 0.10
 				production_factory_efficiency_gain_factor = 0.05
 				industrial_capacity_factory = 0.05
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 			}
 		}
 	}
@@ -2124,7 +2123,7 @@ ideas = {
 			picture = ROM_king_carol_ii_hedonist
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				industrial_capacity_factory = 0.10
 				production_factory_efficiency_gain_factor = 0.05
 			}
diff --git a/common/ideas/zzz_GRU_ideas.txt b/common/ideas/zzz_GRU_ideas.txt
index 3c14651e029..c3d72f4cf7f 100644
--- a/common/ideas/zzz_GRU_ideas.txt
+++ b/common/ideas/zzz_GRU_ideas.txt
@@ -456,7 +456,7 @@ ideas = {
 				trade_opinion_factor = 0.25
 				political_advisor_cost_factor = -0.1
 				license_purchase_cost = -0.1
-				consumer_goods_factor = -0.035
+				consumer_goods_factor = -0.07
 			}
 		}
 		GRU_southcont_company_stronger = {
@@ -477,7 +477,7 @@ ideas = {
 				political_advisor_cost_factor = -0.25
 				trade_opinion_factor = 0.25
 				license_purchase_cost = -0.25
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 		GRU_southcont_company_weakened = {
@@ -498,7 +498,7 @@ ideas = {
 				trade_opinion_factor = 0.25
 				political_advisor_cost_factor = -0.1
 				license_purchase_cost = -0.1
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 			}
 		}
 		GRU_chapterhouses = {
@@ -582,7 +582,7 @@ ideas = {
 			removal_cost = -1
 
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				conscription_factor = -0.05
 			}
 		}
@@ -717,7 +717,7 @@ ideas = {
 			removal_cost = -1
 
 			modifier = {
-				consumer_goods_factor = 0.15
+				consumer_goods_factor = 0.3
 				local_resources_factor = 0.15
 			}
 		}
@@ -732,7 +732,7 @@ ideas = {
 			removal_cost = -1
 
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 		GRU_min_pub_sec = {
@@ -847,7 +847,7 @@ ideas = {
 
 			modifier = {
 				MONTHLY_POPULATION = 0.5
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				global_building_slots_factor = 0.15
 			}
 		}
@@ -863,7 +863,7 @@ ideas = {
 
 			modifier = {
 				MONTHLY_POPULATION = 0.1
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 				global_building_slots_factor = 0.05
 			}
 		}
@@ -917,7 +917,7 @@ ideas = {
 				production_factory_max_efficiency_factor = -0.1
 				production_factory_efficiency_gain_factor = -0.1
 				production_speed_buildings_factor = -0.1
-				consumer_goods_factor = 0.1
+				consumer_goods_factor = 0.2
 			}
 		}
 		GRU_eliminate_bourgeois_nationalism_idea = {
@@ -980,7 +980,7 @@ ideas = {
 			removal_cost = -1
 
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				trade_opinion_factor = 0.25
 			}
 		}
diff --git a/common/ideas/zzz_GRY_ideas.txt b/common/ideas/zzz_GRY_ideas.txt
index 6169d9438cb..3e3233b2d6e 100644
--- a/common/ideas/zzz_GRY_ideas.txt
+++ b/common/ideas/zzz_GRY_ideas.txt
@@ -220,6 +220,7 @@ ideas = {
 	}
 
 	tank_manufacturer = {
+		designer = yes
 		GRY_tank_1 = {
 			allowed = {
 				OR = {
@@ -615,7 +616,7 @@ ideas = {
 				stability_factor = 0.10
 				MONTHLY_POPULATION = 0.10
 				conscription = 0.01
-				consumer_goods_factor = 0.10
+				consumer_goods_factor = 0.2
 				industrial_capacity_factory = -0.10
 				production_speed_buildings_factor = -0.1
 				production_speed_infrastructure_factor = -0.1
@@ -668,7 +669,7 @@ ideas = {
 			modifier = {
 				communism_drift = 0.05
 				stability_factor = -0.15
-				consumer_goods_factor = -0.10
+				consumer_goods_factor = -0.2
 				industrial_capacity_factory = 0.05
 				production_speed_buildings_factor = 0.10
 				production_speed_infrastructure_factor = 0.15
@@ -687,7 +688,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				communism_drift = 0.1
-				consumer_goods_factor = -0.10
+				consumer_goods_factor = -0.2
 				industrial_capacity_factory = 0.05
 				production_speed_buildings_factor = 0.10
 				production_speed_infrastructure_factor = 0.15
@@ -754,7 +755,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				neutrality_drift = 0.30
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				industrial_capacity_factory = 0.05
 				production_speed_buildings_factor = 0.05
 				production_speed_infrastructure_factor = 0.05
@@ -772,7 +773,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				democratic_drift = 0.10
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				industrial_capacity_factory = 0.05
 				production_speed_buildings_factor = 0.05
 				production_speed_infrastructure_factor = 0.05
@@ -793,7 +794,7 @@ ideas = {
 				fascism_drift = 0.05
 				conscription = -0.01
 				stability_factor = -0.05
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				industrial_capacity_factory = 0.05
 				production_speed_buildings_factor = 0.15
 				production_speed_infrastructure_factor = 0.15
@@ -814,7 +815,7 @@ ideas = {
 				MONTHLY_POPULATION = 0.10
 				stability_factor = 0.20
 				conscription = 0.02
-				consumer_goods_factor = 0.10
+				consumer_goods_factor = 0.2
 				industrial_capacity_factory = -0.10
 				production_speed_buildings_factor = -0.1
 				production_speed_infrastructure_factor = -0.1
@@ -1019,7 +1020,7 @@ ideas = {
 			}
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.10
+				consumer_goods_factor = -0.2
 			}
 			picture = generic_foreign_capital
 		}
@@ -1225,7 +1226,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				production_factory_max_efficiency_factor = 0.03
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 				research_speed_factor = 0.03
 			}
 			picture = wingbardian_crown
@@ -1386,7 +1387,7 @@ ideas = {
 			}
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.03
+				consumer_goods_factor = -0.06
 			}
 			picture = generic_goods_red_bonus
 
@@ -1397,7 +1398,7 @@ ideas = {
 				always = no
 			}
 			modifier = {
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 			}
 			picture = chaos_idea
 		}
@@ -1417,7 +1418,7 @@ ideas = {
 				always = no
 			}
 			modifier = {
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 				MONTHLY_POPULATION = 0.10
 			}
 			picture = generic_agrarian_society
diff --git a/common/ideas/zzz_HAU_ideas.txt b/common/ideas/zzz_HAU_ideas.txt
index 3cc73e52ae1..d59b2d800bf 100644
--- a/common/ideas/zzz_HAU_ideas.txt
+++ b/common/ideas/zzz_HAU_ideas.txt
@@ -52,7 +52,7 @@ ideas = {
 			picture = chi_hyper_inflation3
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 				trade_opinion_factor = 0.15
 				political_power_factor = 0.05
 			}
@@ -268,7 +268,7 @@ ideas = {
 			picture = chi_hyper_inflation4
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.035
+				consumer_goods_factor = -0.07
 				trade_opinion_factor = 0.20
 				political_power_factor = 0.10
 			}
@@ -283,7 +283,7 @@ ideas = {
 			picture = chi_hyper_inflation5
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				trade_opinion_factor = 0.25
 				political_power_factor = 0.15
 			}
@@ -313,7 +313,7 @@ ideas = {
 			picture = generic_exploit_mines
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				min_export = 0.10
 				local_resources_factor = 0.15
 			}
@@ -453,7 +453,7 @@ ideas = {
 			picture = liberty_ships_focus
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.03
+				consumer_goods_factor = -0.06
 			}
 			equipment_bonus = {
 				convoy = {
@@ -477,7 +477,7 @@ ideas = {
 			removal_cost = -1
 			
 			modifier = {
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 				political_power_gain = 0.05
 				industrial_capacity_factory = 0.05
 				industrial_capacity_dockyard = 0.05
@@ -496,7 +496,7 @@ ideas = {
 			removal_cost = -1
 			
 			modifier = {
-				consumer_goods_factor = 0.025
+				consumer_goods_factor = 0.05
 				political_power_gain = -0.05
 				industrial_capacity_factory = -0.05
 				industrial_capacity_dockyard = -0.05
@@ -512,7 +512,7 @@ ideas = {
 			picture = generic_political_support
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				political_power_factor = 0.10
 			}
 		}	
diff --git a/common/ideas/zzz_HEL_ideas.txt b/common/ideas/zzz_HEL_ideas.txt
index 076b6b954be..4fc6ca78bdb 100644
--- a/common/ideas/zzz_HEL_ideas.txt
+++ b/common/ideas/zzz_HEL_ideas.txt
@@ -98,7 +98,7 @@ ideas = {
 			}
 			traits = { industrial_concern }
 			modifier = {
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 			}
 		}
 
@@ -392,7 +392,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				political_power_factor = -0.05
-				consumer_goods_factor = 0.03
+				consumer_goods_factor = 0.06
 				production_speed_infrastructure_factor = -0.05
 			}
 		}
@@ -407,7 +407,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				political_power_factor = -0.08
-				consumer_goods_factor = 0.06
+				consumer_goods_factor = 0.12
 				production_speed_industrial_complex_factor = -0.05
 				production_speed_infrastructure_factor = -0.1
 			}
@@ -423,7 +423,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				political_power_factor = -0.12
-				consumer_goods_factor = 0.09
+				consumer_goods_factor = 0.18
 				production_speed_industrial_complex_factor = -0.08
 				production_speed_infrastructure_factor = -0.15
 				democratic_drift = -0.03
@@ -520,7 +520,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				political_power_cost = -0.15
-				consumer_goods_factor = -0.15
+				consumer_goods_factor = -0.3
 				production_speed_industrial_complex_factor = 0.15
 			}
 		}
@@ -1375,7 +1375,7 @@ ideas = {
 			picture = generic_archonism_idea
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.03
+				consumer_goods_factor = 0.06
 				stability_factor = 0.05
 				monthly_population = 0.25
 			}
@@ -1406,7 +1406,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				stability_factor = 0.15
-				consumer_goods_factor = -0.03
+				consumer_goods_factor = -0.06
 				monthly_population = 0.25
 				neutrality_drift = 0.01
 			}
@@ -1423,7 +1423,7 @@ ideas = {
 			modifier = {
 				stability_factor = 0.15
 				political_power_gain = 0.25
-				consumer_goods_factor = 0.07
+				consumer_goods_factor = 0.14
 				monthly_population = 0.5
 			}
 		}
@@ -1439,7 +1439,7 @@ ideas = {
 			modifier = {
 				political_power_gain = 0.05
 				stability_factor = -0.025
-				consumer_goods_factor = -0.01
+				consumer_goods_factor = -0.02
 			}
 		}
 		HEL_large_church_anger = {
@@ -1454,7 +1454,7 @@ ideas = {
 			modifier = {
 				stability_factor = -0.075
 				political_power_gain = 0.2
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 			}
 		}
 		HEL_massive_church_anger = {
@@ -1469,7 +1469,7 @@ ideas = {
 			modifier = {
 				stability_factor = -0.15
 				political_power_gain = 0.35
-				consumer_goods_factor = -0.04
+				consumer_goods_factor = -0.08
 			}
 		}
 		HEL_greifwald_immigrants = {
@@ -1568,7 +1568,7 @@ ideas = {
 			picture = RAZ_education
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 				research_speed_factor = 0.05
 			}
 		}
@@ -1582,7 +1582,7 @@ ideas = {
 			picture = SPR_relocate_the_gold_reserves
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.03
+				consumer_goods_factor = -0.06
 				production_factory_efficiency_gain_factor = 0.075
 			}
 		}
@@ -1596,7 +1596,7 @@ ideas = {
 			picture = SPR_relocate_the_gold_reserves
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				industrial_capacity_factory = 0.05
 				production_factory_efficiency_gain_factor = 0.1
 			}
@@ -1697,7 +1697,7 @@ ideas = {
 			picture = STG_collectivization_effort
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.03
+				consumer_goods_factor = -0.06
 				local_resources_factor = 0.1
 			}
 		}
@@ -1712,7 +1712,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				political_power_gain = -0.15
-				consumer_goods_factor = -0.04
+				consumer_goods_factor = -0.08
 				stability_weekly = 0.005
 			}
 		}
@@ -1740,7 +1740,7 @@ ideas = {
 			picture = CTL_hindia_agr
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 				min_export = -0.1
 				local_resources_factor = 0.15
 			}
@@ -1785,7 +1785,7 @@ ideas = {
 			modifier = {
 				MONTHLY_POPULATION = 0.25
 				stability_factor = 0.05
-				consumer_goods_factor = 0.03
+				consumer_goods_factor = 0.06
 			}
 		}
 		HEL_a_haven = {
@@ -1940,7 +1940,7 @@ ideas = {
 			picture = HUN_hungarian_monarchy_habsburg
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.03
+				consumer_goods_factor = 0.06
 				production_speed_buildings_factor = 0.05
 				local_resources_factor = 0.10
 			}
@@ -1955,7 +1955,7 @@ ideas = {
 			picture = CTL_service
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 				production_speed_buildings_factor = 0.10
 				local_resources_factor = 0.10
 			}
@@ -1970,7 +1970,7 @@ ideas = {
 			picture = Generic_bank_idea_icon
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 				production_speed_buildings_factor = 0.05
 				local_resources_factor = 0.05
 			}
@@ -2000,7 +2000,7 @@ ideas = {
 			picture = CTL_service
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.07
+				consumer_goods_factor = -0.14
 				production_speed_buildings_factor = 0.15
 				local_resources_factor = 0.15
 			}
@@ -2080,7 +2080,7 @@ ideas = {
 			picture = WNG_balanced
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.04
+				consumer_goods_factor = -0.08
 				production_oil_factor = 0.1
 			}
 		}
@@ -2094,7 +2094,7 @@ ideas = {
 			picture = HIP_SIR_ARI_securing_oil
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				production_oil_factor = 0.1
 			}
 		}
@@ -2152,7 +2152,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				political_power_factor = -0.25
-				consumer_goods_factor = -0.04
+				consumer_goods_factor = -0.08
 				production_speed_industrial_complex_factor = 0.08
 			}
 		}
@@ -2374,7 +2374,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				production_speed_buildings_factor = 0.025
-				consumer_goods_factor = -0.015
+				consumer_goods_factor = -0.03
 				research_speed_factor = 0.015
 			}
 		}
diff --git a/common/ideas/zzz_HIE_ideas.txt b/common/ideas/zzz_HIE_ideas.txt
index d8083400ea0..1d330ede7f3 100644
--- a/common/ideas/zzz_HIE_ideas.txt
+++ b/common/ideas/zzz_HIE_ideas.txt
@@ -337,7 +337,7 @@ ideas = {
 			modifier = {
 			    monthly_population = -0.10
                 production_speed_industrial_complex_factor = 0.10
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 				research_speed_factor = 0.025
 			}
 		}
@@ -380,7 +380,7 @@ ideas = {
 			modifier = {
 			    monthly_population = -0.20
                 production_speed_industrial_complex_factor = 0.125
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				research_speed_factor = 0.05
 			}
 		}
@@ -507,7 +507,7 @@ ideas = {
 			modifier = {
 			    war_support_weekly = 0.003
 				stability_weekly = -0.002
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 				industrial_capacity_factory = 0.05
 				production_factory_efficiency_gain_factor = -0.10
 			}
@@ -552,7 +552,7 @@ ideas = {
 			modifier = {
 			    war_support_weekly = 0.005
 				stability_weekly = -0.0035
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				industrial_capacity_factory = 0.10
 				production_factory_efficiency_gain_factor = -0.15
 			}
@@ -1506,7 +1506,7 @@ ideas = {
 			picture = HIE_gas
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				research_speed_factor = -0.2
 				industrial_capacity_factory = -0.2
 				monthly_population = -0.2
@@ -1579,7 +1579,7 @@ ideas = {
 			picture = HIE_loot
 			removal_cost = -1
 			modifier = {
-			    consumer_goods_factor = -0.075
+			    consumer_goods_factor = -0.15
 				production_speed_buildings_factor = 0.1 
 				production_speed_industrial_complex_factor = 0.05
 				industrial_capacity_factory = 0.05
@@ -1592,7 +1592,7 @@ ideas = {
 			picture = HIE_loot
 			removal_cost = -1
 			modifier = {
-			    consumer_goods_factor = -0.05
+			    consumer_goods_factor = -0.1
 				production_speed_buildings_factor = 0.05 
 				production_speed_dockyard_factor = 0.05
 			    industrial_capacity_dockyard = 0.05
@@ -1605,7 +1605,7 @@ ideas = {
 			picture = HIE_loot
 			removal_cost = -1
 			modifier = {
-			    consumer_goods_factor = -0.1
+			    consumer_goods_factor = -0.2
 				production_speed_industrial_complex_factor = 0.15 
 				production_oil_factor = 0.1
 				production_speed_dockyard_factor = 0.05
@@ -1618,7 +1618,7 @@ ideas = {
 			picture = HIE_loot
 			removal_cost = -1
 			modifier = {
-			    consumer_goods_factor = -0.05
+			    consumer_goods_factor = -0.1
 				production_factory_efficiency_gain_factor = 0.15 
 				production_oil_factor = 0.05
 				production_speed_industrial_complex_factor = 0.05
@@ -1631,7 +1631,7 @@ ideas = {
 			picture = HIE_loot
 			removal_cost = -1
 			modifier = {
-			    consumer_goods_factor = -0.15
+			    consumer_goods_factor = -0.3
 				production_speed_buildings_factor = 0.1
 			}
 		}
@@ -1655,7 +1655,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				political_power_factor = -0.05
-				consumer_goods_factor = 0.10
+				consumer_goods_factor = 0.2
 				min_export = 0.15
 			}
 			targeted_modifier = {
diff --git a/common/ideas/zzz_HIP_ideas.txt b/common/ideas/zzz_HIP_ideas.txt
index b2e8ba9ee1a..5dc636a69af 100644
--- a/common/ideas/zzz_HIP_ideas.txt
+++ b/common/ideas/zzz_HIP_ideas.txt
@@ -465,7 +465,7 @@ ideas = {
 
 			modifier = {
 				stability_weekly = 0.005
-				consumer_goods_factor = 0.10
+				consumer_goods_factor = 0.2
 				HIP_recruitable_seapony_pop_factor = -0.05
 				conscription_factor = -0.05
 				training_time_army_factor = 0.10
@@ -732,7 +732,7 @@ ideas = {
 			removal_cost = -1
 			
 			modifier = {
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 			}
 		}
 
@@ -1878,7 +1878,7 @@ ideas = {
 			cancel_if_invalid = yes
 			modifier = {
 				research_speed_factor = 0.05
-				consumer_goods_factor = -0.03
+				consumer_goods_factor = -0.06
 			}
 			research_bonus = {
 				electronics = 0.10
@@ -1918,7 +1918,7 @@ ideas = {
 				lend_lease_tension = 0.5
 				stability_factor = 0.15
 				production_speed_buildings_factor = 0.10
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				conversion_cost_civ_to_mil_factor = -0.1
 				conversion_cost_mil_to_civ_factor = -0.1
 				fuel_gain_factor = 0.10
@@ -1964,7 +1964,7 @@ ideas = {
 			removal_cost = -1
 
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				political_power_gain = 0.15
 			}
 		}
@@ -1991,7 +1991,7 @@ ideas = {
 				always = no
 			}
 			modifier = {
-				consumer_goods_factor = 0.10
+				consumer_goods_factor = 0.2
 				civilian_factory_use = 2
 			}
 		}
@@ -2072,7 +2072,7 @@ ideas = {
 			removal_cost = -1
 			
 			modifier = {
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 			}
 		}
 
@@ -2708,7 +2708,7 @@ ideas = {
 				conversion_cost_civ_to_mil_factor = -0.25
 				local_resources_factor =  0.15
 				production_factory_efficiency_gain_factor = 0.05
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 			}
 		}
 		HIP_industrial_mobilisation_plan_4 = {
@@ -2740,7 +2740,7 @@ ideas = {
 				local_resources_factor =  0.15
 				production_factory_efficiency_gain_factor = 0.10
 				line_change_production_efficiency_factor = 0.1
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 				production_speed_industrial_complex_factor = -0.15
 				stability_factor = -0.05
 				political_power_gain = -0.1
@@ -2778,12 +2778,12 @@ ideas = {
 			removal_cost = -1
 			
 			modifier = {
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 				political_power_gain = -0.1
 			}
 		}
 
-###HIP Harmonist defeat crisis ideas###
+		###HIP Harmonist defeat crisis ideas###
 
 		HIP_defeatism_idea = {
 			allowed = {
@@ -2953,7 +2953,7 @@ ideas = {
 			}
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.07
+				consumer_goods_factor = -0.14
 				production_speed_industrial_complex_factor = 0.15
 				production_speed_infrastructure_factor = 0.15
 			}
@@ -2971,7 +2971,7 @@ ideas = {
 			}
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.07
+				consumer_goods_factor = -0.14
 				production_speed_industrial_complex_factor = 0.15
 				production_speed_infrastructure_factor = 0.15
 				industrial_capacity_factory = 0.05
@@ -2991,7 +2991,7 @@ ideas = {
 			}
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.07
+				consumer_goods_factor = -0.14
 				production_speed_industrial_complex_factor = 0.15
 				production_speed_infrastructure_factor = 0.15
 				production_speed_arms_factory_factor = 0.05
@@ -3023,7 +3023,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				monthly_population = 0.2
-				consumer_goods_factor = 0.02
+				consumer_goods_factor = 0.04
 				stability_factor = 0.1
 			}
 		}
@@ -3037,7 +3037,7 @@ ideas = {
 			}
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.03
+				consumer_goods_factor = -0.06
 				trade_laws_cost_factor = 0.5
 				economy_cost_factor = 0.5
 			}
@@ -3052,7 +3052,7 @@ ideas = {
 			}
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				trade_laws_cost_factor = 0.5
 				economy_cost_factor = 0.5
 				army_morale_factor = 0.05
@@ -3070,7 +3070,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				monthly_population = 0.25
-				consumer_goods_factor = 0.03
+				consumer_goods_factor = 0.06
 				stability_factor = 0.10
 				army_morale_factor = 0.075
 				war_support_factor = 0.075
@@ -3101,7 +3101,7 @@ ideas = {
 				industry_free_repair_factor = 0.25
 				production_speed_buildings_factor = 0.15
 				industrial_factory_donations = 2
-				consumer_goods_factor = -0.03
+				consumer_goods_factor = -0.06
 				production_factory_efficiency_gain_factor = 0.05
 				democratic_drift = 0.05
 				democratic_acceptance = 30
@@ -3118,7 +3118,7 @@ ideas = {
 			}
 			modifier = {
 				civilian_factory_use = 4
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 			}
 		}
 		HIP_silverstream_plan_3 = {
@@ -3134,7 +3134,7 @@ ideas = {
 			}
 			modifier = {
 				civilian_factory_use = 6
-				consumer_goods_factor = 0.075
+				consumer_goods_factor = 0.15
 			}
 		}
 		HIP_silverstream_plan_aftermath_1 = {
@@ -3173,7 +3173,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				civilian_factory_use = 3
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				production_factory_max_efficiency_factor = 0.075
 			}
 		}
@@ -3193,7 +3193,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				civilian_factory_use = 3
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				production_factory_max_efficiency_factor = 0.10
 			}
 		}
@@ -3504,7 +3504,7 @@ ideas = {
 			removal_cost = -1
 
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				conscription = 0.015
 				HIP_recruitable_seapony_pop = 0.015
 				production_speed_arms_factory_factor = 0.1
@@ -3553,7 +3553,7 @@ ideas = {
 				army_org_factor = 0.1
 				army_attack_factor = 0.1
 				breakthrough_factor = 0.2
-				consumer_goods_factor = 0.02
+				consumer_goods_factor = 0.04
 			}
 		}
 		HIP_phalanx_unleashed = {
@@ -3601,7 +3601,7 @@ ideas = {
 			removal_cost = -1
 
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				production_speed_infrastructure_factor = 0.1
 			}
 		}
@@ -3771,7 +3771,7 @@ ideas = {
 				industrial_capacity_dockyard = 0.10
 				production_factory_max_efficiency_factor = 0.05
 				production_factory_start_efficiency_factor = 0.05
-				consumer_goods_factor = 0.03
+				consumer_goods_factor = 0.06
 			}
 		}
 
@@ -3838,7 +3838,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				political_power_gain = -0.20
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				industrial_capacity_factory = 0.10
 				industrial_capacity_dockyard = 0.10
 			}
@@ -3865,7 +3865,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				political_power_gain = -0.25
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				production_speed_arms_factory_factor = 0.10
 				industrial_capacity_factory = 0.15
 				industrial_capacity_dockyard = 0.15
@@ -3893,7 +3893,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				political_power_gain = -0.30
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				industrial_capacity_factory = 0.20
 				industrial_capacity_dockyard = 0.20
 				local_resources_factor = 0.15
@@ -3961,7 +3961,7 @@ ideas = {
 				industrial_capacity_factory = 0.10
 				local_resources_factor = 0.1
 				stability_factor = -0.10
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 			}
 		}
 
@@ -3990,7 +3990,7 @@ ideas = {
 				industrial_capacity_dockyard = 0.10
 				industrial_capacity_factory = 0.10
 				stability_factor = -0.20
-				consumer_goods_factor = 0.075
+				consumer_goods_factor = 0.15
 			}
 		}
 
@@ -4019,7 +4019,7 @@ ideas = {
 				industrial_capacity_dockyard = 0.15
 				industrial_capacity_factory = 0.15
 				stability_factor = -0.25
-				consumer_goods_factor = 0.10
+				consumer_goods_factor = 0.2
 			}
 		}
 
@@ -4037,7 +4037,7 @@ ideas = {
 
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.02
+				consumer_goods_factor = 0.04
 				monthly_population = 0.15
 				global_building_slots_factor = 0.15
 				production_speed_industrial_complex_factor = 0.20
@@ -4193,7 +4193,7 @@ ideas = {
 			}
 		}
 
-### COMMANDER IDEAS ###
+		### COMMANDER IDEAS ###
 
 		HIP_army_purges = {
 			picture = RAZ_purge
@@ -4872,7 +4872,7 @@ ideas = {
 			removal_cost = -1
 
 			modifier = {
-				consumer_goods_factor = 0.02
+				consumer_goods_factor = 0.04
 				production_factory_max_efficiency_factor = 0.05
 				production_factory_start_efficiency_factor = 0.05
 				industrial_capacity_dockyard = 0.05
@@ -4893,7 +4893,7 @@ ideas = {
 			modifier = {
 				trade_opinion_factor = 0.5
 				stability_factor = 0.1
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 				min_export = 0.1
 			}
 		}
@@ -4909,7 +4909,7 @@ ideas = {
 			removal_cost = -1
 
 			modifier = {
-				consumer_goods_factor = 0.04
+				consumer_goods_factor = 0.08
 				production_factory_max_efficiency_factor = 0.1
 				production_factory_start_efficiency_factor = 0.1
 				industrial_capacity_dockyard = 0.1
@@ -4930,7 +4930,7 @@ ideas = {
 			modifier = {
 				trade_opinion_factor = 1
 				stability_factor = 0.2
-				consumer_goods_factor = -0.04
+				consumer_goods_factor = -0.08
 				min_export = 0.2
 			}
 		}
@@ -4966,7 +4966,7 @@ ideas = {
 				political_power_factor = 0.1
 				max_command_power = 50
 				war_support_factor = 0.05
-				consumer_goods_factor = 0.02
+				consumer_goods_factor = 0.04
 				production_factory_max_efficiency_factor = 0.05
 				production_factory_start_efficiency_factor = 0.05
 				industrial_capacity_dockyard = 0.05
@@ -4990,7 +4990,7 @@ ideas = {
 				war_support_factor = 0.05
 				trade_opinion_factor = 0.5
 				stability_factor = 0.1
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 				min_export = 0.1
 			}
 		}
@@ -5477,7 +5477,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				monthly_population = 0.05
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 				research_speed_factor = 0.02
 			}
 		}
@@ -5541,7 +5541,7 @@ ideas = {
 				line_change_production_efficiency_factor = 0.05
 				production_factory_max_efficiency_factor = 0.05
 				production_factory_efficiency_gain_factor = 0.05
-				consumer_goods_factor = 0.02
+				consumer_goods_factor = 0.04
 			}
 		}
 		HIP_workers_paradise_idea_2 = {
@@ -5559,7 +5559,7 @@ ideas = {
 				line_change_production_efficiency_factor = 0.05
 				production_factory_efficiency_gain_factor = 0.1
 				production_speed_buildings_factor = 0.05
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 			}
 		}
 		HIP_workers_paradise_idea_3 = {
@@ -5579,7 +5579,7 @@ ideas = {
 				production_speed_buildings_factor = 0.1
 				industrial_capacity_factory = 0.05
 				industrial_capacity_dockyard = 0.05
-				consumer_goods_factor = 0.1
+				consumer_goods_factor = 0.2
 			}
 		}
 		HIP_workers_paradise_idea_4 = {
@@ -5600,7 +5600,7 @@ ideas = {
 				production_speed_buildings_factor = 0.1
 				industrial_capacity_factory = 0.05
 				industrial_capacity_dockyard = 0.05
-				consumer_goods_factor = 0.2
+				consumer_goods_factor = 0.4
 			}
 		}
 		HIP_global_spy_agency_lar = {
@@ -5927,7 +5927,7 @@ ideas = {
 			}
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.1
+				consumer_goods_factor = 0.2
 				research_speed_factor = -0.1
 			}
 			on_remove = {
@@ -6068,7 +6068,7 @@ ideas = {
 			}
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.1
+				consumer_goods_factor = 0.2
 				industrial_capacity_factory = -0.1
 				industrial_capacity_dockyard = -0.1
 				nuclear_production_factor = -0.5
@@ -6244,7 +6244,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				production_speed_buildings_factor = -0.1
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 		HIP_anti_civilization_3 = {
@@ -6261,7 +6261,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				production_speed_buildings_factor = -0.1
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				production_speed_bunker_factor = 1 # so big because of HIP_divided_society_0
 				production_speed_coastal_bunker_factor = 1 # so big because of HIP_divided_society_0
 			}
@@ -6426,7 +6426,7 @@ ideas = {
 			}
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 				production_factory_max_efficiency_factor = 0.05
 				stability_factor = 0.05
 				war_support_factor = 0.05
@@ -6466,7 +6466,7 @@ ideas = {
 			}
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.02
+				consumer_goods_factor = 0.04
 				weekly_manpower = -100
 			}
 		}
@@ -6480,7 +6480,7 @@ ideas = {
 			}
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				production_factory_start_efficiency_factor = -0.05
 			}
 		}
@@ -7038,7 +7038,7 @@ ideas = {
 			removal_cost = -1
 			
 			modifier = {
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				production_speed_buildings_factor = -0.1
 				conscription_factor = -0.1
 				HIP_recruitable_seapony_pop_factor = -0.1
@@ -7527,7 +7527,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 			    custom_modifier_tooltip = TRO_CTH_disappear_tp
-				consumer_goods_factor = -0.03
+				consumer_goods_factor = -0.06
 				industrial_factory_donations = 4
 				industrial_capacity_factory = 0.075
 			}
@@ -7552,7 +7552,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 			    custom_modifier_tooltip = TRO_CTH_disappear_tp
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 				industrial_factory_donations = 3
 				industrial_capacity_factory = 0.05
 			}
@@ -7577,7 +7577,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 			    custom_modifier_tooltip = TRO_CTH_disappear_tp
-				consumer_goods_factor = -0.01
+				consumer_goods_factor = -0.02
 				industrial_factory_donations = 2
 				industrial_capacity_factory = 0.025
 			}
diff --git a/common/ideas/zzz_HLQ_ideas.txt b/common/ideas/zzz_HLQ_ideas.txt
index 7ed206d7187..5ec3611a70f 100644
--- a/common/ideas/zzz_HLQ_ideas.txt
+++ b/common/ideas/zzz_HLQ_ideas.txt
@@ -863,7 +863,7 @@ ideas = {
 			picture = ger_mefo_bills
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				industrial_capacity_factory = 0.05
 			}
 		}
@@ -950,7 +950,7 @@ ideas = {
 			picture = trade
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.03
+				consumer_goods_factor = -0.06
 				trade_opinion_factor = 0.20
 			}
 		}
@@ -2099,7 +2099,7 @@ ideas = {
 			picture = trotskyite_plot_purged
 			removal_cost = -1
 			modifier = {
-			    consumer_goods_factor = -0.05
+			    consumer_goods_factor = -0.1
 				stability_factor = 0.05
 				political_power_factor = 0.05
 			}
@@ -2158,7 +2158,7 @@ ideas = {
 			picture = usa_great_depression_3
 			removal_cost = -1
 			modifier = {
-			    consumer_goods_factor = 0.20
+			    consumer_goods_factor = 0.4
 			    industrial_capacity_factory = -0.50
 				production_factory_max_efficiency_factor = -0.50
 				production_speed_buildings_factor = -0.50
@@ -2177,7 +2177,7 @@ ideas = {
 			picture = usa_great_depression_3
 			removal_cost = -1
 			modifier = {
-			    consumer_goods_factor = 0.15
+			    consumer_goods_factor = 0.3
 			    industrial_capacity_factory = -0.40
 				production_factory_max_efficiency_factor = -0.40
 				production_speed_buildings_factor = -0.40
@@ -2196,7 +2196,7 @@ ideas = {
 			picture = usa_great_depression_2
 			removal_cost = -1
 			modifier = {
-			    consumer_goods_factor = 0.10
+			    consumer_goods_factor = 0.2
 			    industrial_capacity_factory = -0.30
 				production_factory_max_efficiency_factor = -0.30
 				production_speed_buildings_factor = -0.30
@@ -2215,7 +2215,7 @@ ideas = {
 			picture = usa_great_depression
 			removal_cost = -1
 			modifier = {
-			    consumer_goods_factor = 0.05
+			    consumer_goods_factor = 0.1
 			    industrial_capacity_factory = -0.20
 				production_factory_max_efficiency_factor = -0.20
 				production_speed_buildings_factor = -0.20
@@ -2240,7 +2240,7 @@ ideas = {
 			picture = capital_outflow
 			removal_cost = -1
 			modifier = {
-			    consumer_goods_factor = 0.10
+			    consumer_goods_factor = 0.2
 				political_power_factor = 0.20
 				MONTHLY_POPULATION = 0.15
 			}
@@ -2264,7 +2264,7 @@ ideas = {
 			picture = generic_agrarian_reform
 			removal_cost = -1
 			modifier = {
-			    consumer_goods_factor = -0.05
+			    consumer_goods_factor = -0.1
 				political_power_factor = 0.05
 				MONTHLY_POPULATION = 0.15
 			}
@@ -2316,7 +2316,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 			    stability_factor = -0.10
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				industrial_capacity_factory = 0.10
 				communism_drift = 0.01
 			}
@@ -2362,7 +2362,7 @@ ideas = {
 			modifier = {
 				political_power_gain = 0.10
 				local_resources_factor = 0.05
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 	}
@@ -2483,7 +2483,7 @@ ideas = {
 			picture = raj_risk_of_famine
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				stability_factor = 0.05
 				political_power_factor = 0.05
 			}
@@ -2555,7 +2555,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				stability_factor = 0.05
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				industrial_capacity_factory = 0.10
 			}
 		}
diff --git a/common/ideas/zzz_HLR_ideas.txt b/common/ideas/zzz_HLR_ideas.txt
index e5df732c4f7..5607d4472de 100644
--- a/common/ideas/zzz_HLR_ideas.txt
+++ b/common/ideas/zzz_HLR_ideas.txt
@@ -42,7 +42,7 @@ ideas = {
 				democratic_drift = 0.03
 				fascism_drift = 0.05
 				army_org_factor = -0.25
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				line_change_production_efficiency_factor = -0.1
 				research_speed_factor = -0.3
 				production_speed_buildings_factor = -0.1
@@ -65,7 +65,7 @@ ideas = {
 				neutrality_drift = 0.01
 				democratic_drift = 0.01
 				army_org_factor = -0.3
-				consumer_goods_factor = 0.1
+				consumer_goods_factor = 0.2
 				research_speed_factor = -0.1
 				production_speed_buildings_factor = -0.1
 			}
diff --git a/common/ideas/zzz_JER_ideas.txt b/common/ideas/zzz_JER_ideas.txt
index 13ec0c0d172..4f7a4d73884 100644
--- a/common/ideas/zzz_JER_ideas.txt
+++ b/common/ideas/zzz_JER_ideas.txt
@@ -458,7 +458,7 @@ ideas = {
 				communism_drift = 0.02
 				democratic_drift = 0.02
 				political_power_factor = 0.10
-				consumer_goods_factor = -0.10
+				consumer_goods_factor = -0.2
 				army_morale_factor = 0.10
 				land_reinforce_rate = 0.05
 				training_time_factor = -0.10
@@ -502,7 +502,7 @@ ideas = {
 			picture = JER_legacy_of_coltbert
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				production_factory_efficiency_gain_factor = -0.10
 				production_factory_max_efficiency_factor = -0.10
 				industrial_capacity_factory = -0.05
@@ -713,7 +713,7 @@ ideas = {
 			picture = ROM_king_carol_emptied_accounts
 			removal_cost = -1
 			modifier = {
-			    consumer_goods_factor = -0.015
+			    consumer_goods_factor = -0.03
 				trade_opinion_factor = 0.15
 				political_power_gain = 0.05
 			}
@@ -800,7 +800,7 @@ ideas = {
 			modifier = {
 			    industrial_capacity_factory = 0.05
 				production_speed_arms_factory_factor = 0.05
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 			}
 		}
 	}
@@ -840,7 +840,7 @@ ideas = {
 			picture = ROM_king_carol_emptied_accounts
 			removal_cost = -1
 			modifier = {
-			    consumer_goods_factor = -0.03
+			    consumer_goods_factor = -0.06
 				stability_factor = 0.05
 				political_power_factor = 0.075
 			}
@@ -1042,7 +1042,7 @@ ideas = {
 			picture = ROM_king_carol_emptied_accounts
 			removal_cost = -1
 			modifier = {
-			    consumer_goods_factor = -0.03
+			    consumer_goods_factor = -0.06
 				trade_opinion_factor = 0.25
 				political_power_gain = 0.10
 			}
@@ -1130,7 +1130,7 @@ ideas = {
 			modifier = {
 			    industrial_capacity_factory = 0.05
 				production_speed_arms_factory_factor = 0.10
-				consumer_goods_factor = -0.03
+				consumer_goods_factor = -0.06
 			}
 		}
 	}
@@ -1152,7 +1152,7 @@ ideas = {
 			    industrial_capacity_factory = 0.05
 				production_speed_arms_factory_factor = 0.10
 				production_speed_infrastructure_factor = 0.05
-				consumer_goods_factor = -0.03
+				consumer_goods_factor = -0.06
 			}
 		}
 	}
@@ -1321,7 +1321,7 @@ ideas = {
 			picture = ROM_king_carol_emptied_accounts
 			removal_cost = -1
 			modifier = {
-			    consumer_goods_factor = -0.03
+			    consumer_goods_factor = -0.06
 				stability_factor = 0.05
 				political_power_factor = 0.10
 				production_speed_arms_factory_factor = 0.05
@@ -1527,7 +1527,7 @@ ideas = {
 			picture = ROM_king_carol_emptied_accounts
 			removal_cost = -1
 			modifier = {
-			    consumer_goods_factor = -0.05
+			    consumer_goods_factor = -0.1
 				industrial_capacity_factory = 0.10
 				production_speed_buildings_factor = 0.10
 				production_factory_efficiency_gain_factor = 0.05
@@ -1654,7 +1654,7 @@ ideas = {
 			picture = Generic_bank_idea_icon
 			removal_cost = -1
 			modifier = {
-			    consumer_goods_factor = -0.025
+			    consumer_goods_factor = -0.05
 			}
 		}
 	}
@@ -1673,7 +1673,7 @@ ideas = {
 			picture = ROM_king_carol_emptied_accounts
 			removal_cost = -1
 			modifier = {
-			    consumer_goods_factor = -0.05
+			    consumer_goods_factor = -0.1
 				trade_opinion_factor = 0.25
 			}
 		}
@@ -2399,7 +2399,7 @@ ideas = {
 			picture = Generic_bank_idea_icon
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.03
+				consumer_goods_factor = -0.06
 				political_power_gain = 0.05
 			}
 		}
@@ -2420,7 +2420,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				political_power_factor = -0.05
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				min_export = 0.15
 			}
 			targeted_modifier = {
@@ -2641,7 +2641,7 @@ ideas = {
 			picture = ROM_king_carol_emptied_accounts
 			removal_cost = -1
 			modifier = {
-			    consumer_goods_factor = -0.05
+			    consumer_goods_factor = -0.1
 				industrial_capacity_factory = 0.05
 			}
 		}
@@ -2663,7 +2663,7 @@ ideas = {
 			modifier = {
 			    stability_factor = 0.05
 			    political_power_factor = 0.05
-				consumer_goods_factor = 0.025
+				consumer_goods_factor = 0.05
 			}
 		}
 	}
@@ -2793,7 +2793,7 @@ ideas = {
 			    stability_factor = 0.05
 				war_support_factor = 0.05
 			    political_power_factor = 0.10
-				consumer_goods_factor = 0.03
+				consumer_goods_factor = 0.06
 			}
 		}
 	}
@@ -2877,7 +2877,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				research_speed_factor = 0.03
-				consumer_goods_factor = 0.015
+				consumer_goods_factor = 0.03
 			}
 		}
 	}
@@ -2897,7 +2897,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				research_speed_factor = 0.075
-				consumer_goods_factor = 0.03
+				consumer_goods_factor = 0.06
 				political_power_factor = -0.05
 			}
 		}
diff --git a/common/ideas/zzz_JES_ideas.txt b/common/ideas/zzz_JES_ideas.txt
index 0bc8ed8705b..37fefa873e9 100644
--- a/common/ideas/zzz_JES_ideas.txt
+++ b/common/ideas/zzz_JES_ideas.txt
@@ -418,7 +418,7 @@ ideas = {
 			picture = generic_economic_increase
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 				production_speed_buildings_factor = 0.1
 				stability_factor = 0.05
 			}
@@ -437,7 +437,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				monthly_population = 0.15
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				production_speed_buildings_factor = 0.1
 				stability_factor = 0.05
 			}
@@ -476,7 +476,7 @@ ideas = {
 				industrial_capacity_factory = 0.1
 				production_factory_start_efficiency_factor = 0.1
 				monthly_population = 0.15
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				production_speed_buildings_factor = 0.1
 				stability_factor = 0.05
 			}
@@ -495,7 +495,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				stability_factor = 0.05
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 				party_popularity_stability_factor = 0.25
 			}
 		}
@@ -688,7 +688,7 @@ ideas = {
 			picture = generic_foreign_capital
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.1
+				consumer_goods_factor = -0.2
 			}
 		}
 		JES_central_bank_idea = {
@@ -706,7 +706,7 @@ ideas = {
 			picture = Generic_bank_idea_icon
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 				production_factory_max_efficiency_factor = 0.1
 				economy_cost_factor = -0.5
 			}
diff --git a/common/ideas/zzz_JUN_ideas.txt b/common/ideas/zzz_JUN_ideas.txt
index d93d869a0ef..e0a32818d1f 100644
--- a/common/ideas/zzz_JUN_ideas.txt
+++ b/common/ideas/zzz_JUN_ideas.txt
@@ -18,7 +18,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				political_power_factor = 0.20
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 
@@ -250,7 +250,7 @@ ideas = {
 			picture = usa_great_depression
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.10
+				consumer_goods_factor = 0.2
 				industrial_capacity_factory = -0.20
 				industrial_capacity_dockyard = -0.20
 				production_speed_buildings_factor = -0.15
@@ -267,7 +267,7 @@ ideas = {
 			picture = usa_great_depression
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				industrial_capacity_factory = -0.15
 				industrial_capacity_dockyard = -0.15
 				production_speed_buildings_factor = -0.10
@@ -332,7 +332,7 @@ ideas = {
 			picture = generic_agrarian_reform
 			removal_cost = -1
 			modifier = {
-			    consumer_goods_factor = -0.05
+			    consumer_goods_factor = -0.1
 				local_resources_factor = 0.10
 				MONTHLY_POPULATION = 0.15
 			}
diff --git a/common/ideas/zzz_KAT_ideas.txt b/common/ideas/zzz_KAT_ideas.txt
index db364c33051..b2365aa3f22 100644
--- a/common/ideas/zzz_KAT_ideas.txt
+++ b/common/ideas/zzz_KAT_ideas.txt
@@ -333,7 +333,7 @@ ideas = {
 				modifier = {
 					research_speed_factor = 0.05
 					conscription_factor = 0.1
-					consumer_goods_factor = -0.05
+					consumer_goods_factor = -0.1
 					army_core_defence_factor = 0.15
 				}
 		}
@@ -343,7 +343,7 @@ ideas = {
 				modifier = {
 					local_resources_factor = -0.15
 					industrial_capacity_factory = -0.2
-					consumer_goods_factor = 0.1
+					consumer_goods_factor = 0.2
 					production_speed_buildings_factor = -0.1
 				}
 		}
@@ -353,7 +353,7 @@ ideas = {
 				modifier = {
 					local_resources_factor = -0.075
 					industrial_capacity_factory = -0.1
-					consumer_goods_factor = 0.05
+					consumer_goods_factor = 0.1
 					production_speed_buildings_factor = -0.05
 				}
 		}
@@ -363,7 +363,7 @@ ideas = {
 				modifier = {
 					local_resources_factor = -0.05
 					industrial_capacity_factory = -0.05
-					consumer_goods_factor = 0.025
+					consumer_goods_factor = 0.05
 					production_speed_buildings_factor = -0.025
 				}
 		}
@@ -422,7 +422,7 @@ ideas = {
 					political_power_gain = 0.1
 					communism_drift = 0.03
 					stability_factor = 0.12
-					consumer_goods_factor = -0.01
+					consumer_goods_factor = -0.02
 				}
 		}
 		
@@ -462,7 +462,7 @@ ideas = {
 		KAT_party_costs = {
 			picture = ROM_king_carol_emptied_accounts
 				modifier = {
-					consumer_goods_factor = 0.15
+					consumer_goods_factor = 0.3
 				}
 		}
 		
@@ -477,7 +477,7 @@ ideas = {
 		KAT_boat_gambling = {
 			picture = great_depression
 				modifier = {
-					consumer_goods_factor = 0.1
+					consumer_goods_factor = 0.2
 				}
 		}
 
@@ -494,7 +494,7 @@ ideas = {
 				modifier = {
 					MONTHLY_POPULATION = -0.25
 					conscription_factor = -0.15
-					consumer_goods_factor = 0.1
+					consumer_goods_factor = 0.2
 					political_power_gain = -0.25
 				}
 		}
@@ -504,7 +504,7 @@ ideas = {
 				modifier = {
 					MONTHLY_POPULATION = 0.025
 					stability_factor = 0.025
-					consumer_goods_factor = -0.025
+					consumer_goods_factor = -0.05
 				}
 		}
 		
@@ -600,7 +600,7 @@ ideas = {
 			picture = generic_oppression
 				modifier = {
 					MONTHLY_POPULATION = -0.075
-					consumer_goods_factor = -0.05
+					consumer_goods_factor = -0.1
 				}
 		
 		}
@@ -941,7 +941,7 @@ ideas = {
 				modifier = {
 					communism_drift = 0.01
 					production_speed_buildings_factor = 0.05
-					consumer_goods_factor = -0.05
+					consumer_goods_factor = -0.1
 				}
 		}
 		
@@ -951,7 +951,7 @@ ideas = {
 					communism_drift = 0.01
 					local_resources_factor = 0.1
 					production_speed_buildings_factor = 0.1
-					consumer_goods_factor = -0.05
+					consumer_goods_factor = -0.1
 				}
 		}
 		
@@ -961,7 +961,7 @@ ideas = {
 					fascism_drift = 0.01
 					industrial_capacity_factory = 0.05
 					production_speed_buildings_factor = 0.025
-					consumer_goods_factor = -0.025
+					consumer_goods_factor = -0.05
 				}
 		}
 		
@@ -1026,7 +1026,7 @@ ideas = {
 				modifier = {
 					MONTHLY_POPULATION = -0.25
 					conscription_factor = -0.15
-					consumer_goods_factor = 0.1
+					consumer_goods_factor = 0.2
 					political_power_gain = -0.25
 				}
 		}
@@ -1036,7 +1036,7 @@ ideas = {
 				modifier = {
 					MONTHLY_POPULATION = -0.2
 					conscription_factor = -0.1
-					consumer_goods_factor = 0.05
+					consumer_goods_factor = 0.1
 					political_power_gain = -0.2
 				}
 		}
@@ -1095,7 +1095,7 @@ ideas = {
 					democratic_drift = 0.01
 					industrial_capacity_factory = 0.05
 					production_speed_buildings_factor = 0.05
-					consumer_goods_factor = -0.02
+					consumer_goods_factor = -0.04
 				}
 		}
 		KAT_logistics_officers = {
@@ -1146,7 +1146,7 @@ ideas = {
 					neutrality_drift = 0.03
 					industrial_capacity_factory = 0.025
 					production_speed_buildings_factor = 0.025
-					consumer_goods_factor = -0.02
+					consumer_goods_factor = -0.04
 				}
 		}
 		KAT_peace_through_war = {
@@ -1191,7 +1191,7 @@ ideas = {
 				modifier = {
 					MONTHLY_POPULATION = -0.75
 					conscription_factor = -0.5
-					consumer_goods_factor = 0.15
+					consumer_goods_factor = 0.3
 					stability_factor = -0.4
 				}
 		}
@@ -1201,7 +1201,7 @@ ideas = {
 				modifier = {
 					MONTHLY_POPULATION = -0.5
 					conscription_factor = -0.2
-					consumer_goods_factor = 0.1
+					consumer_goods_factor = 0.2
 					stability_factor = -0.25
 				}
 		}
@@ -1211,7 +1211,7 @@ ideas = {
 				modifier = {
 					MONTHLY_POPULATION = -0.2
 					conscription_factor = -0.1
-					consumer_goods_factor = 0.05
+					consumer_goods_factor = 0.1
 					stability_factor = -0.075
 				}
 		}
@@ -1221,7 +1221,7 @@ ideas = {
 				modifier = {
 					MONTHLY_POPULATION = -0.1
 					conscription_factor = -0.05
-					consumer_goods_factor = 0.025
+					consumer_goods_factor = 0.05
 					stability_factor = -0.05
 				}
 		}
@@ -1230,7 +1230,7 @@ ideas = {
 				modifier = {
 					MONTHLY_POPULATION = -0.015
 					conscription_factor = -0.025
-					consumer_goods_factor = 0.01
+					consumer_goods_factor = 0.02
 					stability_factor = -0.025					
 				}
 		}
@@ -1240,7 +1240,7 @@ ideas = {
 				modifier = {
 					MONTHLY_POPULATION = -0.05
 					conscription_factor = -0.05
-					consumer_goods_factor = 0.05
+					consumer_goods_factor = 0.1
 					stability_factor = -0.25	
 				}
 		}
@@ -1249,7 +1249,7 @@ ideas = {
 				modifier = {
 					MONTHLY_POPULATION = 0.05
 					conscription_factor = 0.025
-					consumer_goods_factor = -0.005
+					consumer_goods_factor = -0.01
 					stability_factor = -0.05	
 				}
 		}	
@@ -1259,7 +1259,7 @@ ideas = {
 				modifier = {
 					MONTHLY_POPULATION = 0.1
 					conscription_factor = 0.05
-					consumer_goods_factor = -0.025
+					consumer_goods_factor = -0.05
 					stability_factor = 0.05	
 				}
 		}	
@@ -1269,7 +1269,7 @@ ideas = {
 				modifier = {
 					MONTHLY_POPULATION = 0.2
 					conscription_factor = 0.1
-					consumer_goods_factor = -0.05
+					consumer_goods_factor = -0.1
 					stability_factor = 0.1	
 				}
 		}	
@@ -1318,7 +1318,7 @@ ideas = {
             picture = generic_pp_unity_bonus
             removal_cost = -1
             modifier = {
-			    consumer_goods_factor = -0.02
+			    consumer_goods_factor = -0.04
 				production_speed_industrial_complex_factor = 0.10
             }
         }
@@ -1488,7 +1488,7 @@ ideas = {
 			picture = generic_goods_red_bonus
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.03
+				consumer_goods_factor = -0.06
 				production_speed_buildings_factor = 0.025
 			}		
 		}
@@ -1503,7 +1503,7 @@ ideas = {
 			picture = generic_goods_red_bonus
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.06
+				consumer_goods_factor = -0.12
 				production_speed_buildings_factor = 0.05
 			}
 		}
@@ -1722,7 +1722,7 @@ ideas = {
 			modifier = {
 				MONTHLY_POPULATION = 0.1
 				conscription_factor = 0.05
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 			}
 		}
 		KAT_railroad_connections = {
@@ -1749,7 +1749,7 @@ ideas = {
 			picture = societe
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.15
+				consumer_goods_factor = 0.3
 			}
 		}
 		KAT_republican_rally_post_idea = {
@@ -1806,7 +1806,7 @@ ideas = {
 			picture = chi_hyper_inflation3
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.03
+				consumer_goods_factor = 0.06
 				production_speed_buildings_factor = 0.03
 				stability_factor = 0.025
 			}
diff --git a/common/ideas/zzz_KIR_ideas.txt b/common/ideas/zzz_KIR_ideas.txt
index 81375c94111..b3ca3c97ffc 100644
--- a/common/ideas/zzz_KIR_ideas.txt
+++ b/common/ideas/zzz_KIR_ideas.txt
@@ -1095,7 +1095,7 @@ ideas = {
 			picture = combined_bomber_offensive
 			removal_cost = -1
 			equipment_bonus = {
-				tac_bomber_equipment = {
+				medium_plane_airframe = {
 					instant = yes
 					air_ground_attack = 0.15
 					naval_strike_attack = 0.15
@@ -1182,28 +1182,28 @@ ideas = {
 			}
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.03
+				consumer_goods_factor = 0.06
 			}
 		}
 		KIR_KI_RES_1 = {
 			name = KIR_KI_RES
 			allowed = { always = no } removal_cost = -1
-			modifier = { consumer_goods_factor = 0.045 }
+			modifier = { consumer_goods_factor = 0.09 }
 		}
 		KIR_KI_RES_2 = {
 			name = KIR_KI_RES
 			allowed = { always = no } removal_cost = -1
-			modifier = { consumer_goods_factor = 0.06 }
+			modifier = { consumer_goods_factor = 0.12 }
 		}
 		KIR_KI_RES_3 = {
 			name = KIR_KI_RES
 			allowed = { always = no } removal_cost = -1
-			modifier = { consumer_goods_factor = 0.075 }
+			modifier = { consumer_goods_factor = 0.15 }
 		}
 		KIR_KI_RES_4 = {
 			name = KIR_KI_RES
 			allowed = { always = no } removal_cost = -1
-			modifier = { consumer_goods_factor = 0.09 }
+			modifier = { consumer_goods_factor = 0.18 }
 		}
 		KIR_citizen_auxiliaries = {
 			allowed = { always = no }
@@ -1267,7 +1267,7 @@ ideas = {
 				always = no
 			}
 			modifier = {
-				guarantee_cost = -0.1
+				guarantee_cost = -0.15
 				guarantee_tension = -0.1
 				lend_lease_tension = -0.1
 				annex_cost_factor = 0.25
@@ -1312,7 +1312,7 @@ ideas = {
 				}
 			}
 			modifier = {
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 			}
 		}
 		KIC_FRV_revolt_hidden = {
@@ -1918,7 +1918,7 @@ ideas = {
 				industrial_capacity_factory = -0.2
 				attrition = 0.2
 				global_building_slots_factor = -0.4
-				consumer_goods_factor = 0.1
+				consumer_goods_factor = 0.2
 				production_speed_buildings_factor = -0.2
 				MONTHLY_POPULATION = -0.2 
 				army_org_factor = -0.5
@@ -3065,7 +3065,7 @@ ideas = {
 			name = KIR_civil_war_rising_fire
 			modifier = {
 				communism_drift = 0.1
-				consumer_goods_factor = 0.03
+				consumer_goods_factor = 0.06
 				conversion_cost_civ_to_mil_factor = -0.15
 				conversion_cost_mil_to_civ_factor = -0.15
 				industry_free_repair_factor = 0.05
@@ -3744,7 +3744,7 @@ ideas = {
 				production_lack_of_resource_penalty_factor = 0.1
 				production_factory_max_efficiency_factor = -0.1
 				attrition = 0.05
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 			}
 		}
 		KIC_FRV_revolt = {
@@ -4280,7 +4280,7 @@ ideas = {
 				always = no
 			}
 			modifier = {
-				guarantee_cost = -0.1
+				guarantee_cost = -0.15
 				guarantee_tension = -0.1
 				lend_lease_tension = -0.1
 				annex_cost_factor = 0.1
@@ -4412,6 +4412,53 @@ ideas = {
 				surrender_limit = 0.05
 			}
 		}
+		CFR_imago_parastatal_AAT = {
+			name = CFR_imago_parastatal
+			picture = KIR_CFR_imago_parastatal
+			allowed = {
+				original_tag = CHN
+			}
+
+			research_bonus = {
+				infantry_weapons = 0.05
+				artillery = 0.05
+			}
+
+			modifier = {
+				civil_war_involvement_tension = -0.5
+				guarantee_cost = -0.25
+				send_volunteer_factor = 0.5
+				send_volunteer_size = 5
+				air_volunteer_cap = 5
+				experience_gain_army_factor = 0.1
+				special_forces_training_time_factor = -0.25
+				amphibious_invasion = 0.1
+			}
+		}
+		
+		CFR_imago_parastatal_SIGNALS_AAT = {
+			name = CFR_imago_parastatal
+			picture = KIR_CFR_imago_parastatal
+			allowed = {
+				original_tag = CHN
+			}
+
+			research_bonus = {
+				infantry_weapons = 0.05
+				artillery = 0.05
+			}
+			modifier = {
+				civil_war_involvement_tension = -0.5
+				guarantee_cost = -0.25
+				send_volunteer_factor = 0.5
+				send_volunteer_size = 5
+				air_volunteer_cap = 5
+				experience_gain_army_factor = 0.1
+				special_forces_training_time_factor = -0.25
+				amphibious_invasion = 0.1
+				unit_signal_company_design_cost_factor = -0.2
+			}
+		}
 	}
 
 	tank_manufacturer = {
@@ -5530,19 +5577,19 @@ ideas = {
 			}
 			
 			equipment_bonus = {
-				fighter_equipment = {
+				small_plane_airframe = {
 					air_range = 0.05
 					reliability = 0.05
 				}
-				CAS_equipment = {
+				small_plane_cas_airframe = {
 					air_range = 0.05
 					reliability = 0.05
 				}
-				heavy_fighter_equipment = {
+				medium_plane_fighter_airframe = {
 					air_range = 0.05
 					reliability = 0.05
 				}
-				tac_bomber_equipment = {
+				medium_plane_airframe = {
 					air_range = 0.05
 					reliability = 0.05
 				}
diff --git a/common/ideas/zzz_KLG_ideas.txt b/common/ideas/zzz_KLG_ideas.txt
index 5a9b9501568..684b29d35a7 100644
--- a/common/ideas/zzz_KLG_ideas.txt
+++ b/common/ideas/zzz_KLG_ideas.txt
@@ -11,7 +11,7 @@ ideas = {
 			picture = ROM_king_carol_ii_hedonist
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				trade_laws_cost_factor = -0.25
 				economy_cost_factor = -0.25
 				trade_opinion_factor = 0.25
@@ -42,7 +42,7 @@ ideas = {
 			picture = pony_passport
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 				monthly_population = 0.2
 				civilian_intel_to_others = 10.0
 			}
diff --git a/common/ideas/zzz_LAK_ideas.txt b/common/ideas/zzz_LAK_ideas.txt
index 6e4e95e2ea2..50a9eb8635f 100644
--- a/common/ideas/zzz_LAK_ideas.txt
+++ b/common/ideas/zzz_LAK_ideas.txt
@@ -77,7 +77,7 @@ ideas = {
 			picture = generic_foreign_capital
 			modifier = {
 			    production_speed_industrial_complex_factor = 0.10
-			    consumer_goods_factor = -0.05
+			    consumer_goods_factor = -0.1
 			}
 		}
 
@@ -112,7 +112,7 @@ ideas = {
             modifier = {
                 production_factory_max_efficiency_factor = 0.05
                 industrial_capacity_factory = 0.05
-                consumer_goods_factor = -0.05
+                consumer_goods_factor = -0.1
             }
         }
 
@@ -128,7 +128,7 @@ ideas = {
 			modifier = {
 			    MONTHLY_POPULATION = 0.20
 				political_power_gain = 0.10
-				consumer_goods_factor = 0.02
+				consumer_goods_factor = 0.04
 			}
 		}
 
@@ -287,7 +287,7 @@ ideas = {
 			modifier = {
 			    MONTHLY_POPULATION = 0.25
 				political_power_gain = 0.15
-				consumer_goods_factor = 0.02
+				consumer_goods_factor = 0.04
 			}
 		}
 
@@ -304,7 +304,7 @@ ideas = {
 			    MONTHLY_POPULATION = 0.05
 				political_power_gain = 0.05
 				research_speed_factor = 0.05
-				consumer_goods_factor = 0.01
+				consumer_goods_factor = 0.02
 			}
 		}
 
@@ -333,7 +333,7 @@ ideas = {
 			removal_cost = -1
 			picture = generic_production_bonus
 			modifier = {
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 			}
 		}
 
@@ -347,7 +347,7 @@ ideas = {
 			removal_cost = -1
 			picture = trade
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				political_power_factor = 0.05
 				production_factory_max_efficiency_factor = 0.05
 				drift_defence_factor = 0.15
diff --git a/common/ideas/zzz_LCT_ideas.txt b/common/ideas/zzz_LCT_ideas.txt
index f460f2e2fee..9cddcd0a3d6 100644
--- a/common/ideas/zzz_LCT_ideas.txt
+++ b/common/ideas/zzz_LCT_ideas.txt
@@ -43,7 +43,7 @@ ideas = {
 				economy_cost_factor = 0.25
 				production_speed_industrial_complex_factor = 0.05
 				production_speed_arms_factory_factor = 0.05
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 			}
 		}
 
@@ -66,7 +66,7 @@ ideas = {
 				production_speed_industrial_complex_factor = 0.1
 				production_speed_arms_factory_factor = 0.1
 				industrial_capacity_factory = 0.05
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 			}
 		}
 
@@ -86,7 +86,7 @@ ideas = {
 				stability_factor = 0.05
 				production_speed_industrial_complex_factor = 0.05
 				production_speed_arms_factory_factor = 0.05
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 
@@ -128,7 +128,7 @@ ideas = {
 				economy_cost_factor = 0.25
 				production_speed_industrial_complex_factor = 0.15
 				production_speed_infrastructure_factor = 0.10
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 			}
 		}
 
diff --git a/common/ideas/zzz_LNS_ideas.txt b/common/ideas/zzz_LNS_ideas.txt
index 58ee9048fc7..2465972c2f8 100644
--- a/common/ideas/zzz_LNS_ideas.txt
+++ b/common/ideas/zzz_LNS_ideas.txt
@@ -118,7 +118,7 @@ ideas = {
 			picture = broken_resistance
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.2
+				consumer_goods_factor = 0.4
 				conscription_factor = -0.25
 				mobilization_speed = -0.5
 				army_morale_factor = -0.2
@@ -139,7 +139,7 @@ ideas = {
 			picture = broken_resistance
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.2
+				consumer_goods_factor = 0.4
 				conscription_factor = -0.225
 				mobilization_speed = -0.45
 				army_morale_factor = -0.2
@@ -160,7 +160,7 @@ ideas = {
 			picture = broken_resistance
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.2
+				consumer_goods_factor = 0.4
 				conscription_factor = -0.2
 				mobilization_speed = -0.4
 				army_morale_factor = -0.2
@@ -181,7 +181,7 @@ ideas = {
 			picture = broken_resistance
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.175
+				consumer_goods_factor = 0.35
 				conscription_factor = -0.175
 				mobilization_speed = -0.35
 				army_morale_factor = -0.2
@@ -202,7 +202,7 @@ ideas = {
 			picture = broken_resistance
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.15
+				consumer_goods_factor = 0.3
 				conscription_factor = -0.15
 				mobilization_speed = -0.3
 				army_morale_factor = -0.2
@@ -223,7 +223,7 @@ ideas = {
 			picture = broken_resistance
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.125
+				consumer_goods_factor = 0.25
 				conscription_factor = -0.125
 				mobilization_speed = -0.25
 				army_morale_factor = -0.2
@@ -244,7 +244,7 @@ ideas = {
 			picture = broken_resistance
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.1
+				consumer_goods_factor = 0.2
 				conscription_factor = -0.1
 				mobilization_speed = -0.2
 				army_morale_factor = -0.2
@@ -265,7 +265,7 @@ ideas = {
 			picture = broken_resistance
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.075
+				consumer_goods_factor = 0.15
 				conscription_factor = -0.075
 				mobilization_speed = -0.15
 				army_morale_factor = -0.2
@@ -286,7 +286,7 @@ ideas = {
 			picture = broken_resistance
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				conscription_factor = -0.05
 				mobilization_speed = -0.1
 				army_morale_factor = -0.2
@@ -383,7 +383,7 @@ ideas = {
 			modifier = {
 				industrial_capacity_factory = 0.1
 				production_factory_max_efficiency_factor = 0.1
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 	}
@@ -540,7 +540,7 @@ ideas = {
 				production_speed_buildings_factor = -0.5
 				industry_repair_factor = -0.5
 				industrial_capacity_factory = -0.4
-				consumer_goods_factor = 0.1
+				consumer_goods_factor = 0.2
 				army_org_factor = -0.1
 				army_attack_factor = -0.1
 				army_defence_factor = -0.1
@@ -559,7 +559,7 @@ ideas = {
 				production_speed_buildings_factor = -1
 				industry_repair_factor = -1
 				industrial_capacity_factory = -0.8
-				consumer_goods_factor = 0.2
+				consumer_goods_factor = 0.4
 				army_org_factor = -0.2
 				army_attack_factor = -0.2
 				army_defence_factor = -0.2
@@ -612,7 +612,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				MONTHLY_POPULATION = 0.15
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				production_factory_max_efficiency_factor = 0.1
 				production_speed_arms_factory_factor = -0.2
 			}
@@ -629,7 +629,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				MONTHLY_POPULATION = 0.15
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				production_factory_max_efficiency_factor = 0.1
 				production_speed_infrastructure_factor = 0.1
 				production_speed_arms_factory_factor = -0.1
@@ -647,7 +647,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				MONTHLY_POPULATION = 0.15
-				consumer_goods_factor = -0.1
+				consumer_goods_factor = -0.2
 				production_factory_max_efficiency_factor = 0.1
 				production_speed_infrastructure_factor = 0.1
 				industrial_capacity_factory = 0.1
@@ -1158,7 +1158,7 @@ ideas = {
 			modifier = {
 				industrial_capacity_factory = -0.2
 				political_power_factor = -0.25
-				consumer_goods_factor = 0.1
+				consumer_goods_factor = 0.2
 			}
 		}
 		LNS_fighting_extremists = {
@@ -1189,7 +1189,7 @@ ideas = {
 			picture = chi_hyper_inflation3
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				political_power_gain = 0.10
 				stability_factor = 0.05
 			}
@@ -1694,7 +1694,7 @@ ideas = {
 			picture = SOV_scientist_defect
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.15
+				consumer_goods_factor = 0.3
 				political_power_factor = -0.20
 				stability_factor = -0.05
 			}
@@ -1744,7 +1744,7 @@ ideas = {
 			picture = prc_permit_opium_trade
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				political_power_gain = 0.10
 				stability_factor = -0.05
 			}
@@ -1997,7 +1997,7 @@ ideas = {
 				stability_factor = 0.05
 				production_speed_industrial_complex_factor = 0.05
 				production_speed_arms_factory_factor = 0.05
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 	}
diff --git a/common/ideas/zzz_LSP_ideas.txt b/common/ideas/zzz_LSP_ideas.txt
index 6f99ce770b2..f82178b1c2d 100644
--- a/common/ideas/zzz_LSP_ideas.txt
+++ b/common/ideas/zzz_LSP_ideas.txt
@@ -358,7 +358,7 @@ ideas = {
 			picture = chi_hyper_inflation2
 			modifier = {
 				political_power_gain = -0.10
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 		LSP_civil_liberties_idea = {
@@ -391,7 +391,7 @@ ideas = {
 				stability_factor = 0.10
 				war_support_factor = 0.10
 				industrial_capacity_factory = 0.10
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 		LSP_chaotic_politics_fash1 = {
@@ -427,7 +427,7 @@ ideas = {
 			modifier = {
 				political_power_gain = 0.05
 				stability_factor = 0.05
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 		LSP_house_state = {
@@ -473,7 +473,7 @@ ideas = {
 				production_factory_max_efficiency_factor = 0.10
 				production_factory_efficiency_gain_factor = 0.10	
 				research_speed_factor = 0.10
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				neutrality_drift = 0.05
 			}
 		}
@@ -766,7 +766,7 @@ ideas = {
 		LSP_chaotic_economy = {
 			picture = ROM_king_carol_emptied_accounts
 			modifier = {
-				consumer_goods_factor = 0.30
+				consumer_goods_factor = 0.6
 				industrial_capacity_factory = -0.30
 				production_speed_buildings_factor = -0.30			
 			}
@@ -774,7 +774,7 @@ ideas = {
 		LSP_chaotic_economy_aut1 = {
 			picture = ROM_king_carol_emptied_accounts
 			modifier = {
-				consumer_goods_factor = 0.15
+				consumer_goods_factor = 0.3
 				industrial_capacity_factory = -0.15
 				production_speed_buildings_factor = -0.15			
 			}
@@ -782,7 +782,7 @@ ideas = {
 		LSP_economy_aut2 = {
 			picture = NLR_m_arsenal
 			modifier = {
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				industrial_capacity_factory = 0.15
 				production_speed_buildings_factor = 0.20			
 			}
@@ -790,7 +790,7 @@ ideas = {
 		LSP_chaotic_economy_fre1 = {
 			picture = ROM_king_carol_emptied_accounts
 			modifier = {
-				consumer_goods_factor = 0.15
+				consumer_goods_factor = 0.3
 				industrial_capacity_factory = -0.10
 				production_speed_buildings_factor = -0.20			
 			}
@@ -798,7 +798,7 @@ ideas = {
 		LSP_economy_fre2 = {
 			picture = generic_trade
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				industrial_capacity_factory = 0.10
 				production_speed_buildings_factor = 0.10			
 			}
@@ -806,7 +806,7 @@ ideas = {
 		LSP_chaotic_economy_gam1 = {
 			picture = ROM_king_carol_emptied_accounts
 			modifier = {
-				consumer_goods_factor = 0.10
+				consumer_goods_factor = 0.2
 				industrial_capacity_factory = -0.20
 				production_speed_buildings_factor = -0.15			
 			}
@@ -814,7 +814,7 @@ ideas = {
 		LSP_economy_gam2 = {
 			picture = new_deal
 			modifier = {
-				consumer_goods_factor = -0.10
+				consumer_goods_factor = -0.2
 				industrial_capacity_factory = 0.10
 				production_speed_buildings_factor = 0.10
 			}
@@ -828,7 +828,7 @@ ideas = {
 		LSP_recycling_idea = {
 			picture = generic_flexible_foreign_policy
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				production_speed_buildings_factor = 0.10
 			}
 			equipment_bonus = {
@@ -865,67 +865,67 @@ ideas = {
 		LSP_trade_profits = {#I considered using a dynamic variable for this, but considering that this idea is meant to be timed, that'd be more trouble than it's worth
 			picture = generic_goods_red_bonus
 			modifier = {
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 			}
 		}
 		LSP_trade_cost1 = {
 			picture = generic_goods_red_bonus
 			modifier = {
-				consumer_goods_factor = 0.02
+				consumer_goods_factor = 0.04
 			}
 		}
 		LSP_trade_cost2 = {
 			picture = generic_goods_red_bonus
 			modifier = {
-				consumer_goods_factor = 0.04
+				consumer_goods_factor = 0.08
 			}
 		}
 		LSP_trade_cost3 = {
 			picture = generic_goods_red_bonus
 			modifier = {
-				consumer_goods_factor = 0.06
+				consumer_goods_factor = 0.12
 			}
 		}
 		LSP_trade_cost4 = {
 			picture = generic_goods_red_bonus
 			modifier = {
-				consumer_goods_factor = 0.08
+				consumer_goods_factor = 0.16
 			}
 		}
 		LSP_trade_cost5 = {
 			picture = generic_goods_red_bonus
 			modifier = {
-				consumer_goods_factor = 0.10
+				consumer_goods_factor = 0.2
 			}
 		}
 		LSP_trade_cost6 = {
 			picture = generic_goods_red_bonus
 			modifier = {
-				consumer_goods_factor = 0.12
+				consumer_goods_factor = 0.24
 			}
 		}
 		LSP_trade_cost7 = {
 			picture = generic_goods_red_bonus
 			modifier = {
-				consumer_goods_factor = 0.14
+				consumer_goods_factor = 0.28
 			}
 		}
 		LSP_trade_cost8 = {
 			picture = generic_goods_red_bonus
 			modifier = {
-				consumer_goods_factor = 0.16
+				consumer_goods_factor = 0.32
 			}
 		}
 		LSP_trade_cost9 = {
 			picture = generic_goods_red_bonus
 			modifier = {
-				consumer_goods_factor = 0.18
+				consumer_goods_factor = 0.36
 			}
 		}
 		LSP_trade_cost10 = {
 			picture = generic_goods_red_bonus
 			modifier = {
-				consumer_goods_factor = 0.20
+				consumer_goods_factor = 0.4
 			}
 		}
 		LSP_mass_migration = {
diff --git a/common/ideas/zzz_LUS_ideas.txt b/common/ideas/zzz_LUS_ideas.txt
index cc6b3417e28..8c4e5f875c9 100644
--- a/common/ideas/zzz_LUS_ideas.txt
+++ b/common/ideas/zzz_LUS_ideas.txt
@@ -330,7 +330,7 @@ ideas = {
 			}
 			modifier = {
 				stability_factor = 0.05
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 			}
 		}
 
@@ -344,7 +344,7 @@ ideas = {
 			}
 			modifier = {
 				stability_factor = 0.15
-				consumer_goods_factor = 0.1
+				consumer_goods_factor = 0.2
 			}
 		}
 
@@ -380,7 +380,7 @@ ideas = {
 				is_subject = no
 			}
 			modifier = {
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 			}
 		}
 
@@ -568,7 +568,7 @@ ideas = {
 				is_subject = no
 			}
 			modifier = {
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 			}
 		}
 
@@ -582,7 +582,7 @@ ideas = {
 				is_subject = no
 			}
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 
@@ -596,7 +596,7 @@ ideas = {
 				is_subject = no
 			}
 			modifier = {
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 			}
 		}
 
@@ -708,7 +708,7 @@ ideas = {
 				}
 			}
 			modifier = {
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 			}
 		}
 
@@ -724,7 +724,7 @@ ideas = {
 				}
 			}
 			modifier = {
-				consumer_goods_factor = -0.03
+				consumer_goods_factor = -0.06
 			}
 		}
 
@@ -736,7 +736,7 @@ ideas = {
 			modifier = {
 				stability_factor = -0.1
 				political_power_cost = 0.3
-				consumer_goods_factor = 0.08
+				consumer_goods_factor = 0.16
 				production_factory_max_efficiency_factor = -0.1
 				industrial_capacity_factory = -0.1
 				industrial_capacity_dockyard = -0.1
@@ -753,7 +753,7 @@ ideas = {
 			modifier = {
 				stability_factor = -0.07
 				political_power_cost = 0.2
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				production_factory_max_efficiency_factor = -0.07
 				industrial_capacity_factory = -0.07
 				industrial_capacity_dockyard = -0.07
@@ -770,7 +770,7 @@ ideas = {
 			modifier = {
 				stability_factor = -0.05
 				political_power_cost = 0.1
-				consumer_goods_factor = 0.03
+				consumer_goods_factor = 0.06
 				production_factory_max_efficiency_factor = -0.03
 				industrial_capacity_factory = -0.05
 				industrial_capacity_dockyard = -0.05
@@ -787,7 +787,7 @@ ideas = {
 			modifier = {
 				stability_factor = -0.025
 				political_power_cost = 0.05
-				consumer_goods_factor = 0.01
+				consumer_goods_factor = 0.02
 				production_factory_max_efficiency_factor = -0.01
 				industrial_capacity_factory = -0.025
 				industrial_capacity_dockyard = -0.025
@@ -1054,7 +1054,7 @@ ideas = {
 				NOT = { has_government = communism is_subject = yes }
 			}
 			modifier = {
-				consumer_goods_factor = -0.1
+				consumer_goods_factor = -0.2
 			}
 		}
 
@@ -1074,7 +1074,7 @@ ideas = {
 			modifier = {
 				local_resources_factor = 0.15
 				political_power_gain = 0.10
-				consumer_goods_factor = -0.1
+				consumer_goods_factor = -0.2
 				production_factory_max_efficiency_factor = 0.10
 			}
 		}
@@ -1161,7 +1161,7 @@ ideas = {
 				}
 			}
 			modifier = {
-				consumer_goods_factor = 0.15
+				consumer_goods_factor = 0.3
 			}
 		}
 
@@ -1181,7 +1181,7 @@ ideas = {
 				}
 			}
 			modifier = {
-				consumer_goods_factor = -0.15
+				consumer_goods_factor = -0.3
 			}
 		}
 
@@ -1201,7 +1201,7 @@ ideas = {
 				always = no
 			}
 			modifier = {
-				consumer_goods_factor = -0.1
+				consumer_goods_factor = -0.2
 			}
 		}
 
@@ -1211,7 +1211,7 @@ ideas = {
 				always = no
 			}
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 
diff --git a/common/ideas/zzz_MAN&ELF_ideas.txt b/common/ideas/zzz_MAN&ELF_ideas.txt
index 997776e2f82..b5467525469 100644
--- a/common/ideas/zzz_MAN&ELF_ideas.txt
+++ b/common/ideas/zzz_MAN&ELF_ideas.txt
@@ -723,7 +723,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				production_factory_efficiency_gain_factor = 0.05
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				army_morale_factor = 0.05
 				MONTHLY_POPULATION = 0.15
 			}
@@ -953,7 +953,7 @@ ideas = {
 				industry = 0.1
 			}
 			modifier = {
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				production_speed_buildings_factor = -0.05
 			}
 		}
@@ -965,7 +965,7 @@ ideas = {
 			picture = CHN_naval_effort 
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				production_speed_naval_base_factor = 0.1
 				production_speed_dockyard_factor = 0.1
 			}
@@ -1497,7 +1497,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				min_export = 0.2
-				consumer_goods_factor = 0.15
+				consumer_goods_factor = 0.3
 				production_factory_efficiency_gain_factor = 0.1
 				civilian_factory_use = 3	
 			}
@@ -1788,7 +1788,7 @@ ideas = {
 			}
 			picture = can_wartime_prices_and_trade_board
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				min_export = 0.05
 				global_building_slots_factor = 0.5
 				production_speed_infrastructure_factor = 0.15
@@ -1801,7 +1801,7 @@ ideas = {
 			}
 			picture = can_wartime_prices_and_trade_board
 			modifier = {
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				min_export = -0.05
 				local_resources_factor = 0.25
 				production_speed_industrial_complex_factor = 0.15
diff --git a/common/ideas/zzz_MAZ_ideas.txt b/common/ideas/zzz_MAZ_ideas.txt
index 89a21808d5f..d0032051d4a 100644
--- a/common/ideas/zzz_MAZ_ideas.txt
+++ b/common/ideas/zzz_MAZ_ideas.txt
@@ -31,7 +31,7 @@ ideas = {
 				}
 			}
 			modifier = {
-				consumer_goods_factor = -0.075
+				consumer_goods_factor = -0.15
 				political_power_gain = 0.1
 				trade_opinion_factor = 0.30
 			}
diff --git a/common/ideas/zzz_MIT_ideas.txt b/common/ideas/zzz_MIT_ideas.txt
index 30621e981f9..6ea321ca856 100644
--- a/common/ideas/zzz_MIT_ideas.txt
+++ b/common/ideas/zzz_MIT_ideas.txt
@@ -15,7 +15,7 @@ ideas = {
 				industrial_capacity_factory = 0.1
 				industrial_capacity_dockyard = 0.1
 				production_speed_buildings_factor = -0.25
-				consumer_goods_factor = 0.1
+				consumer_goods_factor = 0.2
 			}
 		}
 		MIT_militaryindustrialcomplex_2 = {
@@ -33,7 +33,7 @@ ideas = {
 				industrial_capacity_factory = 0.1
 				industrial_capacity_dockyard = 0.1
 				production_speed_buildings_factor = -0.15
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 			}
 		}
 		MIT_island_rnd_idea = {
@@ -293,7 +293,7 @@ ideas = {
 
 			modifier = {
 				local_resources_factor = 0.10
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 
@@ -381,7 +381,7 @@ ideas = {
 			removal_cost = -1
 
 			modifier = {
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 				trade_opinion_factor = 0.25
 			}
 		}
@@ -509,7 +509,7 @@ ideas = {
 			removal_cost = -1
 
 			modifier = {
-				consumer_goods_factor = 0.1
+				consumer_goods_factor = 0.2
 			}
 		}
 		MIT_mountains_payment_received = {
@@ -526,7 +526,7 @@ ideas = {
 			removal_cost = -1
 
 			modifier = {
-				consumer_goods_factor = -0.1
+				consumer_goods_factor = -0.2
 			}
 		}
 		MIT_immigration_idea = {
@@ -642,7 +642,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				stability_factor = 0.1
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 			}
 		}
 
@@ -656,7 +656,7 @@ ideas = {
 			picture = generic_air_payment
 
 			modifier = {
-				consumer_goods_factor = 0.02
+				consumer_goods_factor = 0.04
 			}
 
 			equipment_bonus = {
@@ -688,7 +688,7 @@ ideas = {
 			picture = generic_air_payment
 
 			modifier = {
-				consumer_goods_factor = 0.02
+				consumer_goods_factor = 0.04
 			}
 
 			equipment_bonus = {
@@ -724,6 +724,7 @@ ideas = {
 					original_tag = SIC
 					original_tag = MIT
 				}
+				has_dlc = "Man the Guns"
 			}
 				
 			visible = {
@@ -761,6 +762,7 @@ ideas = {
 					original_tag = SIC
 					original_tag = MIT
 				}
+				has_dlc = "Man the Guns"
 			}
 				
 			visible = {
@@ -810,6 +812,7 @@ ideas = {
 					original_tag = SIC
 					original_tag = MIT
 				}
+				has_dlc = "Man the Guns"
 			}
 				
 			visible = {
@@ -1274,7 +1277,7 @@ ideas = {
             removal_cost = -1
 				modifier = {
 					production_speed_buildings_factor = 0.15
-					consumer_goods_factor = 0.10
+					consumer_goods_factor = 0.20
 			}
         }
 	}
diff --git a/common/ideas/zzz_MNC_ideas.txt b/common/ideas/zzz_MNC_ideas.txt
index 05a2537b6d8..a70e9210b3f 100644
--- a/common/ideas/zzz_MNC_ideas.txt
+++ b/common/ideas/zzz_MNC_ideas.txt
@@ -1,5 +1,7 @@
 ideas = {
 	materiel_manufacturer = {
+		designer = yes
+		
 		MNC_bandits_black_market = {
 			allowed = {
 				OR = {
@@ -207,7 +209,7 @@ ideas = {
 				production_factory_max_efficiency_factor = -0.20
 				production_factory_efficiency_gain_factor = -0.20
 				industrial_capacity_factory = -0.20
-				consumer_goods_factor = -0.10
+				consumer_goods_factor = -0.20
 			}
 		}
 
@@ -370,7 +372,7 @@ ideas = {
 				production_factory_max_efficiency_factor = 0.05
 				production_factory_efficiency_gain_factor = 0.05
 				industrial_capacity_factory = 0.10
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 
@@ -501,7 +503,7 @@ ideas = {
 				production_factory_max_efficiency_factor = -0.30
 				production_factory_efficiency_gain_factor = -0.30
 				industrial_capacity_factory = -0.30
-				consumer_goods_factor = 0.20
+				consumer_goods_factor = 0.40
 			}
 		}
 
@@ -521,7 +523,7 @@ ideas = {
 				production_factory_max_efficiency_factor = -0.15
 				production_factory_efficiency_gain_factor = -0.15
 				industrial_capacity_factory = -0.15
-				consumer_goods_factor = 0.10
+				consumer_goods_factor = 0.2
 			}
 		}
 
@@ -629,7 +631,7 @@ ideas = {
 			removal_cost = -1
 
 			modifier = {
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 			}
 		}
 
@@ -646,7 +648,7 @@ ideas = {
 			removal_cost = -1
 
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 
@@ -663,7 +665,7 @@ ideas = {
 			removal_cost = -1
 
 			modifier = {
-				consumer_goods_factor = -0.075
+				consumer_goods_factor = -0.15
 				political_power_gain = -0.05
 			}
 		}
@@ -681,7 +683,7 @@ ideas = {
 			removal_cost = -1
 
 			modifier = {
-				consumer_goods_factor = -0.10
+				consumer_goods_factor = -0.2
 				political_power_gain = -0.15
 			}
 		}
diff --git a/common/ideas/zzz_MQA_ideas.txt b/common/ideas/zzz_MQA_ideas.txt
index 0cd43dc37ae..5cd5dcacd4d 100644
--- a/common/ideas/zzz_MQA_ideas.txt
+++ b/common/ideas/zzz_MQA_ideas.txt
@@ -16,7 +16,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				naval_doctrine_cost_factor = 0.1
-				consumer_goods_factor = 0.02
+				consumer_goods_factor = 0.04
 			}
 		}
 		
@@ -30,7 +30,7 @@ ideas = {
 			picture = MQA_Newlyopend
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				production_factory_max_efficiency_factor = 0.05
 				stability_factor = -0.30 
 			}
@@ -61,7 +61,7 @@ ideas = {
 			picture = MQA_Zebrica_Trade
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				min_export = -0.05 
 			}
 		}
diff --git a/common/ideas/zzz_MSH_ideas.txt b/common/ideas/zzz_MSH_ideas.txt
index a6a3d6db37d..a0560e0d229 100644
--- a/common/ideas/zzz_MSH_ideas.txt
+++ b/common/ideas/zzz_MSH_ideas.txt
@@ -11,7 +11,7 @@ ideas = {
 				always = yes
 			}
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				political_power_gain = 0.15
 				stability_factor = -0.05
 			}
diff --git a/common/ideas/zzz_NCH_ideas.txt b/common/ideas/zzz_NCH_ideas.txt
index 50ba428e925..67739dc30fc 100644
--- a/common/ideas/zzz_NCH_ideas.txt
+++ b/common/ideas/zzz_NCH_ideas.txt
@@ -457,7 +457,7 @@ ideas = {
 				trade_cost_for_target_factor = -0.15
 			}
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 
diff --git a/common/ideas/zzz_NCR_ideas.txt b/common/ideas/zzz_NCR_ideas.txt
index 48d912d220d..1dbf4a45879 100644
--- a/common/ideas/zzz_NCR_ideas.txt
+++ b/common/ideas/zzz_NCR_ideas.txt
@@ -47,7 +47,7 @@ ideas = {
 			picture = generic_exploit_mines
 
 			modifier = {
-				consumer_goods_factor = 0.1
+				consumer_goods_factor = 0.2
 				local_resources_factor = -0.25
 				weekly_manpower = 50
 			}
@@ -66,7 +66,7 @@ ideas = {
 			picture = generic_exploit_mines
 
 			modifier = {
-				consumer_goods_factor = 0.15
+				consumer_goods_factor = 0.3
 				local_resources_factor = -0.35
 				weekly_manpower = 50
 			}
@@ -125,7 +125,7 @@ ideas = {
 
 			modifier = {
 				research_speed_factor = 0.05
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 		
@@ -316,7 +316,7 @@ ideas = {
 				communism_drift = 0.15
 				production_speed_buildings_factor = 0.1
 				production_factory_efficiency_gain_factor = 0.2
-				consumer_goods_factor = -0.1
+				consumer_goods_factor = -0.2
 				research_speed_factor = 0.05
 			}
 		}
@@ -332,7 +332,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				political_power_gain = -0.05
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 			}
 		}
 		NCR_rediscovering_marxism = {
@@ -361,7 +361,7 @@ ideas = {
 			}
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.1
+				consumer_goods_factor = -0.2
 				production_speed_buildings_factor = 0.1
 				local_resources_factor = 0.1
 				production_factory_efficiency_gain_factor = 0.05
@@ -902,7 +902,7 @@ ideas = {
 				modifier = {
 					political_power_gain = 0.05
 					trade_opinion_factor = 0.30
-					consumer_goods_factor = -0.05
+					consumer_goods_factor = -0.1
 				}
 			}
 		
diff --git a/common/ideas/zzz_NIM_ideas.txt b/common/ideas/zzz_NIM_ideas.txt
index f84188a85f1..c209f42f4a4 100644
--- a/common/ideas/zzz_NIM_ideas.txt
+++ b/common/ideas/zzz_NIM_ideas.txt
@@ -309,7 +309,7 @@ ideas = {
 				non_core_manpower = -0.02
 				conscription = 0.05
 				production_speed_infrastructure_factor = 0.1
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				local_resources_factor = 0.15
 				MONTHLY_POPULATION = -0.1
 				production_speed_buildings_factor = -0.1
@@ -488,7 +488,7 @@ ideas = {
 				army_core_defence_factor = 0.15
 				resistance_target_on_our_occupied_states = 0.1
 				subversive_activites_upkeep = 0.5
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 				production_speed_industrial_complex_factor = -0.1
 				production_speed_buildings_factor = -0.1
 				production_factory_efficiency_gain_factor = -0.1
@@ -526,7 +526,7 @@ ideas = {
 				army_core_defence_factor = 0.05
 				resistance_target_on_our_occupied_states = 0.1
 				subversive_activites_upkeep = 0.5
-				consumer_goods_factor = -0.03
+				consumer_goods_factor = -0.06
 				production_speed_industrial_complex_factor = -0.1
 				production_speed_buildings_factor = -0.1
 				production_factory_efficiency_gain_factor = -0.1
@@ -561,7 +561,7 @@ ideas = {
 				army_core_defence_factor = 0.15
 				resistance_target_on_our_occupied_states = 0.1
 				subversive_activites_upkeep = 0.5
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 				production_speed_industrial_complex_factor = -0.1
 				production_speed_buildings_factor = -0.1
 				production_factory_efficiency_gain_factor = -0.1
@@ -591,7 +591,7 @@ ideas = {
 				army_core_defence_factor = 0.15
 				resistance_target_on_our_occupied_states = 0.1
 				subversive_activites_upkeep = 0.5
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 				research_speed_factor = -0.1
 				AI_FOCUS_PEACEFUL_FACTOR = -0.15
 			}
@@ -622,7 +622,7 @@ ideas = {
 				army_core_defence_factor = 0.15
 				resistance_target_on_our_occupied_states = 0.1
 				subversive_activites_upkeep = 0.5
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 				research_speed_factor = -0.05
 				AI_FOCUS_PEACEFUL_FACTOR = -0.1
 			}
@@ -649,7 +649,7 @@ ideas = {
 				army_core_defence_factor = 0.15
 				resistance_target_on_our_occupied_states = 0.1
 				subversive_activites_upkeep = 0.5
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 			}
 		}
 
@@ -730,7 +730,7 @@ ideas = {
 			removal_cost = -1
 
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 
@@ -1047,7 +1047,7 @@ ideas = {
 			removal_cost = -1
 
 			modifier = {
-				consumer_goods_factor = 0.50
+				consumer_goods_factor = 1
 				local_resources_factor = -0.50
 				production_factory_max_efficiency_factor = -0.25
 			}
@@ -1069,7 +1069,7 @@ ideas = {
 			removal_cost = -1
 
 			modifier = {
-				consumer_goods_factor = 0.25
+				consumer_goods_factor = 0.5
 				local_resources_factor = -0.50
 				production_factory_max_efficiency_factor = -0.10
 			}
@@ -1089,7 +1089,7 @@ ideas = {
 			removal_cost = -1
 
 			modifier = {
-				consumer_goods_factor = 0.25
+				consumer_goods_factor = 0.5
 				local_resources_factor = -0.25
 			}
 		}
@@ -1208,7 +1208,7 @@ ideas = {
 				military_leader_cost_factor = -0.25
 				mobilization_speed = 0.3
 				mobilization_laws_cost_factor = -0.75
-				consumer_goods_factor = 0.03
+				consumer_goods_factor = 0.06
 				research_speed_factor = -0.03
 			}
 		}
@@ -1771,7 +1771,7 @@ ideas = {
 			removal_cost = -1
 
 			modifier = {
-				consumer_goods_factor = -0.06
+				consumer_goods_factor = -0.12
 				supply_consumption_factor = -0.15
 				attrition = -0.05
 			}
@@ -1820,7 +1820,7 @@ ideas = {
 			removal_cost = -1
 
 			modifier = {
-				consumer_goods_factor = -0.04
+				consumer_goods_factor = -0.08
 				monthly_population = 0.1
 				production_speed_buildings_factor = 0.15
 			}
@@ -1921,7 +1921,7 @@ ideas = {
 			removal_cost = -1
 
 			modifier = {
-				consumer_goods_factor = -0.04
+				consumer_goods_factor = -0.08
 			}
 		}
 
diff --git a/common/ideas/zzz_NLR_ideas.txt b/common/ideas/zzz_NLR_ideas.txt
index b780155e037..5b27ea88c08 100644
--- a/common/ideas/zzz_NLR_ideas.txt
+++ b/common/ideas/zzz_NLR_ideas.txt
@@ -542,7 +542,7 @@ ideas = {
 			removal_cost = -1
 			picture = NLR_war_plan
 			modifier = {
-				consumer_goods_factor = -0.15
+				consumer_goods_factor = -0.3
 				conscription = 0.015
 				production_speed_arms_factory_factor = 0.1
 				industrial_capacity_factory = 0.10
@@ -623,7 +623,7 @@ ideas = {
 			picture = chi_hyper_inflation3			
 			modifier = {
 				political_power_factor = 0.05
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 			}
 		}		
 		NLR_radio_equestria_idea = {
@@ -653,7 +653,7 @@ ideas = {
 			modifier = {
 				war_stability_factor = 0.20
 				political_power_factor = 0.10
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 			}
 		}		
 		NLR_academic_militarism_idea = {
@@ -997,7 +997,7 @@ ideas = {
 			modifier = {
 				industrial_capacity_dockyard = -0.90
 				repair_speed_factor = -0.50
-				consumer_goods_factor = 0.10
+				consumer_goods_factor = 0.2
 			}
 		}	
 		NLR_the_IRS_idea = {
@@ -1025,7 +1025,7 @@ ideas = {
 			removal_cost = -1
 			picture = Generic_bank_idea_icon		
 			modifier = {
-				consumer_goods_factor = -0.03
+				consumer_goods_factor = -0.06
 				production_factory_max_efficiency_factor = 0.05
 				production_factory_efficiency_gain_factor = 0.05
 				trade_opinion_factor = 0.10
diff --git a/common/ideas/zzz_NMS_ideas.txt b/common/ideas/zzz_NMS_ideas.txt
index 959a40fa45c..5a0fa826878 100644
--- a/common/ideas/zzz_NMS_ideas.txt
+++ b/common/ideas/zzz_NMS_ideas.txt
@@ -137,7 +137,7 @@ ideas = {
 				political_power_gain = 0.15
 				stability_factor = 0.05
 				war_support_factor = 0.05
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 			}
 		}
 
@@ -279,7 +279,7 @@ ideas = {
 			modifier = {
 				production_speed_buildings_factor = 0.15
 				production_factory_efficiency_gain_factor = 0.10
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 
@@ -312,7 +312,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 			    political_power_gain = 0.15
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				fascism_drift = 0.01
 			}
 		}
@@ -452,7 +452,7 @@ ideas = {
 			    stability_factor = -0.10
 				political_power_factor = -0.20
 				conscription_factor = -0.05
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 			}
 		}
 
@@ -560,7 +560,7 @@ ideas = {
 			picture = generic_exploit_mines
 			removal_cost = -1
 			modifier = {
-			    consumer_goods_factor = -0.03
+			    consumer_goods_factor = -0.06
 				local_resources_factor = 0.05
 			}
 		}
@@ -575,7 +575,7 @@ ideas = {
 			picture = generic_exploit_mines
 			removal_cost = -1
 			modifier = {
-			    consumer_goods_factor = -0.05
+			    consumer_goods_factor = -0.1
 				local_resources_factor = 0.10
 				production_factory_start_efficiency_factor = 0.05
 			}
diff --git a/common/ideas/zzz_OLE_ideas.txt b/common/ideas/zzz_OLE_ideas.txt
index 4088efcd19f..685715908af 100644
--- a/common/ideas/zzz_OLE_ideas.txt
+++ b/common/ideas/zzz_OLE_ideas.txt
@@ -27,7 +27,7 @@ ideas = {
 			removal_cost = -1
 			
 			modifier = {
-				consumer_goods_factor = -0.03
+				consumer_goods_factor = -0.06
 	            production_factory_max_efficiency_factor = 0.05
 			}
 		}
@@ -189,7 +189,7 @@ ideas = {
 			picture = generic_goods_red_bonus
 
 			modifier = {
-				consumer_goods_factor = -0.03
+				consumer_goods_factor = -0.06
 				conversion_cost_civ_to_mil_factor = -0.2
 				industrial_capacity_factory = 0.05
 			}
@@ -419,7 +419,7 @@ ideas = {
 			picture = generic_foreign_capital
 
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				production_speed_buildings_factor = 0.10
 			}
 		}
@@ -477,7 +477,7 @@ ideas = {
 			picture = generic_production_bonus
 
 			modifier = {
-				consumer_goods_factor = -0.07
+				consumer_goods_factor = -0.14
 				production_speed_buildings_factor = 0.15
 			}
 		}
@@ -518,7 +518,7 @@ ideas = {
 
 			modifier = {
 				research_speed_factor = 0.05
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				stability_factor = 0.10
 				army_core_attack_factor = 0.1
 				army_core_defence_factor = 0.1
@@ -855,7 +855,7 @@ ideas = {
 				drift_defence_factor = 0.25
 				political_power_factor = 0.1
 				monthly_population = 0.05
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				research_speed_factor = -0.05
 				experience_gain_air_factor = -0.1
 			}
@@ -1061,7 +1061,7 @@ ideas = {
 			picture = generic_war_preparation
 
 			modifier = {
-				consumer_goods_factor = -0.03
+				consumer_goods_factor = -0.06
 				industrial_capacity_factory = 0.10
 				industrial_capacity_dockyard = 0.10
 			}
@@ -1089,7 +1089,7 @@ ideas = {
 			}
 			picture = OLE_corrupt_government
 			modifier = {
-				consumer_goods_factor = 0.15
+				consumer_goods_factor = 0.3
 				stability_factor = -0.2
 				war_support_factor = -0.1
 				production_factory_max_efficiency_factor = -0.20
@@ -1121,7 +1121,7 @@ ideas = {
 			picture = OLE_corrupt_government
 
 			modifier = {
-				consumer_goods_factor = 0.15
+				consumer_goods_factor = 0.3
 				stability_factor = -0.15
 				production_factory_max_efficiency_factor = -0.20
 				industrial_capacity_factory = -0.15
@@ -1152,7 +1152,7 @@ ideas = {
 			}
 			modifier = {
 
-				consumer_goods_factor = 0.15
+				consumer_goods_factor = 0.3
 				stability_factor = -0.15
 				production_factory_max_efficiency_factor = -0.20
 				industrial_capacity_factory = -0.15
@@ -1182,7 +1182,7 @@ ideas = {
 				}
 			}
 			modifier = {
-				consumer_goods_factor = 0.15
+				consumer_goods_factor = 0.3
 				stability_factor = -0.15
 				production_factory_max_efficiency_factor = -0.15
 				industrial_capacity_factory = -0.1
@@ -1212,7 +1212,7 @@ ideas = {
 				}
 			}
 			modifier = {
-				consumer_goods_factor = 0.15
+				consumer_goods_factor = 0.3
 				stability_factor = -0.05
 				production_factory_max_efficiency_factor = -0.20
 				industrial_capacity_factory = -0.15
@@ -1242,7 +1242,7 @@ ideas = {
 				}
 			}
 			modifier = {
-				consumer_goods_factor = 0.1
+				consumer_goods_factor = 0.2
 				stability_factor = -0.1
 				production_factory_max_efficiency_factor = -0.1
 				industrial_capacity_factory = -0.05
@@ -1272,7 +1272,7 @@ ideas = {
 				}
 			}
 			modifier = {
-				consumer_goods_factor = 0.1
+				consumer_goods_factor = 0.2
 				production_factory_max_efficiency_factor = -0.15
 				industrial_capacity_factory = -0.10
 				production_speed_buildings_factor = -0.20
@@ -1293,7 +1293,7 @@ ideas = {
 			}
 			modifier = {
 				political_power_cost = -0.15
-				consumer_goods_factor = 0.03
+				consumer_goods_factor = 0.06
 			}
 		}
 	}
@@ -1397,7 +1397,7 @@ ideas = {
 				is_subject = no
 			}
 			modifier = {
-				consumer_goods_factor = 0.1
+				consumer_goods_factor = 0.2
 				stability_factor = -0.1
 				production_factory_max_efficiency_factor = -0.05
 				production_speed_buildings_factor = -0.10
@@ -1420,7 +1420,7 @@ ideas = {
 				is_subject = no
 			}
 			modifier = {
-				consumer_goods_factor = 0.1
+				consumer_goods_factor = 0.2
 				production_factory_max_efficiency_factor = -0.1
 				industrial_capacity_factory = -0.05
 				production_speed_buildings_factor = -0.15
@@ -1443,7 +1443,7 @@ ideas = {
 				is_subject = no
 			}
 			modifier = {
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				stability_factor = -0.1
 				industrial_capacity_factory = 0.10
 				production_factory_max_efficiency_factor = 0.05
@@ -1466,7 +1466,7 @@ ideas = {
 				is_subject = no
 			}
 			modifier = {
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				industrial_capacity_factory = 0.05
 				production_speed_buildings_factor = -0.05
 			}
diff --git a/common/ideas/zzz_OLV_ideas.txt b/common/ideas/zzz_OLV_ideas.txt
index eab3e1548be..f78942181b6 100644
--- a/common/ideas/zzz_OLV_ideas.txt
+++ b/common/ideas/zzz_OLV_ideas.txt
@@ -938,7 +938,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 			    stability_factor = -0.20
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				local_resources_factor = 0.05
 				production_speed_buildings_factor = 0.05
 			}
@@ -957,7 +957,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 			    stability_factor = -0.15
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				local_resources_factor = 0.075
 				production_speed_buildings_factor = 0.075
 			}
@@ -976,7 +976,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 			    stability_factor = -0.10
-				consumer_goods_factor = -0.07
+				consumer_goods_factor = -0.14
 				local_resources_factor = 0.10
 				production_speed_buildings_factor = 0.10
 			}
@@ -995,7 +995,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 			    stability_factor = -0.10
-				consumer_goods_factor = -0.03
+				consumer_goods_factor = -0.06
 				local_resources_factor = 0.02
 				production_speed_buildings_factor = 0.02
 			}
@@ -1015,7 +1015,7 @@ ideas = {
 			modifier = {
 			    stability_factor = -0.15
 				political_power_factor = -0.15
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 			}
 		}
 	}
@@ -1033,7 +1033,7 @@ ideas = {
 			modifier = {
 			    stability_factor = -0.075
 				political_power_factor = -0.075
-				consumer_goods_factor = 0.025
+				consumer_goods_factor = 0.05
 			}
 		}
 	}
@@ -1070,7 +1070,7 @@ ideas = {
 		OLV_trade_fleet_idea = {
 			picture = generic_navy_bonus
 			modifier = {
-			    consumer_goods_factor = -0.02
+			    consumer_goods_factor = -0.04
 				trade_opinion_factor = 0.15
 			}
 			equipment_bonus = {
@@ -1298,7 +1298,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 			    conscription = 0.01
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				offensive_war_stability_factor = 0.10
 			}
 		}
@@ -1465,7 +1465,7 @@ ideas = {
 			picture = raj_risk_of_famine
 			removal_cost = -1
 			modifier = {
-			    consumer_goods_factor = -0.02
+			    consumer_goods_factor = -0.04
 				political_power_factor = 0.025
 				MONTHLY_POPULATION = 0.15
 			}
@@ -1680,7 +1680,7 @@ ideas = {
 			modifier = {
 			    communism_drift = 0.02
 				political_power_gain = -0.15
-				consumer_goods_factor = 0.10
+				consumer_goods_factor = 0.2
 			}
 		}
 	}
@@ -1936,7 +1936,7 @@ ideas = {
 			picture = generic_foreign_capital
 			removal_cost = -1
 			modifier = {
-			    consumer_goods_factor = -0.03
+			    consumer_goods_factor = -0.06
 				industrial_capacity_factory = 0.05
 			}
 		}
@@ -2526,7 +2526,7 @@ ideas = {
 			    industrial_capacity_factory = -0.10
 				production_factory_efficiency_gain_factor = -0.10
 				production_factory_max_efficiency_factor = -0.10
-			    consumer_goods_factor = 0.05
+			    consumer_goods_factor = 0.1
 				stability_factor = -0.10
 			}
 		}
@@ -2549,7 +2549,7 @@ ideas = {
 			    industrial_capacity_factory = 0.05
 				production_factory_efficiency_gain_factor = 0.10
 				production_factory_max_efficiency_factor = 0.10
-			    consumer_goods_factor = -0.05
+			    consumer_goods_factor = -0.1
 			}
 		}
 	}
diff --git a/common/ideas/zzz_PCB_ideas.txt b/common/ideas/zzz_PCB_ideas.txt
index 19b02d980e8..f6b2b917fdd 100644
--- a/common/ideas/zzz_PCB_ideas.txt
+++ b/common/ideas/zzz_PCB_ideas.txt
@@ -7,7 +7,7 @@ ideas = {
 
 			modifier = {
 				political_power_factor = -0.1
-				consumer_goods_factor = 0.1
+				consumer_goods_factor = 0.2
 				min_export = 0.1
 			}
 			targeted_modifier = {
@@ -37,7 +37,7 @@ ideas = {
 		PCB_sugar_tax_for_schools = {
 			picture = generic_neutrality_drift_bonus
 			modifier = {
-				consumer_goods_factor = 0.03
+				consumer_goods_factor = 0.06
 				neutrality_drift = 0.05
 			}
 		}
diff --git a/common/ideas/zzz_PLB_NP_ideas.txt b/common/ideas/zzz_PLB_NP_ideas.txt
index 967782f648b..a7d9c83381d 100644
--- a/common/ideas/zzz_PLB_NP_ideas.txt
+++ b/common/ideas/zzz_PLB_NP_ideas.txt
@@ -74,7 +74,7 @@ ideas = {
 				is_in_faction_with = PLB
 			}
 			modifier = {
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 				production_speed_buildings_factor = 0.05
 			}
 		}
@@ -162,7 +162,7 @@ ideas = {
 				industrial_capacity_factory = 0.2
 				production_factory_max_efficiency_factor = 0.2
 				production_speed_buildings_factor = 0.2
-				consumer_goods_factor = -0.2
+				consumer_goods_factor = -0.4
 			}
 		}
 		PLB_NP_megacorp_aid_no_dod = {
@@ -178,7 +178,7 @@ ideas = {
 				industrial_capacity_factory = 0.05
 				production_factory_max_efficiency_factor = 0.05
 				production_speed_buildings_factor = 0.05
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 			targeted_modifier = {
 				tag = CHN
@@ -213,7 +213,7 @@ ideas = {
 				original_tag = PLB
 			}
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 		PLB_NP_true_endsieg = {
@@ -258,7 +258,7 @@ ideas = {
 				always = no
 			}
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				industrial_capacity_dockyard = 0.05
 				industrial_capacity_factory = 0.05
 				production_factory_max_efficiency_factor = 0.05
diff --git a/common/ideas/zzz_PLB_ideas.txt b/common/ideas/zzz_PLB_ideas.txt
index 4ce7ba93d10..38b744ec84b 100644
--- a/common/ideas/zzz_PLB_ideas.txt
+++ b/common/ideas/zzz_PLB_ideas.txt
@@ -479,7 +479,7 @@ ideas = {
 				conscription_factor = -0.40
 				stability_factor = -0.10
 				war_support_factor = -0.10
-				consumer_goods_factor = 0.30
+				consumer_goods_factor = 0.6
 				industrial_capacity_factory = -0.25
 				industrial_capacity_dockyard = -0.25
 				production_factory_max_efficiency_factor = -0.20
@@ -502,7 +502,7 @@ ideas = {
 				conscription_factor = -0.40
 				stability_factor = -0.10
 				war_support_factor = -0.10
-				consumer_goods_factor = 0.20
+				consumer_goods_factor = 0.4
 				industrial_capacity_factory = -0.20
 				industrial_capacity_dockyard = -0.20
 				production_factory_max_efficiency_factor = -0.20
@@ -525,7 +525,7 @@ ideas = {
 				conscription_factor = -0.40
 				stability_factor = -0.10
 				war_support_factor = -0.10
-				consumer_goods_factor = 0.35
+				consumer_goods_factor = 0.7
 				industrial_capacity_factory = -0.30
 				industrial_capacity_dockyard = -0.30
 				production_factory_max_efficiency_factor = -0.25
@@ -548,7 +548,7 @@ ideas = {
 				conscription_factor = -0.35
 				stability_factor = -0.10
 				war_support_factor = -0.10
-				consumer_goods_factor = 0.20
+				consumer_goods_factor = 0.4
 				industrial_capacity_factory = -0.15
 				industrial_capacity_dockyard = -0.15
 				production_factory_max_efficiency_factor = -0.10
@@ -573,7 +573,7 @@ ideas = {
 				conscription_factor = -0.30
 				stability_factor = -0.10
 				war_support_factor = -0.10
-				consumer_goods_factor = 0.15
+				consumer_goods_factor = 0.3
 				industrial_capacity_factory = -0.10
 				industrial_capacity_dockyard = -0.10
 				production_factory_max_efficiency_factor = -0.1
@@ -595,7 +595,7 @@ ideas = {
 				conscription_factor = -0.20
 				stability_factor = -0.10
 				war_support_factor = -0.10
-				consumer_goods_factor = 0.1
+				consumer_goods_factor = 0.2
 				industrial_capacity_factory = -0.05
 				industrial_capacity_dockyard = -0.05
 				production_factory_max_efficiency_factor = -0.1
@@ -627,7 +627,7 @@ ideas = {
 			}
 			picture = generic_license_production
 			modifier = {
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				license_purchase_cost = 1
 			}
 			on_remove = {
@@ -687,7 +687,7 @@ ideas = {
 			picture = SPA_recovering_from_the_civil_war
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 		
@@ -701,7 +701,7 @@ ideas = {
 			picture = SPA_recovering_from_the_civil_war
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 			}
 		}
 		
@@ -749,7 +749,7 @@ ideas = {
 			modifier = {
 				research_speed_factor = -0.10
 				conscription_factor = -0.10
-				consumer_goods_factor = 0.10
+				consumer_goods_factor = 0.2
 				industrial_capacity_factory = -0.10
 				production_factory_max_efficiency_factor = -0.10
 				production_speed_buildings_factor = -0.10
@@ -1630,7 +1630,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				production_speed_buildings_factor = 0.10
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				industry_repair_factor = 0.10
 				political_power_gain = 0.1
 				
@@ -1654,7 +1654,7 @@ ideas = {
 			picture = PLB_polar_bank_1and2
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.10
+				consumer_goods_factor = 0.2
 				political_power_gain = -0.1
 				political_advisor_cost_factor = 0.15
 				trade_laws_cost_factor = 0.15
@@ -1680,7 +1680,7 @@ ideas = {
 			picture = PLB_polar_bank_1and2
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				political_power_gain = 0.15
 				political_advisor_cost_factor = -0.25
 				trade_laws_cost_factor = -0.25
@@ -1730,7 +1730,7 @@ ideas = {
 			picture = PLB_wander_shaman
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				conscription_factor = 0.1
 				war_support_factor = 0.05
 				local_resources_factor = 0.15
@@ -1947,7 +1947,7 @@ ideas = {
 			picture = PLB_nature_guarded
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.02
+				consumer_goods_factor = 0.04
 				stability_factor = 0.05
 			} 
 			research_bonus = {
@@ -1974,7 +1974,7 @@ ideas = {
 			removal_cost = -1
 			modifier = { 
 				conscription_factor = -0.10
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				production_factory_max_efficiency_factor = -0.10
 				production_factory_efficiency_gain_factor = -0.10
 				industrial_capacity_factory = -0.10
@@ -2067,7 +2067,7 @@ ideas = {
 			picture = generic_agrarian_reform
 			removal_cost = -1
 			modifier = {
-			   consumer_goods_factor = 0.05
+			   consumer_goods_factor = 0.1
 			   research_speed_factor = 0.05
 			}
 		}
@@ -2094,7 +2094,7 @@ ideas = {
 				production_factory_max_efficiency_factor = 0.1
 				industrial_capacity_factory = 0.1
 				production_speed_buildings_factor = -0.1
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				
 			}
 		}
@@ -2138,7 +2138,7 @@ ideas = {
 			}
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				research_speed_factor = 0.1
 			}
 			research_bonus = {
@@ -2164,7 +2164,7 @@ ideas = {
 			}
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.1
+				consumer_goods_factor = -0.2
 			}
 		}
 		PLB_protect_weaker_bears = {
@@ -2209,7 +2209,7 @@ ideas = {
 			picture = SRS_skynavian_egalitarianism
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				political_power_factor = 0.05
 				army_defence_factor = 0.05
 			}
@@ -2232,7 +2232,7 @@ ideas = {
 			picture = PLB_bears
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				stability_factor = 0.05
 				army_defence_factor = 0.05
 				MONTHLY_POPULATION = 0.20
@@ -2334,7 +2334,7 @@ ideas = {
 				war_support_factor = 0.05
 				army_morale_factor = 0.10
 				local_resources_factor = -0.05
-				consumer_goods_factor = 0.03
+				consumer_goods_factor = 0.06
 			}
 		}
 		PLB_republican_struggle = {
@@ -2512,7 +2512,7 @@ ideas = {
 			modifier = {
 				conscription = 0.03
 				political_power_gain = -0.3
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 			}
 		}
 		PLB_a_race_of_smiths = {
@@ -2573,7 +2573,7 @@ ideas = {
 				production_factory_efficiency_gain_factor = -0.2
 				industrial_capacity_factory = 0.25
 				research_speed_factor = -0.2
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				minimum_training_level = -0.20
 			}
 			equipment_bonus = {
@@ -2676,7 +2676,7 @@ ideas = {
 				winter_attrition_factor = -0.15
 				attrition = -0.2
 				supply_consumption_factor = -0.2
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 			}
 		}
 		PLB_loyalty_corps = {
@@ -2762,7 +2762,7 @@ ideas = {
 			}
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				democratic_drift = 0.1
 			}
 		}
@@ -2784,7 +2784,7 @@ ideas = {
 			}
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 			}
 		}
 		PLB_gold_currency = {
@@ -2805,7 +2805,7 @@ ideas = {
 			}
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				trade_opinion_factor = 0.1
 				min_export = -0.05
 			}
@@ -2981,7 +2981,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				experience_gain_navy = 0.05
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 		PLB_penguin_support_corps_spirit = {
@@ -3142,7 +3142,7 @@ ideas = {
 			picture = MIT_national_industrial
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				local_resources_factor = -0.10
 			}
 		}
@@ -3623,7 +3623,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				political_power_factor = -0.25
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 			}
 		}
 		PLB_prepare_for_tundra = {
@@ -3736,7 +3736,7 @@ ideas = {
 			picture = generic_economic_increase
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				line_change_production_efficiency_factor = 0.10
 				conversion_cost_civ_to_mil_factor = -0.20
 				conversion_cost_mil_to_civ_factor = -0.20
@@ -4241,7 +4241,7 @@ ideas = {
 			picture = generic_central_management
 
 			modifier = {
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				min_export = 0.10
 			}
 			targeted_modifier = {
@@ -4683,7 +4683,7 @@ ideas = {
 
 			modifier = {
 				political_power_factor = -0.10
-				consumer_goods_factor = 0.10
+				consumer_goods_factor = 0.2
 				min_export = 0.15
 			}
 			targeted_modifier = {
@@ -4708,7 +4708,7 @@ ideas = {
 			removal_cost = -1
 			picture = eng_a_change_in_course
 			modifier = {
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				conscription = -0.005
 				production_speed_infrastructure_factor = -0.1
 				production_speed_buildings_factor = -0.1
@@ -5307,7 +5307,7 @@ ideas = {
 			removal_cost = -1
 			picture = HIP_moneylock
 			modifier = {
-				consumer_goods_factor = 0.2
+				consumer_goods_factor = 0.4
 				research_speed_factor = -0.4
 				industrial_capacity_factory = -0.4
 				monthly_population = -0.4
@@ -5441,7 +5441,7 @@ ideas = {
 			modifier = {
 				war_support_weekly = -0.005
 				stability_weekly = -0.005
-				consumer_goods_factor = -0.1
+				consumer_goods_factor = -0.2
 				industry_repair_factor = 0.15
 				industry_free_repair_factor = 0.15
 				industrial_capacity_factory = 0.15
@@ -5486,7 +5486,7 @@ ideas = {
 				conscription = 0.01
 				conscription_factor = 0.15
 				army_morale_factor = 0.1
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 			}
 		}
 		PLB_devouring_changelings = {
@@ -5662,7 +5662,7 @@ ideas = {
 				industrial_capacity_factory = 0.1
 				industrial_capacity_dockyard = 0.1
 				conversion_cost_civ_to_mil_factor = -0.333
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				production_oil_factor = 0.1
 				production_speed_arms_factory_factor = 0.25
 				production_speed_dockyard_factor = 0.25
diff --git a/common/ideas/zzz_PYT_ideas.txt b/common/ideas/zzz_PYT_ideas.txt
index 4a3dae13d14..452eaaff295 100644
--- a/common/ideas/zzz_PYT_ideas.txt
+++ b/common/ideas/zzz_PYT_ideas.txt
@@ -222,7 +222,7 @@ ideas = {
             removal_cost = -1
             modifier = {
 			    local_resources_factor = 0.10
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				production_factory_max_efficiency_factor = -0.30
 			    production_factory_efficiency_gain_factor = -0.30
 			    industrial_capacity_factory = -0.30
@@ -354,7 +354,7 @@ ideas = {
             removal_cost = -1
             modifier = {
 			    local_resources_factor = 0.10
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				production_factory_max_efficiency_factor = -0.20
 			    production_factory_efficiency_gain_factor = -0.20
 			    industrial_capacity_factory = -0.20
@@ -391,7 +391,7 @@ ideas = {
             removal_cost = -1
             modifier = {
 			    local_resources_factor = 0.10
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				production_factory_max_efficiency_factor = -0.10
 			    production_factory_efficiency_gain_factor = -0.10
 			    industrial_capacity_factory = -0.10
@@ -411,7 +411,7 @@ ideas = {
             removal_cost = -1
             modifier = {
 			    local_resources_factor = 0.15
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
             }
         }	
     }
@@ -428,7 +428,7 @@ ideas = {
             removal_cost = -1
             modifier = {
 			    local_resources_factor = 0.15
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				production_factory_max_efficiency_factor = 0.05
 			    production_factory_efficiency_gain_factor = 0.05
             }
@@ -447,7 +447,7 @@ ideas = {
             removal_cost = -1
             modifier = {
 			    local_resources_factor = 0.05
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				production_factory_max_efficiency_factor = -0.15
 			    production_factory_efficiency_gain_factor = -0.15
 			    industrial_capacity_factory = -0.15
@@ -466,7 +466,7 @@ ideas = {
             picture = generic_production_bonus
             removal_cost = -1
             modifier = {
-				consumer_goods_factor = -0.04
+				consumer_goods_factor = -0.08
 				production_factory_max_efficiency_factor = -0.05
 			    production_factory_efficiency_gain_factor = -0.05
 			    industrial_capacity_factory = -0.05
@@ -485,7 +485,7 @@ ideas = {
             picture = generic_production_bonus
             removal_cost = -1
             modifier = {
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 				production_factory_max_efficiency_factor = 0.05
 			    production_factory_efficiency_gain_factor = 0.05
 			    industrial_capacity_factory = 0.05
@@ -700,7 +700,7 @@ ideas = {
             picture = generic_production_bonus
             removal_cost = -1
             modifier = {
-				consumer_goods_factor = -0.03
+				consumer_goods_factor = -0.06
 				production_speed_buildings_factor = 0.075
 				production_factory_max_efficiency_factor = 0.075
 			    production_factory_efficiency_gain_factor = 0.075
@@ -857,7 +857,7 @@ ideas = {
             removal_cost = -1
             modifier = {
 			    local_resources_factor = 0.15
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				production_factory_max_efficiency_factor = 0.10
 			    production_factory_efficiency_gain_factor = 0.10
             }
@@ -1284,7 +1284,7 @@ ideas = {
             picture = generic_foreign_capital
             removal_cost = -1
             modifier = {
-			    consumer_goods_factor = -0.05
+			    consumer_goods_factor = -0.1
 				trade_laws_cost_factor = -0.10
 				trade_opinion_factor = 0.15
             }
@@ -1371,7 +1371,7 @@ ideas = {
             picture = generic_production_bonus
             removal_cost = -1
             modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				production_speed_buildings_factor = 0.15
 				production_factory_max_efficiency_factor = 0.05
 			    production_factory_efficiency_gain_factor = 0.05
@@ -1422,7 +1422,7 @@ ideas = {
 			    local_resources_factor = 0.10
 				stability_factor = 0.10
 				political_power_gain = 0.10
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
             }
         }	
     }
@@ -1703,7 +1703,7 @@ ideas = {
             picture = SOV_scientist_defect
             removal_cost = -1
             modifier = {
-                consumer_goods_factor = -0.05
+                consumer_goods_factor = -0.1
 			    industrial_capacity_factory = 0.10
             }
         }	
@@ -1824,7 +1824,7 @@ ideas = {
 				communism_drift = 0.01
 				industrial_capacity_factory = -0.10
 				production_factory_efficiency_gain_factor = -0.10
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
             }
         }	
     }
@@ -1872,7 +1872,7 @@ ideas = {
             modifier = {
 			    political_power_factor = 0.05
 				production_speed_industrial_complex_factor = 0.10
-			    consumer_goods_factor = -0.02
+			    consumer_goods_factor = -0.04
             }
         }	
     }
@@ -1982,7 +1982,7 @@ ideas = {
             picture = generic_foreign_capital
             removal_cost = -1
             modifier = {
-			    consumer_goods_factor = 0.15
+			    consumer_goods_factor = 0.3
 				production_speed_buildings_factor = 0.30
 				political_power_factor = 0.05
             }
@@ -2007,7 +2007,7 @@ ideas = {
             picture = generic_production_bonus
             removal_cost = -1
             modifier = {
-			    consumer_goods_factor = -0.02
+			    consumer_goods_factor = -0.04
 				industrial_capacity_factory = 0.05
 				production_factory_efficiency_gain_factor = 0.05
             }
@@ -2156,7 +2156,7 @@ ideas = {
             picture = ROM_king_carol_ii_hedonist
             removal_cost = -1
             modifier = {
-			    consumer_goods_factor = -0.05
+			    consumer_goods_factor = -0.1
 				political_power_factor = 0.05
 				industrial_capacity_factory = -0.10
 				production_factory_efficiency_gain_factor = -0.10
@@ -2285,7 +2285,7 @@ ideas = {
 			    production_factory_efficiency_gain_factor = 0.10
 			    industrial_capacity_factory = 0.10
 				local_resources_factor = 0.10
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
             }
         }	
     }
@@ -2309,7 +2309,7 @@ ideas = {
             modifier = {
                 stability_factor = 0.05
 				political_power_factor = 0.10
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
             }
         }	
     }
@@ -2328,7 +2328,7 @@ ideas = {
             picture = generic_foreign_capital
             removal_cost = -1
             modifier = {
-			    consumer_goods_factor = -0.05
+			    consumer_goods_factor = -0.1
 				trade_laws_cost_factor = -0.10
 				trade_opinion_factor = 0.15
             }
@@ -2526,7 +2526,7 @@ ideas = {
             modifier = {
 			    political_power_gain = 0.15
 				democratic_acceptance = 25
-			    consumer_goods_factor = 0.05
+			    consumer_goods_factor = 0.1
             }
         }	
     }
@@ -2652,7 +2652,7 @@ ideas = {
             picture = generic_production_bonus
             removal_cost = -1
             modifier = {
-				consumer_goods_factor = -0.04
+				consumer_goods_factor = -0.08
 				production_speed_buildings_factor = 0.10
 				production_factory_max_efficiency_factor = 0.10
 			    production_factory_efficiency_gain_factor = 0.10
@@ -2695,7 +2695,7 @@ ideas = {
             picture = generic_foreign_capital
             removal_cost = -1
             modifier = {
-			    consumer_goods_factor = -0.03
+			    consumer_goods_factor = -0.06
 				trade_laws_cost_factor = -0.15
 				political_power_factor = -0.05
             }
diff --git a/common/ideas/zzz_Prywhen_ideas.txt b/common/ideas/zzz_Prywhen_ideas.txt
index 11ab1f77a23..3480fb79bfe 100644
--- a/common/ideas/zzz_Prywhen_ideas.txt
+++ b/common/ideas/zzz_Prywhen_ideas.txt
@@ -1462,7 +1462,7 @@ ideas = {
 			removal_cost = -1
 			picture = ast_all_in
 			modifier = {
-				consumer_goods_factor = -0.1
+				consumer_goods_factor = -0.2
 				local_resources_factor = 0.15
 			}
 		}
diff --git a/common/ideas/zzz_RCT_ideas.txt b/common/ideas/zzz_RCT_ideas.txt
index 4a531c3e46e..5cdea22d457 100644
--- a/common/ideas/zzz_RCT_ideas.txt
+++ b/common/ideas/zzz_RCT_ideas.txt
@@ -89,7 +89,7 @@ ideas = {
 			picture = generic_goods_red_bonus
 
 			modifier = {
-				consumer_goods_factor = 0.07
+				consumer_goods_factor = 0.14
 			}
 		}
 
@@ -113,7 +113,7 @@ ideas = {
 			modifier = {
 				conscription_factor = -0.01
 				industrial_capacity_factory = 0.05
-				consumer_goods_factor = -0.03
+				consumer_goods_factor = -0.06
 			}
 		}
 
@@ -137,7 +137,7 @@ ideas = {
 			modifier = {
 				conscription_factor = -0.02
 				industrial_capacity_factory = 0.10
-				consumer_goods_factor = -0.06
+				consumer_goods_factor = -0.12
 			}
 		}
 
@@ -227,7 +227,7 @@ ideas = {
 
 			modifier = {
 				trade_opinion_factor = 0.33
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				political_power_gain = 0.10
 			}
 
@@ -598,7 +598,7 @@ ideas = {
 			picture = chi_hyper_inflation
 
 			modifier = {
-				consumer_goods_factor = 0.25
+				consumer_goods_factor = 0.5
 				industrial_capacity_factory = -0.20
 				industrial_capacity_dockyard = -0.20
 			}
@@ -620,7 +620,7 @@ ideas = {
 			picture = chi_hyper_inflation2
 
 			modifier = {
-				consumer_goods_factor = 0.15
+				consumer_goods_factor = 0.3
 				industrial_capacity_factory = -0.10
 				industrial_capacity_dockyard = -0.10	
             }
@@ -642,7 +642,7 @@ ideas = {
 			picture = chi_hyper_inflation3
 
 			modifier = {
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				industrial_capacity_factory = -0.05
 				industrial_capacity_dockyard = -0.05
 			}
@@ -1490,7 +1490,7 @@ ideas = {
 			removal_cost = -1
 
 			modifier = {
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 				trade_opinion_factor = 0.50
 			}
 		}
@@ -1682,7 +1682,7 @@ ideas = {
 			removal_cost = -1
 
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				planning_speed = 0.10
 			}
 		}
@@ -1944,7 +1944,7 @@ ideas = {
 
 			modifier = {
 				local_resources_factor = 0.10
-				consumer_goods_factor = -0.03
+				consumer_goods_factor = -0.06
 			}
 		}
 
@@ -1970,7 +1970,7 @@ ideas = {
 			modifier = {
 				stability_factor = 0.1
 				political_power_factor = 0.15
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 			}
 		}
 
@@ -2333,7 +2333,7 @@ ideas = {
 			modifier = {
 				stability_factor = 0.05
 				industrial_capacity_factory = 0.05
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				political_power_gain = -0.15
 			}
 		}
@@ -2404,7 +2404,7 @@ ideas = {
 			picture = STG_pioneers
 
 			modifier = {
-				consumer_goods_factor = -0.03
+				consumer_goods_factor = -0.06
 				stability_factor = -0.05
 				monthly_population = 0.15
 				political_power_gain = -0.15
@@ -2429,7 +2429,7 @@ ideas = {
 			picture = STG_pioneers
 
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				stability_factor = -0.05
 				monthly_population = 0.15
 				}
@@ -2453,7 +2453,7 @@ ideas = {
 			picture = STG_pioneers
 
 			modifier = {
-				consumer_goods_factor = -0.07
+				consumer_goods_factor = -0.14
 				monthly_population = 0.15
 				}
 		}
diff --git a/common/ideas/zzz_RIV_ideas.txt b/common/ideas/zzz_RIV_ideas.txt
index cb0c25501f9..15e602812b4 100644
--- a/common/ideas/zzz_RIV_ideas.txt
+++ b/common/ideas/zzz_RIV_ideas.txt
@@ -218,7 +218,7 @@ ideas = {
 				political_power_gain = 0.25
 				production_factory_max_efficiency_factor = 0.1
 				stability_factor = 0.1
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 			}
 		}
 
@@ -253,7 +253,7 @@ ideas = {
 				political_power_gain = 0.25
 				production_factory_max_efficiency_factor = 0.12
 				stability_factor = 0.1
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 				political_advisor_cost_factor = -0.25
 				trade_opinion_factor = 0.25
 			}
@@ -391,7 +391,7 @@ ideas = {
 			removal_cost = -1
 
 			modifier = {
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 			}
 		}
 
@@ -414,7 +414,7 @@ ideas = {
 			removal_cost = -1
 
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 
diff --git a/common/ideas/zzz_ROU_ideas.txt b/common/ideas/zzz_ROU_ideas.txt
index 27dd24ec4f4..ea91ce84007 100644
--- a/common/ideas/zzz_ROU_ideas.txt
+++ b/common/ideas/zzz_ROU_ideas.txt
@@ -32,7 +32,7 @@ ideas = {
 			modifier = {
 				fascism_drift = 0.02
 				political_power_gain = 0.05
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 			}
 		}
 	}
@@ -85,7 +85,7 @@ ideas = {
 			modifier = {
 				political_power_gain = 0.25
 				monthly_population = 0.15
-				consumer_goods_factor = -0.03
+				consumer_goods_factor = -0.06
 			}
 		}
 	}
@@ -120,7 +120,7 @@ ideas = {
 				stability_factor = -0.15
 				political_power_gain = -0.1
 				industrial_capacity_factory = -0.1
-				consumer_goods_factor = 0.1
+				consumer_goods_factor = 0.2
 			}
 		}
 	}
@@ -138,7 +138,7 @@ ideas = {
 				stability_factor = -0.1
 				political_power_gain = -0.05
 				industrial_capacity_factory = -0.05
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 			}
 		}
 	}
@@ -156,7 +156,7 @@ ideas = {
 				stability_factor = -0.05
 				political_power_gain = -0.025
 				industrial_capacity_factory = -0.025
-				consumer_goods_factor = 0.025
+				consumer_goods_factor = 0.05
 			}
 		}
 	}
@@ -191,7 +191,7 @@ ideas = {
 				stability_factor = 0.05
 				political_power_gain = 0.15
 				industrial_capacity_factory = 0.1
-				consumer_goods_factor = 0.03
+				consumer_goods_factor = 0.06
 			}
 		}
 	}
@@ -240,7 +240,7 @@ ideas = {
 			removal_cost = -1
 			picture = ger_revive_the_kaiserreich
 			modifier = {
-				consumer_goods_factor = -0.04
+				consumer_goods_factor = -0.08
 				production_speed_buildings_factor = 0.1
 			}
 		}
@@ -256,7 +256,7 @@ ideas = {
 			removal_cost = -1
 			picture = ger_revive_the_kaiserreich
 			modifier = {
-				consumer_goods_factor = -0.07
+				consumer_goods_factor = -0.14
 				production_speed_buildings_factor = 0.15
 			}
 		}
@@ -275,7 +275,7 @@ ideas = {
 				stability_factor = -0.15
 				political_power_gain = -0.50
 				production_speed_buildings_factor = -0.25
-				consumer_goods_factor = 0.25
+				consumer_goods_factor = 0.5
 			}
 		}
 	}
@@ -294,7 +294,7 @@ ideas = {
 				stability_factor = -0.05
 				political_power_gain = -0.15
 				production_speed_buildings_factor = -0.05
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 			}
 		}
 	}
@@ -357,7 +357,7 @@ ideas = {
 			modifier = {
 				production_factory_max_efficiency_factor = 0.10
 				industrial_capacity_factory = 0.10
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 	}
@@ -649,7 +649,7 @@ ideas = {
 			modifier = {
 				fascism_drift = 0.03
 				political_power_gain = 0.10
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 	}
diff --git a/common/ideas/zzz_SAM_ideas.txt b/common/ideas/zzz_SAM_ideas.txt
index 80193dc6c43..e92cb5e4e6d 100644
--- a/common/ideas/zzz_SAM_ideas.txt
+++ b/common/ideas/zzz_SAM_ideas.txt
@@ -52,7 +52,7 @@ ideas = {
 			}
 			
 			modifier = {
-				consumer_goods_factor = 0.1
+				consumer_goods_factor = 0.2
 				industrial_capacity_dockyard = 0.15
 				navy_screen_attack_factor = 0.1
 				navy_screen_defence_factor = 0.1
diff --git a/common/ideas/zzz_SCS_ideas.txt b/common/ideas/zzz_SCS_ideas.txt
index adb2867941e..665b85cb031 100644
--- a/common/ideas/zzz_SCS_ideas.txt
+++ b/common/ideas/zzz_SCS_ideas.txt
@@ -3,7 +3,7 @@ ideas = {
 		designer = yes
 	
 		SCS_tank_1 = {
-			visible = {
+			allowed = {
 				original_tag = SCS
 			}
 			picture = SCS_tank_1
@@ -12,7 +12,7 @@ ideas = {
 			}
 		}
 		SCS_tank_2 = {
-			visible = {
+			allowed = {
 				original_tag = SCS
 			}
 			picture = SCS_tank_2
@@ -245,7 +245,7 @@ ideas = {
 			picture = generic_foreign_capital
 			modifier = {
 				political_power_factor = -0.15
-				consumer_goods_factor = -0.10
+				consumer_goods_factor = -0.2
 			}
 		}
 		SCS_disorganized = {
@@ -300,7 +300,7 @@ ideas = {
 				production_factory_efficiency_gain_factor = 0.05
 				production_factory_max_efficiency_factor = 0.05
 				industrial_capacity_factory  = 0.05
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				production_speed_buildings_factor = 0.10
 			}
 		}
@@ -372,7 +372,7 @@ ideas = {
 		SCS_moderate_regulation = {
 			picture = EQS_AI_buff
 			modifier = {
-				consumer_goods_factor = 0.03
+				consumer_goods_factor = 0.06
 				production_speed_buildings_factor = 0.05
 				political_power_cost = 0.10
 			}
@@ -380,7 +380,7 @@ ideas = {
 		SCS_heavy_regulation = {
 			picture = EQS_AI_buff
 			modifier = {
-				consumer_goods_factor = 0.06
+				consumer_goods_factor = 0.12
 				production_speed_buildings_factor = 0.10
 				political_power_cost = 0.15
 			}
@@ -485,7 +485,7 @@ ideas = {
 		SCS_private_gunmaking = {
 			picture = FRA_scw_intervention_republicans_focus
 			modifier = {
-				consumer_goods_factor = -0.03
+				consumer_goods_factor = -0.06
 			}
 			equipment_bonus = {
 				infantry_equipment = {
@@ -549,7 +549,7 @@ ideas = {
 		SCS_LSP_pact_SCS= {
 			picture = generic_production_bonus
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				production_speed_buildings_factor = 0.10
 			}
 		}
@@ -656,20 +656,20 @@ ideas = {
 		SCS_barons_power = {
 			picture = generic_goods_red_bonus
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 		SCS_barons_power_apple1 = {
 			picture = generic_goods_red_bonus
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				stability_factor = -0.05
 			}
 		}
 		SCS_barons_power_apple2 = {
 			picture = generic_goods_red_bonus
 			modifier = {
-				consumer_goods_factor = -0.07
+				consumer_goods_factor = -0.14
 				stability_factor = -0.08
 				conscription_factor = 0.05
 			}
@@ -677,7 +677,7 @@ ideas = {
 		SCS_barons_power_apple3 = {
 			picture = generic_goods_red_bonus
 			modifier = {
-				consumer_goods_factor = -0.10
+				consumer_goods_factor = -0.2
 				stability_factor = -0.08
 				conscription_factor = 0.05
 			}
@@ -685,7 +685,7 @@ ideas = {
 		SCS_barons_power_apple4 = {
 			picture = generic_goods_red_bonus
 			modifier = {
-				consumer_goods_factor = -0.10
+				consumer_goods_factor = -0.2
 				stability_factor = -0.10
 				political_power_gain = 0.10
 				conscription_factor = 0.05
@@ -694,7 +694,7 @@ ideas = {
 		SCS_trotican_profits = {
 			picture = generic_goods_red_bonus
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 		SCS_naval_prod_bonus = {
@@ -825,7 +825,7 @@ ideas = {
 			picture = generic_central_management
 			modifier = {
 				production_speed_buildings_factor = 0.10
-				consumer_goods_factor = -0.03
+				consumer_goods_factor = -0.06
 				research_speed_factor = 0.02
 			}
 		}
@@ -838,7 +838,7 @@ ideas = {
 				industrial_capacity_factory = 0.05
 				production_factory_max_efficiency_factor = 0.10
 				local_resources_factor = 0.10
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 			}
 		}
 	}
@@ -848,7 +848,7 @@ ideas = {
 			picture = generic_pp_unity_bonus
 			modifier = {
 				stability_factor = 0.15
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 	}
@@ -870,7 +870,7 @@ ideas = {
 			modifier = {
 				conversion_cost_civ_to_mil_factor = -0.15
 				production_speed_arms_factory_factor = 0.10
-				consumer_goods_factor = -0.03
+				consumer_goods_factor = -0.06
 			}
 		}
 	}
@@ -881,7 +881,7 @@ ideas = {
 			modifier = {
 				research_speed_factor = 0.05
 				stability_factor = 0.05
-				consumer_goods_factor = 0.03
+				consumer_goods_factor = 0.06
 			}
 		}
 	}
@@ -900,7 +900,7 @@ ideas = {
 			picture = generic_exploit_mines
 			modifier = {
 				local_resources_factor = 0.10
-				consumer_goods_factor = 0.03
+				consumer_goods_factor = 0.06
 				supply_consumption_factor = -0.10
 			}
 		}
@@ -912,7 +912,7 @@ ideas = {
 			modifier = {
 				MONTHLY_POPULATION = 0.10
 				supply_consumption_factor = -0.05
-				consumer_goods_factor = 0.03
+				consumer_goods_factor = 0.06
 			}
 		}
 	}
@@ -931,7 +931,7 @@ ideas = {
 			picture = generic_industrial_concern_2
 			modifier = {
 				production_speed_buildings_factor = 0.10
-				consumer_goods_factor = 0.02
+				consumer_goods_factor = 0.04
 			}
 		}
 	}
diff --git a/common/ideas/zzz_SIC_ideas.txt b/common/ideas/zzz_SIC_ideas.txt
index 580b4ec622c..3b574da62bc 100644
--- a/common/ideas/zzz_SIC_ideas.txt
+++ b/common/ideas/zzz_SIC_ideas.txt
@@ -1190,7 +1190,7 @@
 			removal_cost = -1
 			modifier = {
 				industry_repair_factor = 0.33
-				consumer_goods_factor = -0.1
+				consumer_goods_factor = -0.2
 				communism_drift = 0.1
 				fascism_drift = 0.1
 			}
@@ -1344,7 +1344,7 @@
 			}
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				research_speed_factor = 0.05
 			}
 		}
@@ -1436,7 +1436,7 @@
 			removal_cost = -1
 			modifier = {
 				stability_factor = -0.2
-				consumer_goods_factor = 0.1
+				consumer_goods_factor = 0.2
 			}
 		}
 		SIC_ransom_from_sic = {
@@ -1452,7 +1452,7 @@
 			}
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.1
+				consumer_goods_factor = -0.2
 			}
 		}
 		SIC_divided_legislature = {
@@ -1813,7 +1813,7 @@
 			removal_cost = -1
 
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 		SIC_national_syndicate_idea = {
@@ -1885,7 +1885,7 @@
 			removal_cost = -1
 			modifier = {
 				research_speed_factor = -0.15
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 	}
@@ -1904,7 +1904,7 @@
 			removal_cost = -1
 			modifier = {
 				research_speed_factor = -0.10
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 	}
@@ -1923,7 +1923,7 @@
 			removal_cost = -1
 			modifier = {
 				research_speed_factor = -0.15
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				war_support_factor = 0.05
 
 			}
@@ -1944,7 +1944,7 @@
 			removal_cost = -1
 			modifier = {
 				research_speed_factor = -0.10
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				war_support_factor = 0.05
 			}
 		}
@@ -1964,7 +1964,7 @@
 			removal_cost = -1
 			modifier = {
 				research_speed_factor = -0.05
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				war_support_factor = 0.05
 			}
 		}
@@ -2310,7 +2310,7 @@
 			}
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.025
+				consumer_goods_factor = 0.05
 			}
 			research_bonus = {
 				computing_tech = -0.05
@@ -2350,7 +2350,7 @@
 			}
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				min_export = -0.025
 				production_factory_efficiency_gain_factor = 0.05
 				production_factory_max_efficiency_factor = 0.1
@@ -2375,7 +2375,7 @@
 			}
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.10
+				consumer_goods_factor = -0.2
 				min_export = -0.05
 			}
 		}
@@ -2395,7 +2395,7 @@
 			}
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				min_export = -0.025
 			}
 		}
@@ -2415,7 +2415,7 @@
 			}
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.10
+				consumer_goods_factor = 0.2
 				min_export = 0.035
 			}
 		}
@@ -2435,7 +2435,7 @@
 			}
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.15
+				consumer_goods_factor = 0.3
 			}
 		}
 	}
@@ -2454,7 +2454,7 @@
 			}
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.15
+				consumer_goods_factor = -0.3
 			}
 			research_bonus = {
 				industry = -0.05
@@ -2476,7 +2476,7 @@
 			}
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.10
+				consumer_goods_factor = 0.2
 			}
 		}
 	}
@@ -2495,7 +2495,7 @@
 			}
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.10
+				consumer_goods_factor = -0.2
 			}
 			research_bonus = {
 				industry = -0.10
@@ -2517,7 +2517,7 @@
 			}
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.10
+				consumer_goods_factor = -0.2
 			}
 			research_bonus = {
 				electronics = -0.10
@@ -2539,7 +2539,7 @@
 			}
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.10
+				consumer_goods_factor = -0.2
 			}
 			research_bonus = {
 				armor = -0.10
@@ -2562,7 +2562,7 @@
 			}
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.10
+				consumer_goods_factor = -0.2
 			}
 			research_bonus = {
 				light_air = -0.05
@@ -2586,7 +2586,7 @@
 			}
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.10
+				consumer_goods_factor = -0.2
 			}
 			research_bonus = {
 				infantry_weapons = -0.10
@@ -2608,7 +2608,7 @@
 			}
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.10
+				consumer_goods_factor = -0.2
 			}
 			research_bonus = {
 				dd_tech = -0.05
@@ -2636,7 +2636,7 @@
 			}
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.10
+				consumer_goods_factor = -0.2
 			}
 			research_bonus = {
 				bc_tech = -0.05
@@ -2663,7 +2663,7 @@
 			}
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.10
+				consumer_goods_factor = -0.2
 			}
 			research_bonus = {
 				ss_tech = -0.10
@@ -2726,7 +2726,7 @@
 			removal_cost = -1
 			modifier = {
 				production_speed_buildings_factor = 0.15
-				consumer_goods_factor = 0.10
+				consumer_goods_factor = 0.2
 			}
 		}
 	}
@@ -2999,7 +2999,7 @@
 				industrial_capacity_dockyard = 0.1
 				industry_free_repair_factor = 0.1
 				industry_repair_factor = 0.1
-				consumer_goods_factor = 0.1
+				consumer_goods_factor = 0.2
 				political_power_gain = -0.1
 				stability_factor = -0.15
 			}
@@ -3022,7 +3022,7 @@
 				industrial_capacity_dockyard = 0.1
 				industry_free_repair_factor = 0.1
 				industry_repair_factor = 0.1
-				consumer_goods_factor = 0.075
+				consumer_goods_factor = 0.15
 				minimum_training_level = -0.2
 				conscription = -0.02
 				political_power_gain = -0.25
@@ -3048,7 +3048,7 @@
 				industrial_capacity_dockyard = 0.1
 				industry_free_repair_factor = 0.1
 				industry_repair_factor = 0.1
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				minimum_training_level = -0.2
 				conscription = -0.02
 				political_power_gain = -0.25
@@ -3073,7 +3073,7 @@
 				industrial_capacity_dockyard = 0.05
 				industry_free_repair_factor = 0.05
 				industry_repair_factor = 0.05
-				consumer_goods_factor = 0.075
+				consumer_goods_factor = 0.15
 				political_power_gain = -0.05
 				stability_factor = -0.1
 			}
@@ -3096,7 +3096,7 @@
 				industrial_capacity_dockyard = 0.05
 				industry_free_repair_factor = 0.05
 				industry_repair_factor = 0.05
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				minimum_training_level = -0.2
 				conscription = -0.02
 				political_power_gain = -0.2
@@ -3122,7 +3122,7 @@
 				industrial_capacity_dockyard = 0.05
 				industry_free_repair_factor = 0.05
 				industry_repair_factor = 0.05
-				consumer_goods_factor = 0.025
+				consumer_goods_factor = 0.05
 				minimum_training_level = -0.2
 				conscription = -0.02
 				political_power_gain = -0.2
@@ -3147,7 +3147,7 @@
 				industrial_capacity_dockyard = 0.05
 				industry_free_repair_factor = 0.05
 				industry_repair_factor = 0.05
-				consumer_goods_factor = 0.075
+				consumer_goods_factor = 0.15
 				political_power_gain = -0.15
 				stability_factor = -0.1
 				non_core_manpower = 0.15
@@ -3173,7 +3173,7 @@
 				industrial_capacity_dockyard = 0.075
 				industry_free_repair_factor = 0.075
 				industry_repair_factor = 0.075
-				consumer_goods_factor = 0.075
+				consumer_goods_factor = 0.3
 				political_power_gain = -0.15
 				stability_factor = -0.1
 				non_core_manpower = 0.15
@@ -3200,7 +3200,7 @@
 				industrial_capacity_dockyard = 0.025
 				industry_free_repair_factor = 0.025
 				industry_repair_factor = 0.025
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				stability_factor = -0.05
 			}
 		}
@@ -3222,7 +3222,7 @@
 				industrial_capacity_dockyard = 0.025
 				industry_free_repair_factor = 0.025
 				industry_repair_factor = 0.025
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				stability_factor = -0.05
 				non_core_manpower = 0.15
 				foreign_subversive_activites = 0.3
@@ -3248,7 +3248,7 @@
 				industrial_capacity_dockyard = 0.05
 				industry_free_repair_factor = 0.05
 				industry_repair_factor = 0.05
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				stability_factor = -0.05
 				non_core_manpower = 0.15
 				foreign_subversive_activites = 0.3
@@ -3273,7 +3273,7 @@
 			modifier = {
 				industrial_capacity_factory = 0.05
 				conversion_cost_civ_to_mil_factor = -0.1
-				consumer_goods_factor = -0.01
+				consumer_goods_factor = -0.02
 			}
 		}
 		SIC_arms_trade_idea2 = {
@@ -3292,7 +3292,7 @@
 			modifier = {
 				industrial_capacity_factory = 0.1
 				conversion_cost_civ_to_mil_factor = -0.15
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 			}
 		}
 		SIC_arms_trade_idea3 = {
@@ -3311,7 +3311,7 @@
 			modifier = {
 				industrial_capacity_factory = 0.15
 				conversion_cost_civ_to_mil_factor = -0.2
-				consumer_goods_factor = -0.03
+				consumer_goods_factor = -0.06
 			}
 		}
 		SIC_illegal_arms_trade_idea = {
@@ -3330,7 +3330,7 @@
 			modifier = {
 				industrial_capacity_factory = 0.05
 				conversion_cost_civ_to_mil_factor = 0.2
-				consumer_goods_factor = 0.02
+				consumer_goods_factor = 0.04
 			}
 		}
 		SIC_gambling_idea1 = {
@@ -3348,7 +3348,7 @@
 
 			modifier = {
 				political_power_gain = 0.05
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 			}
 		}
 		SIC_gambling_idea2 = {
@@ -3366,7 +3366,7 @@
 
 			modifier = {
 				political_power_gain = 0.1
-				consumer_goods_factor = -0.03
+				consumer_goods_factor = -0.06
 			}
 		}
 		SIC_gambling_idea3 = {
@@ -3384,7 +3384,7 @@
 
 			modifier = {
 				political_power_gain = 0.15
-				consumer_goods_factor = -0.04
+				consumer_goods_factor = -0.08
 			}
 		}
 		SIC_illegal_gambling_idea = {
@@ -3403,7 +3403,7 @@
 			modifier = {
 				stability_factor = 0.05
 				political_power_gain = -0.1
-				consumer_goods_factor = 0.04
+				consumer_goods_factor = 0.08
 			}
 		}
 		SIC_drugs_idea1 = {
@@ -3421,7 +3421,7 @@
 
 			modifier = {
 				stability_factor = 0.025
-				consumer_goods_factor = -0.01
+				consumer_goods_factor = -0.02
 				production_factory_max_efficiency_factor = 0.05
 			}
 		}
@@ -3440,7 +3440,7 @@
 
 			modifier = {
 				stability_factor = 0.05
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 				production_factory_max_efficiency_factor = 0.1
 			}
 		}
@@ -3459,7 +3459,7 @@
 
 			modifier = {
 				stability_factor = 0.075
-				consumer_goods_factor = -0.03
+				consumer_goods_factor = -0.06
 				production_factory_max_efficiency_factor = 0.15
 			}
 		}
@@ -3478,7 +3478,7 @@
 
 			modifier = {
 				stability_factor = 0.05
-				consumer_goods_factor = 0.02
+				consumer_goods_factor = 0.04
 				production_factory_max_efficiency_factor = -0.1
 			}
 		}
@@ -3498,7 +3498,7 @@
 			modifier = {
 				production_speed_buildings_factor = 0.025
 				local_resources_factor = 0.05
-				consumer_goods_factor = -0.01
+				consumer_goods_factor = -0.02
 				}
 		}
 		SIC_slave_trade_idea2 = {
@@ -3517,7 +3517,7 @@
 			modifier = {
 				production_speed_buildings_factor = 0.05
 				local_resources_factor = 0.1
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 				}
 		}
 		SIC_slave_trade_idea3 = {
@@ -3536,7 +3536,7 @@
 			modifier = {
 				production_speed_buildings_factor = 0.075
 				local_resources_factor = 0.15
-				consumer_goods_factor = -0.03
+				consumer_goods_factor = -0.06
 				}
 		}
 		SIC_illegal_slave_trade_idea = {
@@ -3555,7 +3555,7 @@
 			modifier = {
 				production_speed_buildings_factor = -0.1
 				local_resources_factor = 0.05
-				consumer_goods_factor = 0.02
+				consumer_goods_factor = 0.04
 			}
 		}
 		SIC_successful_raid_idea = {
@@ -3572,7 +3572,7 @@
 			removal_cost = -1
 
 			modifier = {
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 				political_power_gain = 0.05
 				industrial_capacity_factory = 0.05
 				industrial_capacity_dockyard = 0.05
@@ -3592,7 +3592,7 @@
 			removal_cost = -1
 
 			modifier = {
-				consumer_goods_factor = 0.025
+				consumer_goods_factor = 0.05
 				political_power_gain = -0.05
 				industrial_capacity_factory = -0.05
 				industrial_capacity_dockyard = -0.05
diff --git a/common/ideas/zzz_SOL_ideas.txt b/common/ideas/zzz_SOL_ideas.txt
index 48fea089f4b..cac18d1b57e 100644
--- a/common/ideas/zzz_SOL_ideas.txt
+++ b/common/ideas/zzz_SOL_ideas.txt
@@ -229,7 +229,7 @@ ideas = {
 			removal_cost = -1
 			#picture = FRA_national_mobilization_focus
 			modifier = {
-				consumer_goods_factor = 0.02
+				consumer_goods_factor = 0.04
 				stability_factor = 0.15
 				war_support_factor = 0.05
 				army_morale_factor = 0.05
@@ -429,7 +429,7 @@ ideas = {
 				stability_factor = 0.10
 				war_support_factor = 0.15
 				political_power_factor = 0.1
-				consumer_goods_factor = -0.01
+				consumer_goods_factor = -0.02
 				research_speed_factor = -0.05
 			}
 		}
@@ -454,7 +454,7 @@ ideas = {
 				political_power_factor = 0.1
 				army_attack_factor = 0.05
 				conscription_factor = 0.05
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 				research_speed_factor = -0.08
 			}
 		}
@@ -481,7 +481,7 @@ ideas = {
 				army_core_attack_factor = 0.05
 				army_morale_factor = 0.05
 				conscription_factor = 0.1
-				consumer_goods_factor = -0.03
+				consumer_goods_factor = -0.06
 				research_speed_factor = -0.11
 			}
 		}
diff --git a/common/ideas/zzz_SRS_ideas.txt b/common/ideas/zzz_SRS_ideas.txt
index 08af0eb2b98..471653df853 100644
--- a/common/ideas/zzz_SRS_ideas.txt
+++ b/common/ideas/zzz_SRS_ideas.txt
@@ -464,7 +464,7 @@ ideas = {
 			}
 
 			modifier = {
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 				stability_factor = 0.02
 			}
 		}
@@ -638,7 +638,7 @@ ideas = {
 				industrial_capacity_factory = 0.02
 				industrial_capacity_dockyard = 0.02
 				production_speed_buildings_factor = 0.02
-				consumer_goods_factor = 0.02
+				consumer_goods_factor = 0.04
 			}
 		}
 		SRS_weapons_for_the_front = {	
@@ -704,7 +704,7 @@ ideas = {
 				army_core_defence_factor = 0.1
 				research_speed_factor = 0.05
 				army_morale_factor = 0.02
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 			}
 		}
 		SRS_socialist_clergy = {
@@ -912,7 +912,7 @@ ideas = {
 
 			modifier = {
 				production_factory_max_efficiency_factor = -0.10
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				stability_factor = 0.05
 			}
 		}
diff --git a/common/ideas/zzz_STG_ideas.txt b/common/ideas/zzz_STG_ideas.txt
index 60776dd3cfe..726c3c3d687 100644
--- a/common/ideas/zzz_STG_ideas.txt
+++ b/common/ideas/zzz_STG_ideas.txt
@@ -402,7 +402,7 @@ ideas = {
 				industrial_capacity_factory = -0.17
 				industrial_capacity_dockyard = -0.17
 				conscription_factor = -0.2
-				consumer_goods_factor = 0.12
+				consumer_goods_factor = 0.24
 				political_power_gain = -0.5
 				research_speed_factor = -0.1
 			}
@@ -423,7 +423,7 @@ ideas = {
 				industrial_capacity_factory = -0.13
 				industrial_capacity_dockyard = -0.13
 				conscription_factor = -0.1
-				consumer_goods_factor = 0.1
+				consumer_goods_factor = 0.2
 				political_power_gain = -0.3
 				research_speed_factor = -0.07
 			}
@@ -443,7 +443,7 @@ ideas = {
 				industrial_capacity_factory = -0.08
 				industrial_capacity_dockyard = -0.08
 				conscription_factor = -0.07
-				consumer_goods_factor = 0.08
+				consumer_goods_factor = 0.16
 				political_power_gain = -0.25
 				research_speed_factor = -0.065
 			}
@@ -463,7 +463,7 @@ ideas = {
 				industrial_capacity_factory = -0.05
 				industrial_capacity_dockyard = -0.05
 				conscription_factor = -0.05
-				consumer_goods_factor = 0.06
+				consumer_goods_factor = 0.12
 				political_power_gain = -0.19
 				research_speed_factor = -0.045
 			}
@@ -483,7 +483,7 @@ ideas = {
 				industrial_capacity_factory = -0.03
 				industrial_capacity_dockyard = -0.03
 				conscription_factor = -0.025
-				consumer_goods_factor = 0.04
+				consumer_goods_factor = 0.08
 				political_power_gain = -0.10
 				research_speed_factor = -0.03
 			}
@@ -503,7 +503,7 @@ ideas = {
 				industrial_capacity_factory = -0.01
 				industrial_capacity_dockyard = -0.015
 				conscription_factor = -0.01
-				consumer_goods_factor = 0.015
+				consumer_goods_factor = 0.03
 				political_power_gain = -0.05
 				research_speed_factor = -0.01
 			}
@@ -559,7 +559,7 @@ ideas = {
 				stability_factor = -0.1
 				conscription = -0.003
 				industrial_capacity_factory = 0.07
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 	}
@@ -576,7 +576,7 @@ ideas = {
 				stability_factor = -0.1
 				conscription = -0.003
 				industrial_capacity_factory = 0.05
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				research_speed_factor = -0.05
 			}
 		}
@@ -594,7 +594,7 @@ ideas = {
 				stability_factor = -0.05
 				conscription = -0.001
 				industrial_capacity_factory = 0.07
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 	}
@@ -625,7 +625,7 @@ ideas = {
 			picture = STG_sinnie_food_subsidies
 			modifier = {
 				stability_factor = 0.05
-				consumer_goods_factor = 0.15
+				consumer_goods_factor = 0.3
 			}
 		}
 	}
@@ -640,7 +640,7 @@ ideas = {
 			picture = STG_food_market
 			modifier = {
 				industrial_capacity_factory = 0.05
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				political_power_gain = -0.15
 			}
 		}
@@ -890,7 +890,7 @@ ideas = {
 				industrial_capacity_dockyard = 0.05
 				production_speed_buildings_factor = 0.05
 				conscription = 0.05
-				consumer_goods_factor = -0.1
+				consumer_goods_factor = -0.2
 				global_building_slots_factor = 0.1
 			}
 		}
@@ -1001,7 +1001,7 @@ ideas = {
 			removal_cost = -1
 			picture = STG_trade_relations_with_stalliongrad
 			modifier = {
-				consumer_goods_factor = -0.015
+				consumer_goods_factor = -0.03
 				industrial_capacity_factory = 0.05
 				research_speed_factor = 0.05
 			}
@@ -1022,7 +1022,7 @@ ideas = {
 			removal_cost = -1
 			picture = STG_trade_relations_with_stalliongrad
 			modifier = {
-				consumer_goods_factor = -0.03
+				consumer_goods_factor = -0.06
 				industrial_capacity_factory = 0.07
 				research_speed_factor = 0.07
 			}
@@ -1043,7 +1043,7 @@ ideas = {
 			removal_cost = -1
 			picture = STG_trade_relations_with_stalliongrad
 			modifier = {
-				consumer_goods_factor = -0.01
+				consumer_goods_factor = -0.02
 				industrial_capacity_factory = 0.03
 				research_speed_factor = 0.03
 			}
@@ -1064,7 +1064,7 @@ ideas = {
 			removal_cost = -1
 			picture = STG_trade_relations_with_stalliongrad
 			modifier = {
-				consumer_goods_factor = -0.005
+				consumer_goods_factor = -0.01
 				industrial_capacity_factory = 0.01
 				research_speed_factor = 0.01
 			}
diff --git a/common/ideas/zzz_STW_ideas.txt b/common/ideas/zzz_STW_ideas.txt
index 873a371034d..459f3ab351f 100644
--- a/common/ideas/zzz_STW_ideas.txt
+++ b/common/ideas/zzz_STW_ideas.txt
@@ -61,7 +61,7 @@ ideas = {
 
 			modifier = {
 				command_power_gain_mult = -0.1
-				consumer_goods_factor = 0.03
+				consumer_goods_factor = 0.06
 				production_speed_buildings_factor = -0.10
 				local_resources_factor = -0.10
 				production_factory_max_efficiency_factor = -0.10
@@ -150,7 +150,7 @@ ideas = {
 
 			modifier = {
 				political_power_factor = -0.10
-				consumer_goods_factor = 0.02
+				consumer_goods_factor = 0.04
 			}
 		}
 		
@@ -193,7 +193,7 @@ ideas = {
 
 			modifier = {
 				political_power_factor = -0.05
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 			}
 		}
 		
@@ -215,7 +215,7 @@ ideas = {
 
 			modifier = {
 				political_power_factor = 0.10
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 			}
 		}
 		
@@ -364,7 +364,7 @@ ideas = {
 			removal_cost = -1
 
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 		
@@ -432,7 +432,7 @@ ideas = {
 			
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 
@@ -452,7 +452,7 @@ ideas = {
 			removal_cost = -1
 			
 			modifier = {
-				consumer_goods_factor = 0.03
+				consumer_goods_factor = 0.06
 			}
 		}
 		
@@ -470,7 +470,7 @@ ideas = {
 			removal_cost = -1
 			
 			modifier = {
-				consumer_goods_factor = 0.03
+				consumer_goods_factor = 0.06
 			}
 		}
 
@@ -591,7 +591,7 @@ ideas = {
 			
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.03
+				consumer_goods_factor = -0.06
 				trade_opinion_factor = 0.10
 				political_advisor_cost_factor = -0.15
 			}
@@ -614,7 +614,7 @@ ideas = {
 			
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				trade_opinion_factor = 0.20
 				political_advisor_cost_factor = -0.25
 			}
@@ -804,7 +804,7 @@ ideas = {
 			removal_cost = -1
 						
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				production_speed_buildings_factor = 0.10
 			}
 
diff --git a/common/ideas/zzz_TAL_ideas.txt b/common/ideas/zzz_TAL_ideas.txt
index f1b1d20ad53..0429d7e20b1 100644
--- a/common/ideas/zzz_TAL_ideas.txt
+++ b/common/ideas/zzz_TAL_ideas.txt
@@ -387,7 +387,7 @@ ideas = {
 				is_subject = no
 			}
 			modifier = {
-				consumer_goods_factor = 0.10
+				consumer_goods_factor = 0.2
 				political_power_gain = -0.10
 				industrial_capacity_factory = -0.025
 				research_speed_factor = -0.05
@@ -398,7 +398,7 @@ ideas = {
 			picture = civilian_economy_red
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				political_power_gain = -0.05
 				industrial_capacity_factory = -0.015
 				research_speed_factor = -0.025
@@ -415,7 +415,7 @@ ideas = {
 				is_subject = no
 			}
 			modifier = {
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				political_power_gain = -0.05
 				fascism_drift = 0.02
 			}
@@ -447,7 +447,7 @@ ideas = {
 			picture = generic_goods_red_bonus
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.03
+				consumer_goods_factor = -0.06
 				local_resources_factor = 0.10
 			}
 		}
@@ -599,7 +599,7 @@ ideas = {
 			picture = generic_economic_increase
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				production_factory_start_efficiency_factor = 0.05
 				industrial_capacity_factory = 0.05
 			}
@@ -614,7 +614,7 @@ ideas = {
 			picture = generic_economic_increase
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				production_factory_start_efficiency_factor = 0.1
 				industrial_capacity_factory = 0.1
 			}
@@ -698,7 +698,7 @@ ideas = {
 			picture = generic_economic_increase
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				production_factory_start_efficiency_factor = 0.1
 				industrial_capacity_factory = 0.1
 				neutrality_drift = 0.02
@@ -737,7 +737,7 @@ ideas = {
 				production_speed_industrial_complex_factor = 0.05
 				production_speed_arms_factory_factor = 0.05
 				production_speed_dockyard_factor = 0.05
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 				production_factory_start_efficiency_factor = 0.05
 				industrial_capacity_factory = 0.05
 			}
@@ -778,7 +778,7 @@ ideas = {
 			removal_cost = -1
 
 			modifier = {
-				consumer_goods_factor = 0.10
+				consumer_goods_factor = 0.2
 				political_power_gain = -0.10
 				industrial_capacity_factory = -0.025
 				research_speed_factor = -0.05
@@ -791,7 +791,7 @@ ideas = {
 			removal_cost = -1
 			
 			modifier = {
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				political_power_gain = -0.10
 			}
 		}
@@ -822,7 +822,7 @@ ideas = {
 			picture = generic_agrarian_society
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.10				
+				consumer_goods_factor = -0.2				
 			}
 		}
 		TAL_pl_trade_bad = {
@@ -921,7 +921,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				local_resources_factor = 0.10
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 		TAL_coal_assets_good2 = {
@@ -935,7 +935,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				local_resources_factor = 0.15
-				consumer_goods_factor = -0.1
+				consumer_goods_factor = -0.2
 			}
 		}
 		
@@ -977,7 +977,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				local_resources_factor = -0.05
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 			}
 		}		
 		TAL_coal_assets_bad2 = {
@@ -1055,7 +1055,7 @@ ideas = {
 					has_government = communism 												
 				}
 			modifier = {
-				consumer_goods_factor = 0.10
+				consumer_goods_factor = 0.2
 				political_power_gain = -0.10
 				industrial_capacity_factory = -0.025
 				research_speed_factor = -0.05
@@ -1088,7 +1088,7 @@ ideas = {
 			picture = spr_seize_the_gold_reserves
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.04
+				consumer_goods_factor = -0.08
 				production_factory_start_efficiency_factor = 0.04
 				industrial_capacity_factory = 0.04
 			}
@@ -1125,7 +1125,7 @@ ideas = {
 				production_speed_industrial_complex_factor = 0.05
 				production_speed_arms_factory_factor = 0.05
 				production_speed_dockyard_factor = 0.05
-				consumer_goods_factor = -0.020
+				consumer_goods_factor = -0.040
 				production_factory_start_efficiency_factor = 0.05
 				industrial_capacity_factory = 0.05
 			}
@@ -1220,7 +1220,7 @@ ideas = {
 				production_speed_industrial_complex_factor = 0.05
 				production_speed_arms_factory_factor = 0.05
 				production_speed_dockyard_factor = 0.05
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 		TAL_miners_alone_FLT = {
@@ -1344,7 +1344,7 @@ ideas = {
             picture = spr_seize_the_gold_reserves
             removal_cost = -1
             modifier = {
-			    consumer_goods_factor = -0.02
+			    consumer_goods_factor = -0.04
 				production_speed_industrial_complex_factor = 0.10
             }
         }
@@ -1547,7 +1547,7 @@ ideas = {
             picture = generic_pp_unity_bonus
             removal_cost = -1
             modifier = {
-			    consumer_goods_factor = -0.02
+			    consumer_goods_factor = -0.04
 				production_speed_industrial_complex_factor = 0.10
             }
         }
@@ -1807,7 +1807,7 @@ ideas = {
 			picture = civilian_economy_red
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 				industrial_capacity_factory = 0.05
 			}
 		}
diff --git a/common/ideas/zzz_TBK_ideas.txt b/common/ideas/zzz_TBK_ideas.txt
index 359eec430e4..74413903297 100644
--- a/common/ideas/zzz_TBK_ideas.txt
+++ b/common/ideas/zzz_TBK_ideas.txt
@@ -161,7 +161,7 @@ ideas = {
 					instant = yes
 				}
 				mechanized_equipment = {
-					soft_attack = 0.05
+					breakthrough = 0.05
 					instant = yes
 				}
 			}
@@ -703,7 +703,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				stability_factor = -0.10
-				consumer_goods_factor = 0.1
+				consumer_goods_factor = 0.2
 				neutrality_drift = -0.1
 				industrial_capacity_factory = -0.5
 				industrial_capacity_dockyard = -0.5
@@ -724,7 +724,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				political_power_gain = -0.5
-				consumer_goods_factor = 0.1
+				consumer_goods_factor = 0.2
 				industrial_capacity_factory = -0.25
 				industrial_capacity_dockyard = -0.25
 			}
@@ -788,7 +788,7 @@ ideas = {
 			picture = GRW_opened_up_schools2
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.025
+				consumer_goods_factor = 0.05
 				stability_factor = 0.05
 				research_speed_factor = 0.025
 				conscription_factor = 0.05
@@ -810,7 +810,7 @@ ideas = {
 			picture = GRW_opened_up_schools2
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.025
+				consumer_goods_factor = 0.05
 				political_power_gain = -0.1
 				stability_factor = 0.05
 				neutrality_drift = 0.03
@@ -971,7 +971,7 @@ ideas = {
 			picture = GRW_opened_up_schools2
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				stability_factor = 0.1
 				political_power_gain = -0.1
 				neutrality_drift = 0.03
@@ -1081,7 +1081,7 @@ ideas = {
 			picture = hospital
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.03
+				consumer_goods_factor = 0.06
 				political_power_gain = -0.05
 				monthly_population = 0.05
 				neutrality_drift = 0.05
@@ -1103,7 +1103,7 @@ ideas = {
 			picture = hospital
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.03
+				consumer_goods_factor = 0.06
 				political_power_gain = -0.05
 				monthly_population = 0.15
 				neutrality_drift = 0.05
@@ -1126,7 +1126,7 @@ ideas = {
 			picture = generic_foreign_capital
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 			}
 		}
 
@@ -1146,7 +1146,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				political_power_gain = 0.15
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 			}
 		}
 
@@ -1168,7 +1168,7 @@ ideas = {
 				neutrality_drift = -0.02
 				stability_factor = -0.05
 				war_support_factor = -0.05
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 			}
 		}
 
@@ -1210,7 +1210,7 @@ ideas = {
 			picture = trade
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 				political_power_gain = 0.1
 			}
 		}
@@ -1231,7 +1231,7 @@ ideas = {
 			picture = trade
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 				political_power_gain = 0.2
 				opinion_gain_monthly_factor = -0.15
 			}
@@ -1687,7 +1687,7 @@ ideas = {
 			picture = generic_democratic_drift_bonus
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.015
+				consumer_goods_factor = 0.03
 				political_power_gain = -0.15
 				stability_factor = 0.1
 			}
@@ -1772,7 +1772,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				democratic_drift = 0.03
-				consumer_goods_factor = 0.025
+				consumer_goods_factor = 0.05
 				political_power_gain = -0.2
 				stability_factor = 0.15
 				industrial_capacity_factory = 0.025
@@ -1817,7 +1817,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				democratic_drift = 0.05
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				political_power_gain = -0.25
 				stability_factor = 0.2
 				war_support_factor = 0.2
@@ -1875,7 +1875,7 @@ ideas = {
 			picture = griffon_passport
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 				local_resources_factor = 0.15
 				production_speed_buildings_factor = 0.05
 			}
@@ -1911,7 +1911,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				monthly_population = 0.05
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 				conscription_factor = 0.05
 			}
 			targeted_modifier = {
@@ -1960,7 +1960,7 @@ ideas = {
 				neutrality_drift = -0.02
 				stability_factor = -0.1
 				war_support_factor = -0.1
-				consumer_goods_factor = -0.04
+				consumer_goods_factor = -0.08
 			}
 		}
 
@@ -1979,7 +1979,7 @@ ideas = {
 			picture = generic_foreign_capital
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 			}
 		}
 
@@ -1999,7 +1999,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				monthly_population = 0.1
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 			}
 		}
 
@@ -2021,7 +2021,7 @@ ideas = {
 				monthly_population = 0.1
 				drift_defence_factor = 0.1
 				improve_relations_maintain_cost_factor = -0.5
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 			}
 		}
 
@@ -2041,7 +2041,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				monthly_population = 0.1
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 
@@ -2062,7 +2062,7 @@ ideas = {
 			modifier = {
 				drift_defence_factor = 0.1
 				improve_relations_maintain_cost_factor = -0.5
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 			}
 		}
 
@@ -2083,7 +2083,7 @@ ideas = {
 			modifier = {
 				drift_defence_factor = 0.1
 				improve_relations_maintain_cost_factor = -0.5
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 
@@ -2102,7 +2102,7 @@ ideas = {
 			picture = generic_foreign_capital
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 
@@ -2124,7 +2124,7 @@ ideas = {
 				monthly_population = 0.1
 				drift_defence_factor = 0.1
 				improve_relations_maintain_cost_factor = -0.5
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 
@@ -2153,7 +2153,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				political_power_gain = 0.10
-				consumer_goods_factor = -0.015
+				consumer_goods_factor = -0.03
 			}
 		}
 
@@ -2174,7 +2174,7 @@ ideas = {
 			modifier = {
 				stability_factor = -0.1
 				war_support_factor = -0.1
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 			}
 		}
 
@@ -2240,7 +2240,7 @@ ideas = {
 				war_support_factor = -0.1
 				fascism_drift = 0.02
 				conscription_factor = 0.05
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 
@@ -2261,7 +2261,7 @@ ideas = {
 			modifier = {
 				trade_opinion_factor = 0.1
 				improve_relations_maintain_cost_factor = -0.25
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 			}
 		}
 
@@ -2387,7 +2387,7 @@ ideas = {
 			modifier = {
 				stability_factor = -0.05
 				war_support_factor = -0.05
-				consumer_goods_factor = 0.025
+				consumer_goods_factor = 0.05
 				political_power_factor = 0.1
 				fascism_drift = 0.03
 			}
@@ -2453,7 +2453,7 @@ ideas = {
 			modifier = {
 				surrender_limit = 0.05
 				political_power_gain = 0.15
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 				stability_factor = 0.1
 				war_support_factor = 0.1
 			}
@@ -2518,7 +2518,7 @@ ideas = {
 			picture = broken_resistance
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.025
+				consumer_goods_factor = 0.05
 				non_core_manpower = 0.05
 				resistance_damage_to_garrison = -0.1
 				resistance_growth = -0.05
@@ -2540,7 +2540,7 @@ ideas = {
 			picture = broken_resistance
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.025
+				consumer_goods_factor = 0.05
 				compliance_growth = 0.05
 				non_core_manpower = 0.1
 				resistance_damage_to_garrison = -0.1
@@ -2563,7 +2563,7 @@ ideas = {
 			picture = broken_resistance
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.025
+				consumer_goods_factor = 0.05
 				non_core_manpower = 0.05
 				resistance_damage_to_garrison = -0.15
 				resistance_growth = -0.1
@@ -2612,7 +2612,7 @@ ideas = {
 			modifier = {
 				surrender_limit = 0.1
 				political_power_gain = 0.15
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				stability_factor = 0.1
 				war_support_factor = 0.1
 			}
@@ -2772,7 +2772,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				political_power_cost = 0.15
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 			}
 		}
 
@@ -2961,7 +2961,7 @@ ideas = {
 			picture = POL_disjointed_industry
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				industry_free_repair_factor = 0.2
 				production_speed_buildings_factor = 0.25
 			}
@@ -2982,7 +2982,7 @@ ideas = {
 			picture = BUF_workshop3
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.025
+				consumer_goods_factor = 0.05
 				industrial_capacity_factory = 0.05
 				industrial_capacity_dockyard = 0.05
 			}
@@ -3087,7 +3087,7 @@ ideas = {
 			picture = syndicate_of_agriculture
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 				monthly_population = 0.15
 				conscription_factor = 0.05
 			}
@@ -3151,7 +3151,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				industrial_factory_donations = 3
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 
@@ -3170,7 +3170,7 @@ ideas = {
 			picture = SPR_seize_the_gold_reserves
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				political_power_gain = 0.05
 				trade_opinion_factor = 0.05
 			}
@@ -3191,7 +3191,7 @@ ideas = {
 			picture = EST_exploit_the_banks
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.025
+				consumer_goods_factor = 0.05
 				production_speed_buildings_factor = 0.075
 				production_factory_efficiency_gain_factor = 0.05
 			}
@@ -3212,7 +3212,7 @@ ideas = {
 			picture = EST_exploit_the_banks
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.025
+				consumer_goods_factor = 0.05
 				local_resources_factor = 0.1
 				production_speed_buildings_factor = 0.075
 				production_factory_efficiency_gain_factor = 0.05
@@ -3235,7 +3235,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				stability_factor = -0.1
-				consumer_goods_factor = 0.025
+				consumer_goods_factor = 0.05
 				local_resources_factor = 0.20
 				production_speed_buildings_factor = 0.075
 				production_factory_efficiency_gain_factor = 0.05
@@ -3364,7 +3364,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				political_power_cost = 0.2
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 			}
 		}
 
@@ -3384,7 +3384,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				political_power_cost = 0.1
-				consumer_goods_factor = 0.025
+				consumer_goods_factor = 0.05
 			}
 		}
 
@@ -3404,7 +3404,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				political_power_gain = 0.2
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 
@@ -3424,7 +3424,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				political_power_gain = 0.1
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 			}
 		}
 
@@ -3619,7 +3619,7 @@ ideas = {
 			picture = TBK_scarlet_war
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.1
+				consumer_goods_factor = 0.2
 				conscription_factor = -0.05
 				communism_drift = -0.03
 				political_power_factor = -0.25
@@ -3686,7 +3686,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				political_power_gain = -0.15
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 			}
 		}
 
@@ -3855,7 +3855,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				stability_factor = 0.05
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 			}
 		}
 
@@ -3916,7 +3916,7 @@ ideas = {
 			modifier = {
 				political_power_cost = 0.1
 				stability_weekly = 0.002
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 
@@ -4467,7 +4467,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				political_power_gain = 0.15
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 
@@ -4487,7 +4487,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				political_power_gain = -0.15
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 			}
 		}
 
@@ -4617,7 +4617,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				conscription_factor = 0.05
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 				war_support_factor = 0.10
 			}
 		}
@@ -4638,7 +4638,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				conscription_factor = 0.05
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 				war_support_factor = 0.15
 			}
 		}
@@ -4659,7 +4659,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				conscription_factor = 0.1
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				war_support_factor = 0.2
 			}
 		}
@@ -5098,7 +5098,7 @@ ideas = {
 				stability_factor = 0.25
 				war_support_factor = 0.25
 				political_power_gain = 0.15
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				industrial_factory_donations = 5
 			}
 		}
@@ -5185,7 +5185,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				experience_gain_army = 0.05
-				consumer_goods_factor = 0.025
+				consumer_goods_factor = 0.05
 				army_org_factor = 0.1
 			}
 		}
@@ -5288,7 +5288,7 @@ ideas = {
 			removal_cost = -1
 			picture = Generic_Feudalism
 			modifier = {
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 				conscription_factor = 0.05
 			}
 		}
@@ -5532,7 +5532,7 @@ ideas = {
 			removal_cost = -1
 			picture = Generic_Feudalism
 			modifier = {
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 				conscription_factor = 0.1
 				global_building_slots_factor = 0.15
 			}
@@ -5594,7 +5594,7 @@ ideas = {
 			removal_cost = -1
 			picture = Generic_Feudalism
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				conscription_factor = 0.1
 				global_building_slots_factor = 0.15
 				production_speed_industrial_complex_factor = 0.1
@@ -5611,7 +5611,7 @@ ideas = {
 			removal_cost = -1
 			picture = TBK_Imperial_Bureaucratic_Machine
 			modifier = {
-				consumer_goods_factor = 0.025
+				consumer_goods_factor = 0.05
 				stability_factor = 0.1
 			}
 		}
@@ -5626,7 +5626,7 @@ ideas = {
 			removal_cost = -1
 			picture = TBK_Imperial_Bureaucratic_Machine
 			modifier = {
-				consumer_goods_factor = 0.025
+				consumer_goods_factor = 0.05
 				stability_factor = 0.1
 				production_speed_buildings_factor = 0.1
 				local_resources_factor = 0.15
@@ -5812,7 +5812,7 @@ ideas = {
 			removal_cost = -1
 			picture = generic_local_self_management
 			modifier = {
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				production_speed_buildings_factor = -0.1
 			}
 		}
@@ -5827,7 +5827,7 @@ ideas = {
 			picture = eng_special_air_service
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 				surrender_limit = 0.1
 				political_power_factor = 0.2
 				army_core_attack_factor = 0.05
@@ -5877,7 +5877,7 @@ ideas = {
 			removal_cost = -1
 			picture = SOV_third_five_year_plan_civilian
 			modifier = {
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				industrial_capacity_factory = -0.075
 				industrial_capacity_dockyard = -0.075
 			}
@@ -6032,7 +6032,7 @@ ideas = {
 			picture = tur_balkan_central_bank_wealthy_greece
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 				subjects_autonomy_gain = -0.5
 				extra_trade_to_overlord_factor = 0.5
 				industrial_capacity_factory = 0.05
@@ -6050,7 +6050,7 @@ ideas = {
 			picture = tur_balkan_central_bank_wealthy_greece
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				subjects_autonomy_gain = -0.5
 				extra_trade_to_overlord_factor = 0.5
 				stability_factor = 0.1
@@ -6070,7 +6070,7 @@ ideas = {
 			picture = tur_balkan_central_bank_wealthy_greece
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				industrial_capacity_factory = -0.1
 				industrial_capacity_dockyard = -0.1
 			}
@@ -6272,7 +6272,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				experience_gain_army = 0.05
-				consumer_goods_factor = 0.025
+				consumer_goods_factor = 0.05
 				army_org_factor = 0.1
 				army_leader_start_attack_level = 1
 				army_speed_factor = 0.05
@@ -6404,7 +6404,7 @@ ideas = {
 			picture = TBK_sevmon
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 				research_speed_factor = 0.025
 			}
 		}
@@ -6707,7 +6707,7 @@ ideas = {
 			picture = TBK_sevtrd
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 				trade_opinion_factor = 0.15
 			}
 		}
@@ -6945,7 +6945,7 @@ ideas = {
 			picture = TBK_sevord
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 				local_resources_factor = 0.15
 				stability_factor = -0.1
 			}
@@ -7028,7 +7028,7 @@ ideas = {
 			picture = TBK_sevflag
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 				monthly_population = 0.1
 				research_speed_factor = 0.025
 				global_building_slots_factor = 0.2
@@ -7137,7 +7137,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				conscription = 0.01
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				monthly_population = 0.1
 				research_speed_factor = 0.025
 				global_building_slots_factor = 0.2
@@ -7475,7 +7475,7 @@ ideas = {
 			picture = LEC_low_reserves
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.025
+				consumer_goods_factor = 0.05
 				conscription_factor = 0.05
 			}
 		}
@@ -7515,7 +7515,7 @@ ideas = {
 			picture = LEC_staggering_reserves
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.025
+				consumer_goods_factor = 0.05
 				local_resources_factor = -0.20
 				conscription_factor = 0.1
 			}
diff --git a/common/ideas/zzz_TEM_ideas.txt b/common/ideas/zzz_TEM_ideas.txt
index b356b421f61..6401daa59ad 100644
--- a/common/ideas/zzz_TEM_ideas.txt
+++ b/common/ideas/zzz_TEM_ideas.txt
@@ -85,7 +85,7 @@ ideas = {
 				industrial_capacity_factory = -0.20
 				production_factory_efficiency_gain_factor = -0.15
 				production_speed_buildings_factor = -0.15
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 			}
 		}
 	}
@@ -177,7 +177,7 @@ ideas = {
 			picture = FRA_factory_strikes
 			removal_cost = -1
 			modifier = {
-			    consumer_goods_factor = 0.05
+			    consumer_goods_factor = 0.1
 				industrial_capacity_factory = -0.10
 				industrial_capacity_dockyard = -0.10
 				production_speed_buildings_factor = -0.15
diff --git a/common/ideas/zzz_TIM_ideas.txt b/common/ideas/zzz_TIM_ideas.txt
index 87a895b698f..6ea144a0472 100644
--- a/common/ideas/zzz_TIM_ideas.txt
+++ b/common/ideas/zzz_TIM_ideas.txt
@@ -24,7 +24,7 @@ ideas = {
 				always = yes
 			}
 			modifier = {
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 				min_export = 0.05
 				trade_opinion_factor = 0.25
 			}
diff --git a/common/ideas/zzz_TRD_ideas.txt b/common/ideas/zzz_TRD_ideas.txt
index 31b3c866b86..484cbf326c5 100644
--- a/common/ideas/zzz_TRD_ideas.txt
+++ b/common/ideas/zzz_TRD_ideas.txt
@@ -1151,7 +1151,7 @@ ideas = {
             picture = ROM_king_carol_ii_hedonist
             removal_cost = -1
             modifier = {
-			    consumer_goods_factor = -0.05
+			    consumer_goods_factor = -0.1
 				min_export = 0.15
 				trade_opinion_factor = 0.25
             }
@@ -1441,7 +1441,7 @@ ideas = {
 			picture = generic_navy_bonus
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.15
+				consumer_goods_factor = 0.3
 				industrial_capacity_dockyard = 0.20
 			}
 		}
@@ -1478,7 +1478,7 @@ ideas = {
 			picture = generic_navy
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 				industrial_capacity_dockyard = 0.05
 			}
 		}
@@ -1592,7 +1592,7 @@ ideas = {
             picture = generic_foreign_capital
             modifier = {
                 production_factory_max_efficiency_factor = 0.075
-                consumer_goods_factor = -0.04
+                consumer_goods_factor = -0.08
             }
         }
     }
@@ -1626,7 +1626,7 @@ ideas = {
             picture = generic_foreign_capital
             modifier = {
                 production_factory_max_efficiency_factor = 0.05
-                consumer_goods_factor = -0.02
+                consumer_goods_factor = -0.04
             }
         }
     }
@@ -1754,7 +1754,7 @@ ideas = {
 			picture = capital_outflow
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.10
+				consumer_goods_factor = 0.20
 				political_power_factor = -0.05
 			}
 		}
@@ -1956,7 +1956,7 @@ ideas = {
             picture = ROM_king_carol_ii_hedonist
             removal_cost = -1
             modifier = {
-			    consumer_goods_factor = -0.08
+			    consumer_goods_factor = -0.16
 				political_power_factor = 0.10
 				min_export = 0.25
 				trade_opinion_factor = 0.30
@@ -2000,7 +2000,7 @@ ideas = {
             removal_cost = -1
             modifier = {
 			    political_power_factor = 0.10
-			    consumer_goods_factor = -0.05
+			    consumer_goods_factor = -0.1
             }
         }	
     }
@@ -2113,7 +2113,7 @@ ideas = {
             picture = usa_great_depression_3
             removal_cost = -1
             modifier = {
-			    consumer_goods_factor = 0.10
+			    consumer_goods_factor = 0.2
 				production_factory_max_efficiency_factor = -0.25
 				production_factory_efficiency_gain_factor = -0.25
 				industrial_capacity_factory = -0.30
@@ -2225,7 +2225,7 @@ ideas = {
             picture = SOV_scientist_defect
             removal_cost = -1
             modifier = {
-			    consumer_goods_factor = 0.05
+			    consumer_goods_factor = 0.1
 				stability_factor = 0.10
 				political_power_gain = 0.15
             }
@@ -2546,7 +2546,7 @@ ideas = {
             picture = usa_great_depression_2
             removal_cost = -1
             modifier = {
-			    consumer_goods_factor = 0.05
+			    consumer_goods_factor = 0.1
 				production_factory_max_efficiency_factor = -0.20
 				production_factory_efficiency_gain_factor = -0.20
 				industrial_capacity_factory = -0.20
@@ -2720,7 +2720,7 @@ ideas = {
             modifier = {
 				production_factory_max_efficiency_factor = 0.05
 				industrial_capacity_factory = 0.05
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
             }
         }	
     }
@@ -2743,7 +2743,7 @@ ideas = {
             removal_cost = -1
             modifier = {
 				local_resources_factor = 0.10
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
             }
         }	
     }
@@ -2808,7 +2808,7 @@ ideas = {
             picture = raj_risk_of_famine
             removal_cost = -1
             modifier = {
-			    consumer_goods_factor = -0.05
+			    consumer_goods_factor = -0.1
             }
         }	
     }
@@ -3021,7 +3021,7 @@ ideas = {
             modifier = {
 			    political_power_gain = 0.10
 				local_resources_factor = 0.15
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				stability_factor = 0.05
             }
         }	
@@ -3144,7 +3144,7 @@ ideas = {
 			picture = generic_pp_unity_bonus
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.10
+				consumer_goods_factor = 0.2
 				political_advisor_cost_factor = 0.50
 				political_power_factor = -0.15
 			}
@@ -3329,7 +3329,7 @@ ideas = {
             picture = ger_mefo_bills
             removal_cost = -1
             modifier = {
-			    consumer_goods_factor = 0.05
+			    consumer_goods_factor = 0.1
 				political_power_gain = 0.15
 				stability_factor = 0.05
 				democratic_drift = 0.01
diff --git a/common/ideas/zzz_TRO_ideas.txt b/common/ideas/zzz_TRO_ideas.txt
index 81d4691a572..99742a34c0b 100644
--- a/common/ideas/zzz_TRO_ideas.txt
+++ b/common/ideas/zzz_TRO_ideas.txt
@@ -15,7 +15,7 @@ ideas = {
 			picture = tur_sectarian_woes 
 			removal_cost = -1
 			modifier = {
-			    consumer_goods_factor = -0.075
+			    consumer_goods_factor = -0.15
 			    industrial_capacity_factory = 0.10
 				production_factory_max_efficiency_factor = 0.10
 				custom_modifier_tooltip = HIE_CTH_removed_at_end_of_war
@@ -36,7 +36,7 @@ ideas = {
 			picture = tur_sectarian_woes 
 			removal_cost = -1
 			modifier = {
-			    consumer_goods_factor = -0.15
+			    consumer_goods_factor = -0.3
 			    industrial_capacity_factory = 0.20
 				production_factory_max_efficiency_factor = 0.20
 				custom_modifier_tooltip = HIE_CTH_removed_at_end_of_war
@@ -57,7 +57,7 @@ ideas = {
 			picture = tur_sectarian_woes 
 			removal_cost = -1
 			modifier = {
-			    consumer_goods_factor = -0.15
+			    consumer_goods_factor = -0.3
 			    industrial_capacity_factory = 0.20
 				production_factory_max_efficiency_factor = 0.20
 				army_speed_factor = 0.10
@@ -81,7 +81,7 @@ ideas = {
 			modifier = {
 			    conscription_factor = 0.30
 			    MONTHLY_POPULATION = 0.30
-				consumer_goods_factor = -0.15
+				consumer_goods_factor = -0.3
 				custom_modifier_tooltip = HIE_CTH_removed_at_end_of_war
 			}
 		}
@@ -327,7 +327,7 @@ ideas = {
 			picture = LEC_staggering_reserves 
 			removal_cost = -1
 			modifier = {
-			    consumer_goods_factor = -0.05
+			    consumer_goods_factor = -0.1
 				industrial_capacity_factory = 0.10
 				industrial_capacity_dockyard = 0.10
 				production_factory_max_efficiency_factor = 0.10
@@ -365,7 +365,7 @@ ideas = {
                 trade_cost_for_target_factor = -0.05
             }
             modifier = {
-				consumer_goods_factor = -0.01
+				consumer_goods_factor = -0.02
 				stability_factor = 0.025
 				political_power_gain = 0.05
             }
@@ -390,7 +390,7 @@ ideas = {
 				army_morale_factor = 0.10
 				local_resources_factor = -0.15
 				compliance_growth = -0.10
-				consumer_goods_factor = 0.10
+				consumer_goods_factor = 0.2
 				supply_consumption_factor = 0.10
 			}
 		}
@@ -414,7 +414,7 @@ ideas = {
 				army_morale_factor = 0.05
 				local_resources_factor = 0.10
 				compliance_growth = 0.05
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				supply_consumption_factor = -0.05
 			}
 		}
@@ -438,7 +438,7 @@ ideas = {
 				army_morale_factor = -0.10
 				local_resources_factor = 0.15
 				compliance_growth = 0.10
-				consumer_goods_factor = -0.10
+				consumer_goods_factor = -0.2
 				supply_consumption_factor = -0.10
 			}
 		}
@@ -465,7 +465,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 			    custom_modifier_tooltip = TRO_CTH_disappear_2_tp
-				consumer_goods_factor = -0.01
+				consumer_goods_factor = -0.02
 				industrial_factory_donations = 2
 				industrial_capacity_factory = 0.025
 			}
@@ -490,7 +490,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 			    custom_modifier_tooltip = TRO_CTH_disappear_2_tp
-				consumer_goods_factor = -0.03
+				consumer_goods_factor = -0.06
 				industrial_factory_donations = 4
 				industrial_capacity_factory = 0.075
 			}
@@ -515,7 +515,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 			    custom_modifier_tooltip = TRO_CTH_disappear_2_tp
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 				industrial_factory_donations = 3
 				industrial_capacity_factory = 0.05
 			}
@@ -540,7 +540,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 			    custom_modifier_tooltip = TRO_CTH_disappear_3_tp
-				consumer_goods_factor = -0.01
+				consumer_goods_factor = -0.02
 				military_factory_donations = 2
 				production_speed_buildings_factor = 0.025
 			}
@@ -565,7 +565,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 			    custom_modifier_tooltip = TRO_CTH_disappear_3_tp
-				consumer_goods_factor = -0.03
+				consumer_goods_factor = -0.06
 				military_factory_donations = 4
 				production_speed_buildings_factor = 0.075
 			}
@@ -590,7 +590,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 			    custom_modifier_tooltip = TRO_CTH_disappear_3_tp
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 				military_factory_donations = 3
 				production_speed_buildings_factor = 0.05
 			}
diff --git a/common/ideas/zzz_VAN_ideas.txt b/common/ideas/zzz_VAN_ideas.txt
index 44c65b82ca1..f2eae140ab0 100644
--- a/common/ideas/zzz_VAN_ideas.txt
+++ b/common/ideas/zzz_VAN_ideas.txt
@@ -192,7 +192,7 @@ ideas = {
 			modifier = {
 				conscription_factor = -0.15
 				stability_factor = -0.10
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				industrial_capacity_factory = 0.10
 				industrial_capacity_dockyard = 0.10
 				local_resources_factor = 0.10
@@ -291,7 +291,7 @@ ideas = {
 			modifier = {
 				MONTHLY_POPULATION = 0.15
 				stability_factor = 0.05
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 			}
 		}
 
@@ -359,7 +359,7 @@ ideas = {
 			picture = can_wartime_prices_and_trade_board
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 				production_speed_industrial_complex_factor = 0.025
 				political_power_gain = -0.1
 			}
diff --git a/common/ideas/zzz_WIN_ideas.txt b/common/ideas/zzz_WIN_ideas.txt
index 416054cb90d..866dac5ce36 100644
--- a/common/ideas/zzz_WIN_ideas.txt
+++ b/common/ideas/zzz_WIN_ideas.txt
@@ -25,7 +25,7 @@ ideas = {
 				fast_tank_manufacturer 
 			}
 			modifier = {
-			    consumer_goods_factor = 0.015
+			    consumer_goods_factor = 0.03
 				country_resource_chromium = 28
 			}
 		}
@@ -55,7 +55,7 @@ ideas = {
 				medium_tank_manufacturer 
 			}
 			modifier = {
-			    consumer_goods_factor = 0.015
+			    consumer_goods_factor = 0.03
 				country_resource_chromium = 28
 			}
 		}
@@ -195,7 +195,7 @@ ideas = {
 				convoy_escort_naval_manufacturer
 			}
 			modifier = {
-			    consumer_goods_factor = 0.015
+			    consumer_goods_factor = 0.03
 				country_resource_aluminium = 28
 			}
 		}
@@ -224,7 +224,7 @@ ideas = {
 				raiding_fleet_naval_manufacturer 
 			}
 			modifier = {
-			    consumer_goods_factor = 0.015
+			    consumer_goods_factor = 0.03
 				country_resource_aluminium = 28
 			}
 		}
@@ -288,7 +288,7 @@ ideas = {
 				CAS_manufacturer 
 			}
 			modifier = {
-			    consumer_goods_factor = 0.015
+			    consumer_goods_factor = 0.03
 				country_resource_oil = 28
 			}
 		}
@@ -317,7 +317,7 @@ ideas = {
 			    light_aircraft_manufacturer_2 
 			}
 			modifier = {
-			    consumer_goods_factor = 0.015
+			    consumer_goods_factor = 0.03
 				country_resource_oil = 28
 			}
 		}
@@ -448,7 +448,7 @@ ideas = {
 				industrial_concern 
 			}
 			modifier = {
-			    consumer_goods_factor = 0.015
+			    consumer_goods_factor = 0.03
 				country_resource_steel = 28
 			}
 		}
@@ -478,7 +478,7 @@ ideas = {
 				refinery_concern 
 			}
 			modifier = {
-			    consumer_goods_factor = 0.015
+			    consumer_goods_factor = 0.03
 				country_resource_steel = 28
 			}
 		}
@@ -507,7 +507,7 @@ ideas = {
 				agricultural_concern 
 			}
 			modifier = {
-			    consumer_goods_factor = -0.025
+			    consumer_goods_factor = -0.05
 				political_power_factor = 0.05
 				custom_modifier_tooltip = coffee_28_tp
 			}
@@ -537,7 +537,7 @@ ideas = {
 			}
 			modifier = {
 			    industrial_capacity_factory = 0.05
-			    consumer_goods_factor = -0.025
+			    consumer_goods_factor = -0.05
 			    political_power_cost = 0.15
 			}
 		}
@@ -575,7 +575,7 @@ ideas = {
 				}
 			}
 			modifier = {
-			    consumer_goods_factor = 0.015
+			    consumer_goods_factor = 0.03
 				country_resource_tungsten = 28
 			}
 		}
@@ -604,7 +604,7 @@ ideas = {
 				motorized_equipment_manufacturer 
 			}
 			modifier = {
-			    consumer_goods_factor = 0.015
+			    consumer_goods_factor = 0.03
 				country_resource_tungsten = 28
 			}
 		}
@@ -834,7 +834,7 @@ ideas = {
 			picture = LEC_high_reserves
 			removal_cost = -1
 			modifier = {
-			    consumer_goods_factor = -0.03
+			    consumer_goods_factor = -0.06
 				political_power_factor = 0.05
 			}
 		}
@@ -863,7 +863,7 @@ ideas = {
 			picture = LEC_high_reserves
 			removal_cost = -1
 			modifier = {
-			    consumer_goods_factor = -0.03
+			    consumer_goods_factor = -0.06
 				political_power_factor = 0.05
 				industrial_capacity_dockyard = 0.05
 				industrial_capacity_factory = 0.05
@@ -1070,7 +1070,7 @@ ideas = {
 			picture = Generic_bank_idea_icon 
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.03
+				consumer_goods_factor = -0.06
 				research_speed_factor = 0.05
 				production_factory_max_efficiency_factor = 0.075
 				production_factory_efficiency_gain_factor = 0.075
@@ -1098,7 +1098,7 @@ ideas = {
 			picture = Generic_bank_idea_icon 
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				research_speed_factor = 0.025
 				production_factory_max_efficiency_factor = 0.05
 				production_factory_efficiency_gain_factor = 0.05
@@ -1127,7 +1127,7 @@ ideas = {
 			picture = Generic_bank_idea_icon 
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.03
+				consumer_goods_factor = -0.06
 				research_speed_factor = 0.075
 				production_factory_max_efficiency_factor = 0.10
 				production_factory_efficiency_gain_factor = 0.10
@@ -1457,7 +1457,7 @@ ideas = {
 			picture = Generic_bank_idea_icon 
 			removal_cost = -1
 			modifier = {
-			    consumer_goods_factor = -0.05
+			    consumer_goods_factor = -0.1
 				min_export = 0.05
 				industrial_capacity_factory = 0.05
 			}
@@ -1479,7 +1479,7 @@ ideas = {
 			picture = Generic_bank_idea_icon 
 			removal_cost = -1
 			modifier = {
-			    consumer_goods_factor = -0.075
+			    consumer_goods_factor = -0.15
 				min_export = 0.10
 				industrial_capacity_factory = 0.075
 			}
@@ -1501,7 +1501,7 @@ ideas = {
 			picture = Generic_bank_idea_icon 
 			removal_cost = -1
 			modifier = {
-			    consumer_goods_factor = -0.10
+			    consumer_goods_factor = -0.2
 				min_export = 0.15
 				industrial_capacity_factory = 0.10
 			}
@@ -1523,7 +1523,7 @@ ideas = {
 			picture = Generic_bank_idea_icon 
 			removal_cost = -1
 			modifier = {
-			    consumer_goods_factor = -0.125
+			    consumer_goods_factor = -0.25
 				min_export = 0.15
 				industrial_capacity_factory = 0.125
 			}
@@ -1545,7 +1545,7 @@ ideas = {
 			picture = Generic_bank_idea_icon 
 			removal_cost = -1
 			modifier = {
-			    consumer_goods_factor = -0.15
+			    consumer_goods_factor = -0.3
 				min_export = 0.15
 				industrial_capacity_factory = 0.15
 			}
@@ -1569,7 +1569,7 @@ ideas = {
 			modifier = {
 			    stability_factor = 0.025
 				political_power_factor = 0.025
-			    consumer_goods_factor = -0.02
+			    consumer_goods_factor = -0.04
 			}
 		}
 	}
@@ -1592,7 +1592,7 @@ ideas = {
 			    stability_factor = 0.05
 				war_support_factor = 0.05
 				political_power_factor = 0.05
-				consumer_goods_factor = -0.03
+				consumer_goods_factor = -0.06
 			}
 		}
 	}
@@ -1615,7 +1615,7 @@ ideas = {
 			    stability_factor = 0.075
 				war_support_factor = 0.075
 				political_power_factor = 0.075
-				consumer_goods_factor = -0.04
+				consumer_goods_factor = -0.08
 			}
 		}
 	}
@@ -1639,7 +1639,7 @@ ideas = {
 				war_support_factor = 0.10
 				political_power_factor = 0.10
 				army_morale_factor = 0.05
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 	}
@@ -1687,7 +1687,7 @@ ideas = {
 				war_support_factor = 0.15
 				political_power_factor = 0.15
 				army_morale_factor = 0.10
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 	}
@@ -3038,7 +3038,7 @@ ideas = {
 			    monthly_population = 0.20
 				supply_consumption_factor = -0.05
 				stability_weekly = 0.0025
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 			}
 		}
 	}
@@ -3119,7 +3119,7 @@ ideas = {
 				compliance_growth = 0.05
 				resistance_growth = -0.05
 				stability_factor = 0.10
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 			}
 		}
 	}
@@ -3143,7 +3143,7 @@ ideas = {
 				compliance_growth = 0.075
 				resistance_growth = -0.075
 				stability_factor = 0.15
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 	}
diff --git a/common/ideas/zzz_WIT_ideas.txt b/common/ideas/zzz_WIT_ideas.txt
index a3007dadb4e..0350eff15f2 100644
--- a/common/ideas/zzz_WIT_ideas.txt
+++ b/common/ideas/zzz_WIT_ideas.txt
@@ -353,7 +353,7 @@ ideas = {
 
 			modifier = {
 				stability_factor = -0.1
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				political_power_gain = -0.15
 				political_advisor_cost_factor = -0.15
 			}
@@ -432,7 +432,7 @@ ideas = {
 			removal_cost = -1
 			picture = capital_outflow
 			modifier = {
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				stability_factor = 0.1
 				MONTHLY_POPULATION = 0.20
 			}
@@ -449,7 +449,7 @@ ideas = {
 			removal_cost = -1
 			picture = generic_agrarian_society
 			modifier = {
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 				political_power_gain = 0.1
 				stability_factor = 0.05
 				MONTHLY_POPULATION = 0.30
@@ -492,7 +492,7 @@ ideas = {
 			removal_cost = -1
 			picture = generic_agrarian_reform
 			modifier = {
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 				stability_factor = 0.05
 				local_resources_factor = 0.1
 			}
@@ -596,7 +596,7 @@ ideas = {
 			picture = generic_pp_unity_bonus
 			modifier = {
 				political_power_gain = 0.2
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				stability_factor = -0.05
 			}
 		}
@@ -722,7 +722,7 @@ ideas = {
 			picture = generic_pp_unity_bonus
 			modifier = {
 				political_power_gain = 0.3
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 		WIT_royal_judiciary2 = {
@@ -758,7 +758,7 @@ ideas = {
 			picture = ROM_king_carol_emptied_accounts
 			modifier = {
 				political_power_gain = 0.1
-				consumer_goods_factor = -0.1
+				consumer_goods_factor = -0.2
 			}
 		}
 		WIT_paying_for_land = {
@@ -776,7 +776,7 @@ ideas = {
 			picture = ROM_king_carol_emptied_accounts
 			modifier = {
 				political_power_gain = -0.1
-				consumer_goods_factor = 0.1
+				consumer_goods_factor = 0.2
 			}
 		}
 		WIT_worker_protection = {
@@ -831,7 +831,7 @@ ideas = {
 			picture = generic_pp_unity_bonus
 			modifier = {
 				political_power_gain = 0.4
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				stability_factor = 0.05
 				neutrality_drift = -0.01
 			}
@@ -935,7 +935,7 @@ ideas = {
 			picture = generic_local_self_management
 			modifier = {
 				production_speed_buildings_factor = 0.1
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 			}
 		}
 		WIT_sold_land = {
@@ -952,7 +952,7 @@ ideas = {
 			removal_cost = -1
 			picture = generic_agrarian_reform
 			modifier = {
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 				local_resources_factor = 0.1
 				global_building_slots_factor = 0.15
 			}
@@ -1152,7 +1152,7 @@ ideas = {
 			picture = pony_militarization
 			modifier = {
 				MONTHLY_POPULATION = -0.25
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				stability_factor = -0.05
 				conscription_factor = -0.1
 				army_org_factor = 0.15
@@ -1195,7 +1195,7 @@ ideas = {
 				political_power_gain = 0.05
 				trade_laws_cost_factor = -0.25
 				economy_cost_factor = -0.25
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 			}
 		}
 		WIT_expanded_fyrds = {
@@ -1294,7 +1294,7 @@ ideas = {
 			picture = EQC_school_for_unicorns
 			modifier = {
 				stability_factor = -0.05
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 				political_power_gain = 0.15
 				political_advisor_cost_factor = -0.15
 			}
@@ -1359,7 +1359,7 @@ ideas = {
 			picture = ROM_king_carol_ii_handled
 			modifier = {
 				stability_factor = -0.05
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				political_advisor_cost_factor = 0.25
 			}
 		}
@@ -1376,7 +1376,7 @@ ideas = {
 			removal_cost = -1
 			picture = EQC_school_for_unicorns
 			modifier = {
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				political_power_gain = 0.1
 				political_advisor_cost_factor = -0.1
 			}
@@ -1636,7 +1636,7 @@ ideas = {
 			removal_cost = -1
 			picture = generic_agrarian_reform
 			modifier = {
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 				stability_factor = 0.1
 				MONTHLY_POPULATION = 0.10
 				local_resources_factor = 0.1
@@ -1794,7 +1794,7 @@ ideas = {
 			picture = generic_agrarian_reform
 			modifier = {
 				stability_factor = 0.05
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 				MONTHLY_POPULATION = 0.15
 				global_building_slots_factor = 0.1
 			}
@@ -1846,7 +1846,7 @@ ideas = {
 			removal_cost = -1
 			picture = WIT_trade_post_idea
 			modifier = {
-				consumer_goods_factor  = -0.025
+				consumer_goods_factor  = -0.05
 				trade_opinion_factor = 0.1
 			}
 		}
@@ -1867,7 +1867,7 @@ ideas = {
 			picture = generic_foreign_capital
 			modifier = {
 				political_power_gain = 0.2
-				consumer_goods_factor  = -0.025
+				consumer_goods_factor  = -0.05
 				production_speed_industrial_complex_factor = 0.05
 			}
 		}
@@ -1909,7 +1909,7 @@ ideas = {
 			picture = hospital
 			modifier = {
 				MONTHLY_POPULATION = 0.1
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 				political_power_gain = 0.15
 				stability_factor = 0.05
 			}
@@ -1946,7 +1946,7 @@ ideas = {
 			picture = generic_foreign_capital
 			modifier = {
 				trade_opinion_factor = 0.25
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 			}
 		}
 		WIT_silver_mine = {
@@ -1961,7 +1961,7 @@ ideas = {
 			removal_cost = -1
 			picture = generic_exploit_mines
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				political_power_gain = 0.1
 			}
 		}
@@ -1981,7 +1981,7 @@ ideas = {
 			picture = chi_hyper_inflation2
 			modifier = {
 				stability_factor = 0.1
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 			}
 		}
 		WIT_central_bank_idea = {
@@ -2000,7 +2000,7 @@ ideas = {
 			picture = ROM_king_carol_emptied_accounts
 			modifier = {
 				political_power_gain = 0.1
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 				production_speed_buildings_factor = 0.1
 			}
 		}
diff --git a/common/ideas/zzz_WNG_ideas.txt b/common/ideas/zzz_WNG_ideas.txt
index 1096c58f894..e93259bb18a 100644
--- a/common/ideas/zzz_WNG_ideas.txt
+++ b/common/ideas/zzz_WNG_ideas.txt
@@ -81,7 +81,7 @@ ideas = {
 			}
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.20
+				consumer_goods_factor = 0.4
 				industrial_capacity_factory = -0.15
 				industrial_capacity_dockyard = -0.15
 				production_speed_buildings_factor = -0.20
@@ -101,7 +101,7 @@ ideas = {
 			}
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.15
+				consumer_goods_factor = 0.3
 				industrial_capacity_factory = -0.1
 				industrial_capacity_dockyard = -0.1
 				production_speed_buildings_factor = -0.1
@@ -119,7 +119,7 @@ ideas = {
 			}
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				industrial_capacity_factory = -0.05
 				industrial_capacity_dockyard = -0.05
 			}
@@ -180,7 +180,7 @@ ideas = {
 			}
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.1
+				consumer_goods_factor = -0.2
 				industrial_capacity_factory = 0.15
 			}
 		}
@@ -367,7 +367,7 @@ ideas = {
 			}
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 			}
 		}
 
@@ -736,7 +736,7 @@ ideas = {
 				stability_factor = 0.1
 				political_power_gain = 0.15
 				drift_defence_factor = 0.5
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				army_core_defence_factor = 0.1
 			}
 		}
@@ -893,7 +893,7 @@ ideas = {
 			}
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 				industrial_capacity_dockyard = 0.1
 				industrial_capacity_factory = 0.1
 			}
@@ -910,7 +910,7 @@ ideas = {
 			}
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 				production_factory_efficiency_gain_factor = 0.1
 				production_factory_max_efficiency_factor = 0.1
 			}
@@ -1277,7 +1277,7 @@ ideas = {
 			picture = WNG_B_public
 
 			modifier = {
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 			}
 		}
 
@@ -1296,7 +1296,7 @@ ideas = {
 			picture = WNG_balanced
 
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 		WNG_economic_regeneration = {
@@ -1400,7 +1400,7 @@ ideas = {
 			}
 
 			modifier = {
-				consumer_goods_factor = -0.03
+				consumer_goods_factor = -0.06
 				production_speed_dockyard_factor = 0.1
 			}
 		}
@@ -1557,7 +1557,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				stability_factor = 0.1
-				consumer_goods_factor = -0.03
+				consumer_goods_factor = -0.06
 				resistance_damage_to_garrison = -0.15
 			}
 		}
@@ -1585,7 +1585,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				stability_factor = -0.02
-				consumer_goods_factor = 0.02
+				consumer_goods_factor = 0.04
 			}
 		}
 		WNG_mafia_2 = {
@@ -1599,7 +1599,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				stability_factor = -0.05
-				consumer_goods_factor = 0.04
+				consumer_goods_factor = 0.08
 			}
 		}
 		WNG_mafia_3 = {
@@ -1613,7 +1613,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				stability_factor = -0.07
-				consumer_goods_factor = 0.04
+				consumer_goods_factor = 0.08
 			}
 		}
 
@@ -1993,7 +1993,7 @@ ideas = {
 			}
 
 			modifier = {
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 				production_speed_buildings_factor = 0.1
 				local_resources_factor = 0.1
 				production_factory_efficiency_gain_factor = 0.05
@@ -2013,7 +2013,7 @@ ideas = {
 			}
 
 			modifier = {
-				consumer_goods_factor = -0.025
+				consumer_goods_factor = -0.05
 				production_speed_buildings_factor = 0.1
 				local_resources_factor = 0.1
 				production_factory_efficiency_gain_factor = 0.05
@@ -2034,7 +2034,7 @@ ideas = {
 			}
 
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				production_speed_buildings_factor = 0.1
 				local_resources_factor = 0.1
 				production_factory_efficiency_gain_factor = 0.1
@@ -2074,7 +2074,7 @@ ideas = {
 			}
 
 			modifier = {
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 				production_factory_efficiency_gain_factor = 0.05
 				production_factory_start_efficiency_factor = 0.05
 			}
@@ -2253,7 +2253,7 @@ ideas = {
 			modifier = {
 				production_factory_max_efficiency_factor = 0.07
 				industrial_capacity_factory = 0.07
-				consumer_goods_factor = -0.07
+				consumer_goods_factor = -0.14
 				trade_opinion_factor = 0.3
 				improve_relations_maintain_cost_factor = -0.1
 			}
@@ -2468,14 +2468,14 @@ ideas = {
 			picture = ROM_king_carol_emptied_accounts
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.1
+				consumer_goods_factor = 0.2
 			}
 		}
 		WNG_compensation_from_WNG = { 
 			picture = ROM_king_carol_emptied_accounts
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.1
+				consumer_goods_factor = -0.2
 			}
 		}
 		WNG_investigation_1 = {
@@ -2696,7 +2696,7 @@ ideas = {
 				air_equipment = 0.15
 			}
 
-			traits = { medium_aircraft_manufacturer }
+			traits = { multi_role_aircraft_manufacturer }
 		}
 
 		WNG_pigeonio = {
@@ -2823,7 +2823,7 @@ ideas = {
 			}
 
 			research_bonus = {
-				naval_equipment = 0.10
+				naval_equipment = 0.15
 			}
 
 			equipment_bonus = {
diff --git a/common/ideas/zzz_YAK_ideas.txt b/common/ideas/zzz_YAK_ideas.txt
index d0d663dfc5c..f818a79bbe2 100644
--- a/common/ideas/zzz_YAK_ideas.txt
+++ b/common/ideas/zzz_YAK_ideas.txt
@@ -645,7 +645,7 @@ ideas = {
 			removal_cost = -1
 			picture = CES_military_potential
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 		YAK_smart = {
diff --git a/common/ideas/zzz_YAL_ideas.txt b/common/ideas/zzz_YAL_ideas.txt
index 6c93d65f0dc..e3d56dce8d2 100644
--- a/common/ideas/zzz_YAL_ideas.txt
+++ b/common/ideas/zzz_YAL_ideas.txt
@@ -462,7 +462,7 @@ ideas = {
 			removal_cost = -1
 			picture = generic_exploit_mines
 			modifier = {
-				consumer_goods_factor = 0.10
+				consumer_goods_factor = 0.2
 			}
 		}
 	
@@ -483,7 +483,7 @@ ideas = {
 			removal_cost = -1
 			picture = generic_agrarian_society
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 		
@@ -493,7 +493,7 @@ ideas = {
 			picture = jap_supremacy_of_technology
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				research_speed_factor = 0.03
 			}
 		}
@@ -1092,7 +1092,7 @@ ideas = {
 			picture = generic_goods_red_bonus
 			modifier = {
 				production_speed_industrial_complex_factor = 0.05
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 			}
 		}
 		
@@ -1138,7 +1138,7 @@ ideas = {
 			modifier = {
 				production_speed_industrial_complex_factor = 0.05
 				production_speed_arms_factory_factor = 0.05
-				consumer_goods_factor = -0.01
+				consumer_goods_factor = -0.02
 				conscription = 0.002
 				war_support_factor = 0.05
 			}
@@ -1219,7 +1219,7 @@ ideas = {
 			removal_cost = -1
 			picture = generic_production_bonus
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 
@@ -1233,7 +1233,7 @@ ideas = {
 			removal_cost = -1
 			picture = generic_production_bonus
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				research_speed_factor = 0.05
 			}
 		}
@@ -1689,7 +1689,7 @@ ideas = {
 			modifier = {
 				local_resources_factor = 0.10
 				trade_opinion_factor = 0.25
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				industrial_capacity_factory = 0.10
 				industrial_capacity_dockyard = 0.10
 			}
@@ -1709,7 +1709,7 @@ ideas = {
 				trade_opinion_factor = 0.25
 				production_factory_efficiency_gain_factor = 0.15
 				production_factory_max_efficiency_factor = 0.05
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				industrial_capacity_factory = 0.10
 				industrial_capacity_dockyard = 0.10
 			}
@@ -1729,7 +1729,7 @@ ideas = {
 				trade_opinion_factor = 0.25
 				production_factory_efficiency_gain_factor = 0.15
 				production_factory_max_efficiency_factor = 0.10
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				industrial_capacity_factory = 0.10
 				industrial_capacity_dockyard = 0.10
 				production_factory_start_efficiency_factor = 0.15
@@ -1765,7 +1765,7 @@ ideas = {
 			modifier = {
 				local_resources_factor = 0.10
 				trade_opinion_factor = 0.25
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				industry_free_repair_factor = 0.25
 			}
 		}
@@ -1784,7 +1784,7 @@ ideas = {
 				trade_opinion_factor = 0.25
 				production_speed_industrial_complex_factor = 0.05
 				production_speed_arms_factory_factor = 0.05
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				industry_free_repair_factor = 0.25
 			}
 		}
@@ -1803,7 +1803,7 @@ ideas = {
 				trade_opinion_factor = 0.25
 				production_speed_industrial_complex_factor = 0.10
 				production_speed_arms_factory_factor = 0.05
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				industry_free_repair_factor = 0.25
 				global_building_slots_factor = 0.10
 			}
@@ -1823,7 +1823,7 @@ ideas = {
 				trade_opinion_factor = 0.25
 				production_factory_efficiency_gain_factor = 0.15
 				production_factory_max_efficiency_factor = 0.10
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				industrial_capacity_factory = 0.15
 				industrial_capacity_dockyard = 0.10
 				production_factory_start_efficiency_factor = 0.15
@@ -1846,7 +1846,7 @@ ideas = {
 				trade_opinion_factor = 0.25
 				production_speed_industrial_complex_factor = 0.10
 				production_speed_arms_factory_factor = 0.05
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				industry_free_repair_factor = 0.25
 				global_building_slots_factor = 0.20
 				industrial_capacity_factory = 0.05
@@ -1884,7 +1884,7 @@ ideas = {
 				stability_factor = -0.07
 				non_core_manpower = -0.005
 				industrial_capacity_factory = -0.1
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				political_power_gain = -0.1
 				research_speed_factor = -0.05
 				neutrality_drift = -0.01
@@ -1985,7 +1985,7 @@ ideas = {
 				industrial_capacity_factory = 0.02
 				industrial_capacity_dockyard = 0.02
 				production_factory_max_efficiency_factor = 0.05
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 				production_speed_buildings_factor = 0.05
 				political_power_gain = 0.05
 			}
@@ -2064,7 +2064,7 @@ ideas = {
 				industrial_capacity_factory = 0.03
 				industrial_capacity_dockyard = 0.03
 				production_factory_max_efficiency_factor = 0.05
-				consumer_goods_factor = -0.03
+				consumer_goods_factor = -0.06
 				production_speed_buildings_factor = 0.05
 				research_speed_factor = 0.03
 				stability_factor = 0.1
@@ -2087,7 +2087,7 @@ ideas = {
 				industrial_capacity_factory = 0.02
 				industrial_capacity_dockyard = 0.02
 				production_factory_max_efficiency_factor = 0.05
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 				production_speed_infrastructure_factor = 0.05
 			}
 		}
@@ -2108,7 +2108,7 @@ ideas = {
 				industrial_capacity_factory = 0.03
 				industrial_capacity_dockyard = 0.03
 				production_factory_max_efficiency_factor = 0.05
-				consumer_goods_factor = -0.03
+				consumer_goods_factor = -0.06
 				research_speed_factor = 0.03
 				stability_factor = 0.1
 				war_support_factor = 0.1
@@ -2126,7 +2126,7 @@ ideas = {
 			picture = ast_abandon_the_westminster_system
 			modifier = {
 				stability_factor = 0.05
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				non_core_manpower = 0.01
 				neutrality_drift = 0.01
 			}
@@ -2321,7 +2321,7 @@ ideas = {
 				trade_opinion_factor = 0.50
 				production_speed_industrial_complex_factor = 0.10
 				production_speed_arms_factory_factor = 0.10
-				consumer_goods_factor = -0.10
+				consumer_goods_factor = -0.2
 				industry_free_repair_factor = 0.25
 				global_building_slots_factor = 0.20
 				industrial_capacity_factory = 0.10
@@ -2491,7 +2491,7 @@ ideas = {
 			picture = officers_purged
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				production_speed_industrial_complex_factor = -0.10
 				production_speed_arms_factory_factor = -0.10
 			}
@@ -2507,7 +2507,7 @@ ideas = {
 			picture = generic_local_self_management
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				production_speed_industrial_complex_factor = 0.10
 				production_speed_arms_factory_factor = 0.10
 			}
@@ -2537,7 +2537,7 @@ ideas = {
 			removal_cost = -1
 			picture = ROM_king_carol_ii_hedonist
 			modifier = {
-				consumer_goods_factor = -0.10
+				consumer_goods_factor = -0.2
 			}
 		}
 		
@@ -2657,7 +2657,7 @@ ideas = {
 			removal_cost = -1
 			picture = FRA_national_mobilization_focus
 			modifier = {
-				consumer_goods_factor = -0.03
+				consumer_goods_factor = -0.06
 			}
 		}
 
@@ -2746,7 +2746,7 @@ ideas = {
 			removal_cost = -1
 			picture = ROM_king_carol_ii_hedonist
 			modifier = {
-				consumer_goods_factor = -0.10
+				consumer_goods_factor = -0.2
 				production_factory_max_efficiency_factor = 0.05
 			}
 		}
@@ -2941,7 +2941,7 @@ ideas = {
 			picture = generic_agrarian_society
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.075
+				consumer_goods_factor = 0.15
 			}
 		}
 		
diff --git a/common/ideas/zzz_ZAR_ideas.txt b/common/ideas/zzz_ZAR_ideas.txt
index 25080625306..f4bfbac0f29 100644
--- a/common/ideas/zzz_ZAR_ideas.txt
+++ b/common/ideas/zzz_ZAR_ideas.txt
@@ -46,7 +46,7 @@ ideas = {
 			modifier = {
 				production_speed_buildings_factor = -0.20
 				conscription_factor = -0.20
-				consumer_goods_factor = 0.05	
+				consumer_goods_factor = 0.1	
 			}
 		}
 
@@ -67,7 +67,7 @@ ideas = {
 			modifier = {
 				production_speed_buildings_factor = -0.10
 				conscription_factor = -0.10
-				consumer_goods_factor = 0.05	
+				consumer_goods_factor = 0.1	
 			}
 		}
 
@@ -171,7 +171,7 @@ ideas = {
 			picture = FRA_matignon_agreements
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 			}
 		}
 		
@@ -463,7 +463,7 @@ ideas = {
 		modifier = {
 			production_speed_buildings_factor = 0.20
 			research_speed_factor = 0.20
-			consumer_goods_factor = -0.05
+			consumer_goods_factor = -0.1
 			stability_factor = -0.15
 		}
 	}
@@ -507,7 +507,7 @@ ideas = {
 			stability_factor = 0.08
 			political_power_factor = 0.04
 			monthly_population = 0.16
-			consumer_goods_factor = -0.04
+			consumer_goods_factor = -0.08
 			fuel_gain_factor = 0.16
 			max_fuel_factor = 0.16
 		}
@@ -531,7 +531,7 @@ ideas = {
 			stability_factor = 0.10
 			political_power_factor = 0.05
 			monthly_population = 0.20
-			consumer_goods_factor = -0.05
+			consumer_goods_factor = -0.1
 			fuel_gain_factor = 0.2
 			max_fuel_factor = 0.2
 		}
@@ -680,7 +680,7 @@ ideas = {
 		picture = BAR_money_party
 		removal_cost = -1
 		modifier = {
-			consumer_goods_factor = 0.05
+			consumer_goods_factor = 0.1
 		}
 	}
 
@@ -834,7 +834,7 @@ ideas = {
 		picture = LEC_staggering_reserves
 		removal_cost = -1
 		modifier = {
-			consumer_goods_factor = -0.05
+			consumer_goods_factor = -0.1
 			production_factory_max_efficiency_factor = 0.05
 		}
 	}
@@ -848,7 +848,7 @@ ideas = {
 		picture = LEC_staggering_reserves
 		removal_cost = -1
 		modifier = {
-			consumer_goods_factor = -0.05
+			consumer_goods_factor = -0.1
 			production_factory_max_efficiency_factor = 0.05
 		}
 	}
@@ -894,7 +894,7 @@ ideas = {
 		modifier = {
 			political_power_gain = -0.20
 			industrial_capacity_factory = -0.05
-			consumer_goods_factor = 0.02
+			consumer_goods_factor = 0.04
 		}
 	}	
 
@@ -915,7 +915,7 @@ ideas = {
 		modifier = {
 			political_power_gain = 0.20
 			industrial_capacity_factory = 0.05
-			consumer_goods_factor = -0.02
+			consumer_goods_factor = -0.04
 		}
 	}
 
@@ -938,7 +938,7 @@ ideas = {
 		picture = lau_plantation_idea
 		removal_cost = -1
 		modifier = {
-			consumer_goods_factor = 0.05
+			consumer_goods_factor = 0.1
 		}
 	}
 	ZAR_trans_zebrican_trade_network = {
@@ -957,7 +957,7 @@ ideas = {
 		removal_cost = -1
 		modifier = {
 			trade_opinion_factor = 0.25
-			consumer_goods_factor = -0.05
+			consumer_goods_factor = -0.1
 			min_export = 0.1
 		}
 	}
@@ -1114,7 +1114,7 @@ ideas = {
 		removal_cost = -1
 		modifier = {
 			political_power_factor = -0.3
-			consumer_goods_factor = 0.1
+			consumer_goods_factor = 0.2
 		}
 	}
 	ZAR_corruption_1 = {
@@ -1128,7 +1128,7 @@ ideas = {
 		removal_cost = -1
 		modifier = {
 			political_power_factor = -0.25
-			consumer_goods_factor = 0.1
+			consumer_goods_factor = 0.2
 			political_advisor_cost_factor = 1
 		}
 	}
@@ -1143,7 +1143,7 @@ ideas = {
 		removal_cost = -1
 		modifier = {
 			political_power_factor = -0.2
-			consumer_goods_factor = 0.08
+			consumer_goods_factor = 0.16
 			political_advisor_cost_factor = 0.8
 		}
 	}
@@ -1158,7 +1158,7 @@ ideas = {
 		removal_cost = -1
 		modifier = {
 			political_power_factor = -0.15
-			consumer_goods_factor = 0.06
+			consumer_goods_factor = 0.12
 			political_advisor_cost_factor = 0.6
 		}
 	}
@@ -1173,7 +1173,7 @@ ideas = {
 		removal_cost = -1
 		modifier = {
 			political_power_factor = -0.1
-			consumer_goods_factor = 0.04
+			consumer_goods_factor = 0.08
 			political_advisor_cost_factor = 0.4
 		}
 	}
@@ -1188,7 +1188,7 @@ ideas = {
 		removal_cost = -1
 		modifier = {
 			political_power_factor = -0.05
-			consumer_goods_factor = 0.02
+			consumer_goods_factor = 0.04
 			political_advisor_cost_factor = 0.2
 		}	
 	}
@@ -1202,7 +1202,7 @@ ideas = {
 		picture = lau_plantation_idea 
 		removal_cost = -1
 		modifier = {
-			consumer_goods_factor = -0.05
+			consumer_goods_factor = -0.1
 		}
 	}
 	ZAR_modern_agri = {
@@ -1251,7 +1251,7 @@ ideas = {
 		removal_cost = -1
 		modifier = {
 			production_speed_buildings_factor = -0.05
-			consumer_goods_factor = 0.05
+			consumer_goods_factor = 0.1
 		}
 	}
 
@@ -1430,7 +1430,7 @@ ideas = {
 
 		modifier = {
 			production_factory_efficiency_gain_factor = 0.075
-			consumer_goods_factor = -0.025 
+			consumer_goods_factor = -0.05 
 			stability_factor = -0.05
 			conscription_factor = -0.05
 		}
@@ -1450,7 +1450,7 @@ ideas = {
 
 		modifier = {
 			production_factory_efficiency_gain_factor = 0.15
-			consumer_goods_factor = -0.05
+			consumer_goods_factor = -0.1
 			global_building_slots_factor = 0.05
 			conscription_factor = -0.075
 			political_power_factor = -0.10
@@ -1506,7 +1506,7 @@ ideas = {
 		}
 
 		modifier = {
-			consumer_goods_factor = 0.1
+			consumer_goods_factor = 0.2
 		}
 	}
 
diff --git a/common/ideas/zzz_ZES_ideas.txt b/common/ideas/zzz_ZES_ideas.txt
index 5f457babe49..cf89cc26fc7 100644
--- a/common/ideas/zzz_ZES_ideas.txt
+++ b/common/ideas/zzz_ZES_ideas.txt
@@ -30,7 +30,7 @@ ideas = {
 			removal_cost = -1
 			picture = HUN_treaty_of_triannon
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 
@@ -60,7 +60,7 @@ ideas = {
 			removal_cost = -1
 			picture = ZES_Xatisa_Crisis_1
 			modifier = {
-				consumer_goods_factor = 0.20
+				consumer_goods_factor = 0.4
 				political_power_gain = -0.80
 				stability_factor = -0.20
 				conscription_factor = -0.10
@@ -105,7 +105,7 @@ ideas = {
 			}
 			removal_cost = -1
 			modifier = {
-				consumer_goods_factor = -0.01
+				consumer_goods_factor = -0.02
 				trade_opinion_factor = 0.05
 			}
 		}
@@ -122,7 +122,7 @@ ideas = {
 			removal_cost = -1
 			picture = ZES_Xatisa_Crisis_1
 			modifier = {
-				consumer_goods_factor = 0.20
+				consumer_goods_factor = 0.4
 				political_power_gain = -0.70
 				stability_factor = -0.10
 				conscription_factor = -0.10
@@ -139,7 +139,7 @@ ideas = {
 			removal_cost = -1
 			picture = ZES_Xatisa_Crisis_2
 			modifier = {
-				consumer_goods_factor = 0.15
+				consumer_goods_factor = 0.3
 				political_power_gain = -0.60
 				stability_factor = -0.10
 				conscription_factor = -0.10
@@ -156,7 +156,7 @@ ideas = {
 			removal_cost = -1
 			picture = ZES_Xatisa_Crisis_2
 			modifier = {
-				consumer_goods_factor = 0.10
+				consumer_goods_factor = 0.2
 				political_power_gain = -0.50
 				stability_factor = -0.10
 				conscription_factor = -0.10
@@ -173,7 +173,7 @@ ideas = {
 			removal_cost = -1
 			picture = ZES_Xatisa_Crisis_3
 			modifier = {
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				political_power_gain = -0.35
 				stability_factor = -0.05
 				conscription_factor = -0.05
@@ -222,7 +222,7 @@ ideas = {
 			removal_cost = -1
 			picture = generic_goods_red_bonus
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 
@@ -438,7 +438,7 @@ ideas = {
 			removal_cost = -1
 			picture = hospital
 			modifier = {
-				consumer_goods_factor = 0.02
+				consumer_goods_factor = 0.04
 				stability_factor = 0.15
 				political_power_factor = 0.10
 			}
@@ -492,7 +492,7 @@ ideas = {
 			removal_cost = -1
 			picture = EQS_harmonic_stagnation3
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				democratic_drift = 0.06
 				political_power_factor = -0.10
 				stability_factor = 0.20
@@ -709,7 +709,7 @@ ideas = {
 			removal_cost = -1
 			picture = generic_goods_red_bonus
 			modifier = {
-				consumer_goods_factor = 0.03
+				consumer_goods_factor = 0.06
 				stability_factor = 0.05
 				political_power_gain = 0.05
 				production_factory_efficiency_gain_factor = 0.025
@@ -726,7 +726,7 @@ ideas = {
 			removal_cost = -1
 			picture = generic_foreign_capital
 			modifier = {
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				stability_factor = 0.10
 				political_power_gain = 0.10
 				production_factory_efficiency_gain_factor = 0.05
@@ -745,7 +745,7 @@ ideas = {
 			removal_cost = -1
 			picture = ger_mefo_bills
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				trade_opinion_factor = 0.25
 			}
 		}
@@ -760,7 +760,7 @@ ideas = {
 			removal_cost = -1
 			picture = generic_build_infrastructure
 			modifier = {
-				consumer_goods_factor = 0.10
+				consumer_goods_factor = 0.2
 			}
 		}
 
@@ -873,7 +873,7 @@ ideas = {
 			removal_cost = -1
 			picture = generic_build_infrastructure
 			modifier = {
-				consumer_goods_factor = -0.03
+				consumer_goods_factor = -0.06
 				production_factory_efficiency_gain_factor = 0.025
 				production_speed_industrial_complex_factor = 0.025
 			}
@@ -890,7 +890,7 @@ ideas = {
 			picture = great_depression
 			modifier = {
 				production_speed_buildings_factor = -0.25
-				consumer_goods_factor = 0.10
+				consumer_goods_factor = 0.20
 			}
 		}
 
@@ -906,7 +906,7 @@ ideas = {
 			removal_cost = -1
 			picture = ZES_Xatisa_Crisis_1
 			modifier = {
-				consumer_goods_factor = 0.15
+				consumer_goods_factor = 0.3
 				political_power_gain = -0.60
 				stability_factor = -0.20
 				conscription_factor = -0.10
@@ -923,7 +923,7 @@ ideas = {
 			removal_cost = -1
 			picture = ZES_Xatisa_Crisis_2
 			modifier = {
-				consumer_goods_factor = 0.10
+				consumer_goods_factor = 0.4
 				political_power_gain = -0.50
 				stability_factor = -0.15
 				conscription_factor = -0.10
@@ -978,7 +978,7 @@ ideas = {
 			modifier = {
 				political_power_gain = -0.15
 				stability_weekly = -0.0035
-				consumer_goods_factor = -0.10
+				consumer_goods_factor = -0.2
 				production_speed_buildings_factor = 0.025
 				industrial_capacity_dockyard = 0.025
 				industrial_capacity_factory = 0.025
@@ -1082,7 +1082,7 @@ ideas = {
 			picture = purge_capitalists
 			modifier = {
 				political_power_factor = -0.05
-				consumer_goods_factor = 0.02
+				consumer_goods_factor = 0.04
 				production_speed_buildings_factor = 0.05
 			}
 		}
@@ -1097,7 +1097,7 @@ ideas = {
 			removal_cost = -1
 			picture = ZES_Xatisa_Crisis_3
 			modifier = {
-				consumer_goods_factor = 0.10
+				consumer_goods_factor = 0.20
 				political_power_gain = -0.30
 				stability_factor = -0.10
 				conscription_factor = -0.05
@@ -1114,7 +1114,7 @@ ideas = {
 			removal_cost = -1
 			picture = ZES_Xatisa_Crisis_3
 			modifier = {
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				political_power_gain = -0.15
 			}
 		}
@@ -1147,7 +1147,7 @@ ideas = {
 			removal_cost = -1
 			picture = EQS_unicorn_academy
 			modifier = {
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				research_speed_factor = 0.10
 				opinion_gain_monthly_same_ideology_factor = 0.20
 				license_purchase_cost = -0.20
@@ -1180,7 +1180,7 @@ ideas = {
 			removal_cost = -1
 			picture = hospital
 			modifier = {
-				consumer_goods_factor = 0.02
+				consumer_goods_factor = 0.04
 				monthly_population = 0.10
 			}
 		}
@@ -1195,7 +1195,7 @@ ideas = {
 			removal_cost = -1
 			picture = hospital
 			modifier = {
-				consumer_goods_factor = 0.02
+				consumer_goods_factor = 0.04
 				monthly_population = 0.10
 				experience_loss_factor = -0.05
 			}
@@ -1211,7 +1211,7 @@ ideas = {
 			removal_cost = -1
 			picture = MAN_framed_heart
 			modifier = {
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				monthly_population = 0.25
 			}
 		}
@@ -1257,7 +1257,7 @@ ideas = {
 			removal_cost = -1
 			picture = HUN_treaty_of_triannon
 			modifier = {
-				consumer_goods_factor = -0.03
+				consumer_goods_factor = -0.06
 				production_speed_buildings_factor = 0.05
 				industrial_capacity_factory = 0.05
 				industrial_capacity_dockyard = 0.05
@@ -1275,7 +1275,7 @@ ideas = {
 			picture = HUN_treaty_of_triannon
 			modifier = {
 				political_power_gain = 0.10
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 			}
 		}
 
@@ -1290,7 +1290,7 @@ ideas = {
 			picture = HUN_treaty_of_triannon
 			modifier = {
 				political_power_gain = 0.10
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				naval_doctrine_cost_factor = -0.10
 			}
 			research_bonus = {
@@ -1353,7 +1353,7 @@ ideas = {
 			removal_cost = -1
 			picture = ZES_Chamber_of_Commerce
 			modifier = {
-				consumer_goods_factor = 0.03
+				consumer_goods_factor = 0.06
 				stability_factor = -0.20
 				trade_opinion_factor = 0.30
 				political_power_gain = 0.30
@@ -1371,7 +1371,7 @@ ideas = {
 			removal_cost = -1
 			picture = ROM_king_carol_emptied_accounts
 			modifier = {
-				consumer_goods_factor = -0.03
+				consumer_goods_factor = -0.06
 				stability_factor = 0.15
 				political_power_gain = 0.05
 			}
@@ -1459,7 +1459,7 @@ ideas = {
 			removal_cost = -1
 			picture = NMS_sierra_caballo_mining_company
 			modifier = {
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 				local_resources_factor = 0.05
 			}
 		}
@@ -1474,7 +1474,7 @@ ideas = {
 			removal_cost = -1
 			picture = NMS_sierra_caballo_mining_company
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				local_resources_factor = 0.10
 			}
 		}
@@ -1526,7 +1526,7 @@ ideas = {
 			removal_cost = -1
 			picture = generic_flexible_foreign_policy2
 			modifier = {
-				consumer_goods_factor = -0.03
+				consumer_goods_factor = -0.06
 				global_building_slots_factor = 0.15
 				industry_repair_factor = 0.20
 				local_resources_factor = 0.10
@@ -1611,7 +1611,7 @@ ideas = {
 			removal_cost = -1
 			picture = ZES_Xatisa_Crisis_1
 			modifier = {
-				consumer_goods_factor = 0.15
+				consumer_goods_factor = 0.3
 				political_power_gain = -0.60
 				stability_factor = -0.20
 				conscription_factor = -0.10
@@ -1628,7 +1628,7 @@ ideas = {
 			removal_cost = -1
 			picture = ZES_Xatisa_Crisis_1
 			modifier = {
-				consumer_goods_factor = 0.15
+				consumer_goods_factor = 0.3
 				political_power_gain = -0.70
 				stability_factor = -0.15
 				conscription_factor = -0.10
@@ -1645,7 +1645,7 @@ ideas = {
 			removal_cost = -1
 			picture = ZES_Xatisa_Crisis_2
 			modifier = {
-				consumer_goods_factor = 0.10
+				consumer_goods_factor = 0.2
 				political_power_gain = -0.50
 				stability_factor = -0.15
 				conscription_factor = -0.10
@@ -1662,7 +1662,7 @@ ideas = {
 			removal_cost = -1
 			picture = ZES_Xatisa_Crisis_2
 			modifier = {
-				consumer_goods_factor = 0.10
+				consumer_goods_factor = 0.2
 				political_power_gain = -0.30
 				stability_factor = -0.10
 				conscription_factor = -0.05
@@ -1745,7 +1745,7 @@ ideas = {
 			removal_cost = -1
 			picture = GRW_potato_farming
 			modifier = {
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 				min_export = -0.1
 				civilian_intel_to_others = -10
 			}
@@ -1776,7 +1776,7 @@ ideas = {
 			removal_cost = -1
 			picture = ZES_Xatisa_Crisis_3
 			modifier = {
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				political_power_gain = -0.15
 				stability_factor = -0.05
 			}
@@ -1792,7 +1792,7 @@ ideas = {
 			removal_cost = -1
 			picture = SOL_Maternal_Guidiance_idea
 			modifier = {
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 				stability_factor = 0.05
 			}
 		}
@@ -1808,7 +1808,7 @@ ideas = {
 			picture = Generic_bank_idea_icon
 			modifier = {
 				political_power_gain = -0.05
-				consumer_goods_factor = -0.04
+				consumer_goods_factor = -0.08
 				civilian_intel_to_others = -10
 				trade_opinion_factor = 0.15
 			}
@@ -1863,7 +1863,7 @@ ideas = {
 			removal_cost = -1
 			picture = generic_local_self_management
 			modifier = {
-				consumer_goods_factor = 0.03
+				consumer_goods_factor = 0.06
 				political_power_gain = 0.10
 				production_factory_efficiency_gain_factor = -0.05
 				production_factory_max_efficiency_factor = -0.15
@@ -1900,7 +1900,7 @@ ideas = {
 			removal_cost = -1
 			picture = ricefield_training_ideaGRW
 			modifier = {
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 				conscription_factor = 0.05
 				monthly_population = 0.10
 			}
@@ -1916,7 +1916,7 @@ ideas = {
 			removal_cost = -1
 			picture = ricefield_training_ideaGRW
 			modifier = {
-				consumer_goods_factor = -0.04
+				consumer_goods_factor = -0.08
 				global_building_slots_factor = 0.10
 				conscription_factor = 0.05
 				monthly_population = 0.05
@@ -1933,7 +1933,7 @@ ideas = {
 			removal_cost = -1
 			picture = GRW_opened_up_schools2
 			modifier = {
-				consumer_goods_factor = 0.02
+				consumer_goods_factor = 0.04
 				research_speed_factor = 0.10
 			}
 		}
@@ -2017,7 +2017,7 @@ ideas = {
 			removal_cost = -1
 			picture = Generic_bank_idea_icon
 			modifier = {
-				consumer_goods_factor = -0.05
+				consumer_goods_factor = -0.1
 				trade_opinion_factor = 0.35
 			}
 		}
@@ -2260,7 +2260,7 @@ ideas = {
 			picture = generic_trade
 			modifier = {
 				political_power_gain = 0.25
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 			}
 		}
 
@@ -2364,7 +2364,7 @@ ideas = {
 			removal_cost = -1
 			picture = ZES_Xatisa_Crisis_1
 			modifier = {
-				consumer_goods_factor = 0.15
+				consumer_goods_factor = 0.3
 				political_power_gain = -0.50
 				stability_factor = -0.20
 				conscription_factor = -0.10
@@ -2454,7 +2454,7 @@ ideas = {
 			picture = severe_famine3
 			modifier = {
 				political_power_gain = -0.15
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 			}
 		}
 
@@ -2486,7 +2486,7 @@ ideas = {
 			modifier = {
 				political_power_gain = -0.15
 				stability_factor = 0.15
-				consumer_goods_factor = -0.03
+				consumer_goods_factor = -0.06
 				min_export = -0.35
 			}
 		}
@@ -2501,7 +2501,7 @@ ideas = {
 			removal_cost = -1
 			picture = country_focus_efficency
 			modifier = {
-				consumer_goods_factor = 0.02
+				consumer_goods_factor = 0.04
 				industrial_capacity_factory = 0.05
 				industrial_capacity_dockyard = 0.05
 			}
@@ -2533,7 +2533,7 @@ ideas = {
 			removal_cost = -1
 			picture = ZES_Xatisa_Crisis_2
 			modifier = {
-				consumer_goods_factor = 0.10
+				consumer_goods_factor = 0.2
 				political_power_gain = -0.50
 				stability_factor = -0.10
 				conscription_factor = -0.05
@@ -2550,7 +2550,7 @@ ideas = {
 			removal_cost = -1
 			picture = ZES_Xatisa_Crisis_3
 			modifier = {
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				political_power_gain = -0.20
 				stability_factor = -0.05
 			}
@@ -2751,7 +2751,7 @@ ideas = {
 			removal_cost = -1
 			picture = ZES_Xatisa_Crisis_2
 			modifier = {
-				consumer_goods_factor = 0.10
+				consumer_goods_factor = 0.2
 				political_power_gain = -0.25
 				stability_factor = -0.10
 				conscription_factor = -0.10
@@ -2768,7 +2768,7 @@ ideas = {
 			removal_cost = -1
 			picture = ZES_Xatisa_Crisis_3
 			modifier = {
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				stability_factor = -0.10
 				conscription_factor = -0.05
 			}
@@ -2784,7 +2784,7 @@ ideas = {
 			removal_cost = -1
 			picture = EQS_friendly_harmony
 			modifier = {
-				consumer_goods_factor = -0.03
+				consumer_goods_factor = -0.06
 				political_power_factor = 0.15
 				monthly_population = 0.15
 				research_speed_factor = 0.05
@@ -2801,7 +2801,7 @@ ideas = {
 			removal_cost = -1
 			picture = idea_industry_funds
 			modifier = {
-				consumer_goods_factor = 0.02
+				consumer_goods_factor = 0.04
 				production_speed_buildings_factor = 0.10
 				production_factory_efficiency_gain_factor = 0.10
 				production_factory_start_efficiency_factor = 0.10
@@ -2818,7 +2818,7 @@ ideas = {
 			removal_cost = -1
 			picture = HOL_welfare_state
 			modifier = {
-				consumer_goods_factor = 0.02
+				consumer_goods_factor = 0.04
 				production_speed_buildings_factor = 0.10
 				production_speed_industrial_complex_factor = 0.10
 				production_factory_efficiency_gain_factor = 0.10
@@ -2836,7 +2836,7 @@ ideas = {
 			removal_cost = -1
 			picture = trl_dakka
 			modifier = {
-				consumer_goods_factor = 0.02
+				consumer_goods_factor = 0.04
 				production_speed_buildings_factor = 0.10
 				production_speed_arms_factory_factor = 0.10
 				production_factory_efficiency_gain_factor = 0.10
@@ -3872,17 +3872,14 @@ ideas = {
 					}
 				}
 			}
-			available = {
+			available = {				
+				OR = {
+					owns_state = 413
+					owns_state = 721
+				}
 				if = {
-					OR = {
-						owns_state = 413
-						owns_state = 721
-					}
-					if = {
-						limit = { original_tag = ZES }
-
-						has_completed_focus = ZES_navy_fib_5
-					}
+					limit = { original_tag = ZES }
+					has_completed_focus = ZES_navy_fib_5
 				}
 			}
 
diff --git a/common/ideas/zzz_ZUG_ideas.txt b/common/ideas/zzz_ZUG_ideas.txt
index 7ff16e3c102..e410646c640 100644
--- a/common/ideas/zzz_ZUG_ideas.txt
+++ b/common/ideas/zzz_ZUG_ideas.txt
@@ -12,7 +12,7 @@ country = {
 				always = yes
 			}
 			modifier = {
-				consumer_goods_factor = 0.25
+				consumer_goods_factor = 0.5
 				political_power_gain = -0.25
 				industrial_capacity_factory	= -0.15
 				military_leader_cost_factor	= 1
@@ -48,7 +48,7 @@ country = {
 			}
 
 			modifier = {
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 				production_speed_buildings_factor = 0.05
 			}
 		}
diff --git a/common/ideas/zzz_eaw_generic.txt b/common/ideas/zzz_eaw_generic.txt
index efa2d050128..1df2c02162e 100644
--- a/common/ideas/zzz_eaw_generic.txt
+++ b/common/ideas/zzz_eaw_generic.txt
@@ -54,7 +54,7 @@ ideas = {
 			}
 
 			modifier = {
-				consumer_goods_factor = 0.15
+				consumer_goods_factor = 0.3
 				political_power_factor = -0.2
 				stability_factor = -0.2
 				army_morale_factor = -0.15
@@ -70,7 +70,7 @@ ideas = {
 			}
 
 			modifier = {
-				consumer_goods_factor = 0.1
+				consumer_goods_factor = 0.2
 				political_power_factor = -0.15
 				stability_factor = -0.15
 				army_morale_factor = -0.05
@@ -86,7 +86,7 @@ ideas = {
 			}
 
 			modifier = {
-				consumer_goods_factor = 0.05
+				consumer_goods_factor = 0.1
 				political_power_factor = -0.10
 				stability_factor = -0.1
 			}
diff --git a/common/ideas/zzz_generic.txt b/common/ideas/zzz_generic.txt
index 6c02178c737..99dacaa8ece 100644
--- a/common/ideas/zzz_generic.txt
+++ b/common/ideas/zzz_generic.txt
@@ -925,7 +925,7 @@ ideas = {
 			picture = generic_production_bonus
 
 			modifier = {
-				consumer_goods_factor = 0.2
+				consumer_goods_factor = 0.4
 				local_resources_factor = -0.2
 				industrial_capacity_factory = -0.2
 				industrial_capacity_dockyard = -0.2
@@ -946,7 +946,7 @@ ideas = {
 			picture = generic_production_bonus
 
 			modifier = {
-				consumer_goods_factor = 0.3
+				consumer_goods_factor = 0.6
 				local_resources_factor = -0.3
 				industrial_capacity_factory = -0.3
 				industrial_capacity_dockyard = -0.3
@@ -967,7 +967,7 @@ ideas = {
 			picture = generic_production_bonus
 
 			modifier = {
-				consumer_goods_factor = 0.5
+				consumer_goods_factor = 0.8
 				local_resources_factor = -0.5
 				industrial_capacity_factory = -0.5
 				industrial_capacity_dockyard = -0.5
diff --git a/common/ideas/zzz_generic_griffon_ideas.txt b/common/ideas/zzz_generic_griffon_ideas.txt
index 99b0d743f8c..baea81e3123 100644
--- a/common/ideas/zzz_generic_griffon_ideas.txt
+++ b/common/ideas/zzz_generic_griffon_ideas.txt
@@ -221,7 +221,7 @@ ideas = {
 			modifier = {
 				war_support_factor = 0.1
 				local_resources_factor = 0.10
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 			}
 		}
 	}
@@ -328,7 +328,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				production_speed_buildings_factor = 0.05
-				consumer_goods_factor = -0.03
+				consumer_goods_factor = -0.06
 			}
 		}
 	}
diff --git a/common/ideas/zzz_generic_zebra_ideas.txt b/common/ideas/zzz_generic_zebra_ideas.txt
index 424916b68b5..406ddeb3bb9 100644
--- a/common/ideas/zzz_generic_zebra_ideas.txt
+++ b/common/ideas/zzz_generic_zebra_ideas.txt
@@ -169,7 +169,7 @@ ideas = {
 			modifier = {
 				war_support_factor = 0.1
 				local_resources_factor = 0.10
-				consumer_goods_factor = -0.02
+				consumer_goods_factor = -0.04
 			}
 		}
 	}
@@ -276,7 +276,7 @@ ideas = {
 			removal_cost = -1
 			modifier = {
 				production_speed_buildings_factor = 0.05
-				consumer_goods_factor = -0.03
+				consumer_goods_factor = -0.06
 			}
 		}
 	}
diff --git a/common/military_industrial_organization/organizations/00_DEBUG_organization.txt b/common/military_industrial_organization/organizations/00_DEBUG_organization.txt
new file mode 100644
index 00000000000..1004ec92432
--- /dev/null
+++ b/common/military_industrial_organization/organizations/00_DEBUG_organization.txt
@@ -0,0 +1,389 @@
+
+########    ###    ##    ## ##    ##  ######  
+   ##      ## ##   ###   ## ##   ##  ##    ## 
+   ##     ##   ##  ####  ## ##  ##   ##       
+   ##    ##     ## ## ## ## #####     ######  
+   ##    ######### ##  #### ##  ##         ## 
+   ##    ##     ## ##   ### ##   ##  ##    ## 
+   ##    ##     ## ##    ## ##    ##  ######  
+
+DEBUG_generic_tank_organization = {
+	include = generic_tank_organization
+	allowed = {	
+		has_dlc = "Arms Against Tyranny"
+		is_debug = yes
+	}
+
+	visible = { #TODO_Manu: All this needs to be removed later on
+		owner = { has_country_flag = mio_show_all_archetypes_flag }
+	}
+}
+
+DEBUG_generic_infantry_tank_organization = {
+	include = generic_infantry_tank_organization
+	allowed = {	
+		has_dlc = "Arms Against Tyranny"
+		is_debug = yes
+	}
+
+	visible = { #TODO_Manu: All this needs to be removed later on
+		owner = { has_country_flag = mio_show_all_archetypes_flag }
+	}
+}
+
+DEBUG_generic_mobile_tank_organization = {
+	include = generic_mobile_tank_organization
+	allowed = {	
+		has_dlc = "Arms Against Tyranny"
+		is_debug = yes
+	}
+
+	visible = { #TODO_Manu: All this needs to be removed later on
+		owner = { has_country_flag = mio_show_all_archetypes_flag }
+	}
+}
+
+DEBUG_generic_medium_tank_organization = {
+	include = generic_medium_tank_organization
+	allowed = {	
+		has_dlc = "Arms Against Tyranny"
+		is_debug = yes
+	}
+
+	visible = { #TODO_Manu: All this needs to be removed later on
+		owner = { has_country_flag = mio_show_all_archetypes_flag }
+	}
+}
+
+
+DEBUG_generic_main_battle_tank_organization = {
+	include = generic_main_battle_tank_organization
+	allowed = {	
+		has_dlc = "Arms Against Tyranny"
+		is_debug = yes
+	}
+
+	visible = { #TODO_Manu: All this needs to be removed later on
+		owner = { has_country_flag = mio_show_all_archetypes_flag }
+	}
+}
+
+DEBUG_generic_heavy_tank_organization = {
+	include = generic_heavy_tank_organization
+	allowed = {	
+		has_dlc = "Arms Against Tyranny"
+		is_debug = yes
+	}
+
+	visible = { #TODO_Manu: All this needs to be removed later on
+		owner = { has_country_flag = mio_show_all_archetypes_flag }
+	}
+}
+
+DEBUG_generic_super_heavy_tank_organization = {
+	include = generic_super_heavy_tank_organization
+	allowed = {	
+		has_dlc = "Arms Against Tyranny"
+		is_debug = yes
+	}
+
+	visible = { #TODO_Manu: All this needs to be removed later on
+		owner = { has_country_flag = mio_show_all_archetypes_flag }
+	}
+}
+
+DEBUG_generic_tank_refurbishment_plant_organization = {
+	include = generic_tank_refurbishment_plant_organization
+	allowed = {	
+		has_dlc = "Arms Against Tyranny"
+		is_debug = yes
+	}
+
+	visible = { #TODO_Manu: All this needs to be removed later on
+		owner = { has_country_flag = mio_show_all_archetypes_flag }
+	}
+}
+
+
+ ######  ##     ## #### ########   ######  
+##    ## ##     ##  ##  ##     ## ##    ## 
+##       ##     ##  ##  ##     ## ##       
+ ######  #########  ##  ########   ######  
+      ## ##     ##  ##  ##              ## 
+##    ## ##     ##  ##  ##        ##    ## 
+ ######  ##     ## #### ##         ######  
+
+
+DEBUG_generic_task_force_ship_organization = {
+	include = generic_task_force_ship_organization
+	allowed = {	
+		has_dlc = "Arms Against Tyranny"
+		is_debug = yes
+	}
+
+	visible = { #TODO_Manu: All this needs to be removed later on
+		owner = { has_country_flag = mio_show_all_archetypes_flag }
+	}
+}
+
+DEBUG_generic_battle_line_ship_organization = {
+	include = generic_battle_line_ship_organization
+	allowed = {	
+		has_dlc = "Arms Against Tyranny"
+		is_debug = yes
+	}
+
+	visible = { #TODO_Manu: All this needs to be removed later on
+		owner = { has_country_flag = mio_show_all_archetypes_flag }
+	}
+}
+
+DEBUG_generic_escort_ship_organization = {
+	include = generic_escort_ship_organization
+	allowed = {	
+		has_dlc = "Arms Against Tyranny"
+		is_debug = yes
+	}
+
+	visible = { #TODO_Manu: All this needs to be removed later on
+		owner = { has_country_flag = mio_show_all_archetypes_flag }
+	}
+}
+
+DEBUG_generic_raider_ship_organization = {
+	include = generic_raider_ship_organization
+	allowed = {	
+		has_dlc = "Arms Against Tyranny"
+		is_debug = yes
+	}
+
+	visible = { #TODO_Manu: All this needs to be removed later on
+		owner = { has_country_flag = mio_show_all_archetypes_flag }
+	}
+}
+
+DEBUG_generic_submarine_organization = {
+	include = generic_submarine_organization
+	allowed = {	
+		has_dlc = "Arms Against Tyranny"
+		is_debug = yes
+	}
+
+	visible = { #TODO_Manu: All this needs to be removed later on
+		owner = { has_country_flag = mio_show_all_archetypes_flag }
+	}
+}
+
+DEBUG_generic_black_sea_fleet_organization = {
+	include = generic_black_sea_fleet_organization
+	allowed = {	
+		has_dlc = "Arms Against Tyranny"
+		is_debug = yes
+	}
+
+	visible = { #TODO_Manu: All this needs to be removed later on
+		owner = { has_country_flag = mio_show_all_archetypes_flag }
+	}
+}
+
+DEBUG_generic_refurbishment_repair_organization = {
+	include = generic_refurbishment_repair_organization
+	allowed = {	
+		has_dlc = "Arms Against Tyranny"
+		is_debug = yes
+	}
+
+	visible = { #TODO_Manu: All this needs to be removed later on
+		owner = { has_country_flag = mio_show_all_archetypes_flag }
+	}
+}
+
+
+
+########  ##          ###    ##    ## ########  ######  
+##     ## ##         ## ##   ###   ## ##       ##    ## 
+##     ## ##        ##   ##  ####  ## ##       ##       
+########  ##       ##     ## ## ## ## ######    ######  
+##        ##       ######### ##  #### ##             ## 
+##        ##       ##     ## ##   ### ##       ##    ## 
+##        ######## ##     ## ##    ## ########  ######  
+
+
+DEBUG_generic_general_aircraft_organization = {
+	include = generic_general_aircraft_organization
+	allowed = {	
+		has_dlc = "Arms Against Tyranny"
+		is_debug = yes
+	}
+
+	visible = { #TODO_Manu: All this needs to be removed later on
+		owner = { has_country_flag = mio_show_all_archetypes_flag }
+	}
+}
+
+DEBUG_generic_light_aircraft_organization = {
+	include = generic_light_aircraft_organization
+	allowed = {	
+		has_dlc = "Arms Against Tyranny"
+		is_debug = yes
+	}
+
+	visible = { #TODO_Manu: All this needs to be removed later on
+		owner = { has_country_flag = mio_show_all_archetypes_flag }
+	}
+}
+
+DEBUG_generic_medium_aircraft_organization = {
+	include = generic_medium_aircraft_organization
+	allowed = {	
+		has_dlc = "Arms Against Tyranny"
+		is_debug = yes
+	}
+
+	visible = { #TODO_Manu: All this needs to be removed later on
+		owner = { has_country_flag = mio_show_all_archetypes_flag }
+	}
+}
+
+DEBUG_generic_heavy_aircraft_organization = {
+	include = generic_heavy_aircraft_organization
+	allowed = {	
+		has_dlc = "Arms Against Tyranny"
+		is_debug = yes
+	}
+
+	visible = { #TODO_Manu: All this needs to be removed later on
+		owner = { has_country_flag = mio_show_all_archetypes_flag }
+	}
+}
+
+DEBUG_generic_cas_aircraft_organization = {
+	include = generic_cas_aircraft_organization
+	allowed = {	
+		has_dlc = "Arms Against Tyranny"
+		is_debug = yes
+	}
+
+	visible = { #TODO_Manu: All this needs to be removed later on
+		owner = { has_country_flag = mio_show_all_archetypes_flag }
+	}
+}
+
+DEBUG_generic_naval_aircraft_organization = {
+	include = generic_naval_aircraft_organization
+	allowed = {	
+		has_dlc = "Arms Against Tyranny"
+		is_debug = yes
+	}
+
+	visible = { #TODO_Manu: All this needs to be removed later on
+		owner = { has_country_flag = mio_show_all_archetypes_flag }
+	}
+}
+
+DEBUG_generic_multi_role_aircraft_organization = {
+	include = generic_multi_role_aircraft_organization
+	allowed = {	
+		has_dlc = "Arms Against Tyranny"
+		is_debug = yes
+	}
+
+	visible = { #TODO_Manu: All this needs to be removed later on
+		owner = { has_country_flag = mio_show_all_archetypes_flag }
+	}
+}
+
+DEBUG_generic_high_agility_fighter_aircraft_organization = {
+	include = generic_high_agility_fighter_aircraft_organization
+	allowed = {	
+		has_dlc = "Arms Against Tyranny"
+		is_debug = yes
+	}
+
+	visible = { #TODO_Manu: All this needs to be removed later on
+		owner = { has_country_flag = mio_show_all_archetypes_flag }
+	}
+}
+
+DEBUG_generic_range_focused_aircraft_organization = {
+	include = generic_range_focused_aircraft_organization
+	allowed = {	
+		has_dlc = "Arms Against Tyranny"
+		is_debug = yes
+	}
+
+	visible = { #TODO_Manu: All this needs to be removed later on
+		owner = { has_country_flag = mio_show_all_archetypes_flag }
+	}
+}
+
+
+
+##     ##    ###    ######## ######## ########  #### ######## ##       
+###   ###   ## ##      ##    ##       ##     ##  ##  ##       ##       
+#### ####  ##   ##     ##    ##       ##     ##  ##  ##       ##       
+## ### ## ##     ##    ##    ######   ########   ##  ######   ##       
+##     ## #########    ##    ##       ##   ##    ##  ##       ##       
+##     ## ##     ##    ##    ##       ##    ##   ##  ##       ##       
+##     ## ##     ##    ##    ######## ##     ## #### ######## ######## 
+
+
+DEBUG_generic_artillery_organization = {
+	include = generic_artillery_organization
+	allowed = {	
+		has_dlc = "Arms Against Tyranny"
+		is_debug = yes
+	}
+
+	visible = { #TODO_Manu: All this needs to be removed later on
+		owner = { has_country_flag = mio_show_all_archetypes_flag }
+	}
+}
+
+DEBUG_generic_infantry_equipment_organization = {
+	include = generic_infantry_equipment_organization
+	allowed = {	
+		has_dlc = "Arms Against Tyranny"
+		is_debug = yes
+	}
+
+	visible = { #TODO_Manu: All this needs to be removed later on
+		owner = { has_country_flag = mio_show_all_archetypes_flag }
+	}
+}
+
+DEBUG_generic_support_equipment_organization = {
+	include = generic_support_equipment_organization
+	allowed = {	
+		has_dlc = "Arms Against Tyranny"
+		is_debug = yes
+	}
+
+	visible = { #TODO_Manu: All this needs to be removed later on
+		owner = { has_country_flag = mio_show_all_archetypes_flag }
+	}
+}
+
+DEBUG_generic_motorized_mechanized_organization = {
+	include = generic_motorized_mechanized_organization
+	allowed = {	
+		has_dlc = "Arms Against Tyranny"
+		is_debug = yes
+	}
+
+	visible = { #TODO_Manu: All this needs to be removed later on
+		owner = { has_country_flag = mio_show_all_archetypes_flag }
+	}
+}
+
+DEBUG_generic_armored_car_organization = {
+	include = generic_armored_car_organization
+	allowed = {	
+		has_dlc = "Arms Against Tyranny"
+		is_debug = yes
+	}
+
+	visible = { #TODO_Manu: All this needs to be removed later on
+		owner = { has_country_flag = mio_show_all_archetypes_flag }
+	}
+}
\ No newline at end of file
diff --git a/common/military_industrial_organization/organizations/00_generic_organization.txt b/common/military_industrial_organization/organizations/00_generic_organization.txt
new file mode 100644
index 00000000000..74847429e4e
--- /dev/null
+++ b/common/military_industrial_organization/organizations/00_generic_organization.txt
@@ -0,0 +1,8384 @@
+
+
+########    ###    ##    ## ##    ##  ######  
+   ##      ## ##   ###   ## ##   ##  ##    ## 
+   ##     ##   ##  ####  ## ##  ##   ##       
+   ##    ##     ## ## ## ## #####     ######  
+   ##    ######### ##  #### ##  ##         ## 
+   ##    ##     ## ##   ### ##   ##  ##    ## 
+   ##    ##     ## ##    ## ##    ##  ######  
+
+
+
+# GENERIC TANK MANUFACTURER - Based on Daimler Benz
+generic_tank_organization = {
+	icon = GFX_idea_generic_tank_manufacturer_1
+
+	allowed = {
+		NOT = { has_custom_tank_mio = yes }
+	}
+
+	equipment_type = { mio_cat_eq_all_light_tank mio_cat_eq_all_medium_tank }
+	research_categories = { mio_cat_tech_light_armor_and_modules mio_cat_tech_medium_armor_and_modules }
+
+	tree_header_text = {
+		text = mio_header_tank_construction
+		x = 3
+	}
+
+	tree_header_text = {
+		text = mio_header_equipment_and_specialization
+		x = 7
+	}
+
+	
+	initial_trait = {
+		name = generic_mio_initial_trait_standardized_production
+		
+		equipment_bonus = {
+			armor_value = -0.05
+			defense =-0.05
+			build_cost_ic = -0.03
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_simplified_suspension
+		name = generic_mio_trait_simplified_suspension
+		icon = GFX_generic_mio_trait_icon_reliability
+
+		position = { x=1 y=0 }
+		
+		equipment_bonus = {
+			reliability = 0.05
+		}
+	}
+	
+	trait = {
+		token = generic_mio_trait_crew_ergonomics
+		name = generic_mio_trait_crew_ergonomics
+		icon = GFX_generic_mio_trait_icon_maximum_speed
+
+		position = { x=4 y=0 }
+		relative_position_id = generic_mio_trait_simplified_suspension
+		
+		equipment_bonus = {
+			maximum_speed = 0.02
+			defense = 0.02
+		}
+	}
+	
+	trait = {
+		token = generic_mio_trait_improved_tracks
+		name = generic_mio_trait_improved_tracks
+		icon = GFX_generic_mio_trait_icon_maximum_speed
+
+		
+		position = { x=0 y=2 }
+		relative_position_id = generic_mio_trait_simplified_suspension
+		
+		any_parent = { generic_mio_trait_simplified_suspension }
+
+		equipment_bonus = {
+			reliability = 0.05
+			maximum_speed = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_command_upgrades
+		name = generic_mio_trait_command_upgrades
+		icon = GFX_generic_mio_trait_icon_breakthrough
+		
+		position = { x=0 y=2 }
+		relative_position_id = generic_mio_trait_crew_ergonomics
+		
+		any_parent = { generic_mio_trait_crew_ergonomics }
+
+		equipment_bonus = {
+			breakthrough = 0.05
+		}
+	}
+	
+	trait = {
+		token = generic_mio_trait_standardized_components
+		name = generic_mio_trait_standardized_components
+		icon = GFX_generic_mio_department_icon_tank_general_line_efficiency
+		
+		position = { x=2 y=1 }
+		relative_position_id = generic_mio_trait_simplified_suspension
+		
+		all_parents = { generic_mio_trait_simplified_suspension generic_mio_trait_crew_ergonomics }
+
+		production_bonus = {
+			production_efficiency_gain_factor = 0.15
+			production_resource_need_factor = -0.15
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_improved_tooling
+		name = generic_mio_trait_improved_tooling
+		icon = GFX_generic_mio_department_icon_tank_general_technology
+
+		position = { x=0 y=2 }
+		relative_position_id = generic_mio_trait_standardized_components
+		
+		all_parents = { generic_mio_trait_improved_tracks generic_mio_trait_standardized_components generic_mio_trait_command_upgrades }
+
+		production_bonus = {
+			production_efficiency_cap_factor = 0.1
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_mass_production
+		name = generic_mio_trait_mass_production
+		icon = GFX_generic_mio_department_icon_tank_general_production
+		
+		position = { x=-1 y=1 }
+		relative_position_id = generic_mio_trait_improved_tooling
+		
+		any_parent = { generic_mio_trait_improved_tooling }
+		
+		mutually_exclusive = { generic_mio_trait_quality_improvements }
+		
+		production_bonus = {
+			production_cost_factor = -0.05
+			production_efficiency_gain_factor = 0.1
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_quality_improvements
+		name = generic_mio_trait_quality_improvements
+		icon = GFX_generic_mio_department_icon_tank_general_armor
+		
+		position = { x=1 y=1 }
+		relative_position_id = generic_mio_trait_improved_tooling
+		
+		any_parent = { generic_mio_trait_improved_tooling }
+		
+		mutually_exclusive = { generic_mio_trait_mass_production}
+		
+		equipment_bonus = {
+			armor_value = 0.1
+			defense = 0.1
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_defensive_equipment
+		name = generic_mio_trait_defensive_equipment
+		icon = GFX_generic_mio_trait_icon_soft_attack
+
+		position = { x=2 y=0 }
+		relative_position_id = generic_mio_trait_crew_ergonomics
+		
+		equipment_bonus = {
+			soft_attack = 0.02
+			defense = 0.02
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_long_barreled_guns
+		name = generic_mio_trait_long_barreled_guns
+		icon = GFX_generic_mio_trait_icon_ap_attack
+
+		position = { x=0 y=2 }
+		relative_position_id = generic_mio_trait_defensive_equipment
+		
+		all_parents = { generic_mio_trait_crew_ergonomics generic_mio_trait_defensive_equipment }
+
+		equipment_bonus = {
+			ap_attack = 0.05
+			hard_attack = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_anti_tank_specialization
+		name = generic_mio_trait_anti_tank_specialization
+		icon = GFX_generic_mio_trait_icon_hard_attack
+		
+		position = { x=-1 y=2 }
+		relative_position_id = generic_mio_trait_long_barreled_guns
+		
+		any_parent = { generic_mio_trait_long_barreled_guns }
+		
+		mutually_exclusive = { generic_mio_trait_infantry_support_tanks }
+		
+		equipment_bonus = {
+			armor_value = 0.05
+			hard_attack = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_infantry_support_tanks
+		name = generic_mio_trait_infantry_support_tanks
+		icon = GFX_generic_mio_trait_icon_soft_attack
+		
+		position = { x=1 y=2 }
+		relative_position_id = generic_mio_trait_long_barreled_guns
+		
+		any_parent = { generic_mio_trait_long_barreled_guns }
+		
+		mutually_exclusive = { generic_mio_trait_anti_tank_specialization }
+		
+		equipment_bonus = {
+			soft_attack = 0.05
+		}
+
+		production_bonus = {
+			production_cost_factor = -0.02
+		}
+	}
+}
+	
+
+# INFANTRY TANK DESIGNER  - Based on Renault (FRA)
+generic_infantry_tank_organization = {
+	icon = GFX_idea_generic_tank_manufacturer_3
+
+	allowed = {
+		always = no # Archetype only - countries using it have their own verisons
+	}
+
+	equipment_type = { armor }
+	research_categories = { mio_cat_tech_all_armor_and_modules }
+
+	tree_header_text = {
+		text = mio_header_light_tank_department
+		x = 0.1
+	}
+
+	tree_header_text = {
+		text = mio_header_medium_tank_department
+		x = 4
+	}
+
+	tree_header_text = {
+		text = mio_header_heavy_tank_department
+		x = 8
+	}
+
+	initial_trait = {
+		name = generic_mio_initial_trait_infantry_tanks_designer
+		
+		limit_to_equipment_type = { 
+			armor
+		}
+		
+		equipment_bonus = {
+			armor_value = 0.05
+			maximum_speed =-0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_light_tank_improvements
+		name = generic_mio_trait_light_tank_improvements
+		icon = GFX_generic_mio_department_icon_tank_light_tank_weapons
+
+		position = { x=0 y=0 }
+		
+		limit_to_equipment_type = { mio_cat_eq_all_light_tank }
+
+		equipment_bonus = {
+			soft_attack = 0.05
+			hard_attack = 0.05
+			armor_value = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_medium_tank_improvements
+		name = generic_mio_trait_medium_tank_improvements
+		icon = GFX_generic_mio_department_icon_tank_medium_tank_weapons
+
+		limit_to_equipment_type = { mio_cat_eq_all_medium_tank }
+
+		position = { x=4 y=0 }
+		relative_position_id = generic_mio_trait_light_tank_improvements
+		
+		equipment_bonus = {
+			soft_attack = 0.05
+			hard_attack = 0.05
+			armor_value = 0.05
+		}
+
+
+	}
+	trait = {
+		token = generic_mio_trait_heavy_tank_improvements
+		name = generic_mio_trait_heavy_tank_improvements
+		icon = GFX_generic_mio_department_icon_tank_heavy_tank_weapons
+
+		position = { x=4 y=0 }
+		relative_position_id = generic_mio_trait_medium_tank_improvements
+		
+		limit_to_equipment_type = { mio_cat_eq_all_heavy_tank }
+
+		equipment_bonus = {
+			soft_attack = 0.02
+			hard_attack = 0.05
+			armor_value = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_production_division
+		name = generic_mio_trait_production_division
+		icon = GFX_generic_mio_department_icon_tank_general_line_efficiency
+		
+		position = { x=2 y=1 }
+		relative_position_id = generic_mio_trait_light_tank_improvements
+		
+		all_parents = { generic_mio_trait_light_tank_improvements generic_mio_trait_medium_tank_improvements }
+
+		production_bonus = {
+			production_efficiency_gain_factor = 0.15
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_standardized_turrets
+		name = generic_mio_trait_standardized_turrets
+		icon = GFX_generic_mio_department_icon_tank_general_quality
+		
+		position = { x=0 y=1 }
+		relative_position_id = generic_mio_trait_production_division
+
+		any_parent = { generic_mio_trait_production_division }
+
+		equipment_bonus = {
+			soft_attack = 0.05
+			defense = 0.05 
+		}
+
+		production_bonus = {
+			production_cost_factor = -0.03
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_improved_wheel_protection
+		name = generic_mio_trait_improved_wheel_protection
+		icon = GFX_generic_mio_department_icon_tank_light_tank_armor
+		
+		position = { x=0 y=2 }
+		relative_position_id = generic_mio_trait_light_tank_improvements
+		
+		any_parent = { generic_mio_trait_light_tank_improvements }
+
+		limit_to_equipment_type = { mio_cat_eq_all_light_tank }
+
+		equipment_bonus = {
+			reliability = 0.05
+			defense = 0.1
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_gun_improvements
+		name = generic_mio_trait_gun_improvements
+		icon = GFX_generic_mio_trait_icon_ap_attack
+		
+		position = { x=0 y=2 }
+		relative_position_id = generic_mio_trait_medium_tank_improvements
+
+		any_parent = { generic_mio_trait_medium_tank_improvements }
+
+		limit_to_equipment_type = { mio_cat_eq_all_medium_tank mio_cat_eq_all_heavy_tank }
+
+		equipment_bonus = {
+			hard_attack = 0.05
+			ap_attack = 0.1
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_speed_improvements
+		name = generic_mio_trait_speed_improvements
+		icon = GFX_generic_mio_trait_icon_maximum_speed
+		
+		position = { x=1 y=2 }
+		relative_position_id = generic_mio_trait_improved_wheel_protection
+	
+		any_parent = { generic_mio_trait_improved_wheel_protection generic_mio_trait_gun_improvements }
+		
+		mutually_exclusive = { generic_mio_trait_improved_protection }
+		
+		equipment_bonus = {
+			maximum_speed = 0.1
+			breakthrough = 0.1
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_improved_protection
+		name = generic_mio_trait_improved_protection
+		icon = GFX_generic_mio_department_icon_tank_general_armor
+		
+		position = { x=2 y=0 }
+		relative_position_id = generic_mio_trait_speed_improvements
+		
+		any_parent = { generic_mio_trait_improved_wheel_protection generic_mio_trait_gun_improvements }
+		
+		mutually_exclusive= { generic_mio_trait_speed_improvements }
+
+		equipment_bonus = {
+			armor_value = 0.1
+			defense = 0.1
+		}
+	}
+	trait = {
+		token = generic_mio_trait_modular_construction
+		name = generic_mio_trait_modular_construction
+		icon = GFX_generic_mio_department_icon_tank_general_technology
+		
+		position = { x=2 y=2 }
+		relative_position_id = generic_mio_trait_medium_tank_improvements
+		
+		any_parent = { generic_mio_trait_medium_tank_improvements }
+
+		production_bonus = {
+			production_efficiency_cap_factor = 0.1
+			production_efficiency_gain_factor = 0.1
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_light_tank_specialization
+		name = generic_mio_trait_light_tank_specialization
+		icon = GFX_generic_mio_department_icon_tank_light_tank_production
+		
+		position = { x=-1 y=2 }
+		relative_position_id = generic_mio_trait_modular_construction
+		
+		any_parent = { generic_mio_trait_modular_construction }
+		
+		mutually_exclusive= { generic_mio_trait_medium_tank_specialization generic_mio_trait_heavy_tank_specialization }
+
+		limit_to_equipment_type = { mio_cat_eq_all_light_tank }
+
+		production_bonus = {
+			production_cost_factor = -0.05
+		}
+	}
+	trait = {
+		token = generic_mio_trait_medium_tank_specialization
+		name = generic_mio_trait_medium_tank_specialization
+		icon = GFX_generic_mio_department_icon_tank_medium_tank_production
+		
+		position = { x=0 y=2 }
+		relative_position_id = generic_mio_trait_modular_construction
+
+		any_parent = { generic_mio_trait_modular_construction }
+		
+		mutually_exclusive= { generic_mio_trait_light_tank_specialization generic_mio_trait_heavy_tank_specialization }
+		
+		limit_to_equipment_type = { mio_cat_eq_all_medium_tank }
+
+		production_bonus = {
+			production_cost_factor = -0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_heavy_tank_specialization
+		name = generic_mio_trait_heavy_tank_specialization
+		icon = GFX_generic_mio_department_icon_tank_heavy_tank_production
+		
+		position = { x=1 y=2 }
+		relative_position_id = generic_mio_trait_modular_construction
+
+		any_parent = { generic_mio_trait_modular_construction }
+		
+		mutually_exclusive= { generic_mio_trait_light_tank_specialization generic_mio_trait_medium_tank_specialization }
+		
+		limit_to_equipment_type = { mio_cat_eq_all_heavy_tank }
+
+		production_bonus = {
+			production_cost_factor = -0.05
+		}
+	}
+}
+
+
+# MOBILE TANK DESIGNER / FAST TANK DESIGNER - Based on Hotchkiss (FRA)
+generic_mobile_tank_organization = {
+	icon = GFX_idea_generic_tank_manufacturer_3
+
+	allowed = {
+		always = no # Archetype only - countries using it have their own verisons
+	}
+
+	equipment_type = { armor }
+	research_categories = { mio_cat_tech_all_armor_and_modules }
+
+	tree_header_text = {
+		text = mio_header_engine_and_suspension
+		x = 1
+	}
+
+	tree_header_text = {
+		text = mio_header_armor_and_armaments
+		x = 7
+	}
+
+	initial_trait = {
+		name = generic_mio_initial_trait_fast_tanks_designer
+		
+		equipment_bonus = {
+			armor_value = -0.05
+			reliability = -0.05
+			maximum_speed = 0.1
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_improved_boogies
+		name = generic_mio_trait_improved_boogies
+		icon = GFX_generic_mio_department_icon_tank_general_engine
+
+		position = { x=1 y=0 }
+		
+		equipment_bonus = {
+			maximum_speed = 0.02
+			reliability = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_engine_optimization
+		name = generic_mio_engine_optimization
+		icon = GFX_generic_mio_trait_icon_maximum_speed
+
+		position = { x=-1 y=1 }
+		relative_position_id = generic_mio_trait_improved_boogies
+
+		all_parents = { generic_mio_trait_improved_boogies }
+
+		mutually_exclusive = { generic_mio_reduced_fuel_usage }
+		
+		equipment_bonus = {
+			maximum_speed = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_reduced_fuel_usage
+		name = generic_mio_reduced_fuel_usage
+		icon = GFX_generic_mio_trait_icon_fuel_consumption
+
+		position = { x=1 y=1 }
+		relative_position_id = generic_mio_trait_improved_boogies
+
+		all_parents = { generic_mio_trait_improved_boogies }
+
+		mutually_exclusive = { generic_mio_engine_optimization }
+		
+		equipment_bonus = {
+			fuel_consumption = -0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_improved_ventilation
+		name = generic_mio_improved_ventilation
+		icon = GFX_generic_mio_trait_icon_defense
+
+		position = { x=1 y=1 }
+		relative_position_id = generic_mio_engine_optimization
+
+		any_parent = { generic_mio_engine_optimization generic_mio_reduced_fuel_usage }
+		
+		equipment_bonus = {
+			defense = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_improved_tracks_and_suspension
+		name = generic_mio_improved_tracks_and_suspension
+		icon = GFX_generic_mio_trait_icon_breakthrough
+
+		position = { x=0 y=2 }
+		relative_position_id = generic_mio_improved_ventilation
+
+		all_parents = { generic_mio_improved_ventilation }
+		
+		equipment_bonus = {
+			breakthrough = 0.05
+			maximum_speed = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_sloping_armor
+		name = generic_mio_sloping_armor
+		icon = GFX_generic_mio_trait_icon_defense
+
+		position = { x=6 y=0 }
+		relative_position_id = generic_mio_trait_improved_boogies
+
+		equipment_bonus = {
+			defense = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_lighter_materials
+		name = generic_mio_lighter_materials
+		icon = GFX_generic_mio_trait_icon_resources
+
+		position = { x=-1 y=1 }
+		relative_position_id = generic_mio_sloping_armor
+
+		all_parents = { generic_mio_sloping_armor }
+
+		mutually_exclusive = { generic_mio_armor_hardening_process }
+		
+		production_bonus = {
+			production_resource_penalty_factor = -0.1
+		}
+	}
+
+	trait = {
+		token = generic_mio_armor_hardening_process
+		name = generic_mio_armor_hardening_process
+		icon = GFX_generic_mio_trait_icon_armor_value
+
+		position = { x=1 y=1 }
+		relative_position_id = generic_mio_sloping_armor
+
+		all_parents = { generic_mio_sloping_armor }
+
+		mutually_exclusive = { generic_mio_lighter_materials }
+		
+		equipment_bonus = {
+			armor_value = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_enlarged_breech
+		name = generic_mio_enlarged_breech
+		icon = GFX_generic_mio_trait_icon_soft_attack
+
+		position = { x=1 y=1 }
+		relative_position_id = generic_mio_lighter_materials
+
+		any_parent = { generic_mio_lighter_materials generic_mio_armor_hardening_process }
+		
+		equipment_bonus = {
+			soft_attack = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_gunner_sight_improvements
+		name = generic_mio_gunner_sight_improvements
+		icon = GFX_generic_mio_department_icon_tank_general_quality
+
+		position = { x=0 y=2 }
+		relative_position_id = generic_mio_enlarged_breech
+
+		all_parents = { generic_mio_enlarged_breech }
+		
+		equipment_bonus = {
+			breakthrough = 0.05
+			defense = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_quality_assurance_routines
+		name = generic_mio_quality_assurance_routines
+		icon = GFX_generic_mio_trait_icon_reliability
+
+		position = { x=3 y=1 }
+		relative_position_id = generic_mio_trait_improved_boogies
+
+		all_parents = { generic_mio_trait_improved_boogies generic_mio_sloping_armor }
+		
+		equipment_bonus = {
+			reliability = 0.05
+		}
+
+		production_bonus = {
+			production_efficiency_cap_factor = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_streamlined_production
+		name = generic_mio_streamlined_production
+		icon = GFX_generic_mio_department_icon_tank_general_technology		
+
+		position = { x=0 y=2 }
+		relative_position_id = generic_mio_quality_assurance_routines
+
+		all_parents = { generic_mio_quality_assurance_routines generic_mio_improved_ventilation generic_mio_enlarged_breech }
+		
+
+		production_bonus = {
+			production_efficiency_cap_factor = 0.05
+		}
+	}
+}
+
+
+# MEDIUM TANK DESIGNER - Based on Army Ordnance Department (USA)
+generic_medium_tank_organization = {
+	icon = GFX_idea_generic_tank_manufacturer_2
+
+	allowed = {
+		always = no # Archetype only - countries using it have their own verisons
+	}
+
+	equipment_type = { mio_cat_eq_all_medium_tank }
+	research_categories = { mio_cat_tech_medium_armor_and_modules }
+
+	tree_header_text = {
+		text = mio_header_design
+		x = 1
+	}
+
+	tree_header_text = {
+		text = mio_header_armor
+		x = 5
+	}
+
+	tree_header_text = {
+		text = mio_header_engines
+		x = 8
+	}
+
+
+	initial_trait = {
+		name = generic_mio_initial_trait_medium_tank_designer
+
+		organization_modifier = {
+			military_industrial_organization_research_bonus = 0.05
+		}
+		
+		production_bonus = {
+			production_capacity_factor = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_power_traverse
+		name = generic_mio_trait_power_traverse
+		icon = GFX_generic_mio_trait_icon_breakthrough
+
+		position = { x=1 y=0 }
+		
+		equipment_bonus = {
+			breakthrough = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_all_round_cupola
+		name = generic_mio_trait_all_round_cupola
+		icon = GFX_generic_mio_trait_icon_breakthrough
+
+		position = { x=0 y=1 }
+		relative_position_id = generic_mio_trait_power_traverse
+
+		all_parents = { generic_mio_trait_power_traverse }
+		
+		equipment_bonus = {
+			breakthrough = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_simplified_turret_design
+		name = generic_mio_trait_simplified_turret_design
+		icon = GFX_generic_mio_trait_icon_production_capacity
+
+		position = { x=0 y=1 }
+		relative_position_id = generic_mio_trait_all_round_cupola
+
+		all_parents = { generic_mio_trait_all_round_cupola }
+		
+		production_bonus = {
+			production_capacity_factor = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_specialist_shells
+		name = generic_mio_trait_specialist_shells
+		icon = GFX_generic_mio_trait_icon_hard_attack
+
+		position = { x=-1 y=1 }
+		relative_position_id = generic_mio_trait_simplified_turret_design
+
+		all_parents = { generic_mio_trait_simplified_turret_design }
+		
+		equipment_bonus = {
+			hard_attack = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_improved_gun_metallurgy
+		name = generic_mio_trait_improved_gun_metallurgy
+		icon = GFX_generic_mio_trait_icon_ap_attack
+
+		position = { x=1 y=1 }
+		relative_position_id = generic_mio_trait_simplified_turret_design
+
+		all_parents = { generic_mio_trait_simplified_turret_design }
+		
+		equipment_bonus = {
+			ap_attack = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_advanced_shells
+		name = generic_mio_trait_advanced_shells
+		icon = GFX_generic_mio_trait_icon_ap_attack
+
+		position = { x=1 y=1 }
+		relative_position_id = generic_mio_trait_specialist_shells
+
+		any_parent = { generic_mio_trait_specialist_shells generic_mio_trait_improved_gun_metallurgy }
+		
+		equipment_bonus = {
+			ap_attack = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_armor_steel_working
+		name = generic_mio_trait_armor_steel_working
+		icon = GFX_generic_mio_trait_icon_production_capacity
+
+		position = { x=4 y=0 }
+		relative_position_id = generic_mio_trait_power_traverse
+		
+		production_bonus = {
+			production_capacity_factor = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_spaced_armor
+		name = generic_mio_trait_spaced_armor
+		icon = GFX_generic_mio_trait_icon_armor_value
+
+		position = { x=-1 y=2 }
+		relative_position_id = generic_mio_trait_armor_steel_working
+
+		all_parents = { generic_mio_trait_armor_steel_working }
+
+		mutually_exclusive = { generic_mio_trait_crew_survival_layout generic_mio_trait_sloped_side_armor }
+		
+		equipment_bonus = {
+			armor_value = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_crew_survival_layout
+		name = generic_mio_trait_crew_survival_layout
+		icon = GFX_generic_mio_trait_icon_defense		
+
+		position = { x=1 y=0 }
+		relative_position_id = generic_mio_trait_spaced_armor
+
+		all_parents = { generic_mio_trait_armor_steel_working }
+
+		mutually_exclusive = { generic_mio_trait_spaced_armor generic_mio_trait_sloped_side_armor }
+		
+		equipment_bonus = {
+			defense = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_sloped_side_armor
+		name = generic_mio_trait_sloped_side_armor
+		icon = GFX_generic_mio_trait_icon_breakthrough
+
+		position = { x=2 y=0 }
+		relative_position_id = generic_mio_trait_spaced_armor
+
+		all_parents = { generic_mio_trait_armor_steel_working }
+
+		mutually_exclusive = { generic_mio_trait_spaced_armor generic_mio_trait_crew_survival_layout }
+		
+		equipment_bonus = {
+			breakthrough = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_truck_engines
+		name = generic_mio_trait_truck_engines
+		icon = GFX_generic_mio_trait_icon_reliability
+
+		position = { x=2 y=0 }
+		relative_position_id = generic_mio_trait_armor_steel_working
+
+		mutually_exclusive = { generic_mio_trait_aircraft_engines }
+		
+		equipment_bonus = {
+			reliability = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_aircraft_engines
+		name = generic_mio_trait_aircraft_engines
+		icon = GFX_generic_mio_trait_icon_maximum_speed
+
+		position = { x=2 y=0 }
+		relative_position_id = generic_mio_trait_truck_engines
+
+		mutually_exclusive = { generic_mio_trait_truck_engines }
+		
+		equipment_bonus = {
+			maximum_speed = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_improved_suspension
+		name = generic_mio_trait_improved_suspension
+		icon = GFX_generic_mio_trait_icon_reliability
+
+		position = { x=1 y=1 }
+		relative_position_id = generic_mio_trait_truck_engines
+
+		any_parent = { generic_mio_trait_truck_engines generic_mio_trait_aircraft_engines }
+
+		equipment_bonus = {
+			reliability = 0.05
+		}
+	}
+}
+
+
+# MAIN BATTLE TANK DESIGNER - Based on Army Ordnance Department (USA)
+generic_main_battle_tank_organization = {
+	icon = GFX_idea_generic_tank_manufacturer_2
+
+	allowed = {
+		always = no # Archetype only - countries using it have their own verisons
+	}
+
+	equipment_type = { mio_cat_eq_all_main_battle_tank }
+	research_categories = { mio_cat_tech_medium_armor_and_modules }
+
+	tree_header_text = {
+		text = mio_header_design
+		x = 1
+	}
+
+	tree_header_text = {
+		text = mio_header_armor
+		x = 5
+	}
+
+	tree_header_text = {
+		text = mio_header_engines
+		x = 8
+	}
+
+
+	initial_trait = {
+		name = generic_mio_initial_trait_main_battle_tank_designer
+
+		organization_modifier = {
+			military_industrial_organization_research_bonus = 0.05
+		}
+		
+		production_bonus = {
+			production_capacity_factor = 0.05
+		}
+		equipment_bonus = {
+			armor_value = 0.05
+			soft_attack = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_power_traverse
+		name = generic_mio_trait_mbt_power_traverse
+		icon = GFX_generic_mio_trait_icon_breakthrough
+
+		position = { x=1 y=0 }
+		
+		equipment_bonus = {
+			breakthrough = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_all_round_cupola
+		name = generic_mio_trait_mbt_all_round_cupola
+		icon = GFX_generic_mio_trait_icon_breakthrough
+
+		position = { x=0 y=1 }
+		relative_position_id = generic_mio_trait_power_traverse
+
+		all_parents = { generic_mio_trait_power_traverse }
+		
+		equipment_bonus = {
+			breakthrough = 0.1
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_simplified_turret_design
+		name = generic_mio_trait_mbt_simplified_turret_design
+		icon = GFX_generic_mio_trait_icon_production_capacity
+
+		position = { x=0 y=1 }
+		relative_position_id = generic_mio_trait_all_round_cupola
+
+		all_parents = { generic_mio_trait_all_round_cupola }
+		
+		production_bonus = {
+			production_capacity_factor = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_specialist_shells
+		name = generic_mio_trait_mbt_specialist_shells
+		icon = GFX_generic_mio_trait_icon_hard_attack
+
+		position = { x=-1 y=1 }
+		relative_position_id = generic_mio_trait_simplified_turret_design
+
+		all_parents = { generic_mio_trait_simplified_turret_design }
+		
+		limit_to_equipment_type = { modern_tank_chassis }
+		equipment_bonus = {
+			hard_attack = 0.075
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_improved_gun_metallurgy
+		name = generic_mio_trait_mbt_improved_gun_metallurgy
+		icon = GFX_generic_mio_trait_icon_ap_attack
+
+		position = { x=1 y=1 }
+		relative_position_id = generic_mio_trait_simplified_turret_design
+
+		all_parents = { generic_mio_trait_simplified_turret_design }
+		
+
+		equipment_bonus = {
+			ap_attack = 0.1
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_advanced_shells
+		name = generic_mio_trait_mbt_advanced_shells
+		icon = GFX_generic_mio_trait_icon_ap_attack
+
+		position = { x=1 y=1 }
+		relative_position_id = generic_mio_trait_specialist_shells
+
+		any_parent = { generic_mio_trait_specialist_shells generic_mio_trait_improved_gun_metallurgy }
+		
+		equipment_bonus = {
+			ap_attack = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_armor_steel_working
+		name = generic_mio_trait_mbt_armor_steel_working
+		icon = GFX_generic_mio_trait_icon_production_capacity
+
+		position = { x=4 y=0 }
+		relative_position_id = generic_mio_trait_power_traverse
+		
+		production_bonus = {
+			production_capacity_factor = 0.075
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_spaced_armor
+		name = generic_mio_trait_mbt_spaced_armor
+		icon = GFX_generic_mio_trait_icon_armor_value
+
+		position = { x=-1 y=2 }
+		relative_position_id = generic_mio_trait_armor_steel_working
+
+		all_parents = { generic_mio_trait_armor_steel_working }
+
+
+		limit_to_equipment_type = { modern_tank_chassis }
+
+		mutually_exclusive = { generic_mio_trait_crew_survival_layout generic_mio_trait_sloped_side_armor }
+		
+		equipment_bonus = {
+			armor_value = 0.1
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_crew_survival_layout
+		name = generic_mio_trait_mbt_crew_survival_layout
+		icon = GFX_generic_mio_trait_icon_defense		
+
+		position = { x=1 y=0 }
+		relative_position_id = generic_mio_trait_spaced_armor
+
+		all_parents = { generic_mio_trait_armor_steel_working }
+
+
+		limit_to_equipment_type = { modern_tank_chassis }
+
+		mutually_exclusive = { generic_mio_trait_spaced_armor generic_mio_trait_sloped_side_armor }
+		
+		equipment_bonus = {
+			defense = 0.1
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_sloped_side_armor
+		name = generic_mio_trait_mbt_sloped_side_armor
+		icon = GFX_generic_mio_trait_icon_breakthrough
+
+		position = { x=2 y=0 }
+		relative_position_id = generic_mio_trait_spaced_armor
+
+		all_parents = { generic_mio_trait_armor_steel_working }
+
+		mutually_exclusive = { generic_mio_trait_spaced_armor generic_mio_trait_crew_survival_layout }
+		
+		limit_to_equipment_type = { modern_tank_chassis }
+
+		equipment_bonus = {
+			breakthrough = 0.1
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_truck_engines
+		name = generic_mio_trait_mbt_truck_engines
+		icon = GFX_generic_mio_trait_icon_reliability
+
+		position = { x=2 y=0 }
+		relative_position_id = generic_mio_trait_armor_steel_working
+
+		mutually_exclusive = { generic_mio_trait_aircraft_engines }
+		
+		equipment_bonus = {
+			reliability = 0.075
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_aircraft_engines
+		name = generic_mio_trait_mbt_aircraft_engines
+		icon = GFX_generic_mio_trait_icon_maximum_speed
+
+		position = { x=2 y=0 }
+		relative_position_id = generic_mio_trait_truck_engines
+
+		mutually_exclusive = { generic_mio_trait_truck_engines }
+		
+		equipment_bonus = {
+			maximum_speed = 0.075
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_improved_suspension
+		name = generic_mio_trait_mbt_improved_suspension
+		icon = GFX_generic_mio_trait_icon_reliability
+
+		position = { x=1 y=1 }
+		relative_position_id = generic_mio_trait_truck_engines
+
+		any_parent = { generic_mio_trait_truck_engines generic_mio_trait_aircraft_engines }
+
+		equipment_bonus = {
+			reliability = 0.05
+		}
+	}
+}
+
+
+# HEAVY TANK DESIGNER - Based on KV (SOV)
+generic_heavy_tank_organization = {
+	icon = GFX_idea_generic_tank_manufacturer_3
+
+	allowed = {
+		always = no # Archetype only - countries using it have their own verisons
+	}
+
+	equipment_type = { mio_cat_eq_all_heavy_tank }
+	research_categories = { mio_cat_tech_heavy_armor_and_modules }
+
+	tree_header_text = {
+		text = mio_header_engine_and_drive_system
+		x = 1
+	}
+
+	tree_header_text = {
+		text = mio_header_chassis
+		x = 5
+	}
+
+	tree_header_text = {
+		text = mio_header_guns_and_turret
+		x = 8
+	}
+
+
+	initial_trait = {
+		name = generic_mio_initial_trait_heavy_tank_designer
+
+		organization_modifier = {
+			military_industrial_organization_research_bonus = 0.05
+		}
+		
+		equipment_bonus = {
+			armor_value = 0.05
+			reliability = -0.1
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_wide_tracks
+		name = generic_mio_trait_wide_tracks
+		icon = GFX_generic_mio_trait_icon_reliability
+
+		position = { x=1 y=0 }
+		
+		equipment_bonus = {
+			reliability = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_fire_extinguishers
+		name = generic_mio_trait_fire_extinguishers
+		icon = GFX_generic_mio_department_icon_tank_heavy_tank_quality
+
+		position = { x=0 y=4 }
+		relative_position_id = generic_mio_trait_wide_tracks
+
+		all_parents = { generic_mio_trait_wide_tracks }
+		
+		equipment_bonus = {
+			reliability = 0.05
+			breakthrough = 0.02
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_one_piece_hull_side_coverings
+		name = generic_mio_trait_one_piece_hull_side_coverings
+		icon = GFX_generic_mio_department_icon_tank_heavy_tank_technology
+
+		position = { x=4 y=0 }
+		relative_position_id = generic_mio_trait_wide_tracks
+		
+		production_bonus = {
+			production_efficiency_cap_factor = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_simplified_transmission_system
+		name = generic_mio_trait_simplified_transmission_system
+		icon = GFX_generic_mio_department_icon_tank_heavy_tank_line_efficiency
+
+		position = { x=2 y=2 }
+		relative_position_id = generic_mio_trait_wide_tracks
+
+		all_parents = { generic_mio_trait_wide_tracks generic_mio_trait_one_piece_hull_side_coverings }
+		
+		production_bonus = {
+			production_efficiency_cap_factor = 0.05
+			production_efficiency_gain_factor = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_improved_engine_output
+		name = generic_mio_trait_improved_engine_output
+		icon = GFX_generic_mio_trait_icon_maximum_speed
+
+		position = { x=0 y=2 }
+		relative_position_id = generic_mio_trait_simplified_transmission_system
+
+		all_parents = { generic_mio_trait_simplified_transmission_system }
+		
+		equipment_bonus = {
+			maximum_speed = 0.05
+			fuel_consumption = -0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_sloping_armor
+		name = generic_mio_trait_sloping_armor
+		icon = GFX_generic_mio_department_icon_tank_general_armor
+
+		position = { x=0 y=2 }
+		relative_position_id = generic_mio_trait_one_piece_hull_side_coverings
+
+		all_parents = { generic_mio_trait_one_piece_hull_side_coverings }
+		
+		equipment_bonus = {
+			armor_value = 0.05
+			defense = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_improved_crew_ergonomics
+		name = generic_mio_trait_improved_crew_ergonomics
+		icon = GFX_generic_mio_trait_icon_breakthrough
+
+		position = { x=-1 y=2 }
+		relative_position_id = generic_mio_trait_sloping_armor
+
+		all_parents = { generic_mio_trait_sloping_armor }
+
+		mutually_exclusive = { generic_mio_trait_reinforced_construction }
+		
+		equipment_bonus = {
+			breakthrough = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_reinforced_construction
+		name = generic_mio_trait_reinforced_construction
+		icon = GFX_generic_mio_trait_icon_armor_value
+
+		position = { x=1 y=2 }
+		relative_position_id = generic_mio_trait_sloping_armor
+
+		all_parents = { generic_mio_trait_sloping_armor }
+
+		mutually_exclusive = { generic_mio_trait_improved_crew_ergonomics }
+		
+		equipment_bonus = {
+			armor_value = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_fully_cast_turret
+		name = generic_mio_trait_fully_cast_turret
+		icon = GFX_generic_mio_department_icon_tank_general_armor
+
+		position = { x=3 y=0 }
+		relative_position_id = generic_mio_trait_one_piece_hull_side_coverings
+		
+		equipment_bonus = {
+			armor_value = 0.05
+			defense = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_commander_cupola
+		name = generic_mio_trait_commander_cupola
+		icon = GFX_generic_mio_department_icon_tank_general_armor
+
+		position = { x=-1 y=2 }
+		relative_position_id = generic_mio_trait_fully_cast_turret
+
+		all_parents = { generic_mio_trait_fully_cast_turret }
+
+		mutually_exclusive = { generic_mio_trait_simplified_layout }
+		
+		equipment_bonus = {
+			armor_value = 0.05
+			defense = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_simplified_layout
+		name = generic_mio_trait_simplified_layout
+		icon = GFX_generic_mio_department_icon_tank_heavy_tank_line_efficiency
+
+		position = { x=1 y=2 }
+		relative_position_id = generic_mio_trait_fully_cast_turret
+
+		all_parents = { generic_mio_trait_fully_cast_turret }
+
+		mutually_exclusive = { generic_mio_trait_commander_cupola }
+		
+		production_bonus = {
+			production_efficiency_gain_factor = 0.05
+			production_resource_penalty_factor = -0.1
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_high_explosive_shells
+		name = generic_mio_trait_high_explosive_shells
+		icon = GFX_generic_mio_department_icon_tank_general_weapons
+
+		position = { x=0 y=2 }
+		relative_position_id = generic_mio_trait_commander_cupola
+
+		any_parent = { generic_mio_trait_commander_cupola generic_mio_trait_simplified_layout }
+
+		mutually_exclusive = { generic_mio_trait_apcr_hvap_shells }
+		
+		equipment_bonus = {
+			soft_attack = 0.05
+			hard_attack = 0.03
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_apcr_hvap_shells
+		name = generic_mio_trait_apcr_hvap_shells
+		icon = GFX_generic_mio_trait_icon_ap_attack
+
+		position = { x=0 y=2 }
+		relative_position_id = generic_mio_trait_simplified_layout
+
+		any_parent = { generic_mio_trait_commander_cupola generic_mio_trait_simplified_layout }
+
+		mutually_exclusive = { generic_mio_trait_high_explosive_shells }
+		
+		equipment_bonus = {
+			ap_attack = 0.05
+			hard_attack = 0.05
+		}
+	}
+}
+
+# SUPER HEAVY TANK DESIGNER - Based on KV (SOV)
+generic_super_heavy_tank_organization = {
+	icon = GFX_idea_generic_tank_manufacturer_3
+
+	allowed = {
+		always = no # Archetype only - countries using it have their own verisons
+	}
+
+	equipment_type = { mio_cat_eq_all_super_heavy_tank }
+	research_categories = { mio_cat_tech_heavy_armor_and_modules }
+
+	tree_header_text = {
+		text = mio_header_engine_and_drive_system
+		x = 1
+	}
+
+	tree_header_text = {
+		text = mio_header_chassis
+		x = 5
+	}
+
+	tree_header_text = {
+		text = mio_header_guns_and_turret
+		x = 8
+	}
+
+
+	initial_trait = {
+		name = generic_mio_initial_trait_super_heavy_tank_designer
+
+		organization_modifier = {
+			military_industrial_organization_research_bonus = 0.05
+		}
+		
+		equipment_bonus = {
+			armor_value = 0.05
+			breakthrough = 0.05
+			reliability = -0.1
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_sht_double_tracks
+		name = generic_mio_trait_sht_double_tracks
+		icon = GFX_generic_mio_trait_icon_reliability
+
+		position = { x=1 y=0 }
+		
+		equipment_bonus = {
+			reliability = 0.1
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_fire_extinguishers
+		name = generic_mio_trait_fire_extinguishers
+		icon = GFX_generic_mio_department_icon_tank_heavy_tank_quality
+
+		position = { x=0 y=4 }
+		relative_position_id = generic_mio_trait_sht_double_tracks
+
+		all_parents = { generic_mio_trait_sht_double_tracks }
+		
+		equipment_bonus = {
+			reliability = 0.05
+			breakthrough = 0.02
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_one_piece_hull_side_coverings
+		name = generic_mio_trait_sht_one_piece_hull_side_coverings
+		icon = GFX_generic_mio_department_icon_tank_heavy_tank_technology
+
+		position = { x=4 y=0 }
+		relative_position_id = generic_mio_trait_sht_double_tracks
+		
+		production_bonus = {
+			production_efficiency_cap_factor = 0.075
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_simplified_transmission_system
+		name = generic_mio_trait_sht_simplified_transmission_system
+		icon = GFX_generic_mio_department_icon_tank_heavy_tank_line_efficiency
+
+		position = { x=2 y=2 }
+		relative_position_id = generic_mio_trait_sht_double_tracks
+
+		limit_to_equipment_type = { super_heavy_tank_chassis }
+
+		all_parents = { generic_mio_trait_sht_double_tracks generic_mio_trait_one_piece_hull_side_coverings }
+		
+		production_bonus = {
+			production_efficiency_cap_factor = 0.075
+			production_efficiency_gain_factor = 0.075
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_improved_engine_output
+		name = generic_mio_trait_sht_improved_engine_output
+		icon = GFX_generic_mio_trait_icon_maximum_speed
+
+		position = { x=0 y=2 }
+		relative_position_id = generic_mio_trait_simplified_transmission_system
+
+		all_parents = { generic_mio_trait_simplified_transmission_system }
+
+		limit_to_equipment_type = { super_heavy_tank_chassis }
+		
+		equipment_bonus = {
+			maximum_speed = 0.1
+			fuel_consumption = -0.1
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_sloping_armor
+		name = generic_mio_trait_sht_sloping_armor
+		icon = GFX_generic_mio_department_icon_tank_general_armor
+
+		position = { x=0 y=2 }
+		relative_position_id = generic_mio_trait_one_piece_hull_side_coverings
+
+		all_parents = { generic_mio_trait_one_piece_hull_side_coverings }
+		
+		equipment_bonus = {
+			armor_value = 0.075
+			defense = 0.075
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_improved_crew_ergonomics
+		name = generic_mio_trait_sht_improved_crew_ergonomics
+		icon = GFX_generic_mio_trait_icon_breakthrough
+
+		position = { x=-1 y=2 }
+		relative_position_id = generic_mio_trait_sloping_armor
+
+		all_parents = { generic_mio_trait_sloping_armor }
+
+		mutually_exclusive = { generic_mio_trait_reinforced_construction }
+		
+		equipment_bonus = {
+			breakthrough = 0.1
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_reinforced_construction
+		name = generic_mio_trait_sht_reinforced_construction
+		icon = GFX_generic_mio_trait_icon_armor_value
+
+		position = { x=1 y=2 }
+		relative_position_id = generic_mio_trait_sloping_armor
+
+		all_parents = { generic_mio_trait_sloping_armor }
+
+		mutually_exclusive = { generic_mio_trait_improved_crew_ergonomics }
+		
+		equipment_bonus = {
+			armor_value = 0.1
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_fully_cast_turret
+		name = generic_mio_trait_sht_fully_cast_turret
+		icon = GFX_generic_mio_department_icon_tank_general_armor
+
+		position = { x=3 y=0 }
+		relative_position_id = generic_mio_trait_one_piece_hull_side_coverings
+		
+		equipment_bonus = {
+			armor_value = 0.05
+			defense = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_commander_cupola
+		name = generic_mio_trait_sht_commander_cupola
+		icon = GFX_generic_mio_department_icon_tank_general_armor
+
+		position = { x=-1 y=2 }
+		relative_position_id = generic_mio_trait_fully_cast_turret
+
+		all_parents = { generic_mio_trait_fully_cast_turret }
+
+		mutually_exclusive = { generic_mio_trait_simplified_layout }
+		
+		equipment_bonus = {
+			armor_value = 0.075
+			defense = 0.075
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_simplified_layout
+		name = generic_mio_trait_sht_simplified_layout
+		icon = GFX_generic_mio_department_icon_tank_heavy_tank_line_efficiency
+
+		position = { x=1 y=2 }
+		relative_position_id = generic_mio_trait_fully_cast_turret
+
+		all_parents = { generic_mio_trait_fully_cast_turret }
+
+		mutually_exclusive = { generic_mio_trait_commander_cupola }
+		
+		production_bonus = {
+			production_efficiency_gain_factor = 0.075
+			production_resource_penalty_factor = -0.15
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_high_explosive_shells
+		name = generic_mio_trait_sht_high_explosive_shells
+		icon = GFX_generic_mio_department_icon_tank_general_weapons
+
+		position = { x=0 y=2 }
+		relative_position_id = generic_mio_trait_commander_cupola
+
+		any_parent = { generic_mio_trait_commander_cupola generic_mio_trait_simplified_layout }
+
+		limit_to_equipment_type = { super_heavy_tank_chassis }
+
+		mutually_exclusive = { generic_mio_trait_apcr_hvap_shells }
+		
+		equipment_bonus = {
+			soft_attack = 0.1
+			defense = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_apcr_hvap_shells
+		name = generic_mio_trait_sht_apcr_hvap_shells
+		icon = GFX_generic_mio_trait_icon_ap_attack
+
+		position = { x=0 y=2 }
+		relative_position_id = generic_mio_trait_simplified_layout
+
+		any_parent = { generic_mio_trait_commander_cupola generic_mio_trait_simplified_layout }
+
+		limit_to_equipment_type = { super_heavy_tank_chassis }
+
+		mutually_exclusive = { generic_mio_trait_high_explosive_shells }
+		
+		equipment_bonus = {
+			armor_value = 0.05
+			hard_attack = 0.075
+			ap_attack = 0.075
+		}
+	}
+}
+
+
+### TANK REFURBISHMENT PLANT - Based on Mytishchi
+generic_tank_refurbishment_plant_organization = {
+	icon = GFX_idea_generic_tank_manufacturer_3
+
+	allowed = {
+		always = no # Archetype only - countries using it have their own verisons
+	}
+
+	equipment_type = {
+		armor
+		support_equipment
+		train_equipment
+		railway_gun_equipment
+	}
+
+	research_categories = {
+		mio_cat_tech_all_armor_and_modules
+		support_tech
+		train_tech
+	}
+
+	tree_header_text = {
+		text = mio_header_armor
+		x = 1
+	}
+
+	tree_header_text = {
+		text = mio_header_weapons
+		x = 5
+	}
+
+	tree_header_text = {
+		text = mio_header_trains
+		x = 8
+	}
+
+	initial_trait = {
+		token = generic_mio_initial_trait_tank_refurbishment_plant
+		name = generic_mio_initial_trait_tank_refurbishment_plant
+
+		limit_to_equipment_type = { armor }
+
+		organization_modifier = {
+			military_industrial_organization_research_bonus = 0.05
+		}
+
+		production_bonus = {
+			production_conversion_speed_factor = 0.15
+			production_cost_factor = -0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_enemy_tank_refitting
+		name = generic_mio_trait_enemy_tank_refitting
+		icon = GFX_generic_mio_department_icon_tank_general_conversion
+
+		position = { x=1 y=0 }
+
+		limit_to_equipment_type = { armor }
+
+		production_bonus = {
+			production_conversion_speed_factor = 0.15
+			production_cost_factor = -0.03
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_efficient_scrap_recycling
+		name = generic_mio_trait_efficient_scrap_recycling
+		icon = GFX_generic_mio_trait_icon_hardness
+		
+		position = { x=-1 y=1 }
+		relative_position_id = generic_mio_trait_enemy_tank_refitting
+
+		any_parent = { generic_mio_trait_enemy_tank_refitting }
+
+		limit_to_equipment_type = { armor }
+
+		equipment_bonus = {
+			hardness = -0.06
+		}
+
+		production_bonus = {
+			production_resource_need_factor = -0.2
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_high_volume_smelter
+		name = generic_mio_trait_high_volume_smelter
+		icon = GFX_generic_mio_department_icon_tank_general_production
+		
+		position = { x=0 y=1 }
+		relative_position_id = generic_mio_trait_efficient_scrap_recycling
+
+		any_parent = { generic_mio_trait_efficient_scrap_recycling }
+
+		limit_to_equipment_type = { armor }
+
+		production_bonus = {
+			production_capacity_factor = 0.06
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_high_powered_engine_production
+		name = generic_mio_trait_high_powered_engine_production
+		icon = GFX_generic_mio_trait_icon_maximum_speed
+
+		position = { x=1 y=2 }
+		relative_position_id = generic_mio_trait_enemy_tank_refitting
+
+		any_parent = { generic_mio_trait_enemy_tank_refitting }
+
+		limit_to_equipment_type = { armor }
+
+		equipment_bonus = {
+			maximum_speed = 0.1
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_heavy_duty_machine_tools
+		name = generic_mio_trait_heavy_duty_machine_tools
+		icon = GFX_generic_mio_department_icon_tank_general_production
+
+		position = { x=1 y=1 }
+		relative_position_id = generic_mio_trait_high_volume_smelter
+
+		all_parents = { generic_mio_trait_high_powered_engine_production generic_mio_trait_high_volume_smelter }
+
+		limit_to_equipment_type = { armor }
+
+		equipment_bonus = {
+			maximum_speed = 0.1
+		}
+
+		production_bonus = {
+			production_efficiency_gain_factor = 0.05
+			production_efficiency_cap_factor = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_multi_plant_cooperation
+		name = generic_mio_trait_multi_plant_cooperation
+		icon = GFX_generic_mio_department_icon_tank_general_line_efficiency
+
+		position = { x=0 y=1 }
+		relative_position_id = generic_mio_trait_heavy_duty_machine_tools
+
+		any_parent = { generic_mio_trait_heavy_duty_machine_tools }
+
+		limit_to_equipment_type = { armor }
+
+		production_bonus = {
+			production_efficiency_gain_factor = 0.08
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_standardized_secondary_armament
+		name = generic_mio_trait_standardized_secondary_armament
+		icon = GFX_generic_mio_trait_icon_breakthrough
+
+		position = { x=3 y=0 }
+		relative_position_id = generic_mio_trait_enemy_tank_refitting
+
+		limit_to_equipment_type = { armor }
+
+		equipment_bonus = {
+			breakthrough = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_mass_small_arms_ammunition_production
+		name = generic_mio_trait_mass_small_arms_ammunition_production
+		icon = GFX_generic_mio_trait_icon_build_cost_ic
+
+		position = { x=0 y=2 }
+		relative_position_id = generic_mio_trait_standardized_secondary_armament
+
+		any_parent = { generic_mio_trait_standardized_secondary_armament }
+
+		limit_to_equipment_type = { armor support_equipment }
+		
+		production_bonus = {
+			production_cost_factor = -0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_plant_tech_exchange
+		name = generic_mio_trait_plant_tech_exchange
+		icon = GFX_generic_mio_department_icon_facilities
+		
+		position = { x=2 y=0 }
+		relative_position_id = generic_mio_trait_standardized_secondary_armament
+
+		organization_modifier = {
+			military_industrial_organization_research_bonus = 0.06
+		}
+	}
+
+
+	trait = {
+		token = generic_mio_trait_24h_rotation_shifts
+		name = generic_mio_trait_24h_rotation_shifts
+		icon = GFX_generic_mio_trait_icon_production_capacity
+
+		position = { x=0 y=2 }
+		relative_position_id = generic_mio_trait_plant_tech_exchange
+	
+		any_parent = { generic_mio_trait_plant_tech_exchange }
+
+		production_bonus = {
+			production_capacity_factor = 0.06
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_dual_plant_main_armament_production
+		name = generic_mio_trait_dual_plant_main_armament_production
+		icon = GFX_generic_mio_trait_icon_soft_attack
+
+		position = { x=1 y=2 }
+		relative_position_id = generic_mio_trait_mass_small_arms_ammunition_production
+
+		all_parents = { generic_mio_trait_mass_small_arms_ammunition_production generic_mio_trait_24h_rotation_shifts }
+		
+		limit_to_equipment_type = { armor }
+
+		equipment_bonus = {
+			soft_attack = 0.05
+			reliability = -0.05
+		}
+		
+		production_bonus = {
+			production_efficiency_gain_factor = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_long_distance_escort
+		name = generic_mio_trait_long_distance_escort
+		icon = GFX_generic_mio_trait_icon_anti_air_attack
+		
+		position = { x=2 y=0 }
+		relative_position_id = generic_mio_trait_plant_tech_exchange
+
+		limit_to_equipment_type = { train_equipment }
+
+		equipment_bonus = {
+			armor_value = 0.06
+			air_attack = 0.1
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_barrels_of_hell
+		name = generic_mio_trait_barrels_of_hell
+		icon = GFX_generic_mio_trait_icon_production_capacity
+		
+		position = { x=0 y=4 }
+		relative_position_id = generic_mio_trait_long_distance_escort
+
+		limit_to_equipment_type = { railway_gun_equipment }
+
+		all_parents = { generic_mio_trait_24h_rotation_shifts generic_mio_trait_long_distance_escort }
+		production_bonus = {
+			production_capacity_factor = 0.1
+		}
+	}
+}
+
+
+
+
+ ######  ##     ## #### ########   ######  
+##    ## ##     ##  ##  ##     ## ##    ## 
+##       ##     ##  ##  ##     ## ##       
+ ######  #########  ##  ########   ######  
+      ## ##     ##  ##  ##              ## 
+##    ## ##     ##  ##  ##        ##    ## 
+ ######  ##     ## #### ##         ######  
+
+
+
+# GENERIC TANK MANUFACTURERS
+
+#TASK FORCE MANUFACTURER - Based on Harland & Wolff (ENG)
+generic_task_force_ship_organization = {
+	icon = GFX_idea_generic_naval_manufacturer_1
+
+	allowed = {
+		always = no # Archetype only - countries using it have their own verisons
+	}
+
+	equipment_type = {
+		mio_cat_eq_all_carrier
+		mio_cat_eq_all_cruiser
+		mio_cat_eq_all_destroyer
+	}
+	research_categories = {
+		mio_cat_tech_all_carrier_and_modules
+		mio_cat_tech_all_cruiser_and_modules
+		mio_cat_tech_all_destroyer_and_modules
+	}
+
+	
+
+	tree_header_text = {
+		text = mio_header_systems
+		x = 1
+	}
+
+	tree_header_text = {
+		text = mio_header_weapons
+		x = 5
+	}
+
+	
+	initial_trait = {
+		name = generic_mio_initial_trait_task_force_ship_builders
+
+		organization_modifier = {
+			military_industrial_organization_research_bonus = 0.05
+		}
+		equipment_bonus = {
+			max_strength = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_long_range_cruising
+		name = generic_mio_trait_long_range_cruising
+		icon = GFX_generic_mio_trait_icon_naval_range
+
+		position = { x=0 y=0 }
+		
+		mutually_exclusive = { generic_mio_trait_high_speed_cruising }
+
+		equipment_bonus = {
+			naval_range = 0.05
+			fuel_consumption = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_high_speed_cruising
+		name = generic_mio_trait_high_speed_cruising
+		icon = GFX_generic_mio_trait_icon_maximum_speed
+
+		position = { x=2 y=0 }
+		relative_position_id = generic_mio_trait_long_range_cruising
+		
+		mutually_exclusive = { generic_mio_trait_long_range_cruising }
+		
+		equipment_bonus = {
+			naval_speed = 0.05
+			fuel_consumption = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_splinter_protection
+		name = generic_mio_trait_splinter_protection
+		icon = GFX_generic_mio_trait_icon_armor_value
+
+		position = { x=1 y=2 }
+		relative_position_id = generic_mio_trait_long_range_cruising
+		
+		any_parent = { generic_mio_trait_long_range_cruising generic_mio_trait_high_speed_cruising }
+
+		limit_to_equipment_type = { mio_cat_eq_all_carrier mio_cat_eq_all_cruiser }
+
+		equipment_bonus = {
+			armor_value = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_transom_stern
+		name = generic_mio_trait_transom_stern
+		icon = GFX_generic_mio_trait_icon_maximum_speed
+
+		position = { x=-1 y=2 }
+		relative_position_id = generic_mio_trait_splinter_protection
+		
+		any_parent = { generic_mio_trait_splinter_protection }
+
+		mutually_exclusive = { generic_mio_trait_underway_replenishment_equipment }
+
+		equipment_bonus = {
+			naval_speed = 0.05
+			fuel_consumption = -0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_underway_replenishment_equipment
+		name = generic_mio_trait_underway_replenishment_equipment
+		icon = GFX_generic_mio_trait_icon_fuel_consumption
+
+		position = { x=1 y=2 }
+		relative_position_id = generic_mio_trait_splinter_protection
+		
+		any_parent = { generic_mio_trait_splinter_protection }
+
+		mutually_exclusive = { generic_mio_trait_transom_stern }
+
+		equipment_bonus = {
+			naval_range = 0.05
+			fuel_consumption = -0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_secondary_fire_director_control
+		name = generic_mio_trait_secondary_fire_director_control
+		icon = GFX_generic_mio_trait_icon_anti_air_attack
+
+		position = { x=5 y=0 }
+		relative_position_id = generic_mio_trait_long_range_cruising
+		
+		limit_to_equipment_type = { screen_ship carrier }
+
+		equipment_bonus = {
+			anti_air_attack = 0.05
+			naval_light_gun_hit_chance_factor = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_flight_deck_edge_aa_mounts
+		name = generic_mio_trait_flight_deck_edge_aa_mounts
+		icon = GFX_generic_mio_department_icon_ship_carrier_offense
+
+		position = { x=-1 y=1 }
+		relative_position_id = generic_mio_trait_secondary_fire_director_control
+		
+		any_parent = { generic_mio_trait_secondary_fire_director_control }
+
+		limit_to_equipment_type = { mio_cat_eq_all_carrier }
+
+		equipment_bonus = {
+			anti_air_attack = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_gyro_stabilized_mounts
+		name = generic_mio_trait_gyro_stabilized_mounts
+		icon = GFX_generic_mio_trait_icon_lg_attack
+
+		position = { x=0 y=1 }
+		relative_position_id = generic_mio_trait_flight_deck_edge_aa_mounts
+		
+		any_parent = { generic_mio_trait_flight_deck_edge_aa_mounts }
+		
+		equipment_bonus = {
+			anti_air_attack = 0.05
+			lg_attack = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_rapid_fire_guns
+		name = generic_mio_trait_rapid_fire_guns
+		icon = GFX_generic_mio_department_icon_ship_general_offense
+
+		position = { x=1 y=1 }
+		relative_position_id = generic_mio_trait_secondary_fire_director_control
+		
+		any_parent = { generic_mio_trait_secondary_fire_director_control }
+
+		mutually_exclusive = { generic_mio_trait_high_velocity_guns }
+
+		equipment_bonus = {
+			anti_air_attack = 0.05
+			lg_attack = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_advanced_fitting_works
+		name = generic_mio_trait_advanced_fitting_works
+		icon = GFX_generic_mio_department_icon_ship_general_production
+
+		position = { x=0 y=1 }
+		relative_position_id = generic_mio_trait_rapid_fire_guns
+		
+		any_parent = { generic_mio_trait_rapid_fire_guns generic_mio_trait_high_velocity_guns }
+		
+		production_bonus = {
+			production_capacity_factor = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_carrier_flight_operations_center
+		name = generic_mio_trait_carrier_flight_operations_center
+		icon = GFX_generic_mio_trait_icon_max_strength
+
+		position = { x=1 y=2 } #MM: This one could be moved up (4th row) so that it is visually clear which traits are the parents
+		relative_position_id = generic_mio_trait_gyro_stabilized_mounts
+		
+		all_parents = { generic_mio_trait_gyro_stabilized_mounts generic_mio_trait_advanced_fitting_works generic_mio_trait_splinter_protection }
+		
+		equipment_bonus = {
+			max_strength = 0.1
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_primary_fire_director_control
+		name = generic_mio_trait_primary_fire_director_control
+		icon = GFX_generic_mio_trait_icon_hg_attack
+
+		position = { x=3 y=0 }
+		relative_position_id = generic_mio_trait_secondary_fire_director_control
+		
+		limit_to_equipment_type = { mio_cat_eq_all_cruiser }
+
+		equipment_bonus = {
+			hg_attack = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_high_velocity_guns
+		name = generic_mio_trait_high_velocity_guns
+		icon = GFX_generic_mio_trait_icon_ap_attack
+
+		position = { x=0 y=1 }
+		relative_position_id = generic_mio_trait_primary_fire_director_control
+		
+		any_parent = { generic_mio_trait_primary_fire_director_control }
+
+		mutually_exclusive = { generic_mio_trait_rapid_fire_guns }
+
+		limit_to_equipment_type = { mio_cat_eq_all_cruiser }
+
+		equipment_bonus = {
+			hg_armor_piercing = 0.05
+		}
+	}
+}
+
+
+#BATTLE LINE SHIP MANUFACTURER - Based on Cammell Laird (ENG)
+generic_battle_line_ship_organization = {
+	icon = GFX_idea_generic_naval_manufacturer_2
+
+	allowed = {
+		always = no # Archetype only - countries using it have their own verisons
+	}
+
+	equipment_type = {
+		mio_cat_eq_all_battleship
+		mio_cat_eq_all_cruiser
+	}
+	research_categories = {
+		mio_cat_tech_all_capital_ship_and_modules
+		mio_cat_tech_all_cruiser_and_modules
+	}
+
+	tree_header_text = {
+		text = mio_header_systems
+		x = 1
+	}
+
+	tree_header_text = {
+		text = mio_header_weapons
+		x = 5
+	}
+
+	initial_trait = {
+		name = generic_mio_initial_trait_battle_line_ship_builders
+
+		organization_modifier = {
+			military_industrial_organization_research_bonus = 0.05
+		}
+		production_bonus = {
+			production_capacity_factor = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_external_armor_belt
+		name = generic_mio_trait_external_armor_belt
+		icon = GFX_generic_mio_trait_icon_armor_value
+
+		position = { x=0 y=0 }
+
+		mutually_exclusive = { generic_mio_trait_internal_armor_belt }
+
+		equipment_bonus = {
+			armor_value = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_internal_armor_belt
+		name = generic_mio_trait_internal_armor_belt
+		icon = GFX_generic_mio_department_icon_ship_capital_ship_armor
+
+		position = { x=2 y=0 }
+		relative_position_id = generic_mio_trait_external_armor_belt
+
+		mutually_exclusive = { generic_mio_trait_external_armor_belt }
+
+		equipment_bonus = {
+			armor_value = 0.15
+			build_cost_ic = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_hardened_critical_components
+		name = generic_mio_trait_hardened_critical_components
+		icon = GFX_generic_mio_trait_icon_naval_torpedo_damage_reduction_factor
+
+		position = { x=1 y=2 }
+		relative_position_id = generic_mio_trait_external_armor_belt
+
+		any_parent = { generic_mio_trait_internal_armor_belt generic_mio_trait_external_armor_belt }
+
+		equipment_bonus = {
+			naval_torpedo_enemy_critical_chance_factor = -0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_advanced_hydrodynamic_design
+		name = generic_mio_trait_advanced_hydrodynamic_design
+		icon = GFX_generic_mio_trait_icon_maximum_speed
+
+		position = { x=-1 y=2 }
+		relative_position_id = generic_mio_trait_hardened_critical_components
+
+		any_parent = { generic_mio_trait_hardened_critical_components }
+
+		mutually_exclusive = { generic_mio_trait_advanced_armor_design }
+
+		equipment_bonus = {
+			naval_speed = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_advanced_armor_design
+		name = generic_mio_trait_advanced_armor_design
+		icon = GFX_generic_mio_trait_icon_armor_value
+
+		position = { x=1 y=2 }
+		relative_position_id = generic_mio_trait_hardened_critical_components
+
+		any_parent = { generic_mio_trait_hardened_critical_components }
+
+		mutually_exclusive = { generic_mio_trait_advanced_hydrodynamic_design }
+
+		equipment_bonus = {
+			armor_value = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_anti_air_layout
+		name = generic_mio_trait_anti_air_layout
+		icon = GFX_generic_mio_trait_icon_anti_air_attack
+
+		position = { x=4 y=0 }
+		relative_position_id = generic_mio_trait_external_armor_belt
+
+		equipment_bonus = {
+			anti_air_attack = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_secondary_battery_layout
+		name = generic_mio_trait_secondary_battery_layout
+		icon = GFX_generic_mio_trait_icon_lg_attack
+
+		position = { x=2 y=0 }
+		relative_position_id = generic_mio_trait_anti_air_layout
+
+		equipment_bonus = {
+			lg_attack = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_gyro_stabilized_mounts
+		name = generic_mio_trait_gyro_stabilized_mounts
+		icon = GFX_generic_mio_department_icon_ship_capital_ship_offense
+
+		position = { x=1 y=1 }
+		relative_position_id = generic_mio_trait_anti_air_layout
+
+		all_parents = { generic_mio_trait_anti_air_layout generic_mio_trait_secondary_battery_layout }
+
+		equipment_bonus = {
+			anti_air_attack = 0.05
+			lg_attack = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_secondary_fire_director_control
+		name = generic_mio_trait_secondary_fire_director_control
+		icon = GFX_generic_mio_department_icon_ship_capital_ship_offense
+
+		position = { x=0 y=1 }
+		relative_position_id = generic_mio_trait_gyro_stabilized_mounts
+
+		any_parent = { generic_mio_trait_gyro_stabilized_mounts }
+
+		equipment_bonus = {
+			anti_air_attack = 0.05
+			naval_light_gun_hit_chance_factor = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_combat_information_center
+		name = generic_mio_trait_combat_information_center
+		icon = GFX_generic_mio_trait_icon_max_strength
+
+		position = { x=0 y=2 }
+		relative_position_id = generic_mio_trait_secondary_fire_director_control
+
+		all_parents = { generic_mio_trait_hardened_critical_components generic_mio_trait_secondary_fire_director_control }
+		any_parent =  { generic_mio_trait_super_heavy_shells generic_mio_trait_semi_armor_piercing_shells generic_mio_trait_high_velocity_guns }
+
+		equipment_bonus = {
+			max_strength = 0.1
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_primary_battery_layout
+		name = generic_mio_trait_primary_battery_layout
+		icon = GFX_generic_mio_trait_icon_hg_attack
+
+		position = { x=2 y=0 }
+		relative_position_id = generic_mio_trait_secondary_battery_layout
+
+		limit_to_equipment_type = { capital_ship }
+
+		equipment_bonus = {
+			hg_attack = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_super_heavy_shells
+		name = generic_mio_trait_super_heavy_shells
+		icon = GFX_generic_mio_trait_icon_hg_attack
+
+		position = { x=-1 y=2 }
+		relative_position_id = generic_mio_trait_primary_battery_layout
+
+		any_parent = { generic_mio_trait_primary_battery_layout }
+
+		mutually_exclusive = { generic_mio_trait_semi_armor_piercing_shells generic_mio_trait_high_velocity_guns }
+
+		equipment_bonus = {
+			hg_attack = 0.05
+			hg_armor_piercing = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_semi_armor_piercing_shells
+		name = generic_mio_trait_semi_armor_piercing_shells
+		icon = GFX_generic_mio_trait_icon_lg_attack
+
+		position = { x=1 y=0 }
+		relative_position_id = generic_mio_trait_super_heavy_shells
+
+		any_parent = { generic_mio_trait_primary_battery_layout }
+
+		mutually_exclusive = { generic_mio_trait_super_heavy_shells generic_mio_trait_high_velocity_guns }
+
+		equipment_bonus = {
+			lg_attack = 0.05
+			lg_armor_piercing = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_high_velocity_guns
+		name = generic_mio_trait_high_velocity_guns
+		icon = GFX_generic_mio_trait_icon_ap_attack
+
+		position = { x=2 y=0 }
+		relative_position_id = generic_mio_trait_super_heavy_shells
+
+		any_parent = { generic_mio_trait_primary_battery_layout }
+
+		mutually_exclusive = { generic_mio_trait_super_heavy_shells generic_mio_trait_semi_armor_piercing_shells }
+
+		equipment_bonus = {
+			lg_armor_piercing = 0.1
+			hg_armor_piercing = 0.1
+			build_cost_ic = 0.05
+		}
+	}
+}
+
+
+#ESCORT FLEET MANUFACTURER - Based on Yarrow Shipbuilders (ENG)
+generic_escort_ship_organization = {
+	icon = GFX_idea_generic_naval_manufacturer_1
+
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		NOT = { has_custom_ship_mio = yes }
+	}
+
+	equipment_type = {
+		screen_ship
+	}
+	research_categories = {
+		mio_cat_tech_all_screen_ship_and_modules
+	}
+	
+	tree_header_text = {
+		text = mio_header_systems
+		x = 1
+	}
+
+	tree_header_text = {
+		text = mio_header_weapons
+		x = 5
+	}
+
+	initial_trait = {
+		name = generic_mio_initial_trait_escort_fleet
+
+		organization_modifier = {
+			military_industrial_organization_research_bonus = 0.05
+		}
+		production_bonus = {
+			production_capacity_factor = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_submarine_hunters
+		name = generic_mio_trait_submarine_hunters
+		icon = GFX_generic_mio_trait_icon_sub_attack
+
+		position = { x=1 y=0 }
+
+		equipment_bonus = {
+			sub_detection = 0.05
+			sub_attack = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_high_speed_mine_hunting_equipment
+		name = generic_mio_trait_high_speed_mine_hunting_equipment
+		icon = GFX_generic_mio_trait_icon_sub_visibility
+
+		position = { x=0 y=2 }
+		relative_position_id = generic_mio_trait_submarine_hunters
+
+		any_parent = { generic_mio_trait_submarine_hunters }
+
+		equipment_bonus = {
+			sub_detection = 0.05
+			mines_sweeping = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_advanced_hydrodynamic_design
+		name = generic_mio_trait_advanced_hydrodynamic_design
+		icon = GFX_generic_mio_trait_icon_maximum_speed
+
+		position = { x=0 y=2 }
+		relative_position_id = generic_mio_trait_high_speed_mine_hunting_equipment
+
+		any_parent = { generic_mio_trait_high_speed_mine_hunting_equipment }
+
+		equipment_bonus = {
+			naval_speed = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_fleet_escorts
+		name = generic_mio_trait_fleet_escorts
+		icon = GFX_generic_mio_department_icon_ship_screen_ship_offense
+
+		position = { x=5 y=0 }
+		relative_position_id = generic_mio_trait_submarine_hunters
+
+		equipment_bonus = {
+			anti_air_attack = 0.05
+			lg_attack = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_anti_air_ships
+		name = generic_mio_trait_anti_air_ships
+		icon = GFX_generic_mio_trait_icon_anti_air_attack
+
+		position = { x=-3 y=2 }
+		relative_position_id = generic_mio_trait_fleet_escorts
+
+		any_parent = { generic_mio_trait_fleet_escorts }
+
+		mutually_exclusive = { generic_mio_trait_escort_in_force }
+
+		equipment_bonus = {
+			anti_air_attack = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_escort_in_force
+		name = generic_mio_trait_escort_in_force
+		icon = GFX_generic_mio_trait_icon_lg_attack
+
+		position = { x=2 y=0 }
+		relative_position_id = generic_mio_trait_anti_air_ships
+
+		any_parent = { generic_mio_trait_fleet_escorts }
+
+		mutually_exclusive = { generic_mio_trait_anti_air_ships }
+
+		equipment_bonus = {
+			lg_attack = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_anti_air_layout
+		name = generic_mio_trait_anti_air_layout
+		icon = GFX_generic_mio_trait_icon_anti_air_attack
+
+		position = { x=2 y=0 }
+		relative_position_id = generic_mio_trait_escort_in_force
+
+		any_parent = { generic_mio_trait_fleet_escorts }
+
+		equipment_bonus = {
+			anti_air_attack = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_gyro_stabilized_mounts
+		name = generic_mio_trait_gyro_stabilized_mounts
+		icon = GFX_generic_mio_department_icon_ship_screen_ship_offense
+
+		position = { x=0 y=1 }
+		relative_position_id = generic_mio_trait_anti_air_layout
+
+		any_parent = { generic_mio_trait_anti_air_layout }
+
+		equipment_bonus = {
+			anti_air_attack = 0.05
+			lg_attack = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_improved_anti_air_gun_mounting
+		name = generic_mio_trait_improved_anti_air_gun_mounting
+		icon = GFX_generic_mio_trait_icon_anti_air_attack
+
+		position = { x=0 y=2 }
+		relative_position_id = generic_mio_trait_anti_air_ships
+
+		any_parent = { generic_mio_trait_anti_air_ships generic_mio_trait_escort_in_force }
+
+		equipment_bonus = {
+			anti_air_attack = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_mass_production
+		name = generic_mio_trait_mass_production
+		icon = GFX_generic_mio_department_icon_ship_screen_ship_production
+
+		position = { x=1 y=0 }
+		relative_position_id = generic_mio_trait_improved_anti_air_gun_mounting
+
+		any_parent = { generic_mio_trait_anti_air_ships generic_mio_trait_escort_in_force }
+
+		production_bonus = {
+			production_capacity_factor = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_improved_light_gun_mounting
+		name = generic_mio_trait_improved_light_gun_mounting
+		icon = GFX_generic_mio_department_icon_ship_screen_ship_offense
+
+		position = { x=2 y=0 }
+		relative_position_id = generic_mio_trait_mass_production
+
+		any_parent = { generic_mio_trait_anti_air_ships generic_mio_trait_escort_in_force }
+		any_parent = {  generic_mio_trait_gyro_stabilized_mounts }
+
+		equipment_bonus = {
+			anti_air_attack = 0.05
+			lg_attack = 0.05
+		}
+	}
+}
+
+
+#RAIDING FLEET MANUFACTURER - Based on John Brown (ENG)
+generic_raider_ship_organization = {
+	icon = GFX_idea_generic_naval_manufacturer_3
+
+	allowed = {
+		always = no # Archetype only - countries using it have their own verisons
+	}
+
+	equipment_type = {
+		capital_ship
+		screen_ship
+		submarine
+	}
+	research_categories = {
+		mio_cat_tech_all_capital_ship_and_modules
+		mio_cat_tech_all_screen_ship_and_modules
+		mio_cat_tech_all_submarine_and_modules
+	}
+	
+	tree_header_text = {
+		text = mio_header_long_range_focus
+		x = 1
+	}
+
+	tree_header_text = {
+		text = mio_header_high_speed_focus
+		x = 7
+	}
+
+	initial_trait = {
+		name = generic_mio_initial_trait_raiding_fleet
+
+		organization_modifier = {
+			military_industrial_organization_research_bonus = 0.05
+		}
+		equipment_bonus = {
+			surface_visibility = -0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_long_range_raiding
+		name = generic_mio_trait_long_range_raiding
+		icon = GFX_generic_mio_department_icon_ship_general_engine
+
+		position = { x=1 y=0 }
+
+		mutually_exclusive = { generic_mio_trait_high_speed_raiding }
+
+		equipment_bonus = {
+			naval_range = 0.05
+			fuel_consumption = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_high_speed_raiding
+		name = generic_mio_trait_high_speed_raiding
+		icon = GFX_generic_mio_trait_icon_maximum_speed
+
+		position = { x=6 y=0 }
+		relative_position_id = generic_mio_trait_long_range_raiding
+
+		mutually_exclusive = { generic_mio_trait_long_range_raiding }
+
+		equipment_bonus = {
+			naval_speed = 0.05
+			fuel_consumption = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_diesel_powerplants
+		name = generic_mio_trait_diesel_powerplants
+		icon = GFX_generic_mio_trait_icon_fuel_consumption
+
+		position = { x=-1 y=1 }
+		relative_position_id = generic_mio_trait_long_range_raiding
+
+		any_parent = { generic_mio_trait_long_range_raiding }
+
+		equipment_bonus = {
+			fuel_consumption = -0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_high_speed_operation_stores
+		name = generic_mio_trait_high_speed_operation_stores
+		icon = GFX_generic_mio_trait_icon_mines
+
+		position = { x=1 y=1 }
+		relative_position_id = generic_mio_trait_high_speed_raiding
+
+		any_parent = { generic_mio_trait_high_speed_raiding }
+
+		visible = {
+			has_dlc = "Man the Guns"
+		}
+
+		equipment_bonus = {
+			naval_speed = 0.05
+			mines_planting = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_high_speed_operation_stores_no_mtg
+		name = generic_mio_trait_high_speed_operation_stores
+		icon = GFX_generic_mio_trait_icon_mines
+
+		position = { x=0 y=0 }
+		relative_position_id = generic_mio_trait_high_speed_operation_stores
+
+		any_parent = { generic_mio_trait_high_speed_raiding }
+
+		visible = {
+			NOT = { has_dlc = "Man the Guns" }
+		}
+
+		equipment_bonus = {
+			naval_speed = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_raiding_capital_ships
+		name = generic_mio_trait_raiding_capital_ships
+		icon = GFX_generic_mio_department_icon_ship_capital_ship_weapons
+
+		position = { x=1 y=2 }
+		relative_position_id = generic_mio_trait_long_range_raiding
+
+		any_parent = { generic_mio_trait_long_range_raiding generic_mio_trait_high_speed_raiding }
+
+		limit_to_equipment_type = { capital_ship }
+
+		equipment_bonus = {
+			surface_visibility = -0.05
+			hg_attack = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_long_range_engagement_ethos
+		name = generic_mio_trait_long_range_engagement_ethos
+		icon = GFX_generic_mio_department_icon_ship_capital_ship_weapons
+
+		position = { x=-1 y=1 }
+		relative_position_id = generic_mio_trait_raiding_capital_ships
+
+		any_parent = { generic_mio_trait_raiding_capital_ships }
+
+		limit_to_equipment_type = { capital_ship }
+
+		equipment_bonus = {
+			surface_visibility = -0.05
+			hg_attack = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_high_quality_optics
+		name = generic_mio_trait_high_quality_optics
+		icon = GFX_generic_mio_trait_icon_surface_detection
+
+		position = { x=1 y=1 }
+		relative_position_id = generic_mio_trait_raiding_capital_ships
+
+		any_parent = { generic_mio_trait_raiding_capital_ships }
+
+		mutually_exclusive = { generic_mio_trait_spotting_tops }
+
+		equipment_bonus = {
+			surface_detection = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_raider_escort_requirements
+		name = generic_mio_trait_raider_escort_requirements
+		icon = GFX_generic_mio_department_icon_ship_screen_ship_engine
+
+		position = { x=-1 y=1 }
+		relative_position_id = generic_mio_trait_long_range_engagement_ethos
+
+		any_parent = { generic_mio_trait_long_range_engagement_ethos }
+
+		limit_to_equipment_type = { screen_ship }
+
+		equipment_bonus = {
+			naval_range = 0.05
+			naval_speed = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_unescorted_raider_requirements
+		name = generic_mio_trait_unescorted_raider_requirements
+		icon = GFX_generic_mio_trait_icon_lg_attack
+
+		position = { x=1 y=1 }
+		relative_position_id = generic_mio_trait_long_range_engagement_ethos
+
+		all_parents = { generic_mio_trait_long_range_engagement_ethos generic_mio_trait_high_quality_optics }
+
+		limit_to_equipment_type = { capital_ship }
+
+		equipment_bonus = {
+			lg_attack = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_raiding_cruisers
+		name = generic_mio_trait_raiding_cruisers
+		icon = GFX_generic_mio_trait_icon_surface_visibility
+
+		position = { x=-3 y=2 }
+		relative_position_id = generic_mio_trait_high_speed_raiding
+
+		any_parent = { generic_mio_trait_long_range_raiding generic_mio_trait_high_speed_raiding }
+
+		limit_to_equipment_type = { ship_hull_cruiser }
+
+		equipment_bonus = {
+			surface_visibility = -0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_raiding_submarines
+		name = generic_mio_trait_raiding_submarines
+		icon = GFX_generic_mio_department_icon_ship_submarine_survivability
+
+		position = { x=2 y=0 }
+		relative_position_id = generic_mio_trait_raiding_cruisers
+
+		any_parent = { generic_mio_trait_high_speed_raiding generic_mio_trait_long_range_raiding }
+
+		limit_to_equipment_type = { submarine }
+
+		equipment_bonus = {
+			surface_visibility = -0.05
+			sub_visibility = -0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_spotting_tops
+		name = generic_mio_trait_spotting_tops
+		icon = GFX_generic_mio_trait_icon_surface_visibility		
+
+		position = { x=1 y=1 }
+		relative_position_id = generic_mio_trait_raiding_cruisers
+
+		all_parents = { generic_mio_trait_raiding_cruisers generic_mio_trait_raiding_submarines }
+
+		mutually_exclusive = { generic_mio_trait_high_quality_optics }
+
+		limit_to_equipment_type = { capital_ship screen_ship }
+
+		equipment_bonus = {
+			surface_visibility = -0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_large_torpedo_banks
+		name = generic_mio_trait_large_torpedo_banks
+		icon = GFX_generic_mio_trait_icon_torpedo_attack
+
+		position = { x=1 y=1 }
+		relative_position_id = generic_mio_trait_raiding_submarines
+
+		any_parent = { generic_mio_trait_raiding_submarines }
+
+		equipment_bonus = {
+			torpedo_attack = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_mass_produced_raiders
+		name = generic_mio_trait_mass_produced_raiders
+		icon = GFX_generic_mio_department_icon_ship_general_production
+
+		position = { x=1 y=1 }
+		relative_position_id = generic_mio_trait_spotting_tops
+
+		all_parents = { generic_mio_trait_spotting_tops generic_mio_trait_large_torpedo_banks }
+
+		production_bonus = {
+			production_capacity_factor = 0.05
+		}
+	}
+}
+
+
+#SUBMARINE MANUFACTURER - Based on Canteri Navali Tosi (ITA)
+generic_submarine_organization = {
+	icon = GFX_idea_generic_naval_manufacturer_1
+
+	allowed = {
+		always = no # Archetype only - countries using it have their own verisons
+	}
+
+	equipment_type = {
+		ship_hull_submarine
+	}
+	research_categories = {
+		naval_equipment 
+	}
+	
+	tree_header_text = {
+		text = mio_header_stealth_focus
+		x = 2
+	}
+
+	tree_header_text = {
+		text = mio_header_supremacy_focus
+		x = 5
+	}
+
+	initial_trait = {
+		name = generic_mio_initial_trait_submarine_designer
+
+		organization_modifier = {
+			military_industrial_organization_research_bonus = 0.05
+		}
+		equipment_bonus = {
+			sub_visibility = -0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_long_range_raiding
+		name = generic_mio_trait_long_range_raiding
+		icon = GFX_generic_mio_trait_icon_sub_visibility
+
+		position = { x=2 y=0 }
+
+		mutually_exclusive = { generic_mio_trait_decalin_fueled_torpedo }
+
+		equipment_bonus = {
+			sub_visibility = -0.03
+			naval_speed = -0.01
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_decalin_fueled_torpedo
+		name = generic_mio_trait_decalin_fueled_torpedo
+		icon = GFX_generic_mio_trait_icon_torpedo_attack
+
+		position = { x=3 y=0 }
+		relative_position_id = generic_mio_trait_long_range_raiding
+
+		mutually_exclusive = { generic_mio_trait_long_range_raiding }
+
+		equipment_bonus = {
+			torpedo_attack = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_efficient_fuel_engines
+		name = generic_mio_trait_efficient_fuel_engines
+		icon = GFX_generic_mio_trait_icon_naval_range
+
+		position = { x=1 y=1 }
+		relative_position_id = generic_mio_trait_long_range_raiding
+
+		all_parents = { generic_mio_trait_long_range_raiding }
+
+		equipment_bonus = {
+			naval_range = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_highly_efficient_diesel_electric_propulsion_systems
+		name = generic_mio_trait_highly_efficient_diesel_electric_propulsion_systems
+		icon = GFX_generic_mio_trait_icon_naval_range
+
+		position = { x=0 y=1 }
+		relative_position_id = generic_mio_trait_efficient_fuel_engines
+
+		any_parent = { generic_mio_trait_high_powered_engines generic_mio_trait_efficient_fuel_engines }
+		mutually_exclusive = { generic_mio_trait_open_cycle_propulsion }
+
+		equipment_bonus = {
+			naval_range = 0.06
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_high_powered_engines
+		name = generic_mio_trait_high_powered_engines
+		icon = GFX_generic_mio_trait_icon_maximum_speed
+
+		position = { x=-1 y=1 }
+		relative_position_id = generic_mio_trait_decalin_fueled_torpedo
+
+		all_parents = { generic_mio_trait_decalin_fueled_torpedo }
+
+		equipment_bonus = {
+			sub_visibility = 0.02
+			maximum_speed = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_open_cycle_propulsion
+		name = generic_mio_trait_open_cycle_propulsion
+		icon = GFX_generic_mio_trait_icon_maximum_speed
+
+		position = { x=0 y=1 }
+		relative_position_id = generic_mio_trait_high_powered_engines
+
+		any_parent = { generic_mio_trait_high_powered_engines generic_mio_trait_efficient_fuel_engines }
+		mutually_exclusive = { generic_mio_trait_highly_efficient_diesel_electric_propulsion_systems }
+
+		equipment_bonus = {
+			maximum_speed = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_experimental_anechoic_tiles
+		name = generic_mio_trait_experimental_anechoic_tiles
+		icon = GFX_generic_mio_department_icon_ship_submarine_survivability
+
+		position = { x=0 y=1 }
+		relative_position_id = generic_mio_trait_highly_efficient_diesel_electric_propulsion_systems
+
+		any_parent = { generic_mio_trait_highly_efficient_diesel_electric_propulsion_systems generic_mio_trait_open_cycle_propulsion }
+
+		equipment_bonus = {
+			surface_visibility = -0.05
+			sub_visibility = -0.05
+			build_cost_ic = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_improved_torpedo_detonators
+		name = generic_mio_trait_improved_torpedo_detonators
+		icon = GFX_generic_mio_trait_icon_torpedo_attack
+
+		position = { x=0 y=1 }
+		relative_position_id = generic_mio_trait_open_cycle_propulsion
+
+		any_parent = { generic_mio_trait_highly_efficient_diesel_electric_propulsion_systems generic_mio_trait_open_cycle_propulsion }
+
+		equipment_bonus = {
+			torpedo_attack = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_simplified_pressure_hull_design
+		name = generic_mio_trait_simplified_pressure_hull_design
+		icon = GFX_generic_mio_department_icon_ship_submarine_production
+
+		position = { x=1 y=1 }
+		relative_position_id = generic_mio_trait_experimental_anechoic_tiles
+
+		all_parents = { generic_mio_trait_experimental_anechoic_tiles generic_mio_trait_improved_torpedo_detonators }
+
+		production_bonus = {
+			production_capacity_factor = 0.1
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_advanced_periscope
+		name = generic_mio_trait_advanced_periscope
+		icon = GFX_generic_mio_trait_icon_surface_detection
+
+		position = { x=-1 y=2 }
+		relative_position_id = generic_mio_trait_long_range_raiding
+
+		all_parents = { generic_mio_trait_long_range_raiding  }
+
+
+		equipment_bonus = {
+			surface_detection = 0.03
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_emergency_main_ballast_tank_blow
+		name = generic_mio_trait_emergency_main_ballast_tank_blow
+		icon = GFX_generic_mio_trait_icon_max_strength
+
+		position = { x=-1 y=1 }
+		relative_position_id = generic_mio_trait_advanced_periscope
+
+		all_parents = { generic_mio_trait_advanced_periscope }
+
+		equipment_bonus = {
+			max_strength = 0.06
+			maximum_speed = 0.01
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_radar_warning_receiver
+		name = generic_mio_trait_radar_warning_receiver
+		icon = GFX_generic_mio_trait_icon_sub_visibility
+
+		position = { x=1 y=1 }
+		relative_position_id = generic_mio_trait_advanced_periscope
+
+		all_parents = { generic_mio_trait_advanced_periscope }
+
+
+		equipment_bonus = {
+			surface_detection = -0.03
+			sub_visibility = -0.05
+		}
+	}
+
+
+	trait = {
+		token = generic_mio_trait_crash_dive_flood_tanks
+		name = generic_mio_trait_crash_dive_flood_tanks
+		icon = GFX_generic_mio_trait_icon_max_strength
+
+		position = { x=1 y=1 }
+		relative_position_id = generic_mio_trait_emergency_main_ballast_tank_blow
+
+		all_parents = { generic_mio_trait_emergency_main_ballast_tank_blow generic_mio_trait_radar_warning_receiver }
+
+		equipment_bonus = {
+			max_strength = 0.08
+			sub_visibility = -0.01
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_submarine_mass_production
+		name = generic_mio_trait_submarine_mass_production
+		icon = GFX_generic_mio_department_icon_ship_submarine_production
+
+		position = { x=0 y=2 }
+		relative_position_id = generic_mio_trait_decalin_fueled_torpedo
+
+		all_parents = { generic_mio_trait_decalin_fueled_torpedo }
+
+
+		production_bonus = {
+			production_capacity_factor = 0.07
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_advanced_sonar
+		name = generic_mio_trait_advanced_sonar
+		icon = GFX_generic_mio_trait_icon_surface_detection
+
+		position = { x=2 y=0 }
+		relative_position_id = generic_mio_trait_submarine_mass_production
+
+		all_parents = { generic_mio_trait_decalin_fueled_torpedo }
+
+		limit_to_equipment_type = { ship_hull_submarine }
+
+		equipment_bonus = {
+			surface_detection = 0.06
+			sub_visibility = 0.02
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_deck_guns
+		name = generic_mio_trait_deck_guns
+		icon = GFX_generic_mio_trait_icon_max_strength
+
+		position = { x=1 y=1 }
+		relative_position_id = generic_mio_trait_submarine_mass_production
+
+		all_parents = { generic_mio_trait_submarine_mass_production generic_mio_trait_advanced_sonar }
+
+		equipment_bonus = {
+			max_strength = 0.08
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_large_torpedo_banks
+		name = generic_mio_trait_large_torpedo_banks
+		icon = GFX_generic_mio_trait_icon_torpedo_attack
+
+		position = { x=1 y=1 }
+		relative_position_id = generic_mio_trait_advanced_sonar
+
+		all_parents = { generic_mio_trait_advanced_sonar }
+
+		equipment_bonus = {
+			torpedo_attack = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_high_capacity_mine_storage
+		name = generic_mio_trait_high_capacity_mine_storage
+		icon = GFX_generic_mio_trait_icon_mines
+
+		position = { x=1 y=1 }
+		relative_position_id = generic_mio_trait_deck_guns
+
+		any_parent = { generic_mio_trait_deck_guns generic_mio_trait_large_torpedo_banks }
+
+		visible = {
+			has_dlc = "Man the Guns"
+		}
+
+		equipment_bonus = {
+			mines_planting = 0.2
+		}
+	}
+}
+
+#BLACK SEA MANUFACTURER - Based on Black Sea Shipyard (SOV)
+generic_black_sea_fleet_organization = {
+	icon = GFX_idea_generic_naval_manufacturer_2
+
+	allowed = {
+		always = no # Archetype only - countries using it have their own verisons
+	}
+
+	equipment_type = {
+		capital_ship
+		screen_ship
+		ship_hull_submarine
+	}
+
+	research_categories = {
+		naval_equipment
+	}
+	
+	tree_header_text = {
+		text = mio_header_systems
+		x = 1
+	}
+
+	tree_header_text = {
+		text = mio_header_weapons
+		x = 4
+	}
+
+	tree_header_text = {
+		text = mio_header_production
+		x = 8
+	}
+
+	initial_trait = {
+		name = generic_mio_initial_trait_black_sea_fleet_designer
+		limit_to_equipment_type = { capital_ship screen_ship ship_hull_submarine }
+		equipment_bonus = {
+			anti_air_attack = 0.02
+			armor_value = 0.02
+			max_strength = 0.02
+			naval_range = -0.15
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_submarine_hunters_black_sea
+		name = generic_mio_trait_submarine_hunters_black_sea
+		icon = GFX_generic_mio_trait_icon_sub_detection
+
+		position = { x=1 y=0 }
+		
+		equipment_bonus = {
+			sub_detection = 0.05
+			patrol_coordination = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_efficient_patrolling_scheme
+		name = generic_mio_trait_efficient_patrolling_scheme
+		icon = GFX_generic_mio_department_icon_ship_capital_screen_utility
+
+		position = { x=-1 y=1 }
+		relative_position_id = generic_mio_trait_submarine_hunters_black_sea
+		
+		all_parents = { generic_mio_trait_submarine_hunters_black_sea }
+		
+		equipment_bonus = {
+			patrol_coordination = 0.1
+			naval_range = -0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_advanced_sub_scanners
+		name = generic_mio_trait_advanced_sub_scanners
+		icon = GFX_generic_mio_trait_icon_sub_detection
+		
+		position = { x=0 y=1 }
+		relative_position_id = generic_mio_trait_submarine_hunters_black_sea
+		
+		all_parents = { generic_mio_trait_submarine_hunters_black_sea }
+		
+		limit_to_equipment_type = { capital_ship screen_ship }
+		
+		equipment_bonus = {
+			sub_detection = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_high_altitute_catapult
+		name = generic_mio_trait_high_altitute_catapult
+		icon = GFX_generic_mio_trait_icon_detection
+		
+		position = { x=-1 y=1 }
+		relative_position_id = generic_mio_trait_advanced_sub_scanners
+		
+		all_parents = { generic_mio_trait_advanced_sub_scanners }
+		
+		equipment_bonus = {
+			surface_detection = 0.04
+			sub_detection = 0.04
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_light_armor_piercing_guns
+		name = generic_mio_trait_light_armor_piercing_guns
+		icon = GFX_generic_mio_trait_icon_lg_attack
+		
+		position = { x=2 y=0 }
+		relative_position_id = generic_mio_trait_high_altitute_catapult
+		
+		all_parents = { generic_mio_trait_advanced_sub_scanners }
+		
+		limit_to_equipment_type = { capital_ship screen_ship }
+		
+		equipment_bonus = {
+			lg_armor_piercing = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_brass_case_reloader
+		name = generic_mio_trait_brass_case_reloader
+		icon = GFX_generic_mio_department_icon_ship_capital_screen_weapons
+		
+		position = { x=0 y=2 }
+		relative_position_id = generic_mio_trait_light_armor_piercing_guns
+		
+		all_parents = { generic_mio_trait_light_armor_piercing_guns generic_mio_trait_piercing_rounds }
+		
+		limit_to_equipment_type = { capital_ship screen_ship }
+		
+		equipment_bonus = {
+			lg_attack = 0.06
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_anti_air_defense
+		name = generic_mio_trait_anti_air_defense
+		icon = GFX_generic_mio_trait_icon_anti_air_attack
+		
+		position = { x=4 y=0 }
+		
+		limit_to_equipment_type = { capital_ship screen_ship }
+
+		equipment_bonus = {
+			anti_air_attack = 0.06
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_heavy_guns
+		name = generic_mio_trait_heavy_guns
+		icon = GFX_generic_mio_trait_icon_hg_attack
+		
+		position = { x=0 y=1 }
+		relative_position_id = generic_mio_trait_anti_air_defense
+		
+		all_parents = { generic_mio_trait_anti_air_defense }
+		
+		limit_to_equipment_type = { capital_ship screen_ship }
+		
+		equipment_bonus = {
+			hg_attack = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_advanced_periscope
+		name = generic_mio_advanced_periscope
+		icon = GFX_generic_mio_trait_icon_sub_visibility
+		
+		position = { x=2 y=1 }
+		relative_position_id = generic_mio_trait_anti_air_defense
+		
+		all_parents = { generic_mio_trait_anti_air_defense }
+		
+		limit_to_equipment_type = { ship_hull_submarine }
+		
+		equipment_bonus = {
+			sub_visibility = -0.03
+			surface_detection = 0.03
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_piercing_rounds
+		name = generic_mio_trait_piercing_rounds
+		icon = GFX_generic_mio_department_icon_ship_capital_ship_weapons
+		
+		position = { x=-1 y=1 }
+		relative_position_id = generic_mio_trait_heavy_guns
+		
+		all_parents = { generic_mio_trait_heavy_guns }
+		
+		limit_to_equipment_type = { capital_ship }
+		
+		equipment_bonus = {
+			hg_armor_piercing = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_base_defense
+		name = generic_mio_trait_base_defense
+		icon = GFX_generic_mio_department_icon_ship_capital_screen_armor
+		
+		position = { x=1 y=1 }
+		relative_position_id = generic_mio_trait_heavy_guns
+		
+		all_parents = { generic_mio_trait_heavy_guns }
+		
+		limit_to_equipment_type = { capital_ship screen_ship }
+		
+		equipment_bonus = {
+			anti_air_attack = 0.06
+			naval_range = -0.1
+			armor_value = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_state_sponsored_growth
+		name = generic_mio_trait_state_sponsored_growth
+		icon = GFX_generic_mio_department_icon_facilities
+		
+		position = { x=4 y=0 }
+		relative_position_id = generic_mio_trait_anti_air_defense
+		
+		organization_modifier = {
+			military_industrial_organization_funds_gain = 0.1
+		}
+		
+	}
+
+	trait = {
+		token = generic_mio_trait_state_sponsored_research
+		name = generic_mio_trait_state_sponsored_research
+		icon = GFX_generic_mio_department_icon_facilities
+		
+		position = { x=-1 y=2 }
+		relative_position_id = generic_mio_trait_state_sponsored_growth
+		
+		all_parents = { generic_mio_trait_state_sponsored_growth }
+
+		mutually_exclusive = { generic_mio_trait_24h_shifts }
+		
+		organization_modifier = {
+			military_industrial_organization_research_bonus = 0.1
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_24h_shifts
+		name = generic_mio_trait_24h_shifts
+		icon = GFX_generic_mio_department_icon_ship_general_production
+		
+		position = { x=2 y=0 }
+		relative_position_id = generic_mio_trait_state_sponsored_research
+		
+		all_parents = { generic_mio_trait_state_sponsored_growth }
+
+		mutually_exclusive = { generic_mio_trait_state_sponsored_research }
+		
+		production_bonus = {
+			production_capacity_factor = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_state_subsidizing
+		name = generic_mio_trait_state_subsidizing
+		icon = GFX_generic_mio_department_icon_facilities
+		
+		position = { x=1 y=2 }
+		relative_position_id = generic_mio_trait_state_sponsored_research
+		
+		any_parent = { generic_mio_trait_state_sponsored_research generic_mio_trait_24h_shifts }
+		
+		organization_modifier = {
+			military_industrial_organization_size_up_requirement = -0.25
+			military_industrial_organization_design_team_assign_cost = 0.15
+		}
+
+	}
+
+	trait = {
+		token = generic_mio_trait_deck_guns_black_sea
+		name = generic_mio_trait_deck_guns_black_sea
+		icon = GFX_generic_mio_trait_icon_anti_air_attack
+
+		position = { x=-1 y=2 } 
+		relative_position_id = generic_mio_trait_base_defense
+		
+		any_parent = { generic_mio_trait_base_defense generic_mio_trait_piercing_rounds }
+		
+		limit_to_equipment_type = { capital_ship }
+		
+		equipment_bonus = {
+			anti_air_attack = 0.06
+		}
+	}	
+}
+
+
+
+generic_refurbishment_repair_organization = {
+	icon = GFX_idea_generic_naval_manufacturer_1
+
+	allowed = {
+		always = no # Archetype only - countries using it have their own verisons
+	}
+
+	equipment_type = {
+		mio_cat_eq_all_battleship
+		mio_cat_eq_all_cruiser
+	}
+	research_categories = {
+		mio_cat_tech_all_capital_ship_and_modules
+		mio_cat_tech_all_cruiser_and_modules
+	}
+
+	tree_header_text = {
+		text = mio_header_protection
+		x = 3
+	}
+
+	tree_header_text = {
+		text = mio_header_weapons
+		x = 8
+	}
+
+
+	initial_trait = {
+		name = generic_mio_refurbishment_repair_organization
+		limit_to_equipment_type = { capital_ship screen_ship ship_hull_submarine }
+		equipment_bonus = {
+			max_strength = 0.03
+		}
+
+		organization_modifier = {
+			military_industrial_organization_research_bonus = 0.01
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_heavy_armored_hull
+		name = generic_mio_trait_heavy_armored_hull
+		icon = GFX_generic_mio_trait_icon_armor_value
+
+		position = { x=1 y=0 }
+		
+		equipment_bonus = {
+			armor_value = 0.03
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_isolated_firemains
+		name = generic_mio_trait_isolated_firemains
+		icon = GFX_generic_mio_trait_icon_naval_torpedo_damage_reduction_factor
+
+		position = { x=-1 y=2 }
+		relative_position_id = generic_mio_trait_heavy_armored_hull
+		
+		all_parents = { generic_mio_trait_heavy_armored_hull }
+		
+		equipment_bonus = {
+			naval_torpedo_damage_reduction_factor = 0.03
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_counter_flooding_system
+		name = generic_mio_trait_counter_flooding_system
+		icon = GFX_generic_mio_trait_icon_naval_torpedo_hit_chance_factor
+
+		position = { x=3 y=0 }
+		relative_position_id = generic_mio_trait_isolated_firemains
+		
+		all_parents = { generic_mio_trait_heavy_armored_hull }
+		
+		equipment_bonus = {
+			naval_torpedo_enemy_critical_chance_factor = -0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_anti_torpedo_bulge
+		name = generic_mio_trait_anti_torpedo_bulge
+		icon = GFX_generic_mio_trait_icon_naval_torpedo_damage_reduction_factor
+
+		position = { x=1 y=2 }
+		relative_position_id = generic_mio_trait_isolated_firemains
+
+		all_parents = { generic_mio_trait_counter_flooding_system generic_mio_trait_isolated_firemains generic_mio_trait_high_powered_steering }
+		
+		equipment_bonus = {
+			naval_torpedo_enemy_critical_chance_factor = -0.05
+			naval_torpedo_damage_reduction_factor = 0.08
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_foam_fire_extinguishers
+		name = generic_mio_trait_foam_fire_extinguishers
+		icon = GFX_generic_mio_trait_icon_reliability
+
+		position = { x=5 y=0 }
+		relative_position_id = generic_mio_trait_heavy_armored_hull
+		
+		equipment_bonus = {
+			reliability = 0.03
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_bulkhead_shoring_procedure
+		name = generic_mio_trait_bulkhead_shoring_procedure
+		icon = GFX_generic_mio_department_icon_ship_capital_screen_armor
+
+		position = { x=0 y=1 }
+		relative_position_id = generic_mio_trait_foam_fire_extinguishers
+		
+		all_parents = { generic_mio_trait_foam_fire_extinguishers }
+		
+		equipment_bonus = {
+			reliability = 0.01
+			armor_value = 0.02
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_high_powered_steering
+		name = generic_mio_trait_high_powered_steering
+		icon = GFX_generic_mio_department_icon_ship_capital_screen_armor
+
+		position = { x=-1 y=1 }
+		relative_position_id = generic_mio_trait_bulkhead_shoring_procedure
+		
+		all_parents = { generic_mio_trait_bulkhead_shoring_procedure }
+		
+		equipment_bonus = {
+			reliability = 0.01
+			armor_value = 0.02
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_flooding_boundries
+		name = generic_mio_trait_flooding_boundries
+		icon = GFX_generic_mio_trait_icon_max_strength
+
+		position = { x=1 y=0 }
+		relative_position_id = generic_mio_trait_high_powered_steering
+		
+		all_parents = { generic_mio_trait_bulkhead_shoring_procedure }
+		
+		equipment_bonus = {
+			max_strength = 0.03
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_protected_pumps
+		name = generic_mio_trait_protected_pumps
+		icon = GFX_generic_mio_trait_icon_max_strength
+
+		position = { x=0 y=1 }
+		relative_position_id = generic_mio_trait_flooding_boundries
+		
+		all_parents = { generic_mio_trait_flooding_boundries }
+		
+		equipment_bonus = {
+			max_strength = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_advanced_scanners
+		name = generic_mio_trait_advanced_scanners
+		icon = GFX_generic_mio_trait_icon_detection
+
+		position = { x=1 y=1 }
+		relative_position_id = generic_mio_trait_foam_fire_extinguishers
+		
+		all_parents = { generic_mio_trait_foam_fire_extinguishers }
+		
+		equipment_bonus = {
+			sub_detection = 0.05
+			surface_detection = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_high_velocity_guns
+		name = generic_mio_trait_high_velocity_guns
+		icon = GFX_generic_mio_department_icon_ship_capital_ship_weapons
+
+		position = { x=0 y=1 }
+		relative_position_id = generic_mio_trait_advanced_scanners
+
+		all_parents = { generic_mio_trait_advanced_scanners }
+		
+		limit_to_equipment_type = { capital_ship }
+
+		equipment_bonus = {
+			hg_armor_piercing = 0.03
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_capital_destroyer_shells
+		name = generic_mio_trait_capital_destroyer_shells
+		icon = GFX_generic_mio_department_icon_ship_capital_ship_weapons		
+
+		position = { x=0 y=2 }
+		relative_position_id = generic_mio_trait_high_velocity_guns
+		
+		all_parents = { generic_mio_trait_high_velocity_guns }
+		
+		mutually_exclusive = { generic_mio_trait_deck_guns generic_mio_trait_naval_all_purpose_defense_systems }
+
+		limit_to_equipment_type = { capital_ship }
+		
+		equipment_bonus = {
+			hg_armor_piercing = 0.05
+			hg_attack = 0.1
+			naval_range = -0.15
+			maximum_speed = -0.08
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_deck_guns
+		name = generic_mio_trait_deck_guns
+		icon = GFX_generic_mio_trait_icon_anti_air_attack
+
+		position = { x=1 y=0 }
+		relative_position_id = generic_mio_trait_capital_destroyer_shells
+		
+		all_parents = { generic_mio_trait_high_velocity_guns }
+		
+		mutually_exclusive = { generic_mio_trait_capital_destroyer_shells generic_mio_trait_naval_all_purpose_defense_systems }
+
+		equipment_bonus = {
+			anti_air_attack = 0.06
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_naval_all_purpose_defense_systems
+		name = generic_mio_trait_naval_all_purpose_defense_systems
+		icon = GFX_generic_mio_department_icon_ship_capital_ship_armor
+
+		position = { x=1 y=0 }
+		relative_position_id = generic_mio_trait_deck_guns
+		
+		all_parents = { generic_mio_trait_high_velocity_guns }
+		
+		mutually_exclusive = { generic_mio_trait_capital_destroyer_shells generic_mio_trait_deck_guns }
+
+		limit_to_equipment_type = { capital_ship }
+
+		equipment_bonus = {
+			anti_air_attack = 0.03
+			armor_value = 0.03
+			lg_attack = 0.03
+			naval_range = -0.05
+			maximum_speed = -0.04
+		}
+	}
+}
+
+
+
+
+########  ##          ###    ##    ## ########  ######  
+##     ## ##         ## ##   ###   ## ##       ##    ## 
+##     ## ##        ##   ##  ####  ## ##       ##       
+########  ##       ##     ## ## ## ## ######    ######  
+##        ##       ######### ##  #### ##             ## 
+##        ##       ##     ## ##   ### ##       ##    ## 
+##        ######## ##     ## ##    ## ########  ######  
+
+
+
+#GENERAL AIRCRAFT MANUFACTURER - Based on Focker (HOL)
+generic_general_aircraft_organization = {
+	icon = GFX_idea_generic_air_manufacturer_1
+
+	allowed = {
+		NOT = { has_custom_aircraft_mio = yes }
+	}
+
+	equipment_type = {
+		mio_cat_eq_all_small_plane
+		mio_cat_eq_all_medium_plane
+		mio_cat_eq_all_large_plane
+	}
+
+	research_categories = { air_equipment }
+	
+	tree_header_text = {
+		text = mio_header_fighter_aircraft
+		x = 1
+	}
+
+	tree_header_text = {
+		text = mio_header_bomber_aircraft
+		x = 4
+	}
+
+	tree_header_text = {
+		text = mio_header_naval_aircraft
+		x = 7
+	}
+
+	initial_trait = {
+		name = generic_mio_initial_trait_general_aircraft_designer
+
+		organization_modifier = {
+			military_industrial_organization_research_bonus = 0.05
+		}
+		production_bonus = {
+			production_capacity_factor = 0.03
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_conservative_designs
+		name = generic_mio_trait_conservative_designs
+		icon = GFX_generic_mio_trait_icon_reliability
+
+		position = { x=4 y=0 }
+
+		equipment_bonus = {
+			reliability = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_fighter_aircraft_specialists
+		name = generic_mio_trait_fighter_aircraft_specialists
+		icon = GFX_generic_mio_department_icon_plane_fighter_engine
+
+		position = { x=-3 y=1 }
+		relative_position_id = generic_mio_trait_conservative_designs
+
+		all_parents = { generic_mio_trait_conservative_designs }
+
+		limit_to_equipment_type = { mio_cat_eq_only_light_fighter_no_cv medium_plane_fighter_airframe medium_plane_scout_plane_airframe }
+
+		equipment_bonus = {
+			air_range = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_high_speed_design
+		name = generic_mio_trait_high_speed_design
+		icon = GFX_generic_mio_trait_icon_maximum_speed
+
+		position = { x=-1 y=1 }
+		relative_position_id = generic_mio_trait_fighter_aircraft_specialists
+
+		all_parents = { generic_mio_trait_fighter_aircraft_specialists }
+
+		mutually_exclusive = { generic_mio_trait_agility_wing_design }
+
+		limit_to_equipment_type = { mio_cat_eq_only_light_fighter_no_cv medium_plane_fighter_airframe medium_plane_scout_plane_airframe }
+
+		equipment_bonus = {
+			maximum_speed = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_agility_wing_design
+		name = generic_mio_trait_agility_wing_design
+		icon = GFX_generic_mio_trait_icon_air_agility
+
+		position = { x=1 y=1 }
+		relative_position_id = generic_mio_trait_fighter_aircraft_specialists
+
+		all_parents = { generic_mio_trait_fighter_aircraft_specialists }
+
+		mutually_exclusive = { generic_mio_trait_high_speed_design }
+
+		limit_to_equipment_type = { mio_cat_eq_only_light_fighter_no_cv medium_plane_fighter_airframe medium_plane_scout_plane_airframe }
+
+		equipment_bonus = {
+			air_agility = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_fighter_aircraft_production
+		name = generic_mio_trait_fighter_aircraft_production
+		icon = GFX_generic_mio_department_icon_plane_fighter_production
+
+		position = { x=1 y=2 }
+		relative_position_id = generic_mio_trait_high_speed_design
+
+		any_parent = { generic_mio_trait_high_speed_design generic_mio_trait_agility_wing_design }
+
+		limit_to_equipment_type = { mio_cat_eq_only_light_fighter_no_cv medium_plane_fighter_airframe medium_plane_scout_plane_airframe }
+
+		production_bonus = {
+			production_capacity_factor = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_bomber_aircraft_specialists
+		name = generic_mio_trait_bomber_aircraft_specialists
+		icon = GFX_generic_mio_department_icon_plane_strategic_bomber_engine
+
+		position = { x=0 y=1 }
+		relative_position_id = generic_mio_trait_conservative_designs
+
+		all_parents = { generic_mio_trait_conservative_designs }
+
+		limit_to_equipment_type = { small_plane_cas_airframe mio_cat_eq_only_tactical_bomber mio_cat_eq_only_strategic_bomber }
+	equipment_bonus = {
+			air_range = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_bomb_trucks
+		name = generic_mio_trait_bomb_trucks
+		icon = GFX_generic_mio_trait_icon_defense
+
+		position = { x=-1 y=1 }
+		relative_position_id = generic_mio_trait_bomber_aircraft_specialists
+
+		all_parents = { generic_mio_trait_bomber_aircraft_specialists }
+
+		mutually_exclusive = { generic_mio_trait_fast_bombers }
+
+		limit_to_equipment_type = { small_plane_cas_airframe mio_cat_eq_only_tactical_bomber mio_cat_eq_only_strategic_bomber }
+
+		equipment_bonus = {
+			air_defence = 0.03
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_fast_bombers
+		name = generic_mio_trait_fast_bombers
+		icon = GFX_generic_mio_trait_icon_maximum_speed
+
+		position = { x=1 y=1 }
+		relative_position_id = generic_mio_trait_bomber_aircraft_specialists
+
+		all_parents = { generic_mio_trait_bomber_aircraft_specialists }
+
+		mutually_exclusive = { generic_mio_trait_bomb_trucks }
+
+		limit_to_equipment_type = { small_plane_cas_airframe mio_cat_eq_only_tactical_bomber mio_cat_eq_only_strategic_bomber }
+
+		equipment_bonus = {
+			maximum_speed = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_bomber_aircraft_production
+		name = generic_mio_trait_bomber_aircraft_production
+		icon = GFX_generic_mio_department_icon_plane_strategic_bomber_production
+
+		position = { x=1 y=2 }
+		relative_position_id = generic_mio_trait_bomb_trucks
+
+		any_parent = { generic_mio_trait_bomb_trucks generic_mio_trait_fast_bombers }
+
+		limit_to_equipment_type = { small_plane_cas_airframe mio_cat_eq_only_tactical_bomber mio_cat_eq_only_strategic_bomber }
+
+		production_bonus = {
+			production_capacity_factor = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_naval_aircraft_specialists
+		name = generic_mio_trait_naval_aircraft_specialists
+		icon = GFX_generic_mio_department_icon_plane_cv_naval_bomber_engine
+
+		position = { x=3 y=1 }
+		relative_position_id = generic_mio_trait_conservative_designs
+
+		all_parents = { generic_mio_trait_conservative_designs }
+
+		limit_to_equipment_type = { small_plane_naval_bomber_airframe mio_cat_eq_all_cv_aircraft large_plane_maritime_patrol_plane_airframe }
+
+		equipment_bonus = {
+			air_range = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_naval_strike
+		name = generic_mio_trait_naval_strike
+		icon = GFX_generic_mio_trait_icon_torpedo_attack
+
+		position = { x=-1 y=1 }
+		relative_position_id = generic_mio_trait_naval_aircraft_specialists
+
+		all_parents = { generic_mio_trait_naval_aircraft_specialists }
+
+		mutually_exclusive = { generic_mio_trait_naval_air_patrol }
+
+		limit_to_equipment_type = { small_plane_naval_bomber_airframe mio_cat_eq_all_cv_aircraft large_plane_maritime_patrol_plane_airframe }
+
+		equipment_bonus = {
+			naval_strike_targetting = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_naval_air_patrol
+		name = generic_mio_trait_naval_air_patrol
+		icon = GFX_generic_mio_trait_icon_surface_detection
+
+		position = { x=1 y=1 }
+		relative_position_id = generic_mio_trait_naval_aircraft_specialists
+
+		all_parents = { generic_mio_trait_naval_aircraft_specialists }
+
+		mutually_exclusive = { generic_mio_trait_naval_strike }
+
+		limit_to_equipment_type = { small_plane_naval_bomber_airframe mio_cat_eq_all_cv_aircraft large_plane_maritime_patrol_plane_airframe }
+
+		equipment_bonus = {
+			surface_detection = 0.05
+			air_agility = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_naval_aircraft_production
+		name = generic_mio_trait_naval_aircraft_production
+		icon = GFX_generic_mio_department_icon_plane_cv_naval_bomber_production
+
+		position = { x=1 y=2 }
+		relative_position_id = generic_mio_trait_naval_strike
+
+		any_parent = { generic_mio_trait_naval_strike generic_mio_trait_naval_air_patrol }
+
+		limit_to_equipment_type = { small_plane_naval_bomber_airframe mio_cat_eq_all_cv_aircraft large_plane_maritime_patrol_plane_airframe }
+
+		production_bonus = {
+			production_capacity_factor = 0.05
+		}
+	}
+}
+
+#LIGHT AIRCRAFT MANUFACTURER - Based on MESSERSCHMIDT (GER)
+generic_light_aircraft_organization = {
+	icon = GFX_idea_generic_air_manufacturer_1
+
+	allowed = {
+		always = no # Archetype only - countries using it have their own verisons
+	}
+
+	equipment_type = {
+		mio_cat_eq_only_light_fighter
+	}
+
+	research_categories = {	mio_cat_all_light_fighter_and_modules }
+	
+	tree_header_text = {
+		text = mio_header_production
+		x = 1
+	}
+
+	tree_header_text = {
+		text = mio_header_engines
+		x = 3
+	}
+
+	tree_header_text = {
+		text = mio_header_wings
+		x = 5
+	}
+
+	tree_header_text = {
+		text = mio_header_weapons
+		x = 7
+	}
+
+	initial_trait = {
+		name = generic_mio_initial_trait_light_aircraft_designer
+
+		equipment_bonus = {
+			air_agility = 0.05
+			maximum_speed = 0.05
+			air_attack = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_expanded_production_facilities
+		name = generic_mio_trait_expanded_production_facilities
+		icon = GFX_generic_mio_department_icon_plane_fighter_line_efficiency
+
+		position = { x=2 y=0 }
+
+		production_bonus = {
+			production_efficiency_gain_factor = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_fixed_tailwheels
+		name = generic_mio_trait_fixed_tailwheels
+		icon = GFX_generic_mio_trait_icon_reliability
+
+		position = { x=-1 y=1 }
+		relative_position_id = generic_mio_trait_expanded_production_facilities
+
+		all_parents = { generic_mio_trait_expanded_production_facilities }
+
+		equipment_bonus = {
+			reliability = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_removable_wings
+		name = generic_mio_trait_removable_wings
+		icon = GFX_generic_mio_department_icon_plane_fighter_line_efficiency
+
+		position = { x=0 y=2 }
+		relative_position_id = generic_mio_trait_fixed_tailwheels
+
+		all_parents = { generic_mio_trait_fixed_tailwheels }
+
+		equipment_bonus = {
+			reliability = 0.05
+		}
+
+		production_bonus = {
+			production_efficiency_gain_factor = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_liquid_cooled_engines
+		name = generic_mio_trait_liquid_cooled_engines
+		icon = GFX_generic_mio_trait_icon_air_agility
+
+		position = { x=2 y=0 }
+		relative_position_id = generic_mio_trait_expanded_production_facilities
+
+		equipment_bonus = {
+			maximum_speed = 0.05
+			air_agility = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_maritime_duties
+		name = generic_mio_trait_maritime_duties
+		icon = GFX_generic_mio_trait_icon_torpedo_attack
+
+
+		position = { x=-1 y=1 }
+		relative_position_id = generic_mio_trait_liquid_cooled_engines
+
+		all_parents = { generic_mio_trait_liquid_cooled_engines }
+
+		equipment_bonus = {
+			air_range = 0.05
+			naval_strike_attack = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_advanced_aerodynamics
+		name = generic_mio_trait_advanced_aerodynamics
+		icon = GFX_generic_mio_trait_icon_air_agility
+
+		position = { x=2 y=0 }
+		relative_position_id = generic_mio_trait_liquid_cooled_engines
+
+		equipment_bonus = {
+			maximum_speed = 0.05
+			air_agility = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_fuselage_ordinance_rack
+		name = generic_mio_trait_fuselage_ordinance_rack
+		icon = GFX_generic_mio_trait_icon_air_agility
+
+		position = { x=1 y=1 }
+		relative_position_id = generic_mio_trait_advanced_aerodynamics
+
+		all_parents = { generic_mio_trait_advanced_aerodynamics }
+
+		equipment_bonus = {
+			maximum_speed = 0.05
+			air_agility = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_ongoing_developmental_upgrades
+		name = generic_mio_trait_ongoing_developmental_upgrades
+		icon = GFX_generic_mio_department_icon_facilities
+
+		position = { x=1 y=1 }
+		relative_position_id = generic_mio_trait_liquid_cooled_engines
+
+		all_parents = { generic_mio_trait_liquid_cooled_engines generic_mio_trait_advanced_aerodynamics }
+
+		organization_modifier = {
+			military_industrial_organization_research_bonus = 0.05
+		}
+
+		production_bonus = {
+			production_efficiency_gain_factor = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_heavier_airframe
+		name = generic_mio_trait_heavier_airframe
+		icon = GFX_generic_mio_department_icon_plane_fighter_combat
+
+		position = { x=-2 y=1 }
+		relative_position_id = generic_mio_trait_ongoing_developmental_upgrades
+
+		all_parents = { generic_mio_trait_ongoing_developmental_upgrades }
+
+		mutually_exclusive = { generic_mio_trait_maximum_wing_loads generic_mio_trait_gun_pods }
+
+		equipment_bonus = {
+			air_attack = 0.05
+			air_ground_attack = 0.05
+			naval_strike_attack = 0.05
+			air_defence = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_maximum_wing_loads
+		name = generic_mio_trait_maximum_wing_loads
+		icon = GFX_generic_mio_trait_icon_air_agility
+
+		position = { x=0 y=1 }
+		relative_position_id = generic_mio_trait_ongoing_developmental_upgrades
+
+		all_parents = { generic_mio_trait_ongoing_developmental_upgrades }
+
+		mutually_exclusive = { generic_mio_trait_heavier_airframe generic_mio_trait_gun_pods }
+
+		equipment_bonus = {
+			maximum_speed = 0.05
+			air_agility = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_gun_pods
+		name = generic_mio_trait_gun_pods
+		icon = GFX_generic_mio_trait_icon_air_ground_attack
+
+		position = { x=2 y=1 }
+		relative_position_id = generic_mio_trait_ongoing_developmental_upgrades
+
+		all_parents = { generic_mio_trait_ongoing_developmental_upgrades }
+
+		mutually_exclusive = { generic_mio_trait_heavier_airframe generic_mio_trait_maximum_wing_loads }
+
+		equipment_bonus = {
+			air_ground_attack = 0.1
+			air_agility = -0.03
+			air_attack = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_multi_purpose_aircraft
+		name = generic_mio_trait_multi_purpose_aircraft
+		icon = GFX_generic_mio_department_icon_plane_fighter_combat
+
+		position = { x=0 y=1 }
+		relative_position_id = generic_mio_trait_heavier_airframe
+
+		any_parent = { generic_mio_trait_heavier_airframe generic_mio_trait_maximum_wing_loads generic_mio_trait_gun_pods }
+
+		mutually_exclusive = { generic_mio_trait_fighter_specialization generic_mio_trait_close_air_support_specialization }
+
+		equipment_bonus = {
+			air_attack = 0.05
+			air_ground_attack = 0.05
+			naval_strike_attack = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_fighter_specialization
+		name = generic_mio_trait_fighter_specialization
+		icon = GFX_generic_mio_department_icon_plane_fighter_engine
+
+		position = { x=0 y=1 }
+		relative_position_id = generic_mio_trait_maximum_wing_loads
+
+		any_parent = { generic_mio_trait_heavier_airframe generic_mio_trait_maximum_wing_loads generic_mio_trait_gun_pods }
+
+		mutually_exclusive = { generic_mio_trait_multi_purpose_aircraft generic_mio_trait_close_air_support_specialization }
+
+		equipment_bonus = {
+			air_attack = 0.05
+			air_agility = 0.03
+			maximum_speed = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_close_air_support_specialization
+		name = generic_mio_trait_close_air_support_specialization
+		icon = GFX_generic_mio_trait_icon_air_ground_attack
+
+		position = { x=0 y=1 }
+		relative_position_id = generic_mio_trait_gun_pods
+
+		any_parent = { generic_mio_trait_heavier_airframe generic_mio_trait_maximum_wing_loads generic_mio_trait_gun_pods }
+
+		mutually_exclusive = { generic_mio_trait_multi_purpose_aircraft generic_mio_trait_fighter_specialization }
+
+		equipment_bonus = {
+			air_ground_attack = 0.05
+			air_defence = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_flexible_design
+		name = generic_mio_trait_flexible_design
+		icon = GFX_generic_mio_trait_icon_defense
+
+		position = { x=0 y=1 }
+		relative_position_id = generic_mio_trait_multi_purpose_aircraft
+
+		all_parents = { generic_mio_trait_multi_purpose_aircraft }
+
+		equipment_bonus = {
+			air_range = 0.05
+			air_defence = 0.05
+			air_attack = 0.02
+			air_ground_attack = 0.02
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_fighter_expertise
+		name = generic_mio_trait_fighter_expertise
+		icon = GFX_generic_mio_trait_icon_maximum_speed
+
+		position = { x=0 y=1 }
+		relative_position_id = generic_mio_trait_fighter_specialization
+
+		all_parents = { generic_mio_trait_fighter_specialization }
+
+		equipment_bonus = {
+			air_range = 0.05
+			maximum_speed = 0.05
+			air_attack = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_close_air_support_expertise
+		name = generic_mio_trait_close_air_support_expertise
+		icon = GFX_generic_mio_trait_icon_naval_range
+
+		position = { x=0 y=1 }
+		relative_position_id = generic_mio_trait_close_air_support_specialization
+
+		all_parents = { generic_mio_trait_close_air_support_specialization }
+
+		equipment_bonus = {
+			air_ground_attack = 0.05
+			air_range = 0.05
+			air_defence = 0.05
+		}
+	}
+}
+
+
+#MEDIUM AIRCRAFT MANUFACTURER - Based on Dornier / Caproni / de Havilland
+generic_medium_aircraft_organization = {
+	icon = GFX_idea_generic_air_manufacturer_3
+
+	allowed = {
+		always = no # Archetype only - countries using it have their own verisons
+	}
+
+	equipment_type = {
+		mio_cat_eq_all_medium_plane
+		transport_plane_equipment
+	}
+
+	research_categories = { mio_cat_all_medium_aircraft_and_modules }
+	
+	tree_header_text = {
+		text = mio_header_production
+		x = 1
+	}
+
+	tree_header_text = {
+		text = mio_header_engines
+		x = 3
+	}
+
+	tree_header_text = {
+		text = mio_header_wings
+		x = 5
+	}
+
+	tree_header_text = {
+		text = mio_header_weapons
+		x = 7
+	}
+
+	initial_trait = {
+		name = generic_mio_initial_trait_multi_role_tactical_aircraft
+
+		limit_to_equipment_type = { mio_cat_eq_all_medium_plane }
+
+		equipment_bonus = {
+			surface_detection = 0.05
+			air_ground_attack = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_narrow_build
+		name = generic_mio_trait_narrow_build
+		icon = GFX_generic_mio_department_icon_plane_medium_line_efficiency
+
+		position = { x=1 y=0 }
+
+		limit_to_equipment_type = { mio_cat_eq_all_medium_plane }
+
+		equipment_bonus = {
+			air_defence = 0.05
+		}
+
+		production_bonus = {
+			production_efficiency_gain_factor = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_mixed_material_construction
+		name = generic_mio_trait_mixed_material_construction
+		icon = GFX_generic_mio_department_icon_plane_medium_line_efficiency
+
+		position = { x=1 y=0 }
+		relative_position_id = generic_mio_trait_narrow_build
+
+		limit_to_equipment_type = { mio_cat_eq_all_medium_plane }
+
+		production_bonus = {
+			production_efficiency_gain_factor = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_multi_role_transport
+		name = generic_mio_trait_multi_role_transport
+		icon = GFX_generic_mio_department_icon_plane_general_technology
+
+		position = { x=0 y=1 }
+		relative_position_id = generic_mio_trait_mixed_material_construction
+
+		all_parents = { generic_mio_trait_mixed_material_construction }
+
+		limit_to_equipment_type = { transport_plane_equipment }
+
+		production_bonus = {
+			production_efficiency_gain_factor = 0.05
+			production_efficiency_cap_factor = 0.1
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_refined_engines
+		name = generic_mio_trait_refined_engines
+		icon = GFX_generic_mio_trait_icon_maximum_speed
+
+		position = { x=1 y=2 }
+		relative_position_id = generic_mio_trait_mixed_material_construction
+
+		all_parents = { generic_mio_trait_mixed_material_construction }
+
+		limit_to_equipment_type = { mio_cat_eq_all_medium_plane }
+
+		equipment_bonus = {
+			maximum_speed = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_twin_tail
+		name = generic_mio_trait_twin_tail
+		icon = GFX_generic_mio_trait_icon_air_agility
+
+		position = { x=2 y=0 }
+		relative_position_id = generic_mio_trait_mixed_material_construction
+
+		mutually_exclusive = { generic_mio_trait_reinforced_wing_braces }
+
+		limit_to_equipment_type = { mio_cat_eq_all_medium_plane }
+
+		equipment_bonus = {
+			air_agility = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_reinforced_wing_braces
+		name = generic_mio_trait_reinforced_wing_braces
+		icon = GFX_generic_mio_trait_icon_air_ground_attack
+
+		position = { x=2 y=0 }
+		relative_position_id = generic_mio_trait_twin_tail
+
+		mutually_exclusive = { generic_mio_trait_twin_tail }
+
+		limit_to_equipment_type = { mio_cat_eq_all_medium_plane }
+
+		equipment_bonus = {
+			air_ground_attack = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_expanded_cockpit
+		name = generic_mio_trait_expanded_cockpit
+		icon = GFX_generic_mio_department_icon_plane_medium_combat
+
+		position = { x=0 y=1 }
+		relative_position_id = generic_mio_trait_twin_tail
+
+		any_parent = { generic_mio_trait_twin_tail generic_mio_trait_reinforced_wing_braces }
+
+		mutually_exclusive = { generic_mio_trait_metal_nose_replacement }
+
+		limit_to_equipment_type = { mio_cat_eq_all_medium_plane }
+
+		equipment_bonus = {
+			air_ground_attack = 0.05
+			air_bombing = 0.05 #TODO_Manu: Not working
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_metal_nose_replacement
+		name = generic_mio_trait_metal_nose_replacement
+		icon = GFX_generic_mio_trait_icon_defense
+
+		position = { x=0 y=1 }
+		relative_position_id = generic_mio_trait_reinforced_wing_braces
+
+		any_parent = { generic_mio_trait_twin_tail generic_mio_trait_reinforced_wing_braces }
+
+		mutually_exclusive = { generic_mio_trait_expanded_cockpit }
+
+		limit_to_equipment_type = { mio_cat_eq_all_medium_plane }
+
+		equipment_bonus = {
+			air_defence = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_extra_machine_guns
+		name = generic_mio_trait_extra_machine_guns
+		icon = GFX_generic_mio_department_icon_plane_medium_combat
+
+		position = { x=1 y=2 }
+		relative_position_id = generic_mio_trait_reinforced_wing_braces
+
+		limit_to_equipment_type = { mio_cat_eq_all_medium_plane }
+
+		equipment_bonus = {
+			air_ground_attack = 0.1
+			build_cost_ic = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_streamlined_fuselage
+		name = generic_mio_trait_streamlined_fuselage
+		icon = GFX_generic_mio_trait_icon_maximum_speed
+
+		position = { x=1 y=2 }
+		relative_position_id = generic_mio_trait_expanded_cockpit
+
+		all_parents = { generic_mio_trait_refined_engines }
+		all_parents = { generic_mio_trait_extra_machine_guns }
+		any_parent = { generic_mio_trait_expanded_cockpit generic_mio_trait_metal_nose_replacement }
+
+		limit_to_equipment_type = { mio_cat_eq_all_medium_plane }
+
+		equipment_bonus = {
+			air_defence = 0.05
+			maximum_speed = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_adaptable_build
+		name = generic_mio_trait_adaptable_build
+		icon = GFX_generic_mio_department_icon_plane_medium_engine
+
+		position = { x=-2 y=1 }
+		relative_position_id = generic_mio_trait_streamlined_fuselage
+
+		all_parents = { generic_mio_trait_streamlined_fuselage }
+
+		mutually_exclusive = { generic_mio_trait_heavy_fighter_specialization generic_mio_trait_tactical_bomber_specialization }
+
+		limit_to_equipment_type = { mio_cat_eq_all_medium_plane }
+
+		equipment_bonus = {
+			air_range = 0.05
+		}
+
+		production_bonus = {
+			production_capacity_factor = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_heavy_fighter_specialization
+		name = generic_mio_trait_heavy_fighter_specialization
+		icon = GFX_generic_mio_department_icon_plane_medium_quality
+
+		position = { x=0 y=1 }
+		relative_position_id = generic_mio_trait_streamlined_fuselage
+
+		all_parents = { generic_mio_trait_streamlined_fuselage }
+
+		mutually_exclusive = { generic_mio_trait_adaptable_build generic_mio_trait_tactical_bomber_specialization }
+
+		limit_to_equipment_type = { mio_cat_eq_all_medium_plane }
+
+		equipment_bonus = {
+			air_range = 0.05
+			air_attack = 0.05
+			air_defence = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_tactical_bomber_specialization
+		name = generic_mio_trait_tactical_bomber_specialization
+		icon = GFX_generic_mio_department_icon_plane_medium_combat
+
+		position = { x=2 y=1 }
+		relative_position_id = generic_mio_trait_streamlined_fuselage
+
+		all_parents = { generic_mio_trait_streamlined_fuselage }
+
+		mutually_exclusive = { generic_mio_trait_adaptable_build generic_mio_trait_heavy_fighter_specialization }
+
+		limit_to_equipment_type = { mio_cat_eq_all_medium_plane }
+
+		equipment_bonus = {
+			air_range = 0.05
+			air_ground_attack = 0.05
+			air_defence = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_skip_bombing
+		name = generic_mio_trait_skip_bombing
+		icon = GFX_generic_mio_trait_icon_torpedo_attack
+
+		position = { x=2 y=0 }
+		relative_position_id = generic_mio_trait_reinforced_wing_braces
+
+		limit_to_equipment_type = { mio_cat_eq_all_medium_plane }
+
+		equipment_bonus = {
+			naval_strike_attack = 0.03
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_high_frequency_direction_finding
+		name = generic_mio_trait_high_frequency_direction_finding
+		icon = GFX_generic_mio_trait_icon_sub_detection
+
+		position = { x=0 y=2 }
+		relative_position_id = generic_mio_trait_skip_bombing
+
+		all_parents = { generic_mio_trait_skip_bombing }
+
+		limit_to_equipment_type = { mio_cat_eq_all_medium_plane }
+
+		equipment_bonus = {
+			sub_detection = 0.05
+			naval_strike_attack = 0.03
+		}
+	}
+}
+
+
+#HEAVY AIRCRAFT MANUFACTURER - Based on John Brown (ENG)
+generic_heavy_aircraft_organization = {
+	icon = GFX_idea_generic_air_manufacturer_2
+
+	allowed = {
+		always = no # Archetype only - countries using it have their own verisons
+	}
+
+	equipment_type = {
+		large_plane_airframe
+		large_plane_maritime_patrol_plane_airframe
+		transport_plane_equipment
+	}
+
+	research_categories = { mio_cat_all_heavy_aircraft_and_modules }
+	
+	tree_header_text = {
+		text = mio_header_design_department
+		x = 2
+	}
+
+	tree_header_text = {
+		text = mio_header_operational_department
+		x = 8
+	}
+
+	initial_trait = {
+		name = generic_mio_initial_trait_heavy_aircraft_designer
+
+		limit_to_equipment_type = { large_plane_airframe large_plane_maritime_patrol_plane_airframe }
+
+		organization_modifier = {
+			military_industrial_organization_research_bonus = 0.05
+		}
+		equipment_bonus = {
+			air_bombing = 0.05
+			air_agility = -0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_reinforced_frames
+		name = generic_mio_trait_reinforced_frames
+		icon = GFX_generic_mio_trait_icon_defense
+
+		position = { x=2 y=0 }
+
+		limit_to_equipment_type = { large_plane_airframe large_plane_maritime_patrol_plane_airframe }
+
+		equipment_bonus = {
+			air_defence = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_standardized_alloys
+		name = generic_mio_trait_standardized_alloys
+		icon = GFX_generic_mio_trait_icon_resources
+
+		position = { x=0 y=1 }
+		relative_position_id = generic_mio_trait_reinforced_frames
+
+		any_parent = { generic_mio_trait_reinforced_frames }
+
+		production_bonus = {
+			production_efficiency_gain_factor = 0.05
+			production_resource_penalty_factor = -0.1
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_transport_conversions
+		name = generic_mio_trait_transport_conversions
+		icon = GFX_generic_mio_department_icon_plane_general_production
+
+		position = { x=-2 y=1 }
+		relative_position_id = generic_mio_trait_standardized_alloys
+
+		any_parent = { generic_mio_trait_standardized_alloys }
+
+		limit_to_equipment_type = { transport_plane_equipment }
+
+		production_bonus = {
+			production_capacity_factor = 0.1
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_drop_hammer_alloy_straining
+		name = generic_mio_trait_drop_hammer_alloy_straining
+		icon = GFX_generic_mio_trait_icon_reliability
+
+		position = { x=0 y=1 }
+		relative_position_id = generic_mio_trait_standardized_alloys
+
+		any_parent = { generic_mio_trait_standardized_alloys }
+
+		limit_to_equipment_type = { large_plane_airframe large_plane_maritime_patrol_plane_airframe }
+
+		equipment_bonus = {
+			air_defence = 0.05
+			reliability = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_refined_secondary_aluminium
+		name = generic_mio_trait_refined_secondary_aluminium
+		icon = GFX_generic_mio_trait_icon_resources
+
+		position = { x=-1 y=2 }
+		relative_position_id = generic_mio_trait_drop_hammer_alloy_straining
+
+		any_parent = { generic_mio_trait_drop_hammer_alloy_straining }
+
+		mutually_exclusive = { generic_mio_trait_high_quality_aluminium_alloys }
+
+		limit_to_equipment_type = { large_plane_airframe large_plane_maritime_patrol_plane_airframe }
+
+		production_bonus = {
+			production_capacity_factor = 0.05
+			production_resource_need_factor = -0.15
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_high_quality_aluminium_alloys
+		name = generic_mio_trait_high_quality_aluminium_alloys
+		icon = GFX_generic_mio_trait_icon_air_agility
+
+		position = { x=1 y=2 }
+		relative_position_id = generic_mio_trait_drop_hammer_alloy_straining
+
+		any_parent = { generic_mio_trait_drop_hammer_alloy_straining }
+
+		mutually_exclusive = { generic_mio_trait_refined_secondary_aluminium }
+
+		limit_to_equipment_type = { large_plane_airframe large_plane_maritime_patrol_plane_airframe }
+
+		equipment_bonus = {
+			air_agility = 0.05
+			reliability = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_pressurized_cockpit
+		name = generic_mio_trait_pressurized_cockpit
+		icon = GFX_generic_mio_trait_icon_naval_range
+
+		position = { x=3 y=1 }
+		relative_position_id = generic_mio_trait_reinforced_frames
+
+		any_parent = { generic_mio_trait_reinforced_frames generic_mio_trait_extended_rear_fuselage }
+
+		limit_to_equipment_type = { large_plane_airframe large_plane_maritime_patrol_plane_airframe }
+
+		equipment_bonus = {
+			air_range = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_advanced_turbochargers
+		name = generic_mio_trait_advanced_turbochargers
+		icon = GFX_generic_mio_trait_icon_air_agility
+
+		position = { x=0 y=2 }
+		relative_position_id = generic_mio_trait_pressurized_cockpit
+
+		any_parent = { generic_mio_trait_pressurized_cockpit }
+
+		limit_to_equipment_type = { large_plane_airframe large_plane_maritime_patrol_plane_airframe }
+
+		equipment_bonus = {
+			air_agility = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_extended_rear_fuselage
+		name = generic_mio_trait_extended_rear_fuselage
+		icon = GFX_generic_mio_trait_icon_strategic_attack
+
+		position = { x=6 y=0 }
+		relative_position_id = generic_mio_trait_reinforced_frames
+
+		limit_to_equipment_type = { large_plane_airframe large_plane_maritime_patrol_plane_airframe }
+
+		equipment_bonus = {
+			air_bombing = 0.05
+			naval_strike_attack = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_auto_levelled_bombsights
+		name = generic_mio_trait_auto_levelled_bombsights
+		icon = GFX_generic_mio_trait_icon_strategic_attack
+
+		position = { x=-1 y=1 }
+		relative_position_id = generic_mio_trait_extended_rear_fuselage
+
+		any_parent = { generic_mio_trait_extended_rear_fuselage }
+
+		mutually_exclusive = { generic_mio_trait_air_deployed_sonobuoys }
+
+		limit_to_equipment_type = { large_plane_airframe large_plane_maritime_patrol_plane_airframe }
+
+		equipment_bonus = {
+			air_bombing = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_air_deployed_sonobuoys
+		name = generic_mio_trait_air_deployed_sonobuoys
+		icon = GFX_generic_mio_trait_icon_detection
+
+		position = { x=1 y=1 }
+		relative_position_id = generic_mio_trait_extended_rear_fuselage
+
+		any_parent = { generic_mio_trait_extended_rear_fuselage }
+
+		mutually_exclusive = { generic_mio_trait_auto_levelled_bombsights }
+
+		limit_to_equipment_type = { large_plane_airframe large_plane_maritime_patrol_plane_airframe }
+
+		equipment_bonus = {
+			sub_detection = 0.05
+			surface_detection = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_cockpit_controlled_remote_gun_turrets
+		name = generic_mio_trait_cockpit_controlled_remote_gun_turrets
+		icon = GFX_generic_mio_trait_icon_anti_air_attack
+
+		position = { x=1 y=1 }
+		relative_position_id = generic_mio_trait_auto_levelled_bombsights
+
+		any_parent = { generic_mio_trait_auto_levelled_bombsights generic_mio_trait_air_deployed_sonobuoys }
+
+		limit_to_equipment_type = { large_plane_airframe large_plane_maritime_patrol_plane_airframe }
+
+		equipment_bonus = {
+			air_attack = 0.05
+		}
+	}
+	
+	trait = {
+		token = generic_mio_trait_flying_fortress
+		name = generic_mio_trait_flying_fortress
+		icon = GFX_generic_mio_department_icon_plane_general_engine
+
+		position = { x=-1 y=2 }
+		relative_position_id = generic_mio_trait_cockpit_controlled_remote_gun_turrets
+
+		any_parent = { generic_mio_trait_cockpit_controlled_remote_gun_turrets }
+
+		mutually_exclusive = { generic_mio_trait_advanced_instruments }
+
+		limit_to_equipment_type = { large_plane_airframe large_plane_maritime_patrol_plane_airframe }
+
+		equipment_bonus = {
+			air_defence = 0.15
+			air_range = 0.15
+			air_agility = -0.05
+			fuel_consumption = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_advanced_instruments
+		name = generic_mio_trait_advanced_instruments
+		icon = GFX_generic_mio_trait_icon_strategic_attack
+
+		position = { x=1 y=2 }
+		relative_position_id = generic_mio_trait_cockpit_controlled_remote_gun_turrets
+
+		any_parent = { generic_mio_trait_cockpit_controlled_remote_gun_turrets }
+
+		mutually_exclusive = { generic_mio_trait_flying_fortress }
+
+		limit_to_equipment_type = { large_plane_airframe large_plane_maritime_patrol_plane_airframe }
+
+		equipment_bonus = {
+			air_bombing = 0.05
+			naval_strike_targetting = 0.05
+		}
+	}
+}
+
+
+#CAS AIRCRAFT MANUFACTURER - Based on Junkers / Ilyushin
+generic_cas_aircraft_organization = {
+	icon = GFX_idea_generic_air_manufacturer_1
+
+	allowed = {
+		always = no # Archetype only - countries using it have their own verisons
+	}
+
+	equipment_type = {
+		small_plane_cas_airframe
+		cv_small_plane_cas_airframe
+	}
+
+	research_categories = {	mio_cat_all_cas_and_modules }
+	
+	tree_header_text = {
+		text = mio_header_production
+		x = 1
+	}
+
+	tree_header_text = {
+		text = mio_header_engines
+		x = 3
+	}
+
+	tree_header_text = {
+		text = mio_header_wings
+		x = 5
+	}
+
+	tree_header_text = {
+		text = mio_header_weapons
+		x = 7
+	}
+
+	initial_trait = {
+		name = generic_mio_initial_trait_cas_aircraft_designer
+
+		equipment_bonus = {
+			air_ground_attack = 0.05
+			maximum_speed = -0.03
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_selectional_construction
+		name = generic_mio_trait_selectional_construction
+		icon = GFX_generic_mio_department_icon_plane_cas_line_efficiency
+
+		position = { x=0 y=0 }
+
+		production_bonus = {
+			production_efficiency_gain_factor = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_low_altitude_attacks
+		name = generic_mio_trait_low_altitude_attacks
+		icon = GFX_generic_mio_trait_icon_defense
+
+		position = { x=2 y=0 }
+		relative_position_id = generic_mio_trait_selectional_construction
+
+		equipment_bonus = {
+			air_defence = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_canopies_and_firewalls
+		name = generic_mio_trait_canopies_and_firewalls
+		icon = GFX_generic_mio_trait_icon_reliability
+
+		position = { x=1 y=0 }
+		relative_position_id = generic_mio_trait_selectional_construction
+
+		equipment_bonus = {
+			air_defence = 0.05
+			reliability = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_automatic_pull_out
+		name = generic_mio_trait_automatic_pull_out
+		icon = GFX_generic_mio_trait_icon_air_ground_attack
+
+		position = { x=1 y=1 }
+		relative_position_id = generic_mio_trait_canopies_and_firewalls
+
+		all_parents = { generic_mio_trait_canopies_and_firewalls }
+
+		equipment_bonus = {
+			air_ground_attack = 0.05
+			reliability = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_integrated_armor_designs
+		name = generic_mio_trait_integrated_armor_designs
+		icon = GFX_generic_mio_trait_icon_defense
+
+		position = { x=0 y=2 }
+		relative_position_id = generic_mio_trait_canopies_and_firewalls
+
+		all_parents = { generic_mio_trait_canopies_and_firewalls }
+
+		equipment_bonus = {
+			air_defence = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_gull_wings
+		name = generic_mio_trait_gull_wings
+		icon = GFX_generic_mio_trait_icon_air_ground_attack		
+
+		position = { x=2 y=0 }
+		relative_position_id = generic_mio_trait_low_altitude_attacks
+
+		mutually_exclusive = { generic_mio_trait_reinforced_wings }
+
+		equipment_bonus = {
+			air_ground_attack = 0.1
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_reinforced_wings
+		name = generic_mio_trait_reinforced_wings
+		icon = GFX_generic_mio_department_icon_plane_cas_combat
+
+		position = { x=2 y=0 }
+		relative_position_id = generic_mio_trait_gull_wings
+
+		mutually_exclusive = { generic_mio_trait_gull_wings }
+
+		equipment_bonus = {
+			air_ground_attack = 0.03
+			air_attack = 0.03
+			air_defence = 0.03
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_heavily_armed_aircraft
+		name = generic_mio_trait_heavily_armed_aircraft
+		icon = GFX_generic_mio_department_icon_plane_cas_combat
+
+		position = { x=1 y=1 }
+		relative_position_id = generic_mio_trait_gull_wings
+
+		any_parent = { generic_mio_trait_gull_wings generic_mio_trait_reinforced_wings }
+
+		equipment_bonus = {
+			air_attack = 0.05
+			air_ground_attack = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_air_brakes
+		name = generic_mio_trait_air_brakes
+		icon = GFX_generic_mio_trait_icon_air_ground_attack			
+
+		position = { x=0 y=2 }
+		relative_position_id = generic_mio_trait_gull_wings
+
+		all_parents = { generic_mio_trait_gull_wings }
+
+		equipment_bonus = {
+			air_ground_attack = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_wingborne_fuel_tanks
+		name = generic_mio_trait_wingborne_fuel_tanks
+		icon = GFX_generic_mio_trait_icon_naval_range
+
+		position = { x=0 y=2 }
+		relative_position_id = generic_mio_trait_reinforced_wings
+
+		all_parents = { generic_mio_trait_reinforced_wings }
+
+		equipment_bonus = {
+			air_range = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_bombs
+		name = generic_mio_trait_bombs
+		icon = GFX_generic_mio_trait_icon_air_ground_attack			
+
+		position = { x=0 y=2 }
+		relative_position_id = generic_mio_trait_air_brakes
+
+		all_parents = { generic_mio_trait_air_brakes }
+
+		mutually_exclusive = { generic_mio_trait_rockets }
+
+		equipment_bonus = {
+			air_ground_attack = 0.1
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_rockets
+		name = generic_mio_trait_rockets
+		icon = GFX_generic_mio_department_icon_plane_cas_combat		
+
+		position = { x=0 y=2 }
+		relative_position_id = generic_mio_trait_wingborne_fuel_tanks
+
+		all_parents = { generic_mio_trait_wingborne_fuel_tanks }
+
+		mutually_exclusive = { generic_mio_trait_bombs }
+
+		equipment_bonus = {
+			air_ground_attack = 0.05
+			air_agility = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_heat_bombs
+		name = generic_mio_heat_bombs
+		icon = GFX_generic_mio_trait_icon_air_ground_attack	
+
+		position = { x=1 y=0 }
+		relative_position_id = generic_mio_trait_reinforced_wings
+
+		equipment_bonus = {
+			air_ground_attack = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_cluster_bombs
+		name = generic_mio_cluster_bombs
+		icon = GFX_generic_mio_trait_icon_air_ground_attack	
+
+		position = { x=0 y=2 }
+		relative_position_id = generic_mio_heat_bombs
+
+		all_parents = { generic_mio_heat_bombs }
+
+		equipment_bonus = {
+			air_ground_attack = 0.05
+		}
+	}
+}
+
+
+#NAVAL AIRCRAFT MANUFACTURER - Based on Junkers / Ilyushin
+generic_naval_aircraft_organization = {
+	icon = GFX_idea_generic_air_manufacturer_1
+
+	allowed = {
+		always = no # Archetype only - countries using it have their own verisons
+	}
+
+	equipment_type = {
+		small_plane_naval_bomber_airframe
+		cv_small_plane_airframe
+		cv_small_plane_cas_airframe
+		cv_small_plane_naval_bomber_airframe
+	}
+
+	research_categories = { mio_cat_all_naval_bomber_and_modules }
+
+	tree_header_text = {
+		text = mio_header_operational_department
+		x = 1
+	}
+	
+	tree_header_text = {
+		text = mio_header_design_department
+		x = 4
+	}
+
+	tree_header_text = {
+		text = mio_header_engines_department
+		x = 7
+	}
+
+	initial_trait = {
+		name = generic_mio_initial_trait_naval_aircraft_designer
+
+		organization_modifier = {
+			military_industrial_organization_research_bonus = 0.05
+		}
+
+		production_bonus = {
+			production_capacity_factor = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_navigation_equipment
+		name = generic_mio_trait_navigation_equipment
+		icon = GFX_generic_mio_trait_icon_reliability
+
+		position = { x=4 y=0 }
+
+		equipment_bonus = {
+			reliability = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_patrol_fuel_tanks
+		name = generic_mio_trait_patrol_fuel_tanks
+		icon = GFX_generic_mio_trait_icon_naval_range
+
+		position = { x=-4 y=1 }
+		relative_position_id = generic_mio_trait_navigation_equipment
+
+		all_parents = { generic_mio_trait_navigation_equipment }
+
+		mutually_exclusive = { generic_mio_trait_internal_torpedo_mountings }
+
+		limit_to_equipment_type = { small_plane_naval_bomber_airframe cv_small_plane_naval_bomber_airframe }
+
+		equipment_bonus = {
+			air_range = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_internal_torpedo_mountings
+		name = generic_mio_trait_internal_torpedo_mountings
+		icon = GFX_generic_mio_trait_icon_maximum_speed
+
+		position = { x=2 y=0 }
+		relative_position_id = generic_mio_trait_patrol_fuel_tanks
+
+		all_parents = { generic_mio_trait_navigation_equipment }
+
+		mutually_exclusive = { generic_mio_trait_patrol_fuel_tanks }
+
+		limit_to_equipment_type = { small_plane_naval_bomber_airframe cv_small_plane_naval_bomber_airframe }
+
+		equipment_bonus = {
+			maximum_speed = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_high_speed_torpedo_release
+		name = generic_mio_trait_high_speed_torpedo_release
+		icon = GFX_generic_mio_trait_icon_surface_detection
+
+		position = { x=1 y=1 }
+		relative_position_id = generic_mio_trait_patrol_fuel_tanks
+
+		any_parent = { generic_mio_trait_patrol_fuel_tanks generic_mio_trait_internal_torpedo_mountings }
+
+		limit_to_equipment_type = { small_plane_naval_bomber_airframe cv_small_plane_naval_bomber_airframe }
+
+		equipment_bonus = {
+			surface_detection = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_reinforced_fuselage
+		name = generic_mio_trait_reinforced_fuselage
+		icon = GFX_generic_mio_trait_icon_reliability
+
+		position = { x=0 y=1 }
+		relative_position_id = generic_mio_trait_navigation_equipment
+
+		all_parents = { generic_mio_trait_navigation_equipment }
+
+		equipment_bonus = {
+			reliability = 0.05
+			air_defence = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_agility_wing_design
+		name = generic_mio_agility_wing_design
+		icon = GFX_generic_mio_trait_icon_air_agility
+
+		position = { x=-1 y=1 }
+		relative_position_id = generic_mio_trait_reinforced_fuselage
+
+		all_parents = { generic_mio_trait_reinforced_fuselage }
+
+		mutually_exclusive = { generic_mio_strength_wing_design }
+
+		equipment_bonus = {
+			air_range = 0.05
+			air_agility = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_strength_wing_design
+		name = generic_mio_strength_wing_design
+		icon = GFX_generic_mio_trait_icon_defense
+
+		position = { x=1 y=1 }
+		relative_position_id = generic_mio_trait_reinforced_fuselage
+
+		all_parents = { generic_mio_trait_reinforced_fuselage }
+
+		mutually_exclusive = { generic_mio_agility_wing_design }
+
+		equipment_bonus = {
+			air_range = 0.05
+			air_defence = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_high_capacity_ammunition_stores
+		name = generic_mio_high_capacity_ammunition_stores
+		icon = GFX_generic_mio_trait_icon_anti_air_attack
+
+		position = { x=0 y=2 }
+		relative_position_id = generic_mio_agility_wing_design
+
+		all_parents = { generic_mio_agility_wing_design }
+
+		equipment_bonus = {
+			air_attack = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_larger_bomb_loads
+		name = generic_mio_larger_bomb_loads
+		icon = GFX_generic_mio_trait_icon_air_ground_attack
+
+		position = { x=0 y=2 }
+		relative_position_id = generic_mio_strength_wing_design
+
+		all_parents = { generic_mio_strength_wing_design }
+
+		equipment_bonus = {
+			air_ground_attack = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_air_cooled_engines
+		name = generic_mio_air_cooled_engines
+		icon = GFX_generic_mio_trait_icon_reliability
+
+		position = { x=3 y=1 }
+		relative_position_id = generic_mio_trait_navigation_equipment
+
+		all_parents = { generic_mio_trait_navigation_equipment }
+
+		limit_to_equipment_type = {
+			cv_small_plane_airframe
+			cv_small_plane_cas_airframe
+			cv_small_plane_naval_bomber_airframe
+		}
+
+		equipment_bonus = {
+			reliability = 0.05
+			air_defence = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_multi_stage_super_charger
+		name = generic_mio_multi_stage_super_charger
+		icon = GFX_generic_mio_trait_icon_maximum_speed
+
+		position = { x=0 y=1 }
+		relative_position_id = generic_mio_air_cooled_engines
+
+		all_parents = { generic_mio_air_cooled_engines }
+
+		limit_to_equipment_type = {
+			cv_small_plane_airframe
+		}
+
+		equipment_bonus = {
+			air_agility = 0.05
+			maximum_speed = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_water_injection
+		name = generic_mio_water_injection
+		icon = GFX_generic_mio_trait_icon_fuel_consumption
+
+		position = { x=0 y=1 }
+		relative_position_id = generic_mio_multi_stage_super_charger
+
+		all_parents = { generic_mio_multi_stage_super_charger }
+
+		limit_to_equipment_type = {
+			cv_small_plane_airframe
+		}
+
+		equipment_bonus = {
+			fuel_consumption = -0.05
+			maximum_speed = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_advanced_materials
+		name = generic_mio_advanced_materials
+		icon = GFX_generic_mio_trait_icon_build_cost_ic
+
+		position = { x=0 y=1 }
+		relative_position_id = generic_mio_water_injection
+
+		all_parents = { generic_mio_water_injection }
+
+		production_bonus = {
+			production_cost_factor = -0.1
+			production_resource_need_factor = 0.1
+		}
+	}
+}
+
+
+
+#MULTI-ROLE AIRCRAFT MANUFACTURER - Based on Savoia Marchetti (ITA) & Republic
+generic_multi_role_aircraft_organization = {
+	icon = GFX_idea_generic_air_manufacturer_3
+
+	allowed = {
+		always = no # Archetype only - countries using it have their own verisons
+	}
+
+	equipment_type = {
+		mio_cat_eq_all_small_plane
+		mio_cat_eq_all_medium_plane
+		transport_plane_equipment
+	}
+
+	research_categories = { mio_cat_all_light_aircraft_and_modules mio_cat_all_medium_aircraft_and_modules }
+	
+	tree_header_text = {
+		text = mio_header_light_aircraft
+		x = 3
+	}
+
+	tree_header_text = {
+		text = mio_header_medium_aircraft
+		x = 6
+	}
+
+	initial_trait = {
+		name = generic_mio_initial_trait_multi_role_aircraft_designer
+
+		limit_to_equipment_type = { mio_cat_eq_all_small_plane mio_cat_eq_all_medium_plane }
+
+		equipment_bonus = {
+			air_ground_attack = 0.02
+			naval_strike_attack = 0.02
+			air_attack = 0.02
+			air_defence = 0.02
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_armored_cockpit
+		name = generic_mio_trait_armored_cockpit
+		icon = GFX_generic_mio_trait_icon_reliability
+
+		position = { x=3 y=0 }
+
+		limit_to_equipment_type = { mio_cat_eq_all_small_plane mio_cat_eq_all_medium_plane }
+
+		equipment_bonus = {
+			air_defence = 0.05
+			reliability = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_escort_designs
+		name = generic_mio_trait_escort_designs
+		icon = GFX_generic_mio_trait_icon_naval_range
+
+		position = { x=3 y=0 }
+		relative_position_id = generic_mio_trait_armored_cockpit
+
+		limit_to_equipment_type = { mio_cat_eq_all_small_plane mio_cat_eq_all_medium_plane }
+
+		equipment_bonus = {
+			air_range = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_light_airframe
+		name = generic_mio_trait_light_airframe
+		icon = GFX_generic_mio_department_icon_plane_light_line_efficiency
+
+		position = { x=0 y=1 }
+		relative_position_id = generic_mio_trait_armored_cockpit
+
+		all_parents = { generic_mio_trait_armored_cockpit generic_mio_trait_escort_designs }
+
+		mutually_exclusive = { generic_mio_trait_medium_airframe }
+
+		limit_to_equipment_type = { mio_cat_eq_all_small_plane }
+
+		organization_modifier = {
+			military_industrial_organization_research_bonus = 0.05
+		}
+
+		production_bonus = {
+			production_efficiency_gain_factor = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_medium_airframe
+		name = generic_mio_trait_medium_airframe
+		icon = GFX_generic_mio_department_icon_plane_medium_line_efficiency
+
+		position = { x=0 y=1 }
+		relative_position_id = generic_mio_trait_escort_designs
+
+		all_parents = { generic_mio_trait_armored_cockpit generic_mio_trait_escort_designs }
+
+		mutually_exclusive = { generic_mio_trait_light_airframe }
+
+		limit_to_equipment_type = { mio_cat_eq_all_medium_plane }
+
+		organization_modifier = {
+			military_industrial_organization_research_bonus = 0.05
+		}
+
+		production_bonus = {
+			production_efficiency_gain_factor = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_hardened_frames
+		name = generic_mio_trait_hardened_frames
+		icon = GFX_generic_mio_trait_icon_defense
+
+		position = { x=-2 y=1 }
+		relative_position_id = generic_mio_trait_light_airframe
+
+		all_parents = { generic_mio_trait_light_airframe }
+
+		limit_to_equipment_type = { mio_cat_eq_all_small_plane }
+
+		equipment_bonus = {
+			air_defence = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_belly_shackles
+		name = generic_mio_trait_belly_shackles
+		icon = GFX_generic_mio_department_icon_plane_light_combat
+
+		position = { x=1 y=0 }
+		relative_position_id = generic_mio_trait_hardened_frames
+
+		all_parents = { generic_mio_trait_light_airframe }
+
+		limit_to_equipment_type = { mio_cat_eq_all_small_plane }
+
+		equipment_bonus = {
+			air_ground_attack = 0.05
+			naval_strike_attack = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_oversized_propeller
+		name = generic_mio_trait_oversized_propeller
+		icon = GFX_generic_mio_trait_icon_maximum_speed
+
+		position = { x=0 y=2 }
+		relative_position_id = generic_mio_trait_light_airframe
+
+		all_parents = { generic_mio_trait_light_airframe }
+
+		limit_to_equipment_type = { mio_cat_eq_all_small_plane }
+
+		equipment_bonus = {
+			maximum_speed = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_variable_pitch_propellers
+		name = generic_mio_trait_variable_pitch_propellers
+		icon = GFX_generic_mio_trait_icon_air_agility
+
+		position = { x=0 y=2 }
+		relative_position_id = generic_mio_trait_medium_airframe
+
+		all_parents = { generic_mio_trait_medium_airframe }
+
+		limit_to_equipment_type = { mio_cat_eq_all_medium_plane }
+
+		equipment_bonus = {
+			maximum_speed = 0.05
+			air_agility = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_upgraded_air_air_weapons
+		name = generic_mio_trait_upgraded_air_air_weapons
+		icon = GFX_generic_mio_trait_icon_anti_air_attack
+
+		position = { x=1 y=1 }
+		relative_position_id = generic_mio_trait_medium_airframe
+
+		all_parents = { generic_mio_trait_medium_airframe }
+
+		limit_to_equipment_type = { mio_cat_eq_all_medium_plane }
+
+		equipment_bonus = {
+			air_attack = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_reinforced_wing_hardpoints
+		name = generic_mio_trait_reinforced_wing_hardpoints
+		icon = GFX_generic_mio_department_icon_plane_medium_combat
+
+		position = { x=1 y=0 }
+		relative_position_id = generic_mio_trait_upgraded_air_air_weapons
+
+		all_parents = { generic_mio_trait_medium_airframe }
+
+		limit_to_equipment_type = { mio_cat_eq_all_medium_plane }
+
+		equipment_bonus = {
+			air_ground_attack = 0.05
+			naval_strike_attack = 0.05
+			air_bombing = 0.05 #TODO_Manu: NOT WORKING
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_transport_duties
+		name = generic_mio_trait_transport_duties
+		icon = GFX_generic_mio_department_icon_plane_general_production
+
+		position = { x=1 y=0 }
+		relative_position_id = generic_mio_trait_reinforced_wing_hardpoints
+
+		all_parents = { generic_mio_trait_medium_airframe }
+
+		limit_to_equipment_type = { transport_plane_equipment }
+
+		production_bonus = {
+			production_capacity_factor = 0.1
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_upgraded_engines
+		name = generic_mio_trait_upgraded_engines
+		icon = GFX_generic_mio_department_icon_plane_general_engine
+
+		position = { x=1 y=1 }
+		relative_position_id = generic_mio_trait_light_airframe
+
+		any_parent = { generic_mio_trait_light_airframe generic_mio_trait_medium_airframe }
+
+		limit_to_equipment_type = { mio_cat_eq_all_small_plane mio_cat_eq_all_medium_plane }
+
+		equipment_bonus = {
+			maximum_speed = 0.05
+			air_agility = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_not_enough_guns_never_enough_guns
+		name = generic_mio_trait_not_enough_guns_never_enough_guns
+		icon = GFX_generic_mio_department_icon_plane_general_combat
+
+		position = { x=1 y=0 }
+		relative_position_id = generic_mio_trait_upgraded_engines
+
+		any_parent = { generic_mio_trait_light_airframe generic_mio_trait_medium_airframe }
+
+		limit_to_equipment_type = { mio_cat_eq_all_small_plane mio_cat_eq_all_medium_plane }
+
+		equipment_bonus = {
+			air_attack = 0.05
+			air_ground_attack = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_lengthened_wings
+		name = generic_mio_trait_lengthened_wings
+		icon = GFX_generic_mio_trait_icon_naval_range
+
+		position = { x=0 y=1 }
+		relative_position_id = generic_mio_trait_upgraded_engines
+
+		all_parents = { generic_mio_trait_upgraded_engines }
+
+		limit_to_equipment_type = { mio_cat_eq_all_small_plane mio_cat_eq_all_medium_plane }
+
+		equipment_bonus = {
+			air_range = 0.05
+			air_attack = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_bubble_canopy
+		name = generic_mio_trait_bubble_canopy
+		icon = GFX_generic_mio_trait_icon_defense
+
+		position = { x=0 y=1 }
+		relative_position_id = generic_mio_trait_not_enough_guns_never_enough_guns
+
+		all_parents = { generic_mio_trait_not_enough_guns_never_enough_guns }
+
+		limit_to_equipment_type = { mio_cat_eq_all_small_plane mio_cat_eq_all_medium_plane }
+
+		equipment_bonus = {
+			air_defence = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_fighter_specialization
+		name = generic_mio_trait_fighter_specialization
+		icon = GFX_generic_mio_department_icon_plane_general_engine
+
+		position = { x=-1 y=1 }
+		relative_position_id = generic_mio_trait_lengthened_wings
+
+		all_parents = { generic_mio_trait_lengthened_wings generic_mio_trait_bubble_canopy }
+
+		mutually_exclusive = { generic_mio_trait_bomber_specialization }
+
+		limit_to_equipment_type = { mio_cat_eq_all_small_plane mio_cat_eq_all_medium_plane }
+
+		equipment_bonus = {
+			air_attack = 0.05
+			air_agility = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_bomber_specialization
+		name = generic_mio_trait_bomber_specialization
+		icon = GFX_generic_mio_department_icon_plane_general_combat
+
+		position = { x=1 y=1 }
+		relative_position_id = generic_mio_trait_bubble_canopy
+
+		all_parents = { generic_mio_trait_lengthened_wings generic_mio_trait_bubble_canopy }
+
+		mutually_exclusive = { generic_mio_trait_fighter_specialization }
+
+		limit_to_equipment_type = { mio_cat_eq_all_small_plane mio_cat_eq_all_medium_plane }
+
+		equipment_bonus = {
+			air_ground_attack = 0.03
+			naval_strike_attack = 0.03
+			naval_strike_targetting = 0.03
+		}
+	}
+}
+
+
+#HIGH AGILITY FIGHTER AIRCRAFT MANUFACTURER - Based on Supermarine (ENG)
+generic_high_agility_fighter_aircraft_organization = {
+	icon = GFX_idea_generic_air_manufacturer_1
+
+	allowed = {
+		always = no # Archetype only - countries using it have their own verisons
+	}
+
+	equipment_type = {
+		mio_cat_eq_only_light_fighter
+	}
+
+	research_categories = {	mio_cat_all_light_fighter_and_modules }
+	
+	tree_header_text = {
+		text = mio_header_production
+		x = 1
+	}
+
+	tree_header_text = {
+		text = mio_header_engines
+		x = 3
+	}
+
+	tree_header_text = {
+		text = mio_header_wings
+		x = 5
+	}
+
+	tree_header_text = {
+		text = mio_header_weapons
+		x = 7
+	}
+
+	initial_trait = {
+		name = generic_mio_initial_trait_high_agility_fighters_designer
+
+		equipment_bonus = {
+			air_agility = 0.10
+			air_range = -0.10
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_fabric_skin
+		name = generic_mio_trait_fabric_skin
+		icon = GFX_generic_mio_department_icon_plane_general_production
+
+		position = { x=0 y=0 }
+
+		mutually_exclusive = { generic_mio_trait_metal_skin }
+
+		production_bonus = {
+			production_resource_penalty_factor = 0.05
+			production_capacity_factor = 0.05
+		}
+
+		equipment_bonus = {
+			air_agility = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_metal_skin
+		name = generic_mio_trait_metal_skin
+		icon = GFX_generic_mio_trait_icon_defense
+
+		position = { x=2 y=0 }
+		relative_position_id = generic_mio_trait_fabric_skin
+
+		mutually_exclusive = { generic_mio_trait_fabric_skin }
+
+		equipment_bonus = {
+			air_defence = 0.10
+			maximum_speed = 0.05
+		}
+	}
+
+
+	trait = {
+		token = generic_mio_trait_bigger_engines
+		name = generic_mio_trait_bigger_engines
+		icon = GFX_generic_mio_trait_icon_maximum_speed
+		relative_position_id = generic_mio_trait_fabric_skin
+
+		position = { x=3 y=0 }
+
+		equipment_bonus = {
+			maximum_speed = 0.05
+		}
+	}
+
+
+	trait = {
+		token = generic_mio_trait_high_octane_fuels
+		name = generic_mio_trait_high_octane_fuels
+		icon = GFX_generic_mio_trait_icon_maximum_speed
+
+		position = { x=1 y=2 }
+		relative_position_id = generic_mio_trait_bigger_engines
+
+		all_parents = { 
+			generic_mio_trait_bigger_engines
+		}
+
+		equipment_bonus = {
+			maximum_speed = 0.15
+			fuel_consumption_factor = 0.10
+		}
+
+	}
+
+	trait = {
+		token = generic_mio_trait_fuel_injection_engines
+		name = generic_mio_trait_fuel_injection_engines
+		icon = GFX_generic_mio_trait_icon_air_agility
+
+		position = { x=0 y=3 }
+		relative_position_id = generic_mio_trait_bigger_engines
+
+		all_parents = { 
+			generic_mio_trait_bigger_engines
+		}
+
+		equipment_bonus = {
+			maximum_speed = 0.05
+			air_agility = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_subsidiary_suppliers
+		name = generic_mio_trait_subsidiary_suppliers
+		icon = GFX_generic_mio_department_icon_plane_fighter_technology
+
+		position = { x=0 y=1 }
+		relative_position_id = generic_mio_trait_fuel_injection_engines
+
+		all_parents = { 
+			generic_mio_trait_fuel_injection_engines
+		}
+
+		mutually_exclusive = { generic_mio_trait_fighter_interceptors }
+
+		production_bonus = {
+			production_efficiency_cap_factor = 0.10
+			production_efficiency_gain_factor = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_cantilever_wing_structure
+		name = generic_mio_trait_cantilever_wing_structure
+		icon = GFX_generic_mio_trait_icon_air_agility
+
+		position = { x=2 y=0 }
+		relative_position_id = generic_mio_trait_bigger_engines
+
+		equipment_bonus = {
+			air_defence = 0.05
+		}
+
+		equipment_bonus = {
+			air_agility = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_minimum_weapon_requirements
+		name = generic_mio_trait_minimum_weapon_requirements
+		icon = GFX_generic_mio_trait_icon_anti_air_attack
+
+		position = { x=2 y=0 }
+		relative_position_id = generic_mio_trait_cantilever_wing_structure
+
+		equipment_bonus = {
+			air_attack = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_shortened_wings
+		name = generic_mio_trait_shortened_wings
+		icon = GFX_generic_mio_trait_icon_reliability
+
+		position = { x=6 y=1 }
+
+		all_parents = { 
+			generic_mio_trait_cantilever_wing_structure 
+			generic_mio_trait_minimum_weapon_requirements
+		}
+
+		equipment_bonus = {
+			reliability_factor = 0.05
+			air_agility = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_interceptor
+		name = generic_mio_trait_interceptor
+		icon = GFX_generic_mio_trait_icon_anti_air_attack
+
+		position = { x=-1 y=1 }
+		relative_position_id = generic_mio_trait_shortened_wings
+
+		all_parents = { 
+			generic_mio_trait_shortened_wings
+		}
+
+		mutually_exclusive = { generic_mio_trait_gunboat }
+
+		equipment_bonus = {
+			air_attack = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_gunboat
+		name = generic_mio_trait_gunboat
+		icon = GFX_generic_mio_trait_icon_air_ground_attack
+
+		position = { x=1 y=1 }
+		relative_position_id = generic_mio_trait_shortened_wings
+
+		all_parents = { 
+			generic_mio_trait_shortened_wings
+		}
+
+		mutually_exclusive = { generic_mio_trait_interceptor }
+
+		equipment_bonus = {
+			air_ground_attack = 0.10
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_stiffened_wings
+		name = generic_mio_trait_stiffened_wings
+		icon = GFX_generic_mio_trait_icon_air_agility
+
+		position = { x=1 y=1 }
+		relative_position_id = generic_mio_trait_interceptor
+
+		any_parent = { 
+			generic_mio_trait_interceptor
+			generic_mio_trait_gunboat
+		}
+
+		equipment_bonus = {
+			maximum_speed = 0.05
+			air_agility = 0.05
+		}
+	}
+
+
+	trait = {
+		token = generic_mio_trait_fighter_interceptors
+		name = generic_mio_trait_fighter_interceptors
+		icon = GFX_generic_mio_department_icon_plane_fighter_combat
+
+		position = { x=0 y=1 }
+		relative_position_id = generic_mio_trait_stiffened_wings
+
+		all_parents = { 
+			generic_mio_trait_stiffened_wings
+		}
+
+		mutually_exclusive = { generic_mio_trait_subsidiary_suppliers }
+
+		equipment_bonus = {
+			air_range = 0.10
+			air_attack = 0.05
+		}
+	}
+}
+
+
+#RANGE FOCUSED AIRCRAFT MANUFACTURER - Based on North American, Lockheed, Fiat Aviazione
+generic_range_focused_aircraft_organization = {
+	icon = GFX_idea_generic_air_manufacturer_1
+
+	allowed = {
+		always = no # Archetype only - countries using it have their own verisons
+	}
+
+	equipment_type = {
+		mio_cat_eq_all_small_plane
+		mio_cat_eq_all_medium_plane 
+		transport_plane_equipment
+	}
+
+	research_categories = { mio_cat_all_light_aircraft_and_modules mio_cat_all_medium_aircraft_and_modules }
+	
+	tree_header_text = {
+		text = mio_header_production
+		x = 1
+	}
+
+	tree_header_text = {
+		text = mio_header_engines
+		x = 3
+	}
+
+	tree_header_text = {
+		text = mio_header_wings
+		x = 5
+	}
+
+	tree_header_text = {
+		text = mio_header_weapons
+		x = 7
+	}
+
+	initial_trait = {
+		name = generic_mio_initial_trait_range_focused_aircraft_designer
+
+		limit_to_equipment_type = { mio_cat_eq_all_small_plane mio_cat_eq_all_medium_plane }
+
+		equipment_bonus = {
+			air_range = 0.10
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_large_rudders_and_flaps
+		name = generic_mio_trait_large_rudders_and_flaps
+		icon = GFX_generic_mio_trait_icon_air_agility
+
+		position = { x=3 y=0 }
+
+		limit_to_equipment_type = { mio_cat_eq_all_medium_plane }
+
+		equipment_bonus = {
+			air_agility = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_variable_dihedral
+		name = generic_mio_trait_variable_dihedral
+		icon = GFX_generic_mio_department_icon_plane_medium_engine
+
+		position = { x=5 y=0 }
+
+		limit_to_equipment_type = { mio_cat_eq_all_medium_plane }		
+
+		equipment_bonus = {
+			air_range = 0.10
+			reliability_factor = 0.10
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_high_capacity_ammunition
+		name = generic_mio_trait_high_capacity_ammunition
+		icon = GFX_generic_mio_trait_icon_anti_air_attack
+
+		position = { x=7 y=0 }
+
+		limit_to_equipment_type = { mio_cat_eq_all_small_plane mio_cat_eq_all_medium_plane }
+
+		equipment_bonus = {
+			air_attack = 0.10
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_extra_cargo_doors
+		name = generic_mio_trait_extra_cargo_doors
+		icon = GFX_generic_mio_department_icon_plane_general_production
+
+		position = { x=9 y=0 }
+
+		limit_to_equipment_type = { transport_plane_equipment }
+
+		production_bonus = {
+			production_capacity_factor = 0.10
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_improved_air_frame_strength
+		name = generic_mio_trait_improved_air_frame_strength
+		icon = GFX_generic_mio_trait_icon_naval_range
+
+		position = { x=6 y=1 }
+
+		limit_to_equipment_type = { mio_cat_eq_all_medium_plane }
+
+		all_parents = { 
+			generic_mio_trait_variable_dihedral
+		}
+
+		equipment_bonus = {
+			air_range = 0.10
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_glider_hook_modifications
+		name = generic_mio_trait_glider_hook_modifications
+		icon = GFX_generic_mio_trait_icon_naval_range
+
+		position = { x=0 y=1 }
+		relative_position_id = generic_mio_trait_extra_cargo_doors
+
+		limit_to_equipment_type = { transport_plane_equipment }
+
+		all_parents = { 
+			generic_mio_trait_extra_cargo_doors
+		}
+
+		equipment_bonus = {
+			air_range = 0.10
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_advanced_production_techniques
+		name = generic_mio_trait_advanced_production_techniques
+		icon = GFX_generic_mio_department_icon_plane_general_production
+
+		position = { x=1 y=2 }
+
+		limit_to_equipment_type = { mio_cat_eq_all_small_plane mio_cat_eq_all_medium_plane }
+
+		available = {
+			owner ={
+				has_tech = advanced_machine_tools
+			}
+		}
+
+		equipment_bonus = {
+			reliability_factor = 0.10
+		}
+
+		production_bonus = {
+			production_capacity_factor = 0.10
+		}		
+	}
+
+	trait = {
+		token = generic_mio_trait_low_drag_wings
+		name = generic_mio_trait_low_drag_wings
+		icon = GFX_generic_mio_trait_icon_maximum_speed
+
+		position = { x=5 y=2 }
+
+		limit_to_equipment_type = { mio_cat_eq_all_small_plane mio_cat_eq_all_medium_plane }
+
+		all_parents = { 
+			generic_mio_trait_variable_dihedral
+		}
+		
+		equipment_bonus = {
+			air_range = 0.10
+			maximum_speed = 0.10
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_strafing_techniques
+		name = generic_mio_trait_strafing_techniques
+		icon = GFX_generic_mio_trait_icon_air_ground_attack
+
+		position = { x=7 y=2 }
+
+		limit_to_equipment_type = { mio_cat_eq_all_small_plane mio_cat_eq_all_medium_plane }
+
+		all_parents = { 
+			generic_mio_trait_improved_air_frame_strength
+			generic_mio_trait_high_capacity_ammunition
+		}
+		
+		equipment_bonus = {
+			air_ground_attack = 0.10
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_long_range_modifications
+		name = generic_mio_trait_long_range_modifications
+		icon = GFX_generic_mio_trait_icon_naval_range
+
+		position = { x=4 y=3 }
+
+		limit_to_equipment_type = { mio_cat_eq_all_small_plane mio_cat_eq_all_medium_plane }
+
+		all_parents = { 
+			generic_mio_trait_large_rudders_and_flaps
+		}
+		
+		equipment_bonus = {
+			air_range = 0.10
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_anti_interception_tactics
+		name = generic_mio_trait_anti_interception_tactics
+		icon = GFX_generic_mio_trait_icon_maximum_speed
+
+		position = { x=6 y=3 }
+
+		limit_to_equipment_type = { mio_cat_eq_all_medium_plane }
+
+		all_parents = { 
+			generic_mio_trait_low_drag_wings
+		}
+		
+		equipment_bonus = {
+			maximum_speed = 0.10
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_high_explosive_payload
+		name = generic_mio_trait_high_explosive_payload
+		icon = GFX_generic_mio_department_icon_plane_medium_combat
+
+		position = { x=8 y=3 }
+
+		limit_to_equipment_type = { mio_cat_eq_all_medium_plane }
+
+		all_parents = { 
+			generic_mio_trait_strafing_techniques
+		}
+		
+		equipment_bonus = {
+			air_ground_attack = 0.10
+			air_bombing = 0.15
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_long_range_fighters
+		name = generic_mio_trait_long_range_fighters
+		icon = GFX_generic_mio_department_icon_plane_light_engine
+
+		position = { x=3 y=4 }
+
+		limit_to_equipment_type = { mio_cat_eq_all_small_plane }
+
+		all_parents = { 
+			generic_mio_trait_advanced_production_techniques
+			generic_mio_trait_long_range_modifications
+		}
+		
+		equipment_bonus = {
+			air_range = 0.15
+			air_agility = 0.15
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_heavy_fighters
+		name = generic_mio_trait_heavy_fighters
+		icon = GFX_generic_mio_trait_icon_anti_air_attack
+
+		position = { x=5 y=4 }
+
+		limit_to_equipment_type = { mio_cat_eq_all_medium_plane }
+
+		all_parents = { 
+			generic_mio_trait_anti_interception_tactics
+			generic_mio_trait_long_range_modifications
+		}
+		
+		equipment_bonus = {
+			air_attack = 0.15
+			air_range = 0.10
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_tactical_bombers
+		name = generic_mio_trait_tactical_bombers
+		icon = GFX_generic_mio_trait_icon_strategic_attack
+
+		position = { x=7 y=4 }
+
+		limit_to_equipment_type = { mio_cat_eq_all_medium_plane }
+
+		all_parents = { 
+			generic_mio_trait_anti_interception_tactics
+			generic_mio_trait_high_explosive_payload
+		}
+		
+		equipment_bonus = {
+			air_bombing = 0.15
+			air_range = 0.10
+		}
+	}
+}
+
+
+
+
+
+##     ##    ###    ######## ######## ########  #### ######## ##       
+###   ###   ## ##      ##    ##       ##     ##  ##  ##       ##       
+#### ####  ##   ##     ##    ##       ##     ##  ##  ##       ##       
+## ### ## ##     ##    ##    ######   ########   ##  ######   ##       
+##     ## #########    ##    ##       ##   ##    ##  ##       ##       
+##     ## ##     ##    ##    ##       ##    ##   ##  ##       ##       
+##     ## ##     ##    ##    ######## ##     ## #### ######## ######## 
+
+
+###########################
+######## Artillery ########
+###########################
+
+generic_artillery_organization = {
+	icon = GFX_idea_generic_artillery_manufacturer_2
+
+	allowed = {
+		NOT = { has_custom_artillery_mio = yes }
+	}
+
+	equipment_type = {
+		artillery_equipment
+		anti_tank_equipment
+		anti_air_equipment
+		rocket_artillery_equipment
+	}
+
+	research_categories = {
+		mio_cat_all_artillery_equipment
+	}
+	
+	tree_header_text = {
+		text = mio_header_mechanical_design
+		x = 1
+	}
+
+	tree_header_text = {
+		text = mio_header_armament_and_ammunition
+		x = 6
+	}
+
+	initial_trait = {
+		name = generic_mio_initial_trait_artillery_manufacturer
+
+		organization_modifier = {
+			military_industrial_organization_research_bonus = 0.05
+		}
+		production_bonus = {
+			production_cost_factor = -0.03
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_mobile_limbers
+		name = generic_mio_trait_mobile_limbers
+		icon = GFX_generic_mio_trait_icon_breakthrough
+
+		position = { x=0 y=0 }
+		mutually_exclusive = { generic_mio_trait_stable_platforms }
+
+		equipment_bonus = {
+			breakthrough = 0.1
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_stable_platforms
+		name = generic_mio_trait_stable_platforms
+		icon = GFX_generic_mio_trait_icon_defense
+
+		position = { x=2 y=0 }
+		relative_position_id = generic_mio_trait_mobile_limbers
+
+		mutually_exclusive = { generic_mio_trait_mobile_limbers }
+
+		equipment_bonus = {
+			defense = 0.03
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_improved_hydraulic_recoil_system
+		name = generic_mio_trait_improved_hydraulic_recoil_system
+		icon = GFX_generic_mio_trait_icon_reliability
+
+		position = { x=1 y=1 }
+		relative_position_id = generic_mio_trait_mobile_limbers
+
+		any_parent = {
+			generic_mio_trait_stable_platforms
+			generic_mio_trait_mobile_limbers
+		}
+
+		equipment_bonus = {
+			reliability = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_improved_direct_fire_targeting
+		name = generic_mio_trait_improved_direct_fire_targeting
+		icon = GFX_generic_mio_department_icon_anti_tank
+
+		position = { x=-1 y=3 }
+		relative_position_id = generic_mio_trait_improved_hydraulic_recoil_system
+
+		all_parents = {
+			 generic_mio_trait_improved_hydraulic_recoil_system
+		}
+
+		mutually_exclusive = { generic_mio_trait_advanced_anti_air_targeting generic_mio_trait_advanced_trajectory_calculations }
+		
+		limit_to_equipment_type = { 
+			anti_tank_equipment
+		}
+
+		equipment_bonus = {
+			ap_attack = 0.05
+			hard_attack = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_advanced_anti_air_targeting
+		name = generic_mio_trait_advanced_anti_air_targeting
+		icon = GFX_generic_mio_department_icon_anti_air
+
+		position = { x=1 y=0 }
+		relative_position_id = generic_mio_trait_improved_direct_fire_targeting
+		
+		all_parents = {
+			 generic_mio_trait_improved_hydraulic_recoil_system
+		}
+		
+		mutually_exclusive = {
+			generic_mio_trait_improved_direct_fire_targeting
+			generic_mio_trait_advanced_trajectory_calculations
+		}
+		
+		limit_to_equipment_type = { 
+			anti_air_equipment
+		}
+
+		equipment_bonus = {
+			air_attack = 0.07
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_advanced_trajectory_calculations
+		name = generic_mio_trait_advanced_trajectory_calculations
+		icon = GFX_generic_mio_department_icon_artillery
+
+		position = { x=2 y=0 }
+		relative_position_id = generic_mio_trait_improved_direct_fire_targeting
+
+		all_parents = {
+			 generic_mio_trait_improved_hydraulic_recoil_system
+		}
+
+		mutually_exclusive = { 
+			generic_mio_trait_improved_direct_fire_targeting
+			generic_mio_trait_advanced_anti_air_targeting
+		}
+
+		limit_to_equipment_type = { 
+			artillery_equipment
+			rocket_artillery_equipment
+		}
+
+		equipment_bonus = {
+			hard_attack = 1
+			breakthrough = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_sliding_breech_block
+		name = generic_mio_trait_sliding_breech_block
+		icon = GFX_generic_mio_trait_icon_soft_attack
+
+		position = { x=0 y=2 }
+		relative_position_id = generic_mio_trait_rapid_fire	
+
+		all_parents = {
+			generic_mio_trait_improved_hydraulic_recoil_system
+			generic_mio_trait_rapid_fire
+		}
+
+		equipment_bonus = {
+			soft_attack = 0.03
+			breakthrough = 0.03
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_rapid_fire
+		name = generic_mio_trait_rapid_fire
+		icon = GFX_generic_mio_department_icon_tank_general_weapons
+
+		position = { x=4 y=0 }
+		relative_position_id = generic_mio_trait_mobile_limbers	
+
+		limit_to_equipment_type = { 
+			anti_tank_equipment
+			anti_air_equipment
+		}
+
+		equipment_bonus = {
+			soft_attack = 0.1
+			hard_attack = 0.04
+			air_attack = 0.04
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_advanced_barrel_forging
+		name = generic_mio_trait_advanced_barrel_forging
+		icon = GFX_generic_mio_trait_icon_efficiency_gain
+
+		position = { x=2 y=0 }
+		relative_position_id = generic_mio_trait_rapid_fire
+
+		production_bonus = {
+			production_efficiency_gain_factor = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_big_guns
+		name = generic_mio_trait_big_guns
+		icon = GFX_generic_mio_department_icon_artillery_production
+
+		position = { x=2 y=0 }
+		relative_position_id = generic_mio_trait_advanced_barrel_forging
+
+		limit_to_equipment_type = { 
+			artillery_equipment
+			rocket_artillery_equipment
+		}
+
+		equipment_bonus = {
+			soft_attack = 0.02
+			build_cost_ic = 0.03
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_gun_mass_production
+		name = generic_mio_trait_gun_mass_production
+		icon = GFX_generic_mio_department_icon_facilities
+
+		position = { x=0 y=2 }
+		relative_position_id = generic_mio_trait_advanced_barrel_forging
+
+		all_parents = {	generic_mio_trait_advanced_barrel_forging }
+
+		production_bonus = {
+			production_efficiency_gain_factor = 0.03
+			production_efficiency_cap_factor = 0.03
+		}
+
+		organization_modifier = {
+			military_industrial_organization_design_team_assign_cost = -0.15
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_super_charges
+		name = generic_mio_trait_super_charges
+		icon = GFX_generic_mio_department_icon_facilities
+
+		position = { x=0 y=2 }
+		relative_position_id = generic_mio_trait_big_guns
+
+		all_parents = {	generic_mio_trait_big_guns }
+
+		limit_to_equipment_type = { 
+			artillery_equipment
+			rocket_artillery_equipment
+		}
+
+		production_bonus = {
+			production_efficiency_gain_factor = 0.03
+			production_efficiency_cap_factor = 0.03
+		}
+
+		organization_modifier = {
+			military_industrial_organization_design_team_assign_cost = -0.15
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_light_weight_barrels
+		name = generic_mio_trait_light_weight_barrels
+		icon = GFX_generic_mio_trait_icon_breakthrough
+
+		position = { x=0 y=2 }
+		relative_position_id = generic_mio_trait_gun_mass_production
+
+		all_parents = {
+			generic_mio_trait_super_charges
+			generic_mio_trait_gun_mass_production
+			generic_mio_trait_sliding_breech_block
+
+		}
+
+		production_bonus = {
+			production_cost_factor = -0.03
+		}
+
+		equipment_bonus = {
+			breakthrough = 0.06
+			defense = 0.1
+		}
+	}
+
+}
+
+	
+############################
+###### Infantry Weapons ####
+############################
+
+generic_infantry_equipment_organization = {
+	icon = GFX_idea_generic_infantry_equipment_manufacturer_2
+
+	allowed = {
+		NOT = { has_custom_infantry_equipment_mio = yes }
+	}
+
+	equipment_type = {
+		infantry_equipment
+		magical_equipment
+	}
+	research_categories = { infantry_weapons }
+
+	
+
+	tree_header_text = {
+		text = mio_header_design_and_production
+		x = 3
+	}
+
+	tree_header_text = {
+		text = mio_header_anti_tank
+		x = 8
+	}
+
+	initial_trait = {
+		name = generic_mio_initial_trait_infantry_manufacturer
+
+		organization_modifier = {
+			military_industrial_organization_research_bonus = 0.05
+		}
+
+		production_bonus = {
+			production_efficiency_cap_factor = 0.03
+		}
+
+		equipment_bonus = {
+			soft_attack = 0.03
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_drum_pattern_sights
+		name = generic_mio_trait_drum_pattern_sights
+		icon = GFX_generic_mio_trait_icon_defense
+
+		position = { x=1 y=0 }
+
+		equipment_bonus = {
+			defense = 0.035
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_reinforced_stocks
+		name = generic_mio_trait_reinforced_stocks
+		icon = GFX_generic_mio_trait_icon_reliability
+
+		position = { x=4 y=0 }
+		relative_position_id = generic_mio_trait_drum_pattern_sights
+
+		equipment_bonus = {
+			soft_attack = 0.025
+			reliability = 0.03
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_bolt_action
+		name = generic_mio_trait_bolt_action
+		icon = GFX_generic_mio_department_icon_infantry_line_efficiency
+
+		position = { x=-1 y=2 }
+		relative_position_id = generic_mio_trait_reinforced_stocks
+
+		all_parents = { generic_mio_trait_reinforced_stocks }
+
+		mutually_exclusive = { generic_mio_trait_semi_auto }
+
+		equipment_bonus = {
+			soft_attack = -0.03
+		}
+
+		production_bonus = {
+			production_efficiency_gain_factor = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_semi_auto
+		name = generic_mio_trait_semi_auto
+		icon = GFX_generic_mio_trait_icon_soft_attack
+
+		position = { x=1 y=2 }
+		relative_position_id = generic_mio_trait_reinforced_stocks
+
+		all_parents = { generic_mio_trait_reinforced_stocks }
+
+		mutually_exclusive = { generic_mio_trait_bolt_action }
+
+		equipment_bonus = {
+			soft_attack = 0.03
+			breakthrough = 0.03
+		}
+
+		production_bonus = {
+			production_efficiency_gain_factor = -0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_medium_machineguns
+		name = generic_mio_trait_medium_machineguns
+		icon = GFX_generic_mio_trait_icon_breakthrough
+
+		position = { x=1 y=2 }
+		relative_position_id = generic_mio_trait_bolt_action
+
+		any_parent = { generic_mio_trait_semi_auto generic_mio_trait_bolt_action }
+		
+		equipment_bonus = {
+			breakthrough = 0.06
+			build_cost_ic = 0.08
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_advanced_barrel_forging
+		name = generic_mio_trait_advanced_barrel_forging
+		icon = GFX_generic_mio_trait_icon_efficiency_gain
+
+		position = { x=2 y=2 }
+		relative_position_id = generic_mio_trait_drum_pattern_sights
+
+		any_parent = { generic_mio_trait_reinforced_stocks generic_mio_trait_drum_pattern_sights }
+
+		production_bonus = {
+			production_efficiency_gain_factor = 0.03
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_mass_rifle_production
+		name = generic_mio_trait_mass_rifle_production
+		icon = GFX_generic_mio_department_icon_facilities
+
+		position = { x=0 y=2 }
+		relative_position_id = generic_mio_trait_advanced_barrel_forging
+
+		all_parents = { generic_mio_trait_advanced_barrel_forging }
+
+		production_bonus = {
+			production_efficiency_cap_factor = 0.03
+			production_cost_factor = -0.03
+		}
+
+		organization_modifier = {
+			military_industrial_organization_design_team_assign_cost = -0.3
+		}
+	}
+
+
+	trait = {
+		token = generic_mio_trait_quality_materials
+		name = generic_mio_trait_quality_materials
+		icon = GFX_generic_mio_trait_icon_reliability
+
+		position = { x=0 y=2 }
+		relative_position_id = generic_mio_trait_drum_pattern_sights
+
+		all_parents = { generic_mio_trait_drum_pattern_sights }
+
+		equipment_bonus = {
+			reliability = 0.05
+		}
+
+	}
+
+	trait = {
+		token = generic_mio_trait_improved_small_arms_bullet_design
+		name = generic_mio_trait_improved_small_arms_bullet_design
+		icon = GFX_generic_mio_trait_icon_soft_attack
+
+		position = { x=-1 y=2 }
+		relative_position_id = generic_mio_trait_quality_materials
+
+		all_parents = { generic_mio_trait_quality_materials }
+
+		mutually_exclusive = { generic_mio_trait_armor_piercing_rounds }
+
+		equipment_bonus = {
+			soft_attack = 0.05
+			breakthrough = 0.03
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_armor_piercing_rounds
+		name = generic_mio_trait_armor_piercing_rounds
+		icon = GFX_generic_mio_trait_icon_ap_attack
+
+		position = { x=1 y=2 }
+		relative_position_id = generic_mio_trait_quality_materials
+
+		all_parents = { generic_mio_trait_quality_materials }
+		
+		mutually_exclusive = { generic_mio_trait_improved_small_arms_bullet_design }
+
+		equipment_bonus = {
+			ap_attack = 0.25
+			hard_attack = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_heavy_anti_armor_ammunition
+		name = generic_mio_trait_heavy_anti_armor_ammunition
+		icon = GFX_generic_mio_trait_icon_ap_attack
+
+		position = { x=3 y=0 }
+		relative_position_id = generic_mio_trait_reinforced_stocks
+
+		equipment_bonus = {
+			hard_attack = 0.1
+			ap_attack = 0.25
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_vehicle_mounted_capabilities
+		name = generic_mio_trait_vehicle_mounted_capabilities
+		icon = GFX_generic_mio_trait_icon_breakthrough
+
+		position = { x=-1 y=2 }
+		relative_position_id = generic_mio_trait_heavy_anti_armor_ammunition
+
+		all_parents = { generic_mio_trait_heavy_anti_armor_ammunition }
+		
+		mutually_exclusive = { generic_mio_trait_rubber_cushioned_buttpad }
+
+		equipment_bonus = {
+			breakthrough = 0.06
+			build_cost_ic = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_rubber_cushioned_buttpad
+		name = generic_mio_trait_rubber_cushioned_buttpad
+		icon = GFX_generic_mio_trait_icon_breakthrough
+
+		position = { x=1 y=2 }
+		relative_position_id = generic_mio_trait_heavy_anti_armor_ammunition
+
+		all_parents = { generic_mio_trait_heavy_anti_armor_ammunition }
+		
+		mutually_exclusive = { generic_mio_trait_vehicle_mounted_capabilities }
+
+		equipment_bonus = {
+			breakthrough = 0.02
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_anti_vechicle_land_mines
+		name = generic_mio_trait_anti_vechicle_land_mines
+		icon = GFX_generic_mio_department_icon_infantry_quality
+
+		position = { x=1 y=2 }
+		relative_position_id = generic_mio_trait_vehicle_mounted_capabilities
+
+		any_parent = { generic_mio_trait_rubber_cushioned_buttpad generic_mio_trait_vehicle_mounted_capabilities }
+
+		equipment_bonus = {
+			defense = 0.04
+			hard_attack = 0.03
+			build_cost_ic = 0.05
+
+		}
+	}
+
+}
+
+
+###################################
+######## Support Equipment ########
+###################################
+
+generic_support_equipment_organization = {
+	icon = GFX_idea_generic_infantry_equipment_manufacturer_1
+
+	allowed = {
+		always = no # Archetype only - countries using it have their own verisons
+	}
+
+	equipment_type = { infantry_equipment magical_equipment support_equipment }
+	research_categories = { infantry_weapons support_tech }
+
+	
+
+	tree_header_text = {
+		text = mio_header_support
+		x = 1
+	}
+
+	tree_header_text = {
+		text = mio_header_weapons
+		x = 6.5
+	}
+
+	
+	initial_trait = {
+		name = generic_mio_initial_trait_support_equipment_manufacturer
+
+		organization_modifier = {
+			military_industrial_organization_research_bonus = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_material_recycling
+		name = generic_mio_trait_material_recycling
+		icon = GFX_generic_mio_department_icon_support_materials
+		
+		position = { x=1 y=0 }
+		
+		limit_to_equipment_type = { support_equipment }
+		
+		production_bonus = {
+			production_resource_need_factor = -0.15
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_scrap_melting
+		name = generic_mio_trait_scrap_melting
+		icon = GFX_generic_mio_trait_icon_resources
+		
+		position = { x=-1 y=1 }
+		relative_position_id = generic_mio_trait_material_recycling
+		
+		all_parents = { generic_mio_trait_material_recycling }
+		
+		mutually_exclusive = { generic_mio_trait_high_quality_material_blend }
+		
+		limit_to_equipment_type = { support_equipment }
+		
+		equipment_bonus = {
+			reliability = -0.1
+		}
+
+		production_bonus = {
+			production_resource_need_factor = -0.1
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_high_quality_material_blend
+		name = generic_mio_trait_high_quality_material_blend
+		icon = GFX_generic_mio_trait_icon_efficiency_cap
+		
+		position = { x=1 y=1 }
+		relative_position_id = generic_mio_trait_material_recycling
+		
+		all_parents = { generic_mio_trait_material_recycling }
+		
+		mutually_exclusive = { generic_mio_trait_scrap_melting }
+		
+		limit_to_equipment_type = { support_equipment }
+		
+		production_bonus = {
+			production_efficiency_cap_factor = 0.05
+			production_resource_need_factor = 0.1
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_mass_production
+		name = generic_mio_trait_mass_production
+		icon = GFX_generic_mio_trait_icon_efficiency_gain
+		
+		position = { x=-1 y=2 }
+		relative_position_id = generic_mio_trait_high_quality_material_blend
+		
+		any_parent = { generic_mio_trait_high_quality_material_blend generic_mio_trait_scrap_melting }
+		
+		limit_to_equipment_type = { support_equipment }
+
+		production_bonus = {
+			production_efficiency_gain_factor = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_research_program
+		name = generic_mio_trait_research_program
+		icon = GFX_generic_mio_department_icon_facilities
+		
+		position = { x=-1 y=1 }
+		relative_position_id = generic_mio_trait_mass_production
+		
+		all_parents = { generic_mio_trait_mass_production }
+		
+		mutually_exclusive = { generic_mio_trait_efficient_scale_up }
+		
+		organization_modifier = {
+			military_industrial_organization_research_bonus = 0.06
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_efficient_scale_up
+		name = generic_mio_trait_efficient_scale_up
+		icon = GFX_generic_mio_department_icon_support_production
+		
+		position = { x=2 y=0 }
+		relative_position_id = generic_mio_trait_research_program
+		
+		all_parents = { generic_mio_trait_mass_production }
+
+		mutually_exclusive = { generic_mio_trait_research_program }
+		
+		limit_to_equipment_type = { support_equipment }
+
+		production_bonus = {
+			production_capacity_factor = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_private_scientists_program
+		name = generic_mio_trait_private_scientists_program
+		icon = GFX_generic_mio_department_icon_facilities		
+		
+		position = { x=4 y=0 }
+		relative_position_id = generic_mio_trait_material_recycling
+
+		organization_modifier = {
+			military_industrial_organization_research_bonus = 0.05
+		}
+	}
+
+
+	trait = {
+		token = generic_mio_trait_private_tenders
+		name = generic_mio_trait_private_tenders
+		icon = GFX_generic_mio_department_icon_facilities
+		
+		position = { x=0 y=1 }
+		relative_position_id = generic_mio_trait_private_scientists_program
+		
+		all_parents = { generic_mio_trait_private_scientists_program }
+
+		organization_modifier = {
+			military_industrial_organization_funds_gain = 0.1
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_anti_tank_rifle #elephant gun
+		name = generic_mio_trait_anti_tank_rifle
+		icon = GFX_generic_mio_trait_icon_ap_attack
+		
+		position = { x=3 y=0 }
+		relative_position_id = generic_mio_trait_private_scientists_program
+		
+		limit_to_equipment_type = { infantry_equipment magical_equipment }
+
+		equipment_bonus = {
+			ap_attack = 0.1
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_single_shot_man_portable_anti_tank_system #Bazooka boom tank ded
+		name = generic_mio_trait_single_shot_man_portable_anti_tank_system
+		icon = GFX_generic_mio_trait_icon_soft_attack
+		
+		position = { x=0 y=4 }
+		relative_position_id = generic_mio_trait_anti_tank_rifle
+		
+		all_parents = { generic_mio_trait_anti_tank_rifle }
+		
+		mutually_exclusive = { generic_mio_trait_light_mortar }
+		
+		limit_to_equipment_type = { infantry_equipment magical_equipment }
+
+		equipment_bonus = {
+			hard_attack = 0.1
+			build_cost_ic = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_small_sidearms
+		name = generic_mio_trait_small_sidearms
+		icon = GFX_generic_mio_trait_icon_defense
+		
+		position = { x=1 y=2 }
+		relative_position_id = generic_mio_trait_private_tenders
+		
+		all_parents = { generic_mio_trait_private_tenders }
+		
+		limit_to_equipment_type = { infantry_equipment magical_equipment }
+
+		equipment_bonus = {
+			defense = 0.02
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_light_mortar
+		name = generic_mio_trait_light_mortar
+		icon = GFX_generic_mio_trait_icon_breakthrough
+		
+		position = { x=0 y=1 }
+		relative_position_id = generic_mio_trait_small_sidearms
+		
+		all_parents = { generic_mio_trait_small_sidearms }
+
+		mutually_exclusive = { generic_mio_trait_single_shot_man_portable_anti_tank_system }
+
+		limit_to_equipment_type = { infantry_equipment magical_equipment }
+
+		equipment_bonus = {
+			breakthrough = 0.05
+			soft_attack = 0.02
+			build_cost_ic = 0.06
+		}
+	}
+
+
+	trait = {
+		token = generic_mio_trait_pontoons
+		name = generic_mio_trait_pontoons
+		icon = GFX_generic_mio_trait_icon_maximum_speed
+		
+		position = { x=-1 y=1 }
+		relative_position_id = generic_mio_trait_private_tenders
+		
+		all_parents = { generic_mio_trait_private_tenders }
+
+		limit_to_equipment_type = { infantry_equipment magical_equipment }
+
+		equipment_bonus = {
+			maximum_speed = 0.05
+			build_cost_ic = 0.035
+		}
+	}
+}
+
+
+###########################
+######## Motorized ########
+###########################
+
+generic_motorized_mechanized_organization = {
+	icon = GFX_idea_generic_motorized_equipment_manufacturer_3
+
+	allowed = {
+		NOT = { has_custom_motorized_mechanized_mio = yes }
+	}
+
+	equipment_type = {
+		motorized_equipment
+		mechanized_equipment
+		motorized_rocket_equipment
+	}
+	
+	research_categories = {
+		mio_cat_tech_all_motorized_mechanized
+	}
+
+	
+
+	tree_header_text = {
+		text = mio_header_motorized
+		x = 1
+	}
+
+	tree_header_text = {
+		text = mio_header_mechanized
+		x = 7
+	}
+	
+	initial_trait = {
+		name = generic_mio_initial_trait_motorized_mechanized_manufacturer
+
+		organization_modifier = {
+			military_industrial_organization_research_bonus = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_composite_cargo_bed
+		name = generic_mio_trait_composite_cargo_bed
+		icon = GFX_generic_mio_department_icon_motorized_production
+		
+		position = { x=0 y=0 }
+		
+		mutually_exclusive = { generic_mio_trait_steel_cargo_bed }
+
+		limit_to_equipment_type = { motorized_equipment motorized_rocket_equipment }
+
+		equipment_bonus = {
+			reliability = -0.07
+			build_cost_ic = -0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_steel_cargo_bed
+		name = generic_mio_trait_steel_cargo_bed
+		icon = GFX_generic_mio_trait_icon_reliability
+		
+		position = { x=2 y=0 }
+		relative_position_id = generic_mio_trait_composite_cargo_bed
+		
+		mutually_exclusive = { generic_mio_trait_composite_cargo_bed }
+
+		limit_to_equipment_type = { motorized_equipment motorized_rocket_equipment }
+
+		equipment_bonus = {
+			reliability = 0.05
+		}
+		production_bonus = {
+			production_resource_need_factor = 0.02
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_all_wheel_drive
+		name = generic_mio_trait_all_wheel_drive
+		icon = GFX_generic_mio_trait_icon_breakthrough
+		
+		position = { x=1 y=2 }
+		relative_position_id = generic_mio_trait_composite_cargo_bed
+		
+		any_parent = { generic_mio_trait_composite_cargo_bed generic_mio_trait_steel_cargo_bed }
+
+		limit_to_equipment_type = { motorized_equipment motorized_rocket_equipment }
+		
+		equipment_bonus = {
+			breakthrough = 0.035
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_attached_wood_gas_generator
+		name = generic_mio_trait_attached_wood_gas_generator
+		icon = GFX_generic_mio_trait_icon_fuel_consumption
+		
+		position = { x=-1 y=2 }
+		relative_position_id = generic_mio_trait_all_wheel_drive
+		
+		all_parents = { generic_mio_trait_all_wheel_drive }
+		
+		mutually_exclusive = { generic_mio_trait_high_powered_engine }
+
+		limit_to_equipment_type = { motorized_equipment motorized_rocket_equipment }
+
+		equipment_bonus = {
+			fuel_consumption = -0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_high_powered_engine
+		name = generic_mio_trait_high_powered_engine
+		icon = GFX_generic_mio_trait_icon_maximum_speed
+		
+		position = { x=2 y=0 }
+		relative_position_id = generic_mio_trait_attached_wood_gas_generator
+		
+		all_parents = { generic_mio_trait_all_wheel_drive }
+		
+		mutually_exclusive = { generic_mio_trait_attached_wood_gas_generator }
+
+		limit_to_equipment_type = { motorized_equipment motorized_rocket_equipment }
+
+		equipment_bonus = {
+			fuel_consumption = 0.05
+			maximum_speed = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_medium_machinegun_mounts
+		name = generic_mio_trait_medium_machinegun_mounts
+		icon = GFX_generic_mio_trait_icon_breakthrough
+		
+		position = { x=2 y=0 }
+		relative_position_id = generic_mio_trait_steel_cargo_bed
+
+		equipment_bonus = {
+			breakthrough = 0.03
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_armored_pulpit_mount
+		name = generic_mio_trait_armored_pulpit_mount
+		icon = GFX_generic_mio_trait_icon_hardness
+		
+		position = { x=0 y=2 }
+		relative_position_id = generic_mio_trait_medium_machinegun_mounts
+
+		all_parents = { generic_mio_trait_medium_machinegun_mounts }
+
+		equipment_bonus = {
+			hardness = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_advanced_artillery_racks
+		name = generic_mio_trait_advanced_artillery_racks
+		icon = GFX_generic_mio_trait_icon_soft_attack
+		
+		position = { x=-1 y=2 }
+		relative_position_id = generic_mio_trait_armored_pulpit_mount
+		
+		all_parents = { generic_mio_trait_armored_pulpit_mount }
+		
+		mutually_exclusive = { generic_mio_trait_heavy_machinegun_mount generic_mio_trait_mounted_light_anti_tank_gun }
+		
+		limit_to_equipment_type = { motorized_rocket_equipment }
+
+		equipment_bonus = {
+			soft_attack = 0.035
+			build_cost_ic = 0.06
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_heavy_machinegun_mount
+		name = generic_mio_trait_heavy_machinegun_mount
+		icon = GFX_generic_mio_trait_icon_breakthrough
+		
+		position = { x=2 y=0 }
+		relative_position_id = generic_mio_trait_advanced_artillery_racks
+		
+		all_parents = { generic_mio_trait_armored_pulpit_mount }
+		
+		mutually_exclusive = { generic_mio_trait_advanced_artillery_racks generic_mio_trait_mounted_light_anti_tank_gun }
+		
+		limit_to_equipment_type = { mechanized_equipment motorized_equipment }
+		
+		equipment_bonus = {
+			breakthrough = 0.04
+			build_cost_ic = 0.01
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_mounted_light_anti_tank_gun #elephant gun
+		name = generic_mio_trait_mounted_light_anti_tank_gun
+		icon = GFX_generic_mio_trait_icon_ap_attack
+		
+		position = { x=1 y=0 }
+		relative_position_id = generic_mio_trait_heavy_machinegun_mount
+		
+		mutually_exclusive = { generic_mio_trait_advanced_artillery_racks generic_mio_trait_heavy_machinegun_mount }
+		
+		all_parents = { generic_mio_trait_bulletproof_panels }
+		
+		limit_to_equipment_type = { mechanized_equipment }
+
+		equipment_bonus = {
+			ap_attack = 0.1
+			hard_attack = 0.02
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_open_chassi
+		name = generic_mio_trait_open_chassi
+		icon = GFX_generic_mio_department_icon_mechanized_production
+		
+		position = { x=2 y=0 }
+		relative_position_id = generic_mio_trait_medium_machinegun_mounts
+		
+		limit_to_equipment_type = { mechanized_equipment }
+		
+		mutually_exclusive = { generic_mio_trait_closed_chassi }
+
+		equipment_bonus = {
+			defense = -0.02
+			build_cost_ic = -0.03
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_closed_chassi
+		name = generic_mio_trait_closed_chassi
+		icon = GFX_generic_mio_department_icon_mechanized_hull
+		
+		position = { x=2 y=0 }
+		relative_position_id = generic_mio_trait_open_chassi
+		
+		limit_to_equipment_type = { mechanized_equipment }
+		
+		mutually_exclusive = { generic_mio_trait_open_chassi }
+
+		equipment_bonus = {
+			armor_value = 0.05
+		}
+	}
+
+
+	trait = {
+		token = generic_mio_trait_bulletproof_panels
+		name = generic_mio_trait_bulletproof_panels
+		icon = GFX_generic_mio_trait_icon_hardness
+		
+		position = { x=-1 y=2 }
+		relative_position_id = generic_mio_trait_closed_chassi
+		
+		limit_to_equipment_type = { mechanized_equipment }
+		
+		any_parent = { generic_mio_trait_closed_chassi generic_mio_trait_open_chassi }
+
+		equipment_bonus = {
+			hardness = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_light_flame_projectors
+		name = generic_mio_trait_light_flame_projectors
+		icon = GFX_generic_mio_trait_icon_breakthrough
+		
+		position = { x=0 y=2 }
+		relative_position_id = generic_mio_trait_bulletproof_panels
+		
+		limit_to_equipment_type = { mechanized_equipment }
+		
+		all_parents = { generic_mio_trait_bulletproof_panels }
+
+		equipment_bonus = {
+			breakthrough = 0.035
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_land_mine_racks
+		name = generic_mio_trait_land_mine_racks
+		icon = GFX_generic_mio_department_icon_mechanized_hull
+		
+		position = { x=1 y=0 }
+		relative_position_id = generic_mio_trait_light_flame_projectors
+		
+		limit_to_equipment_type = { mechanized_equipment }
+		
+		all_parents = { generic_mio_trait_bulletproof_panels }
+
+		equipment_bonus = {
+			defense = 0.06
+			maximum_speed = -0.02
+		}
+	}
+}
+
+
+
+######################
+#### Armored Car  ####
+######################
+
+
+generic_armored_car_organization = {
+	icon = GFX_idea_generic_tank_manufacturer_1
+
+	allowed = {
+		always = no # Archetype only - countries using it have their own verisons
+		has_dlc = "La Resistance"
+	}
+
+	equipment_type = { armored_car_equipment }
+	research_categories = { cat_armored_cars }
+
+	tree_header_text = {
+		text = mio_header_design_and_production
+		x = 3
+	}
+
+	tree_header_text = {
+		text = mio_header_equipment_and_specialization
+		x = 7
+	}
+
+	
+	initial_trait = {
+		name = generic_mio_initial_trait_standardized_production
+		equipment_bonus = {
+			armor_value = 0.05
+			defense =0.05
+			build_cost_ic = -0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_simplified_suspension
+		name = generic_mio_trait_simplified_suspension
+		icon = GFX_generic_mio_trait_icon_reliability
+
+		equipment_bonus = {
+			reliability = 0.05
+		}
+		position = { x=1 y=0 }
+	}
+	
+	trait = {
+		token = generic_mio_trait_crew_ergonomics
+		name = generic_mio_trait_crew_ergonomics
+		icon = GFX_generic_mio_trait_icon_defense
+
+
+		equipment_bonus = {
+			maximum_speed = 0.02
+			defense = 0.02
+		}
+		position = { x=4 y=0 }
+		relative_position_id = generic_mio_trait_simplified_suspension
+	}
+	
+	trait = {
+		token = generic_mio_trait_reinforced_wheels
+		name = generic_mio_trait_reinforced_wheels
+		icon = GFX_generic_mio_department_icon_armored_car_engine
+		any_parent = { generic_mio_trait_simplified_suspension }
+
+		equipment_bonus = {
+			reliability = 0.05
+			maximum_speed = 0.05
+		}
+		position = { x=0 y=2 }
+		relative_position_id = generic_mio_trait_simplified_suspension
+	}
+
+	trait = {
+		token = generic_mio_trait_command_upgrades
+		name = generic_mio_trait_command_upgrades
+		icon = GFX_generic_mio_trait_icon_breakthrough
+		any_parent = { generic_mio_trait_crew_ergonomics }
+
+
+		equipment_bonus = {
+			breakthrough = 0.05
+		}
+		position = { x=0 y=2 }
+		relative_position_id = generic_mio_trait_crew_ergonomics
+	}
+	
+	trait = {
+		token = generic_mio_trait_standardized_components
+		name = generic_mio_trait_standardized_components
+		icon = GFX_generic_mio_department_icon_armored_car_line_efficiency
+		all_parents = { generic_mio_trait_simplified_suspension generic_mio_trait_crew_ergonomics }
+
+
+		position = { x=2 y=1 }
+		relative_position_id = generic_mio_trait_simplified_suspension
+
+		production_bonus = {
+			production_efficiency_gain_factor = 0.15
+			production_resource_need_factor = -0.15
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_improved_tooling
+		name = generic_mio_trait_improved_tooling
+		icon = GFX_generic_mio_department_icon_armored_car_technology
+
+		all_parents = { generic_mio_trait_reinforced_wheels generic_mio_trait_standardized_components generic_mio_trait_command_upgrades }
+
+		position = { x=0 y=2 }
+		relative_position_id = generic_mio_trait_standardized_components
+
+		production_bonus = {
+			production_efficiency_cap_factor = 0.1
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_mass_production
+		name = generic_mio_trait_mass_production
+		icon = GFX_generic_mio_department_icon_armored_car_production
+		any_parent = { generic_mio_trait_improved_tooling }
+		mutually_exclusive = { generic_mio_trait_quality_improvements }
+
+		position = { x=-1 y=1 }
+		relative_position_id = generic_mio_trait_improved_tooling
+
+		production_bonus = {
+			production_cost_factor = -0.05
+			production_efficiency_gain_factor = 0.1
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_quality_improvements
+		name = generic_mio_trait_quality_improvements
+		icon = GFX_generic_mio_department_icon_tank_general_armor
+		any_parent = { generic_mio_trait_improved_tooling }
+		mutually_exclusive = { generic_mio_trait_mass_production}
+
+		position = { x=1 y=1 }
+		relative_position_id = generic_mio_trait_improved_tooling
+
+		equipment_bonus = {
+			armor_value = 0.1
+			defense = 0.1
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_defensive_equipment
+		name = generic_mio_trait_defensive_equipment
+		icon = GFX_generic_mio_trait_icon_soft_attack
+
+		equipment_bonus = {
+			soft_attack = 0.02
+			defense = 0.02
+		}
+		position = { x=2 y=0 }
+		relative_position_id = generic_mio_trait_crew_ergonomics
+	}
+
+	trait = {
+		token = generic_mio_trait_long_barreled_guns
+		name = generic_mio_trait_long_barreled_guns
+		icon = GFX_generic_mio_department_icon_armored_car_offense
+
+		all_parents = { generic_mio_trait_crew_ergonomics generic_mio_trait_defensive_equipment }
+
+		position = { x=0 y=2 }
+		relative_position_id = generic_mio_trait_defensive_equipment
+
+		equipment_bonus = {
+			ap_attack = 0.05
+			hard_attack = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_heavy_anti_tank_gun
+		name = generic_mio_trait_heavy_anti_tank_gun
+		icon = GFX_generic_mio_trait_icon_hard_attack
+		any_parent = { generic_mio_trait_long_barreled_guns }
+		mutually_exclusive = { generic_mio_trait_officer_support_car }
+
+		position = { x=-1 y=2 }
+		relative_position_id = generic_mio_trait_long_barreled_guns
+
+		equipment_bonus = {
+			armor_value = 0.05
+			hard_attack = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_officer_support_car
+		name = generic_mio_trait_officer_support_car
+		icon = GFX_generic_mio_trait_icon_soft_attack
+		any_parent = { generic_mio_trait_long_barreled_guns }
+		mutually_exclusive = { generic_mio_trait_heavy_anti_tank_gun }
+
+		position = { x=1 y=2 }
+		relative_position_id = generic_mio_trait_long_barreled_guns
+
+		equipment_bonus = {
+			soft_attack = 0.05
+			build_cost_ic = -0.03
+		}
+	}
+}
+
+
+
+
+
+
+
+##       ####  ######  ########     #######  ########     ######  ########    ###    ########  ######
+##        ##  ##    ##    ##       ##     ## ##          ##    ##    ##      ## ##      ##    ##    ##
+##        ##  ##          ##       ##     ## ##          ##          ##     ##   ##     ##    ##
+##        ##   ######     ##       ##     ## ######       ######     ##    ##     ##    ##     ######
+##        ##        ##    ##       ##     ## ##                ##    ##    #########    ##          ##
+##        ##  ##    ##    ##       ##     ## ##          ##    ##    ##    ##     ##    ##    ##    ##
+######## ####  ######     ##        #######  ##           ######     ##    ##     ##    ##     ######
+
+
+### EQUIPMENT STATS ###
+
+
+###  ##  #  # # #  ## 
+ #  #  # ## # # # #   
+ #  #### # ## ##   #  
+ #  #  # #  # # #   # 
+ #  #  # #  # # # ##  
+
+#maximum_speed
+#reliability
+#defense
+#breakthrough
+#armor_value
+#soft_attack
+#hard_attack
+#ap_attack
+#air_attack
+#build_cost_ic
+#fuel_consumption
+#hardness
+#armor_value
+#build_cost_ic
+#entrenchment - only if you have DLC NSB  and module dozer_blade
+#fuel_capacity - only if you have DLC NSB  and module expanded_fuel_tank
+
+
+
+ ## #  # ### ###   ## 
+#   #  #  #  #  # #   
+ #  ####  #  ###   #  
+  # #  #  #  #      # 
+##  #  # ### #    ##  
+
+#lg_armor_piercing (requires modules)
+#lg_attack (requires modules)
+#hg_armor_piercing (requires modules)
+#hg_attack (requires modules)
+#torpedo_attack (requires modules)
+#sub_attack (requires modules)
+#anti_air_attack (requires modules)
+#armor_value (requires modules)
+#surface_detection 
+#sub_detection (requires modules)
+#sub_visibility (sub only)
+#surface_visibility (surface only)
+#naval_speed 
+#reliability
+#naval_range
+#max_strength
+#fuel_consumption
+#build_cost_ic
+#manpower
+#naval_supremacy_factor
+#naval_torpedo_enemy_critical_chance_factor (if you have modules adding it)
+#naval_torpedo_damage_reduction_factor (if you have modules adding it)
+#carrier_size (this will get very bad for you I promise, equipment modifiers are a mistake)
+#mines_sweeping (only MTG and with modules)
+#mines_planting (only with MTG and modules)
+#naval_torpedo_hit_chance_factor (requires modules)
+#naval_light_gun_hit_chance_factor (requires modules)
+#naval_heavy_gun_hit_chance_factor (requires modules)
+
+
+
+###  #    ##  #  # ###  ## 
+#  # #   #  # ## # #   #   
+###  #   #### # ## ##   #  
+#    #   #  # #  # #     # 
+#    ### #  # #  # ### ##  
+
+#air_superiority
+#reliability
+#naval_strike_attack
+#naval_strike_targetting
+#manpower
+#fuel_consumption
+#build_cost_ic
+#resources
+#thrust - only if you have BBA DLC
+#weight - only if you have BBA DLC
+#maximum_speed
+#air_range
+#air_agility
+#air_attack
+#air_defence
+#surface_detection
+#sub_detection
+#air_ground_attack
+#air_bombing
+#mines_planting - if you have MtG and BBA
+#mines_sweeping - if you have MtG and BBA
+#night_penalty - only if you have BBA DLC (you need to have module because base value is 0 - radio navigatio
+
+
+
+#   #  ##  ### ### ###  ### ### #   
+## ## #  #  #  #   #  #  #  #   #   
+# # # ####  #  ##  ###   #  ##  #   
+#   # #  #  #  #   #  #  #  #   #   
+#   # #  #  #  ### #  # ### ### ### 
+
+##############################
+##### INFANTRY EQUIPMENT #####
+##############################
+#reliability
+#maximum_speed
+#defense
+#breakthrough
+#hardness - it is in the script, but the value is set to 0 (in the game, the UI doesn't show this value)
+#armor_value - it is in the script, but the value is set to 0 (in the game, the UI doesn't show this value)
+#soft_attack
+#hard_attack
+#ap_attack
+#air_attack - it is in the script but the value is set to 0 (in the game, the UI doesn't show this value)
+#build_cost_ic
+
+##############################
+##### SUPPORT EQUIPMENT ######
+##############################
+#reliability
+#build_cost_ic
+
+
+#############################
+#### ARTILLERY EQUIPMENT ####
+#############################
+#reliability
+#defense
+#breakthrough
+#hardness
+#armor_value
+#soft_attack
+#hard_attack
+#ap_attack
+#air_attack
+#build_cost_ic
+
+############################
+#### ANTI-AIR EQUIPMENT ####
+############################
+#reliability
+#defense
+#breakthrough
+#hardness
+#armor_value
+#soft_attack
+#hard_attack
+#ap_attack
+#air_attack
+#build_cost_ic
+
+#############################
+#### ANTI-TANK EQUIPMENT ####
+#############################
+#reliability
+#defense
+#breakthrough
+#hardness
+#armor_value
+#soft_attack
+#hard_attack
+#ap_attack
+#air_attack
+#build_cost_ic
+
+####################################
+#### ROCKET ARTILLERY EQUIPMENT ####
+####################################
+#reliability
+#defense
+#breakthrough
+#hardness
+#armor_value
+#soft_attack
+#hard_attack
+#ap_attack
+#air_attack
+#build_cost_ic
+
+
+##############################
+#### MOTORIZED EQUIPMENT #####
+##############################
+#maximum_speed
+#reliability
+#hardness
+#breakthrough
+#build_cost_ic
+#fuel_consumption
+
+####################################
+#### MOTORIZED ROCKET EQUIPMENT ####
+####################################
+#reliability
+#defense
+#breakthrough
+#hardness
+#armor_value
+#soft_attack
+#hard_attack
+#ap_attack
+#air_attack
+#build_cost_ic (edited)
+
+###############################
+#### MECHANIZED EQUIPMENT #####
+###############################
+#maximum_speed
+#reliability
+#defense
+#breakthrough
+#hardness
+#armor_value
+#ap_attack
+#air_attack
+#build_cost_ic
+#fuel_consumption
+
+#########################################
+#### AMPHIBIOUS MECHANIZED EQUIPMENT ####
+#########################################
+#maximum_speed
+#reliability
+#defense
+#breakthrough
+#hardness
+#armor_value
+#ap_attack
+#air_attack
+#build_cost_ic
+#fuel_consumption
+
+
+################################
+#### ARMORED CAR EQUIPMENT #####
+################################
+#maximum_speed
+#reliability
+#defense
+#breakthrough
+#hardness
+#armor_value
+#soft_attack
+#hard_attack
+#ap_attack
+#air_attack
+#build_cost_ic
+#fuel_consumption
+
+
+##########################
+#### TRAIN EQUIPMENT #####
+##########################
+#armor_value
+#build_cost_ic
+#air_attack
+
+################################
+#### RAILWAY GUN EQUIPMENT #####
+################################
+#reliability
+#maximum_speed
+#railway_gun_attack
+#build_cost_ic
+
+
+### PRODUCTION MODIFIERS ###
+#production_cost_factor
+#production_capacity_factor
+#production_efficiency_cap_factor
+#production_efficiency_gain_factor
+#production_resource_need_factor
+#production_resource_penalty_factor
+#production_conversion_speed_factor
+
+### ORGANIZATION MODIFIERS ###
+#military_industrial_organization_research_bonus
+#military_industrial_organization_design_team_assign_cost
+#military_industrial_organization_design_team_change_cost
+#military_industrial_organization_industrial_manufacturer_assign_cost
+#military_industrial_organization_task_capacity
+#military_industrial_organization_size_up_requirement
+#military_industrial_organization_funds_gain
\ No newline at end of file
diff --git a/common/military_industrial_organization/organizations/ANG_organization.txt b/common/military_industrial_organization/organizations/ANG_organization.txt
new file mode 100644
index 00000000000..2ada2164c87
--- /dev/null
+++ b/common/military_industrial_organization/organizations/ANG_organization.txt
@@ -0,0 +1,260 @@
+
+########    ###    ##    ## ##    ##  ######  
+   ##      ## ##   ###   ## ##   ##  ##    ## 
+   ##     ##   ##  ####  ## ##  ##   ##       
+   ##    ##     ## ## ## ## #####     ######  
+   ##    ######### ##  #### ##  ##         ## 
+   ##    ##     ## ##   ### ##   ##  ##    ## 
+   ##    ##     ## ##    ## ##    ##  ######  
+
+ANG_tank_company_organization = {
+	name = ANG_tank_company
+	include = generic_tank_organization
+	icon = GFX_idea_ANG_tank_company
+	allowed = {	
+		OR = {
+			original_tag = ANG
+			original_tag = GRI
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = ANG
+				owns_state = 411
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 411
+			411 = { is_core_of = owner }
+			OR = {
+				has_outdated_industry = yes
+				has_modern_society = yes
+			}
+		}
+	}
+}
+
+
+ ######  ##     ## #### ########   ######  
+##    ## ##     ##  ##  ##     ## ##    ## 
+##       ##     ##  ##  ##     ## ##       
+ ######  #########  ##  ########   ######  
+      ## ##     ##  ##  ##              ## 
+##    ## ##     ##  ##  ##        ##    ## 
+ ######  ##     ## #### ##         ######  
+
+
+
+ ANG_navy_concern_organization = {
+	name = ANG_navy_concern
+	include = generic_raider_ship_organization
+	icon = GFX_idea_ANG_navy_concern
+	allowed = {	
+		OR = {
+			original_tag = ANG
+			original_tag = GRI
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = ANG
+				owns_state = 411
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 411
+			411 = { is_core_of = owner }
+			any_controlled_state_is_coastal = yes
+		}
+	}
+
+}
+
+
+
+########  ##          ###    ##    ## ########  ######  
+##     ## ##         ## ##   ###   ## ##       ##    ## 
+##     ## ##        ##   ##  ####  ## ##       ##       
+########  ##       ##     ## ## ## ## ######    ######  
+##        ##       ######### ##  #### ##             ## 
+##        ##       ##     ## ##   ### ##       ##    ## 
+##        ######## ##     ## ##    ## ########  ######  
+
+
+ANG_air_man_1_organization = {
+	name = ANG_air_man_1
+	include = generic_range_focused_aircraft_organization
+	icon = GFX_idea_ANG_air_man_1
+	allowed = {	
+		OR = {
+			original_tag = ANG
+			original_tag = GRI
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = ANG
+				owns_state = 411
+			}
+		}
+	}
+	available = {
+		owner = {			
+			owns_state = 411
+			411 = { is_core_of = owner }
+			OR = {
+				has_outdated_industry = yes
+				has_modern_society = yes
+			}
+		}
+	}
+	
+}
+
+ANG_air_man_2_organization = {
+	name = ANG_air_man_2
+	include = generic_light_aircraft_organization
+	icon = GFX_idea_ANG_air_man_2
+	allowed = {	
+		OR = {
+			original_tag = ANG
+			original_tag = GRI
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = ANG
+				owns_state = 411
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 411
+			411 = { is_core_of = owner }
+			OR = {
+				has_outdated_industry = yes
+				has_modern_society = yes
+			}
+		}
+	}
+}
+
+
+
+
+##     ##    ###    ######## ######## ########  #### ######## ##       
+###   ###   ## ##      ##    ##       ##     ##  ##  ##       ##       
+#### ####  ##   ##     ##    ##       ##     ##  ##  ##       ##       
+## ### ## ##     ##    ##    ######   ########   ##  ######   ##       
+##     ## #########    ##    ##       ##   ##    ##  ##       ##       
+##     ## ##     ##    ##    ##       ##    ##   ##  ##       ##       
+##     ## ##     ##    ##    ######## ##     ## #### ######## ######## 
+
+
+ANG_small_arms_company_organization = {
+	include = generic_infantry_equipment_organization
+	name = ANG_small_arms_company
+	icon = GFX_idea_ANG_small_arms_company
+	allowed = {
+		OR = {
+			original_tag = ANG
+			original_tag = GRI
+		}
+		has_dlc = "Arms Against Tyranny"
+
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = ANG
+				owns_state = 411
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 411
+			411 = { is_core_of = owner }
+		}
+	}
+	initial_trait = {
+		equipment_bonus = {
+			reliability = 0.05
+		}
+	}
+}
+
+ANG_supp_eq_company_organization = {
+	name = ANG_supp_eq_company
+	include = generic_support_equipment_organization
+	icon = GFX_idea_ANG_supp_eq_company
+	allowed = {
+		OR = {
+			original_tag = ANG
+			original_tag = GRI
+		}
+		has_dlc = "Arms Against Tyranny" 
+
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = ANG
+				owns_state = 411
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 411
+			411 = { is_core_of = owner }
+		}
+	}
+}
+
+
+ANG_artillery_company_organization = {
+	name = ANG_artillery_company
+	include = generic_artillery_organization
+	icon = GFX_idea_ANG_artillery_company
+	allowed = {
+		OR = {
+			original_tag = ANG
+			original_tag = GRI
+		}
+		has_dlc = "Arms Against Tyranny" 
+
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = ANG
+				owns_state = 411
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 411
+			411 = { is_core_of = owner }
+		}
+	}
+	initial_trait = {
+		equipment_bonus = {
+			build_cost_ic = -0.05
+		}
+	}
+}
\ No newline at end of file
diff --git a/common/military_industrial_organization/organizations/BAK_organization.txt b/common/military_industrial_organization/organizations/BAK_organization.txt
new file mode 100644
index 00000000000..6c48b61f162
--- /dev/null
+++ b/common/military_industrial_organization/organizations/BAK_organization.txt
@@ -0,0 +1,448 @@
+
+########    ###    ##    ## ##    ##  ######  
+   ##      ## ##   ###   ## ##   ##  ##    ## 
+   ##     ##   ##  ####  ## ##  ##   ##       
+   ##    ##     ## ## ## ## #####     ######  
+   ##    ######### ##  #### ##  ##         ## 
+   ##    ##     ## ##   ### ##   ##  ##    ## 
+   ##    ##     ## ##    ## ##    ##  ######  
+
+BAK_tailvoz_organization = {
+	name = BAK_tailvoz
+	include = generic_mobile_tank_organization
+	icon = GFX_idea_BAK_tailvoz
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		can_form_river_fed = yes
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = BAK
+				AND = {
+					has_country_flag = RIV_annexed_BAK
+					BAK = { has_completed_focus = BAK_develop_car_industry }
+				}
+			}
+		}
+	}
+	available = {
+		owner = {
+			if = {
+				limit = { original_tag = BAK }
+				has_completed_focus = BAK_develop_car_industry
+			}
+		}
+	}
+}
+BAK_solinair_organization = {
+	name = BAK_solinair
+	include = generic_medium_tank_organization
+	icon = GFX_idea_BAK_solinair
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		can_form_river_fed = yes
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = BAK
+				has_country_flag = RIV_annexed_BAK
+			}
+		}
+	}
+	available = {
+		owner = {
+			hidden_trigger = {
+				OR = {
+					original_tag = BAK
+					has_country_flag = RIV_annexed_BAK
+				}
+			}
+		}
+	}
+	initial_trait = {
+		limit_to_equipment_type = { medium_tank_chassis }
+		equipment_bonus = {
+			maximum_speed = 0.05
+			soft_attack = 0.05
+		}
+	}
+}
+BAK_tomos_organization = {
+	name = BAK_tomos
+	include = generic_heavy_tank_organization
+	icon = GFX_idea_BAK_tomos
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		can_form_river_fed = yes
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = BAK
+				has_country_flag = RIV_annexed_BAK
+			}
+		}
+	}
+	available = {
+		owner = {
+			hidden_trigger = {
+				OR = {
+					original_tag = BAK
+					has_country_flag = RIV_annexed_BAK
+				}
+			}
+		}
+	}
+	initial_trait = {
+		limit_to_equipment_type = { heavy_tank_chassis }
+		equipment_bonus = {
+			breakthrough = 0.05
+			hardness = 0.05
+		}
+	}
+}
+
+
+ ######  ##     ## #### ########   ######  
+##    ## ##     ##  ##  ##     ## ##    ## 
+##       ##     ##  ##  ##     ## ##       
+ ######  #########  ##  ########   ######  
+      ## ##     ##  ##  ##              ## 
+##    ## ##     ##  ##  ##        ##    ## 
+ ######  ##     ## #### ##         ######  
+
+
+
+ BAK_elan_organization = {
+	name =  BAK_elan
+	include = generic_raider_ship_organization
+	icon = GFX_idea_BAK_elan
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		can_form_river_fed = yes
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = BAK
+				has_country_flag = RIV_annexed_BAK
+			}
+		}
+	}
+	available = {
+		owner = {
+			hidden_trigger = {
+				OR = {
+					original_tag = BAK
+					has_country_flag = RIV_annexed_BAK
+				}
+			}
+		}
+	}
+
+
+}
+
+BAK_zoot_organization = {
+	name = BAK_zoot
+	include = generic_task_force_ship_organization
+	icon = GFX_idea_BAK_zoot
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		can_form_river_fed = yes
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = BAK
+				has_country_flag = RIV_annexed_BAK
+			}
+		}
+	}
+	available = {
+		owner = {
+			hidden_trigger = {
+				OR = {
+					original_tag = BAK
+					has_country_flag = RIV_annexed_BAK
+				}
+			}
+		}
+	}
+
+}
+
+BAK_iskra_organization = {
+	name = BAK_iskra
+	include = generic_battle_line_ship_organization
+	icon = GFX_idea_royal_arsenal
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		can_form_river_fed = yes
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = BAK
+				has_country_flag = RIV_annexed_BAK
+			}
+		}
+	}
+	available = {
+		owner = {
+			hidden_trigger = {
+				OR = {
+					original_tag = BAK
+					has_country_flag = RIV_annexed_BAK
+				}
+			}
+		}
+	}
+
+}
+
+
+
+########  ##          ###    ##    ## ########  ######  
+##     ## ##         ## ##   ###   ## ##       ##    ## 
+##     ## ##        ##   ##  ####  ## ##       ##       
+########  ##       ##     ## ## ## ## ######    ######  
+##        ##       ######### ##  #### ##             ## 
+##        ##       ##     ## ##   ### ##       ##    ## 
+##        ######## ##     ## ##    ## ########  ######  
+
+
+BAK_amis_organization = {
+	name = BAK_amis
+	include = generic_range_focused_aircraft_organization
+	icon = GFX_idea_BAK_amis
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		can_form_river_fed = yes
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = BAK
+				has_country_flag = RIV_annexed_BAK
+			}
+		}
+	}
+	available = {
+		owner = {
+			hidden_trigger = {
+				OR = {
+					original_tag = BAK
+					has_country_flag = RIV_annexed_BAK
+				}
+			}
+		}
+	}
+	
+}
+
+BAK_tehnika_organization = {
+	name = BAK_tehnika
+	include = generic_cas_aircraft_organization
+	icon = GFX_idea_BAK_tehnika
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		can_form_river_fed = yes
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = BAK
+				has_country_flag = RIV_annexed_BAK
+			}
+		}
+	}
+	available = {
+		owner = {
+			hidden_trigger = {
+				OR = {
+					original_tag = BAK
+					has_country_flag = RIV_annexed_BAK
+				}
+			}
+		}
+	}
+	
+}
+
+BAK_istrabenz_organization = {
+	name = BAK_istrabenz
+	include = generic_heavy_aircraft_organization
+	icon = GFX_idea_BAK_istrabenz
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		can_form_river_fed = yes
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = BAK
+				has_country_flag = RIV_annexed_BAK
+			}
+		}
+	}
+	available = {
+		owner = {
+			hidden_trigger = {
+				OR = {
+					original_tag = BAK
+					has_country_flag = RIV_annexed_BAK
+				}
+			}
+		}
+	}
+	
+}
+
+
+
+
+
+##     ##    ###    ######## ######## ########  #### ######## ##       
+###   ###   ## ##      ##    ##       ##     ##  ##  ##       ##       
+#### ####  ##   ##     ##    ##       ##     ##  ##  ##       ##       
+## ### ## ##     ##    ##    ######   ########   ##  ######   ##       
+##     ## #########    ##    ##       ##   ##    ##  ##       ##       
+##     ## ##     ##    ##    ##       ##    ##   ##  ##       ##       
+##     ## ##     ##    ##    ######## ##     ## #### ######## ######## 
+
+
+BAK_lisica_organization = { # merger includes BAK_ziri as well!
+	include = generic_infantry_equipment_organization
+	name = BAK_lisica_and_ziri
+	icon = GFX_idea_BAK_lisica
+
+	allowed = {
+		can_form_river_fed = yes
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {			
+			OR = {
+				original_tag = BAK
+				AND = {
+					has_country_flag = RIV_annexed_BAK
+					BAK = { has_completed_focus = BAK_support_clothing_industry }
+				}
+			}
+		}
+	}
+	available = {
+        if = {
+            limit = { owner = { original_tag = BAK } }
+
+            owner = { has_completed_focus = BAK_support_clothing_industry }
+        }
+	}
+	
+	add_trait = { 
+		token = BAK_lisica_trait
+		name = BAK_lisica
+		icon = GFX_generic_mio_department_icon_infantry_offense
+		special_trait_background = yes
+
+		position = { x=1 y=0 }
+		relative_position_id = generic_mio_trait_drum_pattern_sights
+
+		mutually_exclusive = { BAK_ziri_trait }
+		
+		equipment_bonus = {
+			breakthrough = 0.05
+			defense = 0.03
+		}
+	}
+
+	add_trait = { 
+		token = BAK_ziri_trait
+		name = BAK_ziri
+		icon = generic_mio_department_icon_infantry_production
+		special_trait_background = yes
+
+		mutually_exclusive = { BAK_lisica_trait }
+		
+
+		position = { x=3 y=0 }
+		relative_position_id = generic_mio_trait_drum_pattern_sights
+
+		production_bonus = {
+			production_capacity_factor = 0.05
+			production_efficiency_gain_factor = 0.05
+		}
+	}
+}
+
+
+BAK_koper_organization = {
+	name = BAK_koper
+	include = generic_artillery_organization
+	icon = GFX_idea_BAK_koper
+	allowed = {	
+		has_dlc = "Arms Against Tyranny"
+		can_form_river_fed = yes
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = BAK
+				has_country_flag = RIV_annexed_BAK
+			}
+		}
+	}
+	available = {
+		owner = {
+			hidden_trigger = {
+				OR = {
+					original_tag = BAK
+					has_country_flag = RIV_annexed_BAK
+				}
+			}
+		}
+	}
+	initial_trait = {
+		equipment_bonus = {
+			soft_attack = 0.05
+			defense = 0.05
+		}
+	}
+}
+
+BAK_gorica_organization = {
+	name = BAK_gorica
+	include = generic_motorized_mechanized_organization
+	icon = GFX_idea_BAK_gorica
+	allowed = {	
+		has_dlc = "Arms Against Tyranny"
+		can_form_river_fed = yes
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = BAK
+				has_country_flag = RIV_annexed_BAK
+			}
+		}
+	}
+	available = {
+		owner = {
+			hidden_trigger = {
+				OR = {
+					original_tag = BAK
+					has_country_flag = RIV_annexed_BAK
+				}
+			}
+		}
+	}
+	initial_trait = {
+		limit_to_equipment_type = { motorized_equipment }
+		equipment_bonus = {
+			maximum_speed = 0.05
+		}
+	}
+}
\ No newline at end of file
diff --git a/common/military_industrial_organization/organizations/BAR_organization.txt b/common/military_industrial_organization/organizations/BAR_organization.txt
new file mode 100644
index 00000000000..385ca842354
--- /dev/null
+++ b/common/military_industrial_organization/organizations/BAR_organization.txt
@@ -0,0 +1,365 @@
+
+########    ###    ##    ## ##    ##  ######  
+   ##      ## ##   ###   ## ##   ##  ##    ## 
+   ##     ##   ##  ####  ## ##  ##   ##       
+   ##    ##     ## ## ## ## #####     ######  
+   ##    ######### ##  #### ##  ##         ## 
+   ##    ##     ## ##   ### ##   ##  ##    ## 
+   ##    ##     ## ##    ## ##    ##  ######  
+
+bar_tank_organization = {
+	name = bar_tank
+	include = generic_heavy_tank_organization
+	icon = GFX_idea_unknown_advisor
+
+	allowed = {
+		original_tag = BAR
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	visible = {
+		owner = {
+			hidden_trigger = {
+				has_country_flag = BAR_ambrosius_wants_a_car_id
+			}
+		}
+	}
+	available = { 
+		owner = {
+			hidden_trigger = {
+				has_country_flag = BAR_ambrosius_wants_a_car_id
+			}
+		}
+	}
+}
+bar_tank2_organization = {
+	name = bar_tank2
+	include = generic_medium_tank_organization
+	icon = GFX_idea_unknown_advisor
+	allowed = {
+		original_tag = BAR
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	visible = {
+		owner = {
+			hidden_trigger = {
+				has_country_flag = BAR_ambrosius_wants_a_car_id
+			}
+		}
+	}
+	available = { 
+		owner = {
+			hidden_trigger = {
+				has_country_flag = BAR_ambrosius_wants_a_car_id
+			}
+		}
+	}
+}
+
+ ######  ##     ## #### ########   ######  
+##    ## ##     ##  ##  ##     ## ##    ## 
+##       ##     ##  ##  ##     ## ##       
+ ######  #########  ##  ########   ######  
+      ## ##     ##  ##  ##              ## 
+##    ## ##     ##  ##  ##        ##    ## 
+ ######  ##     ## #### ##         ######  
+
+
+
+ BAR_pen_shipyard_organization = {
+	name =  BAR_pen_shipyard
+	include = generic_refurbishment_repair_organization
+	icon = GFX_idea_unknown_advisor
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		original_tag = BAR
+	}
+	visible = {
+		owner = {
+			hidden_trigger = {
+				OR = {
+					has_country_flag = BAR_undead_science
+					NOT = {
+						has_country_flag = BAR_advisors_killed
+					}
+				}
+			}
+		}
+	}
+	available = { 
+		owner = {
+			hidden_trigger = {
+				OR = {
+					has_country_flag = BAR_undead_science
+					NOT = {
+						has_country_flag = BAR_advisors_killed
+					}
+				}
+			}
+		}
+	}
+
+
+}
+
+
+
+########  ##          ###    ##    ## ########  ######  
+##     ## ##         ## ##   ###   ## ##       ##    ## 
+##     ## ##        ##   ##  ####  ## ##       ##       
+########  ##       ##     ## ## ## ## ######    ######  
+##        ##       ######### ##  #### ##             ## 
+##        ##       ##     ## ##   ### ##       ##    ## 
+##        ######## ##     ## ##    ## ########  ######  
+
+
+BAR_pen_light_planes_organization = {
+	name = BAR_pen_light_planes
+	include = generic_light_aircraft_organization
+	icon = GFX_idea_unknown_advisor
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		original_tag = BAR
+	}
+	visible = {
+		owner = {
+			hidden_trigger = {
+				OR = {
+					has_country_flag = BAR_undead_science
+					NOT = {
+						has_country_flag = BAR_advisors_killed
+					}
+				}
+			}
+		}
+	}
+	available = { 
+		owner = {
+			hidden_trigger = {
+				OR = {
+					has_country_flag = BAR_undead_science
+					NOT = {
+						has_country_flag = BAR_advisors_killed
+					}
+				}
+			}
+		}
+	}
+	
+}
+
+
+BAR_pen_cas_organization = {
+	name = BAR_pen_cas
+	include = generic_cas_aircraft_organization
+	icon = GFX_idea_unknown_advisor
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		original_tag = BAR
+	}
+	visible = {
+		owner = {
+			hidden_trigger = {
+				OR = {
+					has_country_flag = BAR_undead_science
+					NOT = {
+						has_country_flag = BAR_advisors_killed
+					}
+				}
+			}
+		}
+	}
+	available = { 
+		owner = {
+			hidden_trigger = {
+				OR = {
+					has_country_flag = BAR_undead_science
+					NOT = {
+						has_country_flag = BAR_advisors_killed
+					}
+				}
+			}
+		}
+	}
+	
+}
+
+BAR_pen_medium_planes_organization = {
+	name = BAR_pen_medium_planes
+	include = generic_medium_aircraft_organization
+	icon = GFX_idea_unknown_advisor
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		original_tag = BAR
+	}
+	visible = {
+		owner = {
+			hidden_trigger = {
+				OR = {
+					has_country_flag = BAR_undead_science
+					NOT = {
+						has_country_flag = BAR_advisors_killed
+					}
+				}
+			}
+		}
+	}
+	available = { 
+		owner = {
+			hidden_trigger = {
+				OR = {
+					has_country_flag = BAR_undead_science
+					NOT = {
+						has_country_flag = BAR_advisors_killed
+					}
+				}
+			}
+		}
+	}
+	
+}
+
+
+##     ##    ###    ######## ######## ########  #### ######## ##       
+###   ###   ## ##      ##    ##       ##     ##  ##  ##       ##       
+#### ####  ##   ##     ##    ##       ##     ##  ##  ##       ##       
+## ### ## ##     ##    ##    ######   ########   ##  ######   ##       
+##     ## #########    ##    ##       ##   ##    ##  ##       ##       
+##     ## ##     ##    ##    ##       ##    ##   ##  ##       ##       
+##     ## ##     ##    ##    ######## ##     ## #### ######## ######## 
+
+
+BAR_pen_arty_organization = {
+	include = generic_artillery_organization
+	name = BAR_pen_arty
+	icon = GFX_idea_BAR_arty_adv
+
+	allowed = {
+		original_tag = BAR
+		has_dlc = "Arms Against Tyranny"
+
+	}
+	visible = {
+		owner = {
+			hidden_trigger = {
+				OR = {
+					has_country_flag = BAR_undead_science
+					NOT = {
+						has_country_flag = BAR_advisors_killed
+					}
+				}
+			}
+		}
+	}
+	available = { 
+		owner = {
+			hidden_trigger = {
+				OR = {
+					has_country_flag = BAR_undead_science
+					NOT = {
+						has_country_flag = BAR_advisors_killed
+					}
+				}
+			}
+		}
+	}
+	initial_trait = {
+		equipment_bonus = {
+			soft_attack = 0.05
+		}
+	}
+}
+
+BAR_pen_guns_organization = {
+	name = BAR_pen_guns
+	include = generic_infantry_equipment_organization
+	icon = GFX_idea_unknown_advisor
+	allowed = {
+		original_tag = BAR
+		has_dlc = "Arms Against Tyranny"
+
+	}
+	visible = {
+		owner = {
+			hidden_trigger = {
+				OR = {
+					has_country_flag = BAR_undead_science
+					NOT = {
+						has_country_flag = BAR_advisors_killed
+					}
+				}
+			}
+		}
+	}
+	available = { 
+		owner = {
+			hidden_trigger = {
+				OR = {
+					has_country_flag = BAR_undead_science
+					NOT = {
+						has_country_flag = BAR_advisors_killed
+					}
+				}
+			}
+		}
+	}
+	initial_trait = {
+		limit_to_equipment_type = { infantry_equipment} 
+		equipment_bonus = {
+			breakthrough = 0.05
+			defense = 0.05
+		}
+	}
+}
+
+BAR_magic_guns_organization = {
+	name = BAR_magic_guns
+	include = generic_infantry_equipment_organization
+	icon = GFX_idea_unknown_advisor
+	allowed = {
+		original_tag = BAR
+		has_dlc = "Arms Against Tyranny"
+
+	}
+	visible = {
+		owner = {
+			hidden_trigger = {
+				OR = {
+					has_country_flag = BAR_undead_science
+					NOT = {
+						has_country_flag = BAR_advisors_killed
+					}
+				}
+			}
+		}
+	}
+	available = { 
+		owner = {
+			hidden_trigger = {
+				OR = {
+					has_country_flag = BAR_undead_science
+					NOT = {
+						has_country_flag = BAR_advisors_killed
+					}
+				}
+			}
+		}
+	}
+	equipment_type = {  
+        magical_equipment
+    }
+
+    research_categories = { 
+        magical_tech
+    }
+	initial_trait = {
+		name = generic_mio_initial_trait_magical_designer
+		limit_to_equipment_type = { magical_equipment } 
+		equipment_bonus = {
+			reliability = 0.1
+		}
+	}
+	
+}
+
diff --git a/common/military_industrial_organization/organizations/BAT_organization.txt b/common/military_industrial_organization/organizations/BAT_organization.txt
new file mode 100644
index 00000000000..41e1ce5d071
--- /dev/null
+++ b/common/military_industrial_organization/organizations/BAT_organization.txt
@@ -0,0 +1,203 @@
+
+########    ###    ##    ## ##    ##  ######  
+   ##      ## ##   ###   ## ##   ##  ##    ## 
+   ##     ##   ##  ####  ## ##  ##   ##       
+   ##    ##     ## ## ## ## #####     ######  
+   ##    ######### ##  #### ##  ##         ## 
+   ##    ##     ## ##   ### ##   ##  ##    ## 
+   ##    ##     ## ##    ## ##    ##  ######  
+
+BAT_designer_4_organization = {
+	name = BAT_designer_4
+	include = generic_mobile_tank_organization
+	icon = GFX_idea_BAT_designer_4
+
+	allowed = {
+		original_tag = BAT
+		has_dlc = "Arms Against Tyranny"
+	}
+	initial_trait = {
+		limit_to_equipment_type = { light_tank_chassis } 
+		equipment_bonus = {
+			hard_attack = 0.03
+		}
+	}
+}
+BAT_designer_5_organization = {
+	name = BAT_designer_5
+	include = generic_infantry_tank_organization
+	icon = GFX_idea_BAT_designer_5
+
+	allowed = {
+		original_tag = BAT
+		has_dlc = "Arms Against Tyranny"
+	}
+	initial_trait = {
+		limit_to_equipment_type = { medium_tank_chassis } 
+		equipment_bonus = {
+			maximum_speed = 0.03
+		}
+	}
+}
+BAT_designer_6_organization = {
+	name = BAT_designer_6
+	include = generic_heavy_tank_organization
+	icon = GFX_idea_BAT_designer_6
+
+	allowed = {
+		original_tag = BAT
+		has_dlc = "Arms Against Tyranny"
+	}
+	initial_trait = {
+		limit_to_equipment_type = { heavy_tank_chassis } 
+		equipment_bonus = {
+			reliability = 0.03
+		}
+	}
+}
+
+ ######  ##     ## #### ########   ######  
+##    ## ##     ##  ##  ##     ## ##    ## 
+##       ##     ##  ##  ##     ## ##       
+ ######  #########  ##  ########   ######  
+      ## ##     ##  ##  ##              ## 
+##    ## ##     ##  ##  ##        ##    ## 
+ ######  ##     ## #### ##         ######  
+
+
+
+ BAT_designer_10_organization = {
+	name =  BAT_designer_10
+	include = generic_raider_ship_organization
+	icon = GFX_idea_BAT_designer_10
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		original_tag = BAT
+	}
+}
+
+
+
+BAT_designer_11_organization = {
+	name =  BAT_designer_11
+	include = generic_task_force_ship_organization
+	icon = GFX_idea_BAT_designer_11
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		original_tag = BAT
+	}
+}
+BAT_designer_12_organization = {
+	name =  BAT_designer_12
+	include = generic_escort_ship_organization
+	icon = GFX_idea_BAT_designer_12
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		original_tag = BAT
+	}
+}
+
+
+
+########  ##          ###    ##    ## ########  ######  
+##     ## ##         ## ##   ###   ## ##       ##    ## 
+##     ## ##        ##   ##  ####  ## ##       ##       
+########  ##       ##     ## ## ## ## ######    ######  
+##        ##       ######### ##  #### ##             ## 
+##        ##       ##     ## ##   ### ##       ##    ## 
+##        ######## ##     ## ##    ## ########  ######  
+
+
+BAT_designer_13_organization = {
+	name = BAT_designer_13
+	include = generic_light_aircraft_organization
+	icon = GFX_idea_BAT_designer_13
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		original_tag = BAT
+	}
+	
+}
+
+
+BAT_designer_14_organization = {
+	name = BAT_designer_14
+	include = generic_range_focused_aircraft_organization
+	icon = GFX_idea_BAT_designer_14
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		original_tag = BAT
+	}
+	
+}
+BAT_designer_15_organization = {
+	name = BAT_designer_15
+	include = generic_cas_aircraft_organization
+	icon = GFX_idea_BAT_designer_15
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		original_tag = BAT
+	}
+	
+}
+
+##     ##    ###    ######## ######## ########  #### ######## ##       
+###   ###   ## ##      ##    ##       ##     ##  ##  ##       ##       
+#### ####  ##   ##     ##    ##       ##     ##  ##  ##       ##       
+## ### ## ##     ##    ##    ######   ########   ##  ######   ##       
+##     ## #########    ##    ##       ##   ##    ##  ##       ##       
+##     ## ##     ##    ##    ##       ##    ##   ##  ##       ##       
+##     ## ##     ##    ##    ######## ##     ## #### ######## ######## 
+
+
+BAT_designer_7_organization = {
+	include = generic_artillery_organization
+	name = BAT_designer_7
+	icon = GFX_idea_BAT_designer_7
+
+	allowed = {
+		original_tag = BAT
+		has_dlc = "Arms Against Tyranny"
+	}
+	initial_trait = {
+		limit_to_equipment_type = { artillery_equipment } 
+		equipment_bonus = {
+			hard_attack = 0.03
+		}
+	}
+}
+
+
+BAT_designer_8_organization = {
+	include = generic_infantry_equipment_organization
+	name = BAT_designer_8
+	icon = GFX_idea_BAT_designer_8
+
+	allowed = {
+		original_tag = BAT
+		has_dlc = "Arms Against Tyranny"
+	}
+	initial_trait = {
+		limit_to_equipment_type = { infantry_equipment } 
+		equipment_bonus = {
+			soft_attack = 0.03
+		}
+	}
+}
+
+BAT_designer_9_organization = {
+	include = generic_motorized_mechanized_organization
+	name = BAT_designer_9
+	icon = GFX_idea_BAT_designer_9
+
+	allowed = {
+		original_tag = BAT
+		has_dlc = "Arms Against Tyranny"
+	}
+	initial_trait = {
+		limit_to_equipment_type = { motorized_equipment } 
+		equipment_bonus = {
+			maximum_speed = 0.03
+		}
+	}
+}
\ No newline at end of file
diff --git a/common/military_industrial_organization/organizations/BRF_organization.txt b/common/military_industrial_organization/organizations/BRF_organization.txt
new file mode 100644
index 00000000000..c251b94b1be
--- /dev/null
+++ b/common/military_industrial_organization/organizations/BRF_organization.txt
@@ -0,0 +1,74 @@
+
+########    ###    ##    ## ##    ##  ######  
+   ##      ## ##   ###   ## ##   ##  ##    ## 
+   ##     ##   ##  ####  ## ##  ##   ##       
+   ##    ##     ## ## ## ## #####     ######  
+   ##    ######### ##  #### ##  ##         ## 
+   ##    ##     ## ##   ### ##   ##  ##    ## 
+   ##    ##     ## ##    ## ##    ##  ######  
+
+BRF_medium_tank_manufacturer_organization = {
+	name = BRF_medium_tank_manufacturer
+	include = generic_medium_tank_organization
+	icon = GFX_idea_generic_tank_manufacturer_1
+
+	allowed = {
+		original_tag = BRF
+		has_dlc = "Arms Against Tyranny"
+	}
+	available = {
+		owner = {
+			has_completed_focus = BRF_army_offensive
+		}
+	}
+}
+ ######  ##     ## #### ########   ######  
+##    ## ##     ##  ##  ##     ## ##    ## 
+##       ##     ##  ##  ##     ## ##       
+ ######  #########  ##  ########   ######  
+      ## ##     ##  ##  ##              ## 
+##    ## ##     ##  ##  ##        ##    ## 
+ ######  ##     ## #### ##         ######  
+
+
+
+########  ##          ###    ##    ## ########  ######  
+##     ## ##         ## ##   ###   ## ##       ##    ## 
+##     ## ##        ##   ##  ####  ## ##       ##       
+########  ##       ##     ## ## ## ## ######    ######  
+##        ##       ######### ##  #### ##             ## 
+##        ##       ##     ## ##   ### ##       ##    ## 
+##        ######## ##     ## ##    ## ########  ######  
+
+
+
+##     ##    ###    ######## ######## ########  #### ######## ##       
+###   ###   ## ##      ##    ##       ##     ##  ##  ##       ##       
+#### ####  ##   ##     ##    ##       ##     ##  ##  ##       ##       
+## ### ## ##     ##    ##    ######   ########   ##  ######   ##       
+##     ## #########    ##    ##       ##   ##    ##  ##       ##       
+##     ## ##     ##    ##    ##       ##    ##   ##  ##       ##       
+##     ## ##     ##    ##    ######## ##     ## #### ######## ######## 
+
+
+BRF_arty_manufacturer_organization = {
+	include = generic_artillery_organization
+	name = BRF_arty_manufacturer
+	icon = GFX_idea_generic_artillery_manufacturer_3
+
+	allowed = {
+		original_tag = BRF
+		has_dlc = "Arms Against Tyranny"
+
+	}
+	available = {
+		owner = {
+			controls_state = 508
+		}
+	}
+	initial_trait = {
+		equipment_bonus = {
+			soft_attack = 0.05
+		}
+	}
+}
diff --git a/common/military_industrial_organization/organizations/BRZ_organization.txt b/common/military_industrial_organization/organizations/BRZ_organization.txt
new file mode 100644
index 00000000000..d8f4b4aa07d
--- /dev/null
+++ b/common/military_industrial_organization/organizations/BRZ_organization.txt
@@ -0,0 +1,173 @@
+
+########    ###    ##    ## ##    ##  ######  
+   ##      ## ##   ###   ## ##   ##  ##    ## 
+   ##     ##   ##  ####  ## ##  ##   ##       
+   ##    ##     ## ## ## ## #####     ######  
+   ##    ######### ##  #### ##  ##         ## 
+   ##    ##     ## ##   ### ##   ##  ##    ## 
+   ##    ##     ## ##    ## ##    ##  ######  
+
+BRZ_greyhound_organization = {
+	name = BRZ_greyhound
+	include = generic_mobile_tank_organization
+	icon = GFX_idea_BRZ_greyhound
+
+	allowed = {
+		original_tag = BRZ
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+}
+BRZ_rabenmetall_organization = {
+	name = BRZ_rabenmetall
+	include = generic_heavy_tank_organization
+	icon = GFX_idea_BRZ_rabenmetall
+
+	allowed = {
+		original_tag = BRZ
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+}
+
+ ######  ##     ## #### ########   ######  
+##    ## ##     ##  ##  ##     ## ##    ## 
+##       ##     ##  ##  ##     ## ##       
+ ######  #########  ##  ########   ######  
+      ## ##     ##  ##  ##              ## 
+##    ## ##     ##  ##  ##        ##    ## 
+ ######  ##     ## #### ##         ######  
+
+
+
+ BRZ_poodle_organization = {
+	name =  BRZ_poodle
+	include = generic_battle_line_ship_organization
+	icon = GFX_idea_BRZ_poodle
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		original_tag = BRZ
+	}
+}
+
+ BRZ_wasserhund_organization = {
+	name =  BRZ_wasserhund
+	include = generic_raider_ship_organization
+	icon = GFX_idea_generic_naval_manufacturer_2
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		original_tag = BRZ
+	}
+}
+
+
+
+
+
+########  ##          ###    ##    ## ########  ######  
+##     ## ##         ## ##   ###   ## ##       ##    ## 
+##     ## ##        ##   ##  ####  ## ##       ##       
+########  ##       ##     ## ## ## ## ######    ######  
+##        ##       ######### ##  #### ##             ## 
+##        ##       ##     ## ##   ### ##       ##    ## 
+##        ######## ##     ## ##    ## ########  ######  
+
+
+BRZ_beakker_organization = {
+	name = BRZ_beakker
+	include = generic_light_aircraft_organization
+	icon = GFX_idea_BRZ_beakker
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		original_tag = BRZ
+	}
+
+	available = {
+		owner = {
+			has_country_flag = BRZ_beakker_bronze_founded
+		}
+	}
+	
+}
+
+
+BRZ_bls_organization = {
+	name = BRZ_bls
+	include = generic_cas_aircraft_organization
+	icon = GFX_idea_BRZ_bls
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		original_tag = BRZ
+	}
+	
+}
+
+
+BRZ_hunter_wolf_organization = {
+	name = BRZ_hunter_wolf
+	include = generic_medium_aircraft_organization
+	icon = GFX_idea_BRZ_hunterwolf
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		original_tag = BRZ
+	}
+	
+}
+
+##     ##    ###    ######## ######## ########  #### ######## ##       
+###   ###   ## ##      ##    ##       ##     ##  ##  ##       ##       
+#### ####  ##   ##     ##    ##       ##     ##  ##  ##       ##       
+## ### ## ##     ##    ##    ######   ########   ##  ######   ##       
+##     ## #########    ##    ##       ##   ##    ##  ##       ##       
+##     ## ##     ##    ##    ##       ##    ##   ##  ##       ##       
+##     ## ##     ##    ##    ######## ##     ## #### ######## ######## 
+
+
+BRZ_baf_organization = {
+	include = generic_motorized_mechanized_organization
+	name = BRZ_baf
+	icon = GFX_idea_BRZ_baf
+
+	allowed = {
+		original_tag = BRZ
+		has_dlc = "Arms Against Tyranny"
+	}
+
+	available = {
+		owner = {
+			has_completed_focus = BRZ_kickstart_the_automotive_industry
+		}
+	}
+	initial_trait = {
+		organization_modifier = {
+			military_industrial_organization_design_team_assign_cost = -0.5
+		}
+		equipment_bonus = {
+			build_cost_ic = -0.10
+			maximum_speed = 0.05
+		}
+	}
+}
+
+
+BRZ_bronzekreuz_arsenal_organization = {
+	include = generic_infantry_equipment_organization
+	name = BRZ_bronzekreuz_arsenal
+	icon = GFX_idea_BRZ_bronzekreuz_arsenal
+
+	allowed = {
+		original_tag = BRZ
+		has_dlc = "Arms Against Tyranny"
+	}
+}
+
+BRZ_isaf_hundfeld_organization = {
+	include = generic_artillery_organization
+	name = BRZ_isaf_hundfeld
+	icon = GFX_idea_BRZ_isaf
+
+	allowed = {
+		original_tag = BRZ
+		has_dlc = "Arms Against Tyranny"
+	}
+}
\ No newline at end of file
diff --git a/common/military_industrial_organization/organizations/BUF_organization.txt b/common/military_industrial_organization/organizations/BUF_organization.txt
new file mode 100644
index 00000000000..29a95867620
--- /dev/null
+++ b/common/military_industrial_organization/organizations/BUF_organization.txt
@@ -0,0 +1,113 @@
+
+########    ###    ##    ## ##    ##  ######  
+   ##      ## ##   ###   ## ##   ##  ##    ## 
+   ##     ##   ##  ####  ## ##  ##   ##       
+   ##    ##     ## ## ## ## #####     ######  
+   ##    ######### ##  #### ##  ##         ## 
+   ##    ##     ## ##   ### ##   ##  ##    ## 
+   ##    ##     ## ##    ## ##    ##  ######  
+
+BUF_tank_factory_organization = {
+	name = BUF_tank_factory
+	include = generic_escort_ship_organization
+	icon = GFX_idea_BUF_tank_factory
+
+	allowed = {
+		original_tag = BUF
+		has_dlc = "Arms Against Tyranny"
+	}
+	available = {
+		owner = {
+			does_not_have_agrarian_society = yes
+		}
+	}
+	initial_trait = {
+		organization_modifier = {
+			military_industrial_organization_research_bonus = 0.03
+		}
+	}
+}
+
+ ######  ##     ## #### ########   ######  
+##    ## ##     ##  ##  ##     ## ##    ## 
+##       ##     ##  ##  ##     ## ##       
+ ######  #########  ##  ########   ######  
+      ## ##     ##  ##  ##              ## 
+##    ## ##     ##  ##  ##        ##    ## 
+ ######  ##     ## #### ##         ######  
+
+
+
+ BUF_navy_organization = {
+	name =  BUF_navy
+	include = generic_raider_ship_organization
+	icon = GFX_idea_BUF_navy
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		original_tag = BUF
+	}
+	
+	available = {
+		owner = {
+			does_not_have_agrarian_society = yes
+			any_controlled_state_is_coastal = yes
+		}
+	}
+}
+
+
+
+
+
+########  ##          ###    ##    ## ########  ######  
+##     ## ##         ## ##   ###   ## ##       ##    ## 
+##     ## ##        ##   ##  ####  ## ##       ##       
+########  ##       ##     ## ## ## ## ######    ######  
+##        ##       ######### ##  #### ##             ## 
+##        ##       ##     ## ##   ### ##       ##    ## 
+##        ######## ##     ## ##    ## ########  ######  
+
+
+BUF_air_organization = {
+	name = BUF_air
+	include = generic_light_aircraft_organization
+	icon = GFX_idea_BUF_air
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		original_tag = BUF
+	}
+
+	available = {
+		owner = {
+			does_not_have_agrarian_society = yes
+		}
+	}
+	
+}
+
+##     ##    ###    ######## ######## ########  #### ######## ##       
+###   ###   ## ##      ##    ##       ##     ##  ##  ##       ##       
+#### ####  ##   ##     ##    ##       ##     ##  ##  ##       ##       
+## ### ## ##     ##    ##    ######   ########   ##  ######   ##       
+##     ## #########    ##    ##       ##   ##    ##  ##       ##       
+##     ## ##     ##    ##    ##       ##    ##   ##  ##       ##       
+##     ## ##     ##    ##    ######## ##     ## #### ######## ######## 
+
+
+
+BUF_infantry_manufacturer_organization = {
+	include = generic_infantry_equipment_organization
+	name = BUF_infantry_manufacturer
+	icon = GFX_idea_BUF_infantry_manufacturer
+
+	allowed = {
+		original_tag = BUF
+		has_dlc = "Arms Against Tyranny"
+	}
+	available = {
+		owner = { 
+			has_completed_focus = BUF_infantry_equipment_factory
+		}
+	}
+
+}
diff --git a/common/military_industrial_organization/organizations/CES_organization.txt b/common/military_industrial_organization/organizations/CES_organization.txt
new file mode 100644
index 00000000000..e9750c1f521
--- /dev/null
+++ b/common/military_industrial_organization/organizations/CES_organization.txt
@@ -0,0 +1,64 @@
+#####################
+
+###  ##  #  # # #  ## 
+ #  #  # ## # # # #   
+ #  #### # ## ##   #  
+ #  #  # #  # # #   # 
+ #  #  # #  # # # ## 
+
+ #################### 
+
+
+
+#####################
+
+ ## #  # ### ###   ## 
+#   #  #  #  #  # #   
+ #  ####  #  ###   #  
+  # #  #  #  #      # 
+##  #  # ### #    ##  
+ 
+#####################
+
+CES_stableside_naval_company_organization = {
+	
+	name = stableside_naval_company
+	icon = GFX_idea_generic_naval_manufacturer_3
+	include = generic_refurbishment_repair_organization
+	
+	allowed = {
+		original_tag = CES
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	available = {
+		owner = {
+			has_completed_focus = CES_naval_production
+			controls_state = 15
+		}
+	}
+	# no initial trait because we're using a whole different trait for this
+}
+
+###########################
+
+###  #    ##  #  # ###  ## 
+#  # #   #  # ## # #   #   
+###  #   #### # ## ##   #  
+#    #   #  # #  # #     # 
+#    ### #  # #  # ### ##  
+
+###########################
+
+
+
+################################### 
+
+#   #  ##  ### ### ###  ### ### #   
+## ## #  #  #  #   #  #  #  #   #   
+# # # ####  #  ##  ###   #  ##  #   
+#   # #  #  #  #   #  #  #  #   #   
+#   # #  #  #  ### #  # ### ### ### 
+
+
+###################################
\ No newline at end of file
diff --git a/common/military_industrial_organization/organizations/CHN_organization.txt b/common/military_industrial_organization/organizations/CHN_organization.txt
new file mode 100644
index 00000000000..e11aa07b380
--- /dev/null
+++ b/common/military_industrial_organization/organizations/CHN_organization.txt
@@ -0,0 +1,322 @@
+
+########    ###    ##    ## ##    ##  ######  
+   ##      ## ##   ###   ## ##   ##  ##    ## 
+   ##     ##   ##  ####  ## ##  ##   ##       
+   ##    ##     ## ## ## ## #####     ######  
+   ##    ######### ##  #### ##  ##         ## 
+   ##    ##     ## ##   ### ##   ##  ##    ## 
+   ##    ##     ## ##    ## ##    ##  ######  
+
+CHN_chntank1_organization = {
+	name = chntank1
+	include = generic_heavy_tank_organization
+	icon = GFX_idea_CHN_aurelia_armory
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = CHN
+			original_tag = CCN
+		}
+	}
+}
+CHN_chntank2_organization = {
+	name = chntank2
+	include = generic_mobile_tank_organization
+	icon = GFX_idea_CHN_carapace
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = CHN
+			original_tag = PLB
+			original_tag = CCN
+		}
+	}
+	visible = {
+		owner = {	
+			OR = {
+				original_tag = CHN
+				original_tag = CCN
+				AND = {
+					original_tag = PLB
+					has_country_flag = exu_comp
+				}
+			}
+		}
+	}
+}
+CHN_chntank3_organization = {
+	name = chntank3
+	include = generic_medium_tank_organization
+	icon = GFX_idea_CHN_KLAA
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = CCN
+			original_tag = CHN
+			original_tag = MAN
+		}
+	}
+
+	available = {
+		if = {
+			limit = { owner = { original_tag = MAN } } 
+			owner = { is_in_faction_with = CHN } 
+		}
+	}
+}
+CHN_tank_sirius_mustang_organization = {
+	name = CHN_tank_sirius_mustang
+	include = generic_main_battle_tank_organization
+	icon = GFX_idea_EQS_sirius
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		original_tag = CHN
+	}
+
+	visible = {
+		owner = { has_completed_focus = CHN_post_war_2_h }
+	}
+}
+
+
+ ######  ##     ## #### ########   ######  
+##    ## ##     ##  ##  ##     ## ##    ## 
+##       ##     ##  ##  ##     ## ##       
+ ######  #########  ##  ########   ######  
+      ## ##     ##  ##  ##              ## 
+##    ## ##     ##  ##  ##        ##    ## 
+ ######  ##     ## #### ##         ######  
+
+
+
+ CHN_chnnavy2_organization = {
+	name =  chnnavy2
+	include = generic_battle_line_ship_organization
+	icon = GFX_idea_CHN_eiskaltenseen
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = CHN
+			original_tag = CCN
+			original_tag = PLB
+		}
+	}
+	visible = {
+		owner = {			
+			OR = {
+				original_tag = CHN
+				original_tag = CCN
+				AND = {
+					original_tag = PLB
+					has_country_flag = exu_comp
+				}
+			}
+		}
+	}
+
+
+}
+
+CHN_chnnavy1_organization = {
+	name =  chnnavy1
+	include = generic_raider_ship_organization
+	icon = GFX_idea_CHN_NG_shipyards
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		original_tag = CHN
+	}
+
+
+}
+
+
+########  ##          ###    ##    ## ########  ######  
+##     ## ##         ## ##   ###   ## ##       ##    ## 
+##     ## ##        ##   ##  ####  ## ##       ##       
+########  ##       ##     ## ## ## ## ######    ######  
+##        ##       ######### ##  #### ##             ## 
+##        ##       ##     ## ##   ### ##       ##    ## 
+##        ######## ##     ## ##    ## ########  ######  
+
+
+CHN_chnairm5_organization = {
+	name = chnairm5
+	include = generic_light_aircraft_organization
+	icon = GFX_idea_CHN_svarm_aircraft
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = CHN
+			original_tag = CCN
+		}
+	}
+	add_trait = {
+		token = CHN_mio_trait_maintenance_first_design
+		name = GER_mio_trait_maintenance_first_design
+
+		icon = GFX_generic_mio_department_icon_plane_fighter_line_efficiency
+		special_trait_background = yes
+		
+		position = { x=-2 y=1 }
+		relative_position_id = generic_mio_trait_expanded_production_facilities
+
+		all_parents = { generic_mio_trait_expanded_production_facilities }
+
+		equipment_bonus = {
+			reliability = 0.05
+		}
+
+		production_bonus = {
+			production_efficiency_gain_factor = 0.05
+		}
+	}
+
+	add_trait = {
+		token = CHM_mio_trait_fuselage_based_weapons
+		name = GER_mio_trait_fuselage_based_weapons
+
+		icon = GFX_generic_mio_trait_icon_anti_air_attack
+		special_trait_background = yes
+		
+		position = { x=1 y=1 }
+		relative_position_id = generic_mio_trait_gun_pods
+
+		any_parent = { generic_mio_trait_heavier_airframe generic_mio_trait_maximum_wing_loads generic_mio_trait_gun_pods }
+
+		equipment_bonus = {
+			air_attack = 0.05
+			air_agility = 0.05
+		} 
+	}
+}
+CHN_chnairm4_organization = {
+	name = chnairm4
+	include = generic_cas_aircraft_organization
+	icon = GFX_idea_CHN_vespidae
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = CHN
+			original_tag = CCN
+		}
+	}
+	
+	add_trait = {
+		token = CHN_mio_trait_psychological_warfare
+		name = GER_mio_trait_psychological_warfare
+
+		icon = GFX_generic_mio_trait_icon_fuel_consumption
+		special_trait_background = yes
+		
+		position = { x=2 y=0 }
+		relative_position_id = generic_mio_trait_reinforced_wings
+
+		equipment_bonus = {
+			fuel_consumption = -0.05
+		} 
+	}
+}
+CHN_chnairm3_organization = {
+	name = chnairm3
+	include = generic_medium_aircraft_organization
+	icon = GFX_idea_CHN_united_wing_association
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = CHN
+			original_tag = CCN
+		}
+	}
+}
+CHN_chnairm2_organization = {
+	name = chnairm2
+	include = generic_heavy_aircraft_organization
+	icon = GFX_idea_CHN_svarm_aircraft
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = CHN
+			original_tag = CCN
+		}
+	}
+}
+CHN_chnairm1_organization = {
+	name = chnairm1
+	include = generic_naval_aircraft_organization
+	icon = GFX_idea_CHN_klab
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = CHN
+			original_tag = CCN
+		}
+	}
+}
+
+
+
+
+##     ##    ###    ######## ######## ########  #### ######## ##       
+###   ###   ## ##      ##    ##       ##     ##  ##  ##       ##       
+#### ####  ##   ##     ##    ##       ##     ##  ##  ##       ##       
+## ### ## ##     ##    ##    ######   ########   ##  ######   ##       
+##     ## #########    ##    ##       ##   ##    ##  ##       ##       
+##     ## ##     ##    ##    ##       ##    ##   ##  ##       ##       
+##     ## ##     ##    ##    ######## ##     ## #### ######## ######## 
+
+
+CHN_chnequip1_organization = {
+	include = generic_artillery_organization
+	name = chnequip1
+	icon = GFX_idea_CHN_eiskaltenseen
+
+	allowed = {
+		OR = {
+			original_tag = CHN
+			original_tag = CCN
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+}
+
+
+CHN_chnequip2_organization = {
+	include = generic_infantry_equipment_organization
+	name = chnequip2
+	icon = GFX_idea_CHN_nidhogg
+
+	allowed = {
+		OR = {
+			original_tag = CHN
+			original_tag = CCN
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+}
+
+CHN_chnequip3_organization = {
+	include = generic_motorized_mechanized_organization
+	name = chnequip3
+	icon = GFX_idea_CHN_open_carriers_and_automotives
+
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = CHN
+			original_tag = CCN
+			original_tag = PLB
+		}
+	}
+	visible = {
+		owner = {			
+			OR = {
+				original_tag = CHN
+				original_tag = CCN
+				AND = {
+					original_tag = PLB
+					has_country_flag = exu_comp
+				}
+			}
+		}
+	}
+}
diff --git a/common/military_industrial_organization/organizations/CRY_organization.txt b/common/military_industrial_organization/organizations/CRY_organization.txt
new file mode 100644
index 00000000000..0ace49dd582
--- /dev/null
+++ b/common/military_industrial_organization/organizations/CRY_organization.txt
@@ -0,0 +1,318 @@
+
+########    ###    ##    ## ##    ##  ######  
+   ##      ## ##   ###   ## ##   ##  ##    ## 
+   ##     ##   ##  ####  ## ##  ##   ##       
+   ##    ##     ## ## ## ## #####     ######  
+   ##    ######### ##  #### ##  ##         ## 
+   ##    ##     ## ##   ### ##   ##  ##    ## 
+   ##    ##     ## ##    ## ##    ##  ######  
+
+CRY_hoplite_organization = {
+	name = hoplite
+	include = generic_mobile_tank_organization
+	icon = GFX_idea_CRY_hoplite
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		original_tag = CRY
+	}
+	available = {
+		owner = {
+			OR = {
+				has_government = democratic
+				has_country_flag = CRY_solar_governorship
+				has_country_flag = CRY_lunar_governorship
+			}
+		}
+	}
+}
+CRY_aegis_organization = {
+	name = aegis
+	include = generic_medium_tank_organization
+	icon = GFX_idea_CRY_aegis
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		original_tag = CRY
+	}
+	
+	available = {
+		owner = {
+			OR = {
+				has_government = democratic
+				has_country_flag = CRY_solar_governorship
+				has_country_flag = CRY_lunar_governorship
+			}
+		}
+	}
+
+}
+CRY_citrum_organization = {
+	name = citrum
+	include = generic_medium_tank_organization
+	icon = GFX_idea_CRY_citrum
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		original_tag = CRY
+	}
+	visible = {
+		owner = {
+			has_focus_tree = crystalempire_sombra
+		}
+		
+	}
+	available = {
+		owner = {
+			has_completed_focus = CRY_somdustrial_concerns
+		}
+	}
+}
+CRY_nyx_organization = {
+	name = nyx
+	include = generic_heavy_tank_organization
+	icon = GFX_idea_CRY_nyx
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		original_tag = CRY
+	}
+	visible = {
+		owner = {
+			has_focus_tree = crystalempire_sombra
+		}
+		
+	}
+	available = {
+		owner = {
+			has_completed_focus = CRY_somdustrial_concerns
+		}
+	}
+	initial_trait = {
+		organization_modifier = {
+			military_industrial_organization_research_bonus = 0.03
+		}
+	}
+}
+CRY_red_star_manufacturing_organization = {
+	name = red_star_manufacturing
+	include = generic_infantry_tank_organization
+	icon = GFX_idea_CRY_red_star_manufacturing
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = CRY
+			original_tag = STG
+		}
+	}
+	available = {
+		CRY = {
+			has_government = communism
+		}
+	}
+	initial_trait = {
+		organization_modifier = {
+			military_industrial_organization_research_bonus = 0.05
+		}
+	}
+}
+
+ ######  ##     ## #### ########   ######  
+##    ## ##     ##  ##  ##     ## ##    ## 
+##       ##     ##  ##  ##     ## ##       
+ ######  #########  ##  ########   ######  
+      ## ##     ##  ##  ##              ## 
+##    ## ##     ##  ##  ##        ##    ## 
+ ######  ##     ## #### ##         ######  
+
+
+ CRY_manehattan_concern_navy_organization = {
+	name =  manehattan_concern_navy
+	include = generic_escort_ship_organization
+	icon = GFX_idea_EQS_manehattan
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		original_tag = CRY
+	}
+	available = {
+		owner = {
+			owns_state = 75
+			has_country_flag = CRY_naval_concern
+		}
+	}
+
+
+}
+
+########  ##          ###    ##    ## ########  ######  
+##     ## ##         ## ##   ###   ## ##       ##    ## 
+##     ## ##        ##   ##  ####  ## ##       ##       
+########  ##       ##     ## ## ## ## ######    ######  
+##        ##       ######### ##  #### ##             ## 
+##        ##       ##     ## ##   ### ##       ##    ## 
+##        ######## ##     ## ##    ## ########  ######  
+
+
+CRY_rainbow_falls_organization = {
+	name = rainbow_falls
+	include = generic_light_aircraft_organization
+	icon = GFX_idea_CRY_rainbow_falls
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = CRY
+			original_tag = EQS
+		}
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = CRY
+				owns_state = 98
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 98
+		}
+	}
+}
+CRY_ventus_organization = {
+	name = ventus
+	include = generic_medium_aircraft_organization
+	icon = GFX_idea_CRY_ventus
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		original_tag = CRY
+	}
+	
+	visible = {
+		owner = {
+			has_focus_tree = crystalempire_sombra
+		}		
+	}
+	available = {
+		owner = {
+			has_completed_focus = CRY_somdustrial_concerns
+		}
+	}
+}
+
+
+
+
+##     ##    ###    ######## ######## ########  #### ######## ##       
+###   ###   ## ##      ##    ##       ##     ##  ##  ##       ##       
+#### ####  ##   ##     ##    ##       ##     ##  ##  ##       ##       
+## ### ## ##     ##    ##    ######   ########   ##  ######   ##       
+##     ## #########    ##    ##       ##   ##    ##  ##       ##       
+##     ## ##     ##    ##    ##       ##    ##   ##  ##       ##       
+##     ## ##     ##    ##    ######## ##     ## #### ######## ######## 
+
+
+CRY_sombra_arms_organization = {
+	include = generic_infantry_equipment_organization
+	name = sombra_arms
+	icon = GFX_idea_CRY_sombra_arms
+
+	allowed = {
+		original_tag = CRY
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = { has_focus_tree = crystalempire_sombra }
+	}
+	available = {
+		owner = { has_completed_focus = CRY_somammocomplex }
+	}
+	initial_trait = {
+		production_bonus = {
+			production_capacity_factor = 0.03
+		}
+	}
+}
+
+
+CRY_darkar_design_organization = {
+	include = generic_artillery_organization
+	name = darkar_design
+	icon = GFX_idea_CRY_darkar_design
+
+	allowed = {
+		original_tag = CRY
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	visible = {
+		owner = { has_focus_tree = crystalempire_sombra }
+	}
+	available = {
+		owner = { has_completed_focus = CRY_darkar } 
+	}
+	initial_trait = {
+
+		limit_to_equipment_type = { artillery_equipment }
+
+		equipment_bonus = {
+			build_cost_ic = -0.1
+			reliability = 0.05
+			soft_attack = 0.03
+		}
+	}
+}
+
+CRY_magical_small_arms_organization = {
+	include = generic_infantry_equipment_organization
+	name = magical_small_arms
+	icon = GFX_idea_CRY_lunar_crystal
+
+	allowed = {
+		original_tag = CRY
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			has_focus_tree = crystal_empire_lunar_focus
+		}
+		
+	}
+	available = {
+		owner = {
+			has_completed_focus = CRY_NLR_weapons_for_cause
+		}	
+	}
+	equipment_type = {  
+        magical_equipment
+    }
+
+    research_categories = { 
+        magical_tech
+    }
+	initial_trait = {
+		name = generic_mio_initial_trait_magical_designer
+		equipment_bonus = {
+			soft_attack = 0.025
+		}
+	}
+}
+
+CRY_small_arms_concern_organization = {
+	include = generic_infantry_equipment_organization
+	name = small_arms_concern
+	icon = GFX_idea_CRY_macintoshl
+
+	allowed = {
+		original_tag = CRY
+		has_dlc = "Arms Against Tyranny"
+	}
+	available = {
+		owner = {
+			has_government = democratic
+			has_completed_focus = CRY_deep_integration
+		}
+	}
+	initial_trait = {
+		limit_to_equipment_type = { infantry_equipment } 
+		equipment_bonus = {
+			soft_attack = 0.025
+		}
+	}
+}
+
diff --git a/common/military_industrial_organization/organizations/CTH_organization.txt b/common/military_industrial_organization/organizations/CTH_organization.txt
new file mode 100644
index 00000000000..b7981eb34e7
--- /dev/null
+++ b/common/military_industrial_organization/organizations/CTH_organization.txt
@@ -0,0 +1,291 @@
+
+########    ###    ##    ## ##    ##  ######  
+   ##      ## ##   ###   ## ##   ##  ##    ## 
+   ##     ##   ##  ####  ## ##  ##   ##       
+   ##    ##     ## ## ## ## #####     ######  
+   ##    ######### ##  #### ##  ##         ## 
+   ##    ##     ## ##   ### ##   ##  ##    ## 
+   ##    ##     ## ##    ## ##    ##  ######  
+
+CTH_infantry_tank_manufacturer_organization = {
+	name = CTH_infantry_tank_manufacturer
+	include = generic_infantry_tank_organization
+	icon = GFX_idea_CTH_infantry_tank_manufacturer
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = CTH
+			original_tag = CVA
+			original_tag = HIE
+			original_tag = TRO
+			original_tag = CDR
+		}
+	}
+}
+CTH_medium_tank_manufacturer_organization = {
+	name = CTH_medium_tank_manufacturer
+	include = generic_medium_tank_organization
+	icon = GFX_idea_CTH_medium_tank_manufacturer
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = CTH
+			original_tag = CVA
+			original_tag = HIE
+			original_tag = TRO
+			original_tag = CDR
+		}
+	}
+}
+CTH_heavy_tank_manufacturer_organization = {
+	name = CTH_heavy_tank_manufacturer
+	include = generic_heavy_tank_organization
+	icon = GFX_idea_CTH_heavy_tank_manufacturer
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		original_tag = CTH
+	}
+	available = {
+		owner = {
+			has_country_flag = CTH_heavy_tank_manufacturer_unlocked
+		}
+	}
+	initial_trait = {
+		organization_modifier = {
+			military_industrial_organization_design_team_assign_cost = -0.5
+		}
+		limit_to_equipment_type = { heavy_tank_chassis } 
+		equipment_bonus = {
+			build_cost_ic = -0.1
+			breakthrough = 0.05
+			soft_attack = 0.1
+		}
+	}
+}
+
+
+ ######  ##     ## #### ########   ######  
+##    ## ##     ##  ##  ##     ## ##    ## 
+##       ##     ##  ##  ##     ## ##       
+ ######  #########  ##  ########   ######  
+      ## ##     ##  ##  ##              ## 
+##    ## ##     ##  ##  ##        ##    ## 
+ ######  ##     ## #### ##         ######  
+
+
+
+ CTH_naval_manufacturer_1_organization = {
+	name =  CTH_naval_manufacturer_1
+	include = generic_escort_ship_organization
+	icon = GFX_idea_CTH_naval_manufacturer_1
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = CTH
+			original_tag = CVA
+			original_tag = HIE
+			original_tag = TRO
+			original_tag = CDR
+		}
+	}
+
+
+}
+
+
+CTH_naval_manufacturer_2_organization = {
+	name =  CTH_naval_manufacturer_2
+	include = generic_battle_line_ship_organization
+	icon = GFX_idea_CTH_naval_manufacturer_2
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = CTH
+			original_tag = CVA
+			original_tag = HIE
+			original_tag = TRO
+			original_tag = CDR
+		}
+	}
+
+
+}
+
+CTH_naval_manufacturer_3_organization = {
+	name =  CTH_naval_manufacturer_3
+	include = generic_black_sea_fleet_organization
+	icon = GFX_idea_CTH_naval_manufacturer_3
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		original_tag = CTH
+	}
+	visible = {
+		owner = {
+			has_country_flag = CTH_naval_manufacturer_unlocked
+		}
+	}
+	initial_trait = {
+		organization_modifier = {
+			military_industrial_organization_design_team_assign_cost = -0.5
+		}
+	}
+
+
+}
+
+
+########  ##          ###    ##    ## ########  ######  
+##     ## ##         ## ##   ###   ## ##       ##    ## 
+##     ## ##        ##   ##  ####  ## ##       ##       
+########  ##       ##     ## ## ## ## ######    ######  
+##        ##       ######### ##  #### ##             ## 
+##        ##       ##     ## ##   ### ##       ##    ## 
+##        ######## ##     ## ##    ## ########  ######  
+
+
+CTH_light_aircraft_manufacturer_organization = {
+	name = CTH_light_aircraft_manufacturer
+	include = generic_light_aircraft_organization
+	icon = GFX_idea_CTH_light_aircraft_manufacturer
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = CTH
+			original_tag = CVA
+			original_tag = HIE
+			original_tag = TRO
+			original_tag = CDR
+		}
+	}
+}
+CTH_naval_aircraft_manufacturer_organization = {
+	name = CTH_naval_aircraft_manufacturer
+	include = generic_naval_aircraft_organization
+	icon = GFX_idea_WNG_columbroni
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = CTH
+			original_tag = CVA
+			original_tag = TRO
+			original_tag = CDR
+		}
+	}
+	available = {
+		owner = {
+			NOT = {
+				has_country_flag = CTH_nationalization
+			}
+		}
+	}
+}
+
+
+
+
+##     ##    ###    ######## ######## ########  #### ######## ##       
+###   ###   ## ##      ##    ##       ##     ##  ##  ##       ##       
+#### ####  ##   ##     ##    ##       ##     ##  ##  ##       ##       
+## ### ## ##     ##    ##    ######   ########   ##  ######   ##       
+##     ## #########    ##    ##       ##   ##    ##  ##       ##       
+##     ## ##     ##    ##    ##       ##    ##   ##  ##       ##       
+##     ## ##     ##    ##    ######## ##     ## #### ######## ######## 
+
+
+CTH_infantry_equipment_manufacturer_organization = {
+	include = generic_infantry_equipment_organization
+	name = CTH_infantry_equipment_manufacturer
+	icon = GFX_idea_CTH_infantry_equipment_manufacturer
+
+	allowed = {
+		OR = {
+			original_tag = CTH
+			original_tag = CVA
+			original_tag = HIE
+			original_tag = TRO
+			original_tag = CDR
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	initial_trait = {
+		equipment_bonus = {
+			soft_attack = 0.05
+		}
+	}
+}
+
+
+CTH_artillery_manufacturer_organization = {
+	include = generic_artillery_organization
+	name = CTH_artillery_manufacturer
+	icon = GFX_idea_CTH_artillery_manufacturer
+
+	allowed = {
+		OR = {
+			original_tag = CTH
+			original_tag = CVA
+			original_tag = HIE
+			original_tag = TRO
+			original_tag = CDR
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	initial_trait = {
+		equipment_bonus = {
+			breakthrough = 0.05
+			defense = 0.05
+		}
+	}
+}
+
+CTH_motorized_equipment_manufacturer_organization = {
+	include = generic_motorized_mechanized_organization
+	name = CTH_motorized_equipment_manufacturer
+	icon = GFX_idea_WNG_taloncia
+
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		original_tag = CTH
+	}
+	available = {
+		owner = {
+			has_country_flag = CTH_motorized_manufacturer_unlocked
+			NOT = {
+				has_country_flag = CTH_nationalization
+			}
+		}
+	}
+	initial_trait = {
+		organization_modifier = {
+			military_industrial_organization_design_team_assign_cost = -0.5
+		}
+		limit_to_equipment_type = { motorized_equipment } 
+		equipment_bonus = {
+			hardness = 0.1
+		}
+	}
+}
+
+CTH_support_equipment_manufacturer_organization = {
+	include = generic_support_equipment_organization
+	name = CTH_support_equipment_manufacturer
+	icon = GFX_idea_WNG_taloncia
+
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = CTH
+			original_tag = CVA
+			original_tag = HIE
+			original_tag = TRO
+			original_tag = CDR
+		}
+	}
+	initial_trait = {
+		equipment_bonus = {
+			build_cost_ic = -0.15
+		}
+	}
+}
+
+
diff --git a/common/military_industrial_organization/organizations/CTL_organization.txt b/common/military_industrial_organization/organizations/CTL_organization.txt
new file mode 100644
index 00000000000..547886c111f
--- /dev/null
+++ b/common/military_industrial_organization/organizations/CTL_organization.txt
@@ -0,0 +1,231 @@
+
+########    ###    ##    ## ##    ##  ######  
+   ##      ## ##   ###   ## ##   ##  ##    ## 
+   ##     ##   ##  ####  ## ##  ##   ##       
+   ##    ##     ## ## ## ## #####     ######  
+   ##    ######### ##  #### ##  ##         ## 
+   ##    ##     ## ##   ### ##   ##  ##    ## 
+   ##    ##     ## ##    ## ##    ##  ######  
+
+CTL_tank_manufacturer_organization = {
+	name = CTL_tank_manufacturer
+	include = generic_mobile_tank_organization
+	icon = GFX_idea_CTL_tank_manufacturer
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		original_tag = CTL
+	}
+}
+CTL_tank_manufacturer2_organization = {
+	name = CTL_tank_manufacturer2
+	include = generic_medium_tank_organization
+	icon = GFX_idea_CTL_tank_manufacturer2
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		original_tag = CTL
+	}
+}
+ ######  ##     ## #### ########   ######  
+##    ## ##     ##  ##  ##     ## ##    ## 
+##       ##     ##  ##  ##     ## ##       
+ ######  #########  ##  ########   ######  
+      ## ##     ##  ##  ##              ## 
+##    ## ##     ##  ##  ##        ##    ## 
+ ######  ##     ## #### ##         ######  
+
+
+
+ CTL_special_naval_manufacturer_organization = {
+	name =  CTL_special_naval_manufacturer
+	include = generic_escort_ship_organization
+	icon = GFX_idea_CTL_special_naval_manufacturer
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = CTL
+			original_tag = MCW
+		}
+	}
+	available = {
+		if = {
+			limit = { owner = { original_tag = CTL } } 
+
+			owner = { has_completed_focus = CTL_naval_designer }
+		}
+	}
+
+}
+
+CTL_eastern_chital_shipyard_organization = {
+	name =  CTL_eastern_chital_shipyard
+	include = generic_battle_line_ship_organization
+	icon = GFX_idea_CTL_eastern_chital_shipyard
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		original_tag = CTL
+	}
+}
+
+CTL_benjen_iii_port_trust_organization = {
+	name =  CTL_benjen_iii_port_trust
+	include = generic_raider_ship_organization
+	icon = GFX_idea_CTL_benjen_iii_port_trust
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		original_tag = CTL
+	}
+}
+
+
+########  ##          ###    ##    ## ########  ######  
+##     ## ##         ## ##   ###   ## ##       ##    ## 
+##     ## ##        ##   ##  ####  ## ##       ##       
+########  ##       ##     ## ## ## ## ######    ######  
+##        ##       ######### ##  #### ##             ## 
+##        ##       ##     ## ##   ### ##       ##    ## 
+##        ######## ##     ## ##    ## ########  ######  
+
+
+CTL_air_gadra_organization = {
+	name = CTL_air_gadra
+	include = generic_light_aircraft_organization
+	icon = GFX_idea_CTL_air_gadra
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		original_tag = CTL
+	}
+	available = {
+		owner = {
+			has_completed_focus = CTL_gadra_family_industrial_plans
+		}
+	}
+	initial_trait = {
+		organization_modifier = {
+			military_industrial_organization_design_team_assign_cost = -0.33
+		}
+	}
+	
+}
+CTL_valdeland_munitions_factory_organization = {
+	name = CTL_valdeland_munitions_factory
+	include = generic_medium_aircraft_organization
+	icon = GFX_idea_CTL_valdeland_munitions_factory
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		original_tag = CTL
+	}
+	available = {
+		owner = {
+			has_completed_focus = CTL_create_the_chitali_air_force
+		}
+	}
+}
+
+CTL_shreenauth_aviation_organization = {
+	name = CTL_shreenauth_aviation
+	include = generic_naval_aircraft_organization
+	icon = GFX_idea_CTL_shreenauth_aviation
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		original_tag = CTL
+	}
+	available = {
+		owner = {
+			has_completed_focus = CTL_create_the_chitali_air_force
+		}
+	}
+}
+
+CTL_bhaat_aircraft_organization = {
+	name = CTL_bhaat_aircraft
+	include = generic_heavy_aircraft_organization
+	icon = GFX_idea_CTL_bhaat_aircraft
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		original_tag = CTL
+	}
+	available = {
+		owner = {
+			has_completed_focus = CTL_create_the_chitali_air_force
+		}
+	}
+}
+
+
+
+
+
+##     ##    ###    ######## ######## ########  #### ######## ##       
+###   ###   ## ##      ##    ##       ##     ##  ##  ##       ##       
+#### ####  ##   ##     ##    ##       ##     ##  ##  ##       ##       
+## ### ## ##     ##    ##    ######   ########   ##  ######   ##       
+##     ## #########    ##    ##       ##   ##    ##  ##       ##       
+##     ## ##     ##    ##    ##       ##    ##   ##  ##       ##       
+##     ## ##     ##    ##    ######## ##     ## #### ######## ######## 
+
+
+CTL_titan_infantry_organization = {
+	include = generic_infantry_equipment_organization
+	name = CTL_titan_infantry
+	icon = GFX_idea_CTL_titan_infantry
+
+	allowed = {
+		original_tag = CTL
+		has_dlc = "Arms Against Tyranny"
+	}
+	available = {
+		owner = {
+			has_completed_focus = CTL_depoliticize_the_army
+		}
+	}
+	initial_trait = {
+		equipment_bonus = {
+			build_cost_ic = -0.05
+		}
+	}
+}
+
+
+CTL_royal_armory_of_chital_organization = {
+	include = generic_infantry_equipment_organization
+	name = CTL_royal_armory_of_chital
+	icon = GFX_idea_CTL_royal_armory_of_chital
+
+	allowed = {
+		original_tag = CTL
+		has_dlc = "Arms Against Tyranny"
+	}
+	available = {
+		owner = {
+			has_completed_focus = CTL_entrench_jakobite_control 
+		}
+	}
+	initial_trait = {
+		organization_modifier = {
+			military_industrial_organization_design_team_assign_cost = -0.5
+		}
+	}
+}
+
+CTL_motorized_manufacturer_organization = {
+	include = generic_motorized_mechanized_organization
+	name = CTL_motorized_manufacturer
+	icon = GFX_idea_CTL_motorized_manufacturer
+
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		original_tag = CTl
+	}
+}
+CTL_artillery_manufacturer_organization = {
+	include = generic_artillery_organization
+	name = CTL_artillery_manufacturer
+	icon = GFX_idea_CTL_artillery_manufacturer
+
+	allowed = {
+		original_tag = CTL
+		has_dlc = "Arms Against Tyranny"
+	}
+}
+
+
diff --git a/common/military_industrial_organization/organizations/CVA_organization.txt b/common/military_industrial_organization/organizations/CVA_organization.txt
new file mode 100644
index 00000000000..a4af305d26c
--- /dev/null
+++ b/common/military_industrial_organization/organizations/CVA_organization.txt
@@ -0,0 +1,70 @@
+
+########    ###    ##    ## ##    ##  ######  
+   ##      ## ##   ###   ## ##   ##  ##    ## 
+   ##     ##   ##  ####  ## ##  ##   ##       
+   ##    ##     ## ## ## ## #####     ######  
+   ##    ######### ##  #### ##  ##         ## 
+   ##    ##     ## ##   ### ##   ##  ##    ## 
+   ##    ##     ## ##    ## ##    ##  ######  
+
+CVA_CTH_AVA_tanks_organization = {
+	name = CVA_CTH_AVA_tanks
+	include = generic_heavy_tank_organization
+	icon = GFX_idea_AVA_tanks
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		original_tag = CVA
+	}
+	visible = {
+		owner = {
+			has_completed_focus = CVA_CTH_develop_light_tanks
+		}
+	}
+}
+ ######  ##     ## #### ########   ######  
+##    ## ##     ##  ##  ##     ## ##    ## 
+##       ##     ##  ##  ##     ## ##       
+ ######  #########  ##  ########   ######  
+      ## ##     ##  ##  ##              ## 
+##    ## ##     ##  ##  ##        ##    ## 
+ ######  ##     ## #### ##         ######  
+
+########  ##          ###    ##    ## ########  ######  
+##     ## ##         ## ##   ###   ## ##       ##    ## 
+##     ## ##        ##   ##  ####  ## ##       ##       
+########  ##       ##     ## ## ## ## ######    ######  
+##        ##       ######### ##  #### ##             ## 
+##        ##       ##     ## ##   ### ##       ##    ## 
+##        ######## ##     ## ##    ## ########  ######  
+
+##     ##    ###    ######## ######## ########  #### ######## ##       
+###   ###   ## ##      ##    ##       ##     ##  ##  ##       ##       
+#### ####  ##   ##     ##    ##       ##     ##  ##  ##       ##       
+## ### ## ##     ##    ##    ######   ########   ##  ######   ##       
+##     ## #########    ##    ##       ##   ##    ##  ##       ##       
+##     ## ##     ##    ##    ##       ##    ##   ##  ##       ##       
+##     ## ##     ##    ##    ######## ##     ## #### ######## ######## 
+
+
+CVA_CTH_kesslers_cars_designer_organization = {
+	include = generic_infantry_equipment_organization
+	name = CVA_CTH_kesslers_cars_designer
+	icon = GFX_idea_krupp
+
+	allowed = {
+		original_tag = CVA
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			has_completed_focus = CVA_CTH_kesslers_cars
+		}
+	}
+	initial_trait = {
+		limit_to_equipment_type = { motorized_equipment } 
+		equipment_bonus = {
+			defense = 0.05
+		}
+	}
+}
+
diff --git a/common/military_industrial_organization/organizations/CYA_organization.txt b/common/military_industrial_organization/organizations/CYA_organization.txt
new file mode 100644
index 00000000000..9c36cc9820a
--- /dev/null
+++ b/common/military_industrial_organization/organizations/CYA_organization.txt
@@ -0,0 +1,311 @@
+
+########    ###    ##    ## ##    ##  ######  
+   ##      ## ##   ###   ## ##   ##  ##    ## 
+   ##     ##   ##  ####  ## ##  ##   ##       
+   ##    ##     ## ## ## ## #####     ######  
+   ##    ######### ##  #### ##  ##         ## 
+   ##    ##     ## ##   ### ##   ##  ##    ## 
+   ##    ##     ## ##    ## ##    ##  ######  
+
+CYA_de_aguilar_tractors_organization = {
+	name = de_aguilar_tractors
+	include = generic_mobile_tank_organization
+	icon = GFX_idea_CYA_de_aguilar_tractors
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = CYA
+			original_tag = GRW
+			original_tag = MIT
+		}
+	}
+	
+	visible = {
+		owner = {
+			OR = {
+				original_tag = CYA
+				owns_state = 671
+			}
+		}
+	}
+	available = {
+		owner =  {
+			owns_state = 671
+		}
+	}
+}
+CYA_auropallieta_motors_organization = {
+	name = auropallieta_motors
+	include = generic_medium_tank_organization
+	icon = GFX_idea_CYA_auropallieta_motors
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = CYA
+			original_tag = GRW
+			original_tag = MIT
+		}
+	}
+	
+	visible = {
+		owner = {
+
+			OR = {
+				original_tag = CYA
+				owns_state = 510
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 510
+		}
+	}
+}
+ ######  ##     ## #### ########   ######  
+##    ## ##     ##  ##  ##     ## ##    ## 
+##       ##     ##  ##  ##     ## ##       
+ ######  #########  ##  ########   ######  
+      ## ##     ##  ##  ##              ## 
+##    ## ##     ##  ##  ##        ##    ## 
+ ######  ##     ## #### ##         ######  
+
+
+
+ CYA_thymiau_docks_organization = {
+	name =  thymiau_docks
+	include = generic_battle_line_ship_organization
+	icon = GFX_idea_CYA_thymiau_docks
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = CYA
+			original_tag = GRW
+			original_tag = MIT
+		}
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = CYA
+				owns_state = 671
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 671
+		}
+	}
+	initial_trait = {
+		organization_modifier = {
+			military_industrial_organization_design_team_assign_cost = 0.15
+			military_industrial_organization_research_bonus = 0.05
+		}
+	}
+
+}
+
+CYA_salmarkt_port_organization = {
+	name =  salmarkt_port
+	include = generic_escort_ship_organization
+	icon = GFX_idea_CYA_salmarkt_port
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = CYA
+			original_tag = BRF
+			original_tag = GRW
+			original_tag = MIT
+		}
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = CYA
+				owns_state = 507
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 507
+		}
+	}
+
+}
+
+
+
+########  ##          ###    ##    ## ########  ######  
+##     ## ##         ## ##   ###   ## ##       ##    ## 
+##     ## ##        ##   ##  ####  ## ##       ##       
+########  ##       ##     ## ## ## ## ######    ######  
+##        ##       ######### ##  #### ##             ## 
+##        ##       ##     ## ##   ### ##       ##    ## 
+##        ######## ##     ## ##    ## ########  ######  
+
+
+CYA_espelho_air_organization = {
+	name = espelho_air
+	include = generic_light_aircraft_organization
+	icon = GFX_idea_CYA_espelho_air
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		
+		OR = {
+			original_tag = CYA
+			original_tag = GRW
+			original_tag = MIT
+		}
+	}
+	
+	visible = {
+		owner = {
+
+			OR = {
+				original_tag = CYA
+				owns_state = 671
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 671
+		}
+		
+	}
+	
+}
+CYA_cyanolisian_wings_organization = {
+	name = cyanolisian_wings
+	include = generic_medium_aircraft_organization
+	icon = GFX_idea_CYA_cyanolisian_wings
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = CYA
+			original_tag = GRW
+			original_tag = MIT
+		}
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = CYA
+				owns_state = 671
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 671
+		}
+	}
+}
+
+
+
+##     ##    ###    ######## ######## ########  #### ######## ##       
+###   ###   ## ##      ##    ##       ##     ##  ##  ##       ##       
+#### ####  ##   ##     ##    ##       ##     ##  ##  ##       ##       
+## ### ## ##     ##    ##    ######   ########   ##  ######   ##       
+##     ## #########    ##    ##       ##   ##    ##  ##       ##       
+##     ## ##     ##    ##    ##       ##    ##   ##  ##       ##       
+##     ## ##     ##    ##    ######## ##     ## #### ######## ######## 
+
+
+CYA_horst_arms_organization = {
+	include = generic_support_equipment_organization
+	name = horst_arms
+	icon = GFX_idea_CYA_horst_arms
+
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = CYA
+			original_tag = GRW
+			original_tag = MIT
+		}
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = CYA
+				owns_state = 671
+			}
+		}
+		CYA = { has_completed_focus = CYA_horst_arms }
+	}
+	available = {
+		owner = {
+			owns_state = 671
+		}
+		if = {
+			limit = { owner = { original_tag = CYA } } 
+
+			owner = { has_completed_focus = CYA_horst_arms }
+		}
+	}
+}
+
+
+
+CYA_sumpfkiel_organization = {
+	include = generic_infantry_equipment_organization
+	name = sumpfkiel
+	icon = GFX_idea_CYA_sumpfkiel
+
+	allowed = {
+		OR = {
+			original_tag = CYA
+			original_tag = GRW
+			original_tag = MIT
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = CYA
+				owns_state = 671
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 671
+		}
+	}
+}
+
+CYA_horst_artillery_organization = {
+	include = generic_artillery_organization
+	name = horst_artillery
+	icon = GFX_idea_CYA_horst_arms
+
+	allowed = {
+		OR = {
+			original_tag = CYA
+			original_tag = GRW
+			original_tag = MIT
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	visible = {
+		owner = {
+			OR = {
+				original_tag = CYA
+				owns_state = 671
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 671
+		}
+	}
+}
+
+
diff --git a/common/military_industrial_organization/organizations/DMT_organization.txt b/common/military_industrial_organization/organizations/DMT_organization.txt
new file mode 100644
index 00000000000..ba207b2f26b
--- /dev/null
+++ b/common/military_industrial_organization/organizations/DMT_organization.txt
@@ -0,0 +1,375 @@
+
+########    ###    ##    ## ##    ##  ######  
+   ##      ## ##   ###   ## ##   ##  ##    ## 
+   ##     ##   ##  ####  ## ##  ##   ##       
+   ##    ##     ## ## ## ## #####     ######  
+   ##    ######### ##  #### ##  ##         ## 
+   ##    ##     ## ##   ### ##   ##  ##    ## 
+   ##    ##     ## ##    ## ##    ##  ######  
+
+DMT_Cerberus = {
+	name = DMT_Cerberus
+	include = generic_mobile_tank_organization
+	icon = GFX_idea_DMT_Cerberus
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		can_form_river_fed = yes
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = DMT
+				has_country_flag = RIV_annexed_DMT
+			}
+		}
+	}
+	available = {
+		owner = {
+			hidden_trigger = {
+				OR = {
+					original_tag = DMT
+					has_country_flag = RIV_annexed_DMT
+				}
+			}
+		}
+	}
+	initial_trait = {
+		limit_to_equipment_type = { light_tank_chassis }
+		equipment_bonus = {
+			breakthrough = 0.05
+		}
+	}
+}
+DMT_Boxer_organization = {
+	name = DMT_Boxer
+	include = generic_medium_tank_organization
+	icon = GFX_idea_DMT_Boxer
+
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		can_form_river_fed = yes
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = DMT
+				has_country_flag = RIV_annexed_DMT
+			}
+		}
+	}
+	available = {
+		owner = {
+			hidden_trigger = {
+				OR = {
+					original_tag = DMT
+					has_country_flag = RIV_annexed_DMT
+				}
+			}
+		}
+	}
+	initial_trait = {
+		limit_to_equipment_type = { medium_tank_chassis }
+		equipment_bonus = {
+			soft_attack = 0.05
+		}
+	}
+}
+
+
+ ######  ##     ## #### ########   ######  
+##    ## ##     ##  ##  ##     ## ##    ## 
+##       ##     ##  ##  ##     ## ##       
+ ######  #########  ##  ########   ######  
+      ## ##     ##  ##  ##              ## 
+##    ## ##     ##  ##  ##        ##    ## 
+ ######  ##     ## #### ##         ######  
+
+ DMT_Poodle_organization = {
+	name = DMT_Poodle
+	icon = GFX_idea_DMT_Poodle
+	include = generic_refurbishment_repair_organization
+	allowed = {
+		can_form_river_fed = yes
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = DMT
+				has_country_flag = RIV_annexed_DMT
+			}
+		}
+	}
+	available = {
+		hidden_trigger = {
+			owner = {
+				OR = {
+					original_tag = DMT
+					has_country_flag = RIV_annexed_DMT
+				}
+				any_controlled_state_is_coastal = yes
+			}
+		}
+	}
+}
+
+DMT_Golden_Retriever_organization = {
+	name = DMT_Golden_Retriever
+	icon = GFX_idea_DMT_gold_triver
+
+	allowed = {
+		can_form_river_fed = yes
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = DMT
+				has_country_flag = RIV_annexed_DMT
+			}
+		}
+	}
+	available = {
+		hidden_trigger = {
+			owner = {
+				OR = {
+					original_tag = DMT
+					has_country_flag = RIV_annexed_DMT
+				}
+				any_controlled_state_is_coastal = yes
+			}
+		}
+	}
+	include = generic_escort_ship_organization
+	initial_trait = {
+		equipment_bonus = {
+			build_cost_ic = -0.05
+		}
+	}
+}
+
+########  ##          ###    ##    ## ########  ######  
+##     ## ##         ## ##   ###   ## ##       ##    ## 
+##     ## ##        ##   ##  ####  ## ##       ##       
+########  ##       ##     ## ## ## ## ######    ######  
+##        ##       ######### ##  #### ##             ## 
+##        ##       ##     ## ##   ### ##       ##    ## 
+##        ######## ##     ## ##    ## ########  ######  
+
+
+DMT_Black_Lab_organization = {
+	name = DMT_Black_Lab
+	include = generic_light_aircraft_organization
+	icon = GFX_idea_DMT_Black_Lab
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		can_form_river_fed = yes
+	}
+	
+	visible = {
+		owner = {
+			OR = {
+				original_tag = DMT
+				has_country_flag = RIV_annexed_DMT
+			}
+		}
+	}
+	available = {
+		owner = {
+			hidden_trigger = {
+				OR = {
+					original_tag = DMT
+					has_country_flag = RIV_annexed_DMT
+				}
+			}
+		}
+	}
+}
+DMT_German_Sheppard_organization = {
+	name = DMT_German_Sheppard
+	include = generic_medium_aircraft_organization
+	icon = GFX_idea_DMT_German_Sheppard
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		can_form_river_fed = yes
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = DMT
+				has_country_flag = RIV_annexed_DMT
+			}
+		}
+	}
+	available = {
+		owner = {
+			hidden_trigger = {
+				OR = {
+					original_tag = DMT
+					has_country_flag = RIV_annexed_DMT
+				}
+			}
+		}
+	}
+}
+DMT_Beagle_organization = {
+	name = DMT_Beagle
+	include = generic_naval_aircraft_organization
+	icon = GFX_idea_DMT_Beagle
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		can_form_river_fed = yes
+	}
+	
+	visible = {
+		owner = {
+			OR = {
+				original_tag = DMT
+				has_country_flag = RIV_annexed_DMT
+			}
+		}
+	}
+	available = {
+		owner = {
+			hidden_trigger = {
+				OR = {
+					original_tag = DMT
+					has_country_flag = RIV_annexed_DMT
+				}
+			}
+		}
+	}
+}
+
+
+
+
+##     ##    ###    ######## ######## ########  #### ######## ##       
+###   ###   ## ##      ##    ##       ##     ##  ##  ##       ##       
+#### ####  ##   ##     ##    ##       ##     ##  ##  ##       ##       
+## ### ## ##     ##    ##    ######   ########   ##  ######   ##       
+##     ## #########    ##    ##       ##   ##    ##  ##       ##       
+##     ## ##     ##    ##    ##       ##    ##   ##  ##       ##       
+##     ## ##     ##    ##    ######## ##     ## #### ######## ######## 
+
+
+DMT_Kal_Spankaz_Forge_organization = {
+	include = generic_infantry_equipment_organization
+	name = DMT_Kal_Spankaz_Forge
+	icon = GFX_idea_DMT_Kal_Spankaz_Forge
+
+	allowed = {
+		OR = {
+			can_form_river_fed = yes
+			original_tag = LSC
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	visible = {
+		owner = {
+			OR = {
+				original_tag = DMT
+				has_country_flag = RIV_annexed_DMT
+				has_completed_focus = LSC_diamond_mountain
+			}
+		}
+	}
+	available = {
+		owner = {
+			hidden_trigger = {
+				OR = {
+					original_tag = DMT
+					has_country_flag = RIV_annexed_DMT
+					has_completed_focus = LSC_diamond_mountain
+				}
+			}
+		}
+	}
+	initial_trait = {
+		equipment_bonus = {
+			defense = 0.05
+		}
+	}
+}
+
+
+DMT_Var_Alsas_Forge_organization = {
+	include = generic_artillery_organization
+	name = DMT_Var_Alsas_Forge
+	icon = GFX_idea_DMT_Var_Alsas_Forge
+
+	allowed = {
+		OR = {
+			can_form_river_fed = yes
+			original_tag = LSC
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	visible = {
+		owner = {
+			OR = {
+				original_tag = DMT
+				has_country_flag = RIV_annexed_DMT
+				has_completed_focus = LSC_diamond_mountain
+			}
+		}
+	}
+	available = {
+		owner = {
+			hidden_trigger = {
+				OR = {
+					original_tag = DMT
+					has_country_flag = RIV_annexed_DMT
+					has_completed_focus = LSC_diamond_mountain
+				}
+			}
+		}
+	}
+	initial_trait = {
+		equipment_bonus = {
+			soft_attack = 0.05
+		}
+	}
+}
+
+DMT_Terri_Azur_Forge_organization = {
+	include = generic_motorized_mechanized_organization
+	name = DMT_Terri_Azur_Forge
+	icon = GFX_idea_DMT_Terri_Azur_Forge
+
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			can_form_river_fed = yes
+			original_tag = LSC
+		}
+	}
+	visible = {
+		owner = {	
+			OR = {
+				original_tag = DMT
+				has_country_flag = RIV_annexed_DMT
+				has_completed_focus = LSC_diamond_mountain
+			}
+		}
+	}
+	
+	available = {
+		owner = {
+			hidden_trigger = {
+				OR = {
+					original_tag = DMT
+					has_country_flag = RIV_annexed_DMT
+					has_completed_focus = LSC_diamond_mountain
+				}
+			}
+		}
+	}
+	initial_trait = {
+		equipment_bonus = {
+			reliability = 0.05
+		}
+	}
+}
diff --git a/common/military_industrial_organization/organizations/ELF_organization.txt b/common/military_industrial_organization/organizations/ELF_organization.txt
new file mode 100644
index 00000000000..d4b9065c6ef
--- /dev/null
+++ b/common/military_industrial_organization/organizations/ELF_organization.txt
@@ -0,0 +1,404 @@
+#####################
+
+###  ##  #  # # #  ## 
+ #  #  # ## # # # #   
+ #  #### # ## ##   #  
+ #  #  # #  # # #   # 
+ #  #  # #  # # # ## 
+
+ #################### 
+
+
+ELF_mustang_organization = {
+	
+	name = ELF_mustang
+	icon = GFX_idea_EQS_mustang
+	include = generic_main_battle_tank_organization
+	allowed = {
+		original_tag = ELF 
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	available = {
+		FROM = {
+			has_country_flag = ELF_collectivised_war_effort
+		}
+	}
+}
+
+ELF_shoof_organization = {
+	
+	name = ELF_shoof
+	icon = GFX_idea_EQS_shoof
+	include = generic_medium_tank_organization
+	allowed = {
+		original_tag = ELF 
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	available = {
+		FROM = {
+			has_country_flag = ELF_collectivised_war_effort
+		}
+	}
+	initial_trait = {
+		organization_modifier = {
+			military_industrial_organization_research_bonus = 0.05
+		}
+		equipment_bonus = {
+			maximum_speed = 0.1
+			reliability = 0.05
+			armor_value = -0.1
+		}
+	}
+
+	initial_trait = {
+		organization_modifier = {
+			military_industrial_organization_research_bonus = 0.05
+		}
+		equipment_bonus = {
+			maximum_speed = 0.1
+			reliability = 0.05
+			armor_value = -0.1
+		}
+	}
+
+	add_trait = { 
+		token = EQS_mio_trait_expanded_turret_capacity
+		name = ENG_mio_trait_expanded_turret_capacity
+		icon = GFX_generic_mio_department_icon_tank_medium_tank_engine
+		special_trait_background = yes
+
+		position = { x=1 y=1 }
+		relative_position_id = generic_mio_trait_all_round_cupola
+
+		any_parent = { generic_mio_trait_all_round_cupola }
+		limit_to_equipment_type = { mio_cat_eq_all_medium_tank }
+
+		equipment_bonus = {
+			reliability = 0.05
+			armor_value = 0.05
+			breakthrough = 0.05
+		}
+	}
+
+	add_trait = { 
+		token = EQS_mio_trait_expanded_production_facilities
+		name = ENG_mio_trait_expanded_production_facilities
+		icon = GFX_generic_mio_department_icon_tank_medium_tank_technology
+		special_trait_background = yes
+
+		position = { x=2 y=1 }
+		relative_position_id = generic_mio_trait_simplified_turret_design
+
+		all_parents = { generic_mio_trait_simplified_turret_design generic_mio_trait_armor_steel_working }
+		production_bonus = {
+			production_efficiency_cap_factor = 0.1
+			production_efficiency_gain_factor = 0.1
+		}
+		
+	}
+}
+
+ELF_sirius_organization = {
+	
+	name = ELF_sirius
+	icon = GFX_idea_EQS_sirius
+	include = generic_heavy_tank_organization
+	allowed = {
+		original_tag = ELF 
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	available = {
+		FROM = {
+			has_country_flag = ELF_collectivised_war_effort
+		}
+	}
+	
+	initial_trait = {
+		equipment_bonus = {
+			armor_value = 0.05
+		}
+	}
+}
+
+#####################
+
+ ## #  # ### ###   ## 
+#   #  #  #  #  # #   
+ #  ####  #  ###   #  
+  # #  #  #  #      # 
+##  #  # ### #    ##  
+ 
+#####################
+
+
+ELF_seaward_shoals_organization = {
+	
+	name = ELF_seaward_shoals
+	icon = GFX_idea_EQS_seaward
+	include = generic_task_force_ship_organization
+	
+	allowed = {
+		original_tag = ELF 
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	available = {
+		FROM = {
+			has_full_control_of_state = 662 
+		}
+	}
+	
+	add_trait = { 
+		token = EQS_mio_trait_flared_bow
+		name = ENG_mio_trait_flared_bow
+		icon = GFX_generic_mio_department_icon_ship_general_quality
+		special_trait_background = yes
+
+		position = { x=1 y=0 }
+		relative_position_id = generic_mio_trait_underway_replenishment_equipment
+
+		any_parent = { generic_mio_trait_splinter_protection }
+
+		equipment_bonus = {
+			naval_weather_penalty_factor = -0.1
+		}
+	}
+
+	add_trait = { 
+		token = generic_mio_trait_semi_armor_piercing_shells
+		name = generic_mio_trait_semi_armor_piercing_shells
+		icon = GFX_generic_mio_trait_icon_lg_attack
+		special_trait_background = yes
+
+		any_parent = { generic_mio_trait_secondary_fire_director_control }
+		position = { x=0 y=1 }
+		relative_position_id = generic_mio_trait_secondary_fire_director_control
+
+		equipment_bonus = {
+			lg_attack = 0.05
+			lg_armor_piercing = 0.05
+		}
+	}
+}
+
+ELF_albion_dockyards_organization = {
+	
+	name = ELF_albion_dockyards
+	icon = GFX_idea_MAN_armoury_of_detrot
+	include = generic_escort_ship_organization
+	
+	allowed = {
+		original_tag = ELF 
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	available = {
+		FROM = {
+			has_full_control_of_state = 525 
+		}
+	}
+}
+
+###########################
+
+###  #    ##  #  # ###  ## 
+#  # #   #  # ## # #   #   
+###  #   #### # ## ##   #  
+#    #   #  # #  # #     # 
+#    ### #  # #  # ### ##  
+
+###########################
+
+
+ELF_stratusburg_air_organization = {
+	
+	name = ELF_stratusburg_air
+	icon = GFX_idea_EQS_stratus 
+	include = generic_cas_aircraft_organization
+	allowed = {
+		original_tag = ELF
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	available = {
+		FROM = {
+			has_full_control_of_state = 226
+		}
+	}
+}
+
+ELF_light_aircraft_manufacturer_organization = {
+
+	name = ELF_light_aircraft_manufacturer
+	icon = GFX_idea_generic_air_manufacturer_1
+	include = generic_high_agility_fighter_aircraft_organization
+	allowed = {
+		original_tag = ELF
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	available = {
+		FROM = {
+			has_country_flag = ELF_collectivised_war_effort
+		}
+	}
+	
+	equipment_type = {
+		mio_cat_eq_all_small_plane
+		maritime_patrol_plane
+	}	
+
+	research_categories = {	
+		mio_cat_all_light_fighter_and_modules 
+#		mio_cat_all_naval_bomber_and_modules 
+			#Could be used to allow Supermarine to research naval bombs, but this could overpower English fighter MIO trait gain early on.
+	}
+	
+	override_trait = {
+		token = generic_mio_trait_fuel_injection_engines
+		
+		position = { x=0 y=2 }
+		relative_position_id = generic_mio_trait_bigger_engines
+	}
+
+	override_trait = {
+		token = generic_mio_trait_high_octane_fuels
+		
+		position = { x=1 y=1 }
+		relative_position_id = generic_mio_trait_bigger_engines
+	}
+
+	override_trait = {
+		token = generic_mio_trait_subsidiary_suppliers
+		
+		position = { x=0 y=2 }
+		relative_position_id = generic_mio_trait_fuel_injection_engines
+	}
+
+
+	add_trait = { 
+		token = ELF_mio_trait_seaplane_origins
+		name = ENG_mio_trait_seaplane_origins
+		icon = GFX_generic_mio_trait_icon_detection
+		special_trait_background = yes
+
+		position = { x=2 y=0 }
+		relative_position_id = generic_mio_trait_minimum_weapon_requirements
+
+		#any_parent = { generic_mio_trait_super_heavy_shells generic_mio_trait_semi_armor_piercing_shells generic_mio_trait_high_velocity_guns }
+
+		limit_to_equipment_type = { mio_cat_eq_all_small_plane mio_cat_eq_all_large_plane }
+
+		equipment_bonus = {
+			sub_detection = 0.05
+			surface_detection = 0.05
+			naval_strike_targetting = 0.1
+		}
+	}
+
+	add_trait = { 
+		token = ELF_mio_trait_elliptical_wings
+		name = ENG_mio_trait_elliptical_wings
+		icon = GFX_generic_mio_trait_icon_defense
+		special_trait_background = yes
+
+		position = { x=0 y=1 }
+		relative_position_id = generic_mio_trait_cantilever_wing_structure
+
+		any_parent = { generic_mio_trait_cantilever_wing_structure }
+
+		equipment_bonus = {
+			air_defence = 0.1	
+		}
+	}
+
+	add_trait = { 
+		token = ELF_mio_trait_supercharger
+		name = ENG_mio_trait_supercharger
+		icon = GFX_generic_mio_trait_icon_defense
+		special_trait_background = yes
+
+		position = { x=1 y=1 }
+		relative_position_id = generic_mio_trait_fuel_injection_engines
+
+		all_parents = { generic_mio_trait_fuel_injection_engines generic_mio_trait_high_octane_fuels }
+
+		equipment_bonus = {
+			air_defence = 0.1	
+		}
+	}
+}
+
+ELF_heavy_aircraft_manufacturer_organization = {
+	
+	name = ELF_heavy_aircraft_manufacturer
+	icon = GFX_idea_generic_air_manufacturer_2
+	include = generic_heavy_aircraft_organization
+	allowed = {
+		original_tag = ELF
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	available = {
+		FROM = {
+			has_country_flag = ELF_collectivised_war_effort
+		}
+	}
+}
+
+ELF_naval_aircraft_manufacturer_organization = {
+
+	name = ELF_naval_aircraft_manufacturer
+	icon = GFX_idea_generic_air_manufacturer_3
+	include = generic_naval_aircraft_organization
+	allowed = {
+		original_tag = ELF
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	available = {
+		FROM = {
+			has_country_flag = ELF_collectivised_war_effort
+		}
+	}
+}
+
+
+################################### 
+
+#   #  ##  ### ### ###  ### ### #   
+## ## #  #  #  #   #  #  #  #   #   
+# # # ####  #  ##  ###   #  ##  #   
+#   # #  #  #  #   #  #  #  #   #   
+#   # #  #  #  ### #  # ### ### ### 
+
+
+###################################
+
+
+
+ELF_fillydelphia_motors_organization = {
+	
+	name = ELF_fillydelphia_motors
+	icon = GFX_idea_EQS_fillydelphia_arms
+	include = generic_motorized_mechanized_organization
+	
+	allowed = {
+		original_tag = ELF 
+		has_dlc = "Arms Against Tyranny"
+	}
+	available = {
+		FROM = {
+			has_full_control_of_state = 12
+		}
+	}
+	initial_trait = {
+		equipment_bonus = {
+			maximum_speed = 0.05
+		}
+	}
+}
+
diff --git a/common/military_industrial_organization/organizations/EQC_organization.txt b/common/military_industrial_organization/organizations/EQC_organization.txt
new file mode 100644
index 00000000000..4555d4839fd
--- /dev/null
+++ b/common/military_industrial_organization/organizations/EQC_organization.txt
@@ -0,0 +1,212 @@
+
+########    ###    ##    ## ##    ##  ######  
+   ##      ## ##   ###   ## ##   ##  ##    ## 
+   ##     ##   ##  ####  ## ##  ##   ##       
+   ##    ##     ## ## ## ## #####     ######  
+   ##    ######### ##  #### ##  ##         ## 
+   ##    ##     ## ##   ### ##   ##  ##    ## 
+   ##    ##     ## ##    ## ##    ##  ######  
+
+EQC_mustang_automotive_organization = {
+	name = EQC_mustang_automotive
+	include = generic_mobile_tank_organization
+	icon = GFX_idea_generic_tank_manufacturer_1
+
+	allowed = {
+		original_tag = EQC
+		has_dlc = "Arms Against Tyranny"
+	}
+}
+EQC_rich_set_industries_organization = {
+	name = EQC_rich_set_industries
+	include = generic_medium_tank_organization
+	icon = GFX_idea_generic_tank_manufacturer_2
+
+	allowed = {
+		original_tag = EQC
+		has_dlc = "Arms Against Tyranny"
+	}
+	available = {
+		owner = {
+			has_completed_focus = EQC_equestrian_investors
+		}
+	}
+}
+
+ ######  ##     ## #### ########   ######  
+##    ## ##     ##  ##  ##     ## ##    ## 
+##       ##     ##  ##  ##     ## ##       
+ ######  #########  ##  ########   ######  
+      ## ##     ##  ##  ##              ## 
+##    ## ##     ##  ##  ##        ##    ## 
+ ######  ##     ## #### ##         ######  
+
+
+
+ EQC_sturdy_sails_co_organization = {
+	name =  EQC_sturdy_sails_co
+	include = generic_battle_line_ship_organization
+	icon = GFX_idea_generic_naval_manufacturer_1
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		original_tag = EQC
+	}
+}
+EQC_cockatoo_ship_yards_organization = {
+	name =  EQC_cockatoo_ship_yards
+	include = generic_escort_ship_organization
+	icon = GFX_idea_generic_naval_manufacturer_2
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		original_tag = EQC
+	}
+}
+EQC_mareland_and_timberwolff_organization = {
+	name =  EQC_mareland_and_timberwolff
+	include = generic_task_force_ship_organization	
+	icon = GFX_idea_generic_naval_manufacturer_3
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		original_tag = EQC
+	}
+}
+
+
+
+########  ##          ###    ##    ## ########  ######  
+##     ## ##         ## ##   ###   ## ##       ##    ## 
+##     ## ##        ##   ##  ####  ## ##       ##       
+########  ##       ##     ## ## ## ## ######    ######  
+##        ##       ######### ##  #### ##             ## 
+##        ##       ##     ## ##   ### ##       ##    ## 
+##        ######## ##     ## ##    ## ########  ######  
+
+
+EQC_commonwealth_aircraft_corporation_organization = {
+	
+	name = EQC_commonwealth_aircraft_corporation
+	include = generic_range_focused_aircraft_organization
+	icon = GFX_idea_EQC_commonwealth_aircraft_corporation
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		original_tag = EQC
+	}
+	
+	available = {
+		owner = {
+			OR = {
+				AND = {
+					has_completed_focus = EQC_transoceanic_support
+					NOT = { has_war_with = EQS }
+				}
+				has_completed_focus = EQC_government_in_exile
+			}
+		}
+	}
+	initial_trait = {
+		organization_modifier = {
+			military_industrial_organization_design_team_assign_cost = -0.67
+		}
+	}
+}
+
+EQC_sunset_car_co_organization = {
+	name = EQC_sunset_car_co
+	include = generic_light_aircraft_organization
+	icon = GFX_idea_generic_air_manufacturer_1
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		original_tag = EQC
+	}
+	
+}
+
+EQC_cockatrice_aircraft_organization = {
+	name = EQC_cockatrice_aircraft
+	include = generic_medium_aircraft_organization
+	icon = GFX_idea_generic_air_manufacturer_3
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		original_tag = EQC
+	}
+	
+}
+
+
+EQC_bombardier_organization = {
+	name = EQC_bombardier
+	include = generic_heavy_aircraft_organization
+	icon = GFX_idea_generic_air_manufacturer_2
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		original_tag = EQC
+	}
+	
+}
+
+
+EQC_riverflight_organization = {
+	name = EQC_riverflight
+	include = generic_naval_aircraft_organization
+	icon = GFX_idea_generic_air_manufacturer_2
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		original_tag = EQC
+	}
+	
+}
+
+
+##     ##    ###    ######## ######## ########  #### ######## ##       
+###   ###   ## ##      ##    ##       ##     ##  ##  ##       ##       
+#### ####  ##   ##     ##    ##       ##     ##  ##  ##       ##       
+## ### ## ##     ##    ##    ######   ########   ##  ######   ##       
+##     ## #########    ##    ##       ##   ##    ##  ##       ##       
+##     ## ##     ##    ##    ##       ##    ##   ##  ##       ##       
+##     ## ##     ##    ##    ######## ##     ## #### ######## ######## 
+
+
+EQC_lsaf_organization = {
+	include = generic_infantry_equipment_organization
+	name = EQC_lsaf
+	icon = GFX_idea_generic_infantry_equipment_manufacturer_2	
+
+	allowed = {
+		original_tag = EQC
+		has_dlc = "Arms Against Tyranny"
+	}
+}
+
+
+EQC_haysaght_organization = {
+	include = generic_support_equipment_organization
+	name = EQC_haysaght
+	icon = GFX_idea_generic_infantry_equipment_manufacturer_1
+
+	allowed = {
+		original_tag = EQC
+		has_dlc = "Arms Against Tyranny"
+	}
+}
+
+EQC_new_mareland_rail_company_organization = {
+	include = generic_artillery_organization
+	name = EQC_new_mareland_rail_company
+	icon = GFX_idea_generic_artillery_manufacturer_2
+
+	allowed = {
+		original_tag = EQC
+		has_dlc = "Arms Against Tyranny"
+	}
+}
+
+EQC_freemare_automotive_organization = {
+	include = generic_motorized_mechanized_organization
+	name = EQC_freemare_automotive
+	icon = GFX_idea_generic_motorized_equipment_manufacturer_3
+
+	allowed = {
+		original_tag = EQC
+		has_dlc = "Arms Against Tyranny"
+	}
+}
\ No newline at end of file
diff --git a/common/military_industrial_organization/organizations/EQS_organization.txt b/common/military_industrial_organization/organizations/EQS_organization.txt
new file mode 100644
index 00000000000..06792a36b25
--- /dev/null
+++ b/common/military_industrial_organization/organizations/EQS_organization.txt
@@ -0,0 +1,499 @@
+
+########    ###    ##    ## ##    ##  ######  
+   ##      ## ##   ###   ## ##   ##  ##    ## 
+   ##     ##   ##  ####  ## ##  ##   ##       
+   ##    ##     ## ## ## ## #####     ######  
+   ##    ######### ##  #### ##  ##         ## 
+   ##    ##     ## ##   ### ##   ##  ##    ## 
+   ##    ##     ## ##    ## ##    ##  ######  
+
+EQS_shoof_organization = {
+	name = shoof
+	include = generic_medium_tank_organization
+	icon = GFX_idea_EQS_shoof
+	allowed = {	
+		tag = EQS
+		has_dlc = "Arms Against Tyranny"
+	}
+
+	initial_trait = {
+		organization_modifier = {
+			military_industrial_organization_research_bonus = 0.05
+		}
+		equipment_bonus = {
+			maximum_speed = 0.1
+			reliability = 0.05
+			armor_value = -0.1
+		}
+	}
+
+	add_trait = { 
+		token = EQS_mio_trait_expanded_turret_capacity
+		name = ENG_mio_trait_expanded_turret_capacity
+		icon = GFX_generic_mio_department_icon_tank_medium_tank_engine
+		special_trait_background = yes
+
+		position = { x=1 y=1 }
+		relative_position_id = generic_mio_trait_all_round_cupola
+
+		any_parent = { generic_mio_trait_all_round_cupola }
+		limit_to_equipment_type = { mio_cat_eq_all_medium_tank }
+
+		equipment_bonus = {
+			reliability = 0.05
+			armor_value = 0.05
+			breakthrough = 0.05
+		}
+	}
+
+	add_trait = { 
+		token = EQS_mio_trait_expanded_production_facilities
+		name = ENG_mio_trait_expanded_production_facilities
+		icon = GFX_generic_mio_department_icon_tank_medium_tank_technology
+		special_trait_background = yes
+
+		position = { x=2 y=1 }
+		relative_position_id = generic_mio_trait_simplified_turret_design
+
+		all_parents = { generic_mio_trait_simplified_turret_design generic_mio_trait_armor_steel_working }
+		production_bonus = {
+			production_efficiency_cap_factor = 0.1
+			production_efficiency_gain_factor = 0.1
+		}
+		
+	}
+}
+
+EQS_mustang_organization = {
+	name = mustang
+	include = generic_mobile_tank_organization
+	icon = GFX_idea_EQS_mustang
+	allowed = {
+		tag = EQS
+		has_dlc = "Arms Against Tyranny"
+	}
+	# available = { # This can't be checked for with AAT :(
+	# 	owner = {
+
+	# 		if = {
+	# 			limit = { event_target:solar_empire = { exists = yes } }
+	# 			OR = {
+	# 				AND = {
+	# 					tag = event_target:equestria
+	# 					NOT = { event_target:solar_empire = { has_idea = mustang } }
+	# 				}
+	# 				AND = {
+	# 					tag = event_target:solar_empire
+	# 					NOT = { event_target:equestria = { has_idea = mustang } }
+	# 				}
+	# 			}
+	# 		}
+	# 	}
+	# }
+	initial_trait = {
+		organization_modifier = {
+			military_industrial_organization_research_bonus = 0.03
+		}
+	}
+}
+
+EQS_sirius_organization = {
+	name = sirius
+	include = generic_heavy_tank_organization
+	icon = GFX_idea_EQS_sirius
+	allowed = {
+		tag = EQS
+		has_dlc = "Arms Against Tyranny"
+	}
+	initial_trait = {
+		equipment_bonus = {
+			armor_value = 0.05
+		}
+	}
+}
+
+
+ ######  ##     ## #### ########   ######  
+##    ## ##     ##  ##  ##     ## ##    ## 
+##       ##     ##  ##  ##     ## ##       
+ ######  #########  ##  ########   ######  
+      ## ##     ##  ##  ##              ## 
+##    ## ##     ##  ##  ##        ##    ## 
+ ######  ##     ## #### ##         ######  
+
+
+
+EQS_seaward_organization = {
+	name = seaward
+	include = generic_task_force_ship_organization
+	icon = GFX_idea_EQS_seaward
+	allowed = {	
+		OR = {
+			original_tag = EQS
+			original_tag = BAL
+			original_tag = CES
+			original_tag = NMS
+			original_tag = JUN
+			original_tag = TEM
+			original_tag = NLR
+			original_tag = CRY
+			original_tag = VAN
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	available = {
+		owner = {
+			owns_state = 59
+		}
+	}
+
+	override_trait = {
+		token = generic_mio_trait_underway_replenishment_equipment
+
+		position = { x=1 y=0 }
+		relative_position_id = generic_mio_trait_transom_stern
+	}
+
+	add_trait = { 
+		token = EQS_mio_trait_flared_bow
+		name = ENG_mio_trait_flared_bow
+		icon = GFX_generic_mio_department_icon_ship_general_quality
+		special_trait_background = yes
+
+		position = { x=1 y=0 }
+		relative_position_id = generic_mio_trait_underway_replenishment_equipment
+
+		any_parent = { generic_mio_trait_splinter_protection }
+
+		equipment_bonus = {
+			naval_weather_penalty_factor = -0.1
+		}
+	}
+
+	add_trait = { 
+		token = generic_mio_trait_semi_armor_piercing_shells
+		name = generic_mio_trait_semi_armor_piercing_shells
+		icon = GFX_generic_mio_trait_icon_lg_attack
+		special_trait_background = yes
+
+		any_parent = { generic_mio_trait_secondary_fire_director_control }
+		position = { x=0 y=1 }
+		relative_position_id = generic_mio_trait_secondary_fire_director_control
+
+		equipment_bonus = {
+			lg_attack = 0.05
+			lg_armor_piercing = 0.05
+		}
+	}
+}
+
+
+EQS_baltimare_organization = {
+	name = baltimare
+	include = generic_battle_line_ship_organization
+	icon = GFX_idea_EQS_baltimare
+	allowed = {	
+		OR = {
+			original_tag = EQS
+			original_tag = BAL
+			original_tag = CES
+			original_tag = NMS
+			original_tag = JUN
+			original_tag = TEM
+			original_tag = NLR
+			original_tag = VAN
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	available = {
+		owner = {
+			owns_state = 13
+		}
+	}
+
+	override_trait = {
+		token = generic_mio_trait_advanced_armor_design
+
+		position = { x=1 y=0 }
+		relative_position_id = generic_mio_trait_advanced_hydrodynamic_design
+	}
+
+	add_trait = { 
+		token = EQS_mio_trait_flared_bow
+		name = ENG_mio_trait_flared_bow
+		icon = GFX_generic_mio_department_icon_ship_general_quality
+		special_trait_background = yes
+
+		position = { x=1 y=0 }
+		relative_position_id = generic_mio_trait_advanced_armor_design
+
+		any_parent = { generic_mio_trait_hardened_critical_components}
+		
+		equipment_bonus = {
+			naval_weather_penalty_factor = -0.1
+		}
+	}
+
+	add_trait = { 
+		token = EQS_mio_trait_super_charges
+		name = ENG_mio_trait_super_charges
+		icon = GFX_generic_mio_department_icon_ship_capital_ship_weapons
+		special_trait_background = yes
+
+		position = { x=0 y=2 }
+		relative_position_id = generic_mio_trait_semi_armor_piercing_shells
+
+		any_parent = { generic_mio_trait_super_heavy_shells generic_mio_trait_semi_armor_piercing_shells generic_mio_trait_high_velocity_guns }
+
+		limit_to_equipment_type = { capital_ship }
+
+		equipment_bonus = {
+			hg_armor_piercing = 0.05
+			lg_armor_piercing = 0.05
+		}
+	}
+}
+
+EQS_mustangia_shipyards_organization = {
+	name = mustangia_shipyards
+	include = generic_escort_ship_organization
+	icon = GFX_idea_EQS_mustangia_shipyards
+	allowed = {	
+		tag = EQS
+		has_dlc = "Arms Against Tyranny"
+	}
+}
+
+EQS_ichthys_docyard_organization = {
+	name = EQS_ichthys_docyard
+	include = generic_raider_ship_organization
+	icon = GFX_idea_EQS_ichthys_docyard
+	allowed = {	
+		tag = EQS
+		has_dlc = "Arms Against Tyranny"
+	}
+	available = {
+		owner = {
+			owns_state = 12
+		}
+	}
+}
+
+
+
+########  ##          ###    ##    ## ########  ######  
+##     ## ##         ## ##   ###   ## ##       ##    ## 
+##     ## ##        ##   ##  ####  ## ##       ##       
+########  ##       ##     ## ## ## ## ######    ######  
+##        ##       ######### ##  #### ##             ## 
+##        ##       ##     ## ##   ### ##       ##    ## 
+##        ######## ##     ## ##    ## ########  ######  
+
+
+EQS_wonderbolt_concern_organization = {
+	name = wonderbolt_concern
+	include = generic_high_agility_fighter_aircraft_organization
+	icon = GFX_idea_EQS_wonderbolt_concern
+	allowed = {	
+		tag = EQS
+		has_dlc = "Arms Against Tyranny"
+	}
+
+	equipment_type = {
+		mio_cat_eq_all_small_plane
+		maritime_patrol_plane
+	}	
+
+	research_categories = {	
+		mio_cat_all_light_fighter_and_modules 
+#		mio_cat_all_naval_bomber_and_modules 
+			#Could be used to allow Supermarine to research naval bombs, but this could overpower English fighter MIO trait gain early on.
+	}
+	
+	override_trait = {
+		token = generic_mio_trait_fuel_injection_engines
+		
+		position = { x=0 y=2 }
+		relative_position_id = generic_mio_trait_bigger_engines
+	}
+
+	override_trait = {
+		token = generic_mio_trait_high_octane_fuels
+		
+		position = { x=1 y=1 }
+		relative_position_id = generic_mio_trait_bigger_engines
+	}
+
+	override_trait = {
+		token = generic_mio_trait_subsidiary_suppliers
+		
+		position = { x=0 y=2 }
+		relative_position_id = generic_mio_trait_fuel_injection_engines
+	}
+
+
+	add_trait = { 
+		token = EQS_mio_trait_seaplane_origins
+		name = ENG_mio_trait_seaplane_origins
+		icon = GFX_generic_mio_trait_icon_detection
+		special_trait_background = yes
+
+		position = { x=2 y=0 }
+		relative_position_id = generic_mio_trait_minimum_weapon_requirements
+
+		#any_parent = { generic_mio_trait_super_heavy_shells generic_mio_trait_semi_armor_piercing_shells generic_mio_trait_high_velocity_guns }
+
+		limit_to_equipment_type = { mio_cat_eq_all_small_plane mio_cat_eq_all_large_plane }
+
+		equipment_bonus = {
+			sub_detection = 0.05
+			surface_detection = 0.05
+			naval_strike_targetting = 0.1
+		}
+	}
+
+	add_trait = { 
+		token = EQS_mio_trait_elliptical_wings
+		name = ENG_mio_trait_elliptical_wings
+		icon = GFX_generic_mio_trait_icon_defense
+		special_trait_background = yes
+
+		position = { x=0 y=1 }
+		relative_position_id = generic_mio_trait_cantilever_wing_structure
+
+		any_parent = { generic_mio_trait_cantilever_wing_structure }
+
+		equipment_bonus = {
+			air_defence = 0.1	
+		}
+	}
+
+	add_trait = { 
+		token = EQS_mio_trait_supercharger
+		name = ENG_mio_trait_supercharger
+		icon = GFX_generic_mio_trait_icon_defense
+		special_trait_background = yes
+
+		position = { x=1 y=1 }
+		relative_position_id = generic_mio_trait_fuel_injection_engines
+
+		all_parents = { generic_mio_trait_fuel_injection_engines generic_mio_trait_high_octane_fuels }
+
+		equipment_bonus = {
+			air_defence = 0.1	
+		}
+	}
+}
+
+EQS_stratus_organization = {
+	name = EQS_stratus
+	include = generic_cas_aircraft_organization
+	icon = GFX_idea_EQS_stratus
+	allowed = {	
+		tag = EQS
+		has_dlc = "Arms Against Tyranny"
+	}
+}
+EQS_cloudsdale_research_organization = {
+	name = cloudsdale_research
+	include = generic_medium_aircraft_organization
+	icon = GFX_idea_EQS_cloudsdale_research
+	allowed = {	
+		tag = EQS
+		has_dlc = "Arms Against Tyranny"
+	}
+}
+EQS_northern_organization = {
+	name = northern
+	include = generic_heavy_aircraft_organization
+	icon = GFX_idea_EQS_northern
+	allowed = {	
+		tag = EQS
+		has_dlc = "Arms Against Tyranny"
+	}
+}
+EQS_ultramarine_organization = {
+	name = EQS_ultramarine
+	include = generic_naval_aircraft_organization
+	icon = GFX_idea_EQS_ultramarine
+	allowed = {	
+		tag = EQS
+		has_dlc = "Arms Against Tyranny"
+	}
+}
+
+
+
+
+##     ##    ###    ######## ######## ########  #### ######## ##       
+###   ###   ## ##      ##    ##       ##     ##  ##  ##       ##       
+#### ####  ##   ##     ##    ##       ##     ##  ##  ##       ##       
+## ### ## ##     ##    ##    ######   ########   ##  ######   ##       
+##     ## #########    ##    ##       ##   ##    ##  ##       ##       
+##     ## ##     ##    ##    ##       ##    ##   ##  ##       ##       
+##     ## ##     ##    ##    ######## ##     ## #### ######## ######## 
+
+
+EQS_macintosh_organization = {
+	include = generic_infantry_equipment_organization
+	name = macintosh
+	icon = GFX_idea_EQS_macintosh
+	allowed = {	
+		tag = EQS
+		has_dlc = "Arms Against Tyranny"
+	}
+	override_trait = { 
+		token = generic_mio_trait_anti_vechicle_land_mines	
+		name = ENG_mio_trait_piat	
+		icon = GFX_generic_mio_trait_icon_hard_attack
+		special_trait_background = yes
+
+		equipment_bonus = {
+			hard_attack = 0.05
+			defense = 0.05
+			breakthrough = 0.1
+		}
+	}
+
+	add_trait = { 
+		token = EQS_mio_trait_sten_submachine_guns	
+		name = ENG_mio_trait_sten_submachine_guns	
+		icon = GFX_generic_mio_trait_icon_ap_attack
+		special_trait_background = yes
+
+		position = { x=1 y=1 }
+		relative_position_id = generic_mio_trait_drum_pattern_sights
+
+		any_parent = { generic_mio_trait_reinforced_stocks generic_mio_trait_drum_pattern_sights }
+
+		equipment_bonus = {
+			reliability = 0.05
+			soft_attack = 0.03
+			ap_attack = 0.05
+		}
+	}
+}
+
+EQS_fillydelphia_arms_organization = {
+	name = fillydelphia_arms
+	include = generic_motorized_mechanized_organization
+	icon = GFX_idea_EQS_fillydelphia_arms
+	allowed = {	
+		tag = EQS
+		has_dlc = "Arms Against Tyranny"
+	}
+	initial_trait = {
+		equipment_bonus = {
+			maximum_speed = 0.05
+		}
+	}
+}
+EQS_star_energy_organization = {
+	name = star_energy
+	include = generic_artillery_organization
+	icon = GFX_idea_EQS_star_energy
+	allowed = {	
+		tag = EQS
+		has_dlc = "Arms Against Tyranny" 
+	}
+}
\ No newline at end of file
diff --git a/common/military_industrial_organization/organizations/FAL_Organization.txt b/common/military_industrial_organization/organizations/FAL_Organization.txt
new file mode 100644
index 00000000000..53bb164966a
--- /dev/null
+++ b/common/military_industrial_organization/organizations/FAL_Organization.txt
@@ -0,0 +1,321 @@
+########    ###    ##    ## ##    ##  ######  
+   ##      ## ##   ###   ## ##   ##  ##    ## 
+   ##     ##   ##  ####  ## ##  ##   ##       
+   ##    ##     ## ## ## ## #####     ######  
+   ##    ######### ##  #### ##  ##         ## 
+   ##    ##     ## ##   ### ##   ##  ##    ## 
+   ##    ##     ## ##    ## ##    ##  ######  
+
+FAL_Cerberus_organization = {
+	name = Cerberus
+	include = generic_mobile_tank_organization
+	icon = GFX_idea_FAL_Fabbrica_Falcorian_Automobili
+			allowed = {
+				has_dlc = "Arms Against Tyranny"
+				OR = {
+					original_tag = FAL
+					original_tag = WNG
+				}
+			}
+			visible = {
+				owner = {
+					OR = {
+						original_tag = FAL
+						owns_state = 529
+					}
+				}
+			}
+            available = {
+				owner = {
+					owns_state = 529
+				}
+			}
+		initial_trait = {
+			limit_to_equipment_type = { light_tank_chassis }
+			equipment_bonus = {
+				breakthrough = 0.05
+			}
+		}
+	}
+FAL_Eupolis_FAL_organization = {
+	name = Eupolis_FAL
+	include = generic_medium_tank_organization
+	icon = GFX_idea_FAL_Eupolis
+			allowed = {
+				has_dlc = "Arms Against Tyranny"
+				OR = {
+					original_tag = FAL
+					original_tag = WNG
+				}
+			}
+			visible = {
+				owner = {
+					OR = {
+						original_tag = FAL
+						owns_state = 529
+					}
+				}
+			}
+            available = {
+				owner = {
+					owns_state = 529
+				}
+			}
+			initial_trait = {
+				limit_to_equipment_type = { medium_tank_chassis }
+				equipment_bonus = {
+					soft_attack = 0.05
+				}
+			}
+		}
+
+
+
+ ######  ##     ## #### ########   ######  
+##    ## ##     ##  ##  ##     ## ##    ## 
+##       ##     ##  ##  ##     ## ##       
+ ######  #########  ##  ########   ######  
+      ## ##     ##  ##  ##              ## 
+##    ## ##     ##  ##  ##        ##    ## 
+ ######  ##     ## #### ##         ######  
+
+
+ 
+FAL_Poseidon_organization = {
+	name = Poseidon
+	include = generic_battle_line_ship_organization
+	icon = GFX_idea_FAL_Poseidon
+			allowed = {
+				has_dlc = "Arms Against Tyranny"
+				OR = {
+					original_tag = FAL
+					original_tag = WNG
+				}
+			}
+			visible = {
+				owner = {
+					OR = {
+						original_tag = FAL
+						owns_state = 504
+					}
+				}
+			}
+            available = {
+				owner = {
+					owns_state = 504
+				}
+			}
+		}
+
+FAL_Fluctus_organization = {
+	name = Fluctus
+	include = generic_task_force_ship_organization
+	icon = GFX_idea_FAL_Fluctus
+			allowed = {
+				has_dlc = "Arms Against Tyranny"
+				OR = {
+					original_tag = FAL
+					original_tag = WNG
+				}
+			}
+			visible = {
+				owner = {
+					OR = {
+						original_tag = FAL
+						owns_state = 529
+					}
+				}
+			}
+            available = {
+				owner = {
+					owns_state = 529
+					any_controlled_state_is_coastal = yes
+				}
+			}
+		}
+ 
+ ########  ##          ###    ##    ## ########  ######  
+##     ## ##         ## ##   ###   ## ##       ##    ## 
+##     ## ##        ##   ##  ####  ## ##       ##       
+########  ##       ##     ## ## ## ## ######    ######  
+##        ##       ######### ##  #### ##             ## 
+##        ##       ##     ## ##   ### ##       ##    ## 
+##        ######## ##     ## ##    ## ########  ###### 
+
+FAL_Hermes_organization = {
+	name = Hermes
+	include = generic_light_aircraft_organization
+	icon = GFX_idea_FAL_Falcor_Aerospace
+			allowed = {
+				has_dlc = "Arms Against Tyranny"
+				OR = {
+					original_tag = FAL
+					original_tag = WNG
+				}
+			}
+			visible = {
+				owner = {
+					OR = {
+						original_tag = FAL
+						owns_state = 529
+					}
+				}
+			}
+            available = {
+				owner = {
+					owns_state = 529
+				}
+			}
+		}
+	
+	FAL_Artemis_organization = {
+	name = Artemis
+	include = generic_medium_aircraft_organization
+	icon = GFX_idea_FAL_Artemis
+			allowed = {
+				OR = {
+					original_tag = FAL
+					original_tag = WNG
+				}
+			}
+			visible = {
+				owner = {
+					OR = {
+						original_tag = FAL
+						owns_state = 529
+					}
+				}
+			}
+            available = {
+				owner = {
+					owns_state = 529
+				}
+			}
+		}
+	
+	FAL_Apollo_organization = {
+	name = Apollo
+	include = generic_naval_aircraft_organization
+	icon = GFX_idea_FAL_Apollo
+			allowed = {
+				has_dlc = "Arms Against Tyranny"
+				OR = {
+					original_tag = FAL
+					original_tag = WNG
+				}
+			}
+			visible = {
+				owner = {
+					OR = {
+						original_tag = FAL
+						owns_state = 504
+					}
+				}
+			}
+            available = {
+				owner = {
+					owns_state = 504
+				}
+			}
+		}
+			
+##     ##    ###    ######## ######## ########  #### ######## ##       
+###   ###   ## ##      ##    ##       ##     ##  ##  ##       ##       
+#### ####  ##   ##     ##    ##       ##     ##  ##  ##       ##       
+## ### ## ##     ##    ##    ######   ########   ##  ######   ##       
+##     ## #########    ##    ##       ##   ##    ##  ##       ##       
+##     ## ##     ##    ##    ##       ##    ##   ##  ##       ##       
+##     ## ##     ##    ##    ######## ##     ## #### ######## ########
+
+FAL_Lycus_organization = {
+	name = Lycus
+	include = generic_infantry_equipment_organization
+	icon = GFX_idea_FAL_Lycus
+			allowed = {
+				has_dlc = "Arms Against Tyranny"
+				OR = {
+					original_tag = FAL
+					original_tag = WNG
+				}
+			}
+			visible = {
+				owner = {
+					OR = {
+						original_tag = FAL
+						owns_state = 533
+					}
+				}
+			}
+            available = {
+				owner = {
+					owns_state = 533
+				}
+			}
+			initial_trait = {
+				equipment_bonus = {
+					defense = 0.05
+				}
+			}
+		}
+	FAL_Lycurgus_organization = {
+	name = Lycurgus
+	include = generic_motorized_mechanized_organization
+	icon = GFX_idea_FAL_Lycurgus
+			allowed = {
+				has_dlc = "Arms Against Tyranny"
+				OR = {
+					original_tag = FAL
+					original_tag = WNG
+				}
+			}
+			visible = {
+				owner = {
+					OR = {
+						original_tag = FAL
+						owns_state = 529
+					}
+				}
+			}
+            available = {
+				owner = {
+					owns_state = 529
+				}
+			}
+			initial_trait = {
+				limit_to_equipment_type = { motorized_equipment } 
+				equipment_bonus = {
+					reliability = 0.05
+				}
+			}
+		}
+			
+	FAL_Nicocreon_organization = {
+	name = Nicocreon
+	include = generic_artillery_organization
+	icon = GFX_idea_FAL_Nicocreon
+			allowed = {
+				has_dlc = "Arms Against Tyranny"
+				OR = {
+					original_tag = FAL
+					original_tag = WNG
+				}
+			}
+			visible = {
+				owner = {
+					OR = {
+						original_tag = FAL
+						owns_state = 529
+					}
+				}
+			}
+            available = {
+				owner = {
+					owns_state = 529
+				}
+			}
+			initial_trait = {
+				equipment_bonus = {
+					soft_attack = 0.05
+				}
+			}
+		}
\ No newline at end of file
diff --git a/common/military_industrial_organization/organizations/FAT_Organization.txt b/common/military_industrial_organization/organizations/FAT_Organization.txt
new file mode 100644
index 00000000000..831d76d3169
--- /dev/null
+++ b/common/military_industrial_organization/organizations/FAT_Organization.txt
@@ -0,0 +1,751 @@
+########    ###    ##    ## ##    ##  ######  
+   ##      ## ##   ###   ## ##   ##  ##    ## 
+   ##     ##   ##  ####  ## ##  ##   ##       
+   ##    ##     ## ## ## ## #####     ######  
+   ##    ######### ##  #### ##  ##         ## 
+   ##    ##     ## ##   ### ##   ##  ##    ## 
+   ##    ##     ## ##    ## ##    ##  ######
+FAT_squark_tank_factory_organization = {
+	name = FAT_squark_tank_factory
+	include = generic_mobile_tank_organization
+	icon = GFX_idea_FAT_squark_tank_factory
+	allowed = {
+		has_dlc = "Arms Against Tyranny"			
+		OR = {
+			original_tag = FAT
+			original_tag = FAW
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 582
+		}
+	}
+	initial_trait = {
+		organization_modifier = {
+			military_industrial_organization_research_bonus = 0.03
+		}
+	}
+}
+FAT_cockade_factory_organization = {
+	name = FAT_cockade_factory
+	include = generic_medium_tank_organization
+	icon = GFX_idea_FAT_cockade_factory			
+			allowed = {
+				has_dlc = "Arms Against Tyranny"			
+				OR = {
+					original_tag = FAT
+					original_tag = FAW
+				}
+			}
+			available = {
+				owner = {
+					owns_state = 485
+				}
+			}
+}
+FAT_ring_motors_organization = {
+	name = FAT_ring_motors
+	include = generic_heavy_tank_organization
+	icon = GFX_idea_FAT_ring_motors
+			allowed = {
+				has_dlc = "Arms Against Tyranny"			
+				OR = {
+					original_tag = FAT
+					original_tag = FAW
+				}
+			}
+			available = {
+				owner = {
+					owns_state = 485
+				}
+			}
+		}	
+######  ##     ## #### ########   ######  
+##    ## ##     ##  ##  ##     ## ##    ## 
+##       ##     ##  ##  ##     ## ##       
+ ######  #########  ##  ########   ######  
+      ## ##     ##  ##  ##              ## 
+##    ## ##     ##  ##  ##        ##    ## 
+ ######  ##     ## #### ##         ######
+
+ FAT_republican_shipbuilding_union_organization = {
+	name = FAT_republican_shipbuilding_union
+	include = generic_battle_line_ship_organization
+	icon = GFX_idea_FAT_republican_shipbuilding_union
+			allowed = {
+				has_dlc = "Arms Against Tyranny"			
+				OR = {
+					original_tag = FAT
+					original_tag = FAW
+				}
+			}
+		}
+FAT_river_boats_of_bleakspire_organization = {
+	name = FAT_river_boats_of_bleakspire
+	include = generic_escort_ship_organization
+	icon = GFX_idea_FAT_river_boats_of_bleakspire
+			allowed = {
+				has_dlc = "Arms Against Tyranny"				
+				OR = {
+					original_tag = FAT
+					original_tag = FAW
+				}
+			}
+			available = {
+				owner = {
+					owns_state = 432
+					owns_state = 449
+				}
+			}
+		}
+FAT_shipyards_of_winghagen_organization = {
+	name = FAT_shipyards_of_winghagen
+	include = generic_task_force_ship_organization
+	icon = GFX_idea_FAT_shipyards_of_winghagen
+	allowed = {
+		OR = {
+			original_tag = FAT
+			original_tag = FAW
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 432
+		}
+	}
+	
+    tree_header_text = {
+        text = mio_header_systems
+        x = 1
+    }
+
+    tree_header_text = {
+        text = mio_header_weapons
+        x = 4
+    }
+
+    tree_header_text = {
+        text = mio_header_production
+        x = 7.5
+    }
+
+    override_trait = {
+        token = generic_mio_trait_secondary_fire_director_control
+        position = { x=4 y=0 }
+    }
+
+    override_trait = {
+        token = generic_mio_trait_primary_fire_director_control
+        position = { x=2 y=0 }
+    }
+
+
+    add_trait = { 
+        token = FAT_mio_trait_coastal_defense_ship_modernization
+        name = DEN_mio_trait_coastal_defense_ship_modernization
+        icon = GFX_generic_mio_department_icon_ship_general
+        special_trait_background = yes
+
+        position = { x=1.5 y=0 }
+        relative_position_id = generic_mio_trait_primary_fire_director_control
+
+        
+        limit_to_equipment_type = { ship_hull_cruiser_coastal_defense_ship }
+
+        visible = {
+            owner = {
+                has_dlc = "Man the Guns"
+            }
+        }
+
+        equipment_bonus = {
+            naval_speed = 0.05
+            fuel_consumption = -0.05
+        }
+
+        production_bonus = {
+            production_cost_factor = -0.1
+            production_resource_need_factor = -0.05
+            production_conversion_speed_factor = 0.1
+        }
+    }
+
+    add_trait = { 
+        token = FAT_mio_trait_engine_optimization
+        name = generic_mio_engine_optimization
+        icon = GFX_generic_mio_trait_icon_naval_speed
+        special_trait_background = yes
+
+        position = { x=2.5 y=0 }
+        relative_position_id = generic_mio_trait_primary_fire_director_control
+
+        equipment_bonus = {
+            fuel_consumption = -0.02
+            naval_speed = 0.02
+            naval_range = 0.02
+        }
+    }
+
+    add_trait = { 
+        token = FAT_mio_trait_refit_civilian_ships
+        name = generic_mio_trait_efficient_scrap_recycling
+        icon = GFX_generic_mio_department_icon_ship_general_conversion
+        special_trait_background = yes
+
+        all_parents = {
+            FAT_mio_trait_engine_optimization
+        }
+
+        position = { x=-1 y=1 }
+        relative_position_id = FAT_mio_trait_engine_optimization
+
+        production_bonus = {
+            production_conversion_speed_factor = 0.1
+            production_resource_need_factor = -0.05
+        }
+    }
+
+    add_trait = { 
+        token = FAT_mio_trait_ship_efficient_scrap_recycling
+        name = generic_mio_trait_efficient_scrap_recycling
+        icon = GFX_generic_mio_department_icon_ship_general_production
+        special_trait_background = yes
+
+        all_parents = {
+            FAT_mio_trait_engine_optimization
+        }
+
+        position = { x=0 y=1 }
+        relative_position_id = FAT_mio_trait_engine_optimization
+
+        production_bonus = {
+            production_cost_factor = -0.05
+            production_capacity_factor = 0.05
+            production_resource_penalty_factor = -0.05
+        }
+    }
+}
+ 
+ ########  ##          ###    ##    ## ########  ######  
+##     ## ##         ## ##   ###   ## ##       ##    ## 
+##     ## ##        ##   ##  ####  ## ##       ##       
+########  ##       ##     ## ## ## ## ######    ######  
+##        ##       ######### ##  #### ##             ## 
+##        ##       ##     ## ##   ### ##       ##    ## 
+##        ######## ##     ## ##    ## ########  ######
+
+FAT_squark_birds_of_steel_organization = {
+	name = FAT_squark_birds_of_steel
+	include = generic_light_aircraft_organization
+	icon = GFX_idea_FAT_squark_birds_of_steel
+			allowed = {
+				has_dlc = "Arms Against Tyranny"			
+				OR = {
+					original_tag = FAT
+					original_tag = FAW
+				}
+			}
+			available = {
+				owner = {
+					owns_state = 582
+				}
+			}
+		}	
+
+FAT_blue_and_white_organization = {
+	name = FAT_blue_and_white
+	include = generic_medium_aircraft_organization
+	icon = GFX_idea_FAT_blue_and_white	
+			allowed = {
+				has_dlc = "Arms Against Tyranny"
+				OR = {
+					original_tag = FAT
+					original_tag = FAW
+				}
+			}
+			available = {
+				owner = {
+					owns_state = 485
+				}
+			}	
+		}
+FAT_whitestar_aircraft_organization = {
+	name = FAT_whitestar_aircraft
+	include = generic_heavy_aircraft_organization
+	icon = GFX_idea_FAT_whitestar_aircraft
+			allowed = {
+				has_dlc = "Arms Against Tyranny"			
+				OR = {
+					original_tag = FAT
+					original_tag = FAW
+				}
+			}
+			available = {
+				owner = {
+					owns_state = 485
+				}
+			}	
+		}
+##     ##    ###    ######## ######## ########  #### ######## ##       
+###   ###   ## ##      ##    ##       ##     ##  ##  ##       ##       
+#### ####  ##   ##     ##    ##       ##     ##  ##  ##       ##       
+## ### ## ##     ##    ##    ######   ########   ##  ######   ##       
+##     ## #########    ##    ##       ##   ##    ##  ##       ##       
+##     ## ##     ##    ##    ##       ##    ##   ##  ##       ##       
+##     ## ##     ##    ##    ######## ##     ## #### ######## ########
+
+FAT_cloudbury_arsenal_company_organization = {
+	name = FAT_cloudbury_arsenal_company
+	include = generic_infantry_equipment_organization
+	icon = GFX_idea_FAT_cloudbury_arsenal_company
+			allowed = {
+				has_dlc = "Arms Against Tyranny"			
+				OR = {
+					original_tag = FAT
+					original_tag = FAW
+				}
+			}
+			available = {
+				owner = {
+					owns_state = 485
+				}
+			}
+			add_trait = { 
+				token = FAT_mio_trait_weibel_development
+				name = DEN_mio_trait_weibel_development
+				icon = GFX_generic_mio_department_icon_infantry_offense
+				special_trait_background = yes
+		
+				position = { x=0 y=1 }
+				relative_position_id = generic_mio_trait_reinforced_stocks
+		
+				all_parents = {
+					generic_mio_trait_reinforced_stocks
+				}
+				
+				available = {
+					owner = {
+						has_idea = modern_society
+					}
+				}
+		
+				equipment_bonus = {
+					soft_attack = 0.02
+					breakthrough = 0.02
+					defense = 0.02
+				}
+			}
+		
+		   add_trait = { 
+			   token = FAT_mio_trait_madsen_heavy_machine_gun
+			   name = DEN_mio_trait_madsen_heavy_machine_gun
+			   icon = GFX_generic_mio_department_icon_infantry_offense
+			   special_trait_background = yes
+		
+			   position = { x=0 y=1 }
+			   relative_position_id = generic_mio_trait_heavy_anti_armor_ammunition
+		
+			   all_parents = {
+				   generic_mio_trait_heavy_anti_armor_ammunition
+			   }
+			   
+			   available = {
+				   owner = {
+						has_idea = modern_society
+				   }
+			   }
+		
+			   equipment_bonus = {
+				   ap_attack = 0.03
+				   hard_attack = 0.02
+				   breakthrough = 0.03
+			   }
+		   }	
+		}
+	
+FAT_broby_armaments_organization = {
+	name = FAT_broby_armaments
+	include = generic_artillery_organization
+	icon = GFX_idea_FAT_broby_armaments
+			allowed = {
+				has_dlc = "Arms Against Tyranny"			
+				OR = {
+					original_tag = FAT
+					original_tag = FAW
+				}
+			}
+			available = {
+				owner = {
+					owns_state = 548
+				}
+			}	
+
+			override_trait = {
+				token = generic_mio_trait_improved_hydraulic_recoil_system
+				position = { x=1 y=2 }
+			}
+		
+			override_trait = {
+				token = generic_mio_trait_improved_direct_fire_targeting
+				position = { x=-1 y=2 }
+			}
+		
+			override_trait = {
+				token = generic_mio_trait_rapid_fire
+				name = DEN_mio_trait_fodfolkskanoner
+				icon = GFX_generic_mio_department_icon_tank_general_weapons
+				special_trait_background = yes
+		
+				position = { x=4 y=0 }
+				equipment_bonus = {
+					soft_attack = 0.1
+					breakthrough = 0.05
+					reliability = 0.03
+				}
+			}
+		
+			override_trait = {
+				token = generic_mio_trait_sliding_breech_block
+				special_trait_background = yes
+		
+				position = { x=0 y=3 }
+				all_parents = {
+					generic_mio_trait_rapid_fire
+				}
+		
+				equipment_bonus = {
+					soft_attack = 0.03
+					defense = 0.03
+				}
+			}
+		
+			override_trait = {
+				token = generic_mio_trait_gun_mass_production
+				special_trait_background = yes
+		
+				position = { x=2 y=1 }
+				relative_position_id = generic_mio_trait_rapid_fire
+		
+				any_parent = {
+					generic_mio_trait_rapid_fire
+					generic_mio_trait_big_guns
+				}
+		
+				production_bonus = {
+					production_efficiency_gain_factor = 0.05
+					production_efficiency_cap_factor = 0.05
+				}
+			}
+		
+			 override_trait = {
+				token = generic_mio_trait_big_guns
+				name = DEN_mio_trait_feltkanoner
+				icon = GFX_generic_mio_department_icon_artillery_production
+				special_trait_background = yes
+		
+				position = { x=4 y=0 }
+				relative_position_id = generic_mio_trait_rapid_fire
+		
+				equipment_bonus = {
+					soft_attack = 0.02
+					defense = 0.02
+				}
+			}
+		
+			override_trait = {
+				token = generic_mio_trait_light_weight_barrels
+				icon = GFX_generic_mio_department_icon_tank_general_weapons
+				special_trait_background = yes
+		
+				position = { x=2 y=4 }
+				relative_position_id = generic_mio_trait_rapid_fire
+				
+				any_parent = {
+					FAT_mio_trait_madsen_20_mm
+					FAT_mio_trait_big_guns
+				}
+				all_parents = {
+				   generic_mio_trait_sliding_breech_block
+				   FAT_mio_trait_advanced_barrel_forging
+				}
+		
+				production_bonus = {
+					production_cost_factor = -0.05
+				}
+		
+				equipment_bonus = {
+					breakthrough = 0.06
+					defense = 0.1
+				}
+			}
+		
+			add_trait = { 
+				token = FAT_mio_trait_madsen_20_mm
+				name = DEN_mio_trait_madsen_20_mm
+				icon = GFX_generic_mio_trait_icon_ap_attack
+				special_trait_background = yes
+		
+				position = { x=1 y=2 }
+				relative_position_id = generic_mio_trait_rapid_fire
+		
+				all_parents = {
+					generic_mio_trait_rapid_fire
+					generic_mio_trait_gun_mass_production
+				}
+				
+				available = {
+					owner = {
+						has_idea = modern_society
+					}
+				}
+		
+				limit_to_equipment_type = { 
+					anti_tank_equipment
+					anti_air_equipment
+				}
+		
+				equipment_bonus = {
+					ap_attack = 0.05
+					hard_attack = 0.05
+					air_attack = 0.05
+				}
+		
+				production_bonus = {
+					production_cost_factor = 0.05
+				}
+			}
+		
+			add_trait = { 
+				token = FAT_mio_trait_big_guns
+				name = generic_mio_trait_big_guns
+				icon = GFX_generic_mio_trait_icon_breakthrough
+				special_trait_background = yes
+		
+				position = { x=-1 y=2 }
+				relative_position_id = generic_mio_trait_big_guns
+		
+				all_parents = {
+					generic_mio_trait_big_guns
+					generic_mio_trait_gun_mass_production
+				}
+				
+				available = {
+					owner = {
+						has_idea = modern_society
+					}
+				}
+		
+				limit_to_equipment_type = { 
+					artillery_equipment
+					rocket_artillery_equipment
+				}
+		
+				equipment_bonus = {
+					breakthrough = 0.03
+					defense = 0.02
+				}
+			}
+		
+			add_trait = { 
+				token = FAT_mio_trait_advanced_barrel_forging
+				name = generic_mio_trait_advanced_barrel_forging
+				icon = GFX_generic_mio_trait_icon_breakthrough
+				special_trait_background = yes
+		
+				position = { x=0 y=3 }
+				relative_position_id = generic_mio_trait_big_guns
+		
+				all_parents = {
+					generic_mio_trait_big_guns
+				}
+				
+				available = {
+					owner = {
+						has_idea = modern_society
+					}
+				}
+		
+				limit_to_equipment_type = { 
+					artillery_equipment
+					rocket_artillery_equipment
+				}
+		
+				equipment_bonus = {
+					breakthrough = 0.03
+					soft_attack = 0.02
+				}
+			}
+		
+			remove_trait = {
+				generic_mio_trait_advanced_barrel_forging
+				generic_mio_trait_super_charges
+			}
+		}
+FAT_ignis_car_factory_organization = {
+	name = FAT_ignis_car_factory
+	include = generic_motorized_mechanized_organization
+	icon = GFX_idea_FAT_ignis_car_factory
+			allowed = {
+				has_dlc = "Arms Against Tyranny"			
+				OR = {
+					original_tag = FAT
+					original_tag = FAW
+				}
+			}	
+			tree_header_text = {
+				text = mio_header_motorized
+				x = 1
+			}
+		
+			tree_header_text = {
+				text = mio_header_mechanized
+				x = 6
+			}
+		
+			tree_header_text = {
+				text = mio_header_production_department
+				x = 8.5
+			}
+		
+			override_trait = {
+				token = generic_mio_trait_steel_cargo_bed
+		
+				position = { x=2 y=0 }
+				relative_position_id = generic_mio_trait_composite_cargo_bed
+			}
+		
+			override_trait = {
+				token = generic_mio_trait_high_powered_engine
+		
+				position = { x=1 y=0 }
+				relative_position_id = generic_mio_trait_attached_wood_gas_generator
+			}
+		
+			override_trait = {
+				token = generic_mio_trait_medium_machinegun_mounts
+		
+				position = { x=1 y=0 }
+				relative_position_id = generic_mio_trait_steel_cargo_bed
+			}
+		
+			override_trait = {
+				token = generic_mio_trait_advanced_artillery_racks
+		
+				position = { x=0 y=2 }
+				relative_position_id = generic_mio_trait_armored_pulpit_mount
+			}
+		
+			override_trait = {
+				token = generic_mio_trait_heavy_machinegun_mount
+		
+				position = { x=1 y=0 }
+				relative_position_id = generic_mio_trait_advanced_artillery_racks
+			}
+		
+			override_trait = {
+				token = generic_mio_trait_open_chassi
+		
+				position = { x=2 y=0 }
+				relative_position_id = generic_mio_trait_medium_machinegun_mounts
+			}
+			
+			override_trait = {
+				token = generic_mio_trait_land_mine_racks
+		
+				position = { x=1 y=0 }
+				relative_position_id = generic_mio_trait_light_flame_projectors
+			}
+		
+			add_trait = { 
+				token = FAT_mio_trait_truck_mass_production
+				name = generic_mio_trait_mass_production
+				icon = GFX_generic_mio_department_icon_motorized_production
+				special_trait_background = yes
+		
+				position = { x=9 y=0 }
+				
+				available = {
+					owner = {
+						has_idea = modern_society
+					}
+				}
+		
+				limit_to_equipment_type = {
+					motorized_equipment
+				}
+		
+				production_bonus = {
+					production_capacity_factor = 0.05
+					production_efficiency_gain_factor = 0.05
+					production_efficiency_cap_factor = 0.05
+				}
+			}
+		
+			add_trait = { 
+				token = FAT_mio_trait_repurpose_triangel_factories
+				name = DEN_mio_trait_repurpose_triangel_factories
+				icon = GFX_generic_mio_department_icon_mechanized_production
+				special_trait_background = yes
+		
+				position = { x=0 y=1 }
+				relative_position_id = FAT_mio_trait_truck_mass_production
+		
+				all_parents = { FAT_mio_trait_truck_mass_production }
+		
+				limit_to_equipment_type = {
+					mechanized_equipment
+				}
+		
+				production_bonus = {
+					production_capacity_factor = 0.05
+					production_efficiency_gain_factor = 0.05
+					production_efficiency_cap_factor = 0.05
+				}
+			}
+		
+			add_trait = { 
+				token = FAT_mio_trait_standardized_production_trucks_and_mechs
+				name = generic_mio_initial_trait_standardized_production
+				icon = GFX_generic_mio_department_icon_motorized_mechanized_technology
+				special_trait_background = yes
+		
+				position = { x=0 y=1 }
+				relative_position_id = FAT_mio_trait_repurpose_triangel_factories
+		
+				all_parents = { FAT_mio_trait_repurpose_triangel_factories }
+				
+				limit_to_equipment_type = {
+					motorized_equipment
+					mechanized_equipment
+				}
+		
+				equipment_bonus = {
+					maximum_speed = 0.05
+					reliability = 0.05
+				}
+		
+				production_bonus = {
+					production_efficiency_gain_factor = 0.05
+					production_efficiency_cap_factor = 0.05
+				}
+			}
+		}
+FAT_squark_tank_factory_armored_cars_organization = {
+	name = FAT_squark_tank_factory_armored_cars
+	include = generic_armored_car_organization
+	icon = GFX_idea_FAT_squark_tank_factory
+			allowed = {
+				has_dlc = "La Resistance"
+				has_dlc = "Arms Against Tyranny"				
+				OR = {
+					original_tag = FAT
+					original_tag = FAW
+				}	
+			}
+			available = {
+				owner = {
+					owns_state = 582
+				}
+			}
+		}
\ No newline at end of file
diff --git a/common/military_industrial_organization/organizations/FBK_Organization.txt b/common/military_industrial_organization/organizations/FBK_Organization.txt
new file mode 100644
index 00000000000..2c6ffd9a5ec
--- /dev/null
+++ b/common/military_industrial_organization/organizations/FBK_Organization.txt
@@ -0,0 +1,305 @@
+########    ###    ##    ## ##    ##  ######  
+   ##      ## ##   ###   ## ##   ##  ##    ## 
+   ##     ##   ##  ####  ## ##  ##   ##       
+   ##    ##     ## ## ## ## #####     ######  
+   ##    ######### ##  #### ##  ##         ## 
+   ##    ##     ## ##   ### ##   ##  ##    ## 
+   ##    ##     ## ##    ## ##    ##  ######  
+
+FBK_advisor19_organization = {
+	name = FBK_advisor19
+	include = generic_mobile_tank_organization
+	icon = GFX_idea_FBK_advisor19
+			allowed = {
+				has_dlc = "Arms Against Tyranny"			
+				can_form_river_fed = yes
+			}
+			visible = {
+				owner = {
+					OR = {
+						original_tag = FBK
+						has_country_flag = RIV_annexed_FBK
+					}
+				}
+			}
+			available = {
+				owner = {
+					hidden_trigger = {
+						OR = {
+							original_tag = FBK
+							has_country_flag = RIV_annexed_FBK
+						}
+					}
+				}
+			}
+			initial_trait = {
+				organization_modifier = {
+					military_industrial_organization_research_bonus = 0.03
+				}
+			}
+		}
+		
+FBK_advisor20_organization = {
+	name = FBK_advisor20
+	include = generic_medium_tank_organization
+	icon = GFX_idea_FBK_advisor20
+			allowed = {
+				has_dlc = "Arms Against Tyranny"			
+				can_form_river_fed = yes
+			}
+			visible = {
+				owner = {
+					OR = {
+						original_tag = FBK
+						has_country_flag = RIV_annexed_FBK
+					}
+				}
+			}
+			available = {
+				owner = {
+					hidden_trigger = {
+						OR = {
+							original_tag = FBK
+							has_country_flag = RIV_annexed_FBK
+						}
+					}
+				}
+			}
+		}			
+
+ ######  ##     ## #### ########   ######  
+##    ## ##     ##  ##  ##     ## ##    ## 
+##       ##     ##  ##  ##     ## ##       
+ ######  #########  ##  ########   ######  
+      ## ##     ##  ##  ##              ## 
+##    ## ##     ##  ##  ##        ##    ## 
+ ######  ##     ## #### ##         ######
+
+ FBK_advisor28_organization = {
+	name = FBK_advisor28
+	include = generic_escort_ship_organization
+	icon = GFX_idea_FBK_advisor28
+			allowed = {
+				has_dlc = "Arms Against Tyranny"			
+				can_form_river_fed = yes
+			}
+			visible = {
+				owner = {
+					OR = {
+						original_tag = FBK
+						has_country_flag = RIV_annexed_FBK
+					}
+				}
+			}
+			available = {
+				owner = {
+					hidden_trigger = {
+						OR = {
+							original_tag = FBK
+							has_country_flag = RIV_annexed_FBK
+						}
+					}
+				}
+			}
+		}			
+			
+FBK_advisor29_organization = {
+	name = FBK_advisor29
+	include = generic_battle_line_ship_organization
+	icon = GFX_idea_FBK_advisor29
+			allowed = {
+				has_dlc = "Arms Against Tyranny"			
+				original_tag = FBK
+			}
+			available = {
+				owner = {
+					has_completed_focus = FBK_pirates
+				}
+			}
+		}
+
+FBK_advisor30_organization = {
+	name = FBK_advisor30
+	include = generic_raider_ship_organization
+	icon = GFX_idea_FBK_advisor30
+			allowed = {
+				has_dlc = "Arms Against Tyranny"			
+				original_tag = FBK
+			}
+			visible = {
+				owner = {
+					OR = {
+						original_tag = FBK
+						has_country_flag = RIV_annexed_FBK
+					}
+				}
+			}
+			available = {
+				hidden_trigger = {
+					owner = {
+						OR = {
+							original_tag = FBK
+							has_country_flag = RIV_annexed_FBK
+						}
+					}
+				}
+			}
+		}
+		
+
+ 
+ ########  ##          ###    ##    ## ########  ######  
+##     ## ##         ## ##   ###   ## ##       ##    ## 
+##     ## ##        ##   ##  ####  ## ##       ##       
+########  ##       ##     ## ## ## ## ######    ######  
+##        ##       ######### ##  #### ##             ## 
+##        ##       ##     ## ##   ### ##       ##    ## 
+##        ######## ##     ## ##    ## ########  ######
+
+FBK_advisor26_organization = {
+	name = FBK_advisor26
+	include = generic_light_aircraft_organization
+	icon = GFX_idea_FBK_advisor26
+			allowed = {
+				has_dlc = "Arms Against Tyranny"
+				can_form_river_fed = yes
+			}
+			visible = {
+				owner = {
+					OR = {
+						original_tag = FBK
+						has_country_flag = RIV_annexed_FBK
+					}
+				}
+			}
+			available = {
+				owner = {
+					hidden_trigger = {
+						OR = {
+							original_tag = FBK
+							has_country_flag = RIV_annexed_FBK
+						}
+					}
+				}
+			}
+		}			
+			
+FBK_advisor27_organization = {
+	name = FBK_advisor27
+	include = generic_medium_aircraft_organization
+	icon = GFX_idea_FBK_advisor27
+			allowed = {
+				has_dlc = "Arms Against Tyranny"	
+				can_form_river_fed = yes
+			}
+			visible = {
+				owner = {
+					OR = {
+						original_tag = FBK
+						has_country_flag = RIV_annexed_FBK
+					}
+				}
+			}
+			available = {
+				owner = {
+					hidden_trigger = {
+						OR = {
+							original_tag = FBK
+							has_country_flag = RIV_annexed_FBK
+						}
+					}
+				}
+			}
+		}			
+
+##     ##    ###    ######## ######## ########  #### ######## ##       
+###   ###   ## ##      ##    ##       ##     ##  ##  ##       ##       
+#### ####  ##   ##     ##    ##       ##     ##  ##  ##       ##       
+## ### ## ##     ##    ##    ######   ########   ##  ######   ##       
+##     ## #########    ##    ##       ##   ##    ##  ##       ##       
+##     ## ##     ##    ##    ##       ##    ##   ##  ##       ##       
+##     ## ##     ##    ##    ######## ##     ## #### ######## ########
+
+FBK_advisor21_organization = {
+	name = FBK_advisor21
+	include = generic_artillery_organization
+	icon = GFX_idea_FBK_advisor21
+			allowed = {
+				has_dlc = "Arms Against Tyranny"			
+				can_form_river_fed = yes
+			}
+			visible = {
+				owner = {
+					OR = {
+						original_tag = FBK
+						has_country_flag = RIV_annexed_FBK
+					}
+				}
+			}
+			available = {
+				owner = {
+					hidden_trigger = {
+						OR = {
+							original_tag = FBK
+							has_country_flag = RIV_annexed_FBK
+						}
+					}
+				}
+			}
+		}			
+	
+FBK_advisor22_organization = {
+	name = FBK_advisor22
+	include = generic_infantry_equipment_organization
+	icon = GFX_idea_FBK_advisor22
+			allowed = {
+				has_dlc = "Arms Against Tyranny"			
+				can_form_river_fed = yes
+			}
+			visible = {
+				owner = {
+					OR = {
+						original_tag = FBK
+						has_country_flag = RIV_annexed_FBK
+					}
+				}
+			}
+			available = {
+				owner = {
+					hidden_trigger = {
+						OR = {
+							original_tag = FBK
+							has_country_flag = RIV_annexed_FBK
+						}
+					}
+				}
+			}
+		}			
+	
+FBK_advisor23_organization = {
+	name = FBK_advisor23
+	include = generic_motorized_mechanized_organization
+	icon = GFX_idea_FBK_advisor23
+			allowed = {
+				can_form_river_fed = yes
+				has_dlc = "Arms Against Tyranny"				
+			}
+			visible = {
+				owner = {
+					OR = {
+						original_tag = FBK
+						has_country_flag = RIV_annexed_FBK
+					}
+				}
+			}
+			available = {
+				owner = {
+					hidden_trigger = {
+						OR = {
+							original_tag = FBK
+							has_country_flag = RIV_annexed_FBK
+						}
+					}
+				}
+			}
+		}	
\ No newline at end of file
diff --git a/common/military_industrial_organization/organizations/FEA_Organization.txt b/common/military_industrial_organization/organizations/FEA_Organization.txt
new file mode 100644
index 00000000000..923f803c524
--- /dev/null
+++ b/common/military_industrial_organization/organizations/FEA_Organization.txt
@@ -0,0 +1,252 @@
+########    ###    ##    ## ##    ##  ######  
+   ##      ## ##   ###   ## ##   ##  ##    ## 
+   ##     ##   ##  ####  ## ##  ##   ##       
+   ##    ##     ## ## ## ## #####     ######  
+   ##    ######### ##  #### ##  ##         ## 
+   ##    ##     ## ##   ### ##   ##  ##    ## 
+   ##    ##     ## ##    ## ##    ##  ######  
+
+FEA_Feat_company_14_organization = {
+	name = feat_company_14
+	include = generic_mobile_tank_organization
+	icon = GFX_idea_Feat_company_14
+			allowed = {
+				has_dlc = "Arms Against Tyranny"
+				original_tag = FEA
+			}
+			initial_trait = {
+				limit_to_equipment_type = { light_tank_chassis } 
+				equipment_bonus = {
+					hard_attack = 0.03
+				}
+			}
+		}	
+				
+				
+FEA_Feat_company_15_organization = {
+	name = feat_company_15
+	include = generic_medium_tank_organization
+	icon = GFX_idea_Feat_company_15
+			allowed = {
+				has_dlc = "Arms Against Tyranny"
+				original_tag = FEA
+			}
+			initial_trait = {
+				limit_to_equipment_type = { medium_tank_chassis } 
+				equipment_bonus = {
+					maximum_speed = 0.05
+					breakthrough = 0.03
+				}
+			}
+		}
+
+FEA_Feat_company_16_organization = {
+	name = feat_company_16
+	include = generic_heavy_tank_organization
+	icon = GFX_idea_Feat_company_16
+			allowed = {
+				has_dlc = "Arms Against Tyranny"
+				original_tag = FEA
+			}
+			initial_trait = {
+				limit_to_equipment_type = { heavy_tank_chassis } 
+				equipment_bonus = {
+					breakthrough = 0.03
+				}
+			}
+		}	
+
+ ######  ##     ## #### ########   ######  
+##    ## ##     ##  ##  ##     ## ##    ## 
+##       ##     ##  ##  ##     ## ##       
+ ######  #########  ##  ########   ######  
+      ## ##     ##  ##  ##              ## 
+##    ## ##     ##  ##  ##        ##    ## 
+ ######  ##     ## #### ##         ######  
+
+
+ FEA_feat_company_11_organization = {
+	name = feat_company_11
+	icon = GFX_idea_feat_company_11
+	allowed = {
+		original_tag = FEA
+		has_dlc = "Arms Against Tyranny"
+	}
+	include = generic_battle_line_ship_organization
+	initial_trait = {
+		equipment_bonus = {
+			lg_attack = 0.03
+			hg_attack = 0.03
+		}
+	}
+}
+
+FEA_feat_company_12_organization = {
+	name = feat_company_12
+	icon = GFX_idea_feat_company_12
+	allowed = {
+		original_tag = FEA
+		has_dlc = "Arms Against Tyranny"
+	}
+	available = {
+		owner = {
+			any_controlled_state_is_coastal = yes
+		}
+	}
+	include = generic_task_force_ship_organization
+	initial_trait = {
+		equipment_bonus = {
+			armor_value = 0.04
+			anti_air_attack = 0.03
+			surface_visibility = -0.05
+			naval_speed = 0.02
+		}
+	}
+}
+
+FEA_feat_company_13_organization = {
+	name = feat_company_13
+	icon = GFX_idea_feat_company_13
+	allowed = {
+		original_tag = FEA
+		has_dlc = "Arms Against Tyranny"
+	}
+	available = {
+		owner = {
+			any_controlled_state_is_coastal = yes
+		}
+	}
+	include = generic_escort_ship_organization
+	initial_trait = {
+		equipment_bonus = {
+			defense = -0.03
+			build_cost_ic = -0.05
+		}
+	}
+}
+
+ 
+ ########  ##          ###    ##    ## ########  ######  
+##     ## ##         ## ##   ###   ## ##       ##    ## 
+##     ## ##        ##   ##  ####  ## ##       ##       
+########  ##       ##     ## ## ## ## ######    ######  
+##        ##       ######### ##  #### ##             ## 
+##        ##       ##     ## ##   ### ##       ##    ## 
+##        ######## ##     ## ##    ## ########  ######
+
+FEA_Feat_company_8_organization = {
+	name = feat_company_8
+	include = generic_light_aircraft_organization
+	icon = GFX_idea_Feat_company_8
+			allowed = {
+				has_dlc = "Arms Against Tyranny"
+				original_tag = FEA
+			}
+		}
+
+FEA_Feat_company_9_organization = {
+	name = feat_company_9
+	include = generic_heavy_aircraft_organization
+	icon = GFX_idea_Feat_company_9
+			allowed = {
+				has_dlc = "Arms Against Tyranny"
+				original_tag = FEA
+			}
+		}	
+
+FEA_Feat_company_10_organization = {
+	name = feat_company_10
+	include = generic_naval_aircraft_organization
+	icon = GFX_idea_Feat_company_10
+			allowed = {
+				has_dlc = "Arms Against Tyranny"
+				original_tag = FEA
+			}
+		}
+
+
+##     ##    ###    ######## ######## ########  #### ######## ##       
+###   ###   ## ##      ##    ##       ##     ##  ##  ##       ##       
+#### ####  ##   ##     ##    ##       ##     ##  ##  ##       ##       
+## ### ## ##     ##    ##    ######   ########   ##  ######   ##       
+##     ## #########    ##    ##       ##   ##    ##  ##       ##       
+##     ## ##     ##    ##    ##       ##    ##   ##  ##       ##       
+##     ## ##     ##    ##    ######## ##     ## #### ######## ########
+
+FEA_Feat_company_1_organization = {
+	name = feat_company_1
+	include = generic_artillery_organization
+	icon = GFX_idea_Feat_company_1
+			allowed = {
+				has_dlc = "Arms Against Tyranny"
+				original_tag = FEA
+			}
+			initial_trait = {
+				limit_to_equipment_type = { artillery_equipment }
+
+				equipment_bonus = {
+					soft_attack = 0.02
+				}
+			}
+		}	
+
+FEA_feat_company_2_and_3_organization = { # merged
+	name = feat_company_2_and_3
+	icon = GFX_idea_feat_company_3
+	include = generic_infantry_equipment_organization
+	allowed = {
+		original_tag = FEA
+		has_dlc = "Arms Against Tyranny"
+	}
+	add_trait = { 
+		token = feat_company_2_trait
+		name = feat_company_2
+		icon = GFX_generic_mio_department_icon_ship_general_engine
+		special_trait_background = yes
+
+		position = { x=1 y=0 }
+		relative_position_id = generic_mio_trait_drum_pattern_sights
+
+		mutually_exclusive = { feat_company_3_trait }
+		
+		equipment_bonus = {
+			breakthrough = 0.03
+			soft_attack = 0.02
+			defense = -0.02
+		}
+	}
+
+	add_trait = { 
+		token = feat_company_3_trait
+		name = feat_company_3
+		icon = generic_mio_department_icon_infantry_production
+		special_trait_background = yes
+
+		mutually_exclusive = { feat_company_2_trait }
+		
+
+		position = { x=3 y=0 }
+		relative_position_id = generic_mio_trait_drum_pattern_sights
+
+		equipment_bonus = {
+			soft_attack = 0.03
+			hard_attack = 0.02
+		}
+	}
+}
+	FEA_Feat_company_4_organization = {
+	name = feat_company_4
+	include = generic_motorized_mechanized_organization
+	icon = GFX_idea_Feat_company_4
+			allowed = {
+				has_dlc = "Arms Against Tyranny"
+				original_tag = FEA
+			}
+			initial_trait = {
+				limit_to_equipment_type = { motorized_equipment }
+				equipment_bonus = {
+					defense = 0.02
+					maximum_speed = 0.03
+				}
+			}
+		}
\ No newline at end of file
diff --git a/common/military_industrial_organization/organizations/FEZ_organization.txt b/common/military_industrial_organization/organizations/FEZ_organization.txt
new file mode 100644
index 00000000000..6b369383cfe
--- /dev/null
+++ b/common/military_industrial_organization/organizations/FEZ_organization.txt
@@ -0,0 +1,303 @@
+
+FEZ_infantry_equiptment_advisor_organization = {
+	name = FEZ_infantry_equiptment_advisor
+	icon = GFX_idea_FEZ_Fabriquenationalefezzeran
+	include = generic_infantry_equipment_organization
+	allowed = {
+		OR = {
+			original_tag = FEZ
+			original_tag = TRD
+			original_tag = JES
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = FEZ
+				owns_state = 390
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 390
+		}
+	}
+	initial_trait = {
+		equipment_bonus = {
+			defense = 0.05
+		}
+	}
+}
+
+FEZ_artillery_advisor_organization = {
+	name = FEZ_artillery_advisor
+	icon = GFX_idea_FEZ_artillery_advisor
+	include = generic_artillery_organization
+	allowed = {
+		OR = {
+			original_tag = FEZ
+			original_tag = TRD
+			original_tag = JES
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = FEZ
+				owns_state = 390
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 390
+		}
+	}
+	initial_trait = {
+		equipment_bonus = {
+			soft_attack = 0.05
+		}
+	}
+}
+
+FEZ_motorized_equiptment_advisor_organization = {
+	name = FEZ_motorized_equiptment_advisor
+	icon = GFX_idea_FEZ_motorized_equiptment_advisor
+	include = generic_motorized_mechanized_organization
+	allowed = {
+		OR = {
+			original_tag = FEZ
+			original_tag = TRD
+			original_tag = JES
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = FEZ
+				owns_state = 390
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 390
+		}
+	}
+	initial_trait = {
+		equipment_bonus = {
+			reliability = 0.05
+		}
+	}
+}
+FEZ_light_aircraft_manufacturer_advisor_organization = {
+	name = FEZ_light_aircraft_manufacturer_advisor
+	icon = GFX_idea_FEZ_light_aircraft_manufacturer_advisor
+	include = generic_light_aircraft_organization
+	allowed = {
+		OR = {
+			original_tag = FEZ
+			original_tag = TRD
+			original_tag = JES
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = FEZ
+				owns_state = 390
+			}
+		}
+	}
+}
+
+FEZ_medium_aircraft_manufacturer_advisor_organization = {
+	name = FEZ_medium_aircraft_manufacturer_advisor
+	icon = GFX_idea_FEZ_medium_aircraft_manufacturer_advisor
+	include = generic_medium_aircraft_organization
+	allowed = {
+		OR = {
+			original_tag = FEZ
+			original_tag = TRD
+			original_tag = JES
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = FEZ
+				owns_state = 390
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 390
+		}
+	}
+}
+
+FEZ_naval_aircraft_manufacturer_advisor_organization = {
+	name = FEZ_naval_aircraft_manufacturer_advisor
+	icon = GFX_idea_FEZ_naval_aircraft_manufacturer_advisor
+	include = generic_naval_aircraft_organization
+	allowed = {
+		OR = {
+			original_tag = FEZ
+			original_tag = TRD
+			original_tag = JES
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = FEZ
+				owns_state = 390
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 390
+		}
+	}
+}
+FEZ_surface_fleet_manufacturer_advisor_organization = {
+	name = FEZ_surface_fleet_manufacturer_advisor
+	icon = GFX_idea_FEZ_surface_fleet_manufacturer_advisor
+	allowed = {
+		OR = {
+			original_tag = FEZ
+			original_tag = TRD
+			original_tag = JES
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = FEZ
+				owns_state = 390
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 390
+			any_controlled_state_is_coastal = yes
+		}
+	}
+	include = generic_battle_line_ship_organization
+	initial_trait = {
+		equipment_bonus = {
+			lg_attack = 0.05
+			hg_attack = 0.05
+		}
+	}
+}
+
+FEZ_submarine_manufacturer_advisor_organization = {
+	name = FEZ_submarine_manufacturer_advisor
+	icon = GFX_idea_FEZ_submarine_manufacturer_advisor
+	include = generic_submarine_organization
+	allowed = {
+		OR = {
+			original_tag = FEZ
+			original_tag = TRD
+			original_tag = JES
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = FEZ
+				owns_state = 390
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 390
+			any_controlled_state_is_coastal = yes
+		}
+	}
+	initial_trait = {
+		equipment_bonus = {
+			build_cost_ic = -0.05
+		}
+	}
+}
+FEZ_fast_tank_manufacturer_advisor_organization = {
+	name = FEZ_fast_tank_manufacturer_advisor
+	icon = GFX_idea_FEZ_fast_tank_manufacturer_advisor
+	allowed = {
+		OR = {
+			original_tag = FEZ
+			original_tag = TRD
+			original_tag = JES
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = FEZ
+				owns_state = 390
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 390
+		}
+	}
+	initial_trait = {
+		limit_to_equipment_type = { light_tank_chassis } 
+		equipment_bonus = {
+			breakthrough = 0.05
+		}
+	}
+
+	include = generic_mobile_tank_organization
+}
+
+FEZ_medium_tank_manufacturer_advisor_organization = {
+	name = FEZ_medium_tank_manufacturer_advisor
+	icon = GFX_idea_FEZ_medium_tank_manufacturer_advisor
+	allowed = {
+		OR = {
+			original_tag = FEZ
+			original_tag = TRD
+			original_tag = JES
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = FEZ
+				owns_state = 390
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 390
+		}
+	}
+	initial_trait = {
+		limit_to_equipment_type = { medium_tank_chassis } 
+		equipment_bonus = {
+			soft_attack = 0.05
+		}
+	}
+	include = generic_medium_tank_organization
+}
\ No newline at end of file
diff --git a/common/military_industrial_organization/organizations/FIR_organization.txt b/common/military_industrial_organization/organizations/FIR_organization.txt
new file mode 100644
index 00000000000..698a5ec47bc
--- /dev/null
+++ b/common/military_industrial_organization/organizations/FIR_organization.txt
@@ -0,0 +1,253 @@
+FIR_advisor19_organization = {
+	name = FIR_advisor19
+	icon = GFX_idea_FIR_advisor19
+	include = generic_mobile_tank_organization
+	allowed = {
+		can_form_river_fed = yes
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = FIR
+				has_country_flag = RIV_annexed_FIR
+			}
+		}
+	}
+	available = {
+		owner = {
+			hidden_trigger = {
+				OR = {
+					original_tag = FIR
+					has_country_flag = RIV_annexed_FIR
+				}
+			}
+		}
+	}
+	initial_trait = {
+		organization_modifier = {
+			military_industrial_organization_research_bonus = 0.03
+		}
+	}
+}
+
+FIR_advisor20_organization = {
+	name = FIR_advisor20
+	icon = GFX_idea_FIR_advisor20
+	include = generic_medium_tank_organization
+	allowed = {
+		can_form_river_fed = yes
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = FIR
+				has_country_flag = RIV_annexed_FIR
+			}
+		}
+	}
+	available = {
+		owner = {
+			hidden_trigger = {
+				OR = {
+					original_tag = FIR
+					has_country_flag = RIV_annexed_FIR
+				}
+			}
+		}
+	}
+}
+FIR_advisor21_organization = {
+	name = FIR_advisor21
+	icon = GFX_idea_FIR_advisor21
+	include= generic_artillery_organization
+	allowed = {
+		can_form_river_fed = yes
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = FIR
+				has_country_flag = RIV_annexed_FIR
+			}
+		}
+	}
+	available = {
+		owner = {
+			hidden_trigger = {
+				OR = {
+					original_tag = FIR
+					has_country_flag = RIV_annexed_FIR
+				}
+			}
+		}
+	}
+}
+
+FIR_advisor22_organization = {
+	name = FIR_advisor22
+	icon = GFX_idea_FBK_advisor22
+	include = generic_infantry_equipment_organization
+	allowed = {
+		can_form_river_fed = yes
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = FIR
+				has_country_flag = RIV_annexed_FIR
+			}
+		}
+	}
+	available = {
+		owner = {
+			hidden_trigger = {
+				OR = {
+					original_tag = FIR
+					has_country_flag = RIV_annexed_FIR
+				}
+			}
+		}
+	}
+}
+
+FIR_advisor23_organization = {
+	name = FIR_advisor23
+	icon = GFX_idea_FIR_advisor23
+	include = generic_motorized_mechanized_organization
+	allowed = {
+		can_form_river_fed = yes
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = FIR
+				has_country_flag = RIV_annexed_FIR
+			}
+		}
+	}
+	available = {
+		owner = {
+			hidden_trigger = {
+				OR = {
+					original_tag = FIR
+					has_country_flag = RIV_annexed_FIR
+				}
+			}
+		}
+	}
+}
+FIR_advisor26_organization = {
+	name = FIR_advisor26
+	icon = GFX_idea_FIR_advisor26
+	include = generic_light_aircraft_organization
+	allowed = {
+		can_form_river_fed = yes
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = FIR
+				has_country_flag = RIV_annexed_FIR
+			}
+		}
+	}
+	available = {
+		owner = {
+			hidden_trigger = {
+				OR = {
+					original_tag = FIR
+					has_country_flag = RIV_annexed_FIR
+				}
+			}
+		}
+	}
+}
+
+FIR_advisor27_organization = {
+	name = FIR_advisor27
+	icon = GFX_idea_FIR_advisor27
+	include = generic_medium_aircraft_organization
+	allowed = {
+		can_form_river_fed = yes
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = FIR
+				has_country_flag = RIV_annexed_FIR
+			}
+		}
+	}
+	available = {
+		owner = {
+			hidden_trigger = {
+				OR = {
+					original_tag = FIR
+					has_country_flag = RIV_annexed_FIR
+				}
+			}
+		}
+	}
+}
+FIR_advisor28_organization = {
+	name = FIR_advisor28
+	icon = GFX_idea_FIR_advisor28
+	include = generic_escort_ship_organization
+	allowed = {
+		can_form_river_fed = yes
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = FIR
+				has_country_flag = RIV_annexed_FIR
+			}
+		}
+	}
+	available = {
+		owner = {
+			hidden_trigger = {
+				OR = {
+					original_tag = FIR
+					has_country_flag = RIV_annexed_FIR
+				}
+			}
+		}
+	}
+}
+
+FIR_advisor29_organization = {
+	name = FIR_advisor29
+	icon = GFX_idea_FIR_advisor29
+	include = generic_battle_line_ship_organization
+	allowed = {
+		can_form_river_fed = yes
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = FIR
+				has_country_flag = RIV_annexed_FIR
+			}
+		}
+	}
+	available = {
+		owner = {
+			hidden_trigger = {
+				OR = {
+					original_tag = FIR
+					has_country_flag = RIV_annexed_FIR
+				}
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/common/military_industrial_organization/organizations/FLO_organization.txt b/common/military_industrial_organization/organizations/FLO_organization.txt
new file mode 100644
index 00000000000..4c3f11b6092
--- /dev/null
+++ b/common/military_industrial_organization/organizations/FLO_organization.txt
@@ -0,0 +1,191 @@
+FLO_mistral_organization = {
+	name = FLO_mistral
+	icon = GFX_idea_JER_mistral
+	include = generic_raider_ship_organization
+	allowed = {
+		original_tag = FLO
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			has_completed_focus = FLO_long_live_the_king
+		}
+		JER = {
+			exists = no
+		}
+	}
+	initial_trait = {
+		limit_to_equipment_type = { ship_hull_carrier ship_hull_heavy } 
+		equipment_bonus = {
+			armor_value = 0.05
+			anti_air_attack = 0.05
+			surface_visibility = -0.05
+		}
+	}
+}
+FLO_loup_shipping_organization = {
+	name = FLO_loup_shipping
+	icon = GFX_idea_JER_loup_shipping
+	include = generic_escort_ship_organization
+	allowed = {
+		original_tag = FLO
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			has_completed_focus = FLO_long_live_the_king
+		}
+		JER = {
+			exists = no
+		}
+	}
+	initial_trait = {
+		limit_to_equipment_type = { ship_hull_light ship_hull_submarine } 
+		equipment_bonus = {
+			build_cost_ic = -0.05
+		}
+	}
+}
+FLO_medium_tank_manufacturer_organization = {
+	name = FLO_medium_tank_manufacturer
+	include = generic_medium_tank_organization
+	icon = GFX_idea_FLO_medium_tank_manufacturer
+	allowed = {
+		original_tag = FLO
+		has_dlc = "Arms Against Tyranny"
+	}
+}
+FLO_light_tank_manufacturer_organization = {
+	name = FLO_light_tank_manufacturer
+	include = generic_mobile_tank_organization
+	icon = GFX_idea_FLO_light_tank_manufacturer
+	allowed = {
+		original_tag = FLO
+		has_dlc = "Arms Against Tyranny"
+	}
+}
+FLO_light_aircraft_concern_organization = {
+	name = FLO_light_aircraft_concern
+	include = generic_light_aircraft_organization
+	icon = GFX_idea_FLO_light_aircraft_concern
+	allowed = {
+		original_tag = FLO
+		has_dlc = "Arms Against Tyranny"
+	}
+}
+FLO_medium_aircraft_concern_organization = {
+	name = FLO_medium_aircraft_concern
+	include = generic_medium_aircraft_organization
+	icon = GFX_idea_FLO_medium_aircraft_concern
+	allowed = {
+		original_tag = FLO
+		has_dlc = "Arms Against Tyranny"
+	}
+}
+FLO_heavy_aircraft_concern_organization = {
+	name = FLO_heavy_aircraft_concern
+	include = generic_heavy_aircraft_organization
+	icon = GFX_idea_FLO_heavy_aircraft_concern
+	allowed = {
+		original_tag = FLO
+		has_dlc = "Arms Against Tyranny"
+	}
+}
+FLO_tigerdale_FLO_organization = {
+	name = tigerdale_FLO
+	include = generic_infantry_equipment_organization
+	icon = GFX_idea_TRD_tigerdale
+	allowed = {
+		original_tag = FLO
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			has_completed_focus = FLO_skyfall_branch_offices
+			has_government = neutrality
+		}
+		TRD = {
+			exists = yes
+		}
+	}
+	initial_trait = {
+		limit_to_equipment_type = { infantry_equipment magical_equipment } 
+		equipment_bonus = {
+			defense = 0.05
+		}
+		organization_modifier = {
+			military_industrial_organization_research_bonus = 0.05
+		}
+	}
+}
+FLO_manufacture_aquileia_FLO_organization = {
+	name = manufacture_aquileia_FLO
+	include = generic_infantry_equipment_organization
+	icon = GFX_idea_JER_manufacture_aquileia
+	allowed = {
+		original_tag = FLO
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				AND = {
+					has_completed_focus = FLO_cooperate_with_companies
+					has_government = neutrality
+	
+					JER = {
+						exists = yes
+					}
+				}
+				AND = {		
+					JER = {
+						exists = no
+					}
+					has_completed_focus = FLO_long_live_the_king
+				}
+			}
+		}
+	}
+	initial_trait = {
+		limit_to_equipment_type = { infantry_equipment magical_equipment } 
+		equipment_bonus = {
+			soft_attack = 0.05
+		}
+		organization_modifier = {
+			military_industrial_organization_research_bonus = 0.05
+		}
+	}
+}
+FLO_arty_manufacturer_organization = {
+	name = FLO_arty_manufacturer
+	include = generic_artillery_organization
+	icon = GFX_idea_FLO_arty_manufacturer
+	allowed = {
+		original_tag = FLO
+		has_dlc = "Arms Against Tyranny"
+	}
+}
+FLO_mot_manufacturer_organization = {
+	name = FLO_mot_manufacturer
+	include = generic_motorized_mechanized_organization
+	icon = GFX_idea_FLO_mot_manufacturer
+	allowed = {
+		original_tag = FLO
+		has_dlc = "Arms Against Tyranny"
+	}
+	initial_trait = {
+		limit_to_equipment_type = { motorized_equipment } 
+		equipment_bonus = {
+			build_cost_ic = -0.15
+		}
+	}
+}
+FLO_rifle_manufacturer_organization = {
+	name = FLO_rifle_manufacturer
+	include = generic_infantry_equipment_organization
+	icon = FLO_rifle_manufacturer
+	allowed = {
+		original_tag = FLO
+		has_dlc = "Arms Against Tyranny"
+	}
+}
diff --git a/common/military_industrial_organization/organizations/FRE_organization.txt b/common/military_industrial_organization/organizations/FRE_organization.txt
new file mode 100644
index 00000000000..fa4029ec2b9
--- /dev/null
+++ b/common/military_industrial_organization/organizations/FRE_organization.txt
@@ -0,0 +1,156 @@
+#####################
+
+###  ##  #  # # #  ## 
+ #  #  # ## # # # #   
+ #  #### # ## ##   #  
+ #  #  # #  # # #   # 
+ #  #  # #  # # # ## 
+
+ #################### 
+
+FRE_tank_manufacturer_organization = {
+	
+	name = FRE_tank_manufacturer
+	icon = GFX_idea_FRE_pjuw
+	include = generic_tank_organization
+	
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		can_form_river_fed = yes
+	}
+	
+	visible = {
+		FROM = {
+			OR = {
+				original_tag = FRE
+				has_country_flag = RIV_annexed_FRE
+			}
+		}
+	}
+			
+}
+
+#####################
+
+ ## #  # ### ###   ## 
+#   #  #  #  #  # #   
+ #  ####  #  ###   #  
+  # #  #  #  #      # 
+##  #  # ### #    ##  
+ 
+#####################
+
+
+FRE_naval_manufacturer_organization = {
+
+	name = FRE_naval_manufacturer
+	icon = GFX_idea_FRE_naval_manufacturer
+	include = generic_escort_ship_organization
+	
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		can_form_river_fed = yes
+	}
+	
+	visible = {
+		FROM = {
+			OR = {
+				original_tag = FRE
+				has_country_flag = RIV_annexed_FRE
+			}
+		}
+	}
+}
+
+
+###########################
+
+###  #    ##  #  # ###  ## 
+#  # #   #  # ## # #   #   
+###  #   #### # ## ##   #  
+#    #   #  # #  # #     # 
+#    ### #  # #  # ### ##  
+
+###########################
+
+
+FRE_fighter_industry_organization = {
+
+	name = FRE_fighter_industry
+	icon = GFX_idea_FRE_fighter_industry
+	include = generic_light_aircraft_organization
+	
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		can_form_river_fed = yes
+	}
+	
+	visible = {
+		FROM = {
+			OR = {
+				AND = {
+					original_tag = FRE
+					has_completed_focus = FRE_start_fighter_industry
+				}
+				has_country_flag = RIV_annexed_FRE
+			}
+		}
+	}
+}
+
+FRE_bomber_industry_organization = {
+
+	name = FRE_bomber_industry
+	icon = GFX_idea_FRE_bomber_industry
+	include = generic_medium_aircraft_organization
+	
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		can_form_river_fed = yes
+	}
+	
+	visible = {
+		FROM = {
+			OR = {
+				AND = {
+					original_tag = FRE
+					has_completed_focus = FRE_start_bomber_industry
+				}
+				has_country_flag = RIV_annexed_FRE
+			}
+		}
+	}
+}
+
+
+################################### 
+
+#   #  ##  ### ### ###  ### ### #   
+## ## #  #  #  #   #  #  #  #   #   
+# # # ####  #  ##  ###   #  ##  #   
+#   # #  #  #  #   #  #  #  #   #   
+#   # #  #  #  ### #  # ### ### ### 
+
+
+###################################
+
+FRE_infantry_equipment_manufacturer_organization = {
+
+	name = FRE_infantry_equipment_manufacturer
+	icon = GFX_idea_FRE_infantry_equipment_manufacturer
+	include = generic_infantry_equipment_organization
+	
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		can_form_river_fed = yes
+	}
+	
+	visible = {
+		FROM = {
+			OR = {
+				original_tag = FRE
+				has_country_flag = RIV_annexed_FRE
+			}
+		}
+	}
+}
diff --git a/common/military_industrial_organization/organizations/FRN_organization.txt b/common/military_industrial_organization/organizations/FRN_organization.txt
new file mode 100644
index 00000000000..ff63e63afa3
--- /dev/null
+++ b/common/military_industrial_organization/organizations/FRN_organization.txt
@@ -0,0 +1,225 @@
+#####################
+
+###  ##  #  # # #  ## 
+ #  #  # ## # # # #   
+ #  #### # ## ##   #  
+ #  #  # #  # # #   # 
+ #  #  # #  # # # ## 
+
+ #################### 
+
+FRN_light_tank_manufacturer_organization = {
+	
+	name = FRN_light_tank_manufacturer
+	icon = GFX_idea_FRN_light_tank_manufacturer
+	include = generic_mobile_tank_organization
+	
+	allowed = {
+		original_tag = FRN 
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	available = {
+		owner = {
+			owns_state = 481
+			has_completed_focus = FRN_tractor_factories
+		}
+	}
+	initial_trait = {
+		organization_modifier = {
+			military_industrial_organization_research_bonus = 0.05
+		}
+	}
+
+}
+
+FRN_infantry_tank_manufacturer_organization = {
+		
+	name = FRN_infantry_tank_manufacturer
+	icon = GFX_idea_FRN_infantry_tank_manufacturer
+	include = generic_infantry_tank_organization
+	
+	allowed = {
+		OR = {
+			original_tag = FRN 
+			original_tag = WNG 
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = FRN
+				owns_state = 515
+			}
+		}
+	}
+	available = {
+		FROM = {
+			owns_state = 515
+		}
+	}
+}
+
+#####################
+
+ ## #  # ### ###   ## 
+#   #  #  #  #  # #   
+ #  ####  #  ###   #  
+  # #  #  #  #      # 
+##  #  # ### #    ##  
+ 
+#####################
+
+
+
+###########################
+
+###  #    ##  #  # ###  ## 
+#  # #   #  # ## # #   #   
+###  #   #### # ## ##   #  
+#    #   #  # #  # #     # 
+#    ### #  # #  # ### ##  
+
+###########################
+
+
+FRN_cas_designer_organization = {
+			
+	name = FRN_cas_designer
+	icon = GFX_idea_FRN_cas_designer
+	include = generic_cas_aircraft_organization
+	
+	allowed = {
+		OR = {
+			original_tag = FRN 
+			original_tag = WNG 
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = FRN
+				owns_state = 515
+			}
+		}
+	}
+	available = {
+		FROM = {
+			owns_state = 515
+		}
+	}
+}
+
+FRN_fuel_designer_organization = {
+				
+	name = FRN_fuel_designer
+	icon = GFX_idea_FRN_fuel_designer
+	include = generic_range_focused_aircraft_organization
+	
+	allowed = {
+		OR = {
+			original_tag = FRN 
+			original_tag = WNG 
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = FRN
+				owns_state = 481
+			}
+		}
+	}
+	available = {
+		FROM = {
+			owns_state = 481 
+		}
+	}
+}
+
+
+################################### 
+
+#   #  ##  ### ### ###  ### ### #   
+## ## #  #  #  #   #  #  #  #   #   
+# # # ####  #  ##  ###   #  ##  #   
+#   # #  #  #  #   #  #  #  #   #   
+#   # #  #  #  ### #  # ### ### ### 
+
+
+###################################
+
+FRN_greda_organization = {
+					
+	name = FRN_greda
+	icon = GFX_idea_WNG_greda
+	include = generic_artillery_organization
+	
+	allowed = {
+		original_tag = FRN 
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	available = {
+		FROM = {
+			has_country_flag = FRN_arms_contract
+		}
+	}
+}
+
+FRN_sup_eq_design_organization = {
+					
+	name = FRN_sup_eq_design
+	icon = GFX_idea_FRN_sup_eq_design
+	include = generic_support_equipment_organization
+	
+	allowed = {
+		OR = {
+			original_tag = FRN 
+			original_tag = WNG 
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	available = {
+		FROM = {
+			owns_state = 515
+			
+		}
+	}
+	initial_trait = {
+		equipment_bonus = {
+			build_cost_ic = -0.1
+		}
+	}
+}
+
+FRN_SPA_organization = {
+					
+	name = FRN_SPA
+	icon = GFX_idea_FRN_SPA
+	include = generic_motorized_mechanized_organization
+	
+	allowed = {
+		OR = {
+			original_tag = FRN 
+			original_tag = WNG 
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	available = {
+		FROM = {
+			owns_state = 515
+		}
+	}
+	initial_trait = {
+		limit_to_equipment_type = { motorized_equipment }
+		equipment_bonus = {
+			maximum_speed = 0.1
+		}
+	}
+}
diff --git a/common/military_industrial_organization/organizations/GFF_organization.txt b/common/military_industrial_organization/organizations/GFF_organization.txt
new file mode 100644
index 00000000000..e430175b52a
--- /dev/null
+++ b/common/military_industrial_organization/organizations/GFF_organization.txt
@@ -0,0 +1,75 @@
+#####################
+
+###  ##  #  # # #  ## 
+ #  #  # ## # # # #   
+ #  #### # ## ##   #  
+ #  #  # #  # # #   # 
+ #  #  # #  # # # ## 
+
+ #################### 
+
+
+
+#####################
+
+ ## #  # ### ###   ## 
+#   #  #  #  #  # #   
+ #  ####  #  ###   #  
+  # #  #  #  #      # 
+##  #  # ### #    ##  
+ 
+#####################
+
+
+
+###########################
+
+###  #    ##  #  # ###  ## 
+#  # #   #  # ## # #   #   
+###  #   #### # ## ##   #  
+#    #   #  # #  # #     # 
+#    ### #  # #  # ### ##  
+
+###########################
+
+
+
+################################### 
+
+#   #  ##  ### ### ###  ### ### #   
+## ## #  #  #  #   #  #  #  #   #   
+# # # ####  #  ##  ###   #  ##  #   
+#   # #  #  #  #   #  #  #  #   #   
+#   # #  #  #  ### #  # ### ### ### 
+
+
+###################################
+
+
+GFF_infantry_equipment_manufacturer_organization = {
+	
+	name = GFF_infantry_equipment_manufacturer
+	icon = GFX_idea_GFF_infantry_equipment_manufacturer
+	include = generic_infantry_equipment_organization
+	allowed = {
+		OR = {
+			original_tag = GRF 
+			original_tag = GFF 
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	available = {
+		FROM = {
+			owns_state = 281 
+		}
+	}
+	visible = {
+		FROM = {
+			OR = {
+				original_tag = GFF 
+				owns_state = 281 
+			}
+		}
+	}
+	
+}
diff --git a/common/military_industrial_organization/organizations/GRF_organization.txt b/common/military_industrial_organization/organizations/GRF_organization.txt
new file mode 100644
index 00000000000..0f9edf7d17b
--- /dev/null
+++ b/common/military_industrial_organization/organizations/GRF_organization.txt
@@ -0,0 +1,351 @@
+#####################
+
+###  ##  #  # # #  ## 
+ #  #  # ## # # # #   
+ #  #### # ## ##   #  
+ #  #  # #  # # #   # 
+ #  #  # #  # # # ## 
+
+ #################### 
+
+GRF_ironwheels_organization = {
+	
+	name = ironwheels
+	icon = GFX_idea_GRF_ironwheels
+	include = generic_mobile_tank_organization
+	allowed = {
+		OR = {
+			original_tag = GRF 
+			original_tag = GFF 
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	available = {
+		FROM = {
+			if = {
+				limit =  { original_tag = GFF }
+
+				OR = {
+					owns_state = 243
+					is_in_faction_with = GRF
+					is_subject_of = GRF
+				}
+			}
+		}
+	}
+	initial_trait = {
+		organization_modifier = {
+			military_industrial_organization_research_bonus = 0.03
+		}
+	}
+}
+
+GRF_starpoint_organization = {
+	name = starpoint
+	icon = GFX_idea_GRF_starpoint
+	include = generic_medium_tank_organization
+	allowed = {
+		OR = {
+			original_tag = GRF 
+			original_tag = GFF 
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	available = {
+		FROM = {
+			if = {
+				limit =  { original_tag = GFF }
+
+				OR = {
+					owns_state = 243
+					is_in_faction_with = GRF
+					is_subject_of = GRF
+				}
+			}
+		}
+	}
+}
+
+GRF_united_tank_corporation_organization = {
+	name = GRF_united_tank_corporation
+	icon = GFX_idea_GRF_united_tank_corporation
+	include = generic_heavy_tank_organization
+	allowed = {
+		OR = {
+			original_tag = GRF 
+			original_tag = GFF 
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	available = {
+		FROM = {
+			if = {
+				limit =  { original_tag = GFF }
+
+				OR = {
+					owns_state = 243
+					is_in_faction_with = GRF
+					is_subject_of = GRF
+				}
+			}
+		}
+	}
+}
+
+#####################
+
+ ## #  # ### ###   ## 
+#   #  #  #  #  # #   
+ #  ####  #  ###   #  
+  # #  #  #  #      # 
+##  #  # ### #    ##  
+ 
+#####################
+
+
+GRF_vanguard_organization = {
+	name = vanguard
+	icon = GFX_idea_GRF_vanguard
+	include = generic_escort_ship_organization
+	allowed = {
+		OR = {
+			original_tag = GRF 
+			original_tag = GFF 
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	available = {
+		FROM = {
+			owns_state = 243 
+		}
+	}
+}
+
+GRF_felicity_organization = {
+	name = felicity
+	icon = GFX_idea_GRF_felicity
+	include = generic_raider_ship_organization
+	allowed = {
+		OR = {
+			original_tag = GRF 
+			original_tag = GFF 
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	available = {
+		FROM = {
+			owns_state = 243 
+		}
+	}
+}
+
+GRF_grf_united_shipbuilding_corporation_organization = {
+	name = grf_united_shipbuilding_corporation
+	icon = GFX_idea_GRF_united_shipbuilding_corporation
+	include = generic_battle_line_ship_organization
+	allowed = {
+		original_tag = GRF 
+		has_dlc = "Arms Against Tyranny"
+	}
+	available = {
+		FROM = {
+			owns_state = 243 
+			has_completed_focus = GRF_massive_expansion
+		}
+		
+	}
+	initial_trait = {
+		organization_modifier = {
+			military_industrial_organization_design_team_assign_cost = -0.67
+		}
+		production_bonus = {
+			production_capacity_factor = 0.05 
+		}
+	}
+}
+
+
+###########################
+
+###  #    ##  #  # ###  ## 
+#  # #   #  # ## # #   #   
+###  #   #### # ## ##   #  
+#    #   #  # #  # #     # 
+#    ### #  # #  # ### ##  
+
+###########################
+
+
+GRF_yellow_a_organization = {
+	name = yellow_a
+	icon = GFX_idea_GRF_yellow_a
+	include = generic_light_aircraft_organization
+	allowed = {
+		OR = {
+			original_tag = GRF 
+			original_tag = GFF 
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	available = {
+		FROM = {
+			if = {
+				limit =  { original_tag = GFF }
+
+				OR = {
+					owns_state = 243
+					is_in_faction_with = GRF
+					is_subject_of = GRF
+				}
+			}
+		}
+	}
+}
+
+GRF_blue_a_organization = {
+	name = blue_a
+	icon = GFX_idea_GRF_blue_a
+	include = generic_medium_aircraft_organization
+	allowed = {
+		OR = {
+			original_tag = GRF 
+			original_tag = GFF 
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	available = {
+		FROM = {
+			if = {
+				limit =  { original_tag = GFF }
+
+				OR = {
+					owns_state = 243
+					is_in_faction_with = GRF
+					is_subject_of = GRF
+				}
+			}
+		}
+	}
+}
+
+
+################################### 
+
+#   #  ##  ### ### ###  ### ### #   
+## ## #  #  #  #   #  #  #  #   #   
+# # # ####  #  ##  ###   #  ##  #   
+#   # #  #  #  #   #  #  #  #   #   
+#   # #  #  #  ### #  # ### ### ### 
+
+
+###################################
+
+
+GRF_talon_organization = {
+	name = talon
+	icon = GFX_idea_GRF_talon
+	include = generic_infantry_equipment_organization
+	allowed = {
+		original_tag = GRF 
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		FROM = {
+			NOT = {
+				OR = {
+					has_government = communism
+					has_government = democratic
+				}
+			}
+		}
+	}
+	available = {
+		FROM = {
+			owns_state = 243
+			owns_state = 242
+			has_completed_focus = GRF_military_south
+				
+		}
+	}
+}
+
+GRF_triton_manufacturer_organization = {
+	name = triton_manufacturer
+	icon = GFX_idea_GRF_triton_manufacturer
+	include = generic_infantry_equipment_organization
+	allowed = {
+		original_tag = GRF 
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		FROM = {
+			NOT = {
+				OR = {
+					has_government = communism
+					has_government = democratic
+				}
+			}
+		}
+	}
+	available = {
+		FROM = {
+			owns_state = 243
+			owns_state = 288
+			has_completed_focus = GRF_military_south
+				
+		}
+	}
+}
+
+GRF_cannonstone_organization = {
+	name = cannonstone
+	icon = GFX_idea_GRF_cannonstone
+	include = generic_artillery_organization
+	allowed = {
+		OR = {
+			original_tag = GRF 
+			original_tag = GFF 
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	available = {
+		FROM = {
+			if = {
+				limit =  { original_tag = GFF }
+
+				OR = {
+					owns_state = 243
+					is_in_faction_with = GRF
+					is_subject_of = GRF
+				}
+			}
+		}
+	}
+}
+
+GRF_dragon_grf_organization = {
+	name = dragon_grf
+	icon = GFX_idea_GRF_dragon
+	include = generic_motorized_mechanized_organization
+	allowed = {
+		OR = {
+			original_tag = GRF 
+			original_tag = GFF 
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	available = {
+		FROM = {
+			if = {
+				limit =  { original_tag = GFF }
+
+				OR = {
+					owns_state = 243
+					is_in_faction_with = GRF
+					is_subject_of = GRF
+				}
+			}
+		}
+	}
+}
+
diff --git a/common/military_industrial_organization/organizations/GRI_organization.txt b/common/military_industrial_organization/organizations/GRI_organization.txt
new file mode 100644
index 00000000000..93914529b0f
--- /dev/null
+++ b/common/military_industrial_organization/organizations/GRI_organization.txt
@@ -0,0 +1,424 @@
+GRI_imperial_arms_co_organization = {
+	name = imperial_arms_co
+	include = generic_infantry_equipment_organization
+	icon = GFX_idea_GRI_imperial_arms_co
+	allowed = {
+		OR = {
+			original_tag = GRI
+			original_tag = TRD
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	available = {
+		
+		if = {
+			limit = {
+				owner = {
+					original_tag = GRI
+				}
+				
+				has_game_rule = {
+					rule = eog_april_fool
+					option = DEFAULT
+				}
+			}
+			owner = {
+				has_completed_focus = GRI_crona_industry
+			}
+		}
+		if = {
+			limit = {
+				has_game_rule = {
+					rule = eog_april_fool
+					option = EOG_APRIL_FOOL
+				}
+			}
+			owner = {
+				has_completed_focus = GRI_AF_imperium
+			}
+		}
+		#CHN = { NOT = { has_idea = GRI_chn_imperial_arms_co } }
+	}
+	visible = {
+		if = {
+			limit = {
+				owner = {
+					original_tag = TRD
+				}
+			}
+			owner = {
+				has_government = fascism
+			}
+		}
+	}
+	initial_trait = {
+		equipment_bonus = {
+			breakthrough = 0.05
+		}
+	}
+}
+GRI_bluedale_organization = {
+	name = bluedale
+	include = generic_infantry_equipment_organization
+	icon = GFX_idea_siemens
+	allowed = {
+		OR = {
+			original_tag = GRI
+			original_tag = TRD
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		if = {
+			limit = {
+				owner = {
+					original_tag = TRD
+				}
+			}
+			owner = {
+				has_government = fascism
+			}
+		}
+	}
+	initial_trait = {
+		equipment_bonus = {
+			defense = 0.05
+		}
+	}
+}
+GRI_helheim_organization = {
+	name = helheim
+	include = generic_artillery_organization
+	icon = GFX_idea_GRI_helheim
+	allowed = {
+		OR = {
+			original_tag = GRI
+			original_tag = TRD
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		if = {
+			limit = {
+				owner = {
+					original_tag = TRD
+				}
+			}
+			owner = {
+				has_government = fascism
+			}
+		}
+	}
+	initial_trait = {
+		equipment_bonus = {
+			soft_attack = 0.05
+		}
+	}
+}
+GRI_lionstone_organization = {
+	name = lionstone
+	include = generic_motorized_mechanized_organization
+	icon = GFX_idea_GRI_lionstone
+	allowed = {
+		OR = {
+			original_tag = GRI
+			original_tag = TRD
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	available = {
+		
+		if = {
+			limit = {
+				owner = {
+					original_tag = GRI
+				}
+				
+				has_game_rule = {
+					rule = eog_april_fool
+					option = DEFAULT
+				}
+			}
+			owner = {
+				has_completed_focus = GRI_lowstein_motorized_contract
+			}
+		}
+		if = {
+			limit = {
+				has_game_rule = {
+					rule = eog_april_fool
+					option = EOG_APRIL_FOOL
+				}
+			}
+			owner = {
+				has_completed_focus = GRI_AF_imperium
+			}
+		}
+		#CHN = { NOT = { has_idea = GRI_chn_imperial_arms_co } }
+	}
+	visible = {
+		if = {
+			limit = {
+				owner = {
+					original_tag = TRD
+				}
+			}
+			owner = {
+				has_government = fascism
+			}
+		}
+	}
+	initial_trait = {
+		limit_to_equipment_type = { motorized_equipment } 
+		equipment_bonus = {
+			defense = 0.05
+		}
+	}
+}
+GRI_chn_imperial_arms_co_organization = {
+	name = GRI_chn_imperial_arms_co
+	icon = GFX_idea_GRI_imperial_arms_co
+	include = generic_infantry_equipment_organization	
+	allowed = {
+		original_tag = CHN
+		has_dlc = "Arms Against Tyranny"
+	}
+	available = {
+		owner = {
+			has_idea = CHN_GRI_Attache_For_CHN
+			has_country_flag = GRI_joint_industrial_development_accepted
+			NOT = { 
+				has_war_with = GRI
+			}
+		}
+	}	
+	initial_trait = {
+		equipment_bonus = {
+			breakthrough = 0.05
+		}
+	}
+}
+GRI_armada_organization = {
+	name = armada
+	include = generic_battle_line_ship_organization
+	icon = GFX_idea_GRI_armada
+	allowed = {
+		OR = {
+			original_tag = GRI
+			original_tag = TRD
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	available = {
+		owner = {
+			any_owned_state = {
+				is_coastal = yes
+			}
+		}
+	}
+	visible = {
+		if = {
+			limit = {
+				owner = {
+					original_tag = TRD
+				}
+			}
+			owner = {
+				has_government = fascism
+			}
+		}
+	}
+	initial_trait = {
+		equipment_bonus = {
+			lg_attack = 0.05
+			hg_attack = 0.05
+		}
+	}
+}
+GRI_alligator_organization = {
+	name = alligator
+	include = generic_escort_ship_organization
+	icon = GFX_idea_GRI_alligator
+	allowed = {
+		OR = {
+			original_tag = GRI
+			original_tag = TRD
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	available = {
+		owner = {
+			any_owned_state = {
+				is_coastal = yes
+			}
+		}
+	}
+	visible = {
+		if = {
+			limit = {
+				owner = {
+					original_tag = TRD
+				}
+			}
+			owner = {
+				has_government = fascism
+			}
+		}
+	}
+	initial_trait = {
+		limit_to_equipment_type = { mio_cat_eq_all_destroyer } 
+		equipment_bonus = {
+			build_cost_ic = -0.07
+		}
+	}
+
+}
+GRI_kraken_organization = {
+	name = kraken
+	include = generic_raider_ship_organization
+	icon = GFX_idea_GRI_kraken
+	allowed = {
+		OR = {
+			original_tag = GRI
+			original_tag = TRD
+		}
+
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		if = {
+			limit = {
+				owner = {
+					original_tag = TRD
+				}
+			}
+			owner = {
+				has_government = fascism
+			}
+		}
+	}
+	available = {
+		owner = {
+			any_owned_state = {
+				is_coastal = yes
+			}
+		}
+	}
+	initial_trait = {
+		limit_to_equipment_type = { ship_hull_cruiser } 
+		equipment_bonus = {
+			armor_value = 0.05
+			anti_air_attack = 0.07
+			surface_visibility = -0.05
+			naval_speed = 0.05
+		}
+	}
+}
+GRI_imperial_motors_organization = {
+	name = imperial_motors
+	include = generic_mobile_tank_organization
+	icon = GFX_idea_GRI_mobile_tank_manufacturer
+	allowed = {
+		OR = {
+			original_tag = GRI
+			original_tag = TRD
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		
+		if = {
+			limit = {
+				owner = {
+					original_tag = TRD
+				}
+			}
+			owner = {
+				has_government = fascism
+			}
+		}
+	}
+	initial_trait = {
+		limit_to_equipment_type = { light_tank_chassis } 
+		equipment_bonus = {
+			hard_attack = 0.05
+		}
+	}
+}
+GRI_arcturian_organization = {
+	name = arcturian
+	include = generic_medium_tank_organization
+	icon = GFX_idea_GRI_arcturian
+
+	allowed = {
+		OR = {
+			original_tag = GRI
+			original_tag = TRD
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		if = {
+			limit = {
+				owner = {
+					original_tag = TRD
+				}
+			}
+			owner = {
+				has_government = fascism
+			}
+		}
+	}
+	initial_trait = {
+		limit_to_equipment_type = { medium_tank_chassis } 
+		equipment_bonus = {
+			breakthrough = 0.05
+		}
+	}
+}
+GRI_chntank1_organization = {
+	name = GRI_chntank1
+	include = generic_heavy_tank_organization
+	icon = GFX_idea_CHN_aurelia_armory
+
+	allowed = {
+		original_tag = GRI
+		has_dlc = "Arms Against Tyranny"
+	}
+	available = {
+		owner = {
+			has_idea = CHN_GRI_Attache_For_GRI
+			has_country_flag = GRI_joint_industrial_development_accepted
+			NOT = { has_war_with = CHN }
+
+		}
+	}
+}
+GRI_alpha_organization = {
+	name = alpha
+	icon = GFX_idea_GRI_alpha
+	include = generic_light_aircraft_organization
+
+	allowed = {
+		original_tag = GRI
+		has_dlc = "Arms Against Tyranny"
+	}
+}
+GRI_beta_organization = {
+	name = beta
+	icon = GFX_idea_GRI_beta
+	include = generic_medium_aircraft_organization
+	allowed = {
+		original_tag = GRI
+		has_dlc = "Arms Against Tyranny"
+	}
+}
+GRI_gamma_organization = {
+	name = gamma
+	icon = GFX_idea_GRI_gamma
+	include = generic_heavy_aircraft_organization
+	allowed = {
+		original_tag = GRI
+		has_dlc = "Arms Against Tyranny"
+	}
+}
\ No newline at end of file
diff --git a/common/military_industrial_organization/organizations/GRU_organization.txt b/common/military_industrial_organization/organizations/GRU_organization.txt
new file mode 100644
index 00000000000..994ffdbd885
--- /dev/null
+++ b/common/military_industrial_organization/organizations/GRU_organization.txt
@@ -0,0 +1,215 @@
+GRU_infantry_concern_organization = {
+	name = GRU_infantry_concern
+	include = generic_infantry_equipment_organization
+	icon = GFX_idea_GRU_infantry_concern
+
+	allowed = {
+		OR = {
+			original_tag = GRU
+			original_tag = GRW
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				owns_state = 512
+				original_tag = GRU
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 512
+			512 = { is_core_of = owner }
+		}		
+	}
+}
+GRU_artillery_concern_organization = {
+	name = GRU_artillery_concern
+	include = generic_artillery_organization
+	icon = GFX_idea_GRU_artillery_concern
+
+	allowed = {
+		OR = {
+			original_tag = GRU
+			original_tag = GRW
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				owns_state = 594
+				original_tag = GRU
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 594
+			594 = { is_core_of = owner }
+		}		
+	}
+}
+GRU_light_tank_concern_organization = {
+	name = GRU_light_tank_concern
+	include = generic_mobile_tank_organization
+	icon = GFX_idea_GRU_light_tank_concern
+
+	allowed = {
+		OR = {
+			original_tag = GRU
+			original_tag = GRW
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				owns_state = 559
+				original_tag = GRU
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 559
+			559 = { is_core_of = owner }
+		}		
+	}
+}
+GRU_medium_tank_concern_organization = {
+	name = GRU_medium_tank_concern
+	include = generic_medium_tank_organization
+	icon = GFX_idea_GRU_medium_tank_concern
+
+	allowed = {
+		OR = {
+			original_tag = GRU
+			original_tag = GRW
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				owns_state = 599
+				original_tag = GRU
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 599
+			599	= { is_core_of = owner }
+		}		
+	}
+}
+GRU_light_air_concern_organization = {
+	name = GRU_light_air_concern
+	include = generic_light_aircraft_organization
+	icon = GFX_idea_GRU_light_air_concern
+
+	allowed = {
+		OR = {
+			original_tag = GRU
+			original_tag = GRW
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				owns_state = 595
+				original_tag = GRU
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 595
+			595 = { is_core_of = owner }
+		}		
+	}
+}
+GRU_heavy_air_concern_organization = {
+	name = GRU_heavy_air_concern
+	include = generic_heavy_aircraft_organization
+	icon = GFX_idea_GRU_heavy_air_concern
+
+	allowed = {
+		OR = {
+			original_tag = GRU
+			original_tag = GRW
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				owns_state = 623
+				original_tag = GRU
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 623
+		}		
+	}
+}
+GRU_raiding_naval_concern_organization = {
+	name = GRU_raiding_naval_concern
+	include = generic_raider_ship_organization
+	icon = GFX_idea_GRU_raiding_naval_concern
+
+	allowed = {
+		OR = {
+			original_tag = GRU
+			original_tag = GRW
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				owns_state = 559
+				original_tag = GRU
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 559
+			559 = { is_core_of = owner }
+		}		
+	}
+}
+GRU_defence_naval_concern_organization = {
+	name = GRU_defence_naval_concern
+	include = generic_escort_ship_organization
+	icon = GFX_idea_GRU_defence_naval_concern
+
+	allowed = {
+		OR = {
+			original_tag = GRU
+			original_tag = GRW
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				owns_state = 512
+				original_tag = GRU
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 512
+			512 = { is_core_of = owner }
+		}		
+	}
+}
\ No newline at end of file
diff --git a/common/military_industrial_organization/organizations/GRW_organization.txt b/common/military_industrial_organization/organizations/GRW_organization.txt
new file mode 100644
index 00000000000..1fcbb720dd0
--- /dev/null
+++ b/common/military_industrial_organization/organizations/GRW_organization.txt
@@ -0,0 +1,196 @@
+
+########    ###    ##    ## ##    ##  ######  
+   ##      ## ##   ###   ## ##   ##  ##    ## 
+   ##     ##   ##  ####  ## ##  ##   ##       
+   ##    ##     ## ## ## ## #####     ######  
+   ##    ######### ##  #### ##  ##         ## 
+   ##    ##     ## ##   ### ##   ##  ##    ## 
+   ##    ##     ## ##    ## ##    ##  ######  
+
+GRW_tank_manufacturer_organization = {
+	name = GRW_tank_manufacturer
+	include = generic_mobile_tank_organization
+	icon = GFX_idea_GRW_tank_manufacturer
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = GRW
+			original_tag = BRF
+		}
+	}
+	available = {
+		if = {
+			limit = { owner = { original_tag = GRW } }
+
+			owner = {
+				has_completed_focus = GRW_brodfeld_tank_polygon
+			}
+		}
+	}
+}
+GRW_medium_tank_manufacturer_organization = {
+	name = GRW_medium_tank_manufacturer
+	include = generic_medium_tank_organization
+	icon = GFX_idea_GRW_medium_tank_manufacturer
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		original_tag = GRW
+		
+	}
+	available = {
+		owner = {
+			has_global_flag = prywhen_civil_war_is_over
+		}
+	}
+}
+
+ ######  ##     ## #### ########   ######  
+##    ## ##     ##  ##  ##     ## ##    ## 
+##       ##     ##  ##  ##     ## ##       
+ ######  #########  ##  ########   ######  
+      ## ##     ##  ##  ##              ## 
+##    ## ##     ##  ##  ##        ##    ## 
+ ######  ##     ## #### ##         ######  
+
+
+
+ GRW_naval_manufacturer_organization = {
+	name =  GRW_naval_manufacturer
+	include = generic_escort_ship_organization
+	icon = GFX_idea_GRW_naval_manufacturer
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		original_tag = GRW
+	}
+
+}
+
+GRW_naval_manufacturer_organization_2 = {
+	name =  GRW_naval_manufacturer_2
+	include = generic_raider_ship_organization
+	icon = GFX_idea_GRW_naval_manufacturer_2
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = GRW
+			original_tag = BRF
+		}
+	}
+	initial_trait = {
+		name = ROM_mio_trait_coastal_defense_production
+		limit_to_equipment_type = { mio_cat_eq_all_cruiser }
+		production_bonus = {
+			production_cost_factor = -0.05
+		}
+		equipment_bonus = {
+			lg_attack = 0.05
+			naval_range = -0.1
+		}
+	}
+}
+
+
+GRW_naval_manufacturer_organization3 = {
+	name =  GRW_naval_manufacturer3
+	include = generic_escort_ship_organization
+	icon = GFX_idea_GRW_naval_manufacturer3
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		original_tag = BRF
+	}
+
+}
+
+########  ##          ###    ##    ## ########  ######  
+##     ## ##         ## ##   ###   ## ##       ##    ## 
+##     ## ##        ##   ##  ####  ## ##       ##       
+########  ##       ##     ## ## ## ## ######    ######  
+##        ##       ######### ##  #### ##             ## 
+##        ##       ##     ## ##   ### ##       ##    ## 
+##        ######## ##     ## ##    ## ########  ######  
+
+
+GRW_aircraft_manufacturer_organization = {
+	name = GRW_aircraft_manufacturer
+	include = generic_light_aircraft_organization
+	icon = GFX_idea_GRW_aircraft_manufacturer
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = GRW
+			original_tag = BRF
+		}
+	}
+}
+GRW_med_aircraft_manufacturer_organization = {
+	name = GRW_med_aircraft_manufacturer
+	include = generic_medium_aircraft_organization
+	icon = GFX_idea_GRW_med_aircraft_manufacturer
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = GRW
+			original_tag = BRF
+		}
+	}
+}
+
+
+##     ##    ###    ######## ######## ########  #### ######## ##       
+###   ###   ## ##      ##    ##       ##     ##  ##  ##       ##       
+#### ####  ##   ##     ##    ##       ##     ##  ##  ##       ##       
+## ### ## ##     ##    ##    ######   ########   ##  ######   ##       
+##     ## #########    ##    ##       ##   ##    ##  ##       ##       
+##     ## ##     ##    ##    ##       ##    ##   ##  ##       ##       
+##     ## ##     ##    ##    ######## ##     ## #### ######## ######## 
+
+
+GRW_inf_manufacturer_organization = {
+	include = generic_infantry_equipment_organization
+	name = GRW_inf_manufacturer
+	icon = GFX_idea_GRW_inf_manufacturer
+
+	allowed = {
+		OR = {
+			original_tag = GRW
+			original_tag = BRF
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	available = {
+		owner = {
+			controls_state = 414
+		}
+	}
+}
+
+
+GRW_arty_manufacturer_organization = {
+	include = generic_infantry_equipment_organization
+	name = GRW_arty_manufacturer
+	icon = GFX_idea_GRW_arty_manufacturer
+
+	allowed = {
+		original_tag = GRW
+		has_dlc = "Arms Against Tyranny"
+	}
+	available = {
+		owner = {
+			controls_state = 508
+		}
+	}
+}
+
+GRW_motorized_manufacturer_organization = {
+	include = generic_motorized_mechanized_organization
+	name = GRW_motorized_manufacturer
+	icon = GFX_idea_GRW_motorized_manufacturer
+
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = GRW
+			original_tag = BRF
+		}
+	}
+}
diff --git a/common/military_industrial_organization/organizations/GRY_organization.txt b/common/military_industrial_organization/organizations/GRY_organization.txt
new file mode 100644
index 00000000000..2d559fdab56
--- /dev/null
+++ b/common/military_industrial_organization/organizations/GRY_organization.txt
@@ -0,0 +1,421 @@
+GRY_air_concern_organization = {
+	name = GRY_air_concern
+	icon = GFX_idea_GRY_fuel_efficient_aircraft_manufacturer
+	include = generic_range_focused_aircraft_organization
+	allowed = {
+		OR = {
+			can_form_river_fed = yes
+			original_tag = GRW
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = GRY
+				AND = {
+					OR = {
+						has_country_flag = RIV_annexed_GRY
+						AND = {
+							original_tag = GRW
+							owns_state = 598
+						}
+					}
+					GRY = { has_completed_focus = GRY_air_company }
+				}
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 598
+			if = {
+				limit = { original_tag = GRY }
+
+				has_completed_focus = GRY_air_company
+			}
+		}
+	}
+}
+
+GRY_air_man_1_organization = {
+	name = GRY_air_man_1
+	icon = GFX_idea_GRY_air_man_1
+	include = generic_medium_aircraft_organization
+	allowed = {
+		OR = {
+			can_form_river_fed = yes
+			original_tag = GRW
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = GRY
+				AND = {
+					OR = {
+						has_country_flag = RIV_annexed_GRY
+						AND = {
+							original_tag = GRW
+							owns_state = 598
+						}
+					}
+				}
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 598
+		}
+	}
+}
+
+GRY_air_man_2_organization = {
+	name = GRY_air_man_2
+	icon = GFX_idea_GRY_air_man_2
+	include = generic_heavy_aircraft_organization
+	allowed = {
+		OR = {
+			can_form_river_fed = yes
+			original_tag = GRW
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = GRY
+				AND = {
+					OR = {
+						has_country_flag = RIV_annexed_GRY
+						AND = {
+							original_tag = GRW
+							owns_state = 598
+						}
+					}
+				}
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 598
+		}
+	}
+}
+
+GRY_air_man_3_organization = {
+	name = GRY_air_man_3
+	icon = GFX_idea_GRY_air_man_3
+	include = generic_light_aircraft_organization
+	allowed = {
+		OR = {
+			can_form_river_fed = yes
+			original_tag = GRW
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = GRY
+				AND = {
+					OR = {
+						has_country_flag = RIV_annexed_GRY
+						AND = {
+							original_tag = GRW
+							owns_state = 598
+						}
+					}
+				}
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 598
+		}
+	}
+}
+GRY_navy_concern_organization = {
+	name = GRY_navy_concern
+	icon = GFX_idea_GRY_navy_concern
+
+	allowed = {
+		OR = {
+			can_form_river_fed = yes
+			original_tag = GRW
+		}
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = GRY
+				AND = {
+					OR = {
+						has_country_flag = RIV_annexed_GRY
+						AND = {
+							original_tag = GRW
+							owns_state = 598
+						}
+					}
+					GRY = { has_completed_focus = GRY_naval_company }
+				}
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 598
+			if = {
+				limit = { original_tag = GRY }
+				has_completed_focus = GRY_naval_company
+			}
+		}
+	}
+	include = generic_raider_ship_organization
+}
+
+GRY_navy_man_1_organization = {
+	name = GRY_navy_man_1
+	icon = GFX_idea_GRY_navy_man_1
+	include = generic_battle_line_ship_organization
+	allowed = {
+		OR = {
+			can_form_river_fed = yes
+			original_tag = GRW
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = GRY
+				AND = {
+					OR = {
+						has_country_flag = RIV_annexed_GRY
+						AND = {
+							original_tag = GRW
+							owns_state = 598
+						}
+					}
+				}
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 598
+		}
+	}
+}
+
+GRY_navy_man_2_organization = {
+	name = GRY_navy_man_2
+	icon = GFX_idea_GRY_navy_man_2
+	include = generic_escort_ship_organization
+	allowed = {
+		OR = {
+			can_form_river_fed = yes
+			original_tag = GRW
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = GRY
+				AND = {
+					OR = {
+						has_country_flag = RIV_annexed_GRY
+						AND = {
+							original_tag = GRW
+							owns_state = 598
+						}
+					}
+				}
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 598
+		}
+	}
+}
+GRY_tank_1_organization = {
+	name = GRY_tank_1
+	icon = GFX_idea_GRY_tank_1
+	include = generic_mobile_tank_organization
+	allowed = {
+		OR = {
+			can_form_river_fed = yes
+			original_tag = GRW
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = GRY
+				AND = {
+					OR = {
+						has_country_flag = RIV_annexed_GRY
+						AND = {
+							original_tag = GRW
+							owns_state = 598
+						}
+					}
+				}
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 598
+		}
+	}
+}
+
+GRY_tank_2_organization = {
+	name = GRY_tank_2
+	icon = GFX_idea_GRY_tank_2
+	include = generic_heavy_tank_organization
+	allowed = {
+		OR = {
+			can_form_river_fed = yes
+			original_tag = GRW
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = GRY
+				AND = {
+					OR = {
+						has_country_flag = RIV_annexed_GRY
+						AND = {
+							original_tag = GRW
+							owns_state = 598
+						}
+					}
+				}
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 598
+		}
+	}
+}
+GRY_fac1_organization = {
+	name = GRY_fac1
+	icon = GFX_idea_GRY_fac1
+	include = generic_artillery_organization
+	allowed = {
+		OR = {
+			can_form_river_fed = yes
+			original_tag = GRW
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = GRY
+				AND = {
+					OR = {
+						has_country_flag = RIV_annexed_GRY
+						AND = {
+							original_tag = GRW
+							owns_state = 598
+						}
+					}
+				}
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 598
+		}
+	}
+	initial_trait = {
+		limit_to_equipment_type = { artillery_equipment } 
+		equipment_bonus = {
+			build_cost_ic = -0.05
+		}
+	}
+}
+
+GRY_fac2_organization = {
+	name = GRY_fac2
+	icon = GFX_idea_GRY_fac2
+	include = generic_infantry_equipment_organization
+	allowed = {
+		OR = {
+			can_form_river_fed = yes
+			original_tag = GRW
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = GRY
+				AND = {
+					OR = {
+						has_country_flag = RIV_annexed_GRY
+						AND = {
+							original_tag = GRW
+							owns_state = 598
+						}
+					}
+				}
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 598
+		}
+	}
+}
+
+GRY_fac3_organization = {
+	name = GRY_fac3
+	icon = GFX_idea_GRY_fac3
+	include = generic_motorized_mechanized_organization
+	allowed = {
+		OR = {
+			can_form_river_fed = yes
+			original_tag = GRW
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = GRY
+				AND = {
+					OR = {
+						has_country_flag = RIV_annexed_GRY
+						AND = {
+							original_tag = GRW
+							owns_state = 598
+						}
+					}
+				}
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 598
+		}
+	}
+}
\ No newline at end of file
diff --git a/common/military_industrial_organization/organizations/HIP_organization.txt b/common/military_industrial_organization/organizations/HIP_organization.txt
new file mode 100644
index 00000000000..42f0d177c11
--- /dev/null
+++ b/common/military_industrial_organization/organizations/HIP_organization.txt
@@ -0,0 +1,873 @@
+#####################
+
+###  ##  #  # # #  ## 
+ #  #  # ## # # # #   
+ #  #### # ## ##   #  
+ #  #  # #  # # #   # 
+ #  #  # #  # # # ## 
+
+ #################### 
+
+
+ HIP_marbreeze_herring_organization = {
+	name = HIP_marbreeze_herring
+	include = generic_medium_tank_organization
+	icon = GFX_idea_marbreeze
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = HIP
+			original_tag = WIN
+		}
+	}
+	visible = {
+		if = {
+			limit = {
+				owner = {
+					original_tag = WIN
+				}
+			}
+			owner = {
+				OR = {
+					has_country_flag = WIN_fascist_victory
+					has_country_flag = WIN_libertalia_created
+				 }
+			}
+		}
+	}
+	initial_trait = {
+
+		limit_to_equipment_type = { mio_cat_eq_all_medium_tank }
+
+		equipment_bonus = {
+			reliability = 0.1
+			soft_attack = 0.02
+			hard_attack = 0.03
+			defense = -0.15
+		}
+	}
+	add_trait = { 
+		token = HIP_mio_trait_strict_design_specifications
+		name = USA_mio_trait_strict_design_specifications
+		icon = GFX_generic_mio_trait_icon_reliability
+		special_trait_background = yes
+
+		position = { x=2 y=1 }
+		relative_position_id = generic_mio_trait_simplified_turret_design
+
+		all_parents = { generic_mio_trait_simplified_turret_design generic_mio_trait_armor_steel_working }
+		limit_to_equipment_type = { mio_cat_eq_all_medium_tank }
+
+		equipment_bonus = {
+			reliability = 0.1
+		}
+	}
+	add_trait = { 
+		token = HIP_mio_trait_expanded_production_facilities
+		name = USA_mio_trait_expanded_production_facilities
+		icon = GFX_generic_mio_trait_icon_build_cost_ic
+		special_trait_background = yes
+
+		position = { x=0 y=1 }
+		relative_position_id = HIP_mio_trait_strict_design_specifications
+
+		all_parents = { HIP_mio_trait_strict_design_specifications }
+		production_bonus = {
+			production_cost_factor = -0.1
+			production_capacity_factor = 0.05
+		}
+		
+	}
+}
+
+HIP_crystalstar_corporation_organization = {
+	name = HIP_crystalstar_corporation
+	include = generic_infantry_tank_organization
+	icon = GFX_idea_crystalcorp
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = HIP
+			original_tag = WIN
+		}
+	}
+	visible = {
+		if = {
+			limit = {
+				owner = {
+					original_tag = WIN
+				}
+			}
+			OR = {
+				owner = {
+					has_country_flag = WIN_fascist_victory
+					has_country_flag = WIN_libertalia_created
+				}
+			 }
+		}
+	}
+}
+
+HIP_army_ordnance_department_organization = {
+	name = HIP_army_ordnance_department
+	include = generic_super_heavy_tank_organization
+	icon = GFX_idea_army_ordnance_department
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = HIP
+			original_tag = WIN
+		}
+	}
+	visible = {
+		if = {
+			limit = {
+				owner = {
+					original_tag = WIN
+				}
+			}
+			owner = {
+				OR = {
+					has_country_flag = WIN_fascist_victory
+					has_country_flag = WIN_libertalia_created
+				 }
+			}
+		}
+	}
+	add_trait = { 
+		token = HIP_mio_trait_periscope_sights
+		name = USA_mio_trait_periscope_sights
+		icon = GFX_generic_mio_department_icon_tank_medium_tank_armor
+		special_trait_background = yes
+
+		position = { x=-2 y=1 }
+		relative_position_id = generic_mio_trait_fully_cast_turret
+
+		all_parents = { generic_mio_trait_fully_cast_turret  }
+		equipment_bonus = {
+			breakthrough = 0.1
+			defense = 0.05
+		}
+		
+	}
+	add_trait = { 
+		token = HIP_mio_trait_mass_production_of_armor
+		name = USA_mio_trait_mass_production_of_armor
+		icon = GFX_generic_mio_department_icon_tank_medium_tank_line_efficiency
+		special_trait_background = yes
+
+		position = { x=2 y=1 }
+		relative_position_id = generic_mio_trait_fully_cast_turret
+
+		all_parents = { generic_mio_trait_fully_cast_turret }
+		production_bonus = {
+			production_efficiency_cap_factor = 0.05
+			production_efficiency_gain_factor = 0.1
+		}
+		
+	}
+}
+HIP_star_tank_manufacturer_organization = {
+   name = HIP_star_tank_manufacturer
+   include = generic_main_battle_tank_organization
+   icon = GFX_idea_SCS_tank_1
+   allowed = {
+		has_dlc = "Arms Against Tyranny"
+	   OR = {
+		   original_tag = HIP
+		   original_tag = WIN
+	   }
+   }
+
+   visible = {
+		owner = {
+			OR = {
+				has_completed_focus = WIN_fascist_health_clubs
+				has_completed_focus = HIP_radiation_proof_armor
+				has_country_flag = HIP_SIR_designers_unlocked
+			}
+		}
+   }
+}
+
+# USA_detroit_arsenal_organization = {
+# 	#name = detroit_arsenal
+# 	include = generic_tank_organization
+# 	icon = GFX_idea_generic_industrial_concern_1
+# 	allowed = {
+#		has_dlc = "Arms Against Tyranny"	
+# 		tag = HIP 
+# 	}
+# 	available = {
+# 		owner = { has_completed_focus = USA_main_battle_tanks }
+# 	}
+# }
+
+# USA_tank_destroyer_board_organization = {
+# 	name = tank_destroyer_board
+# 	include = generic_mobile_tank_organization
+# 	icon = GFX_idea_usa_tank_destroyer_board
+# 	allowed = {
+#		has_dlc = "Arms Against Tyranny"	
+# 		tag = HIP 
+# 	}
+# 	available = {
+# 		owner = { has_completed_focus = USA_tank_destroyer_doctrine }
+# 	}
+# 	initial_trait = {
+# 		name = ROM_mio_trait_mobile_tank_destroyers
+		
+# 		limit_to_equipment_type = { 
+# 			mio_cat_eq_all_tank_destroyers
+# 		}
+		
+# 		equipment_bonus = {
+# 			reliability = 0.05
+# 			hard_attack = 0.05
+# 			ap_attack = 0.05
+# 		}
+# 	}
+
+# 	override_trait = {
+# 		token = generic_mio_enlarged_breech
+# 		limit_to_equipment_type = { 
+# 			mio_cat_eq_all_tank_destroyers
+# 		}
+# 		equipment_bonus = {
+# 			hard_attack = 0.05
+# 			ap_attack = 0.1
+# 		}
+# 		special_trait_background = yes
+# 	}
+# }
+
+#TODO Add Star and Siren Tank
+
+
+#####################
+
+ ## #  # ### ###   ## 
+#   #  #  #  #  # #   
+ #  ####  #  ###   #  
+  # #  #  #  #      # 
+##  #  # ### #    ##  
+ 
+#####################
+
+
+HIP_clawes_naval_yard_organization = {
+	include = generic_black_sea_fleet_organization
+	name = HIP_clawes_naval_yard
+	icon = GFX_idea_clawes
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = HIP
+			original_tag = WIN
+		}
+	}
+	visible = {
+		if = {
+			limit = {
+				owner = {
+					original_tag = WIN
+				}
+			}
+			owner = {
+				OR = {
+					has_country_flag = WIN_fascist_victory
+					has_country_flag = WIN_libertalia_created
+				 }
+			}
+		}
+	}
+}
+
+HIP_electric_boat_company_organization = {
+	name = HIP_electric_boat_company
+	include = generic_raider_ship_organization
+	icon = GFX_idea_electric_boat_company
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = HIP
+			original_tag = WIN
+		}
+	}
+	visible = {
+		if = {
+			limit = {
+				owner = {
+					original_tag = WIN
+				}
+			}
+			owner = {
+				OR = {
+					has_country_flag = WIN_fascist_victory
+					has_country_flag = WIN_libertalia_created
+				 }
+			}
+		}
+	}
+}
+
+HIP_aris_trench_naval_yard_organization = {
+	name = HIP_aris_trench_naval_yard
+	include = generic_battle_line_ship_organization
+	icon = GFX_idea_aristrench
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = HIP
+			original_tag = WIN
+		}
+	}
+	visible = {
+		if = {
+			limit = {
+				owner = {
+					original_tag = WIN
+				}
+			}
+			owner = {
+				OR = {
+					has_country_flag = WIN_fascist_victory
+					has_country_flag = WIN_libertalia_created
+				 }
+			}
+		}
+	}
+}
+
+HIP_northpoint_national_shipbuilding_organization = {
+	name = HIP_northpoint_national_shipbuilding
+	include = generic_task_force_ship_organization
+	icon = GFX_idea_newport_news_shipbuilding
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = HIP
+			original_tag = WIN
+		}
+	}
+	visible = {
+		if = {
+			limit = {
+				owner = {
+					original_tag = WIN
+				}
+			}
+			owner = {
+				OR = {
+					has_country_flag = WIN_fascist_victory
+					has_country_flag = WIN_libertalia_created
+				 }
+			}
+		}
+	}
+}
+
+###########################
+
+###  #    ##  #  # ###  ## 
+#  # #   #  # ## # #   #   
+###  #   #### # ## ##   #  
+#    #   #  # #  # #     # 
+#    ### #  # #  # ### ##  
+
+###########################
+
+HIP_national_aeronautical_association_organization = {
+	include = generic_light_aircraft_organization
+	name = HIP_national_aeronautical_association
+	icon = GFX_idea_north_american_aviation
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = HIP
+			original_tag = WIN
+		}
+	}
+	visible = {
+		if = {
+			limit = {
+				owner = {
+					original_tag = WIN
+				}
+			}
+			owner = {
+				OR = {
+					has_country_flag = WIN_fascist_victory
+					has_country_flag = WIN_libertalia_created
+				 }
+			}
+		}
+	}
+}
+
+HIP_lightning_organization = {
+	name = HIP_lightning
+	include = generic_medium_aircraft_organization
+	icon = GFX_idea_lightning
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = HIP
+			original_tag = WIN
+		}
+	}
+	visible = {
+		if = {
+			limit = {
+				owner = {
+					original_tag = WIN
+				}
+			}
+			owner = {
+				OR = {
+					has_country_flag = WIN_fascist_victory
+					has_country_flag = WIN_libertalia_created
+				 }
+			}
+		}
+	}
+	equipment_type = {
+		mio_cat_eq_all_small_plane
+		mio_cat_eq_all_medium_plane 
+		transport_plane_equipment
+	}
+	
+	initial_trait = {
+		limit_to_equipment_type = { mio_cat_eq_all_medium_plane }
+
+		equipment_bonus = {
+			air_range = 0.15
+			air_attack = 0.05
+		}
+	}
+	
+	add_trait = {
+		token = HIP_mio_trait_mechanized_production
+		name = USA_mio_trait_mechanized_production
+		icon = GFX_generic_mio_department_icon_plane_medium_technology
+		special_trait_background = yes
+		
+		position = { x=0 y=1 }  
+		relative_position_id = generic_mio_trait_narrow_build
+		
+		any_parent = { generic_mio_trait_narrow_build }
+		
+		limit_to_equipment_type = { mio_cat_eq_all_medium_plane }
+		
+		production_bonus = {
+			production_efficiency_cap_factor = 0.05
+		} 
+	}
+	
+	override_trait = {
+		token = generic_mio_trait_heavy_fighter_specialization
+		equipment_bonus = {
+			air_range = 0.1
+			air_attack = 0.05
+		}
+	}
+}
+
+HIP_bluewing_organization = {
+	include = generic_heavy_aircraft_organization
+	name = HIP_bluewing
+	icon = GFX_idea_bluewing
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = HIP
+			original_tag = WIN
+		}
+	}
+	visible = {
+		if = {
+			limit = {
+				owner = {
+					original_tag = WIN
+				}
+			}
+			owner = {
+				OR = {
+					has_country_flag = WIN_fascist_victory
+					has_country_flag = WIN_libertalia_created
+				 }
+			}
+		}
+	}
+	override_trait = {
+		token = generic_mio_trait_flying_fortress
+		position = { x=-1 y=1 }
+	}
+	override_trait = {
+		token = generic_mio_trait_advanced_instruments
+		position = { x=1 y=1 }
+	}
+	add_trait = {
+		token = HIP_mio_trait_superfortress
+		name = USA_mio_trait_superfortress
+		icon = GFX_generic_mio_department_icon_plane_general_engine
+		special_trait_background = yes
+		
+		position = { x=0 y=1 }  
+		relative_position_id = generic_mio_trait_flying_fortress
+		
+		any_parent = { generic_mio_trait_flying_fortress }
+		limit_to_equipment_type = { large_plane_airframe large_plane_maritime_patrol_plane_airframe }
+			
+		equipment_bonus = {
+			air_defence = 0.1
+			air_range = 0.1
+			air_agility = -0.05
+			fuel_consumption = 0.05
+		}
+	}
+}
+
+HIP_gunmare_organization = {
+	include = generic_naval_aircraft_organization
+	name = HIP_gunmare
+	icon = GFX_idea_gunmare
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = HIP
+			original_tag = WIN
+		}
+	}
+	visible = {
+		if = {
+			limit = {
+				owner = {
+					original_tag = WIN
+				}
+			}
+			owner = {
+				OR = {
+					has_country_flag = WIN_fascist_victory
+					has_country_flag = WIN_libertalia_created
+				 }
+			}
+		}
+	}
+	add_trait = {
+		token = HIP_mio_trait_smooth_finish
+		name = USA_mio_trait_smooth_finish
+		icon = GFX_generic_mio_trait_icon_air_agility
+		special_trait_background = yes
+		
+		position = { x=2 y=1 }  
+		relative_position_id = generic_mio_trait_reinforced_fuselage
+		
+		any_parent = { generic_mio_trait_reinforced_fuselage }
+		limit_to_equipment_type = { large_plane_airframe large_plane_maritime_patrol_plane_airframe }
+			
+		equipment_bonus = {
+			air_agility = 0.05
+			maximum_speed = 0.05
+		}
+	}
+	override_trait = {
+		token = generic_mio_advanced_materials
+		position = { x=-1 y=1 }
+	}
+	add_trait = {
+		token = HIP_mio_trait_jet_fighter_design
+		name = USA_mio_trait_jet_fighter_design
+		icon = GFX_generic_mio_trait_icon_maximum_speed
+		special_trait_background = yes
+
+		available = {
+			owner = {
+				has_tech = jet_engines
+			}
+		}
+		position = { x=1 y=1 }  
+		relative_position_id = generic_mio_water_injection
+		
+		any_parent = { generic_mio_water_injection }
+		limit_to_equipment_type = { mio_cat_eq_all_cv_aircraft }
+			
+		equipment_bonus = {
+			maximum_speed = 0.1
+		}
+	}
+}
+
+
+HIP_bellbreeze_aircraft_corporation_organization = {
+	name = HIP_bellbreeze_aircraft_corporation
+	include = generic_high_agility_fighter_aircraft_organization
+	icon = GFX_idea_bellbreeze
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = HIP
+			original_tag = WIN
+		}
+	}
+	visible = {
+		if = {
+			limit = {
+				owner = {
+					original_tag = WIN
+				}
+			}
+			owner = {
+				OR = {
+					has_country_flag = WIN_fascist_victory
+					has_country_flag = WIN_libertalia_created
+				 }
+			}
+		}
+	}
+	
+	available = {
+		owner = {
+			OR = {
+				has_completed_focus = HIP_bellbreeze_aircraft_corporation_focus
+				has_completed_focus = HIP_create_new_design_bureaus
+				has_country_flag = HIP_SIR_designers_unlocked
+			}
+		}
+	}
+}
+HIP_downwind_aircraft_company_organization = {
+	name = HIP_downwind_aircraft_company
+	include = generic_cas_aircraft_organization
+	icon = GFX_idea_downwind
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = HIP
+			original_tag = WIN
+		}
+	}
+	visible = {
+		if = {
+			limit = {
+				owner = {
+					original_tag = WIN
+				}
+			}
+			owner = {
+				OR = {
+					has_country_flag = WIN_fascist_victory
+					has_country_flag = WIN_libertalia_created
+				 }
+			}
+		}
+	}
+}
+
+HIP_consolidated_aircraft_organization = {
+	name = HIP_consolidated_aircraft
+	include = generic_range_focused_aircraft_organization
+	icon = GFX_idea_consolidated_aircraft
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = HIP
+			original_tag = WIN
+		}
+	}
+	visible = {
+		if = {
+			limit = {
+				owner = {
+					original_tag = WIN
+				}
+			}
+			owner = {
+				OR = {
+					has_country_flag = WIN_fascist_victory
+					has_country_flag = WIN_libertalia_created
+				 }
+			}
+		}
+	}
+	available = {
+		owner = {
+			OR = {
+				has_completed_focus = HIP_consolidated_aircraft_focus
+				has_completed_focus = HIP_create_new_design_bureaus
+				has_country_flag = HIP_SIR_designers_unlocked
+			}
+		}
+	}
+	add_trait = {
+		token = HIP_mio_trait_outsourced_engines
+		name = USA_mio_trait_outsourced_engines
+		icon = GFX_generic_mio_trait_icon_air_agility
+		special_trait_background = yes
+		
+		position = { x=0 y=1 }  
+		relative_position_id = generic_mio_trait_advanced_production_techniques
+		
+		any_parent = { generic_mio_trait_advanced_production_techniques }
+		
+		limit_to_equipment_type = { mio_cat_eq_all_small_plane }
+
+		available = {
+			FROM = {
+				is_in_faction_with = ENG	
+			}
+		}
+		
+		equipment_bonus = {
+			air_agility = 0.05
+			maximum_speed = 0.05
+		}
+	}
+
+	add_trait = {
+		token = HIP_mio_trait_light_aircraft_development
+		name = USA_mio_trait_light_aircraft_development
+		icon = GFX_generic_mio_department_icon_plane_light_combat
+		special_trait_background = yes
+		
+		position = { x=0 y=1 }  
+		relative_position_id = generic_mio_trait_strafing_techniques
+		
+		any_parent = { generic_mio_trait_strafing_techniques }
+		
+		limit_to_equipment_type = { mio_cat_eq_all_small_plane }
+
+		equipment_bonus = {
+			air_agility = 0.05
+			air_ground_attack = 0.05
+			air_attack = 0.02
+		}
+	}
+
+}
+
+# TODO AIR
+# HIP_SIR_siren_aircraft_merger - siren_aircraft_manufacturer
+
+
+################################### 
+
+#   #  ##  ### ### ###  ### ### #   
+## ## #  #  #  #   #  #  #  #   #   
+# # # ####  #  ##  ###   #  ##  #   
+#   # #  #  #  #   #  #  #  #   #   
+#   # #  #  #  ### #  # ### ### ### 
+
+
+###################################
+
+HIP_summershores_armory_organization = {
+	name = HIP_summershores_armory
+	include = generic_infantry_equipment_organization
+	icon = GFX_idea_summershores
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = HIP
+			original_tag = WIN
+		}
+	}
+	visible = {
+		if = {
+			limit = {
+				owner = {
+					original_tag = WIN
+				}
+			}
+			owner = {
+				OR = {
+					has_country_flag = WIN_fascist_victory
+					has_country_flag = WIN_libertalia_created
+				 }
+			}
+		}
+	}
+	initial_trait = {
+		equipment_bonus = {
+			defense = 0.05
+		}
+	}
+}
+
+HIP_lightstar_motor_company_organization = {
+	name = HIP_lightstar_motor_company
+	include = generic_motorized_mechanized_organization
+	icon = GFX_idea_lightstar
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = HIP
+			original_tag = WIN
+		}
+	}
+	visible = {
+		if = {
+			limit = {
+				owner = {
+					original_tag = WIN
+				}
+			}
+			owner = {
+				OR = {
+					has_country_flag = WIN_fascist_victory
+					has_country_flag = WIN_libertalia_created
+				 }
+			}
+		}
+	}
+	initial_trait = {
+		equipment_bonus = {
+			maximum_speed = 0.05
+			build_cost_ic = -0.05
+		}
+	}
+}
+
+
+
+HIP_royal_island_arsenal_organization = {
+	name = HIP_royal_island_arsenal
+	include = generic_artillery_organization
+	icon = GFX_idea_rockisland
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = HIP
+			original_tag = WIN
+		}
+	}
+	visible = {
+		if = {
+			limit = {
+				owner = {
+					original_tag = WIN
+				}
+			}
+			owner = {
+				OR = {
+					has_country_flag = WIN_fascist_victory
+					has_country_flag = WIN_libertalia_created
+				 }
+			}
+		}
+	}
+	initial_trait = {
+		equipment_bonus = {
+			soft_attack = 0.05
+			hard_attack = 0.05
+			air_attack = 0.05
+		}
+	}
+}
+
+	#TODO HIP_SIR_siren_material_merger - UNIQUE
+
+
+#################################################
+# EXOTIC WEAPONS DIVISION IS A POLICY WITH MIOS #
+#################################################
\ No newline at end of file
diff --git a/common/military_industrial_organization/organizations/JAK_organization.txt b/common/military_industrial_organization/organizations/JAK_organization.txt
new file mode 100644
index 00000000000..304c5c71625
--- /dev/null
+++ b/common/military_industrial_organization/organizations/JAK_organization.txt
@@ -0,0 +1,21 @@
+JAK_yakistanks_organization = {
+	name = JAK_yakistanks
+	include = generic_mobile_tank_organization
+	icon = GFX_idea_YAK_yakistanks
+	allowed = {
+		original_tag = JAK
+		has_dlc = "Arms Against Tyranny"
+	}
+}
+JAK_ryben_industries_organization = {
+	name = JAK_ryben_industries
+	include = generic_infantry_equipment_organization
+	icon = GFX_idea_JAK_ryben_industries
+	allowed = {
+		OR = {
+			original_tag = YAK
+			original_tag = JAK
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+}
\ No newline at end of file
diff --git a/common/military_industrial_organization/organizations/JER_organization.txt b/common/military_industrial_organization/organizations/JER_organization.txt
new file mode 100644
index 00000000000..75be3b659ad
--- /dev/null
+++ b/common/military_industrial_organization/organizations/JER_organization.txt
@@ -0,0 +1,253 @@
+JER_manufacture_aquileia_organization = {
+	name = manufacture_aquileia
+	include = generic_infantry_equipment_organization
+	icon = GFX_idea_JER_manufacture_aquileia
+	allowed = {
+		OR = {
+			original_tag = JER
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	available = {
+		owner = {
+			owns_state = 377
+		}
+	}
+	initial_trait = {
+		equipment_bonus = {
+			soft_attack = 0.05
+		}
+	}
+}
+JER_manufacture_rila_organization = {
+	name = manufacture_rila
+	include = generic_infantry_equipment_organization
+	icon = GFX_idea_JER_manufacture_rila
+	allowed = {
+		OR = {
+			original_tag = JER
+			original_tag = JEB
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	available = {
+		owner = {
+			owns_state = 435
+		}
+	}
+	initial_trait = {
+		equipment_bonus = {
+			reliability = 0.07
+		}
+	}
+}
+JER_manufacture_vin_organization = {
+	name = manufacture_vin
+	include = generic_support_equipment_organization
+	icon = GFX_idea_JER_manufacture_vin
+	allowed = {
+		OR = {
+			original_tag = JER
+			original_tag = JFT
+			original_tag = JEB
+			original_tag = JRR
+			original_tag = VIN
+			original_tag = JES
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = JER
+				original_tag = VIN
+				owns_state = 517
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 435
+		}
+	}
+	initial_trait = {
+		equipment_bonus = {
+			breakthrough = 0.05
+		}
+	}
+}
+JER_dassault_organization = {
+	name = dassault
+	include = generic_artillery_organization
+	icon = GFX_idea_JER_dassault
+	allowed = {
+		original_tag = JER
+		has_dlc = "Arms Against Tyranny"
+	}
+	initial_trait = {
+		equipment_bonus = {
+			hard_attack = 0.05
+		}
+	}
+}
+JER_leopard_jer_organization = {
+	name = leopard_jer
+	include = generic_motorized_mechanized_organization
+	icon = GFX_idea_JER_leopard
+	allowed = {
+		original_tag = JER
+		has_dlc = "Arms Against Tyranny"
+	}
+	available = {
+		owner = {
+			has_completed_focus = JER_support_automobile_industry
+		}
+	}
+	initial_trait = {
+		equipment_bonus = {
+			reliability = 0.05
+		}
+	}
+}
+JER_safran_organization = {
+	name = safran
+	include = generic_light_aircraft_organization
+	icon = GFX_idea_JER_safran
+	allowed = {
+		original_tag = JER
+		has_dlc = "Arms Against Tyranny"
+	}
+}
+JER_thales_organization = {
+	name = thales
+	include = generic_medium_aircraft_organization
+	icon = GFX_idea_JER_thales
+	allowed = {
+		original_tag = JER
+		has_dlc = "Arms Against Tyranny"
+	}
+}
+JER_astrium_organization = {
+	name = astrium
+	include = generic_cas_aircraft_organization
+	icon = GFX_idea_JER_astrium
+	allowed = {
+		OR = {
+			original_tag = JER
+			original_tag = JFT
+			original_tag = JEB
+			original_tag = JRR
+			original_tag = VIN
+			original_tag = JES
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = JER
+				owns_state = 377
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 377
+		}
+	}
+}
+JER_mistral_organization = {
+	name = mistral
+	include = generic_battle_line_ship_organization
+	icon = GFX_idea_JER_mistral
+	allowed = {
+		OR = {
+			original_tag = JER
+			original_tag = FLO
+			original_tag = JES
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = JER
+				owns_state = 377
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 377
+		}
+	}
+	initial_trait = {
+		limit_to_equipment_type = { ship_hull_carrier ship_hull_heavy } 
+		equipment_bonus = {
+			armor_value = 0.05
+			anti_air_attack = 0.05
+			surface_visibility = -0.05
+		}
+	}
+}
+JER_loup_shipping_organization = {
+	include = generic_raider_ship_organization
+	icon = GFX_idea_JER_loup_shipping
+	allowed = {
+		OR = {
+			original_tag = JER
+			original_tag = FLO
+			original_tag = JES
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	available = {
+		owner = {
+			owns_state = 377
+		}
+	}
+	initial_trait = {
+		limit_to_equipment_type = { mio_cat_eq_all_destroyer submarine } 
+		equipment_bonus = {
+			build_cost_ic = -0.05
+		}
+	}
+}
+JER_fer_de_lance_organization = {
+	include = generic_mobile_tank_organization
+	icon = GFX_idea_JER_fer_de_lance
+	allowed = {
+		original_tag = JER
+		has_dlc = "Arms Against Tyranny"
+	}
+	initial_trait = {
+		organization_modifier = {
+			military_industrial_organization_research_bonus = 0.03
+		}
+	}
+	add_trait = { 
+		token = JER_mio_trait_l_35
+		name = FRA_mio_trait_l_35
+		icon = GFX_generic_mio_department_icon_tank_general_weapons
+		any_parent = { generic_mio_enlarged_breech }
+		relative_position_id = generic_mio_enlarged_breech
+		position = { x=1 y=2 }  
+		equipment_bonus = {
+			hard_attack = 0.05
+			ap_attack = 0.05
+		}  
+	}
+
+	override_trait = {
+		token = generic_mio_gunner_sight_improvements
+		position = { x=-1 y=2}
+	}
+}
+JER_AVA_tanks_organization = {
+	include = generic_heavy_tank_organization
+	icon = GFX_idea_JER_ava_tanks
+	allowed = {
+		original_tag = JER
+		has_dlc = "Arms Against Tyranny"
+	}
+}
diff --git a/common/military_industrial_organization/organizations/JES_organization.txt b/common/military_industrial_organization/organizations/JES_organization.txt
new file mode 100644
index 00000000000..35a605977a4
--- /dev/null
+++ b/common/military_industrial_organization/organizations/JES_organization.txt
@@ -0,0 +1,229 @@
+JES_light_tank_manufacturer_organization = {
+	name = JES_light_tank_manufacturer
+	include = generic_mobile_tank_organization
+	icon = GFX_idea_JES_light_tank_manufacturer
+	allowed = {
+		OR = {
+			original_tag = JES
+			original_tag = JER
+			original_tag = FRN
+			original_tag = WNG
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = JES
+				owns_state = 487
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 487
+			487 = { is_core_of = ROOT }
+		}
+	}
+}
+JES_medium_tank_manufacturer_organization = {
+	name = JES_medium_tank_manufacturer
+	include = generic_medium_tank_organization
+	icon = GFX_idea_JES_medium_tank_manufacturer
+	allowed = {
+		OR = {
+			original_tag = JES
+			original_tag = JER
+			original_tag = FRN
+			original_tag = WNG
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = JES
+				AND = {
+					owns_state = 487
+					JES = { has_completed_focus = JES_tank_experiments }
+				}
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 487
+			487 = { is_core_of = ROOT }
+		}
+		if = {
+			limit = { owner = { original_tag = JES } }
+			owner = {
+				has_completed_focus = JES_tank_experiments
+			}
+		}
+	}
+}
+JES_light_plane_designer_organization = {
+	name = JES_light_plane_designer
+	include = generic_light_aircraft_organization
+	icon = GFX_idea_JES_light_plane_designer
+	allowed = {
+		OR = {
+			original_tag = JES
+			original_tag = JER
+			original_tag = FRN
+			original_tag = WNG
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = JES
+				owns_state = 487
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 487
+			487 = { is_core_of = ROOT }
+		}
+	}
+}
+JES_medium_plane_designer_organization = {
+	name = JES_medium_plane_designer
+	include = generic_medium_aircraft_organization
+	icon = GFX_idea_JES_medium_plane_designer
+	allowed = {
+		OR = {
+			original_tag = JES
+			original_tag = JER
+			original_tag = FRN
+			original_tag = WNG
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	visible = {
+		owner = {
+			OR = {
+				original_tag = JES
+				owns_state = 487
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 487
+			487 = { is_core_of = ROOT }
+		}
+	}
+}
+JES_improved_infantry_designer_organization = {
+	name = JES_improved_infantry_designer
+	include = generic_infantry_equipment_organization
+	icon = GFX_idea_JES_improved_infantry_designer
+	allowed = {
+		OR = {
+			original_tag = JES
+			original_tag = JER
+			original_tag = FRN
+			original_tag = WNG
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	visible = {
+		owner = {
+			OR = {
+				original_tag = JES
+				AND = {
+					owns_state = 487
+					JES = { has_completed_focus = JES_standardize_equipment }
+				}
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 487
+			487 = { is_core_of = ROOT }
+		}
+		if = {
+			limit = { owner = { original_tag = JES } } 
+
+			owner = {
+				has_completed_focus = JES_standardize_equipment
+			}
+		}
+	}
+	initial_trait = {
+		equipment_bonus = {
+			reliability = 0.1
+		}
+	}
+}
+JES_artillery_designer_organization = {
+	name = JES_artillery_designer
+	include = generic_artillery_organization
+	icon = GFX_idea_JES_artillery_designer
+	allowed = {
+		OR = {
+			original_tag = JES
+			original_tag = JER
+			original_tag = FRN
+			original_tag = WNG
+		}
+		has_dlc = "Arms Against Tyranny"
+	}	
+	visible = {
+		owner = {
+			OR = {
+				original_tag = JES
+				owns_state = 487
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 487
+			487 = { is_core_of = ROOT }
+		}
+	}
+
+	initial_trait = {
+		equipment_bonus = {
+			soft_attack = 0.1
+		}
+	}
+}
+JES_armored_car_designer_organization = {
+	name = JES_armored_car_designer
+	include = generic_armored_car_organization
+	icon = GFX_idea_JES_armored_car_designer
+	allowed = {
+		OR = {
+			original_tag = JES
+			original_tag = JER
+			original_tag = FRN
+			original_tag = WNG
+		}
+		has_dlc = "Arms Against Tyranny"
+		has_dlc = "La Resistance"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = JES
+				owns_state = 487
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 487
+			487 = { is_core_of = ROOT }
+		}
+	}
+}
\ No newline at end of file
diff --git a/common/military_industrial_organization/organizations/KAT_organization.txt b/common/military_industrial_organization/organizations/KAT_organization.txt
new file mode 100644
index 00000000000..9a88f368f6a
--- /dev/null
+++ b/common/military_industrial_organization/organizations/KAT_organization.txt
@@ -0,0 +1,205 @@
+KAT_infantry_concern_organization = {
+	name = KAT_infantry_concern
+	include = generic_infantry_equipment_organization
+	icon = GFX_idea_KAT_infantry_concern
+	allowed = {
+		OR = {
+			original_tag = KAT
+			original_tag = GRI
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+
+			OR = {
+				original_tag = KAT
+				owns_state = 423
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 423
+		}
+	}
+}
+KAT_artillery_concern_organization = {
+	name = KAT_artillery_concern
+	include = generic_artillery_organization
+	icon = GFX_idea_KAT_artillery_concern
+	allowed = {
+		OR = {
+			original_tag = KAT
+			original_tag = GRI
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = KAT
+				owns_state = 423
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 423
+		}
+	}
+}
+KAT_light_tank_concern_organization = {
+	name = KAT_light_tank_concern
+	include = generic_mobile_tank_organization
+	icon = GFX_idea_KAT_light_tank_concern
+	allowed = {
+		OR = {
+			original_tag = KAT
+			original_tag = GRI
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = KAT
+				owns_state = 423
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 423
+		}
+	}
+}
+KAT_medium_tank_concern_organization = {
+	name = KAT_medium_tank_concern
+	include = generic_medium_tank_organization
+	icon = GFX_idea_KAT_medium_tank_concern
+	allowed = {
+		OR = {
+			original_tag = KAT
+			original_tag = GRI
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = KAT
+				owns_state = 423
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 423
+		}
+	}
+}
+KAT_light_air_concern_organization = {
+	name = KAT_light_air_concern
+	include = generic_light_aircraft_organization
+	icon = GFX_idea_KAT_light_air_concern
+	allowed = {
+		OR = {
+			original_tag = KAT
+			original_tag = GRI
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = KAT
+				owns_state = 423
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 423
+			423 = { is_core_of = ROOT }
+		}
+	}
+}
+KAT_heavy_air_concern_organization = {
+	name = KAT_heavy_air_concern
+	include = generic_heavy_aircraft_organization
+	icon = GFX_idea_KAT_heavy_air_concern
+	allowed = {
+		OR = {
+			original_tag = KAT
+			original_tag = GRI
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = KAT
+				owns_state = 423
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 423
+			423 = { is_core_of = ROOT }
+		}
+	}
+}
+KAT_raiding_naval_concern_organization = {
+	name = KAT_raiding_naval_concern
+	include = generic_raider_ship_organization
+	icon = GFX_idea_KAT_raiding_naval_concern
+	allowed = {
+		OR = {
+			original_tag = KAT
+			original_tag = GRI
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = KAT
+				owns_state = 423
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 423
+			423 = { is_core_of = ROOT }
+		}
+	}
+}
+KAT_battlefleet_naval_concern_organization = {
+	name = KAT_battlefleet_naval_concern
+	include = generic_battle_line_ship_organization
+	icon = GFX_idea_KAT_battlefleet_naval_concern
+	allowed = {
+		OR = {
+			original_tag = KAT
+			original_tag = GRI
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = KAT
+				owns_state = 423
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 423
+			423 = { is_core_of = ROOT }
+		}
+	}
+}
\ No newline at end of file
diff --git a/common/military_industrial_organization/organizations/KIR_organization.txt b/common/military_industrial_organization/organizations/KIR_organization.txt
new file mode 100644
index 00000000000..1979cba87e9
--- /dev/null
+++ b/common/military_industrial_organization/organizations/KIR_organization.txt
@@ -0,0 +1,943 @@
+KIR_armour_bureau_organization = {
+	name = KIR_armour_bureau
+	icon = GFX_idea_KIR_armour_bureau
+	include = generic_mobile_tank_organization
+	allowed = {
+		original_tag = KIR
+		NOT = {
+			has_dlc = "La Resistance"
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+
+	available = {
+		hidden_trigger = {
+			owner = {
+				has_country_flag = KIR_armour_bureau_available
+				NOT = {
+					check_variable = { KIR_the_silence_disabled_ideas_var = 1}
+				}
+			}
+		}
+
+	}
+	add_trait = { 
+        token = KIR_VaKA_VMWP_organization
+        name = KIR_VaKA_VMWP
+        icon = GFX_generic_mio_trait_icon_ap_attack
+        special_trait_background = yes
+
+		position = { x=3 y=0 }
+		relative_position_id = generic_mio_quality_assurance_routines
+
+        visible = {
+            owner = {
+                has_completed_focus = KIR_ARMOUR_3
+            }
+        }
+
+        available = {
+            owner = {
+                has_completed_focus = KIR_ARMOUR_3
+            }
+        }
+		limit_to_equipment_type = {
+			light_tank_chassis
+		}
+        equipment_bonus = {
+			ap_attack = 0.1
+			soft_attack = 0.05
+			hard_attack = 0.05
+        }
+    } 
+}
+KIR_armour_bureau_LaR_organization = {
+	name = KIR_armour_bureau
+	icon = GFX_idea_KIR_armour_bureau
+	include = generic_mobile_tank_organization
+	allowed = {
+		original_tag = KIR
+		has_dlc = "La Resistance"
+		has_dlc = "Arms Against Tyranny"
+	}
+
+	available = {
+		hidden_trigger = {
+			owner = {
+				has_country_flag = KIR_armour_bureau_available
+				NOT = {
+					check_variable = { KIR_the_silence_disabled_ideas_var = 1}
+				}
+			}
+		}
+
+	}
+	equipment_type = {
+		armor
+		cat_armored_cars
+	}
+	research_categories = {
+		mio_cat_tech_all_armor_and_modules
+		cat_armored_cars
+	}
+	add_trait = { 
+        token = KIR_VaKA_VMWP_LaR_organization
+        name = KIR_VaKA_VMWP_LaR
+        icon = GFX_generic_mio_trait_icon_ap_attack
+        special_trait_background = yes
+
+		position = { x=3 y=0 }
+		relative_position_id = generic_mio_quality_assurance_routines
+
+        visible = {
+            owner = {
+                has_completed_focus = KIR_ARMOUR_3
+            }
+        }
+
+        available = {
+            owner = {
+                has_completed_focus = KIR_ARMOUR_3
+            }
+        }
+		limit_to_equipment_type = {
+			light_tank_chassis
+		}
+        equipment_bonus = {
+			ap_attack = 0.1
+			soft_attack = 0.05
+			hard_attack = 0.05
+        }
+    } 
+}
+
+KIR_cog_plow_bull_co_organization = {
+	name = KIR_cog_plow_bull_co
+	icon = GFX_idea_KIR_cog_plow_bull_co
+	include = generic_heavy_tank_organization
+	allowed = {
+		OR = {
+			original_tag = KIR
+			original_tag = KIS
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+
+	available = {
+		owner = {
+			has_country_flag = KIR_cog_plow_bull_co_available
+		}
+		hidden_trigger = {
+			owner = {
+				NOT = {
+					check_variable = { KIR_the_silence_disabled_ideas_var = 1}
+				}
+				if = {
+					limit = {
+						original_tag = KIR
+						KIS = {
+							exists = yes
+						}
+					}
+					NOT = {
+						KIS = {
+							has_idea = KIR_cog_plow_bull_co
+						}
+					}
+				}
+			}
+		}
+	}
+}
+KIR_enterprise_TANK_organization = {
+	icon = GFX_idea_KIR_enterprise
+	name = KIR_enterprise_TANK
+	include = generic_main_battle_tank_organization
+	allowed = {
+		original_tag = KIS
+		has_dlc = "Arms Against Tyranny"
+	}
+
+	visible = {
+		owner = {
+			has_country_flag = KIR_enterprise_TANK_available
+		}
+	}
+}
+
+KIS_guild_artificer_organization = {
+	icon = GFX_idea_KIR_idea_fulgent_focus
+	include = generic_mobile_tank_organization
+	name = KIS_guild_artificer
+	allowed = {
+		original_tag = KIS
+		has_dlc = "Arms Against Tyranny"
+	}
+
+	visible = {
+		owner = {
+			has_country_flag = KIS_guild_artificer_available
+		}
+	}
+	research_categories = {
+		mio_cat_tech_light_armor_and_modules
+		cat_armored_cars
+		mio_cat_tech_all_motorized_mechanized
+	}
+	equipment_type = {
+		mio_cat_eq_all_light_tank
+		motorized_equipment
+		mechanized_equipment
+		motorized_rocket_equipment
+	}
+	
+	initial_trait = {
+		equipment_bonus = {
+			fuel_consumption = -0.1	
+		}
+	}
+#	modifier = {
+#		supply_node_range = 0.1
+#		fuel_gain_factor = 0.05
+		#supply_node_range = 0.1
+		#fuel_gain_factor = 0.1
+		#industry_free_repair_factor = 0.25
+#	}
+}
+
+KIC_tank_designer_1_organization = {
+	name = KIC_tank_designer_1
+	icon = GFX_idea_unknown_advisor_kirin_female
+	include = generic_mobile_tank_organization
+
+	allowed = {
+		original_tag = KIC
+		has_dlc = "Arms Against Tyranny"
+	}
+
+	available = {
+		owner = {
+			has_country_flag = KIC_tank_designer_1_available
+		}
+	}
+
+}
+
+KIC_tank_designer_2_organization = {
+	icon = GFX_idea_unknown_advisor_kirin_male_2
+	name = KIC_tank_designer_2
+	include = generic_medium_tank_organization
+	
+
+	allowed = {
+		original_tag = KIC
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	available = {
+		owner = {
+			has_country_flag = KIC_tank_designer_2_available
+		}
+	}
+
+}
+
+
+KIR_FRV_pearl_works_organization = {
+	icon = GFX_idea_KIR_FRV_pearl_works
+	name = KIR_FRV_pearl_works
+	include = generic_mobile_tank_organization
+	allowed = {
+		original_tag = KIS
+		has_dlc = "Arms Against Tyranny"
+	}
+	equipment_type = {
+		armor
+		mechanized_equipment
+		armored_car_equipment
+		motorized_equipment
+	}
+	visible = {
+		owner = {
+			has_country_flag = KIS_FRV_flag
+		}
+	}
+
+	available = {
+		owner = {
+			has_country_flag = KIR_FRV_pearl_works_available
+		}
+	}
+
+	initial_trait = {
+		equipment_bonus = {
+			reliability = 0.05
+		}
+	}
+}
+KIR_fern_flare_designer_organization = {
+	name = KIR_fern_flare
+	icon = GFX_idea_KIR_idea_fern_flare
+	include = generic_mobile_tank_organization
+	allowed = {
+		original_tag = KIR
+		has_dlc = "Arms Against Tyranny"
+	}
+	equipment_type = {
+		armor
+		mechanized_equipment
+		armored_car_equipment
+		motorized_equipment
+	}
+	visible = {
+		owner = {
+			has_country_flag = KIR_fern_flare_designer_available
+		}
+	}
+
+	available = {
+		owner = {
+			has_country_flag = KIR_fern_flare_designer_available
+		}
+		hidden_trigger = {
+			owner = {
+				NOT = {
+					check_variable = { KIR_the_silence_disabled_ideas_var = 1}
+				}
+			}
+		}
+	}
+	initial_trait = {
+		equipment_bonus = {
+			build_cost_ic = -0.05
+		}
+	}
+}
+KIR_kirin_holding_group_tank_organization = {
+	icon = GFX_idea_KIR_kirin_holding_group
+	name = KIR_kirin_holding_group
+	allowed = {
+		original_tag = KIR
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner ={
+			has_country_flag = KIR_kirin_holding_group_available
+		}
+	}
+
+	available = {
+		owner = {
+			has_country_flag = KIR_kirin_holding_group_available
+			hidden_trigger = {
+				NOT = {
+					check_variable = { KIR_the_silence_disabled_ideas_var = 1}
+				}
+			}
+		}
+	}
+	include = generic_mobile_tank_organization
+	initial_trait = {
+		equipment_bonus = {
+			build_cost_ic = -0.1
+		}
+		production_bonus = {
+            production_resource_penalty_factor = -0.05
+            production_efficiency_gain_factor = 0.05
+            production_efficiency_cap_factor = 0.05
+		}
+	}
+}
+KIR_rhapsody_arsenal_organization = {
+	icon = GFX_idea_KIR_rhapsody_arsenal_original
+	name = KIR_rhapsody_arsenal
+	include = generic_infantry_equipment_organization
+	allowed = {
+		OR = {
+			original_tag = KIR
+			original_tag = KIS
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	research_categories = {
+		artillery
+		infantry_weapons
+	}
+	visible = {
+		owner = {
+			NOT = {
+				has_country_flag = KIR_rhapsody_arsenal_LCAB_available
+			}
+		}
+	}
+
+	available = {
+		owner = {
+			has_country_flag = KIR_rhapsody_arsenal_available
+			owns_state = 1060
+		}
+		hidden_trigger = {
+			owner = {
+				NOT = {
+					check_variable = { KIR_the_silence_disabled_ideas_var = 1}
+				}
+			}
+		}
+	}
+
+	add_trait = { 
+        token = KIR_VaKA_LCAB_organization
+        name = KIR_VaKA_LCAB 
+        icon = GFX_generic_mio_trait_icon_ap_attack
+        special_trait_background = yes
+
+        position = { x=2 y=0 }
+		relative_position_id = generic_mio_trait_advanced_barrel_forging
+        visible = {
+            owner = {
+                has_completed_focus = KIR_SOLDIERY_3
+            }
+        }
+
+        available = {
+            owner = {
+                has_completed_focus = KIR_SOLDIERY_3
+            }
+        }
+
+        equipment_bonus = {
+			breakthrough = 0.1
+			soft_attack = 0.05
+        }
+    } 
+}
+KIR_aureolin_monastery = {
+	name = KIR_aureolin_monastery
+	icon = GFX_idea_KIR_aureolin_monastery
+	allowed = {
+		OR = {
+			original_tag = KIR
+			original_tag = KIC
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	include = generic_support_equipment_organization
+	available = {
+		owner = {
+			has_country_flag = KIR_aureolin_monastery_available
+			owns_state = 1079
+		}
+		hidden_trigger = {
+			owner = {
+				NOT = {
+					check_variable = { KIR_the_silence_disabled_ideas_var = 1}
+				}
+			}
+		}
+	}
+	research_categories = {
+		support_tech
+		kirin_vanguard_tech
+		kirin_brave_tech
+	}
+	initial_trait = {
+		equipment_bonus = {
+			build_cost_ic = -0.15
+		}
+	}
+}
+KIR_motor_bureau_organization = {
+	icon = GFX_idea_KIR_motor_bureau
+	name = KIR_motor_bureau
+	include = generic_motorized_mechanized_organization
+	allowed = {
+		original_tag = KIR
+		has_dlc = "Arms Against Tyranny"
+	}
+
+	available = {
+		owner = {
+			has_country_flag = KIR_motor_bureau_available
+		}
+		hidden_trigger = {
+			owner = {
+				NOT = {
+					check_variable = { KIR_the_silence_disabled_ideas_var = 1}
+				}
+			}
+		}
+	}
+}
+KIR_enterprise_EQUIPMENT_organization = {
+	icon = GFX_idea_KIR_enterprise
+	name = KIR_enterprise_EQUIPMENT
+	include = generic_motorized_mechanized_organization
+	allowed = {
+		original_tag = KIS
+		has_dlc = "Arms Against Tyranny"
+	}
+
+	visible = {
+		owner = {
+			has_country_flag = KIR_enterprise_EQUIPMENT_available
+		}
+	}
+
+}
+KIC_small_arms_inventor_organization = {
+	icon = GFX_idea_unknown_advisor_kirin_androgyne_2
+	name = KIC_small_arms_inventor
+	include = generic_infantry_equipment_organization
+	allowed = {
+		original_tag = KIC
+		has_dlc = "Arms Against Tyranny"
+	}
+
+	available = {
+		owner = {
+			has_country_flag = KIC_small_arms_inventor_available
+		}
+	}
+
+
+}
+KIR_kirin_holding_group_materiel_organization = {
+	icon = GFX_idea_KIR_kirin_holding_group
+	name = KIR_kirin_holding_group
+	include = generic_infantry_equipment_organization
+	allowed = {
+		original_tag = KIR
+		has_dlc = "Arms Against Tyranny"
+	}
+	research_categories = {
+		infantry_equipment
+		artillery
+	}
+	visible = {
+		owner ={
+			has_country_flag = KIR_kirin_holding_group_available
+		}
+	}
+
+	available = {
+		owner = {
+			has_country_flag = KIR_kirin_holding_group_available
+			hidden_trigger = {
+				NOT = {
+					check_variable = { KIR_the_silence_disabled_ideas_var = 1}
+				}
+			}
+		}
+	}
+	
+	initial_trait = {
+		equipment_bonus = {
+			build_cost_ic = -0.1
+		}
+		production_bonus = {
+            production_resource_penalty_factor = -0.05
+            production_efficiency_gain_factor = 0.05
+            production_efficiency_cap_factor = 0.05
+			production_capacity_factor = 0.1
+		}
+	}
+}
+KIR_crane_heavy_industries_organization = {
+	name = KIR_crane_heavy_industries
+	include = generic_light_aircraft_organization
+	icon = GFX_idea_KIR_crane_heavy_industries
+	allowed = {
+		OR = {
+			original_tag = KIR
+			original_tag = KIS
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+
+	available = {
+		owner = {
+			has_country_flag = KIR_crane_heavy_industries_available
+			if = {
+				limit = {
+					original_tag = KIR
+					KIS = {
+						exists = yes
+					}
+				}
+				NOT = {
+					KIS = {
+						has_idea = KIR_crane_heavy_industries
+					}
+				}
+			}
+		}
+		hidden_trigger = {
+			owner = {
+				NOT = {
+					check_variable = { KIR_the_silence_disabled_ideas_var = 1}
+				}
+			}
+		}
+	}
+}
+KIR_wingluck_consortium_organization = {
+	name = KIR_wingluck_consortium
+	include = generic_heavy_aircraft_organization
+	icon = GFX_idea_KIR_wingluck_consortium
+	allowed = {
+		OR = {
+			original_tag = KIR
+			original_tag = KIS
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+
+	available = {
+		owner = {
+			has_country_flag = KIR_wingluck_consortium_available
+			if = {
+				limit = {
+					original_tag = KIR
+					KIS = {
+						exists = yes
+					}
+				}
+				NOT = {
+					KIS = {
+						has_idea = KIR_wingluck_consortium
+					}
+				}
+			}
+		}
+	}
+	add_trait = { 
+        token = KIR_VaKA_WLWW_organization
+        name = KIR_VaKA_WLWW
+        icon = GFX_generic_mio_trait_icon_ap_attack
+        special_trait_background = yes
+
+        position = { x=-2 y=0 }
+		relative_position_id = generic_mio_trait_reinforced_frames
+        visible = {
+            owner = {
+                has_completed_focus = KIR_AIR_2
+            }
+        }
+
+        available = {
+            owner = {
+                has_completed_focus = KIR_AIR_2
+            }
+			hidden_trigger = {
+				owner = {
+					NOT = {
+						check_variable = { KIR_the_silence_disabled_ideas_var = 1}
+					}
+				}
+			}
+        }
+		limit_to_equipment_type = {
+			medium_plane_airframe
+		}
+        equipment_bonus = {
+			air_ground_attack = 0.15
+			naval_strike_attack = 0.15
+			air_bombing = 0.15
+        }
+    } 
+} 
+
+KIR_enterprise_AIR_organization = {
+	name = KIR_enterprise_AIR
+	include = generic_naval_aircraft_organization
+	icon = GFX_idea_KIR_enterprise
+	allowed = {
+		original_tag = KIS
+		has_dlc = "Arms Against Tyranny"
+	}
+
+	visible = {
+		owner = {
+			has_country_flag = KIR_enterprise_AIR_available
+		}
+	}
+
+}
+
+KIR_DM_aerospace_engineering_organization = {
+	name = KIR_DM_aerospace_engineering
+	icon = GFX_idea_KIR_DM_aerospace_engineering
+	include = generic_cas_aircraft_organization
+	allowed = {
+		original_tag = KIC
+		has_dlc = "Arms Against Tyranny"
+	}
+
+	available = {
+		owner = {
+			has_country_flag = KIR_DM_aerospace_engineering_available
+		}
+	}
+}
+
+KIC_aerospace_engineer_organization = {
+	icon = GFX_idea_unknown_advisor_kirin_male
+	name = KIC_aerospace_engineer
+	include = generic_multi_role_aircraft_organization
+	allowed = {
+		original_tag = KIC
+		has_dlc = "Arms Against Tyranny"
+	}
+	available = {
+		owner = {
+			has_country_flag = KIC_aerospace_engineer_available
+		}
+	}
+	initial_trait = {
+
+		equipment_bonus = {
+			air_range = 0.05
+			reliability = 0.05
+		}
+	} 
+}
+
+
+KIR_kirin_holding_group_aircraft_organization = {
+	icon = GFX_idea_KIR_kirin_holding_group
+	name = KIR_kirin_holding_group
+	allowed = {
+		original_tag = KIR
+		has_dlc = "Arms Against Tyranny"
+	}
+
+	visible = {
+		owner ={
+			has_country_flag = KIR_kirin_holding_group_available
+		}
+	}
+
+	available = {
+		owner = {
+			has_country_flag = KIR_kirin_holding_group_available
+			hidden_trigger = {
+				NOT = {
+					check_variable = { KIR_the_silence_disabled_ideas_var = 1}
+				}
+			}
+		}
+	}
+	include = generic_range_focused_aircraft_organization
+	initial_trait = {
+
+		equipment_bonus = {
+			build_cost_ic = -0.1
+		}
+		production_bonus = {
+            production_resource_penalty_factor = -0.05
+            production_efficiency_gain_factor = 0.05
+            production_efficiency_cap_factor = 0.05
+		}
+	}
+}
+
+KIR_fragrance_shipyards_organization = {
+    name = KIR_fragrance_shipyards
+    include = generic_task_force_ship_organization
+    icon = GFX_idea_KIR_fragrance_shipyards_old
+    allowed = {
+        OR = {
+            original_tag = KIR
+            original_tag = KIS
+        }
+        has_dlc = "Arms Against Tyranny"
+    }
+    available = {
+        owner = {
+            owns_state = 1071
+        }
+		hidden_trigger = {
+			owner = {
+				NOT = {
+					check_variable = { KIR_the_silence_disabled_ideas_var = 1}
+				}
+			}
+		}
+    }
+    visible = {
+        owner = {    
+            OR = {
+                original_tag = KIR
+                original_tag = KIS
+            }
+        }
+    }
+	add_trait = { 
+        token = KIR_VaKA_ADPE_organization
+        name = KIR_VaKA_ADPE
+        icon = GFX_generic_mio_trait_icon_ap_attack
+        special_trait_background = yes
+
+		position = { x=3 y=0 }
+		relative_position_id = generic_mio_trait_carrier_flight_operations_center
+
+        visible = {
+            owner = {
+                has_completed_focus = KIR_NAVY_4
+            }
+        }
+
+        available = {
+            owner = {
+                has_completed_focus = KIR_NAVY_4
+            }
+        }
+		limit_to_equipment_type = {
+			screen_ship
+		}
+        equipment_bonus = {
+			build_cost_ic = -0.15 
+			naval_speed = 0.15 
+			naval_range = 0.3 
+			surface_visibility = 0.1
+        }
+    } 
+}
+KIR_dreamboat_organization = {
+    name = KIR_dreamboat
+    include = generic_battle_line_ship_organization
+    icon = GFX_idea_KIR_dreamboat
+    allowed = {
+        OR = {
+            original_tag = KIR
+            original_tag = KIS
+        }
+        has_dlc = "Arms Against Tyranny"
+    }
+    available = {
+        owner = {
+            has_country_flag = KIR_dreamboat_available
+        }
+    }
+    visible = {
+        owner = {
+            has_country_flag = KIR_dreamboat_available
+        }
+    }
+}
+KIR_scarlet_sails_shipyards_organization = {
+	icon = GFX_idea_KIR_scarlet_sails_shipyards
+	name = KIR_scarlet_sails_shipyards
+	include = generic_raider_ship_organization
+	allowed = {
+		OR = {
+			original_tag = KIR
+			original_tag = KIS
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+
+	available = {
+		owner = {
+			has_country_flag = KIR_scarlet_sails_shipyards_available
+			if = {
+				limit = {
+					original_tag = KIR
+					KIS = {
+						exists = yes
+					}
+				}
+				NOT = {
+					KIS = {
+						has_idea = KIR_scarlet_sails_shipyards
+					}
+				}
+			}
+		}
+		hidden_trigger = {
+			owner = {
+				NOT = {
+					check_variable = { KIR_the_silence_disabled_ideas_var = 1}
+				}
+			}
+		}
+	}
+}
+
+KIR_DM_maritime_systems_organization = {
+	name = KIR_DM_maritime_systems
+	icon = GFX_idea_KIR_DM_maritime_systems
+	include = generic_battle_line_ship_organization
+	allowed = {
+		original_tag = KIC
+		has_dlc = "Arms Against Tyranny"
+	}
+
+	available = {
+		owner = {
+			has_country_flag = KIR_DM_maritime_systems_available
+		}
+	}
+}
+
+KIC_deer_comrade_organization = {
+	name = KIC_deer_comrade
+	icon = GFX_idea_unknown_advisor_deer_alternative
+	include = generic_escort_ship_organization
+	allowed = {
+		original_tag = KIC
+		has_dlc = "Arms Against Tyranny"
+	}
+
+	available = {
+		owner = {
+			has_country_flag = KIC_deer_comrade_available
+		}
+	}
+	initial_trait = {
+		limit_to_equipment_type = {screen_ship}
+		equipment_bonus = {
+			naval_range = 0.1
+			naval_speed = 0.1
+			surface_visibility = -0.1
+		}
+	} 
+}
+KIR_kirin_holding_group_naval_organization = {
+	icon = GFX_idea_KIR_kirin_holding_group
+	name = KIR_kirin_holding_group
+	allowed = {
+		original_tag = KIR
+		has_dlc = "Arms Against Tyranny"
+	}
+
+	visible = {
+		owner ={
+			has_country_flag = KIR_kirin_holding_group_available
+		}
+	}
+
+	available = {
+		owner = {
+			has_country_flag = KIR_kirin_holding_group_available
+			hidden_trigger = {
+				NOT = {
+					check_variable = { KIR_the_silence_disabled_ideas_var = 1}
+				}
+			}
+		}
+	}
+	include = generic_task_force_ship_organization
+	initial_trait = {
+		equipment_bonus = {
+			build_cost_ic = -0.15
+		}
+		production_bonus = {
+            production_resource_penalty_factor = -0.05
+            production_efficiency_gain_factor = 0.05
+            production_efficiency_cap_factor = 0.05
+			production_capacity_factor = 0.1
+		}
+	}
+}
+
diff --git a/common/military_industrial_organization/organizations/LCT_organization.txt b/common/military_industrial_organization/organizations/LCT_organization.txt
new file mode 100644
index 00000000000..2f0062afe2a
--- /dev/null
+++ b/common/military_industrial_organization/organizations/LCT_organization.txt
@@ -0,0 +1,363 @@
+LCT_heavy_bois_organization = {
+	name = LCT_heavy_bois
+	include = generic_heavy_tank_organization
+	icon = GFX_idea_LCT_heavy_bois
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		can_form_river_fed = yes
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = LCT
+				has_country_flag = RIV_annexed_LCT
+			}
+		}
+	}
+	available = {
+		hidden_trigger = {
+			owner = {
+				OR = {
+					original_tag = LCT
+					has_country_flag = RIV_annexed_LCT
+				}
+			}
+		}
+		owner = {
+			owns_state = 387
+		}
+	}
+}
+LCT_speed_demons_organization = {
+	name = LCT_speed_demons 
+	include = generic_mobile_tank_organization
+	icon = GFX_idea_LCT_neighsan
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		can_form_river_fed = yes
+	}
+	available = {
+		hidden_trigger = {
+			owner = {
+				OR = {
+					original_tag = LCT
+					has_country_flag = RIV_annexed_LCT
+				}
+			}
+		}
+		owner = {
+			owns_state = 387
+		}
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = LCT
+				has_country_flag = RIV_annexed_LCT
+			}
+		}
+	}
+	available = {
+		hidden_trigger = {
+			owner = {
+				OR = {
+					original_tag = LCT
+					has_country_flag = RIV_annexed_LCT
+				}
+			}
+		}
+		owner = {
+			owns_state = 387
+		}
+	}
+}
+LCT_light_air_man_organization = {
+	name = LCT_light_air_man
+	include = generic_high_agility_fighter_aircraft_organization
+	icon = GFX_idea_LCT_jasa
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		can_form_river_fed = yes
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = LCT
+				AND = {
+					has_country_flag = RIV_annexed_LCT
+					LCT = { has_completed_focus = LCT_unlock_fighter_man }
+				}
+			}
+		}
+	}
+	available = {
+		hidden_trigger = {
+			owner = {
+				if = {
+					limit = { original_tag = LCT }
+
+					has_completed_focus = LCT_unlock_fighter_man
+				}
+			}			
+		}
+		owner = {
+			owns_state = 387
+		}
+	}
+}
+LCT_manesibishi_organization = {
+	name = LCT_manesibishi
+	include = generic_light_aircraft_organization
+	icon = GFX_idea_LCT_maresubishi
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		can_form_river_fed = yes
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = LCT
+				has_country_flag = RIV_annexed_LCT
+			}
+		}
+	}
+	available = {
+		hidden_trigger = {
+			owner = {
+				OR = {
+					original_tag = LCT
+					has_country_flag = RIV_annexed_LCT
+				}
+			}
+		}
+	}
+}
+LCT_med_air_man_organization = {
+	name = LCT_med_air_man
+	include = generic_range_focused_aircraft_organization
+	icon = GFX_idea_aichi
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		can_form_river_fed = yes
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = LCT
+				AND = {
+					has_country_flag = RIV_annexed_LCT
+					LCT = { has_completed_focus = LCT_unlock_med_air_man }
+				}
+			}
+		}
+	}
+	available = {
+		hidden_trigger = {
+			owner = {
+				OR = {
+					original_tag = LCT
+					has_country_flag = RIV_annexed_LCT
+				}
+			}
+		}
+	}
+}
+LCT_nav_air_man_organization = {
+	name = LCT_nav_air_man
+	include = generic_naval_aircraft_organization
+	icon = GFX_idea_yokosuka
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		can_form_river_fed = yes
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = LCT
+				AND = {
+					has_country_flag = RIV_annexed_LCT
+					LCT = { has_completed_focus = LCT_carriers }
+				}
+			}
+		}
+	}
+	available = {
+
+		if = {
+			limit = { owner = {  original_tag = LCT } } 
+			owner = {
+				has_completed_focus = LCT_carriers
+			}
+		}
+	}
+}
+LCT_atlantic_manufacturer_organization = {
+	name = LCT_atlantic_manufacturer
+	include = generic_battle_line_ship_organization
+	icon = GFX_idea_kure_naval_arsenal
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		can_form_river_fed = yes
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = LCT
+				AND = {
+					has_country_flag = RIV_annexed_LCT
+					LCT = { has_completed_focus = LCT_capital_focus }
+				}
+			}
+		}
+	}
+	available = {
+		if = {
+			limit = { owner = { original_tag = LCT } } 
+			owner = {
+				has_completed_focus = LCT_capital_focus
+			}
+		}
+	}
+}
+LCT_pacific_manufacturer_organization = {
+	name = LCT_pacific_manufacturer
+	include = generic_task_force_ship_organization
+	icon = GFX_idea_yokosuka
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		can_form_river_fed = yes
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = LCT
+				AND = {
+					has_country_flag = RIV_annexed_LCT
+					LCT = { has_completed_focus = LCT_carrier_focus }
+				}
+			}
+		}
+	}
+	available = {
+		if = {
+			limit = { owner = {  original_tag = LCT } } 
+			owner = {
+				has_completed_focus = LCT_carrier_focus
+			}
+		}
+	}
+}
+LCT_navy_manufacturer_organization = {
+	name = LCT_navy_manufacturer
+	include = generic_escort_ship_organization
+	icon = GFX_idea_LCT_gfc
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		can_form_river_fed = yes
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = LCT
+				has_country_flag = RIV_annexed_LCT
+			}
+		}
+	}
+	available = {
+		owner = {
+			hidden_trigger = {
+				OR = {
+					original_tag = LCT
+					has_country_flag = RIV_annexed_LCT
+				}
+			}
+		}
+	}
+}
+LCT_gun_organization = {
+	name = LCT_gun
+	include = generic_infantry_equipment_organization
+	icon = GFX_idea_LCT_gun
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		can_form_river_fed = yes
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = LCT
+				has_country_flag = RIV_annexed_LCT
+			}
+		}
+	}
+	available = {
+		hidden_trigger = {
+			owner = {
+				OR = {
+					original_tag = LCT
+					has_country_flag = RIV_annexed_LCT
+				}
+			}
+		}
+		owner = {
+			owns_state = 550
+		}
+	}
+}
+LCT_arty_organization = {
+	name = LCT_arty
+	include = generic_artillery_organization
+	icon = GFX_idea_LCT_jezeagrad_arms
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		can_form_river_fed = yes
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = LCT
+				has_country_flag = RIV_annexed_LCT
+			}
+		}
+	}
+	available = {
+		hidden_trigger = {
+			owner = {
+				OR = {
+					original_tag = LCT
+					has_country_flag = RIV_annexed_LCT
+				}
+			}
+		}
+	}
+}
+LCT_truck_organization = {
+	name = LCT_truck
+	include = generic_motorized_mechanized_organization
+	icon = GFX_idea_LCT_trotyota
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		can_form_river_fed = yes
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = LCT
+				has_country_flag = RIV_annexed_LCT
+			}
+		}
+	}
+	available = {
+		hidden_trigger = {
+			owner = {
+				OR = {
+					original_tag = LCT
+					has_country_flag = RIV_annexed_LCT
+				}
+			}
+		}
+		owner = {
+			owns_state = 387
+		}
+	}
+}
\ No newline at end of file
diff --git a/common/military_industrial_organization/organizations/LSP_organization.txt b/common/military_industrial_organization/organizations/LSP_organization.txt
new file mode 100644
index 00000000000..1474578b961
--- /dev/null
+++ b/common/military_industrial_organization/organizations/LSP_organization.txt
@@ -0,0 +1,124 @@
+LSP_guns_rearington_organization = {
+	name = LSP_guns_rearington
+	include = generic_infantry_equipment_organization
+	icon = GFX_idea_SCS_rearington_arms
+	allowed = {
+		original_tag = LSP
+		has_dlc = "Arms Against Tyranny"
+	}
+	initial_trait = {
+		equipment_bonus = {
+			build_cost_ic = -0.05
+		}
+	}
+}
+LSP_arty_organization = {
+	name = LSP_arty
+	include = generic_artillery_organization
+	icon = GFX_idea_osaka_army_arsenal
+	allowed = {
+		original_tag = LSP
+		has_dlc = "Arms Against Tyranny"
+	}
+	initial_trait = {
+		equipment_bonus = {
+			build_cost_ic = -0.05
+		}
+	}
+}
+LSP_moto_organization = {
+	name = LSP_moto
+	include = generic_motorized_mechanized_organization
+	icon = GFX_idea_morozov_design_bureau
+	allowed = {
+		original_tag = LSP
+		has_dlc = "Arms Against Tyranny"
+	}
+	initial_trait = {
+		equipment_bonus = {
+			build_cost_ic = -0.05
+		}
+	}
+}
+LSP_tank_1_organization = {
+	name = LSP_tank_1
+	include = generic_mobile_tank_organization
+	icon = GFX_idea_LSP_tank_1
+	allowed = {
+		original_tag = LSP
+		has_dlc = "Arms Against Tyranny"
+	}
+	initial_trait = {
+		equipment_bonus = {
+			armor_value = 0.15
+		}
+	}
+}
+LSP_tank_2_organization = {
+	name = LSP_tank_2
+	include = generic_heavy_tank_organization
+	icon = GFX_idea_LSP_tank_2
+	allowed = {
+		original_tag = LSP
+		has_dlc = "Arms Against Tyranny"
+	}
+	initial_trait = {
+		equipment_bonus = {
+			armor_value = 0.15
+		}
+	}
+}
+LSP_air_1_organization = {
+	name = LSP_air_1
+	include = generic_light_aircraft_organization
+	icon = GFX_idea_LSP_air_man
+	allowed = {
+		original_tag = LSP
+		has_dlc = "Arms Against Tyranny"
+	}
+}
+LSP_air_2_organization = {
+	name = LSP_air_2
+	include = generic_medium_aircraft_organization
+	icon = GFX_idea_LSP_air_man_2
+	allowed = {
+		original_tag = LSP
+		has_dlc = "Arms Against Tyranny"
+	}
+}
+LSP_air_3_organization = {
+	name = LSP_air_3
+	include = generic_heavy_aircraft_organization
+	icon = GFX_idea_LSP_air_man_3
+	allowed = {
+		original_tag = LSP
+		has_dlc = "Arms Against Tyranny"
+	}
+}
+LSP_navy_man_organization = {
+	name = LSP_navy_man
+	include = generic_raider_ship_organization
+	icon = GFX_idea_LSP_navy_man
+	allowed = {
+		original_tag = LSP
+		has_dlc = "Arms Against Tyranny"
+	}
+}
+LSP_navy_man_2_organization = {
+	name = LSP_navy_man_2
+	include = generic_task_force_ship_organization
+	icon = GFX_idea_LSP_navy_man_2
+	allowed = {
+		original_tag = LSP
+		has_dlc = "Arms Against Tyranny"
+	}
+}
+LSP_navy_man_3_organization = {
+	name = LSP_navy_man_3
+	include = generic_escort_ship_organization
+	icon = GFX_idea_LSP_navy_man_3
+	allowed = {
+		original_tag = LSP
+		has_dlc = "Arms Against Tyranny"
+	}
+}
\ No newline at end of file
diff --git a/common/military_industrial_organization/organizations/LUS_organization.txt b/common/military_industrial_organization/organizations/LUS_organization.txt
new file mode 100644
index 00000000000..e2d6ddadf2b
--- /dev/null
+++ b/common/military_industrial_organization/organizations/LUS_organization.txt
@@ -0,0 +1,166 @@
+LUS_Nedhern_organization = {
+	name = LUS_Nedhern
+	include = generic_mobile_tank_organization
+	icon = GFX_idea_LUS_Nedhern
+	allowed = {
+		OR = {
+			original_tag = LUS
+			original_tag = GRW
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = LUS
+				AND = {
+					owns_state = 608
+					LUS = { has_completed_focus = LUS_tanks }
+				}
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 608
+			if = {
+				limit = { original_tag = LUS }
+				has_completed_focus = LUS_tanks
+			}
+		}
+	}
+}
+LUS_clover_weaponry_organization = {
+	name = LUS_clover_weaponry
+	include = generic_infantry_equipment_organization
+	icon = GFX_idea_LUS_clover_weaponry
+	allowed = {
+		OR = {
+			original_tag = LUS
+			original_tag = GRW
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = LUS
+				AND = {
+					owns_state = 608
+					LUS = {
+						OR = {
+							has_completed_focus = LUS_lushian_weaponry
+							has_country_flag = opened_lushian_weaponry
+						}
+					}
+				}
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 608
+			if = {
+				limit = { original_tag = LUS }
+				OR = {
+					has_completed_focus = LUS_lushian_weaponry
+					has_country_flag = opened_lushian_weaponry
+				}
+			}
+		}
+	}
+	initial_trait = {
+		equipment_bonus = {
+			build_cost_ic = -0.08
+		}
+	}
+}
+LUS_arty_manufacture_organization = {
+	name = LUS_arty_manufacture
+	include = generic_artillery_organization
+	icon = GFX_idea_LUS_arty_manufacture
+	allowed = {
+		OR = {
+			original_tag = LUS
+			original_tag = GRW
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = LUS
+				AND = {
+					owns_state = 608
+					LUS = { has_completed_focus = LUS_new_artillery }
+				}
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 608
+			if = {
+				limit = { original_tag = LUS }
+				has_completed_focus = LUS_new_artillery
+			}
+		}	
+	}
+}
+LUS_barman_organization = {
+	name = LUS_barman
+	include = generic_light_aircraft_organization
+	icon = GFX_idea_LUS_barman
+	allowed = {
+		OR = {
+			original_tag = LUS
+			original_tag = GRW
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = LUS
+				AND = {
+					owns_state = 608
+					LUS = { has_completed_focus = LUS_griffon_aviation_effort }
+				}
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 608
+			if = {
+				limit = { original_tag = LUS }
+				LUS = {has_completed_focus = LUS_griffon_aviation_effort}
+			}
+		}
+	}
+}
+LUS_bork_organization = {
+	name = LUS_bork
+	include = generic_escort_ship_organization
+	icon = GFX_idea_LUS_bork
+	allowed = {
+		OR = {
+			original_tag = LUS
+			original_tag = GRW
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = LUS
+				owns_state = 608
+			}
+		}
+	}
+	available = {
+		owner = {
+		owns_state = 608
+		}
+	}
+}
\ No newline at end of file
diff --git a/common/military_industrial_organization/organizations/MAN_organization.txt b/common/military_industrial_organization/organizations/MAN_organization.txt
new file mode 100644
index 00000000000..dd1fceb543b
--- /dev/null
+++ b/common/military_industrial_organization/organizations/MAN_organization.txt
@@ -0,0 +1,238 @@
+#####################
+
+###  ##  #  # # #  ## 
+ #  #  # ## # # # #   
+ #  #### # ## ##   #  
+ #  #  # #  # # #   # 
+ #  #  # #  # # # ## 
+
+ #################### 
+
+
+MAN_lancel_organization = {
+	
+	name = MAN_lancel
+	icon = GFX_idea_MAN_lancel
+	include = generic_heavy_tank_organization
+	allowed = {
+		original_tag = MAN 
+		has_dlc = "Arms Against Tyranny"
+	}
+}
+
+MAN_scarab_organization = {
+	
+	name = MAN_scarab
+	icon = GFX_idea_MAN_scarab 
+	include = generic_main_battle_tank_organization
+	allowed = {
+		original_tag = MAN 
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	available = {
+		FROM = {
+			has_country_flag = MAN_unlocked_scarab
+			is_in_faction_with = CHN 
+		}
+	}
+}
+
+
+#####################
+
+ ## #  # ### ###   ## 
+#   #  #  #  #  # #   
+ #  ####  #  ###   #  
+  # #  #  #  #      # 
+##  #  # ### #    ##  
+ 
+#####################
+
+
+MAN_antax_organization = {
+	
+	name = MAN_antax
+	icon = GFX_idea_MAN_antax 
+	include = generic_raider_ship_organization
+	allowed = {
+		original_tag = MAN 
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	available = {
+		FROM = {
+			has_country_flag = MAN_unlocked_antax
+			is_in_faction_with = CHN
+		}
+	}
+}
+
+MAN_albion_dockyards_organization = {
+	
+	name = MAN_albion_dockyards
+	icon = GFX_idea_MAN_armoury_of_detrot
+	include = generic_escort_ship_organization
+	allowed = {
+		original_tag = MAN 
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	available = {
+		FROM = {
+			has_full_control_of_state = 525
+			OR = {
+				has_idea = MAN_collaborator_power_2
+				AND = {
+					NOT = { has_idea = MAN_collaborator_power }
+					NOT = { has_idea = MAN_collaborator_power_1 }
+					NOT = { has_idea = MAN_collaborator_power_2 }
+				}
+			}
+		}
+	}
+}
+
+MAN_seaward_shoals_organization = {
+	
+	name = MAN_seaward_shoals
+	icon = GFX_idea_EQS_seaward
+	include = generic_task_force_ship_organization
+	
+	allowed = {
+		original_tag = MAN 
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	available = {
+		FROM = {
+			has_full_control_of_state = 662
+			OR = {
+				has_idea = MAN_collaborator_power_2
+				AND = {
+					NOT = { has_idea = MAN_collaborator_power }
+					NOT = { has_idea = MAN_collaborator_power_1 }
+					NOT = { has_idea = MAN_collaborator_power_2 }
+				}
+			}
+		}
+	}
+	
+}
+
+
+
+###########################
+
+###  #    ##  #  # ###  ## 
+#  # #   #  # ## # #   #   
+###  #   #### # ## ##   #  
+#    #   #  # #  # #     # 
+#    ### #  # #  # ### ##  
+
+###########################
+
+
+MAN_bury_organization = {
+	
+	name = MAN_bury
+	icon = GFX_idea_MAN_bury 
+	include = generic_medium_aircraft_organization
+	
+	allowed = {
+		original_tag = MAN 
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	available = {
+		FROM = {
+			has_country_flag = MAN_unlocked_bury
+		}
+	}
+	initial_trait = {
+		equipment_bonus = {
+			reliability = 0.04
+		}
+	}
+	# air_accidents_factor = -0.02
+	
+}
+
+MAN_stratusburg_air_organization = {
+	name = MAN_stratusburg_air
+	icon = GFX_idea_EQS_stratus
+	include = generic_cas_aircraft_organization
+	
+	allowed = {
+		original_tag = MAN 
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	available = {
+		FROM = {
+			has_full_control_of_state = 226
+			OR = {
+				has_idea = MAN_collaborator_power_2
+				AND = {
+					NOT = { has_idea = MAN_collaborator_power }
+					NOT = { has_idea = MAN_collaborator_power_1 }
+					NOT = { has_idea = MAN_collaborator_power_2 }
+				}
+			}
+		}
+	}
+}
+
+
+################################### 
+
+#   #  ##  ### ### ###  ### ### #   
+## ## #  #  #  #   #  #  #  #   #   
+# # # ####  #  ##  ###   #  ##  #   
+#   # #  #  #  #   #  #  #  #   #   
+#   # #  #  #  ### #  # ### ### ### 
+
+
+###################################
+
+MAN_nidhogg_industries_organization = {
+	
+	name = MAN_nidhogg_industries
+	icon = GFX_idea_CHN_nidhogg
+	include = generic_infantry_equipment_organization
+	
+	allowed = {
+		original_tag = MAN 
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	available = {
+		FROM = {
+			has_country_flag = MAN_unlocked_nidhogg_industries
+			is_in_faction_with = CHN
+		}
+	}
+	research_categories = {
+		infantry_weapons
+		jager_tech
+	}
+	
+}
+
+MAN_fillydelphia_motors_organization = {
+	
+	name = MAN_fillydelphia_motors
+	icon = GFX_idea_EQS_fillydelphia_arms 
+	include = generic_motorized_mechanized_organization
+	allowed = {
+		original_tag = MAN 
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	available = {
+		FROM = {
+			has_country_flag = MAN_unlocked_fillydelphia_motors
+			has_full_control_of_state = 12
+		}
+	}
+}
diff --git a/common/military_industrial_organization/organizations/MIT_organization.txt b/common/military_industrial_organization/organizations/MIT_organization.txt
new file mode 100644
index 00000000000..b2bb705e5a0
--- /dev/null
+++ b/common/military_industrial_organization/organizations/MIT_organization.txt
@@ -0,0 +1,221 @@
+
+########    ###    ##    ## ##    ##  ######  
+   ##      ## ##   ###   ## ##   ##  ##    ## 
+   ##     ##   ##  ####  ## ##  ##   ##       
+   ##    ##     ## ## ## ## #####     ######  
+   ##    ######### ##  #### ##  ##         ## 
+   ##    ##     ## ##   ### ##   ##  ##    ## 
+   ##    ##     ## ##    ## ##    ##  ######  
+
+MIT_aspis_organization = {
+	name = MIT_aspis
+	include = generic_mobile_tank_organization
+	icon = GFX_idea_MIT_aspis
+
+	allowed = {
+		original_tag = MIT
+		has_dlc = "Arms Against Tyranny"
+	}
+}
+placeholder_name_amphibious_tank_designer_organization = {
+	name = placeholder_name_amphibious_tank_designer
+	include = generic_tank_organization
+	icon = generic_tank_manufacturer_2
+
+    equipment_type = {  
+        mio_cat_eq_all_amphibious_tank
+    }
+
+    research_categories = { 
+        mio_cat_tech_light_armor_and_modules
+    }
+	initial_trait = {
+		name = MIT_amtank_designer
+	}
+	allowed = {
+		OR = {
+			original_tag = SIC
+			original_tag = MIT
+		}
+		has_dlc = "Arms Against Tyranny"
+		has_dlc = "Man the Guns"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = MIT
+				has_global_flag = SIC_minotaurian_business_flag
+			}
+		}
+	}
+}
+
+
+ ######  ##     ## #### ########   ######  
+##    ## ##     ##  ##  ##     ## ##    ## 
+##       ##     ##  ##  ##     ## ##       
+ ######  #########  ##  ########   ######  
+      ## ##     ##  ##  ##              ## 
+##    ## ##     ##  ##  ##        ##    ## 
+ ######  ##     ## #### ##         ######  
+
+
+
+ MIT_republican_naval_shipyard_organization = {
+	name =  MIT_republican_naval_shipyard
+	include = generic_battle_line_ship_organization
+	icon = GFX_idea_MIT_republican_naval_shipyard
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		original_tag = MIT
+	}
+	initial_trait = {
+		organization_modifier = {
+			military_industrial_organization_research_bonus = 0.05
+		}
+	}
+}
+
+
+
+MIT_okeanos_shipworks_organization = {
+	name =  MIT_okeanos_shipworks
+	include = generic_escort_ship_organization
+	icon = GFX_idea_MIT_okeanos_shipworks
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		original_tag = MIT
+	}
+	initial_trait = {
+		organization_modifier = {
+			military_industrial_organization_research_bonus = 0.05
+		}
+	}
+}
+
+
+########  ##          ###    ##    ## ########  ######  
+##     ## ##         ## ##   ###   ## ##       ##    ## 
+##     ## ##        ##   ##  ####  ## ##       ##       
+########  ##       ##     ## ## ## ## ######    ######  
+##        ##       ######### ##  #### ##             ## 
+##        ##       ##     ## ##   ### ##       ##    ## 
+##        ######## ##     ## ##    ## ########  ######  
+
+
+MIT_ikaros_organization = {
+	name = MIT_ikaros
+	include = generic_light_aircraft_organization
+	icon = GFX_idea_MIT_ikaros
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		original_tag = MIT
+	}
+	
+}
+
+
+MIT_gypaetos_organization = {
+	name = MIT_gypaetos
+	include = generic_cas_aircraft_organization	
+	icon = GFX_idea_MIT_gypaetos
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		original_tag = MIT
+	}
+	
+}
+MIT_rodopelekanos_organization = {
+	name = MIT_rodopelekanos
+	include = generic_naval_aircraft_organization
+	icon = GFX_idea_MIT_rodopelekanos
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		original_tag = MIT
+	}
+	
+}
+
+MIT_placeholder_name_air_designer_organization = {
+	name = placeholder_name_air_designer
+	include = generic_naval_aircraft_organization
+	icon = GFX_idea_aichi
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = SIC
+			original_tag = MIT
+		}
+	}
+		
+	visible = {
+		owner = {
+			OR = {
+				original_tag = MIT
+				has_global_flag = SIC_minotaurian_business_flag
+			}
+		}
+	}
+
+	
+}
+
+##     ##    ###    ######## ######## ########  #### ######## ##       
+###   ###   ## ##      ##    ##       ##     ##  ##  ##       ##       
+#### ####  ##   ##     ##    ##       ##     ##  ##  ##       ##       
+## ### ## ##     ##    ##    ######   ########   ##  ######   ##       
+##     ## #########    ##    ##       ##   ##    ##  ##       ##       
+##     ## ##     ##    ##    ##       ##    ##   ##  ##       ##       
+##     ## ##     ##    ##    ######## ##     ## #### ######## ######## 
+
+
+
+
+MIT_arma_organization = {
+	include = generic_motorized_mechanized_organization
+	name = MIT_arma
+	icon = GFX_idea_MIT_arma
+
+	allowed = {
+		original_tag = MIT
+		has_dlc = "Arms Against Tyranny"
+	}
+	initial_trait = {
+		organization_modifier = {
+			military_industrial_organization_research_bonus = 0.05
+		}
+	}
+}
+
+
+MIT_national_armory_organization = {
+	include = generic_infantry_equipment_organization
+	name = MIT_national_armory
+	icon = GFX_idea_MIT_national_armory
+
+	allowed = {
+		original_tag = MIT
+		has_dlc = "Arms Against Tyranny"
+	}
+	initial_trait = {
+		organization_modifier = {
+			military_industrial_organization_research_bonus = 0.05
+		}
+	}
+}
+
+MIT_hephaistos_organization = {
+	include = generic_artillery_organization
+	name = MIT_hephaistos
+	icon = GFX_idea_MIT_hephaistos
+
+	allowed = {
+		original_tag = MIT
+		has_dlc = "Arms Against Tyranny"
+	}
+	initial_trait = {
+		organization_modifier = {
+			military_industrial_organization_research_bonus = 0.05
+		}
+	}
+}
diff --git a/common/military_industrial_organization/organizations/MNC_organization.txt b/common/military_industrial_organization/organizations/MNC_organization.txt
new file mode 100644
index 00000000000..4981e78775d
--- /dev/null
+++ b/common/military_industrial_organization/organizations/MNC_organization.txt
@@ -0,0 +1,62 @@
+MNC_bandits_black_market_organization = {
+	name = MNC_bandits_black_market
+	include = generic_infantry_equipment_organization
+	icon = GFX_idea_MNC_bandits_black_market
+	allowed = {
+		OR = {
+			original_tag = MNC
+			original_tag = BAN
+			original_tag = GFF
+			original_tag = FEZ
+			original_tag = LUS
+			original_tag = SIC
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	available = {
+		owner = {
+			has_government = fascism
+		}
+	}
+	initial_trait = {
+		equipment_bonus = {
+			build_cost_ic = -0.2
+		}
+		organization_modifier = {
+			military_industrial_organization_design_team_assign_cost = -0.33
+		}
+	}
+}
+MNC_brantbeak_aircraft_factory_organization = {
+	name = MNC_brantbeak_aircraft_factory
+	include = generic_light_aircraft_organization
+	icon = GFX_idea_MNC_brantbeak_aircraft_factory
+	allowed = {
+		OR = {
+			original_tag = MNC
+			original_tag = FAT
+			original_tag = FAW
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = MNC
+				AND = {
+					owns_state = 581
+					MNC = { has_completed_focus = MNC_air_1 }
+				}
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 581
+			if = {
+				limit = { original_tag = MNC }
+				has_completed_focus = MNC_air_1
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/common/military_industrial_organization/organizations/MQA_organization.txt b/common/military_industrial_organization/organizations/MQA_organization.txt
new file mode 100644
index 00000000000..437e6072473
--- /dev/null
+++ b/common/military_industrial_organization/organizations/MQA_organization.txt
@@ -0,0 +1,121 @@
+MQA_light_tank_maker_organization = {
+	name = MQA_light_tank_maker
+	icon = GFX_idea_generic_tank_manufacturer_3
+	allowed = {
+		original_tag = MQA
+		has_dlc = "Arms Against Tyranny"
+	}
+	include = generic_mobile_tank_organization
+}
+
+MQA_medium_tank_maker_organization = {
+	name = MQA_medium_tank_maker
+	icon = GFX_idea_generic_tank_manufacturer_2
+	allowed = {
+		original_tag = MQA
+		has_dlc = "Arms Against Tyranny"
+	}
+	include = generic_medium_tank_organization
+}
+
+MQA_heavy_tank_maker_organization = {
+	name = MQA_heavy_tank_maker
+	icon = GFX_idea_generic_tank_manufacturer_1
+	allowed = {
+		original_tag = MQA
+		has_dlc = "Arms Against Tyranny"
+	}
+	include = generic_heavy_tank_organization
+}
+MQA_heavy_ships_organization = {
+	name = MQA_heavy_ships
+	icon = GFX_idea_generic_naval_manufacturer_1
+	allowed = {
+		original_tag = MQA
+		has_dlc = "Arms Against Tyranny"
+	}
+	include = generic_battle_line_ship_organization
+	initial_trait = {
+		organization_modifier = {
+			military_industrial_organization_research_bonus = 0.05
+		}
+	}
+}
+
+MQA_trade_protection_organization = {
+	name = MQA_trade_protection
+	icon = GFX_idea_generic_naval_manufacturer_2
+	allowed = {
+		original_tag = MQA
+		has_dlc = "Arms Against Tyranny"
+	}
+	include = generic_escort_ship_organization
+	initial_trait = {
+		organization_modifier = {
+			military_industrial_organization_research_bonus = 0.05
+		}
+	}
+}
+
+MQA_coast_protection_organization = {
+	name = MQA_coast_protection
+	icon = GFX_idea_generic_naval_manufacturer_3
+	allowed = {
+		original_tag = MQA
+		has_dlc = "Arms Against Tyranny"
+	}
+	include = generic_task_force_ship_organization
+	initial_trait = {
+		organization_modifier = {
+			military_industrial_organization_research_bonus = 0.05
+		}
+	}
+}
+MQA_pew_pew_shooty_planes_organization = {
+	name = MQA_pew_pew_shooty_planes
+	icon = GFX_idea_generic_air_manufacturer_1
+	allowed = {
+		original_tag = MQA
+		has_dlc = "Arms Against Tyranny"
+	}
+	include = generic_cas_aircraft_organization
+}
+
+MQA_cheap_planes_organization = {
+	name = MQA_cheap_planes
+	icon = GFX_idea_generic_air_manufacturer_2
+	allowed = {
+		original_tag = MQA
+		has_dlc = "Arms Against Tyranny"
+	}
+	include = generic_range_focused_aircraft_organization
+}
+
+MQA_heavy_planes_organization = {
+	name = MQA_heavy_planes
+	icon = GFX_idea_generic_air_manufacturer_3
+	allowed = {
+		original_tag = MQA
+		has_dlc = "Arms Against Tyranny"
+	}
+	include = generic_heavy_aircraft_organization
+}
+MQA_gun_making_organization = {
+	name = MQA_gun_making
+	icon = GFX_idea_generic_infantry_equipment_manufacturer_2
+	allowed = {
+		original_tag = MQA
+		has_dlc = "Arms Against Tyranny"
+	}
+	include = generic_infantry_equipment_organization
+}
+
+MQA_massive_cannon_making_organization = {
+	name = MQA_massive_cannon_making
+	icon = GFX_idea_generic_artillery_manufacturer_2
+	allowed = {
+		original_tag = MQA
+		has_dlc = "Arms Against Tyranny"
+	}
+	include = generic_artillery_organization
+}
\ No newline at end of file
diff --git a/common/military_industrial_organization/organizations/NCH_organization.txt b/common/military_industrial_organization/organizations/NCH_organization.txt
new file mode 100644
index 00000000000..e2d569c3ab0
--- /dev/null
+++ b/common/military_industrial_organization/organizations/NCH_organization.txt
@@ -0,0 +1,237 @@
+NCH_generic_infantry_equipment_manufacturer_organization = {
+	name = NCH_generic_infantry_equipment_manufacturer
+	icon = GFX_idea_NCH_generic_gun
+
+	allowed = {
+		can_form_river_fed = yes
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = NCH
+				has_country_flag = RIV_annexed_NCH
+			}
+		}
+	}
+	available = {
+		owner = {
+			NCH = { has_completed_focus = NCH_inf_weapons }
+			hidden_trigger = {
+				OR = {
+					original_tag = NCH
+					has_country_flag = RIV_annexed_NCH
+				}
+			}
+		}
+	}
+	include = generic_infantry_equipment_organization
+}
+
+NCH_reichswaffen_organization = {
+	name = NCH_reichswaffen
+	icon = GFX_idea_GRI_imperial_arms_co
+
+	allowed = {
+		original_tag = NCH
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = { 
+		owner = {
+			has_country_flag = NCH_griffon_rifles_flag 
+		}
+	}
+	available = { 
+		owner = {
+			has_country_flag = NCH_griffon_rifles_flag 
+		}
+	}
+	include = generic_infantry_equipment_organization
+}
+
+NCH_greda_organization = {
+	name = NCH_greda
+	icon = GFX_idea_WNG_greda
+	
+	allowed = {
+		original_tag = NCH
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = { 
+		owner = {
+			has_country_flag = NCH_greda_flag 
+		}
+	}
+	available = { 
+		owner = {
+			has_country_flag = NCH_greda_flag 
+		}
+	}
+	include = generic_artillery_organization
+}
+NCH_longchlois_organization = {
+	name = longchlois
+	icon = GFX_idea_NCH_longchlois
+
+	allowed = {
+		can_form_river_fed = yes
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = NCH
+				AND = {
+					has_country_flag = RIV_annexed_NCH
+					NCH = { has_country_flag = NCH_naval_yards_flag }
+				}
+			}
+		}
+	}
+	available = {
+		owner = {
+			if = {
+				limit = { original_tag = NCH }
+				has_country_flag = NCH_naval_yards_flag
+			}
+		}
+	}
+	include = generic_escort_ship_organization
+}
+NCH_generic_light_aircraft_manufacturer_organization = {
+	name = NCH_generic_light_aircraft_manufacturer
+	icon = GFX_idea_NCH_generic_light_aircraft_manufacturer
+	allowed = {
+		can_form_river_fed = yes
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = NCH
+				has_country_flag = RIV_annexed_NCH
+			}
+		}
+	}
+	available = {
+		owner = {
+			hidden_trigger = {
+				OR = {
+					original_tag = NCH
+					has_country_flag = RIV_annexed_NCH
+				}
+			}
+		}
+	}
+	include = generic_light_aircraft_organization
+}
+
+NCH_generic_medium_aircraft_manufacturer_organization = {
+	name = NCH_generic_medium_aircraft_manufacturer
+	icon = GFX_idea_NCH_generic_medium_aircraft_manufacturer
+	allowed = {
+		can_form_river_fed = yes
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = NCH
+				has_country_flag = RIV_annexed_NCH
+			}
+		}
+	}
+	available = {
+		owner = {
+			hidden_trigger = {
+				OR = {
+					original_tag = NCH
+					has_country_flag = RIV_annexed_NCH
+				}
+			}
+		}
+	}
+	include = generic_medium_aircraft_organization
+}
+
+NCH_generic_heavy_aircraft_manufacturer_organization = {
+	name = NCH_generic_heavy_aircraft_manufacturer
+	icon = GFX_idea_NCH_generic_heavy_aircraft_manufacturer
+	allowed = {
+		can_form_river_fed = yes
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = NCH
+				has_country_flag = RIV_annexed_NCH
+			}
+		}
+	}
+	available = {
+		owner = {
+			hidden_trigger = {
+				OR = {
+					original_tag = NCH
+					has_country_flag = RIV_annexed_NCH
+				}
+			}
+		}
+	}
+	include = generic_heavy_aircraft_organization
+}
+
+NCH_generic_naval_aircraft_manufacturer_organization = {
+	name = NCH_generic_naval_aircraft_manufacturer
+	icon = GFX_idea_NCH_generic_naval_aircraft_manufacturer
+	allowed = {
+		can_form_river_fed = yes
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = NCH
+				has_country_flag = RIV_annexed_NCH
+			}
+		}
+	}
+	available = {
+		owner = {
+			hidden_trigger = {
+				OR = {
+					original_tag = NCH
+					has_country_flag = RIV_annexed_NCH
+				}
+			}
+		}
+	}
+	include = generic_naval_aircraft_organization
+}
+NCH_generic_tank_manufacturer_organization = {
+	name = NCH_generic_tank_manufacturer
+	icon = GFX_idea_NCH_generic_tank_manufacturer
+	allowed = {
+		can_form_river_fed = yes
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = NCH
+				has_country_flag = RIV_annexed_NCH
+			}
+		}
+	}
+	available = {
+		owner = {
+			hidden_trigger = {
+				OR = {
+					original_tag = NCH
+					has_country_flag = RIV_annexed_NCH
+				}
+			}
+		}
+	}
+	include = generic_tank_organization
+}
\ No newline at end of file
diff --git a/common/military_industrial_organization/organizations/NCR_organization.txt b/common/military_industrial_organization/organizations/NCR_organization.txt
new file mode 100644
index 00000000000..82f8829c00f
--- /dev/null
+++ b/common/military_industrial_organization/organizations/NCR_organization.txt
@@ -0,0 +1,130 @@
+
+NCR_high_noon_manufacturer_organization = {
+	name = high_noon_manufacturer
+	icon = GFX_idea_trl_dakka
+
+	allowed = {
+		original_tag = NCR
+		has_dlc = "Arms Against Tyranny"
+	}
+	include = generic_infantry_equipment_organization
+	initial_trait = {
+		equipment_bonus = {
+			build_cost_ic = -0.05
+		}
+	}
+}
+
+NCR_cheap_weapon_manufacturer_organization = {
+	name = cheap_weapon_manufacturer
+	icon = GFX_idea_company_pile_of_guns
+
+	allowed = {
+		original_tag = NCR
+		has_dlc = "Arms Against Tyranny"
+	}
+	include = generic_infantry_equipment_organization
+	initial_trait = {
+		equipment_bonus = {
+			build_cost_ic = -0.3
+			soft_attack = -0.1
+			reliability = -0.1
+		}
+	}
+}
+
+NCR_car_manufacturer_organization = {
+	name = car_manufacturer
+	icon = GFX_idea_wheelmothers_garage
+
+	allowed = {
+		original_tag = NCR
+		has_dlc = "Arms Against Tyranny"
+	}
+	include = generic_motorized_mechanized_organization
+	initial_trait = {
+		limit_to_equipment_type = { motorized_equipment } 
+		equipment_bonus = {
+			fuel_consumption = 0.1
+			maximum_speed = 0.25
+		}
+	}
+}
+NCR_air_support_manufacturer_organization = {
+	name = air_support_manufacturer
+	icon = GFX_idea_ncr_victoria
+	allowed = {
+		original_tag = NCR
+		has_dlc = "Arms Against Tyranny"
+	}
+	include = generic_cas_aircraft_organization
+	add_trait = { 
+        token = NCR_agile_CAS
+        name = agile_CAS_manufacturer
+        icon = GFX_generic_mio_trait_icon_air_agility
+        special_trait_background  = yes
+        position = { x=1 y=0 }
+
+
+        limit_to_equipment_type = {
+            anti_air_equipment
+        }
+
+        equipment_bonus = {
+            air_agility = 0.1 
+        }
+	}
+}
+NCR_raiding_fleet_naval_manufacturer_ncr_organization = {
+	name = raiding_fleet_naval_manufacturer_ncr
+	icon = GFX_idea_billbattle
+	allowed = {
+		original_tag = NCR
+		has_dlc = "Arms Against Tyranny"
+	}
+	include = generic_raider_ship_organization
+}
+
+NCR_coastal_defence_naval_manufacturer_ncr_organization = {
+	name = coastal_defence_naval_manufacturer_ncr
+	icon = GFX_idea_canoeoe
+	allowed = {
+		original_tag = NCR
+		has_dlc = "Arms Against Tyranny"
+	}
+	include = generic_escort_ship_organization
+}
+NCR_timstanks_manufacturer_organization = {
+	name = timstanks_manufacturer
+	icon = GFX_idea_timtank
+	allowed = {
+		original_tag = NCR
+		has_dlc = "Arms Against Tyranny"
+	}
+	include = generic_mobile_tank_organization
+	initial_trait = {
+		name = ROM_mio_trait_mobile_tank_destroyers
+		
+		limit_to_equipment_type = { 
+			mio_cat_eq_all_tank_destroyers
+		}
+		
+		equipment_bonus = {
+			reliability = 0.05
+			hard_attack = 0.05
+			ap_attack = 0.05
+		}
+	}
+
+	override_trait = {
+		token = generic_mio_enlarged_breech
+		limit_to_equipment_type = { 
+			mio_cat_eq_all_tank_destroyers
+		}
+		equipment_bonus = {
+			hard_attack = 0.05
+			ap_attack = 0.1
+		}
+		special_trait_background = yes
+	}
+}
\ No newline at end of file
diff --git a/common/military_industrial_organization/organizations/NLR_organization.txt b/common/military_industrial_organization/organizations/NLR_organization.txt
new file mode 100644
index 00000000000..d8c809672e8
--- /dev/null
+++ b/common/military_industrial_organization/organizations/NLR_organization.txt
@@ -0,0 +1,446 @@
+#####################
+
+###  ##  #  # # #  ## 
+ #  #  # ## # # # #   
+ #  #### # ## ##   #  
+ #  #  # #  # # #   # 
+ #  #  # #  # # # ## 
+
+ #################### 
+
+NLR_detrot_organization = {
+
+	name = NLR_detrot
+	icon = GFX_idea_NLR_detrot
+	include = generic_mobile_tank_organization
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			tag = NLR
+			tag = MAN
+			tag = ELF
+		}
+	}
+	
+	available = {
+		FROM = {
+			if = {
+				limit = { original_tag = ELF }
+				has_full_control_of_state = 349
+			}
+			if = {
+				limit = { original_tag = MAN }
+				has_full_control_of_state = 349
+				OR = {
+					has_idea = MAN_collaborator_power_2
+					AND = { 
+						NOT = { has_idea = MAN_collaborator_power }
+						NOT = { has_idea = MAN_collaborator_power_1 }
+						NOT = { has_idea = MAN_collaborator_power_2 }
+					}
+				}
+			}
+		}
+	}
+}
+
+NLR_nightmare_organization = {
+
+	name = NLR_nightmare
+	icon = GFX_idea_NLR_nightmare
+	include = generic_heavy_tank_organization
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		original_tag = NLR 
+	}
+}
+
+NLR_shoof_organization = {
+	
+	name = NLR_shoof
+	icon = GFX_idea_EQS_shoof 
+	include = generic_medium_tank_organization
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		original_tag = NLR 
+	}
+	visible = {
+		FROM = {
+			has_country_flag = NLR_equestrian_companies
+		}
+	}
+
+	initial_trait = {
+		organization_modifier = {
+			military_industrial_organization_research_bonus = 0.05
+		}
+		equipment_bonus = {
+			maximum_speed = 0.1
+			reliability = 0.05
+			armor_value = -0.1
+		}
+	}
+
+	add_trait = { 
+		token = NLR_mio_trait_expanded_turret_capacity
+		name = ENG_mio_trait_expanded_turret_capacity
+		icon = GFX_generic_mio_department_icon_tank_medium_tank_engine
+		special_trait_background = yes
+
+		position = { x=1 y=1 }
+		relative_position_id = generic_mio_trait_all_round_cupola
+
+		any_parent = { generic_mio_trait_all_round_cupola }
+		limit_to_equipment_type = { mio_cat_eq_all_medium_tank }
+
+		equipment_bonus = {
+			reliability = 0.05
+			armor_value = 0.05
+			breakthrough = 0.05
+		}
+	}
+
+	add_trait = { 
+		token = NLR_mio_trait_expanded_production_facilities
+		name = ENG_mio_trait_expanded_production_facilities
+		icon = GFX_generic_mio_department_icon_tank_medium_tank_technology
+		special_trait_background = yes
+
+		position = { x=2 y=1 }
+		relative_position_id = generic_mio_trait_simplified_turret_design
+
+		all_parents = { generic_mio_trait_simplified_turret_design generic_mio_trait_armor_steel_working }
+		production_bonus = {
+			production_efficiency_cap_factor = 0.1
+			production_efficiency_gain_factor = 0.1
+		}
+		
+	}
+
+}
+
+
+#####################
+
+ ## #  # ### ###   ## 
+#   #  #  #  #  # #   
+ #  ####  #  ###   #  
+  # #  #  #  #      # 
+##  #  # ### #    ##  
+ 
+#####################
+
+NLR_orca_organization = {
+	name = NLR_orca
+	icon = GFX_idea_NLR_orca
+	include = generic_escort_ship_organization
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		original_tag = NLR 
+	}
+
+}
+
+NLR_moonglade_organization = {
+
+	name = NLR_moonglade
+	icon = GFX_idea_NLR_moonglade
+	include = generic_raider_ship_organization
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		original_tag = NLR 
+	}
+}
+
+
+###########################
+
+###  #    ##  #  # ###  ## 
+#  # #   #  # ## # #   #   
+###  #   #### # ## ##   #  
+#    #   #  # #  # #     # 
+#    ### #  # #  # ### ##  
+
+###########################
+
+NLR_moonlight_organization = {
+
+	name = NLR_moonlight
+	icon = GFX_idea_NLR_moonlight
+	include = generic_high_agility_fighter_aircraft_organization
+	allowed = {	
+		has_dlc = "Arms Against Tyranny"
+		original_tag = NLR 
+	}
+
+	equipment_type = {
+		mio_cat_eq_all_small_plane
+		maritime_patrol_plane
+	}	
+
+	research_categories = {	
+		mio_cat_all_light_fighter_and_modules 
+#		mio_cat_all_naval_bomber_and_modules 
+			#Could be used to allow Supermarine to research naval bombs, but this could overpower English fighter MIO trait gain early on.
+	}
+	
+	override_trait = {
+		token = generic_mio_trait_fuel_injection_engines
+		
+		position = { x=0 y=2 }
+		relative_position_id = generic_mio_trait_bigger_engines
+	}
+
+	override_trait = {
+		token = generic_mio_trait_high_octane_fuels
+		
+		position = { x=1 y=1 }
+		relative_position_id = generic_mio_trait_bigger_engines
+	}
+
+	override_trait = {
+		token = generic_mio_trait_subsidiary_suppliers
+		
+		position = { x=0 y=2 }
+		relative_position_id = generic_mio_trait_fuel_injection_engines
+	}
+
+
+	add_trait = { 
+		token = NLR_mio_trait_seaplane_origins
+		name = ENG_mio_trait_seaplane_origins
+		icon = GFX_generic_mio_trait_icon_detection
+		special_trait_background = yes
+
+		position = { x=2 y=0 }
+		relative_position_id = generic_mio_trait_minimum_weapon_requirements
+
+		#any_parent = { generic_mio_trait_super_heavy_shells generic_mio_trait_semi_armor_piercing_shells generic_mio_trait_high_velocity_guns }
+
+		limit_to_equipment_type = { mio_cat_eq_all_small_plane mio_cat_eq_all_large_plane }
+
+		equipment_bonus = {
+			sub_detection = 0.05
+			surface_detection = 0.05
+			naval_strike_targetting = 0.1
+		}
+	}
+
+	add_trait = { 
+		token = NLR_mio_trait_elliptical_wings
+		name = ENG_mio_trait_elliptical_wings
+		icon = GFX_generic_mio_trait_icon_defense
+		special_trait_background = yes
+
+		position = { x=0 y=1 }
+		relative_position_id = generic_mio_trait_cantilever_wing_structure
+
+		any_parent = { generic_mio_trait_cantilever_wing_structure }
+
+		equipment_bonus = {
+			air_defence = 0.1	
+		}
+	}
+
+	add_trait = { 
+		token = NLR_mio_trait_supercharger
+		name = ENG_mio_trait_supercharger
+		icon = GFX_generic_mio_trait_icon_defense
+		special_trait_background = yes
+
+		position = { x=1 y=1 }
+		relative_position_id = generic_mio_trait_fuel_injection_engines
+
+		all_parents = { generic_mio_trait_fuel_injection_engines generic_mio_trait_high_octane_fuels }
+
+		equipment_bonus = {
+			air_defence = 0.1	
+		}
+	}
+}
+
+NLR_starfall_organization = {
+
+	name = NLR_starfall
+	icon = GFX_idea_NLR_starfall
+	include = generic_medium_aircraft_organization
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		original_tag = NLR 
+	}
+}
+
+NLR_northern_organization = {
+	
+	name = NLR_northern
+	icon = GFX_idea_NLR_northern
+	include = generic_heavy_aircraft_organization
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		original_tag = NLR 
+	}
+	visible = {
+		owner = {
+			has_country_flag = NLR_equestrian_companies
+		}
+	}
+	available = {
+		owner = {
+			hidden_trigger = {
+				has_country_flag = NLR_equestrian_companies
+			}
+		}
+	}
+
+}
+
+NLR_ultramarine_organization = {
+
+	name = NLR_ultramarine
+	icon = GFX_idea_EQS_ultramarine
+	include = generic_naval_aircraft_organization
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		original_tag = NLR 
+	}
+	visible = {
+		owner = {
+			has_country_flag = NLR_equestrian_companies
+		}
+	}
+	available = {
+		owner = {
+			hidden_trigger = {
+				has_country_flag = NLR_equestrian_companies
+			}
+		}
+	}
+}
+
+NLR_stratus_organization = {
+	
+	name = NLR_stratus
+	icon = GFX_idea_EQS_stratus
+	include = generic_cas_aircraft_organization
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		original_tag = NLR 
+	}
+	visible = {
+		owner = {
+			has_country_flag = NLR_equestrian_companies
+		}
+	}
+	available = {
+		owner = {
+			hidden_trigger = {
+				has_country_flag = NLR_equestrian_companies
+			}
+		}
+	}
+
+}
+
+
+################################### 
+
+#   #  ##  ### ### ###  ### ### #   
+## ## #  #  #  #   #  #  #  #   #   
+# # # ####  #  ##  ###   #  ##  #   
+#   # #  #  #  #   #  #  #  #   #   
+#   # #  #  #  ### #  # ### ### ### 
+
+
+###################################
+
+
+NLR_m_arsenal_organization = {
+
+	name = NLR_m_arsenal
+	icon = GFX_idea_NLR_m_arsenal 
+	include = generic_infantry_equipment_organization
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			tag = NLR
+			tag = MAN
+			tag = ELF
+		}
+	}
+	available = {
+		FROM = {
+			if = {
+				limit = { original_tag = ELF }
+				has_full_control_of_state = 75
+			}
+			if = {
+				limit = { original_tag = MAN }
+				has_full_control_of_state = 75
+				OR = {
+					has_idea = MAN_collaborator_power_2
+					AND = { 
+						NOT = { has_idea = MAN_collaborator_power }
+						NOT = { has_idea = MAN_collaborator_power_1 }
+						NOT = { has_idea = MAN_collaborator_power_2 }
+					}
+				}
+			}
+		}
+	}
+	override_trait = { 
+		token = generic_mio_trait_anti_vechicle_land_mines	
+		name = ENG_mio_trait_piat	
+		icon = GFX_generic_mio_trait_icon_hard_attack
+		special_trait_background = yes
+
+		equipment_bonus = {
+			hard_attack = 0.05
+			defense = 0.05
+			breakthrough = 0.1
+		}
+	}
+
+	add_trait = { 
+		token = NLR_mio_trait_sten_submachine_guns	
+		name = ENG_mio_trait_sten_submachine_guns	
+		icon = GFX_generic_mio_trait_icon_ap_attack
+		special_trait_background = yes
+
+		position = { x=1 y=1 }
+		relative_position_id = generic_mio_trait_drum_pattern_sights
+
+		any_parent = { generic_mio_trait_reinforced_stocks generic_mio_trait_drum_pattern_sights }
+
+		equipment_bonus = {
+			reliability = 0.05
+			soft_attack = 0.03
+			ap_attack = 0.05
+		}
+	}
+}
+
+NLR_thunder_organization = {
+	name = NLR_thunder
+	icon = GFX_idea_NLR_thunder 
+	include = generic_artillery_organization
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		original_tag = NLR 
+	}
+}
+
+NLR_triumph_organization = {
+
+	name = NLR_triumph
+	icon = GFX_idea_NLR_triumph
+	include = generic_motorized_mechanized_organization
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		original_tag = NLR 
+	}
+	initial_trait = {
+		equipment_bonus = {
+			maximum_speed = 0.05
+		}
+	}
+}
diff --git a/common/military_industrial_organization/organizations/OLE_organization.txt b/common/military_industrial_organization/organizations/OLE_organization.txt
new file mode 100644
index 00000000000..c748653bb56
--- /dev/null
+++ b/common/military_industrial_organization/organizations/OLE_organization.txt
@@ -0,0 +1,683 @@
+#####################
+
+###  ##  #  # # #  ## 
+ #  #  # ## # # # #   
+ #  #### # ## ##   #  
+ #  #  # #  # # #   # 
+ #  #  # #  # # # ## 
+
+ #################### 
+
+OLE_haakon_tank_co_organization = {
+
+	name = OLE_haakon_tank_co
+	icon = GFX_idea_OLE_haakon_tank_co
+	include = generic_mobile_tank_organization
+	allowed = {
+		tag = OLE
+		has_dlc = "Arms Against Tyranny"
+	}
+	add_trait = {
+		token = OLE_mio_trait_german_landsverk_tech_exchange
+		name = OLE_mio_trait_german_landsverk_tech_exchange
+		icon = GFX_generic_mio_department_icon_facilities
+		relative_position_id = generic_mio_streamlined_production
+		all_parents = { generic_mio_streamlined_production }
+		special_trait_background  = yes
+		position = { x=0 y=1 }
+		available = { OLE = { has_completed_focus = OLE_accept_servitude } }
+		production_bonus = {
+			production_capacity_factor = 0.03
+		}
+
+		organization_modifier = {
+			military_industrial_organization_research_bonus = 0.08
+		
+		}
+	}
+	
+}
+
+OLE_mihari_oranization = {
+	name = OLE_mihari
+	icon = GFX_idea_OLE_mihari
+	include = generic_medium_tank_organization
+	allowed = {
+		tag = OLE
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+}
+
+#####################
+
+ ## #  # ### ###   ## 
+#   #  #  #  #  # #   
+ #  ####  #  ###   #  
+  # #  #  #  #      # 
+##  #  # ### #    ##  
+ 
+#####################
+
+OLE_hjortland_naval_dockyards_organization = {
+	name = OLE_hjortland_naval_dockyards
+	icon = GFX_idea_OLE_hjortland_naval_dockyards 
+	include = generic_escort_ship_organization
+	allowed = {
+		tag = OLE
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+}
+
+OLE_peura_shipbuilders_organization = {
+	name = OLE_peura_shipbuilders
+	icon = GFX_idea_OLE_peura_shipbuilders 
+	include = generic_raider_ship_organization
+	allowed = {
+		tag = OLE
+		has_dlc = "Arms Against Tyranny"
+	}
+
+	
+	tree_header_text = {
+		text = mio_header_long_range_focus
+		x = 2
+	}
+
+	tree_header_text = {
+		text = mio_header_high_speed_focus
+		x = 8
+	}
+
+	override_trait = {
+		token = generic_mio_trait_long_range_raiding
+
+		position = { x=2 y=0 }
+	}
+
+	add_trait = { 
+		token = OLE_mio_trait_andros_engines
+		name = FIN_mio_trait_andros_engines
+		icon = GFX_generic_mio_department_icon_ship_general_engine
+		special_trait_background = yes
+
+		position = { x=2 y=1 }
+		relative_position_id = generic_mio_trait_long_range_raiding
+
+		mutually_exclusive = { OLE_mio_trait_wartsila_engine_production }
+
+		any_parent = { generic_mio_trait_long_range_raiding generic_mio_trait_high_speed_raiding }
+		
+		equipment_bonus = {
+			naval_range = 0.05
+			naval_speed = 0.05
+			fuel_consumption = -0.05
+		}
+	}
+
+	add_trait = { 
+		token = OLE_mio_trait_wartsila_engine_production
+		name = FIN_mio_trait_wartsila_engine_production
+		icon = GFX_generic_mio_department_icon_ship_general_production
+		special_trait_background = yes
+
+		mutually_exclusive = { OLE_mio_trait_andros_engines }
+
+		position = { x=-2 y=1 }
+		relative_position_id = generic_mio_trait_high_speed_raiding
+
+		any_parent = { generic_mio_trait_long_range_raiding generic_mio_trait_high_speed_raiding }
+
+		production_bonus = {
+			production_capacity_factor = 0.05
+			production_efficiency_gain_factor = 0.05
+		}
+	}
+
+	add_trait = { 
+		token = OLE_mio_trait_rapid_raiders
+		name = FIN_mio_trait_rapid_raiders
+		icon = GFX_generic_mio_department_icon_ship_general_offense
+		special_trait_background = yes
+
+		position = { x=-2 y=0 }
+		relative_position_id = generic_mio_trait_long_range_raiding
+		
+		mutually_exclusive = { OLE_mio_trait_deep_sea_raiders }
+
+		limit_to_equipment_type = { screen_ship }
+
+		equipment_bonus = {
+			naval_speed = 0.05
+			lg_attack = 0.05
+			surface_detection = 0.05
+			sub_detection = 0.05
+		}
+	}
+
+	add_trait = { 
+		token = OLE_mio_trait_deep_sea_raiders
+		name = FIN_mio_trait_deep_sea_raiders
+		icon = GFX_generic_mio_department_icon_ship_submarine_survivability
+		special_trait_background = yes
+
+		position = { x=1 y=0 }
+		relative_position_id = OLE_mio_trait_rapid_raiders
+
+		mutually_exclusive = { OLE_mio_trait_rapid_raiders }
+		
+
+		limit_to_equipment_type = { submarine }
+
+		equipment_bonus = {
+			naval_speed = 0.05
+			surface_detection = 0.05
+			sub_visibility = -0.05
+			torpedo_attack = 0.05
+		}
+	}
+
+	add_trait = { 
+		token = OLE_mio_trait_modernization_program
+		name = FIN_mio_trait_modernization_program
+		icon = GFX_generic_mio_department_icon_ship_general_production
+		special_trait_background = yes
+
+		position = { x=1 y=0 }
+		relative_position_id = generic_mio_trait_high_speed_raiding
+		
+		available = {
+			owner = {
+				has_idea = modern_society
+			}
+		}
+
+		production_bonus = {
+			production_capacity_factor = 0.05
+		}
+	}
+	
+}
+
+
+
+###########################
+
+###  #    ##  #  # ###  ## 
+#  # #   #  # ## # #   #   
+###  #   #### # ## ##   #  
+#    #   #  # #  # #     # 
+#    ### #  # #  # ### ##  
+
+###########################
+
+OLE_kunikaallinen_aeronautics_organization = {
+	name = OLE_kunikaallinen_aeronautics
+	icon = GFX_idea_OLE_kunikaallinen_aeronautics
+	include = generic_light_aircraft_organization
+	allowed = {
+		tag = OLE
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+}
+
+OLE_paakaupunki_organization = {
+	name = OLE_paakaupunki
+	icon = GFX_idea_OLE_paakaupunki
+	include = generic_medium_aircraft_organization
+	allowed = {
+		tag = OLE
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+}
+
+OLE_huufsen_organization = {
+	name = OLE_huufsen
+	icon = GFX_idea_OLE_huufsen
+	include = generic_heavy_aircraft_organization
+	allowed = {
+		tag = OLE
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+}
+
+OLE_lokki_seagull_co_organization = {
+	name = OLE_lokki_seagull_co
+	icon = GFX_idea_OLE_lokki_seagull_co
+	include = generic_naval_aircraft_organization
+	allowed = {
+		tag = OLE
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+}
+
+
+################################### 
+
+#   #  ##  ### ### ###  ### ### #   
+## ## #  #  #  #   #  #  #  #   #   
+# # # ####  #  ##  ###   #  ##  #   
+#   # #  #  #  #   #  #  #  #   #   
+#   # #  #  #  ### #  # ### ### ### 
+
+
+###################################
+
+OLE_alda_gunworks_organization = {
+
+	name = OLE_alda_gunworks
+	icon = GFX_idea_OLE_alda_gunworks 
+	include = generic_infantry_equipment_organization
+	allowed = {
+		tag = OLE
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	
+	tree_header_text = {
+		text = mio_header_systems
+		x = 1
+	}
+
+	tree_header_text = {
+		text = mio_header_weapons
+		x = 5.5
+	}
+
+	tree_header_text = {
+		text = mio_header_production
+		x = 8.5
+	}
+
+	override_trait = {
+		token = generic_mio_trait_reinforced_stocks
+
+		position = { x=3 y=0 }
+		relative_position_id = generic_mio_trait_drum_pattern_sights
+	}
+
+	override_trait = {
+		token = generic_mio_trait_bolt_action
+
+		position = { x=0 y=2 }
+		relative_position_id = generic_mio_trait_reinforced_stocks
+	}
+
+	override_trait = {
+		token = generic_mio_trait_rubber_cushioned_buttpad
+
+		position = { x=0 y=2 }
+		relative_position_id = generic_mio_trait_heavy_anti_armor_ammunition
+	}
+
+	override_trait = {
+		token = generic_mio_trait_anti_vechicle_land_mines
+
+		position = { x=0 y=2 }
+		relative_position_id = generic_mio_trait_vehicle_mounted_capabilities
+	}
+
+	add_trait = { 
+		token = OLE_mio_trait_salvaged_and_retooled
+		name = FIN_mio_trait_salvaged_and_retooled
+		icon = GFX_generic_mio_department_icon_infantry_materials
+		special_trait_background = yes
+
+		position = { x=8 y=0 }
+		
+		available = {
+			owner = {
+				OR = {
+					has_tech = tech_deer_army_def
+					has_tech = tech_deer_army_atk
+				}
+			}
+		}
+
+		production_bonus = {
+			production_capacity_factor = 0.05
+			production_resource_need_factor = -0.1
+		}
+	}
+
+	add_trait = { 
+		token = OLE_mio_trait_modernization_program
+		name = FIN_mio_trait_modernization_program
+		icon = GFX_generic_mio_department_icon_infantry_production
+		special_trait_background = yes
+
+		position = { x=1 y=0 }
+		relative_position_id = OLE_mio_trait_salvaged_and_retooled
+		
+		available = {
+			owner = {
+				has_idea = modern_society
+			}
+		}
+
+		production_bonus = {
+			production_capacity_factor = 0.05
+		}
+	}
+
+	add_trait = { 
+		token = OLE_mio_trait_oy_tikkakoski
+		name = FIN_mio_trait_oy_tikkakoski
+		icon = GFX_generic_mio_department_icon_infantry_line_efficiency
+		special_trait_background = yes
+
+		position = { x=0 y=1 }
+		relative_position_id = OLE_mio_trait_salvaged_and_retooled
+
+		any_parent = { generic_mio_trait_heavy_anti_armor_ammunition }
+		
+		available = {
+			owner = {
+				has_idea = modern_society
+			}
+		}
+
+		production_bonus = {
+			production_capacity_factor = 0.05
+			production_efficiency_gain_factor = 0.1
+		}
+	}
+}
+
+
+OLE_keisarillinen_organization = {
+	name = OLE_keisarillinen
+	icon = GFX_idea_OLE_keisarillinen
+	include = generic_artillery_organization
+	allowed = {
+		tag = OLE
+		has_dlc = "Arms Against Tyranny"
+	}
+
+	
+	tree_header_text = {
+		text = mio_header_operational_department
+		x = 1
+	}
+
+	tree_header_text = {
+		text = mio_header_design_department
+		x = 5
+	}
+
+	tree_header_text = {
+		text = mio_header_production_department
+		x = 8.5
+	}
+
+	override_trait = {
+		token = generic_mio_trait_rapid_fire
+
+		position = { x=3 y=0 }
+	}
+
+	add_trait = { 
+		token = OLE_mio_trait_salvaged_and_retooled
+		name = FIN_mio_trait_salvaged_and_retooled
+		icon = GFX_generic_mio_trait_icon_resources
+		special_trait_background = yes
+
+		position = { x=8 y=0 }
+		
+		available = {
+			owner = {
+				OR = {
+					has_tech = tech_deer_army_def
+					has_tech = tech_deer_army_atk
+				}
+			}
+		}
+
+		production_bonus = {
+			production_capacity_factor = 0.05
+			production_resource_need_factor = -0.1
+		}
+	}
+
+	add_trait = { 
+		token = OLE_mio_trait_modernization_program
+		name = FIN_mio_trait_modernization_program
+		icon = GFX_generic_mio_trait_icon_production_capacity
+		special_trait_background = yes
+
+		position = { x=1 y=0 }
+		relative_position_id = OLE_mio_trait_salvaged_and_retooled
+		
+		available = {
+			owner = {
+				has_idea = modern_society
+			}
+		}
+
+		production_bonus = {
+			production_capacity_factor = 0.05
+		}
+	}
+}
+
+OLE_korvensuu_organization = {
+	name = OLE_korvensuu
+	icon = GFX_idea_OLE_korvensuu
+	include = generic_motorized_mechanized_organization
+	allowed = {
+		tag = OLE
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	tree_header_text = {
+		text = mio_header_motorized
+		x = 1
+	}
+
+	tree_header_text = {
+		text = mio_header_mechanized
+		x = 6
+	}
+
+	tree_header_text = {
+		text = mio_header_production
+		x = 8.5
+	}
+
+	override_trait = {
+		token = generic_mio_trait_steel_cargo_bed
+
+		position = { x=1 y=0 }
+		relative_position_id = generic_mio_trait_composite_cargo_bed
+	}
+
+	override_trait = {
+		token = generic_mio_trait_high_powered_engine
+
+		position = { x=1 y=0 }
+		relative_position_id = generic_mio_trait_attached_wood_gas_generator
+	}
+
+	override_trait = {
+		token = generic_mio_trait_medium_machinegun_mounts
+
+		position = { x=1 y=0 }
+		relative_position_id = generic_mio_trait_steel_cargo_bed
+	}
+
+	override_trait = {
+		token = generic_mio_trait_advanced_artillery_racks
+
+		position = { x=0 y=2 }
+		relative_position_id = generic_mio_trait_armored_pulpit_mount
+	}
+
+	override_trait = {
+		token = generic_mio_trait_heavy_machinegun_mount
+
+		position = { x=1 y=0 }
+		relative_position_id = generic_mio_trait_advanced_artillery_racks
+	}
+
+	override_trait = {
+		token = generic_mio_trait_open_chassi
+
+		position = { x=3 y=0 }
+		relative_position_id = generic_mio_trait_medium_machinegun_mounts
+	}
+	
+	override_trait = {
+		token = generic_mio_trait_land_mine_racks
+
+		mutually_exclusive = { OLE_mio_trait_repurposed_equipment }
+	}
+
+	add_trait = { 
+		token = OLE_mio_trait_wartsila_engine_production
+		name = FIN_mio_trait_wartsila_engine_production
+		icon = GFX_generic_mio_department_icon_motorized_mechanized_line_efficiency
+		special_trait_background = yes
+
+		position = { x=0 y=1 }
+		relative_position_id = generic_mio_trait_composite_cargo_bed
+		
+		any_parent = { generic_mio_trait_composite_cargo_bed generic_mio_trait_steel_cargo_bed }
+		
+		available = {
+			owner = {
+				has_idea = modern_society
+			}
+		}
+
+		production_bonus = {
+			production_capacity_factor = 0.05
+			production_efficiency_gain_factor = 0.05
+		}
+	}
+
+	add_trait = { 
+		token = OLE_mio_trait_recycled_materials
+		name = FIN_mio_trait_recycled_materials
+		icon = GFX_generic_mio_department_icon_motorized_materials
+		special_trait_background = yes
+
+		position = { x=1 y=0 }
+		relative_position_id = generic_mio_trait_medium_machinegun_mounts
+				
+		available = {
+			owner = {
+				has_idea = modern_society
+			}
+		}
+
+		limit_to_equipment_type = { motorized_equipment }
+
+		production_bonus = {
+			production_capacity_factor = 0.05
+			production_resource_need_factor = -0.1
+		}
+	}
+
+	add_trait = { 
+		token = OLE_mio_trait_yhteissisus_modern_premises
+		name = FIN_mio_trait_yhteissisus_modern_premises
+		icon = GFX_generic_mio_department_icon_motorized_technology
+		special_trait_background = yes
+
+		position = { x=0 y=1 }
+		relative_position_id = OLE_mio_trait_recycled_materials
+
+		all_parents = { OLE_mio_trait_recycled_materials }
+	
+		available = {
+			owner = {
+				has_idea = modern_society
+			}
+		}
+
+		limit_to_equipment_type = { motorized_equipment }
+
+		production_bonus = {
+			production_efficiency_gain_factor = 0.05
+			production_efficiency_cap_factor = 0.1
+		}
+	}
+
+	add_trait = { 
+		token = OLE_mio_trait_repurposed_equipment
+		name = FIN_mio_trait_repurposed_equipment
+		icon = GFX_generic_mio_department_icon_motorized_line_efficiency
+		special_trait_background = yes
+
+		position = { x=0 y=4 }
+		relative_position_id = OLE_mio_trait_salvaged_and_retooled
+
+		all_parents = { OLE_mio_trait_salvaged_and_retooled generic_mio_trait_bulletproof_panels }
+
+		mutually_exclusive = { generic_mio_trait_land_mine_racks }
+	
+		available = {
+			owner = {
+				custom_trigger_tooltip = {
+					tooltip = FIN_mio_trait_repurposed_equipment_trigger_tt
+					has_tech = mechanised_infantry3
+				}
+			}
+		}
+
+		limit_to_equipment_type = { motorized_equipment }
+
+		production_bonus = {
+			production_efficiency_gain_factor = 0.1
+		}
+	}
+
+
+	add_trait = { 
+		token = OLE_mio_trait_salvaged_and_retooled
+		name = FIN_mio_trait_salvaged_and_retooled
+		icon = GFX_generic_mio_department_icon_infantry_materials
+		special_trait_background = yes
+
+		position = { x=8 y=0 }
+		
+		available = {
+			owner = {
+				OR = {
+					has_tech = tech_deer_army_def
+					has_tech = tech_deer_army_atk
+				}
+			}
+		}
+
+		production_bonus = {
+			production_capacity_factor = 0.05
+			production_resource_need_factor = -0.1
+		}
+	}
+
+	add_trait = { 
+		token = OLE_mio_trait_modernization_program
+		name = FIN_mio_trait_modernization_program
+		icon = GFX_generic_mio_department_icon_infantry_production
+		special_trait_background = yes
+
+		position = { x=1 y=0 }
+		relative_position_id = OLE_mio_trait_salvaged_and_retooled
+		
+		available = {
+			owner = {
+				has_idea = modern_society
+			}
+		}
+
+		production_bonus = {
+			production_capacity_factor = 0.05
+		}
+	}
+}
diff --git a/common/military_industrial_organization/organizations/OLV_organization.txt b/common/military_industrial_organization/organizations/OLV_organization.txt
new file mode 100644
index 00000000000..feceb201527
--- /dev/null
+++ b/common/military_industrial_organization/organizations/OLV_organization.txt
@@ -0,0 +1,404 @@
+
+########    ###    ##    ## ##    ##  ######  
+   ##      ## ##   ###   ## ##   ##  ##    ## 
+   ##     ##   ##  ####  ## ##  ##   ##       
+   ##    ##     ## ## ## ## #####     ######  
+   ##    ######### ##  #### ##  ##         ## 
+   ##    ##     ## ##   ### ##   ##  ##    ## 
+   ##    ##     ## ##    ## ##    ##  ######  
+
+OLV_designer_4_organization = {
+	name = OLV_designer_4
+	include = generic_mobile_tank_organization
+	icon = GFX_idea_OLV_designer_4
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = OLV
+			original_tag = ZES
+		}
+	}
+	visible = {
+		OR = {
+			owner = {
+				tag = OLV
+			}
+			owner = {
+				owns_state = 412
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 412
+		}
+	}
+	initial_trait = {
+		limit_to_equipment_type = { light_tank_chassis}
+		equipment_bonus = {
+			maximum_speed = 0.03
+			soft_attack = 0.03
+		}
+	}
+}
+
+OLV_designer_5_organization = {
+	name = OLV_designer_5
+	include = generic_infantry_tank_organization
+	icon = GFX_idea_RCT_OLV_designer_5
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = OLV
+			original_tag = ZES
+		}
+	}
+	visible = {
+		OR = {
+			owner = {
+				tag = OLV
+			}
+			owner = {
+				owns_state = 412
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 412
+		}
+	}
+	initial_trait = {
+		limit_to_equipment_type = { medium_tank_chassis }
+		equipment_bonus = {
+			breakthrough = 0.03
+			hardness = 0.03
+		}
+	}
+}
+
+
+
+ ######  ##     ## #### ########   ######  
+##    ## ##     ##  ##  ##     ## ##    ## 
+##       ##     ##  ##  ##     ## ##       
+ ######  #########  ##  ########   ######  
+      ## ##     ##  ##  ##              ## 
+##    ## ##     ##  ##  ##        ##    ## 
+ ######  ##     ## #### ##         ######  
+
+
+
+OLV_designer_10_organization = {
+	name =  OLV_designer_10
+	include = generic_escort_ship_organization
+	icon = GFX_idea_OLV_designer_10
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = OLV
+			original_tag = ZES
+		}
+	}
+	visible = {
+		OR = {
+			owner = {
+				tag = OLV
+			}
+			owner = {
+				owns_state = 412
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 412
+		}
+	}
+}
+
+OLV_designer_9_organization = {
+	name =  OLV_designer_9
+	include = generic_raider_ship_organization
+	icon = GFX_idea_OLV_designer_9
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = OLV
+			original_tag = ZES
+		}
+	}
+	visible = {
+		OR = {
+			owner = {
+				tag = OLV
+			}
+			owner = {
+				owns_state = 412
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 412
+		}
+	}
+}
+
+OLV_designer_11_organization = {
+	name =  OLV_designer_11
+	include = generic_battle_line_ship_organization
+	icon = GFX_idea_OLV_designer_11
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = OLV
+			original_tag = ZES
+		}
+	}
+	visible = {
+		OR = {
+			owner = {
+				tag = OLV
+			}
+			owner = {
+				owns_state = 412
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 412
+		}
+	}
+}
+
+OLV_national_shipyards = {
+	name = OLV_national_shipyards
+	include = generic_refurbishment_repair_organization
+	icon = GFX_idea_tur_tulomsas
+	allowed = {
+		original_tag = OLV
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			has_completed_focus = OLV_national_dockyards
+		}
+	}
+	initial_trait = {
+		limit_to_equipment_type = { ship_hull_heavy } 
+		equipment_bonus = {
+			lg_attack = 0.05
+			hg_attack = 0.05
+		}
+	}
+}
+
+
+
+
+
+########  ##          ###    ##    ## ########  ######  
+##     ## ##         ## ##   ###   ## ##       ##    ## 
+##     ## ##        ##   ##  ####  ## ##       ##       
+########  ##       ##     ## ## ## ## ######    ######  
+##        ##       ######### ##  #### ##             ## 
+##        ##       ##     ## ##   ### ##       ##    ## 
+##        ######## ##     ## ##    ## ########  ######  
+
+OLV_designer_12_organization = {
+	name = OLV_designer_12
+	include = generic_light_aircraft_organization
+	icon = GFX_idea_OLV_designer_12
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = OLV
+			original_tag = ZES
+		}
+	}
+	visible = {
+		OR = {
+			owner = {
+				tag = OLV
+			}
+			owner = {
+				owns_state = 412
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 412
+		}
+	}
+}
+
+OLV_designer_13_organization = {
+	name = OLV_designer_13
+	include = generic_range_focused_aircraft_organization
+	icon = GFX_idea_RCT_OLV_designer_13
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = OLV
+			original_tag = ZES
+		}
+	}
+	visible = {
+		OR = {
+			owner = {
+				tag = OLV
+			}
+			owner = {
+				owns_state = 412
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 412
+		}
+	}
+}
+
+OLV_designer_14_organization = {
+	name = OLV_designer_14
+	include = generic_naval_aircraft_organization
+	icon = GFX_idea_OLV_designer_14
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = OLV
+			original_tag = ZES
+		}
+	}
+	visible = {
+		OR = {
+			owner = {
+				tag = OLV
+			}
+			owner = {
+				owns_state = 412
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 412
+		}
+	}
+}
+
+
+
+##     ##    ###    ######## ######## ########  #### ######## ##       
+###   ###   ## ##      ##    ##       ##     ##  ##  ##       ##       
+#### ####  ##   ##     ##    ##       ##     ##  ##  ##       ##       
+## ### ## ##     ##    ##    ######   ########   ##  ######   ##       
+##     ## #########    ##    ##       ##   ##    ##  ##       ##       
+##     ## ##     ##    ##    ##       ##    ##   ##  ##       ##       
+##     ## ##     ##    ##    ######## ##     ## #### ######## ######## 
+
+OLV_designer_6_organization = {
+	include = generic_infantry_equipment_organization
+	name = OLV_designer_6
+	icon = GFX_idea_OLV_designer_6
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = OLV
+			original_tag = ZES
+		}
+	}
+	visible = {
+		OR = {
+			owner = {
+				tag = OLV
+			}
+			owner = {
+				owns_state = 412
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 412
+		}
+	}
+	initial_trait = {
+		limit_to_equipment_type = { infantry_equipment } 
+		equipment_bonus = {
+			defense = 0.05
+		}
+	}
+}
+
+
+OLV_designer_7_organization = {
+	include = generic_artillery_organization
+	name = OLV_designer_7
+	icon = GFX_idea_OLV_designer_7
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = OLV
+			original_tag = ZES
+		}
+	}
+	visible = {
+		OR = {
+			owner = {
+				tag = OLV
+			}
+			owner = {
+				owns_state = 412
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 412
+		}
+	}
+	initial_trait = {
+		equipment_bonus = {
+			soft_attack = 0.05
+		}
+	}
+}
+
+OLV_designer_8_organization = {
+	include = generic_motorized_mechanized_organization
+	name = OLV_designer_8
+	icon = GFX_idea_OLV_designer_8
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = OLV
+			original_tag = ZES
+		}
+	}
+	visible = {
+		OR = {
+			owner = {
+				tag = OLV
+			}
+			owner = {
+				owns_state = 412
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 412
+		}
+	}
+	initial_trait = {
+		limit_to_equipment_type = { motorized_equipment } 
+		equipment_bonus = {
+			maximum_speed = 0.05
+		}
+	}
+}
diff --git a/common/military_industrial_organization/organizations/PCB_organization.txt b/common/military_industrial_organization/organizations/PCB_organization.txt
new file mode 100644
index 00000000000..ce3c37499f3
--- /dev/null
+++ b/common/military_industrial_organization/organizations/PCB_organization.txt
@@ -0,0 +1,65 @@
+
+ ######  ##     ## #### ########   ######  
+##    ## ##     ##  ##  ##     ## ##    ## 
+##       ##     ##  ##  ##     ## ##       
+ ######  #########  ##  ########   ######  
+      ## ##     ##  ##  ##              ## 
+##    ## ##     ##  ##  ##        ##    ## 
+ ######  ##     ## #### ##         ######  
+
+
+
+ PCB_astimar_organization = {
+	name =  PCB_astimar
+	include = generic_battle_line_ship_organization
+	icon = GFX_idea_PCB_astimar
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		original_tag = PCB
+	}
+	initial_trait = {
+		organization_modifier = {
+			military_industrial_organization_research_bonus = 0.05
+		}
+	}
+}
+
+PCB_bukleymane_organization = {
+	name =  PCB_bukleymane
+	include = generic_task_force_ship_organization
+	icon = GFX_idea_PCB_bukleymane
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		original_tag = PCB
+	}
+	initial_trait = {
+		organization_modifier = {
+			military_industrial_organization_research_bonus = 0.05
+		}
+	}
+}
+
+
+
+########  ##          ###    ##    ## ########  ######  
+##     ## ##         ## ##   ###   ## ##       ##    ## 
+##     ## ##        ##   ##  ####  ## ##       ##       
+########  ##       ##     ## ## ## ## ######    ######  
+##        ##       ######### ##  #### ##             ## 
+##        ##       ##     ## ##   ### ##       ##    ## 
+##        ######## ##     ## ##    ## ########  ######  
+
+PCB_tnca_organization = {
+	name = PCB_tnca
+	include = generic_light_aircraft_organization
+	icon = GFX_idea_PCB_tnca
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		original_tag = PCB
+	}
+	initial_trait = {
+		organization_modifier = {
+			military_industrial_organization_research_bonus = 0.05
+		}
+	}
+}
diff --git a/common/military_industrial_organization/organizations/PLB_organization.txt b/common/military_industrial_organization/organizations/PLB_organization.txt
new file mode 100644
index 00000000000..98c10887708
--- /dev/null
+++ b/common/military_industrial_organization/organizations/PLB_organization.txt
@@ -0,0 +1,509 @@
+#####################
+
+###  ##  #  # # #  ## 
+ #  #  # ## # # # #   
+ #  #### # ## ##   #  
+ #  #  # #  # # #   # 
+ #  #  # #  # # # ## 
+
+ #################### 
+
+PLB_mechanite_cult_organization = {
+	name = PLB_mechanite_cult
+	icon = GFX_idea_unknown_advisor_bear
+	include = generic_motorized_mechanized_organization
+	allowed = {
+		tag = PLB
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		FROM = {
+			OR = {
+				has_completed_focus = PLB_the_mechanites_and_their_queen
+				has_completed_focus = PLB_mechanites_of_the_protectorate
+			}
+		}
+	}
+    initial_trait = {
+        production_bonus = {
+            production_cost_factor = 0.1
+            production_resource_need_factor = -0.15
+        }
+
+        organization_modifier = {
+            military_industrial_organization_research_bonus = 0.05
+        }
+
+        equipment_bonus = {
+            reliability_factor = 0.05
+        }
+    }
+}
+
+PLB_traditional_armorsmiths_organization = {
+	name = PLB_traditional_armorsmiths
+	icon = GFX_idea_unknown_advisor_bear
+	include = generic_infantry_tank_organization
+	allowed = {
+		tag = PLB
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+    equipment_type = {  
+        armor
+        train_equipment
+    }
+
+    research_categories = { 
+        mio_cat_tech_all_armor_and_modules
+        train_tech
+    }
+
+    initial_trait = {
+        name = NOR_mio_initial_trait_mechanical_workshop
+        
+        limit_to_equipment_type = { 
+            train_equipment
+        }
+        equipment_bonus = {
+            build_cost_ic = -0.07
+            armor_value = 0.02
+        }
+    }
+}
+
+PLB_griffon_labourers_organization = {
+	name = PLB_griffon_labourers
+	icon = GFX_idea_PLB_griffon_labourers
+	include = generic_motorized_mechanized_organization
+	allowed = {
+		tag = PLB
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		FROM = {
+			has_completed_focus = PLB_their_griffon_servants_persist_too
+			NOT = {
+				has_country_flag = PLB_northern_protectorate
+			}
+		}
+	}
+
+	equipment_type = {
+		motorized_equipment
+		mechanized_equipment
+		motorized_rocket_equipment
+		polar_bear_equipment
+	}
+	
+	research_categories = {
+		mio_cat_tech_all_motorized_mechanized
+		panzerbar_tech
+	}
+	initial_trait = {
+		equipment_bonus = {
+			hard_attack = 0.05
+			build_cost_ic = -0.1
+		}
+	}
+}
+
+#####################
+
+ ## #  # ### ###   ## 
+#   #  #  #  #  # #   
+ #  ####  #  ###   #  
+  # #  #  #  #      # 
+##  #  # ### #    ##  
+ 
+#####################
+
+
+PLB_clan_anker_organization = {
+	name = PLB_clan_anker
+	icon = GFX_idea_unknown_advisor_bear
+	include = generic_escort_ship_organization
+	allowed = {
+		tag = PLB
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		FROM = {
+			OR = {
+				has_completed_focus = PLB_anker_navy
+				has_completed_focus = PLB_anker_tradition
+			}
+			NOT = {
+				has_country_flag = PLB_northern_protectorate
+			}
+		}
+	}
+	
+    equipment_type = {  
+        screen_ship
+        convoy_1
+    }
+
+    initial_trait = {
+        name = NOR_mio_initial_trait_convoy_and_escort_fleet
+
+        organization_modifier = {
+            military_industrial_organization_research_bonus = 0.05
+        }
+
+        production_bonus = {
+            production_capacity_factor = 0.07
+        }
+    }
+
+    trait = {
+        token = generic_mio_trait_submarine_hunters
+        limit_to_equipment_type = { screen_ship }
+    }
+
+    trait = {
+        token = generic_mio_trait_high_speed_mine_hunting_equipment
+        limit_to_equipment_type = { screen_ship }
+    }
+
+    trait = {
+        token = generic_mio_trait_advanced_hydrodynamic_design
+        limit_to_equipment_type = { screen_ship }
+    }
+
+    trait = {
+        token = generic_mio_trait_fleet_escorts
+        limit_to_equipment_type = { screen_ship }
+    }
+
+    trait = {
+        token = generic_mio_trait_anti_air_ships
+        limit_to_equipment_type = { screen_ship }
+    }
+
+    trait = {
+        token = generic_mio_trait_escort_in_force
+        limit_to_equipment_type = { screen_ship }
+    }
+
+    trait = {
+        token = generic_mio_trait_anti_air_layout
+        limit_to_equipment_type = { screen_ship }
+    }
+
+    trait = {
+        token = generic_mio_trait_gyro_stabilized_mounts
+        limit_to_equipment_type = { screen_ship }
+    }
+
+    trait = {
+        token = generic_mio_trait_improved_anti_air_gun_mounting
+        limit_to_equipment_type = { screen_ship }
+    }
+
+    trait = {
+        token = generic_mio_trait_mass_production
+        limit_to_equipment_type = { screen_ship }
+    }
+
+    trait = {
+        token = generic_mio_trait_improved_light_gun_mounting
+        limit_to_equipment_type = { screen_ship }
+    }
+
+    add_trait = {
+        token = PLB_mio_trait_convoy_production
+        name = NOR_shipping_capitalist
+        icon = GFX_generic_mio_trait_icon_supply_consumption
+
+        position = { x=0 y=0 }
+        limit_to_equipment_type = { convoy }
+        
+        production_bonus = {
+            production_capacity_factor = 0.1
+        }   
+    }
+}
+
+PLB_clan_falsen_organization = {
+	name = PLB_clan_falsen
+	icon = GFX_idea_unknown_advisor_bear
+	include = generic_battle_line_ship_organization
+	allowed = {
+		tag = PLB
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		FROM = {
+			OR = {
+				has_completed_focus = PLB_falsen_navy
+				has_completed_focus = PLB_wesslandia_integration
+			}
+			NOT = {
+				has_country_flag = PLB_northern_protectorate
+			}
+		}
+	}
+}
+
+PLB_clan_anker_craftsbears_organization = {
+	name = PLB_clan_anker_craftsbears
+	icon = GFX_idea_unknown_advisor_bear
+	include = generic_raider_ship_organization
+	allowed = {
+		tag = PLB
+		has_dlc = "Arms Against Tyranny"
+	}
+}
+
+
+###########################
+
+###  #    ##  #  # ###  ## 
+#  # #   #  # ## # #   #   
+###  #   #### # ## ##   #  
+#    #   #  # #  # #     # 
+#    ### #  # #  # ### ##  
+
+###########################
+
+
+PLB_light_aircraft_guys_organization = {
+	name = PLB_light_aircraft_guys
+	icon = GFX_idea_unknown_advisor_pingu
+	include = generic_light_aircraft_organization
+	allowed = {
+		tag = PLB
+		has_dlc = "Arms Against Tyranny"
+	}
+}
+
+
+################################### 
+
+#   #  ##  ### ### ###  ### ### #   
+## ## #  #  #  #   #  #  #  #   #   
+# # # ####  #  ##  ###   #  ##  #   
+#   # #  #  #  #   #  #  #  #   #   
+#   # #  #  #  ### #  # ### ### ### 
+
+
+###################################
+
+
+PLB_clan_svartpels_organization = {
+	name = PLB_clan_svartpels
+	icon = GFX_idea_unknown_advisor_bear
+	include = generic_motorized_mechanized_organization
+	allowed = {
+		tag = PLB
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		FROM = {
+			has_completed_focus = PLB_svartpels_as_our_military_producer
+			NOT = {
+				has_country_flag = PLB_northern_protectorate
+			}
+		}
+	}
+	equipment_type = {
+		motorized_equipment
+		mechanized_equipment
+		motorized_rocket_equipment
+		polar_bear_equipment
+	}
+	
+	research_categories = {
+		mio_cat_tech_all_motorized_mechanized
+		panzerbar_tech
+	}
+	initial_trait = {
+		equipment_bonus = {
+			breakthrough = 0.05
+			defense = 0.05
+			ap_attack = 0.05
+		}
+	}
+}
+
+PLB_clans_of_onladir_organization = {
+	name = PLB_clans_of_onladir
+	icon = GFX_idea_unknown_advisor_bear
+	include = generic_support_equipment_organization
+	allowed = {
+		tag = PLB
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		FROM = {
+			has_completed_focus = PLB_onladir_clans_as_our_military_producers
+			NOT = {
+				has_country_flag = PLB_northern_protectorate
+			}
+		}
+	}
+	initial_trait = {
+		equipment_bonus = {
+			reliability = 0.05
+		}
+	}
+}
+
+PLB_clans_of_triple_alliance_organization = {
+	name = PLB_clans_of_triple_alliance
+	icon = GFX_idea_unknown_advisor_bear
+	include = generic_infantry_equipment_organization
+	allowed = {
+		tag = PLB
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		FROM = {
+			has_completed_focus = PLB_triple_alliance_in_charge_of_gun_production
+			NOT = {
+				has_country_flag = PLB_northern_protectorate
+			}
+		}
+	}
+	initial_trait = {
+		equipment_bonus = {
+			build_cost_ic = -0.15
+		}
+	}
+}
+
+PLB_clan_volsungr_organization = {
+	name = PLB_clan_volsungr
+	icon = GFX_idea_unknown_advisor_bear
+	include = generic_artillery_organization
+	allowed = {
+		tag = PLB
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		FROM = {
+			has_completed_focus = PLB_volsungr_as_our_military_producer
+			has_completed_focus = PLB_iron_and_will
+			NOT = {
+				has_country_flag = PLB_northern_protectorate
+			}
+		}
+	}
+	
+    trait = { 
+        token = NOR_bofors_fly_swatter
+        name = SWE_bofors_fly_swatter
+        icon = GFX_generic_mio_department_icon_anti_air
+        special_trait_background  = yes
+        position = { x=1 y=0 }
+        relative_position_id = generic_mio_trait_improved_hydraulic_recoil_system
+
+        all_parents = { generic_mio_trait_improved_hydraulic_recoil_system }
+        available = {
+            PLB = { NOT = { has_war_with = OLE} }
+        }
+
+        limit_to_equipment_type = {
+            anti_air_equipment
+        }
+
+        equipment_bonus = {
+            air_attack = 0.1
+            ap_attack = 0.05
+        }
+	}
+}
+
+PLB_clan_tordentsjerne_organization = {
+	name = PLB_clan_tordentsjerne
+	icon = GFX_idea_unknown_advisor_bear
+	include = generic_infantry_equipment_organization
+	allowed = {
+		tag = PLB
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		FROM = {
+			has_completed_focus = PLB_midas_protectorate
+		}
+	}
+	initial_trait = {
+		limit_to_equipment_type = { magical_equipment } 
+		equipment_bonus = {
+			build_cost_ic = -0.1
+			soft_attack = 0.1
+			hard_attack = 0.1
+			ap_attack = 0.25
+			reliability = -0.05
+		}
+	}
+}
+
+PLB_traditional_gunsmiths_organization = {
+	name = PLB_traditional_gunsmiths
+	icon = GFX_idea_unknown_advisor_bear
+	include = generic_infantry_equipment_organization
+	allowed = {
+		tag = PLB
+		has_dlc = "Arms Against Tyranny"
+	}
+    initial_trait = {
+        
+        production_bonus = {
+            production_efficiency_cap_factor = 0.03
+            production_resource_need_factor = -0.05
+        }
+
+        equipment_bonus = {
+            soft_attack = 0.03
+            breakthrough = 0.02
+        }
+    }
+}
+
+PLB_owlbear_drug_research_organization = {
+	name = PLB_owlbear_drug_research
+	icon = GFX_idea_scania
+	include = generic_support_equipment_organization
+	allowed = {
+		tag = PLB
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		FROM = {
+			OR = {
+				has_completed_focus = PLB_the_owlbear_project
+				has_completed_focus = PLB_hyperbearia_restored_betrayal
+			}
+		}
+	}
+	initial_trait = {
+		equipment_bonus = {
+			build_cost_ic = -0.1
+		}
+	}
+}
+
+PLB_cloning_vats_organization = {
+	name = PLB_cloning_vats
+	icon = GFX_idea_gre_phaliron_aircraft
+	include = generic_infantry_equipment_organization
+	allowed = {
+		tag = PLB
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		FROM = {
+			OR = {
+				has_completed_focus = PLB_the_owlbear_project
+				has_completed_focus = PLB_hyperbearia_restored_betrayal
+			}
+		}
+	}
+	research_categories = {
+		infantry_weapons
+		race_tech
+		support_tech
+	}
+}
\ No newline at end of file
diff --git a/common/military_industrial_organization/organizations/PYT_organization.txt b/common/military_industrial_organization/organizations/PYT_organization.txt
new file mode 100644
index 00000000000..1401e12fddd
--- /dev/null
+++ b/common/military_industrial_organization/organizations/PYT_organization.txt
@@ -0,0 +1,82 @@
+PYT_infantry_concern_organization = {
+	include = generic_infantry_equipment_organization
+	name = PYT_infantry_concern
+	icon = GFX_idea_PYT_infantry_concern
+
+	allowed = {
+		original_tag = PYT
+		has_dlc = "Arms Against Tyranny"
+	}
+}
+PYT_artillery_concern_organization = {
+	include = generic_artillery_organization
+	name = PYT_artillery_concern
+	icon = GFX_idea_PYT_artillery_concern
+
+	allowed = {
+		original_tag = PYT
+		has_dlc = "Arms Against Tyranny"
+	}
+}
+PYT_light_tank_concern_organization = {
+	name = PYT_light_tank_concern
+	include = generic_mobile_tank_organization
+	icon = GFX_idea_PYT_light_tank_concern
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = PYT
+		}
+	}
+}
+PYT_medium_tank_concern_organization = {
+	name = PYT_medium_tank_concern
+	include = generic_medium_tank_organization
+	icon = GFX_idea_PYT_medium_tank_concern
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = PYT
+		}
+	}
+}
+
+PYT_light_air_concern_organization = {
+	name = PYT_light_air_concern
+	include = generic_light_aircraft_organization
+	icon = GFX_idea_PYT_light_air_concern
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		original_tag = PYT
+	}
+}
+
+PYT_heavy_air_concern_organization = {
+	name = PYT_heavy_air_concern
+	include = generic_heavy_aircraft_organization
+	icon = GFX_idea_PYT_heavy_air_concern
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		original_tag = PYT
+	}
+}
+
+PYT_raiding_naval_concern_organization = {
+	name = PYT_raiding_naval_concern
+	include = generic_raider_ship_organization
+	icon = GFX_idea_PYT_raiding_naval_concern
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		original_tag = PYT
+	}
+}
+
+PYT_defence_naval_concern_organization = {
+	name = PYT_defence_naval_concern
+	include = generic_escort_ship_organization
+	icon = GFX_idea_PYT_defence_naval_concern
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		original_tag = PYT
+	}
+}
\ No newline at end of file
diff --git a/common/military_industrial_organization/organizations/RCT_organization.txt b/common/military_industrial_organization/organizations/RCT_organization.txt
new file mode 100644
index 00000000000..cee216c82bb
--- /dev/null
+++ b/common/military_industrial_organization/organizations/RCT_organization.txt
@@ -0,0 +1,468 @@
+
+########    ###    ##    ## ##    ##  ######  
+   ##      ## ##   ###   ## ##   ##  ##    ## 
+   ##     ##   ##  ####  ## ##  ##   ##       
+   ##    ##     ## ## ## ## #####     ######  
+   ##    ######### ##  #### ##  ##         ## 
+   ##    ##     ## ##   ### ##   ##  ##    ## 
+   ##    ##     ## ##    ## ##    ##  ######  
+
+RCT_Coltocac_Speedy_Tanks_organization = {
+	name = RCT_Coltocac_Speedy_Tanks
+	include = generic_mobile_tank_organization
+	icon = GFX_idea_RCT_Coltocac_Speedy_Tanks
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		can_form_river_fed = yes
+	}
+	visible = {
+		owner = {
+			OR = {
+				has_country_flag = RIV_annexed_RCT
+				original_tag = RCT
+			}
+		}
+	}
+	available = {
+		hidden_trigger = {
+			owner = {
+				OR = {
+					has_country_flag = RIV_annexed_RCT
+					original_tag = RCT
+				}
+			}
+		}
+		owner = {
+			owns_state = 646
+		}
+	}
+	initial_trait = {
+		limit_to_equipment_type = { light_tank_chassis }
+		equipment_bonus = {
+			hard_attack = 0.03
+			ap_attack = 0.05
+		}
+	}
+}
+
+RCT_Rivers_Automobiles_organization = {
+	name = RCT_Rivers_Automobiles
+	include = generic_medium_tank_organization
+	icon = GFX_idea_RCT_Rivers_Automobiles
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		can_form_river_fed = yes
+	}
+	visible = {
+		owner = {
+			OR = {
+				has_country_flag = RIV_annexed_RCT
+				original_tag = RCT
+			}
+		}
+	}
+	available = {
+		hidden_trigger = {
+			owner = {
+				OR = {
+					has_country_flag = RIV_annexed_RCT
+					original_tag = RCT
+				}
+			}
+		}
+		owner = {
+			owns_state = 619
+		}
+	}
+	initial_trait = {
+		limit_to_equipment_type = { medium_tank_chassis }
+		equipment_bonus = {
+			maximum_speed = 0.06
+			soft_attack = 0.06
+		}
+	}
+}
+
+RCT_Poneonski_Drivers_organization = {
+	name = RCT_Poneonski_Drivers
+	include = generic_heavy_tank_organization
+	icon = GFX_idea_RCT_Poneonski_Drivers
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		can_form_river_fed = yes
+	}
+	visible = {
+		owner = {
+			OR = {
+				has_country_flag = RIV_annexed_RCT
+				original_tag = RCT
+			}
+		}
+	}
+	available = {
+		hidden_trigger = {
+			owner = {
+				OR = {
+					has_country_flag = RIV_annexed_RCT
+					original_tag = RCT
+				}
+			}
+		}
+		owner = {
+			owns_state = 577
+		}
+	}
+	initial_trait = {
+		limit_to_equipment_type = { heavy_tank_chassis }
+		equipment_bonus = {
+			breakthrough = 0.1
+			hardness = 0.09
+		}
+	}
+}
+
+RCT_Zagrep_Future_Mobile_Device_organization = {
+	name = RCT_Zagrep_Future_Mobile_Device
+	include = generic_super_heavy_tank_organization
+	icon = GFX_idea_RCT_Zagrep_Future_Mobile_Device
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		can_form_river_fed = yes
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = RCT
+				has_country_flag = RIV_annexed_RCT
+			}
+		}
+	}
+	available = {
+		owner = {
+			hidden_trigger = {
+				OR = {
+					original_tag = RCT
+					has_country_flag = RIV_annexed_RCT
+				}
+			}
+			owns_state = 620
+		}
+	}
+	initial_trait = {
+		limit_to_equipment_type = { super_heavy_tank_chassis }
+		equipment_bonus = {
+			maximum_speed = 0.1
+			defense = 0.06
+		}
+	}
+}
+
+
+ ######  ##     ## #### ########   ######  
+##    ## ##     ##  ##  ##     ## ##    ## 
+##       ##     ##  ##  ##     ## ##       
+ ######  #########  ##  ########   ######  
+      ## ##     ##  ##  ##              ## 
+##    ## ##     ##  ##  ##        ##    ## 
+ ######  ##     ## #### ##         ######  
+
+
+
+ RCT_Boats_on_River_GmbH_organization = {
+	name =  RCT_Boats_on_River_GmbH
+	include = generic_battle_line_ship_organization
+	icon = GFX_idea_RCT_Boats_on_River_GmbH
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		can_form_river_fed = yes
+	}
+	visible = {
+		owner = {
+			OR = {
+				has_country_flag = RIV_annexed_RCT
+				original_tag = RCT
+			}
+		}
+	}
+	available = {
+		hidden_trigger = {
+			owner = {
+				OR = {
+					has_country_flag = RIV_annexed_RCT
+					original_tag = RCT
+				}
+			}
+		}
+		owner = {
+			owns_state = 619
+		}
+	}
+	initial_trait = {
+		limit_to_equipment_type = { ship_hull_heavy }
+		equipment_bonus = {
+			lg_attack = 0.03
+			hg_attack = 0.03
+		}
+	}
+}
+
+RCT_Under_The_River_organization = {
+	name =  RCT_Under_The_River
+	include = generic_raider_ship_organization
+	icon = GFX_idea_RCT_Under_The_River
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		can_form_river_fed = yes
+	}
+	visible = {
+		owner = {
+			OR = {
+				has_country_flag = RIV_annexed_RCT
+				original_tag = RCT
+			}
+		}
+	}
+	available = {
+		hidden_trigger = {
+			owner = {
+				OR = {
+					has_country_flag = RIV_annexed_RCT
+					original_tag = RCT
+				}
+			}
+		}
+		owner = {
+			owns_state = 619
+		}
+	}
+	initial_trait = {
+		limit_to_equipment_type = { submarine }
+		equipment_bonus = {
+			naval_speed = 0.2
+			reliability = 0.1
+			build_cost_ic = -0.1
+		}
+	}
+}
+
+
+
+########  ##          ###    ##    ## ########  ######  
+##     ## ##         ## ##   ###   ## ##       ##    ## 
+##     ## ##        ##   ##  ####  ## ##       ##       
+########  ##       ##     ## ## ## ## ######    ######  
+##        ##       ######### ##  #### ##             ## 
+##        ##       ##     ## ##   ### ##       ##    ## 
+##        ######## ##     ## ##    ## ########  ######  
+
+RCT_Coltstream_Air_Service_organization = {
+	name = RCT_Coltstream_Air_Service
+	include = generic_range_focused_aircraft_organization
+	icon = GFX_idea_RCT_Coltstream_Air_Service
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		can_form_river_fed = yes
+	}
+	visible = {
+		owner = {
+			OR = {
+				has_country_flag = RIV_annexed_RCT
+				original_tag = RCT
+			}
+		}
+	}
+	available = {
+		hidden_trigger = {
+			owner = {
+				OR = {
+					has_country_flag = RIV_annexed_RCT
+					original_tag = RCT
+				}
+			}
+		}
+		owner = {
+			owns_state = 619
+		}
+	}
+}
+
+RCT_Big_Planes_Big_Price_GmbH_organization = {
+	name = RCT_Big_Planes_Big_Price_GmbH
+	include = generic_heavy_aircraft_organization
+	icon = GFX_idea_RCT_Big_Planes_Big_Price_GmbH
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		can_form_river_fed = yes
+	}
+	visible = {
+		owner = {
+			OR = {
+				has_country_flag = RIV_annexed_RCT
+				original_tag = RCT
+			}
+		}
+	}
+	available = {
+		hidden_trigger = {
+			owner = {
+				OR = {
+					has_country_flag = RIV_annexed_RCT
+					original_tag = RCT
+				}
+			}
+		}
+	}
+}
+
+RCT_Ponezega_Fly_And_Dive_organization = {
+	name = RCT_Ponezega_Fly_And_Dive
+	include = generic_cas_aircraft_organization
+	icon = GFX_idea_RCT_Ponezega_Fly_And_Dive
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		can_form_river_fed = yes
+	}
+	visible = {
+		owner = {
+			OR = {
+				has_country_flag = RIV_annexed_RCT
+				original_tag = RCT
+			}
+		}
+	}
+	available = {
+		hidden_trigger = {
+			owner = {
+				OR = {
+					has_country_flag = RIV_annexed_RCT
+					original_tag = RCT
+				}
+			}
+		}
+		owner = {
+			owns_state = 619
+		}
+	}
+}
+
+
+
+##     ##    ###    ######## ######## ########  #### ######## ##       
+###   ###   ## ##      ##    ##       ##     ##  ##  ##       ##       
+#### ####  ##   ##     ##    ##       ##     ##  ##  ##       ##       
+## ### ## ##     ##    ##    ######   ########   ##  ######   ##       
+##     ## #########    ##    ##       ##   ##    ##  ##       ##       
+##     ## ##     ##    ##    ##       ##    ##   ##  ##       ##       
+##     ## ##     ##    ##    ######## ##     ## #### ######## ######## 
+
+RCT_Weapons_organization = {
+	include = generic_infantry_equipment_organization
+	name = RCT_Weapons
+	icon = GFX_idea_RCT_Weapons
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		can_form_river_fed = yes
+	}
+	visible = {
+		owner = {
+			OR = {
+				has_country_flag = RIV_annexed_RCT
+				original_tag = RCT
+			}
+		}
+	}
+	available = {
+		hidden_trigger = {
+			owner = {
+				OR = {
+					has_country_flag = RIV_annexed_RCT
+					original_tag = RCT
+				}
+			}
+		}
+		owner = {
+			owns_state = 619
+		}
+	}
+	initial_trait = {
+		equipment_bonus = {
+			breakthrough = 0.03
+			defense = 0.03
+		}
+	}
+}
+
+
+RCT_Rijekograd_shells_organization = {
+	include = generic_artillery_organization
+	name = RCT_Rijekograd_shells
+	icon = GFX_idea_RCT_Rijekograd_shells
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		can_form_river_fed = yes
+	}
+	visible = {
+		owner = {
+			OR = {
+				has_country_flag = RIV_annexed_RCT
+				original_tag = RCT
+			}
+		}
+	}
+	available = {
+		hidden_trigger = {
+			owner = {
+				OR = {
+					has_country_flag = RIV_annexed_RCT
+					original_tag = RCT
+				}
+			}
+		}
+		owner = {
+			owns_state = 619
+		}
+	}
+	initial_trait = {
+		equipment_bonus = {
+			soft_attack = 0.02
+			defense = 0.01
+		}
+	}
+}
+
+RCT_Fast_as_the_River_GmbH_organization = {
+	include = generic_motorized_mechanized_organization
+	name = RCT_Fast_as_the_River_GmbH
+	icon = GFX_idea_RCT_Fast_as_the_River_GmbH
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		can_form_river_fed = yes
+	}
+	visible = {
+		owner = {
+			OR = {
+				has_country_flag = RIV_annexed_RCT
+				original_tag = RCT
+			}
+		}
+	}
+	available = {
+		hidden_trigger = {
+			owner = {
+				OR = {
+					has_country_flag = RIV_annexed_RCT
+					original_tag = RCT
+				}
+			}
+		}
+		owner = {
+			owns_state = 619
+		}
+	}
+	initial_trait = {
+		limit_to_equipment_type = { motorized_equipment }
+		equipment_bonus = {
+			maximum_speed = 0.06
+		}
+	}
+}
diff --git a/common/military_industrial_organization/organizations/SCS_organization.txt b/common/military_industrial_organization/organizations/SCS_organization.txt
new file mode 100644
index 00000000000..aa203e73271
--- /dev/null
+++ b/common/military_industrial_organization/organizations/SCS_organization.txt
@@ -0,0 +1,118 @@
+SCS_tank_1_organization = {
+	name = SCS_tank_1
+	include = generic_mobile_tank_organization
+	icon = GFX_idea_SCS_tank_1
+	allowed = {
+		original_tag = SCS
+		has_dlc = "Arms Against Tyranny"
+	}
+}
+SCS_tank_2_organization = {
+	name = SCS_tank_2
+	include = generic_heavy_tank_organization
+	icon = GFX_idea_SCS_tank_2
+	allowed = {
+		original_tag = SCS
+		has_dlc = "Arms Against Tyranny"
+	}
+}
+SCS_colt_arms_organization = {
+	name = colt_arms
+	include = generic_infantry_equipment_organization
+	icon = GFX_idea_generic_infantry_equipment_manufacturer_3
+	allowed = {
+		original_tag = SCS
+		has_dlc = "Arms Against Tyranny"
+	}
+	initial_trait = {
+		organization_modifier = {
+			military_industrial_organization_design_team_assign_cost = -0.67
+		}
+	}
+}
+SCS_neighchester_arms_organization = {
+	name = neighchester_arms
+	include = generic_support_equipment_organization
+	icon = GFX_idea_generic_infantry_equipment_manufacturer_1
+	allowed = {
+		original_tag = SCS
+		has_dlc = "Arms Against Tyranny"
+	}
+	initial_trait = {
+		limit_to_equipment_type = { support_equipment } 
+		equipment_bonus = {
+			build_cost_ic = -0.05
+		}
+		organization_modifier = {
+			military_industrial_organization_design_team_assign_cost = -0.67
+		}
+	}
+}
+SCS_rearington_arms_organization = {
+	name = rearington_arms
+	include = generic_artillery_organization
+	icon = GFX_idea_SCS_rearington_arms
+	allowed = {
+		original_tag = SCS
+		has_dlc = "Arms Against Tyranny"
+	}
+	initial_trait = {
+		organization_modifier = {
+			military_industrial_organization_design_team_assign_cost = -0.67
+		}
+	}
+}
+SCS_air_man_organization = {
+	name = SCS_air_man
+	include = generic_light_aircraft_organization
+	icon = GFX_idea_SCS_air_man
+	allowed = {
+		original_tag = SCS
+		has_dlc = "Arms Against Tyranny"
+	}
+}
+SCS_air_man_2_organization = {
+	name = SCS_air_man_2
+	include = generic_medium_aircraft_organization
+	icon = GFX_idea_SCS_air_man_2
+	allowed = {
+		original_tag = SCS
+		has_dlc = "Arms Against Tyranny"
+	}
+}
+SCS_air_man_3_organization = {
+	name = SCS_air_man_3
+	include = generic_heavy_aircraft_organization
+	icon = GFX_idea_SCS_air_man_3
+	allowed = {
+		original_tag = SCS
+		has_dlc = "Arms Against Tyranny"
+	}
+}
+SCS_navy_man_organization = {
+	name = SCS_navy_man
+	include = generic_raider_ship_organization
+	icon = GFX_idea_SCS_navy_man
+	allowed = {
+		original_tag = SCS
+		has_dlc = "Arms Against Tyranny"
+	}
+}
+SCS_navy_man_2_organization = {
+	name = SCS_navy_man_2
+	include = generic_task_force_ship_organization
+	icon = GFX_idea_SCS_navy_man_2
+	allowed = {
+		original_tag = SCS
+		has_dlc = "Arms Against Tyranny"
+	}
+}
+SCS_navy_man_3_organization = {
+	name = SCS_navy_man_3
+	include = generic_escort_ship_organization
+	icon = GFX_idea_SCS_navy_man_3
+	allowed = {
+		original_tag = SCS
+		has_dlc = "Arms Against Tyranny"
+	}
+}
\ No newline at end of file
diff --git a/common/military_industrial_organization/organizations/SIC_organization.txt b/common/military_industrial_organization/organizations/SIC_organization.txt
new file mode 100644
index 00000000000..073df096b6b
--- /dev/null
+++ b/common/military_industrial_organization/organizations/SIC_organization.txt
@@ -0,0 +1,264 @@
+SIC_arahno_vehiculos_especiales_organization = {
+	name = arahno_vehiculos_especiales
+	include = generic_mobile_tank_organization
+	icon = GFX_idea_SIC_arahno_vehiculos_especiales
+	allowed = {
+		OR = {
+			original_tag = SIC
+			original_tag = WNG
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = SIC
+				owns_state = 518
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 518
+		}
+	}
+}
+SIC_construccion_agricola_tractores_organization = {
+	name = construccion_agricola_tractores
+	include = generic_medium_tank_organization
+	icon = GFX_idea_SIC_construccion_agricola_tractores
+	allowed = {
+		OR = {
+			original_tag = SIC
+			original_tag = WNG
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = SIC
+				owns_state = 445
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 445
+		}
+	}
+	initial_trait = {
+		organization_modifier = {
+			military_industrial_organization_design_team_assign_cost = -0.15
+		}
+	}
+}
+SIC_arsenal_sycamore_organization = {
+	name = arsenal_sycamore
+	include = generic_artillery_organization
+	icon = GFX_idea_SIC_arsenal_sycamore
+	allowed = {
+		original_tag = SIC
+		has_dlc = "Arms Against Tyranny"
+	}
+	available = {
+		owner = {
+			has_completed_focus = SIC_sycamore_armory
+		}
+	}
+	initial_trait = {
+		organization_modifier = {
+			military_industrial_organization_design_team_assign_cost = -0.33
+		}
+	}
+}
+SIC_estrella_organization = {
+	name = estrella
+	include = generic_infantry_equipment_organization
+	icon = GFX_idea_SIC_estrella
+	allowed = {
+		OR = {
+			original_tag = SIC
+			original_tag = MIT
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	available = {
+		owner = {
+			OR = {
+				original_tag = SIC
+				has_global_flag = SIC_minotaurian_business_flag
+			}
+		}
+	}
+}
+SIC_motores_makomo_organization = {
+	name = motores_makomo
+	include = generic_motorized_mechanized_organization
+	icon = GFX_idea_SIC_motores_makomo
+	allowed = {
+		original_tag = SIC
+		has_dlc = "Arms Against Tyranny"
+	}
+}
+SIC_astilleros_y_talleres_de_queruscos_organization= {
+	name = astilleros_y_talleres_de_queruscos
+	include = generic_escort_ship_organization
+	icon = GFX_idea_SIC_astilleros_y_talleres_de_queruscos
+	allowed = {
+		OR = {
+			original_tag = SIC
+			original_tag = WNG
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = SIC
+				owns_state = 444
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 444
+		}
+	}
+}
+SIC_eritonaval_organization = {
+	name = eritonaval
+	include = generic_task_force_ship_organization
+	icon = GFX_idea_SIC_eritonaval
+	allowed = {
+		OR = {
+			original_tag = SIC
+			original_tag = MIT
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	available = {
+		owner = {
+			OR = {
+				original_tag = SIC
+				has_global_flag = SIC_minotaurian_business_flag
+			}
+		}
+	}
+}
+SIC_fast_battleship_committee_organization = {
+	name = fast_battleship_committee_designer
+	include = generic_raider_ship_organization
+	icon = GFX_idea_SIC_fast_battleship_committee
+	allowed = {
+		OR = {
+			original_tag = SIC
+			original_tag = WNG
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+
+	visible = {
+		owner = {
+			OR = {
+				original_tag = SIC
+				AND = {
+					SIC = { has_completed_focus = SIC_fast_battleship_committee }
+					owns_state = 445
+				}
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 445
+		}
+		if = {
+			limit = { owner = { original_tag = SIC } }
+
+			owner = { has_completed_focus = SIC_fast_battleship_committee }
+		}
+	}
+	initial_trait = {
+		organization_modifier = {
+			military_industrial_organization_design_team_assign_cost = -0.15
+		}
+	}
+}		
+SIC_construcciones_aeronauticas_escalara_CAEA_organization = {
+	name = construcciones_aeronauticas_escalara_CAEA
+	icon = GFX_idea_SIC_construcciones_aeronauticas_escalara_CAEA
+	include = generic_light_aircraft_organization
+	allowed = {
+		OR = {
+			original_tag = SIC
+			original_tag = WNG
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = SIC
+				owns_state = 394
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 394
+		}
+	}
+}
+
+SIC_ala_vuelo_organization = {
+	name = ala_vuelo
+	include = generic_cas_aircraft_organization
+	allowed = {
+		OR = {
+			original_tag = SIC
+			original_tag = WNG
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = SIC
+				owns_state = 445
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 445
+		}
+	}
+	icon = GFX_idea_SIC_ala_vuelo
+}
+
+SIC_grupo_aviones_keowen_organization = {
+	name = grupo_aviones_keowen
+	allowed = {
+		OR = {
+			original_tag = SIC
+			original_tag = WNG
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = SIC
+				owns_state = 528
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 528
+		}
+	}
+	icon = GFX_idea_SIC_grupo_aviones_keowen
+	include = generic_naval_aircraft_organization
+}
\ No newline at end of file
diff --git a/common/military_industrial_organization/organizations/SRS_organization.txt b/common/military_industrial_organization/organizations/SRS_organization.txt
new file mode 100644
index 00000000000..db2a6d008d0
--- /dev/null
+++ b/common/military_industrial_organization/organizations/SRS_organization.txt
@@ -0,0 +1,113 @@
+
+SRS_internationalist_armaments_organization = {
+	name = internationalist_armaments
+	icon = GFX_idea_internationalist_armaments
+
+	allowed = {
+		original_tag = SRS
+		has_dlc = "Arms Against Tyranny"
+	}
+	available = {
+		owner = {
+			has_country_flag = SRS_debates_3d_flag
+			has_country_flag = SRS_picked_the_internationalist_armaments
+			has_government = communism
+		}
+	}	
+	include = generic_infantry_equipment_organization
+	research_categories = {
+		infantry_weapons
+		magical_tech
+	}
+}
+
+SRS_skynavian_automobile_cooperative_organization = {
+	name = SRS_skynavian_automobile_cooperative
+	icon = GFX_idea_schneider
+	
+	allowed = {
+		original_tag = SRS
+		has_dlc = "Arms Against Tyranny"
+	}
+	available = {
+		owner = {
+			has_country_flag = SRS_picked_the_skynavian_automobile_cooperative
+			has_government = communism
+		}
+	}
+	include = generic_motorized_mechanized_organization
+}
+
+SRS_plover_cove_shipwrights_collective_organization = {
+	name = plover_cove_shipwrights_collective
+	icon = GFX_idea_plover_cove_shipwrights_collective
+	allowed = {
+		original_tag = SRS
+		has_dlc = "Arms Against Tyranny"
+	}
+	available = {
+		owner = {
+			522 = { is_fully_controlled_by = owner }
+			has_country_flag = SRS_unlocked_shipwrights_collective_as_naval_designer
+			has_government = communism
+		}
+	}
+	include = generic_raider_ship_organization
+	initial_trait = {
+		equipment_bonus = {
+			build_cost_ic = -0.05
+		}
+	}
+}
+
+SRS_punch_a_hole_organization = {
+	name = SRS_punch_a_hole
+	icon = GFX_idea_SRS_punch_a_hole
+	allowed = {
+		OR = {
+			original_tag = SRS
+			original_tag = FAT
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = SRS
+				owns_state = 522
+			}
+		}	
+	}
+	available = {
+		owner = {
+			owns_state = 522
+		}
+	}
+	include = generic_infantry_tank_organization
+}
+
+SRS_light_aircraft_manufacturer_organization = {
+	name = SRS_light_aircraft_manufacturer
+	icon = GFX_idea_SRS_light_aircraft_manufacturer
+	allowed = {
+		OR = {
+			original_tag = SRS
+			original_tag = FAT
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = SRS
+				owns_state = 522
+			}
+		}	
+	}
+	available = {
+		owner = {
+			owns_state = 522
+		}
+	}
+	include = generic_light_aircraft_organization
+}
\ No newline at end of file
diff --git a/common/military_industrial_organization/organizations/STG_organization.txt b/common/military_industrial_organization/organizations/STG_organization.txt
new file mode 100644
index 00000000000..5a9387677c3
--- /dev/null
+++ b/common/military_industrial_organization/organizations/STG_organization.txt
@@ -0,0 +1,300 @@
+#####################
+
+###  ##  #  # # #  ## 
+ #  #  # ## # # # #   
+ #  #### # ## ##   #  
+ #  #  # #  # # #   # 
+ #  #  # #  # # # ## 
+
+ #################### 
+
+
+
+STG_stalliongrad_tractor_factory_organization = {
+	
+	name = stalliongrad_tractor_factory
+	include = generic_heavy_tank_organization
+	icon = GFX_idea_STG_stalliongrad_tractor_factory
+	available = {
+		FROM = {
+			
+			OR = {
+				has_government = communism
+				has_country_leader = {
+					ruling_only = yes
+					character = STG_dark_wing
+				}
+			}
+		}
+	}
+	allowed = {
+		tag = STG
+		has_dlc = "Arms Against Tyranny"
+	} 
+	initial_trait = {
+		organization_modifier = {
+			military_industrial_organization_research_bonus = 0.03
+		}
+	}
+}
+
+STG_PegAz_organization = {
+
+	name = STG_PegAZ
+	icon = GFX_idea_STG_PegAZ 
+	include = generic_mobile_tank_organization
+	allowed = {
+		tag = STG
+		has_dlc = "Arms Against Tyranny"
+	}
+	available = {
+		FROM = {
+			
+			OR = {
+				has_government = communism
+				has_country_leader = {
+					ruling_only = yes
+					character = STG_dark_wing
+				}
+			}
+		}
+	}
+	initial_trait = {
+		organization_modifier = {
+			military_industrial_organization_research_bonus = 0.03
+		}
+	}
+}
+
+
+#####################
+
+ ## #  # ### ###   ## 
+#   #  #  #  #  # #   
+ #  ####  #  ###   #  
+  # #  #  #  #      # 
+##  #  # ### #    ##  
+ 
+#####################
+
+STG_yantar_organization = {
+	name = yantar
+	icon = GFX_idea_STG_yantar 
+	include = generic_battle_line_ship_organization
+	allowed = {
+		tag = STG
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		FROM = { 
+			OR = {
+				tag = STG
+				owns_state = 332
+			}
+		}
+	}
+	available = {
+		FROM = { owns_state = 332 }
+	}
+	override_trait = {
+		token = generic_mio_trait_advanced_armor_design
+
+		position = { x=1 y=0 }
+		relative_position_id = generic_mio_trait_advanced_hydrodynamic_design
+	}
+
+	add_trait = { 
+		token = STG_mio_trait_flared_bow
+		name = ENG_mio_trait_flared_bow
+		icon = GFX_generic_mio_department_icon_ship_general_quality
+		special_trait_background = yes
+
+		position = { x=1 y=0 }
+		relative_position_id = generic_mio_trait_advanced_armor_design
+
+		any_parent = { generic_mio_trait_hardened_critical_components}
+		
+		equipment_bonus = {
+			naval_weather_penalty_factor = -0.1
+		}
+	}
+
+	add_trait = { 
+		token = STG_mio_trait_super_charges
+		name = ENG_mio_trait_super_charges
+		icon = GFX_generic_mio_department_icon_ship_capital_ship_weapons
+		special_trait_background = yes
+
+		position = { x=0 y=2 }
+		relative_position_id = generic_mio_trait_semi_armor_piercing_shells
+
+		any_parent = { generic_mio_trait_super_heavy_shells generic_mio_trait_semi_armor_piercing_shells generic_mio_trait_high_velocity_guns }
+
+		limit_to_equipment_type = { capital_ship }
+
+		equipment_bonus = {
+			hg_armor_piercing = 0.05
+			lg_armor_piercing = 0.05
+		}
+	}
+}
+
+STG_petershoof_zavod_organization = {
+	name = petershoof_zavod
+	icon = GFX_idea_STG_petershoof_zavod
+	include = generic_refurbishment_repair_organization # CHANGED FROM BATTLE LINE TO PREVENT DUPLICATE
+	allowed = {
+		tag = STG
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		FROM = { 
+			OR = {
+				original_tag= STG
+				owns_state = 166
+			}
+		}
+	}
+	available = {
+		FROM = { owns_state = 166 }
+	}
+}
+
+###########################
+
+###  #    ##  #  # ###  ## 
+#  # #   #  # ## # #   #   
+###  #   #### # ## ##   #  
+#    #   #  # #  # #     # 
+#    ### #  # #  # ### ##  
+
+###########################
+
+STG_prolet_airfleet_organization = {
+	name = prolet_airfleet
+	icon = GFX_idea_STG_prolet_airfleet 
+	include = generic_light_aircraft_organization
+	available = {
+		FROM = {
+			
+			OR = {
+				has_government = communism
+				has_country_leader = {
+					ruling_only = yes
+					character = STG_dark_wing
+				}
+			}
+		}
+	}
+	allowed = {
+		tag = STG
+		has_dlc = "Arms Against Tyranny"
+	}
+}
+
+STG_voskhod_organization = {
+	name = voskhod
+	icon = GFX_idea_STG_voskhod 
+	include = generic_medium_aircraft_organization
+	allowed = {
+		tag = STG
+		has_dlc = "Arms Against Tyranny"
+	}
+}
+
+STG_zarya_organization = {
+	name = STG_zarya
+	icon = GFX_idea_STG_zarya
+	include = generic_cas_aircraft_organization
+	visible = {
+		FROM = {
+			OR = {
+				original_tag = STG
+				owns_state = 153
+			}
+		}
+	}
+	available = {
+		FROM = { owns_state = 153 }
+	}
+	allowed = {
+		OR = {
+			original_tag = STG
+			original_tag = STL
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+}
+
+
+################################### 
+
+#   #  ##  ### ### ###  ### ### #   
+## ## #  #  #  #   #  #  #  #   #   
+# # # ####  #  ##  ###   #  ##  #   
+#   # #  #  #  #   #  #  #  #   #   
+#   # #  #  #  ### #  # ### ### ### 
+
+
+###################################
+
+STG_grey_design_organization = {
+	
+	name = grey_design
+	icon = GFX_idea_STG_grey_design
+	include = generic_infantry_equipment_organization
+	available = {
+		FROM = {
+			
+			OR = {
+				has_government = communism
+				has_country_leader = {
+					ruling_only = yes
+					character = STG_dark_wing
+				}
+			}
+		}
+	}
+	allowed = {
+		tag = STG
+		has_dlc = "Arms Against Tyranny"
+	}
+}
+
+STG_stavropon_factory_organization = {
+	name = STG_stavropon_factory
+	icon = GFX_idea_STG_stavropon_factory
+	include = generic_artillery_organization
+	available = {
+		FROM = { owns_state = 233 }
+	}
+	allowed = {
+		tag = STG
+		has_dlc = "Arms Against Tyranny"
+	}
+}
+
+STG_ZAZ_concern_organization = {
+	name = ZAZ_concern
+	icon = GFX_idea_STG_zaz_concern 
+	include = generic_motorized_mechanized_organization
+	visible = {
+		FROM = {
+			OR = {
+				original_tag = STG
+				owns_state = 334
+			}
+		}
+	}
+	available = { 
+		FROM = { owns_state = 334 }
+	}
+	allowed = {
+		tag = STG
+		has_dlc = "Arms Against Tyranny"
+	}
+}
+
+
+
+
diff --git a/common/military_industrial_organization/organizations/STW_organization.txt b/common/military_industrial_organization/organizations/STW_organization.txt
new file mode 100644
index 00000000000..478b5996e7d
--- /dev/null
+++ b/common/military_industrial_organization/organizations/STW_organization.txt
@@ -0,0 +1,314 @@
+#####################
+
+###  ##  #  # # #  ## 
+ #  #  # ## # # # #   
+ #  #### # ## ##   #  
+ #  #  # #  # # #   # 
+ #  #  # #  # # # ## 
+
+ #################### 
+
+STW_fast_tank_manufacturer_organization = {
+	
+	name = STW_fast_tank_manufacturer
+	icon = GFX_idea_STW_fast_tank_manufacturer
+	include = generic_mobile_tank_organization
+	
+	allowed = {
+		OR = {
+			original_tag = GRI 
+			original_tag = STW 
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	available = {
+		FROM = {
+			owns_state = 443
+			443 = { is_core_of = FROM }
+		}
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = STW
+				owns_state = 443
+			}
+		}
+	}
+}
+
+STW_medium_tank_manufacturer_organization = {
+
+	name = STW_medium_tank_manufacturer
+	icon = GFX_idea_STW_medium_tank_manufacturer
+	include = generic_medium_tank_organization
+	
+	allowed = {
+		OR = {
+			original_tag = GRI 
+			original_tag = STW 
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = STW
+				owns_state = 486
+			}
+		}
+	}
+	available = {
+		FROM = {
+			owns_state = 486
+			486 = { is_core_of = FROM }
+		}
+	}
+}
+
+#####################
+
+ ## #  # ### ###   ## 
+#   #  #  #  #  # #   
+ #  ####  #  ###   #  
+  # #  #  #  #      # 
+##  #  # ### #    ##  
+ 
+#####################
+
+STW_convoy_escort_naval_manufacturer_organization = {
+
+	name = STW_convoy_escort_naval_manufacturer
+	icon = GFX_idea_STW_convoy_escort_naval_manufacturer
+	include = generic_escort_ship_organization
+	
+	allowed = {
+		OR = {
+			original_tag = GRI 
+			original_tag = STW 
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	visible = {
+		owner = {
+			OR = {
+				original_tag = STW
+				owns_state = 486
+			}
+		}
+	}
+	available = {
+		FROM = {
+			owns_state = 486
+			486 = { is_core_of = FROM }
+			any_controlled_state_is_coastal = yes
+		}
+	}
+}
+
+
+###########################
+
+###  #    ##  #  # ###  ## 
+#  # #   #  # ## # #   #   
+###  #   #### # ## ##   #  
+#    #   #  # #  # #     # 
+#    ### #  # #  # ### ##  
+
+###########################
+
+
+STW_light_aircraft_manufacturer_organization = {
+
+	name = STW_light_aircraft_manufacturer
+	icon = GFX_idea_STW_light_aircraft_manufacturer
+	include = generic_light_aircraft_organization
+	
+	allowed = {
+		OR = {
+			original_tag = GRI 
+			original_tag = STW 
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = STW
+				owns_state = 486
+			}
+		}
+	}
+	
+	available = {
+		FROM = {
+			owns_state = 486
+			486 = { is_core_of = FROM }
+		}
+	}
+}
+
+STW_medium_aircraft_manufacturer_organization = {
+
+	name = STW_medium_aircraft_manufacturer
+	icon = GFX_idea_STW_medium_aircraft_manufacturer
+	include = generic_medium_aircraft_organization
+	
+	allowed = {
+		OR = {
+			original_tag = GRI 
+			original_tag = STW 
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	visible = {
+		owner = {
+			OR = {
+				original_tag = STW
+				owns_state = 545
+			}
+		}
+	}
+	
+	available = {
+		FROM = {
+			owns_state = 545
+			545 = { is_core_of = FROM }
+		}
+	}
+}
+
+STW_heavy_aircraft_manufacturer_organization = {
+
+	name = STW_heavy_aircraft_manufacturer
+	icon = GFX_idea_STW_heavy_aircraft_manufacturer
+	include = generic_heavy_aircraft_organization
+	
+	allowed = {
+		OR = {
+			original_tag = GRI 
+			original_tag = STW 
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = STW
+				owns_state = 486
+			}
+		}
+	}
+	
+	available = {
+		FROM = {
+			owns_state = 486
+			486 = { is_core_of = FROM }
+		}
+	}
+}
+
+
+################################### 
+
+#   #  ##  ### ### ###  ### ### #   
+## ## #  #  #  #   #  #  #  #   #   
+# # # ####  #  ##  ###   #  ##  #   
+#   # #  #  #  #   #  #  #  #   #   
+#   # #  #  #  ### #  # ### ### ### 
+
+
+###################################
+
+STW_infantry_equipment_manufacturer_organization = {
+
+	name = STW_infantry_equipment_manufacturer
+	icon = GFX_idea_STW_infantry_equipment_manufacturer
+	include = generic_infantry_equipment_organization
+	
+	allowed = {
+		OR = {
+			original_tag = GRI 
+			original_tag = STW 
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = STW
+				owns_state = 486
+			}
+		}
+	}
+
+	available = {
+		FROM = {
+			owns_state = 486
+			486 = { is_core_of = FROM }
+		}
+	}
+}
+
+STW_artillery_manufacturer_organization = {
+
+	name = STW_artillery_manufacturer
+	icon = GFX_idea_STW_artillery_manufacturer
+	include = generic_artillery_organization
+	
+	allowed = {
+		OR = {
+			original_tag = GRI 
+			original_tag = STW 
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = STW
+				owns_state = 486
+			}
+		}
+	}
+	
+	available = {
+		FROM = {
+			owns_state = 486
+			486 = { is_core_of = FROM }
+		}
+	}
+}
+
+STW_motorized_equipment_manufacturer_organization = {
+
+	name = STW_motorized_equipment_manufacturer
+	icon = GFX_idea_STW_motorized_equipment_manufacturer
+	include = generic_motorized_mechanized_organization
+	
+	allowed = {
+		OR = {
+			original_tag = GRI 
+			original_tag = STW 
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = STW
+				owns_state = 486
+			}
+		}
+	}
+	
+	available = {
+		FROM = {
+			owns_state = 486
+			486 = { is_core_of = FROM }
+		}
+	}
+}
diff --git a/common/military_industrial_organization/organizations/Southeast_organization.txt b/common/military_industrial_organization/organizations/Southeast_organization.txt
new file mode 100644
index 00000000000..3f0bec229d4
--- /dev/null
+++ b/common/military_industrial_organization/organizations/Southeast_organization.txt
@@ -0,0 +1,159 @@
+
+########    ###    ##    ## ##    ##  ######  
+   ##      ## ##   ###   ## ##   ##  ##    ## 
+   ##     ##   ##  ####  ## ##  ##   ##       
+   ##    ##     ## ## ## ## #####     ######  
+   ##    ######### ##  #### ##  ##         ## 
+   ##    ##     ## ##   ### ##   ##  ##    ## 
+   ##    ##     ## ##    ## ##    ##  ######  
+
+saltlickingham_ground_organization = {
+	name = saltlickingham_ground
+	include = generic_mobile_tank_organization
+	icon = GFX_idea_BAL_white_hoof
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		
+		OR = {
+			original_tag = CES
+			original_tag = NMS
+			original_tag = BAL #Controls at game start
+			original_tag = JUN
+			original_tag = TEM
+		}
+	}
+	available = {
+		owner = {
+			controls_state = 13
+		}
+	}
+	initial_trait = {
+		organization_modifier = {
+			military_industrial_organization_research_bonus = 0.03
+		}
+	}
+}
+ ######  ##     ## #### ########   ######  
+##    ## ##     ##  ##  ##     ## ##    ## 
+##       ##     ##  ##  ##     ## ##       
+ ######  #########  ##  ########   ######  
+      ## ##     ##  ##  ##              ## 
+##    ## ##     ##  ##  ##        ##    ## 
+ ######  ##     ## #### ##         ######  
+
+
+
+########  ##          ###    ##    ## ########  ######  
+##     ## ##         ## ##   ###   ## ##       ##    ## 
+##     ## ##        ##   ##  ####  ## ##       ##       
+########  ##       ##     ## ## ## ## ######    ######  
+##        ##       ######### ##  #### ##             ## 
+##        ##       ##     ## ##   ### ##       ##    ## 
+##        ######## ##     ## ##    ## ########  ######  
+
+
+heavy_wings_organization = {
+	name = heavy_wings
+	include = generic_medium_aircraft_organization
+	icon = GFX_idea_JUN_heavy_wings
+	allowed = {
+		OR = {
+			original_tag = CES
+			original_tag = NMS
+			original_tag = BAL #Controls at game start
+			original_tag = JUN
+			original_tag = TEM
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	available = {
+		owner = {
+			controls_state = 16
+		}
+	}
+	
+}
+
+
+
+##     ##    ###    ######## ######## ########  #### ######## ##       
+###   ###   ## ##      ##    ##       ##     ##  ##  ##       ##       
+#### ####  ##   ##     ##    ##       ##     ##  ##  ##       ##       
+## ### ## ##     ##    ##    ######   ########   ##  ######   ##       
+##     ## #########    ##    ##       ##   ##    ##  ##       ##       
+##     ## ##     ##    ##    ##       ##    ##   ##  ##       ##       
+##     ## ##     ##    ##    ######## ##     ## #### ######## ######## 
+
+
+sturdy_stable_factory_organization = {
+	include = generic_infantry_equipment_organization
+	name = sturdy_stable_factory
+	icon = GFX_idea_CES_sturdy_stable_factory
+
+	allowed = {
+		can_form_river_fed = yes
+		OR = {
+			original_tag = CES #Controls at game start
+			original_tag = NMS
+			original_tag = BAL
+			original_tag = JUN
+			original_tag = TEM
+		}
+	}
+
+	available = {
+		owner = {
+			controls_state = 15
+		}
+	}
+}
+
+
+astimare_concern_organization = {
+	name = astimare_concern
+	include = generic_artillery_organization
+	icon = GFX_idea_NMS_astimare_concern
+	allowed = {	
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = CES
+			original_tag = NMS #Controls at game start
+			original_tag = BAL
+			original_tag = JUN
+			original_tag = TEM
+		}
+	}
+	
+	available = {
+		owner = {
+			controls_state = 24
+		}
+	}
+	initial_trait = {
+		organization_modifier = {
+			military_industrial_organization_research_bonus = 0.05
+		}
+	}
+}
+
+blue_mare_motors_organization = {
+	name = blue_mare_motors
+	include = generic_motorized_mechanized_organization
+	icon = GFX_idea_BAL_blue_mare_motors
+	allowed = {	
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = CES
+			original_tag = NMS
+			original_tag = BAL #Controls at game start
+			original_tag = JUN
+			original_tag = TEM
+		}
+	}
+	
+	available = {
+		owner = {
+			controls_state = 13
+		}
+	}
+}
\ No newline at end of file
diff --git a/common/military_industrial_organization/organizations/TAL_organization.txt b/common/military_industrial_organization/organizations/TAL_organization.txt
new file mode 100644
index 00000000000..1070de8e3a6
--- /dev/null
+++ b/common/military_industrial_organization/organizations/TAL_organization.txt
@@ -0,0 +1,272 @@
+#####################
+
+###  ##  #  # # #  ## 
+ #  #  # ## # # # #   
+ #  #### # ## ##   #  
+ #  #  # #  # # #   # 
+ #  #  # #  # # # ## 
+
+ #################### 
+
+TAL_light_tank_manufacturer_organization = {
+
+	name = TAL_light_tank_manufacturer
+	icon = GFX_idea_TAL_light_tank_manufacturer
+	include = generic_mobile_tank_organization
+	
+	allowed = {
+		OR = {
+			original_tag = TAL 
+			original_tag = WNG
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	visible = {
+		owner = {
+			OR = {
+				original_tag = TAL
+				owns_state = 366
+			}
+		}
+	}
+	available = {
+		FROM = {
+			owns_state = 366
+		}
+	}
+}
+
+TAL_medium_tank_manufacturer_organization = {
+
+	name = TAL_medium_tank_manufacturer
+	icon = GFX_idea_TAL_medium_tank_manufacturer
+	include = generic_medium_tank_organization
+	
+	allowed = {
+		OR = {
+			original_tag = TAL 
+			original_tag = WNG
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = TAL
+				owns_state = 366
+			}
+		}
+	}
+	
+	available = {
+		FROM = {
+			owns_state = 366
+		}
+	}
+}
+
+#####################
+
+ ## #  # ### ###   ## 
+#   #  #  #  #  # #   
+ #  ####  #  ###   #  
+  # #  #  #  #      # 
+##  #  # ### #    ##  
+ 
+#####################
+
+
+TAL_navy_escort_manufacturer_organization = {
+
+	name = TAL_navy_escort_manufacturer
+	icon = GFX_idea_TAL_navy_escort_manufacturer
+	include = generic_escort_ship_organization
+	
+	allowed = {
+		OR = {
+			original_tag = TAL 
+			original_tag = WNG
+			original_tag = FRN
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = TAL
+				owns_state = 366
+			}
+		}
+	}
+	
+	available = {
+		FROM = {
+			owns_state = 366
+		}
+	}
+}
+
+TAL_coast_defence_manufacturer_organization = {
+
+	name = TAL_coast_defence_manufacturer
+	icon = GFX_idea_TAL_coast_defence_manufacturer
+	include = generic_raider_ship_organization
+	
+	allowed = {
+		OR = {
+			original_tag = TAL 
+			original_tag = WNG
+			original_tag = FRN
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = TAL
+				owns_state = 366
+			}
+		}
+	}
+	
+	available = {
+		FROM = {
+			owns_state = 366
+		}
+	}
+}
+
+
+###########################
+
+###  #    ##  #  # ###  ## 
+#  # #   #  # ## # #   #   
+###  #   #### # ## ##   #  
+#    #   #  # #  # #     # 
+#    ### #  # #  # ### ##  
+
+###########################
+
+TAL_light_plane_manufacturer_organization = {
+
+	name = TAL_light_plane_manufacturer
+	icon = GFX_idea_TAL_light_plane_manufacturer
+	include = generic_high_agility_fighter_aircraft_organization
+	
+	allowed = {
+		OR = {
+			original_tag = TAL 
+			original_tag = WNG
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = TAL
+				owns_state = 366
+			}
+		}
+	}
+	
+	available = {
+		FROM = {
+			owns_state = 366
+		}
+	}
+}
+
+TAL_navy_plane_manufacturer_organization = {
+
+	name = TAL_navy_plane_manufacturer
+	icon = GFX_idea_TAL_navy_plane_manufacturer
+	include = generic_naval_aircraft_organization
+	
+	allowed = {
+		OR = {
+			original_tag = TAL 
+			original_tag = WNG
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = TAL
+				owns_state = 366
+			}
+		}
+	}
+	
+	available = {
+		FROM = {
+			owns_state = 366
+		}
+	}
+}
+
+
+
+################################### 
+
+#   #  ##  ### ### ###  ### ### #   
+## ## #  #  #  #   #  #  #  #   #   
+# # # ####  #  ##  ###   #  ##  #   
+#   # #  #  #  #   #  #  #  #   #   
+#   # #  #  #  ### #  # ### ### ### 
+
+
+###################################
+
+TAL_infantry_manufacturer_organization = {
+	
+	name = TAL_infantry_manufacturer
+	icon = GFX_idea_TAL_infantry_manufacturer
+	include = generic_infantry_equipment_organization
+	
+	allowed = {
+		OR = {
+			original_tag = TAL 
+			original_tag = WNG
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = TAL
+				owns_state = 368
+			}
+		}
+	}
+	
+	available = {
+		FROM = {
+			owns_state = 368
+		}
+	}
+}
+
+TAL_automobile_industry_idea_organization = {
+
+	name = TAL_automobile_industry_idea
+	icon = GFX_idea_TAL_automobile_industry_idea
+	include = generic_motorized_mechanized_organization
+	
+	allowed = {
+		original_tag = TAL 
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	available = {
+		FROM = {
+			has_completed_focus = TAL_automobile_industry
+		}
+	}
+	initial_trait = {
+		equipment_bonus = {
+			build_cost_ic = -0.05
+		}
+	}
+}
diff --git a/common/military_industrial_organization/organizations/TBK_organization.txt b/common/military_industrial_organization/organizations/TBK_organization.txt
new file mode 100644
index 00000000000..812151e4f20
--- /dev/null
+++ b/common/military_industrial_organization/organizations/TBK_organization.txt
@@ -0,0 +1,334 @@
+
+########    ###    ##    ## ##    ##  ######  
+   ##      ## ##   ###   ## ##   ##  ##    ## 
+   ##     ##   ##  ####  ## ##  ##   ##       
+   ##    ##     ## ## ## ## #####     ######  
+   ##    ######### ##  #### ##  ##         ## 
+   ##    ##     ## ##   ### ##   ##  ##    ## 
+   ##    ##     ## ##    ## ##    ##  ######  
+
+
+TBK_Starting_Tank_organization = {
+	name = TBK_Starting_Tank
+	include = generic_mobile_tank_organization
+	icon = GFX_idea_TBK_Zufra_Steelworks
+	allowed = {
+		OR = {
+			original_tag = TBK
+			original_tag = ZAR
+		}
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = TBK
+				AND = {
+					original_tag = ZAR
+					owns_state = 728
+					NOT = { has_country_flag = ZAR_wormy }
+				}
+			}
+		}
+	}
+}
+
+TBK_royal_severyan_rd_organization = {
+	name = TBK_royal_severyan_rd
+	include = generic_tank_organization
+	icon = GFX_idea_TBK_Royal_Severyan_RD
+	allowed = {
+		original_tag = TBK
+	}
+	visible = {
+		owner = {
+			has_completed_focus = TBK_tank_plane_desigs
+		}
+	}
+	initial_trait  = {
+		limit_to_equipment_type = { 
+			mio_cat_eq_all_light_tank mio_cat_eq_all_medium_tank
+		}
+		equipment_bonus = {
+			soft_attack = 0.03
+			hard_attack = 0.03
+			build_cost_ic = -0.03
+		}
+	}
+}
+
+
+ ######  ##     ## #### ########   ######  
+##    ## ##     ##  ##  ##     ## ##    ## 
+##       ##     ##  ##  ##     ## ##       
+ ######  #########  ##  ########   ######  
+      ## ##     ##  ##  ##              ## 
+##    ## ##     ##  ##  ##        ##    ## 
+ ######  ##     ## #### ##         ######  
+
+
+TBK_Starting_Navy_organization = {
+	name = TBK_Starting_Navy
+	include = generic_task_force_ship_organization
+	icon = GFX_idea_TBK_Imperial_Marine
+	allowed = {
+		OR = {
+			original_tag = TBK
+			original_tag = ZAR
+		}
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = TBK
+				AND = {
+					original_tag = ZAR
+					owns_state = 728
+					NOT = { has_country_flag = ZAR_wormy }
+				}
+			}
+		}
+	}
+	initial_trait  = {
+		limit_to_equipment_type = { mio_cat_eq_all_destroyer convoy }
+		equipment_bonus = {
+			build_cost_ic = -0.05
+			lg_attack = 0.05	
+		}
+	}
+}
+
+
+########  ##          ###    ##    ## ########  ######  
+##     ## ##         ## ##   ###   ## ##       ##    ## 
+##     ## ##        ##   ##  ####  ## ##       ##       
+########  ##       ##     ## ## ## ## ######    ######  
+##        ##       ######### ##  #### ##             ## 
+##        ##       ##     ## ##   ### ##       ##    ## 
+##        ######## ##     ## ##    ## ########  ######  
+
+
+TBK_Starting_Fighters_organization = {
+	name = TBK_Starting_Fighters
+	include = generic_light_aircraft_organization
+	icon = GFX_idea_TBK_Thunderclap
+	allowed = {
+		OR = {
+			original_tag = TBK
+			original_tag = ZAR
+		}
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = TBK
+				AND = {
+					original_tag = ZAR
+					owns_state = 728
+					NOT = { has_country_flag = ZAR_wormy }
+				}
+			}
+		}
+	}
+	initial_trait  = {
+		limit_to_equipment_type = { medium_airship_equipment_0 }
+		equipment_bonus = {
+			build_cost_ic = -0.15
+		}
+	}
+}
+
+TBK_Starting_CAS_organization = {
+	name = TBK_Starting_CAS
+	include = generic_cas_aircraft_organization
+	icon = GFX_idea_TBK_Stormside_Inc
+	allowed = {
+		OR = {
+			original_tag = TBK
+			original_tag = ZAR
+		}
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = TBK
+				AND = {
+					original_tag = ZAR
+					owns_state = 728
+					NOT = { has_country_flag = ZAR_wormy }
+				}
+			}
+		}
+	}
+	initial_trait  = {
+		limit_to_equipment_type = { heavy_airship_equipment_0 }
+		equipment_bonus = {
+			build_cost_ic = -0.1
+		}
+	}
+}
+
+
+##     ##    ###    ######## ######## ########  #### ######## ##       
+###   ###   ## ##      ##    ##       ##     ##  ##  ##       ##       
+#### ####  ##   ##     ##    ##       ##     ##  ##  ##       ##       
+## ### ## ##     ##    ##    ######   ########   ##  ######   ##       
+##     ## #########    ##    ##       ##   ##    ##  ##       ##       
+##     ## ##     ##    ##    ##       ##    ##   ##  ##       ##       
+##     ## ##     ##    ##    ######## ##     ## #### ######## ######## 
+
+
+TBK_Starting_Gun_organization = {
+	name = TBK_Starting_Gun
+	include = generic_infantry_equipment_organization
+	icon = GFX_idea_TBK_Cityside_Rifles
+	allowed = {	
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = TBK
+			original_tag = ZAR
+		}
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = TBK
+				AND = {
+					original_tag = ZAR
+					owns_state = 728
+					NOT = { has_country_flag = ZAR_wormy }
+				}
+			}
+		}
+	}
+	initial_trait = {
+		organization_modifier = { 
+			military_industrial_organization_design_team_assign_cost = 0.15
+		}
+		equipment_bonus = {
+			reliability = 0.1
+			build_cost_ic = -0.10
+		}
+	}
+}
+
+TBK_Starting_Arty_organization = {
+	name = TBK_Starting_Arty
+	include = generic_artillery_organization
+	icon = GFX_idea_TBK_HighCal_Plants
+	allowed = {	
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = TBK
+			original_tag = ZAR
+		}
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = TBK
+				AND = {
+					original_tag = ZAR
+					owns_state = 728
+					NOT = { has_country_flag = ZAR_wormy }
+				}
+			}
+		}
+	}
+	initial_trait = {
+		equipment_bonus = {
+			soft_attack = 0.05
+		}
+	}
+}
+
+TBK_criminal_tradat_concern_organization = {
+	name = TBK_criminal_tradat_concern
+	include = generic_infantry_equipment_organization
+	icon = GFX_idea_TBK_Tradat_Bullet_Co
+	allowed = {	
+		has_dlc = "Arms Against Tyranny"
+		original_tag = TBK
+	}
+	visible = {
+		owner = {
+			OR = {
+				has_completed_focus = TBK_vasile_gun_industry
+				has_completed_focus = TBK_vasile_business
+			}
+		}
+	}
+	initial_trait = {
+		equipment_bonus = {
+			soft_attack = 0.03
+			build_cost_ic = -0.05
+			reliability = -0.05
+		}
+	}
+}
+
+TBK_moon_rifle_corporation_organization = {
+	name = TBK_moon_rifle_corporation
+	include = generic_infantry_equipment_organization
+	icon = GFX_idea_TBK_Moon_Rifle_Corporation
+	allowed = {	
+		has_dlc = "Arms Against Tyranny"
+		original_tag = TBK
+	}
+	visible = {
+		owner = {
+			has_completed_focus = TBK_infantry_primacy
+		}
+	}
+	initial_trait = {
+		limit_to_equipment_type = { infantry_equipment magical_equipment } 
+		equipment_bonus = {
+			soft_attack = 0.03
+			hard_attack = 0.03
+			reliability = 0.03
+			build_cost_ic = -0.05
+		}
+	}
+}
+
+TBK_zamivgazal_steelsingers_organization = {
+	name = TBK_zamivgazal_steelsingers
+	include = generic_infantry_equipment_organization
+	icon = GFX_idea_TBK_Most_Honourable_Order_of_Steelsingers
+	allowed = {	
+		has_dlc = "Arms Against Tyranny"
+		original_tag = TBK
+	}
+	visible = {
+		owner = {
+			has_completed_focus = TBK_steelsingers
+		}
+	}
+	initial_trait = {
+		equipment_bonus = {
+			soft_attack = 0.05
+			hard_attack = 0.05
+		}
+	}
+}
+
+TBK_leopard_tires_organization = {
+	name = TBK_leopard_tires
+	include = generic_motorized_mechanized_organization
+	icon = GFX_idea_TBK_Leopard_Tires_Ltd
+	allowed = {	
+		has_dlc = "Arms Against Tyranny"
+		original_tag = TBK
+	}
+	visible = {
+		owner = {
+			has_completed_focus = TBK_vehicle_production
+		}
+	}
+	initial_trait = {
+		limit_to_equipment_type = { motorized_equipment mechanized_equipment } 
+		equipment_bonus = {
+			build_cost_ic = -0.05
+			breakthrough = 0.05
+		}
+	}
+}
\ No newline at end of file
diff --git a/common/military_industrial_organization/organizations/TRD_organization.txt b/common/military_industrial_organization/organizations/TRD_organization.txt
new file mode 100644
index 00000000000..29ea65048ae
--- /dev/null
+++ b/common/military_industrial_organization/organizations/TRD_organization.txt
@@ -0,0 +1,601 @@
+#####################
+
+###  ##  #  # # #  ## 
+ #  #  # ## # # # #   
+ #  #### # ## ##   #  
+ #  #  # #  # # #   # 
+ #  #  # #  # # # ## 
+
+ #################### 
+
+TRD_orthos_organization = {
+
+	name = orthos
+	icon = GFX_idea_TRD_orthos
+	include = generic_mobile_tank_organization
+	
+	allowed = {
+		original_tag = TRD 
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	available = {
+		FROM = {
+			has_completed_focus = TRD_motor_factories
+		}
+	}
+	initial_trait = {
+		limit_to_equipment_type = { light_tank_chassis }
+		equipment_bonus = {
+			breakthrough = 0.05
+		}
+	}	
+}
+
+TRD_ursa_organization = {
+
+	name = ursa
+	icon = GFX_idea_TRD_ursa
+	include = generic_medium_tank_organization
+	
+	allowed = {
+		original_tag = TRD 
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	available = {
+		FROM = {
+			has_completed_focus = TRD_motor_factories
+		}
+	}
+	
+	visible = {
+		FROM = {
+			NOT = { has_government = communism }
+			NOT = { has_government = fascism }
+			NOT = {
+				AND = {
+			        has_government = democratic
+				    has_completed_focus = TRD_altesburg
+				}
+			}
+		}
+	}
+	initial_trait = {
+		limit_to_equipment_type = { medium_tank_chassis }
+		equipment_bonus = {
+			soft_attack = 0.05
+		}
+	}	
+}
+
+TRD_ablynx_organization = {
+
+	name = ablynx
+	icon = GFX_idea_TRD_ablynx
+	include = generic_heavy_tank_organization
+	
+	allowed = {
+		original_tag = TRD 
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	available = {
+		FROM = {
+			has_completed_focus = TRD_motor_factories
+		}
+	}
+	
+	visible = {
+		FROM = {
+			NOT = { has_government = communism }
+			NOT = { has_government = fascism }
+			NOT = {
+				AND = {
+			        has_government = democratic
+				    has_completed_focus = TRD_altesburg
+				}
+			}
+		}
+	}
+	initial_trait = {
+		limit_to_equipment_type = { heavy_tank_chassis }
+		equipment_bonus = {
+			breakthrough = 0.05
+		}
+	}	
+}
+
+TRD_elsevier_organization = {
+
+	name = elsevier
+	icon = GFX_idea_ROM_the_sentinel_of_the_motherland
+	include = generic_mobile_tank_organization
+	
+	allowed = {
+		original_tag = TRD 
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	visible = {
+		FROM = {
+			OR = {
+				has_completed_focus = TRD_motor_factories
+				has_government = communism
+				has_completed_focus = TRD_altesburg
+			}
+		}
+	}
+}
+
+TRD_fugro_organization = {
+
+	name = fugro
+	icon = GFX_idea_generic_motorized_equipment_manufacturer_1
+	include = generic_medium_tank_organization
+	
+	allowed = {
+		original_tag = TRD 
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	visible = {
+		FROM = {
+			OR = {
+				has_completed_focus = TRD_motor_factories
+				has_government = communism
+				has_completed_focus = TRD_altesburg
+			}
+		}
+	}
+}
+
+#####################
+
+ ## #  # ### ###   ## 
+#   #  #  #  #  # #   
+ #  ####  #  ###   #  
+  # #  #  #  #      # 
+##  #  # ### #    ##  
+ 
+#####################
+
+
+TRD_skyfall_ships_TRD_organization = {
+	name = skyfall_ships_TRD
+	icon = GFX_idea_TRD_skyfall_ships
+	include = generic_battle_line_ship_organization
+	
+	allowed = {
+		original_tag = TRD 
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	available = {
+		FROM = {
+			owns_state = 381
+		}
+	}
+	initial_trait = {
+		limit_to_equipment_type = { ship_hull_carrier }
+		equipment_bonus = {
+			armor_value = 0.05
+			anti_air_attack = 0.05
+			surface_visibility = -0.05
+		}
+	}
+}
+
+TRD_cyclops_organization = {
+
+	name = cyclops
+	icon = GFX_idea_TRD_cyclops
+	include = generic_task_force_ship_organization
+	
+	allowed = {
+		original_tag = TRD 
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	available = {
+		FROM = {
+			any_controlled_state_is_coastal = yes
+		}
+	}
+	
+	visible = {
+		FROM = {
+			NOT = { has_government = communism }
+			NOT = { has_government = fascism }
+			NOT = {
+				AND = {
+			        has_government = democratic
+				    has_completed_focus = TRD_altesburg
+				}
+			}
+		}
+	}
+	initial_trait = {
+		limit_to_equipment_type = { ship_hull_light ship_hull_submarine }
+		equipment_bonus = {
+			build_cost_ic = -0.05
+		}
+	}
+}
+
+
+###########################
+
+###  #    ##  #  # ###  ## 
+#  # #   #  # ## # #   #   
+###  #   #### # ## ##   #  
+#    #   #  # #  # #     # 
+#    ### #  # #  # ### ##  
+
+###########################
+
+
+TRD_way_organization = {
+
+	name = way
+	icon = GFX_idea_TRD_way
+	include = generic_high_agility_fighter_aircraft_organization
+	
+	allowed = {
+		original_tag = TRD 
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	visible = {
+		FROM = {
+			NOT = { has_government = communism }
+			NOT = { has_government = fascism }
+			NOT = {
+				AND = {
+			        has_government = democratic
+				    has_completed_focus = TRD_altesburg
+				}
+			}
+		}
+	}
+}
+
+TRD_oracle_organization = {
+
+	name = oracle
+	icon = GFX_idea_TRD_oracle
+	include = generic_medium_aircraft_organization
+	
+	allowed = {
+		original_tag = TRD 
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	visible = {
+		FROM = {
+			NOT = { has_government = communism }
+			NOT = { has_government = fascism }
+			NOT = {
+				AND = {
+			        has_government = democratic
+				    has_completed_focus = TRD_altesburg
+				}
+			}
+		}
+	}
+}
+
+TRD_drake_organization = {
+
+	name = drake
+	icon = GFX_idea_TRD_drake
+	include = generic_naval_aircraft_organization
+	
+	allowed = {
+		original_tag = TRD 
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	visible = {
+		FROM = {
+			NOT = { has_government = communism }
+			NOT = { has_government = fascism }
+			NOT = {
+				AND = {
+			        has_government = democratic
+				    has_completed_focus = TRD_altesburg
+				}
+			}
+		}
+	}
+}
+
+TRD_martinair_organization = {
+
+	name = martinair
+	icon = GFX_idea_TRD_martinair
+	include = generic_light_aircraft_organization
+	
+	allowed = {
+		original_tag = TRD 
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	available = {
+		FROM = {
+			has_completed_focus = TRD_martinair_contract
+		}
+	}
+}
+
+TRD_transavia_organization = {
+
+	name = transavia
+	icon = GFX_idea_TRD_transavia
+	include = generic_range_focused_aircraft_organization
+	
+	allowed = {
+		original_tag = TRD 
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	visible = {
+		FROM = {
+			has_completed_focus = TRD_transavia_contract
+		}
+	}
+}
+
+TRD_abellio_organization = {
+
+	name = abellio
+	icon = GFX_idea_TRD_abellio
+	include = generic_cas_aircraft_organization
+	
+	allowed = {
+		original_tag = TRD 
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	available = {
+		FROM = {
+			has_completed_focus = TRD_abbelio_contract
+		}
+	}
+}
+
+TRD_alpha_TRD_organization = {
+
+	name = alpha_TRD
+	icon = GFX_idea_GRI_alpha
+	include = generic_light_aircraft_organization
+	
+	allowed = {
+		original_tag = TRD 
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		FROM = {
+			has_government = fascism
+		}
+	}
+	
+	available = {
+		FROM = {
+			has_completed_focus = TRD_contract_1
+		}
+	}
+}
+
+TRD_beta_TRD_organization = {
+
+	name = beta_TRD
+	icon = GFX_idea_GRI_beta
+	include = generic_medium_aircraft_organization
+	
+	allowed = {
+		original_tag = TRD 
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		FROM = {
+			has_government = fascism
+		}
+	}
+	
+	available = {
+		FROM = {
+			has_completed_focus = TRD_contract_2
+		}
+	}
+}
+
+TRD_gamma_TRD_organization = {
+
+	name = gamma_TRD
+	icon = GFX_idea_GRI_gamma
+	include = generic_heavy_aircraft_organization
+	
+	allowed = {
+		original_tag = TRD 
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		FROM = {
+			has_government = fascism
+		}
+	}
+	
+	available = {
+		FROM = {
+			has_completed_focus = TRD_contract_3
+		}
+	}
+}
+
+################################### 
+
+#   #  ##  ### ### ###  ### ### #   
+## ## #  #  #  #   #  #  #  #   #   
+# # # ####  #  ##  ###   #  ##  #   
+#   # #  #  #  #   #  #  #  #   #   
+#   # #  #  #  ### #  # ### ### ### 
+
+
+###################################
+
+TRD_lionwares_organization = {
+	
+	name = lionwares
+	icon = GFX_idea_TRD_lionwares
+	include = generic_artillery_organization
+	
+	allowed = {
+		original_tag = TRD 
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	available = {
+		FROM = {
+			has_completed_focus = TRD_artillery_construction
+		}
+	}
+	initial_trait = {
+		equipment_bonus = {
+			build_cost_ic = -0.05
+		}
+	}
+}
+
+TRD_tigerdale_organization = {
+	
+	name = tigerdale
+	icon = GFX_idea_TRD_tigerdale
+	include = generic_infantry_equipment_organization
+	
+	allowed = {
+		original_tag = TRD 
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	visible = {
+		FROM = {
+			NOT = { has_government = communism }
+			NOT = { has_government = fascism }
+			NOT = {
+				AND = {
+			        has_government = democratic
+				    has_completed_focus = TRD_altesburg
+				}
+			}
+		}
+	}
+	initial_trait = {
+		equipment_bonus = {
+			defense = 0.05
+		}
+	}
+}
+
+TRD_antarts_organization = {
+
+	name = antarts
+	icon = GFX_idea_TRD_antarts
+	include = generic_motorized_mechanized_organization
+	
+	allowed = {
+		original_tag = TRD 
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	visible = {
+		FROM = {
+			NOT = { has_government = communism }
+			NOT = { has_government = fascism }
+			NOT = {
+				AND = {
+			        has_government = democratic
+				    has_completed_focus = TRD_altesburg
+				}
+			}
+		}
+	}
+	initial_trait = {
+		limit_to_equipment_type = { motorized_equipment }
+		equipment_bonus = {
+			reliability = 0.05
+		}
+	}
+}
+
+TRD_atlas_organization = {
+
+	name = atlas
+	icon = GFX_idea_TRD_atlas
+	include = generic_motorized_mechanized_organization
+	
+	allowed = {
+		original_tag = TRD 
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	visible = {
+		FROM = {
+			NOT = { has_government = fascism }
+		}
+	}
+	initial_trait = {
+		limit_to_equipment_type = { motorized_equipment }
+		equipment_bonus = {
+			maximum_speed = 0.05
+		}
+	}
+}
+
+TRD_zetes_organization = {
+
+	name = zetes
+	icon = GFX_idea_TRD_zetes
+	include = generic_artillery_organization
+	
+	allowed = {
+		original_tag = TRD 
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	visible = {
+		FROM = {
+			NOT = { has_government = fascism }
+			NOT = { has_completed_focus = TRD_the_death_of_guichard_2 }
+		}
+	}
+	initial_trait = {
+		equipment_bonus = {
+			reliability = 0.05
+		}
+	}	
+}
+
+TRD_deceuninck_organization = {
+
+	name = deceuninck
+	icon = GFX_idea_TRD_deceuninck
+	include = generic_infantry_equipment_organization
+	
+	allowed = {
+		original_tag = TRD 
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	visible = {
+		FROM = {
+			NOT = { has_government = fascism }
+			NOT = { has_completed_focus = TRD_the_death_of_guichard_2 }
+		}
+	}
+	initial_trait = {
+		equipment_bonus = {
+			build_cost_ic = -0.05
+		}
+	}
+}
diff --git a/common/military_industrial_organization/organizations/VAN_organization.txt b/common/military_industrial_organization/organizations/VAN_organization.txt
new file mode 100644
index 00000000000..e7bceb7e446
--- /dev/null
+++ b/common/military_industrial_organization/organizations/VAN_organization.txt
@@ -0,0 +1,62 @@
+#####################
+
+###  ##  #  # # #  ## 
+ #  #  # ## # # # #   
+ #  #### # ## ##   #  
+ #  #  # #  # # #   # 
+ #  #  # #  # # # ## 
+
+ #################### 
+
+
+
+#####################
+
+ ## #  # ### ###   ## 
+#   #  #  #  #  # #   
+ #  ####  #  ###   #  
+  # #  #  #  #      # 
+##  #  # ### #    ##  
+ 
+#####################
+
+VAN_vanhoover_dockyards_organization = {
+	
+	name = VAN_vanhoover_dockyards
+	icon = GFX_idea_generic_naval_manufacturer_3
+	include = generic_raider_ship_organization
+	
+	allowed = {
+		original_tag = VAN
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	available = {
+		FROM = {
+			owns_state = 14
+		}
+	}
+}
+
+###########################
+
+###  #    ##  #  # ###  ## 
+#  # #   #  # ## # #   #   
+###  #   #### # ## ##   #  
+#    #   #  # #  # #     # 
+#    ### #  # #  # ### ##  
+
+###########################
+
+
+
+################################### 
+
+#   #  ##  ### ### ###  ### ### #   
+## ## #  #  #  #   #  #  #  #   #   
+# # # ####  #  ##  ###   #  ##  #   
+#   # #  #  #  #   #  #  #  #   #   
+#   # #  #  #  ### #  # ### ### ### 
+
+
+###################################
\ No newline at end of file
diff --git a/common/military_industrial_organization/organizations/VED_organization.txt b/common/military_industrial_organization/organizations/VED_organization.txt
new file mode 100644
index 00000000000..c674f685dd7
--- /dev/null
+++ b/common/military_industrial_organization/organizations/VED_organization.txt
@@ -0,0 +1,127 @@
+VED_tank_manufacturer_organization = {
+	name = VED_tank_manufacturer
+	include = generic_tank_organization
+	icon = GFX_idea_VED_tank_manufacturer
+	allowed = {
+		original_tag = VED
+		has_dlc = "Arms Against Tyranny"
+	}
+}
+VED_naval_manufacturer_organization = {
+	name = VED_naval_manufacturer
+	include = generic_escort_ship_organization
+	icon = GFX_idea_VED_naval_manufacturer
+	allowed = {
+		OR = {
+			original_tag = VED
+			original_tag = FAT
+			original_tag = FAW
+			original_tag = SRS
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = VED
+				owns_state = 429
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 429
+		}
+	}
+	initial_trait = {
+		production_bonus = {
+			production_capacity_factor = 0.05
+		}
+	}
+}
+VED_light_aircraft_manufacturer_organization = {			
+	name = VED_light_aircraft_manufacturer
+	icon = GFX_idea_generic_air_manufacturer_1
+	include = generic_light_aircraft_organization
+	allowed = {
+		original_tag = VED
+		has_dlc = "Arms Against Tyranny"
+	}
+}
+
+VED_medium_aircraft_manufacturer_organization = {
+	name = VED_medium_aircraft_manufacturer
+	icon = GFX_idea_generic_air_manufacturer_3
+	include = generic_medium_aircraft_organization
+	allowed = {
+		original_tag = VED
+		has_dlc = "Arms Against Tyranny"
+	}
+}
+
+VED_heavy_aircraft_manufacturer_organization = {
+	name = VED_heavy_aircraft_manufacturer
+	icon = GFX_idea_generic_air_manufacturer_2
+	include = generic_heavy_aircraft_organization
+	allowed = {
+		original_tag = VED
+		has_dlc = "Arms Against Tyranny"
+	}
+}
+
+VED_naval_aircraft_manufacturer_organization = {
+	name = VED_naval_aircraft_manufacturer
+	icon = GFX_idea_generic_naval_manufacturer_2
+	include = generic_naval_aircraft_organization
+	allowed = {
+		original_tag = VED
+		has_dlc = "Arms Against Tyranny"
+	}
+}
+VED_infantry_equipment_manufacturer_organization = {
+	name = VED_infantry_equipment_manufacturer
+	icon = GFX_idea_VED_infantry_equipment_manufacturer
+	include = generic_infantry_equipment_organization
+	allowed = {
+		original_tag = VED
+		has_dlc = "Arms Against Tyranny"
+	}
+}
+
+VED_artillery_manufacturer_organization = {
+	name = VED_artillery_manufacturer
+	icon = GFX_idea_VED_artillery_manufacturer
+	include = generic_artillery_organization
+	allowed = {
+		OR = {
+			original_tag = VED
+			original_tag = FAT
+			original_tag = FAW
+			original_tag = SRS
+		}
+		has_dlc = "Arms Against Tyranny"
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = VED
+				owns_state = 429
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 429
+		}
+	}
+}
+
+VED_motorized_equipment_manufacturer_organization = {
+	name = VED_motorized_equipment_manufacturer
+	icon = GFX_idea_VED_motorized_equipment_manufacturer
+	include = generic_motorized_mechanized_organization
+	allowed = {
+		original_tag = VED
+		has_dlc = "Arms Against Tyranny"
+	}
+}
\ No newline at end of file
diff --git a/common/military_industrial_organization/organizations/WAR_organization.txt b/common/military_industrial_organization/organizations/WAR_organization.txt
new file mode 100644
index 00000000000..76969d05f80
--- /dev/null
+++ b/common/military_industrial_organization/organizations/WAR_organization.txt
@@ -0,0 +1,98 @@
+#####################
+
+###  ##  #  # # #  ## 
+ #  #  # ## # # # #   
+ #  #### # ## ##   #  
+ #  #  # #  # # #   # 
+ #  #  # #  # # # ## 
+
+ #################### 
+
+WAR_tank_guys_organization = {
+
+	name = WAR_tank_guys
+	icon = GFX_idea_WAR_tank_guys
+	include = generic_infantry_tank_organization
+	
+	allowed = {
+		original_tag = WAR 
+		has_dlc = "Arms Against Tyranny"
+	}
+}
+
+#####################
+
+ ## #  # ### ###   ## 
+#   #  #  #  #  # #   
+ #  ####  #  ###   #  
+  # #  #  #  #      # 
+##  #  # ### #    ##  
+ 
+#####################
+
+
+WAR_naval_guys_organization = {
+
+	name = WAR_naval_guys
+	icon = GFX_idea_WAR_naval_guys
+	include = generic_raider_ship_organization
+	
+	allowed = {
+		original_tag = WAR 
+		has_dlc = "Arms Against Tyranny"
+	}
+}
+
+
+###########################
+
+###  #    ##  #  # ###  ## 
+#  # #   #  # ## # #   #   
+###  #   #### # ## ##   #  
+#    #   #  # #  # #     # 
+#    ### #  # #  # ### ##  
+
+###########################
+
+
+WAR_aircraft_guys_organization = {
+
+	name = WAR_aircraft_guys
+	icon = GFX_idea_WAR_aircraft_guys
+	include = generic_light_aircraft_organization
+	
+	allowed = {
+		original_tag = WAR 
+		has_dlc = "Arms Against Tyranny"
+	}
+}
+
+
+################################### 
+
+#   #  ##  ### ### ###  ### ### #   
+## ## #  #  #  #   #  #  #  #   #   
+# # # ####  #  ##  ###   #  ##  #   
+#   # #  #  #  #   #  #  #  #   #   
+#   # #  #  #  ### #  # ### ### ### 
+
+
+###################################
+
+
+WAR_gun_guys_organization = {
+	
+	name = WAR_gun_guys
+	icon = GFX_idea_WAR_gun_guys
+	include = generic_infantry_equipment_organization
+	
+	allowed = {
+		original_tag = WAR 
+		has_dlc = "Arms Against Tyranny"
+	}
+	initial_trait = {
+		equipment_bonus = {
+			defense = 0.05
+		}
+	}
+}
diff --git a/common/military_industrial_organization/organizations/WAT_organization.txt b/common/military_industrial_organization/organizations/WAT_organization.txt
new file mode 100644
index 00000000000..1857fe2e3af
--- /dev/null
+++ b/common/military_industrial_organization/organizations/WAT_organization.txt
@@ -0,0 +1,374 @@
+#####################
+
+###  ##  #  # # #  ## 
+ #  #  # ## # # # #   
+ #  #### # ## ##   #  
+ #  #  # #  # # #   # 
+ #  #  # #  # # # ## 
+
+ #################### 
+
+WAT_northern_tank_organization = {
+	
+	name = northern_tank
+	icon = GFX_idea_WAT_northern_tank
+	include = generic_mobile_tank_organization
+	
+	allowed = {
+		can_form_river_fed = yes 
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	visible = {
+		hidden_trigger = {
+			FROM = {
+				OR = {
+					original_tag = WAT 
+					has_country_flag = RIV_annexed_WAT
+				}
+			}
+		}
+	}
+	available = {
+		hidden_trigger = {
+			owner = {
+				OR = {
+					original_tag = WAT
+					has_country_flag = RIV_annexed_WAT
+				}
+			}
+		}
+	}
+	initial_trait = {
+		organization_modifier = {
+			military_industrial_organization_research_bonus = 0.03
+		}
+	}
+				
+}
+
+WAT_enchanted_armour_concern_organization = {
+	
+	name = enchanted_armour_concern
+	icon = GFX_idea_WAT_enchanted_armour_concern 
+	include = generic_medium_tank_organization
+	allowed = {
+		can_form_river_fed = yes 
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	visible = {
+		hidden_trigger = {
+			FROM = {
+				OR = {
+					original_tag = WAT 
+					has_country_flag = RIV_annexed_WAT
+				}
+			}
+		}
+	}
+	available = {
+		hidden_trigger = {
+			owner = {
+				OR = {
+					original_tag = WAT
+					has_country_flag = RIV_annexed_WAT
+				}
+			}
+		}
+	}
+	
+}
+
+#####################
+
+ ## #  # ### ###   ## 
+#   #  #  #  #  # #   
+ #  ####  #  ###   #  
+  # #  #  #  #      # 
+##  #  # ### #    ##  
+ 
+#####################
+
+
+WAT_farbrook_shipbuilding_organization = {
+	
+	name = farbrook_shipbuilding
+	icon = GFX_idea_WAT_farbrook_shipbuilding
+	include = generic_escort_ship_organization
+	allowed = {
+		can_form_river_fed = yes 
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	visible = {
+		hidden_trigger = {
+			FROM = {
+				OR = {
+					original_tag = WAT 
+					has_country_flag = RIV_annexed_WAT
+				}
+			}
+		}
+	}
+	available = {
+		hidden_trigger = {
+			owner = {
+				OR = {
+					original_tag = WAT
+					has_country_flag = RIV_annexed_WAT
+				}
+			}
+		}
+	}
+}
+
+
+###########################
+
+###  #    ##  #  # ###  ## 
+#  # #   #  # ## # #   #   
+###  #   #### # ## ##   #  
+#    #   #  # #  # #     # 
+#    ### #  # #  # ### ##  
+
+###########################
+
+
+WAT_stal_wing_berau_organization = {
+	
+	name = stal_wing_berau
+	icon = GFX_idea_WAT_stal_wing_berau
+	include = generic_light_aircraft_organization
+	allowed = {
+		can_form_river_fed = yes 
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	visible = {
+		hidden_trigger = {
+			FROM = {
+				OR = {
+					original_tag = WAT 
+					has_country_flag = RIV_annexed_WAT
+				}
+			}
+		}
+	}
+	available = {
+		hidden_trigger = {
+			owner = {
+				OR = {
+					original_tag = WAT
+					has_country_flag = RIV_annexed_WAT
+				}
+			}
+		}
+	}
+	
+}
+
+WAT_generic_medium_aircraft_manufacturer_organization = {
+	
+	name = WAT_generic_medium_aircraft_manufacturer
+	icon = GFX_idea_generic_air_manufacturer_3
+	include = generic_medium_aircraft_organization
+	allowed = {
+		can_form_river_fed = yes 
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	visible = {
+		hidden_trigger = {
+			FROM = {
+				OR = {
+					original_tag = WAT 
+					has_country_flag = RIV_annexed_WAT
+				}
+			}
+		}
+	}
+	available = {
+		hidden_trigger = {
+			owner = {
+				OR = {
+					original_tag = WAT
+					has_country_flag = RIV_annexed_WAT
+				}
+			}
+		}
+	}
+}
+
+WAT_generic_heavy_aircraft_manufacturer_organization = {
+
+	name = WAT_generic_heavy_aircraft_manufacturer
+	icon = GFX_idea_generic_air_manufacturer_2
+	include = generic_heavy_aircraft_organization
+	allowed = {
+		can_form_river_fed = yes 
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	visible = {
+		hidden_trigger = {
+			FROM = {
+				OR = {
+					original_tag = WAT 
+					has_country_flag = RIV_annexed_WAT
+				}
+			}
+		}
+	}
+	available = {
+		hidden_trigger = {
+			owner = {
+				OR = {
+					original_tag = WAT
+					has_country_flag = RIV_annexed_WAT
+				}
+			}
+		}
+	}
+}
+
+WAT_generic_naval_aircraft_manufacturer_organization = {
+
+	name = WAT_generic_naval_aircraft_manufacturer
+	icon = GFX_idea_generic_naval_manufacturer_2
+	include = generic_naval_aircraft_organization
+	allowed = {
+		can_form_river_fed = yes 
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	visible = {
+		hidden_trigger = {
+			FROM = {
+				OR = {
+					original_tag = WAT 
+					has_country_flag = RIV_annexed_WAT
+				}
+			}
+		}
+	}
+	available = {
+		hidden_trigger = {
+			owner = {
+				OR = {
+					original_tag = WAT
+					has_country_flag = RIV_annexed_WAT
+				}
+			}
+		}
+	}
+}
+
+
+################################### 
+
+#   #  ##  ### ### ###  ### ### #   
+## ## #  #  #  #   #  #  #  #   #   
+# # # ####  #  ##  ###   #  ##  #   
+#   # #  #  #  #   #  #  #  #   #   
+#   # #  #  #  ### #  # ### ### ### 
+
+
+###################################
+
+
+WAT_kenelm_smithery_organization = {
+
+	name = kenelm_smithery
+	icon = GFX_idea_WAT_kenelm_smithery
+	include = generic_infantry_equipment_organization
+	allowed = {
+		can_form_river_fed = yes 
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	visible = {
+		hidden_trigger = {
+			FROM = {
+				OR = {
+					original_tag = WAT 
+					has_country_flag = RIV_annexed_WAT
+				}
+			}
+		}
+	}
+	available = {
+		hidden_trigger = {
+			owner = {
+				OR = {
+					original_tag = WAT
+					has_country_flag = RIV_annexed_WAT
+				}
+			}
+		}
+	}
+}
+
+WAT_slingshots_of_watertown_organization = {
+
+	name = slingshots_of_watertown
+	icon = GFX_idea_WAT_slingshots_of_watertown
+	include = generic_artillery_organization
+	allowed = {
+		can_form_river_fed = yes 
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	visible = {
+		hidden_trigger = {
+			FROM = {
+				OR = {
+					original_tag = WAT 
+					has_country_flag = RIV_annexed_WAT
+				}
+			}
+		}
+	}
+	available = {
+		hidden_trigger = {
+			owner = {
+				OR = {
+					original_tag = WAT
+					has_country_flag = RIV_annexed_WAT
+				}
+			}
+		}
+	}
+}
+
+WAT_carts_n_darts_organization = {
+
+	name = WAT_carts_n_darts
+	icon = GFX_idea_WAT_carts_n_darts
+	include = generic_motorized_mechanized_organization
+	allowed = {
+		can_form_river_fed = yes 
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	visible = {
+		hidden_trigger = {
+			FROM = {
+				OR = {
+					original_tag = WAT 
+					has_country_flag = RIV_annexed_WAT
+				}
+			}
+		}
+	}
+	available = {
+		hidden_trigger = {
+			owner = {
+				OR = {
+					original_tag = WAT
+					has_country_flag = RIV_annexed_WAT
+				}
+			}
+		}
+	}
+}
diff --git a/common/military_industrial_organization/organizations/WIN_organization.txt b/common/military_industrial_organization/organizations/WIN_organization.txt
new file mode 100644
index 00000000000..4b62daff993
--- /dev/null
+++ b/common/military_industrial_organization/organizations/WIN_organization.txt
@@ -0,0 +1,450 @@
+#####################
+
+###  ##  #  # # #  ## 
+ #  #  # ## # # # #   
+ #  #### # ## ##   #  
+ #  #  # #  # # #   # 
+ #  #  # #  # # # ## 
+
+ #################### 
+
+WIN_mustang_2_organization = {
+	
+	name = WIN_mustang_2
+	icon = GFX_idea_EQS_mustang
+	include = generic_mobile_tank_organization
+	
+	allowed = {
+		original_tag = WIN 
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	visible = {
+		FROM = {
+			has_completed_focus = WIN_regulations_begone
+		}
+	}
+	initial_trait = {
+		organization_modifier = {
+			military_industrial_organization_research_bonus = 0.03
+		}
+	}
+			
+}
+
+WIN_crystalstar_corporation_2_organization = {
+
+	name = WIN_crystalstar_corporation_2
+	icon = GFX_idea_generic_tank_manufacturer_1
+	include = generic_mobile_tank_organization
+	
+	allowed = {
+		original_tag = WIN 
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	visible = {
+		FROM = {
+			has_completed_focus = WIN_recomepnsate_big_bussiness
+		}
+	}
+	initial_trait = {
+		organization_modifier = {
+			military_industrial_organization_research_bonus = 0.05
+		}
+	}
+		
+}
+
+WIN_ocean_spray_designer_1_organization = {
+
+	name = WIN_ocean_spray_designer_1
+	icon = GFX_idea_NLR_guns1_idea
+	include = generic_mobile_tank_organization
+	
+	allowed = {
+		original_tag = WIN 
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	visible = {
+		FROM = {
+			has_country_flag = WIN_ocean_design_companies
+		}
+	}
+	
+	initial_trait = {
+		equipment_bonus = {
+			build_cost_ic = -0.25
+		}
+		production_bonus = {
+			production_capacity_factor = 0.05
+		}
+	}
+	
+}
+
+WIN_ocean_spray_designer_2_organization = {
+
+	name = WIN_ocean_spray_designer_2
+	icon = GFX_idea_NLR_guns1_idea
+	include = generic_motorized_mechanized_organization
+	
+	allowed = {
+		original_tag = WIN 
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	visible = {
+		FROM = {
+			has_country_flag = WIN_ocean_design_companies
+		}
+	}
+	initial_trait = {
+		limit_to_equipment_type = { motorized_equipment }
+		equipment_bonus = {
+			maximum_speed = 0.05
+		}
+	}
+}
+
+WIN_ocean_spray_designer_3_organization = {
+	
+	name = WIN_ocean_spray_designer_3
+	icon = GFX_idea_NLR_guns1_idea
+	include = generic_motorized_mechanized_organization
+	
+	allowed = {
+		original_tag = WIN 
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	visible = {
+		FROM = {
+			has_country_flag = WIN_ocean_design_companies
+		}
+	}
+	initial_trait = {
+		limit_to_equipment_type = { mechanized_equipment }
+		equipment_bonus = {
+			maximum_speed = 0.05
+		}
+	}
+}
+
+#####################
+
+ ## #  # ### ###   ## 
+#   #  #  #  #  # #   
+ #  ####  #  ###   #  
+  # #  #  #  #      # 
+##  #  # ### #    ##  
+ 
+#####################
+
+
+WIN_cockatoo_2_organization = {
+
+	name = WIN_cockatoo_2
+	icon = GFX_idea_EQC_cockatoo_ship_yards
+	include = generic_escort_ship_organization
+	
+	allowed = {
+		original_tag = WIN 
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	visible = {
+		FROM = {
+			has_completed_focus = WIN_foreign_ties
+		}
+	}
+}
+
+WIN_electric_boat_company_2_organization = {
+
+	name = WIN_electric_boat_company_2
+	icon = GFX_idea_electric_boat_company
+	include = generic_raider_ship_organization
+	
+	allowed = {
+		original_tag = WIN 
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	visible = {
+		FROM = {
+			has_completed_focus = WIN_recomepnsate_big_bussiness
+		}
+	}
+}
+
+WIN_ocean_spray_designer_4_organization = {
+
+	name = WIN_electric_boat_company_2
+	icon = WIN_ocean_spray_designer_3
+	include = generic_submarine_organization
+	
+	allowed = {
+		original_tag = WIN 
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	visible = {
+		FROM = {
+			has_country_flag = WIN_ocean_design_companies
+		}
+	}
+	initial_trait = {
+		production_bonus = {
+			production_capacity_factor = 0.1
+		}
+	}
+}
+
+
+###########################
+
+###  #    ##  #  # ###  ## 
+#  # #   #  # ## # #   #   
+###  #   #### # ## ##   #  
+#    #   #  # #  # #     # 
+#    ### #  # #  # ### ##  
+
+###########################
+
+
+WIN_vespidae_2_organization = {
+
+	name = WIN_vespidae_2
+	icon = GFX_idea_CHN_vespidae
+	include = generic_cas_aircraft_organization
+	
+	allowed = {
+		original_tag = WIN 
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	visible = {
+		FROM = {
+			has_completed_focus = WIN_foreign_ties
+		}
+	}
+}
+
+WIN_bellbreeze_aircraft_corporation_2_organization = {
+
+	name = WIN_bellbreeze_aircraft_corporation_2
+	icon = GFX_idea_bell
+	include = generic_high_agility_fighter_aircraft_organization
+	
+	allowed = {
+		original_tag = WIN 
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	visible = {
+		FROM = {
+			has_completed_focus = WIN_recomepnsate_big_bussiness
+		}
+	}
+	initial_trait = {
+		organization_modifier = {
+			military_industrial_organization_research_bonus = 0.05
+		}
+	}
+}
+
+WIN_ocean_spray_designer_5_organization = {
+
+	name = WIN_ocean_spray_designer_5
+	icon = GFX_idea_bell
+	include = generic_cas_aircraft_organization
+	
+	allowed = {
+		original_tag = WIN 
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	visible = {
+		FROM = {
+			has_country_flag = WIN_ocean_design_companies
+		}
+	}
+	initial_trait = {
+		equipment_bonus = {
+			air_ground_attack = 0.10 
+			reliability = 0.10
+		}
+	}
+}
+
+WIN_ocean_spray_designer_6_organization = {
+
+	name = WIN_ocean_spray_designer_6
+	icon = GFX_idea_bell
+	include = generic_light_aircraft_organization
+	
+	allowed = {
+		original_tag = WIN 
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	visible = {
+		FROM = {
+			has_country_flag = WIN_ocean_design_companies
+		}
+	}
+	initial_trait = {
+		equipment_bonus = {
+			reliability = 0.10
+			air_range = 0.10
+		}
+	}
+}
+
+WIN_ocean_spray_designer_7_organization = {
+
+	name = WIN_ocean_spray_designer_7
+	icon = GFX_idea_bell
+	include = generic_medium_aircraft_organization
+	
+	allowed = {
+		original_tag = WIN 
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	visible = {
+		FROM = {
+			has_country_flag = WIN_ocean_design_companies
+		}
+	}
+	initial_trait = {
+		equipment_bonus = {
+			air_range = 0.10
+		}
+	}
+}
+
+
+################################### 
+
+#   #  ##  ### ### ###  ### ### #   
+## ## #  #  #  #   #  #  #  #   #   
+# # # ####  #  ##  ###   #  ##  #   
+#   # #  #  #  #   #  #  #  #   #   
+#   # #  #  #  ### #  # ### ### ### 
+
+
+###################################
+
+
+WIN_dassault_2_organization = {
+
+	name = WIN_dassault_2
+	icon = GFX_idea_JER_dassault
+	include = generic_infantry_equipment_organization
+	
+	allowed = {
+		original_tag = WIN 
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	visible = {
+		FROM = {
+			has_completed_focus = WIN_regulations_begone
+		}
+	}
+	initial_trait = {
+		equipment_bonus = {
+			hard_attack = 0.05
+		}
+	}
+}
+
+WIN_lightstar_motor_company_2_organization = {
+
+	name = WIN_lightstar_motor_company_2
+	icon = GFX_idea_generic_motorized_equipment_manufacturer_1
+	include = generic_motorized_mechanized_organization
+	
+	allowed = {
+		original_tag = WIN 
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	visible = {
+		FROM = {
+			has_completed_focus = WIN_recomepnsate_big_bussiness
+		}
+	}
+}
+
+WIN_ocean_spray_designer_8_organization = {
+
+	name = WIN_ocean_spray_designer_8
+	icon = GFX_idea_NLR_guns1_idea
+	include = generic_infantry_equipment_organization
+	
+	allowed = {
+		original_tag = WIN 
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	visible = {
+		FROM = {
+			has_country_flag = WIN_ocean_design_companies
+		}
+	}
+	initial_trait = {
+		equipment_bonus = {
+			soft_attack = 0.05
+		}
+	}
+}
+
+WIN_ocean_spray_designer_9_organization = {
+
+	name = WIN_ocean_spray_designer_9
+	icon = GFX_idea_NLR_guns1_idea
+	include = generic_artillery_organization
+	
+	allowed = {
+		original_tag = WIN 
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	visible = {
+		FROM = {
+			has_country_flag = WIN_ocean_design_companies
+		}
+	}
+	initial_trait = {
+		equipment_bonus = {
+			soft_attack = 0.05
+		}
+	}
+}
+
+WIN_ocean_spray_designer_10_organization = {
+
+	name = WIN_ocean_spray_designer_10
+	icon = GFX_idea_NLR_guns1_idea
+	include = generic_infantry_equipment_organization
+	
+	allowed = {
+		original_tag = WIN 
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	visible = {
+		FROM = {
+			has_country_flag = WIN_ocean_design_companies
+		}
+	}
+	initial_trait = {
+		equipment_bonus = {
+			hard_attack = 0.05
+		}
+	}
+}
\ No newline at end of file
diff --git a/common/military_industrial_organization/organizations/WIT_organization.txt b/common/military_industrial_organization/organizations/WIT_organization.txt
new file mode 100644
index 00000000000..8a9c558eaf4
--- /dev/null
+++ b/common/military_industrial_organization/organizations/WIT_organization.txt
@@ -0,0 +1,289 @@
+#####################
+
+###  ##  #  # # #  ## 
+ #  #  # ## # # # #   
+ #  #### # ## ##   #  
+ #  #  # #  # # #   # 
+ #  #  # #  # # # ## 
+
+ #################### 
+
+WIT_Magic_Tank_Concern_organization = {
+
+	name = WIT_Magic_Tank_Concern
+	icon = GFX_idea_WIT_Magic_Tank_Concern
+	include = generic_heavy_tank_organization
+	
+	allowed = {
+		can_form_river_fed = yes 
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	visible = {
+		FROM = {
+			OR = {
+				hidden_trigger = {
+					has_country_flag = RIV_annexed_WIT
+					AND = {
+						original_tag = WIT
+						has_country_flag = WIT_Tank_Concern_Unlocked_Flag 
+					}
+				}
+			}
+		}
+	}
+	initial_trait = {
+		name = WIT_heavy_tank_manufacturer_Trait
+	}
+	
+}
+
+WIT_generic_tank_manufacturer_organization = {
+
+	name = WIT_Magic_Tank_Concern
+	icon = GFX_idea_WIT_Magic_Tank_Concern
+	include = generic_tank_organization
+	
+	allowed = {
+		can_form_river_fed = yes 
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	visible = {
+		FROM = {
+			hidden_trigger = {
+				OR = {
+					has_country_flag = RIV_annexed_WIT
+					original_tag = WIT	
+				}
+			}
+		}
+	}
+}
+
+
+
+#####################
+
+ ## #  # ### ###   ## 
+#   #  #  #  #  # #   
+ #  ####  #  ###   #  
+  # #  #  #  #      # 
+##  #  # ### #    ##  
+ 
+#####################
+
+
+WIT_generic_naval_manufacturer_organization = {
+
+	name = WIT_generic_naval_manufacturer
+	icon = GFX_idea_WIT_generic_naval_manufacturer
+	include = generic_escort_ship_organization
+	
+	allowed = {
+		can_form_river_fed = yes 
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	visible = {
+		FROM = {
+			hidden_trigger = {
+				OR = {
+					has_country_flag = RIV_annexed_WIT
+					original_tag = WIT	
+				}
+			}
+			owns_state = 617
+		}
+	}
+}
+
+
+###########################
+
+###  #    ##  #  # ###  ## 
+#  # #   #  # ## # #   #   
+###  #   #### # ## ##   #  
+#    #   #  # #  # #     # 
+#    ### #  # #  # ### ##  
+
+###########################
+
+
+WIT_generic_light_aircraft_manufacturer_organization = {
+
+	name = WIT_generic_light_aircraft_manufacturer
+	icon = GFX_idea_WIT_generic_light_aircraft_manufacturer
+	include = generic_light_aircraft_organization
+	
+	allowed = {
+		can_form_river_fed = yes 
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	visible = {
+		FROM = {
+			hidden_trigger = {
+				OR = {
+					has_country_flag = RIV_annexed_WIT
+					original_tag = WIT	
+				}
+			}
+			owns_state = 617
+		}
+	}
+}
+
+WIT_generic_medium_aircraft_manufacturer_organization = {
+
+	name = WIT_generic_medium_aircraft_manufacturer
+	icon = GFX_idea_WIT_generic_medium_aircraft_manufacturer
+	include = generic_medium_aircraft_organization
+	
+	allowed = {
+		can_form_river_fed = yes 
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	visible = {
+		FROM = {
+			hidden_trigger = {
+				OR = {
+					has_country_flag = RIV_annexed_WIT
+					original_tag = WIT	
+				}
+			}
+			owns_state = 617
+		}
+	}
+}
+
+WIT_generic_heavy_aircraft_manufacturer_organization = {
+
+	name = WIT_generic_heavy_aircraft_manufacturer
+	icon = GFX_idea_WIT_generic_heavy_aircraft_manufacturer
+	include = generic_heavy_aircraft_organization
+	
+	allowed = {
+		can_form_river_fed = yes 
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	visible = {
+		FROM = {
+			hidden_trigger = {
+				OR = {
+					has_country_flag = RIV_annexed_WIT
+					original_tag = WIT	
+				}
+			}
+			owns_state = 617
+		}
+	}
+}
+
+WIT_generic_naval_aircraft_manufacturer_organization = {
+
+	name = WIT_generic_naval_aircraft_manufacturer
+	icon = GFX_idea_WIT_generic_naval_aircraft_manufacturer
+	include = generic_naval_aircraft_organization
+	
+	allowed = {
+		can_form_river_fed = yes 
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	visible = {
+		FROM = {
+			hidden_trigger = {
+				OR = {
+					has_country_flag = RIV_annexed_WIT
+					original_tag = WIT	
+				}
+			}
+			owns_state = 617
+		}
+	}
+}
+
+
+################################### 
+
+#   #  ##  ### ### ###  ### ### #   
+## ## #  #  #  #   #  #  #  #   #   
+# # # ####  #  ##  ###   #  ##  #   
+#   # #  #  #  #   #  #  #  #   #   
+#   # #  #  #  ### #  # ### ### ### 
+
+
+###################################
+
+
+WIT_generic_infantry_equipment_manufacturer_organization = {
+	
+	name = WIT_generic_infantry_equipment_manufacturer
+	icon = GFX_idea_LCT_gun
+	include = generic_infantry_equipment_organization
+	
+	allowed = {
+		original_tag = WIT 
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	available = {
+		FROM = {
+			has_completed_focus = WIT_lakeish_arms_contract
+		}
+	}
+	initial_trait = {
+		organization_modifier = {
+			military_industrial_organization_design_team_assign_cost = -0.15
+		}
+	}
+}
+
+WIT_generic_artillery_manufacturer_organization = {
+
+	name = WIT_generic_artillery_manufacturer
+	icon = GFX_idea_WIT_generic_artillery_manufacturer
+	include = generic_artillery_organization
+	
+	allowed = {
+		can_form_river_fed = yes 
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	visible = {
+		FROM = {
+			hidden_trigger = {
+				OR = {
+					has_country_flag = RIV_annexed_WIT
+					original_tag = WIT	
+				}
+			}
+		}
+	}
+}
+
+WIT_generic_motorized_equipment_manufacturer_organization = {
+
+	name = WIT_generic_motorized_equipment_manufacturer
+	icon = GFX_idea_WIT_generic_motorized_equipment_manufacturer
+	include = generic_motorized_mechanized_organization
+	
+	allowed = {
+		can_form_river_fed = yes 
+		has_dlc = "Arms Against Tyranny"
+	}
+	
+	visible = {
+		FROM = {
+			hidden_trigger = {
+				OR = {
+					has_country_flag = RIV_annexed_WIT
+					original_tag = WIT	
+				}
+			}
+		}
+	}
+}
diff --git a/common/military_industrial_organization/organizations/WNG_organization.txt b/common/military_industrial_organization/organizations/WNG_organization.txt
new file mode 100644
index 00000000000..76061102cb6
--- /dev/null
+++ b/common/military_industrial_organization/organizations/WNG_organization.txt
@@ -0,0 +1,346 @@
+
+########    ###    ##    ## ##    ##  ######  
+   ##      ## ##   ###   ## ##   ##  ##    ## 
+   ##     ##   ##  ####  ## ##  ##   ##       
+   ##    ##     ## ## ## ## #####     ######  
+   ##    ######### ##  #### ##  ##         ## 
+   ##    ##     ## ##   ### ##   ##  ##    ## 
+   ##    ##     ## ##    ## ##    ##  ######  
+
+WNG_fwan_organization = {
+	name = WNG_fwan
+	include = generic_mobile_tank_organization
+	icon = GFX_idea_WNG_fwan
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		original_tag = WNG
+	}
+}
+
+ ######  ##     ## #### ########   ######  
+##    ## ##     ##  ##  ##     ## ##    ## 
+##       ##     ##  ##  ##     ## ##       
+ ######  #########  ##  ########   ######  
+      ## ##     ##  ##  ##              ## 
+##    ## ##     ##  ##  ##        ##    ## 
+ ######  ##     ## #### ##         ######  
+
+
+
+ WNG_alcedinidae_organization = {
+	name =  WNG_alcedinidae
+	include = generic_black_sea_fleet_organization
+	icon = GFX_idea_WNG_alcedinidae
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = WNG
+			original_tag = FRN
+		}
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = WNG
+				owns_state = 371
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 371
+		}
+	}
+}
+
+WNG_high_seas_fleet_designer_organization = {
+	name =  WNG_high_seas_fleet_designer
+	include = generic_task_force_ship_organization
+	icon = GFX_idea_WNG_high_seas_fleet_designer
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = WNG
+			original_tag = FRN
+		}
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = WNG
+				owns_state = 371
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 371
+		}
+	}
+}
+
+WNG_gansaldo_organization = {
+	name =  WNG_gansaldo
+	include = generic_battle_line_ship_organization
+	icon = GFX_idea_WNG_gansaldo
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = WNG
+			original_tag = FRN
+		}
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = WNG
+				owns_state = 371
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 371
+		}
+	}
+}
+WNG_crdk_organization = {
+	name =  WNG_crdk
+	include = generic_raider_ship_organization
+	icon = GFX_idea_WNG_crdk
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = WNG
+			original_tag = FRN
+		}
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = WNG
+				owns_state = 371
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 371
+		}
+	}
+}
+WNG_otg_organization = {
+	name =  WNG_otg
+	include = generic_escort_ship_organization
+	icon = GFX_idea_WNG_otg
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = WNG
+			original_tag = FRN
+		}
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = WNG
+				owns_state = 371
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 371
+		}
+	}
+}
+
+
+########  ##          ###    ##    ## ########  ######  
+##     ## ##         ## ##   ###   ## ##       ##    ## 
+##     ## ##        ##   ##  ####  ## ##       ##       
+########  ##       ##     ## ## ## ## ######    ######  
+##        ##       ######### ##  #### ##             ## 
+##        ##       ##     ## ##   ### ##       ##    ## 
+##        ######## ##     ## ##    ## ########  ######  
+
+
+WNG_accipitri_organization = {
+	name = WNG_accipitri
+	include = generic_light_aircraft_organization
+	icon = GFX_idea_WNG_accipitri
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		original_tag = WNG
+	}
+}
+WNG_strigivoia_afroaves_organization = {
+	name = WNG_strigivoia_afroaves
+	include = generic_multi_role_aircraft_organization
+	icon = GFX_idea_WNG_strigivoia_afroaves
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		original_tag = WNG
+	}
+	add_trait = {
+		token = WNG_mio_trait_air_race_pedigree
+		name = ITA_mio_trait_air_race_pedigree
+		icon = GFX_generic_mio_department_icon_plane_medium_engine
+		special_trait_background = yes
+		
+		position = { x=7 y=0 }  
+		#relative_position_id = generic_mio_trait_narrow_build
+		
+		#any_parent = { generic_mio_trait_narrow_build }
+		
+		limit_to_equipment_type = { mio_cat_eq_all_medium_plane }
+		equipment_bonus = {
+			maximum_speed = 0.05
+			air_range = 0.15
+		}
+	}
+
+	add_trait = {
+		token = WNG_mio_trait_special_aerotorpedoes_unit
+		name = ITA_mio_trait_special_aerotorpedoes_unit
+		icon = GFX_generic_mio_trait_icon_torpedo_attack
+		special_trait_background = yes
+		
+		position = { x=1 y=0 }  
+		relative_position_id = WNG_mio_trait_air_race_pedigree
+		
+		#any_parent = { generic_mio_trait_narrow_build }
+		
+		limit_to_equipment_type = { mio_cat_eq_all_medium_plane }
+		equipment_bonus = {
+			naval_strike_attack = 0.15
+		}
+	}
+
+	add_trait = {
+		token = WNG_mio_trait_remote_operated
+		name = ITA_mio_trait_remote_operated
+		icon = GFX_generic_mio_trait_icon_build_cost_ic
+		special_trait_background = yes
+		
+		position = { x=3 y=0 }  
+		relative_position_id = generic_mio_trait_bomber_specialization
+		available = {
+			FROM = { has_tech = experimental_rockets }
+		}
+		
+		#any_parent = { generic_mio_trait_narrow_build }
+		
+		limit_to_equipment_type = { mio_cat_eq_all_small_plane }
+		equipment_bonus = {
+			reliability = 0.1
+		}
+		production_bonus = {
+			production_cost_factor = -0.1
+		}
+	}
+}
+WNG_pigeonio_organization = {
+	name = WNG_pigeonio
+	include = generic_heavy_aircraft_organization
+	icon = GFX_idea_WNG_pigeonio
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		original_tag = WNG
+	}
+}
+WNG_columbroni_organization = {
+	name = WNG_columbroni
+	include = generic_naval_aircraft_organization
+	icon = GFX_idea_WNG_columbroni
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		original_tag = WNG
+	}
+}
+
+
+
+##     ##    ###    ######## ######## ########  #### ######## ##       
+###   ###   ## ##      ##    ##       ##     ##  ##  ##       ##       
+#### ####  ##   ##     ##    ##       ##     ##  ##  ##       ##       
+## ### ## ##     ##    ##    ######   ########   ##  ######   ##       
+##     ## #########    ##    ##       ##   ##    ##  ##       ##       
+##     ## ##     ##    ##    ##       ##    ##   ##  ##       ##       
+##     ## ##     ##    ##    ######## ##     ## #### ######## ######## 
+
+
+WNG_beaketta_organization = {
+	include = generic_infantry_equipment_organization
+	name = WNG_beaketta
+	icon = GFX_idea_WNG_beaketta
+
+	allowed = {
+		original_tag = WNG
+		has_dlc = "Arms Against Tyranny"
+	}
+}
+
+
+WNG_greda_organization = {
+	include = generic_artillery_organization
+	name = WNG_greda
+	icon = GFX_idea_WNG_greda
+
+	allowed = {
+		original_tag = WNG
+		has_dlc = "Arms Against Tyranny"
+	}
+}
+
+WNG_taloncia_organization = {
+	include = generic_motorized_mechanized_organization
+	name = WNG_taloncia
+	icon = GFX_idea_WNG_taloncia
+
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		original_tag = WNG
+	}
+	
+	equipment_type = {
+		motorized_equipment
+		mechanized_equipment
+		motorized_rocket_equipment
+		train_equipment
+	}
+	
+	research_categories = {
+		mio_cat_tech_all_motorized_mechanized
+		train_equipment
+	}
+
+	initial_trait = {
+		organization_modifier = {
+			military_industrial_organization_research_bonus = 0.15
+		}
+	}
+
+	#research_bonus = 0.2 #Intended to be a total of 20% Research for the MIO at start
+
+	override_trait = { #Traits with no limits in the archetype need the limit to exclude the additional equipment in this MIO (train)
+		token = generic_mio_trait_medium_machinegun_mounts
+
+		limit_to_equipment_type = {
+			motorized_equipment
+			mechanized_equipment
+			motorized_rocket_equipment
+		}
+	}
+
+	override_trait = { #Traits with no limits in the archetype need the limit to exclude the additional equipment in this MIO (train)
+		token = generic_mio_trait_armored_pulpit_mount
+
+		limit_to_equipment_type = {
+			motorized_equipment
+			mechanized_equipment
+			motorized_rocket_equipment
+		}
+	}
+
+}
diff --git a/common/military_industrial_organization/organizations/YAK_organization.txt b/common/military_industrial_organization/organizations/YAK_organization.txt
new file mode 100644
index 00000000000..36f45d80b24
--- /dev/null
+++ b/common/military_industrial_organization/organizations/YAK_organization.txt
@@ -0,0 +1,97 @@
+
+########    ###    ##    ## ##    ##  ######  
+   ##      ## ##   ###   ## ##   ##  ##    ## 
+   ##     ##   ##  ####  ## ##  ##   ##       
+   ##    ##     ## ## ## ## #####     ######  
+   ##    ######### ##  #### ##  ##         ## 
+   ##    ##     ## ##   ### ##   ##  ##    ## 
+   ##    ##     ## ##    ## ##    ##  ######  
+
+
+YAK_yakistanks_organization = {
+	name = YAK_yakistanks
+	include = generic_mobile_tank_organization
+	icon = YAK_yakistanks
+	allowed = {	
+		has_dlc = "Arms Against Tyranny"
+		original_tag = YAK
+	}
+}
+
+YAK_buuhtan_motors_organization = {
+	name = YAK_buuhtan_motors
+	include = generic_medium_tank_organization
+	icon = generic_industrial_concern_2
+	allowed = {	
+		has_dlc = "Arms Against Tyranny"
+		original_tag = YAK
+	}
+}
+
+
+ ######  ##     ## #### ########   ######  
+##    ## ##     ##  ##  ##     ## ##    ## 
+##       ##     ##  ##  ##     ## ##       
+ ######  #########  ##  ########   ######  
+      ## ##     ##  ##  ##              ## 
+##    ## ##     ##  ##  ##        ##    ## 
+ ######  ##     ## #### ##         ######  
+
+
+ YAK_serekh_ni_khurtel_organization = {
+	name = YAK_serekh_ni_khurtel
+	include = generic_raider_ship_organization
+	icon = YAK_serekh_ni_khurtel
+	allowed = {	
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = YAK
+			original_tag = JAK
+		}
+	}
+}
+
+
+########  ##          ###    ##    ## ########  ######  
+##     ## ##         ## ##   ###   ## ##       ##    ## 
+##     ## ##        ##   ##  ####  ## ##       ##       
+########  ##       ##     ## ## ## ## ######    ######  
+##        ##       ######### ##  #### ##             ## 
+##        ##       ##     ## ##   ### ##       ##    ## 
+##        ######## ##     ## ##    ## ########  ######  
+
+
+YAK_northwind_design_organization = {
+	name = YAK_northwind_design
+	include = generic_light_aircraft_organization
+	icon = YAK_northwind_design
+	allowed = {	
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = YAK
+			original_tag = JAK
+		}
+	}
+}
+
+YAK_darksky_aeronautics_organization = {
+	name = YAK_darksky_aeronautics
+	include = generic_medium_aircraft_organization
+	icon = YAK_darksky_aeronautics
+	allowed = {	
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = YAK
+			original_tag = JAK
+		}
+	}
+}
+
+
+##     ##    ###    ######## ######## ########  #### ######## ##       
+###   ###   ## ##      ##    ##       ##     ##  ##  ##       ##       
+#### ####  ##   ##     ##    ##       ##     ##  ##  ##       ##       
+## ### ## ##     ##    ##    ######   ########   ##  ######   ##       
+##     ## #########    ##    ##       ##   ##    ##  ##       ##       
+##     ## ##     ##    ##    ##       ##    ##   ##  ##       ##       
+##     ## ##     ##    ##    ######## ##     ## #### ######## ######## 
diff --git a/common/military_industrial_organization/organizations/YAL_organization.txt b/common/military_industrial_organization/organizations/YAL_organization.txt
new file mode 100644
index 00000000000..9a32c2bf3d4
--- /dev/null
+++ b/common/military_industrial_organization/organizations/YAL_organization.txt
@@ -0,0 +1,363 @@
+
+########    ###    ##    ## ##    ##  ######  
+   ##      ## ##   ###   ## ##   ##  ##    ## 
+   ##     ##   ##  ####  ## ##  ##   ##       
+   ##    ##     ## ## ## ## #####     ######  
+   ##    ######### ##  #### ##  ##         ## 
+   ##    ##     ## ##   ### ##   ##  ##    ## 
+   ##    ##     ## ##    ## ##    ##  ######  
+
+
+YAL_super_dickgreif_dicke_panzer_organization = {
+	name = YAL_super_dickgreif_dicke_panzer
+	include = generic_super_heavy_tank_organization
+	icon = GFX_idea_generic_tank_manufacturer_3
+	allowed = {	
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = YAL
+			original_tag = GRI
+		}
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = YAL
+				398 = { is_core_of = ROOT }
+			}
+		}
+	}
+	initial_trait = {
+		equipment_bonus = {
+			maximum_speed = 0.1
+			defense = 0.09
+		}
+	}
+}
+
+YAL_Panzerleichte_Wissenschaft_organization = {
+	name = YAL_Panzerleichte_Wissenschaft
+	include = generic_mobile_tank_organization
+	icon = GFX_idea_generic_tank_manufacturer_1
+	allowed = {	
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = YAL
+			original_tag = GRI
+		}
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = YAL
+				398 = { is_core_of = ROOT }
+			}
+		}
+	}
+	initial_trait = {
+		equipment_bonus = {
+			maximum_speed = 0.08
+			supply_consumption = -0.1
+		}
+	}
+}
+
+
+ ######  ##     ## #### ########   ######  
+##    ## ##     ##  ##  ##     ## ##    ## 
+##       ##     ##  ##  ##     ## ##       
+ ######  #########  ##  ########   ######  
+      ## ##     ##  ##  ##              ## 
+##    ## ##     ##  ##  ##        ##    ## 
+ ######  ##     ## #### ##         ######  
+
+
+YAL_Daraens_Traumschiffe_organization = {
+	name = YAL_Daraens_Traumschiffe
+	include = generic_battle_line_ship_organization
+	icon = GFX_idea_generic_naval_manufacturer_1
+	allowed = {	
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = YAL
+			original_tag = GRI
+		}
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = YAL
+				398 = { is_core_of = ROOT }
+			}
+		}
+	}
+	initial_trait = {
+		limit_to_equipment_type = { capital_ship }
+		equipment_bonus = {
+			lg_attack = 0.03
+			hg_attack = 0.03
+			naval_speed = 0.1
+		}
+	}
+}
+
+YAL_Huberts_Fliegende_Fische_organization = {
+	name = YAL_Huberts_Fliegende_Fische
+	include = generic_task_force_ship_organization
+	icon = GFX_idea_generic_naval_manufacturer_2
+	allowed = {	
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = YAL
+			original_tag = GRI
+		}
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = YAL
+				398 = { is_core_of = ROOT }
+			}
+		}
+	}
+	initial_trait = {
+		limit_to_equipment_type = { mio_cat_eq_all_carrier }
+		equipment_bonus = {
+			build_cost_ic = -0.15
+		}
+	}
+}
+
+YAL_Studenten_schiffbau_organization = {
+	name = YAL_Studenten_schiffbau
+	include = generic_escort_ship_organization
+	icon = GFX_idea_generic_naval_manufacturer_3
+	allowed = {	
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = YAL
+			original_tag = GRI
+		}
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = YAL
+				398 = { is_core_of = ROOT }
+			}
+		}
+	}
+	initial_trait = {
+		limit_to_equipment_type = { mio_cat_eq_all_destroyer submarine }
+		equipment_bonus = {
+			reliability = 0.15
+		}
+	}
+}
+
+########  ##          ###    ##    ## ########  ######  
+##     ## ##         ## ##   ###   ## ##       ##    ## 
+##     ## ##        ##   ##  ####  ## ##       ##       
+########  ##       ##     ## ## ## ## ######    ######  
+##        ##       ######### ##  #### ##             ## 
+##        ##       ##     ## ##   ### ##       ##    ## 
+##        ######## ##     ## ##    ## ########  ######  
+
+
+YAL_Himmelschlaumeier_organization = {
+	name = YAL_Himmelschlaumeier
+	include = generic_range_focused_aircraft_organization
+	icon = GFX_idea_generic_air_manufacturer_1
+	allowed = {	
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = YAL
+			original_tag = GRI
+		}
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = YAL
+				398 = { is_core_of = ROOT }
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 398
+			398 = { is_core_of = ROOT }	
+		}
+	}
+}
+
+YAL_Fliegender_Teppich_AG_organization = {
+	name = YAL_Fliegender_Teppich_AG
+	include = generic_heavy_aircraft_organization
+	icon = GFX_idea_generic_air_manufacturer_2
+	allowed = {	
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = YAL
+			original_tag = GRI
+		}
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = YAL
+				398 = { is_core_of = ROOT }
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 398
+			398 = { is_core_of = ROOT }	
+		}
+
+	}
+}
+
+YAL_Kralle_und_Geist_werke_organization = {
+	name = YAL_Kralle_und_Geist_werke
+	include = generic_cas_aircraft_organization
+	icon = GFX_idea_generic_air_manufacturer_3
+	allowed = {	
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = YAL
+			original_tag = GRI
+		}
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = YAL
+				398 = { is_core_of = ROOT }
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 398
+			398 = { is_core_of = ROOT }	
+		}
+	}
+}
+
+##     ##    ###    ######## ######## ########  #### ######## ##       
+###   ###   ## ##      ##    ##       ##     ##  ##  ##       ##       
+#### ####  ##   ##     ##    ##       ##     ##  ##  ##       ##       
+## ### ## ##     ##    ##    ######   ########   ##  ######   ##       
+##     ## #########    ##    ##       ##   ##    ##  ##       ##       
+##     ## ##     ##    ##    ##       ##    ##   ##  ##       ##       
+##     ## ##     ##    ##    ######## ##     ## #### ######## ######## 
+
+
+YAL_Johannes_Werkzeugkiste_organization = { ### Toybox designer
+	name = YAL_Johannes_Werkzeugkiste
+	include = generic_artillery_organization
+	icon = GFX_idea_generic_infantry_equipment_manufacturer_1
+	allowed = {	
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = YAL
+			original_tag = GRI
+		}
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = YAL
+				398 = { is_core_of = ROOT }
+			}
+		}
+	}
+	initial_trait = {
+		limit_to_equipment_type = { anti_tank_equipment anti_air_equipment }
+		equipment_bonus = {
+			build_cost_ic = -0.1
+		}
+	}
+}
+
+YAL_Yales_buechsenmacher_GmbH_organization = {
+	name = YAL_Yales_buechsenmacher_GmbH
+	include = generic_infantry_equipment_organization
+	icon = GFX_idea_generic_infantry_equipment_manufacturer_2
+	allowed = {	
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = YAL
+			original_tag = GRI
+		}
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = YAL
+				398 = { is_core_of = ROOT }
+			}
+		}
+	}
+	initial_trait = {
+		equipment_bonus = {
+			soft_attack = 0.05
+		}
+	}
+}
+
+YAL_Studentenwagen_organization = {
+	name = YAL_Studentenwagen
+	include = generic_motorized_mechanized_organization
+	icon = GFX_idea_generic_infantry_equipment_manufacturer_3
+	allowed = {	
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = YAL
+			original_tag = GRI
+		}
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = YAL
+				398 = { is_core_of = ROOT }
+			}
+		}
+	}
+	initial_trait = {
+		equipment_bonus = {
+			soft_attack = 0.05
+		}
+	}
+}
+
+YAL_Familie_Rohrleger_Rohre_organization = { ### add advanced_artillery_manufacturer trait
+	name = YAL_Familie_Rohrleger_Rohre
+	include = generic_artillery_organization
+	icon = GFX_idea_generic_infantry_equipment_manufacturer_3
+	allowed = {	
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = YAL
+			original_tag = GRI
+		}
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = YAL
+				398 = { is_core_of = ROOT }
+			}
+		}
+	}
+	initial_trait = {
+		limit_to_equipment_type = { artillery_equipment }
+		equipment_bonus = {
+			build_cost_ic = -0.05
+			reliability = 0.05
+		}
+	}
+}
\ No newline at end of file
diff --git a/common/military_industrial_organization/organizations/ZAR_organization.txt b/common/military_industrial_organization/organizations/ZAR_organization.txt
new file mode 100644
index 00000000000..105d7412c08
--- /dev/null
+++ b/common/military_industrial_organization/organizations/ZAR_organization.txt
@@ -0,0 +1,87 @@
+
+########    ###    ##    ## ##    ##  ######  
+   ##      ## ##   ###   ## ##   ##  ##    ## 
+   ##     ##   ##  ####  ## ##  ##   ##       
+   ##    ##     ## ## ## ## #####     ######  
+   ##    ######### ##  #### ##  ##         ## 
+   ##    ##     ## ##   ### ##   ##  ##    ## 
+   ##    ##     ## ##    ## ##    ##  ######  
+
+
+
+
+ ######  ##     ## #### ########   ######  
+##    ## ##     ##  ##  ##     ## ##    ## 
+##       ##     ##  ##  ##     ## ##       
+ ######  #########  ##  ########   ######  
+      ## ##     ##  ##  ##              ## 
+##    ## ##     ##  ##  ##        ##    ## 
+ ######  ##     ## #### ##         ######  
+
+
+
+
+########  ##          ###    ##    ## ########  ######  
+##     ## ##         ## ##   ###   ## ##       ##    ## 
+##     ## ##        ##   ##  ####  ## ##       ##       
+########  ##       ##     ## ## ## ## ######    ######  
+##        ##       ######### ##  #### ##             ## 
+##        ##       ##     ## ##   ### ##       ##    ## 
+##        ######## ##     ## ##    ## ########  ######  
+
+
+
+
+##     ##    ###    ######## ######## ########  #### ######## ##       
+###   ###   ## ##      ##    ##       ##     ##  ##  ##       ##       
+#### ####  ##   ##     ##    ##       ##     ##  ##  ##       ##       
+## ### ## ##     ##    ##    ######   ########   ##  ######   ##       
+##     ## #########    ##    ##       ##   ##    ##  ##       ##       
+##     ## ##     ##    ##    ##       ##    ##   ##  ##       ##       
+##     ## ##     ##    ##    ######## ##     ## #### ######## ######## 
+
+
+ZAR_tribe_armory_organization = {
+	name = ZAR_tribe_armory
+	include = generic_infantry_equipment_organization
+	icon = ZAR_tribe_armory
+	allowed = {	
+		has_dlc = "Arms Against Tyranny"
+		original_tag = ZAR
+	}
+	visible = {
+		owner = {
+			original_tag = ZAR
+			has_completed_focus	= ZAR_tribal_armories	
+		}
+	}
+	initial_trait = {
+		equipment_bonus = {
+			reliability = -0.05
+			build_cost_ic = -0.25
+		}
+	}
+}
+
+ZAR_royal_armory_organization = {
+	name = ZAR_royal_armory
+	include = generic_artillery_organization
+	icon = GFX_idea_generic_infantry_equipment_manufacturer_2
+	allowed = {	
+		has_dlc = "Arms Against Tyranny"
+		original_tag = ZAR
+	}
+	visible = {
+		owner = {
+			original_tag = ZAR
+			has_completed_focus	= ZAR_fledgling_arms_industry	
+		}
+	}
+	initial_trait = {
+		equipment_bonus = {
+			reliability = 0.05
+			soft_attack = 0.05
+			defense = 0.05
+		}
+	}
+}
\ No newline at end of file
diff --git a/common/military_industrial_organization/organizations/ZES_organization.txt b/common/military_industrial_organization/organizations/ZES_organization.txt
new file mode 100644
index 00000000000..182980783d5
--- /dev/null
+++ b/common/military_industrial_organization/organizations/ZES_organization.txt
@@ -0,0 +1,395 @@
+
+########    ###    ##    ## ##    ##  ######  
+   ##      ## ##   ###   ## ##   ##  ##    ## 
+   ##     ##   ##  ####  ## ##  ##   ##       
+   ##    ##     ## ## ## ## #####     ######  
+   ##    ######### ##  #### ##  ##         ## 
+   ##    ##     ## ##   ### ##   ##  ##    ## 
+   ##    ##     ## ##    ## ##    ##  ######  
+
+
+ZES_tank_manufacturer_organization = {
+	name = ZES_tank_manufacturer
+	include = generic_tank_organization
+	icon = GFX_idea_ZES_Fundicao_de_ilha_Rosca
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = ZES
+			original_tag = OLV
+		}
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = ZES
+				owns_state = 680
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 680
+		}
+	}
+}
+
+
+ ######  ##     ## #### ########   ######  
+##    ## ##     ##  ##  ##     ## ##    ## 
+##       ##     ##  ##  ##     ## ##       
+ ######  #########  ##  ########   ######  
+      ## ##     ##  ##  ##              ## 
+##    ## ##     ##  ##  ##        ##    ## 
+ ######  ##     ## #### ##         ######  
+
+
+ ZES_fib_doctrin_manuf_organization = {
+	name =  ZES_fib_doctrin_manuf
+	include = generic_battle_line_ship_organization
+	icon = GFX_idea_ZES_fib_doctrin_manuf
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = ZES
+			original_tag = OLV
+			original_tag = MCW
+		}
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = ZES
+				original_tag = MCW
+				AND = {
+					owns_state = 394
+					ZES = { has_completed_focus = ZES_navy_fib_5 }
+				}
+			}
+		}
+	}
+	available = {
+		owner = {
+			OR = {
+				owns_state = 413
+				owns_state = 721
+			}
+		}
+		if = {
+			limit = { owner = { original_tag = ZES } }
+			owner = { has_completed_focus = ZES_navy_fib_5 }
+		}
+	}
+
+	initial_trait = {
+		name = ZES_fib_doctrin
+
+		limit_to_equipment_type = { 
+			capital_ship
+		}
+		equipment_bonus = {
+			max_strength = 0.1
+			armor_value = 0.1 
+			hg_attack = 0.1
+		}
+	}
+}
+
+ZES_ti_doctrin_manuf_organization = {
+	name =  ZES_ti_doctrin_manuf
+	include = generic_submarine_organization
+	icon = GFX_idea_ZES_Arsenal_Naval_de_Seguro
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = ZES
+			original_tag = OLV
+		}
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = ZES
+				AND = {
+					owns_state = 394
+					ZES = { has_completed_focus = ZES_navy_ti_3 }
+				}
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 413
+		}
+		if = {
+			limit = { owner = { original_tag = ZES } }
+
+			owner = { has_completed_focus = ZES_navy_ti_3 }
+		}
+	}
+
+	initial_trait = {
+		name = ZES_ti_doctrin
+
+		limit_to_equipment_type = { 
+			submarine
+		}
+		equipment_bonus = {
+			sub_visibility = -0.1
+			naval_speed = 0.1 
+		}
+	}
+}
+
+
+########  ##          ###    ##    ## ########  ######  
+##     ## ##         ## ##   ###   ## ##       ##    ## 
+##     ## ##        ##   ##  ####  ## ##       ##       
+########  ##       ##     ## ## ## ## ######    ######  
+##        ##       ######### ##  #### ##             ## 
+##        ##       ##     ## ##   ### ##       ##    ## 
+##        ######## ##     ## ##    ## ########  ######  
+
+
+ZES_l_air_manu_organization = {
+	name = ZES_l_air_manu
+	include = generic_light_aircraft_organization
+	icon = GFX_idea_ZES_Ca_Sa_Aeronautica_Ltda
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = ZES
+			original_tag = OLV
+		}
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = ZES
+				owns_state = 413
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 413
+		}
+	}
+}
+
+ZES_CAS_manu_organization = {
+	name = ZES_CAS_manu
+	include = generic_cas_aircraft_organization
+	icon = GFX_idea_ZES_Garca
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = ZES
+			original_tag = OLV
+		}
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = ZES
+				owns_state = 413
+			}
+		}
+	}
+	
+	available = {
+		owner = {
+			owns_state = 413
+		}
+	}
+}
+
+ZES_n_air_manu_organization = {
+	name = ZES_n_air_manu
+	include = generic_naval_aircraft_organization
+	icon = GFX_idea_ZES_Companhia_Aeronautica_Jandala
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = ZES
+			original_tag = OLV
+			original_tag = MCW
+		}
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = ZES
+				original_tag = MCW
+				owns_state = 413
+				owns_state = 725
+			}
+		}
+	}
+	available = {
+		owner = {
+			OR = {
+				owns_state = 413
+				owns_state = 725
+			}
+		}
+	}
+}
+
+ZES_pasarinha_airline_organization = {
+	name = ZES_pasarinha_airline
+	include = generic_light_aircraft_organization
+	icon = GFX_idea_generic_air_manufacturer_1
+	allowed = {
+		has_dlc = "Arms Against Tyranny"
+		original_tag = ZES
+	}
+	visible = {
+		owner = {
+			has_completed_focus = ZES_airline_production
+		}
+	}
+	available = {
+		owner = {
+			has_completed_focus = ZES_airline_production
+		}
+	}
+}
+
+##     ##    ###    ######## ######## ########  #### ######## ##       
+###   ###   ## ##      ##    ##       ##     ##  ##  ##       ##       
+#### ####  ##   ##     ##    ##       ##     ##  ##  ##       ##       
+## ### ## ##     ##    ##    ######   ########   ##  ######   ##       
+##     ## #########    ##    ##       ##   ##    ##  ##       ##       
+##     ## ##     ##    ##    ##       ##    ##   ##  ##       ##       
+##     ## ##     ##    ##    ######## ##     ## #### ######## ######## 
+
+
+ZES_infantry_equipment_manufacturer_organization = {
+	name = ZES_infantry_equipment_manufacturer
+	include = generic_infantry_equipment_organization
+	icon = GFX_idea_ZES_infantry_equipment_manufacturer
+	allowed = {	
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = ZES
+			original_tag = OLV
+		}
+	}
+	visible = {
+		owner = {
+			AND = {
+				OR = {
+					original_tag = ZES
+					owns_state = 413
+				}
+				ZES = {
+					OR = {
+						has_completed_focus = ZES_our_gun
+						has_completed_focus = ZES_altu_mili_6_1
+					}
+				}
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 413
+		}
+		if = {
+			limit = { owner = { original_tag = ZES } } 
+			owner = {
+				OR = {
+					has_completed_focus = ZES_our_gun
+					has_completed_focus = ZES_altu_mili_6_1
+				}
+			}
+		}
+	}
+	initial_trait = {
+		equipment_bonus = {
+			reliability = 0.1
+			build_cost_ic = -0.1
+		}
+		organization_modifier = {
+			military_industrial_organization_design_team_assign_cost = -0.67
+		}
+	}
+}
+
+ZES_artillery_manufacturer_organization = {
+	name = ZES_artillery_manufacturer
+	include = generic_artillery_organization
+	icon = GFX_idea_ZES_Dinamite_Fyrport
+	allowed = {	
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = ZES
+			original_tag = OLV
+		}
+	}
+	visible = {
+		owner = {
+			OR = {
+				original_tag = ZES
+				owns_state = 558
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 558
+		}
+	}
+}
+
+ZES_support_equipment_manufacturer_organization = {
+	name = ZES_support_equipment_manufacturer
+	include = generic_support_equipment_organization
+	icon = GFX_idea_ZES_Pa_e_Broca_Inc
+	allowed = {	
+		has_dlc = "Arms Against Tyranny"
+		OR = {
+			original_tag = ZES
+			original_tag = OLV
+		}
+	}
+	visible = {
+		owner = {			
+			OR = {
+				original_tag = ZES
+				owns_state = 413
+			}
+		}
+	}
+	available = {
+		owner = {
+			owns_state = 413
+		}
+	}
+}
+
+ZES_pasarinha_automobile_organization = {
+	name = ZES_pasarinha_automobile
+	include = generic_motorized_mechanized_organization
+	icon = GFX_idea_generic_industrial_concern_1
+	allowed = {	
+		has_dlc = "Arms Against Tyranny"
+		tag = ZES
+	}
+	visible = {
+		owner = {
+			has_completed_focus = ZES_car_production
+		}
+	}
+	available = {
+		owner = {
+			has_completed_focus = ZES_car_production
+		}
+	}
+	initial_trait = {
+		equipment_bonus = {
+			build_cost_ic = -0.05
+		}
+	}
+}
\ No newline at end of file
diff --git a/common/military_industrial_organization/organizations/_template_organization.txt b/common/military_industrial_organization/organizations/_template_organization.txt
new file mode 100644
index 00000000000..2a173df4c72
--- /dev/null
+++ b/common/military_industrial_organization/organizations/_template_organization.txt
@@ -0,0 +1,46 @@
+#####################
+
+###  ##  #  # # #  ## 
+ #  #  # ## # # # #   
+ #  #### # ## ##   #  
+ #  #  # #  # # #   # 
+ #  #  # #  # # # ## 
+
+ #################### 
+
+
+
+#####################
+
+ ## #  # ### ###   ## 
+#   #  #  #  #  # #   
+ #  ####  #  ###   #  
+  # #  #  #  #      # 
+##  #  # ### #    ##  
+ 
+#####################
+
+
+
+###########################
+
+###  #    ##  #  # ###  ## 
+#  # #   #  # ## # #   #   
+###  #   #### # ## ##   #  
+#    #   #  # #  # #     # 
+#    ### #  # #  # ### ##  
+
+###########################
+
+
+
+################################### 
+
+#   #  ##  ### ### ###  ### ### #   
+## ## #  #  #  #   #  #  #  #   #   
+# # # ####  #  ##  ###   #  ##  #   
+#   # #  #  #  #   #  #  #  #   #   
+#   # #  #  #  ### #  # ### ### ### 
+
+
+###################################
\ No newline at end of file
diff --git a/common/military_industrial_organization/organizations/documentation.info b/common/military_industrial_organization/organizations/documentation.info
new file mode 100644
index 00000000000..4f6b3edf215
--- /dev/null
+++ b/common/military_industrial_organization/organizations/documentation.info
@@ -0,0 +1,503 @@
+# Military Industrial Organization (MIO) database
+#
+# MIOs are replacement for design companies.
+# They give research bonuses, but most importantly they give bonuses to equipments (quality and production).
+#
+# 1 MIO is composed of 1 tree of unlockable traits.
+# The list of equipment a MIO can match is set in the MIO.
+# Then the equipment stat & production stat for the bonus is set in the traits.
+# The bonus is the combinaison of the two - e.g. soft attack for infantry equipment.
+# 
+# Trait can also unlock modifier for the MIO itself - in that case the equipment type does not matter.
+#
+# See "game/common/defines/00_graphics.lua" for configuration of coloring of lines in the trait trees
+# (for example, "TRAIT_LINE_ASSIGNED_COLOR").
+#
+# Example with all possible parts:
+# my_MIO_token = {
+#	name = loc_key # optional
+#	# if name provided, use TAG_loc_key if it exists. if not use loc_key (where TAG is the tag of the MIO owner)
+#	# if localization key TAG_my_MIO_token exists, use it 
+#	# else use loc key my_MIO_token
+#	# loc key may use scripted loc, scope will be set with this MIO
+#
+#	icon = GFX_key # optional
+#	# if icon provided, use GFX_key
+#	# if gfx key GFX_TAG_my_MIO_token exists, use it (where TAG is the tag of the MIO owner)
+#	# if gfx key GFX_my_MIO_token exists, use it
+#	# else use GFX_idea_unknown
+#
+#	allowed = { ... } # mandatory
+#   # country scope
+#   # allowed is evaluated when starting the game for all countries (even the ones that don't exist yet)
+#   # if trigger returns true, an instance of this MIO is created for this country
+#
+#	visible = { ... } # optional, default is always = yes
+#   # current MIO scope - FROM = country
+#   # visible is evaluated when displaying the MIO UIs
+#   # if trigger returns false, then the MIO is not visible for the player
+#
+#	available = { ... } # optional, default is always = yes
+#   # current MIO scope - FROM = country
+#   # available is evaluated when displaying the MIO UIs
+#   # if trigger returns false, then the MIO is visible but disabled and greyed-out
+#
+#   # for AI and script, a MIO is considered enabled if it is both visible and available
+#
+#   equipment_type = { equipment_type_token1 }
+#	# Equipment archetypes & categories used to match the MIO with variants
+#	# cf. script enum script_enum_equipment_bonus_type for possible values
+#
+# 	research_categories = { infantry_weapons }
+#	# Research categories used to match the MIO with technlogies
+#	# Must match categories in game/common/technologies files
+#
+#	on_design_team_assigned_to_tech = { ... }
+#	on_design_team_assigned_to_variant = { ... }
+#	on_industrial_manufacturer_assigned = { ... }
+#	on_tech_research_cancelled = { ... }
+#	on_tech_research_completed = { ... }
+#	on_industrial_manufacturer_unassigned = { ... }
+#	# optional on-action effects - executed with current MIO scope and FROM = country
+#
+#   research_bonus = 0.2 # optional, default is define DESIGN_TEAM_RESEARCH_BONUS
+#   task_capacity = 3 # optional, default is define DEFAULT_INITIAL_TASK_CAPACITY
+#
+#
+#	ai_will_do = {
+#		...
+#	}
+#   # current MIO scope - FROM = country
+#	# AI weight modifier for this organization - optional
+#	# For documentation, see examples of ai_will_do throughout the content
+#
+#	# Flavor texts are displayed above the trait tree.
+#	# They are typically here to describe a column of traits - there is only room for 1 line!
+#	# You can have several flavor texts - repeat the tree_flavor_text block
+#	# use x to choose where to put the text on the horizontal axis.
+#	# x should be the horizontal coordinate of the cell where the center of the text will be.
+#	# For the text to be aligned with a point between 2 cells, use a decimal number. (e.g. x = 1.2)
+#	tree_header_text = {
+#		text = my_flavor_text_loc_key
+#		x = 1
+#	}
+#
+#	# In addition to the traits in trees, MIO can have an initial trait.
+#	# This one is unlocked from the start, and the bonuses applies directly.
+#	initial_trait = {
+#		# Only the following parameters are relevant for initial traits - all optional
+#		# See Trait parameters below for more details.
+#		name = my_loc_key # token initial_trait will be used for default name
+#		limit_to_equipment_type = { ... }
+#		equipment_bonus = { ... }
+#		production_bonus = { ... }
+#		organization_modifier = { ... }
+#	}
+#
+#	# Add traits to the tree
+#   # you can add as many as needed by repeating the trait block
+#	trait = {
+#		token = upgrade_1 # mandatory
+#		name = loc_key # optional
+#		# if name provided, use TAG_loc_key if it exists. if not use loc_key (where TAG is the tag of the MIO owner)
+#		# if localization key TAG_my_MIO_token_upgrade_1 exists, use it 
+#		# else use loc key my_MIO_token_upgrade_1
+#
+#		icon = GFX_key # optional
+#		# if icon provided, use GFX_key
+#		# if gfx key GFX_TAG_my_MIO_token_upgrade_1 exists, use it (where TAG is the tag of the MIO owner)
+#		# if gfx key GFX_my_MIO_token_upgrade_1 exists, use it
+#		# else use GFX_idea_unknown
+#
+#		special_trait_background  = yes # optional - default no
+#		# if yes, trait background will be golden to indicate an interesting trait
+#
+#		# if your trait is not the first in the tree, it needs at least one parent specified
+#       # with parent or any_parent
+#		parent = {
+#           traits = { parent traits }
+#           num_parents_needed = X # The number of parents that needs to be unlocked, default 1
+#       }
+#       any_parent = { parent traits } # Short hand for "parent = { traits = { parent traits } num_parents_needed = 1 }"
+#       all_parents = { parent traits} # Short hand for "parent = { traits = { parent traits } num_parents_needed = N }" where N is the number of parent traits
+#
+#		# The trait can be mutually exclusive with another (or more)
+#		# Note that the other trait should also have the mutually_exclusive parameter set
+#		mutually_exclusive= { upgrade4 }
+#
+#		visible = { ... } # optional, default is always = yes
+#   	# current MIO scope - FROM = country
+#   	# visible is evaluated when displaying the MIO UIs
+#   	# if trigger returns false, then the trait is not visible for the player
+#
+#		available = { ... } # optional, default is always = yes
+#   	# current MIO scope - FROM = country
+#   	# available is evaluated when displaying the MIO UIs
+#   	# if trigger returns false, then the trait is visible but disabled and greyed-out
+#
+#   	# for AI and script, a trait is considered enabled if it is both visible and available
+#
+#		on_complete = { ... } # optional
+#		# current MIO scope - FROM = country
+#		# Effects that will be executed when the trait is completed (aka unlocked)
+#
+#		limit_to_equipment_type = { ... } # Optional
+#		# By default, the bonuses in traits are applied to the equipment types at MIO level
+#		# But you can restrict them to equipment type contained in the ones at MIO level
+#		# eg. if MIO has list of equipment archetypes { light_armor medium_tank }, you may limit to archetype { light_tank }
+#		# eg. if MIO has equipment category { armor }, you may limit to archetypes { light_tank medium_tank }
+#
+#       # Defines the bonus given when the trait is unlocked, and the MIO is assigned to an equipment variant
+#		# cf. script enum script_enum_equipment_stat for possible values
+#		equipment_bonus = {
+#			reliability = 0.2
+#			soft_attack = 0.1 # accepts as many stats as needed
+#		}
+#       # Defines the bonus given when the trait is unlocked, and the MIO is assigned to a production line
+#		# cf. script enum script_enum_production_stat for possible values
+#		production_bonus = {
+#			production_cost_factor = -0.1
+#			production_capacity_factor = 0.1 # accepts as many stats as needed
+#		}
+#
+#		# Defines modifiers that will apply on the Organization the trait is part of.
+#		# Only use modifiers relevant for MIOs - full list below.
+#		organization_modifier = {
+#			military_industrial_organization_research_bonus = 0.1
+#			military_industrial_organization_design_team_assign_cost = -0.33
+#			military_industrial_organization_design_team_change_cost = -0.5
+#			military_industrial_organization_industrial_manufacturer_assign_cost = -0.66
+#			military_industrial_organization_task_capacity = 2
+#			military_industrial_organization_size_up_requirement = -0.2
+#			military_industrial_organization_funds_gain = 0.5
+#		}
+#
+#		# Defines where the trait will be positioned in the tree grid (in the MIO Details UI)
+#       # x=0 y=0 is the top left position
+#       # Careful to not reuse twice the same position in the same tree
+#		position = { x=1 y=0 }
+#		# by default position is the absolute coordinate in the tree grid.
+#		# if relative_position_id is provided, it becomes a delta applied to the input trait position
+#		relative_position_id = trait_token
+#
+#		# AI weight modifier for this trait
+#		# For documentation, see examples of ai_will_do throughout the content
+#		# Warning : if the trait is part of a central tree, the trait's ai_will_do will override the central tree's!
+#		ai_will_do = {
+#			...
+#		}
+#	 }
+# }
+#
+# Another example where we build a new MIO by reusing an existing one
+# my_quick_unoriginal_MIO = {
+#	include = my_MIO_token
+#	# By default, every part of the my_MIO_token will be reused.
+#	# But you may override any part
+#	allowed = { ... }
+#	icon = another_GFX_key
+#	research_bonus = 0.3
+#
+#	# In order to override with default/empty value, put parameter name in delete_included_values
+#	# All parameters are eligible except the trait ones (see below)
+#	delete_included_values = { name on_design_team_assigned_to_variant initial_trait ... }
+#
+#	# For the initial trait
+#	# Usual trait API - just fill parts you want to override - the rest will keep the original values
+#	initial_trait = {
+#		icon = another_trait_GFX_key
+#	}
+#
+#	# Same for the traits that are copied into the including MIO as they are.
+#	# Use the following specific parameters to modify them.
+#	add_trait = { ... } # add a trait to the included tree - usual trait API
+#	remove_trait = { trait_token }
+#	override_trait = {
+#		token = trait_token # must match a trait in included MIO
+#		# Usual trait API - just fill parts you want to override - the rest will keep the original values
+#		equipment_bonus = { ... }
+#		is_available = { ... }
+#		# In order to override with default/empty value, put parameter name in delete_included_values
+#		# All parameters are eligible
+#		delete_included_values = { equipment_bonus relative_position_id ...  }
+#   }
+#	# !Warning! if included and including MIO are in 2 seperate files, you will need to "save" the 2 files to hot-reload the result.
+# }
+# NB: there are no load order constriction when using include. The included MIO just needs to exists somewhere in the organizations directory.
+
+
+
+
+########  #######  ##     ## #### ########  ##     ## ######## ##    ## ########     ######  ########    ###    ########  ######  
+##       ##     ## ##     ##  ##  ##     ## ###   ### ##       ###   ##    ##       ##    ##    ##      ## ##      ##    ##    ## 
+##       ##     ## ##     ##  ##  ##     ## #### #### ##       ####  ##    ##       ##          ##     ##   ##     ##    ##       
+######   ##     ## ##     ##  ##  ########  ## ### ## ######   ## ## ##    ##        ######     ##    ##     ##    ##     ######  
+##       ##  ## ## ##     ##  ##  ##        ##     ## ##       ##  ####    ##             ##    ##    #########    ##          ## 
+##       ##    ##  ##     ##  ##  ##        ##     ## ##       ##   ###    ##       ##    ##    ##    ##     ##    ##    ##    ## 
+########  ##### ##  #######  #### ##        ##     ## ######## ##    ##    ##        ######     ##    ##     ##    ##     ######  
+
+
+
+###  ##  #  # # #  ## 
+ #  #  # ## # # # #   
+ #  #### # ## ##   #  
+ #  #  # #  # # #   # 
+ #  #  # #  # # # ##  
+
+#maximum_speed
+#reliability
+#defense
+#breakthrough
+#armor_value
+#soft_attack
+#hard_attack
+#ap_attack
+#air_attack
+#build_cost_ic
+#fuel_consumption
+#hardness
+#armor_value
+#build_cost_ic
+#entrenchment - only if you have DLC NSB  and module dozer_blade
+#fuel_capacity - only if you have DLC NSB  and module expanded_fuel_tank
+
+
+
+ ## #  # ### ###   ## 
+#   #  #  #  #  # #   
+ #  ####  #  ###   #  
+  # #  #  #  #      # 
+##  #  # ### #    ##  
+
+#lg_armor_piercing (requires modules)
+#lg_attack (requires modules)
+#hg_armor_piercing (requires modules)
+#hg_attack (requires modules)
+#torpedo_attack (requires modules)
+#sub_attack (requires modules)
+#anti_air_attack (requires modules)
+#armor_value (requires modules)
+#surface_detection 
+#sub_detection (requires modules)
+#sub_visibility (sub only)
+#surface_visibility (surface only)
+#naval_speed 
+#reliability
+#naval_range
+#max_strength
+#fuel_consumption
+#build_cost_ic
+#manpower
+#naval_supremacy_factor
+#naval_torpedo_enemy_critical_chance_factor (if you have modules adding it)
+#naval_torpedo_damage_reduction_factor (if you have modules adding it)
+#carrier_size (this will get very bad for you I promise, equipment modifiers are a mistake)
+#mines_sweeping (only MTG and with modules)
+#mines_planting (only with MTG and modules)
+#naval_torpedo_hit_chance_factor (requires modules)
+#naval_light_gun_hit_chance_factor (requires modules)
+#naval_heavy_gun_hit_chance_factor (requires modules)
+
+
+
+###  #    ##  #  # ###  ## 
+#  # #   #  # ## # #   #   
+###  #   #### # ## ##   #  
+#    #   #  # #  # #     # 
+#    ### #  # #  # ### ##  
+
+#air_superiority
+#reliability
+#naval_strike_attack
+#naval_strike_targetting
+#manpower
+#fuel_consumption
+#build_cost_ic
+#resources
+#thrust - only if you have BBA DLC
+#weight - only if you have BBA DLC
+#maximum_speed
+#air_range
+#air_agility
+#air_attack
+#air_defence
+#surface_detection
+#sub_detection
+#air_ground_attack
+#air_bombing
+#mines_planting - if you have MtG and BBA
+#mines_sweeping - if you have MtG and BBA
+#night_penalty - only if you have BBA DLC (you need to have module because base value is 0 - radio navigatio
+
+
+
+#   #  ##  ### ### ###  ### ### #   
+## ## #  #  #  #   #  #  #  #   #   
+# # # ####  #  ##  ###   #  ##  #   
+#   # #  #  #  #   #  #  #  #   #   
+#   # #  #  #  ### #  # ### ### ### 
+
+
+##############################
+##### INFANTRY EQUIPMENT #####
+##############################
+#reliability
+#maximum_speed
+#defense
+#breakthrough
+#hardness - it is in the script, but the value is set to 0 (in the game, the UI doesn't show this value)
+#armor_value - it is in the script, but the value is set to 0 (in the game, the UI doesn't show this value)
+#soft_attack
+#hard_attack
+#ap_attack
+#air_attack - it is in the script but the value is set to 0 (in the game, the UI doesn't show this value)
+#build_cost_ic
+
+##############################
+##### SUPPORT EQUIPMENT ######
+##############################
+#reliability
+#build_cost_ic
+
+
+#############################
+#### ARTILLERY EQUIPMENT ####
+#############################
+#reliability
+#defense
+#breakthrough
+#hardness
+#armor_value
+#soft_attack
+#hard_attack
+#ap_attack
+#air_attack
+#build_cost_ic
+
+############################
+#### ANTI-AIR EQUIPMENT ####
+############################
+#reliability
+#defense
+#breakthrough
+#hardness
+#armor_value
+#soft_attack
+#hard_attack
+#ap_attack
+#air_attack
+#build_cost_ic
+
+#############################
+#### ANTI-TANK EQUIPMENT ####
+#############################
+#reliability
+#defense
+#breakthrough
+#hardness
+#armor_value
+#soft_attack
+#hard_attack
+#ap_attack
+#air_attack
+#build_cost_ic
+
+####################################
+#### ROCKET ARTILLERY EQUIPMENT ####
+####################################
+#reliability
+#defense
+#breakthrough
+#hardness
+#armor_value
+#soft_attack
+#hard_attack
+#ap_attack
+#air_attack
+#build_cost_ic
+
+
+##############################
+#### MOTORIZED EQUIPMENT #####
+##############################
+#maximum_speed
+#reliability
+#hardness
+#breakthrough
+#build_cost_ic
+#fuel_consumption
+
+####################################
+#### MOTORIZED ROCKET EQUIPMENT ####
+####################################
+#reliability
+#defense
+#breakthrough
+#hardness
+#armor_value
+#soft_attack
+#hard_attack
+#ap_attack
+#air_attack
+#build_cost_ic (edited)
+
+###############################
+#### MECHANIZED EQUIPMENT #####
+###############################
+#maximum_speed
+#reliability
+#defense
+#breakthrough
+#hardness
+#armor_value
+#ap_attack
+#air_attack
+#build_cost_ic
+#fuel_consumption
+
+#########################################
+#### AMPHIBIOUS MECHANIZED EQUIPMENT ####
+#########################################
+#maximum_speed
+#reliability
+#defense
+#breakthrough
+#hardness
+#armor_value
+#ap_attack
+#air_attack
+#build_cost_ic
+#fuel_consumption
+
+
+################################
+#### ARMORED CAR EQUIPMENT #####
+################################
+#maximum_speed
+#reliability
+#defense
+#breakthrough
+#hardness
+#armor_value
+#soft_attack
+#hard_attack
+#ap_attack
+#air_attack
+#build_cost_ic
+#fuel_consumption
+
+
+##########################
+#### TRAIN EQUIPMENT #####
+##########################
+#armor_value
+#build_cost_ic
+#air_attack
+
+################################
+#### RAILWAY GUN EQUIPMENT #####
+################################
+#reliability
+#maximum_speed
+#railway_gun_attack
+#build_cost_ic
\ No newline at end of file
diff --git a/common/military_industrial_organization/policies/_general_policies.txt b/common/military_industrial_organization/policies/_general_policies.txt
new file mode 100644
index 00000000000..b70dc1b43d2
--- /dev/null
+++ b/common/military_industrial_organization/policies/_general_policies.txt
@@ -0,0 +1,96 @@
+mio_policy_general_ruthless_contracts = {
+	icon = GFX_mio_policy_ruthless_contracts
+	allowed = { always = yes  }
+	available = { has_mio_size > 5}
+	organization_modifier = {
+		military_industrial_organization_funds_gain = 0.1
+	}
+}
+
+mio_policy_general_assembly_line_optimisers = {
+	icon = GFX_mio_policy_assembly_line_optimisers
+	allowed = { 
+		OR = {
+			has_mio_equipment_type = small_plane_airframe
+			has_mio_equipment_type = medium_plane_airframe
+			has_mio_equipment_type = large_plane_airframe
+			has_mio_equipment_type = small_plane_cas_airframe
+			has_mio_equipment_type = small_plane_naval_bomber_airframe
+			has_mio_equipment_type = medium_plane_fighter_airframe
+			has_mio_equipment_type = medium_plane_scout_plane_airframe
+			has_mio_equipment_type = large_plane_maritime_patrol_plane_airframe
+			has_mio_equipment_type = armor
+			has_mio_equipment_type = motorized
+			has_mio_equipment_type = mechanized
+			has_mio_equipment_type = anti_tank
+			has_mio_equipment_type = flame
+			has_mio_equipment_type = anti_air
+			has_mio_equipment_type = artillery
+			has_mio_equipment_type = rocket
+			has_mio_equipment_type = infantry
+			has_mio_equipment_type = railway_gun
+			has_mio_equipment_type = train
+		} 
+	}
+	available = { has_mio_size > 5}
+	production_bonus = {
+		same_as_mio = {
+			production_efficiency_cap_factor = 0.05
+			production_efficiency_gain_factor = 0.05
+		}
+	}
+}
+
+mio_policy_general_vertical_integration = {
+	icon = GFX_mio_policy_vertical_integration
+	allowed = { always = yes }
+	available = { has_mio_size > 5}
+	production_bonus = {
+		same_as_mio = {
+			production_resource_need_factor = -0.1
+			production_resource_penalty_factor = 0.1
+		}
+	}
+}
+
+mio_policy_general_mechanical_genius  = {
+	icon = GFX_mio_policy_mechanical_genius
+	allowed = { always = yes }
+	available = { has_mio_size > 5}
+	equipment_bonus = {
+		same_as_mio = {
+			reliability = 0.1
+		}
+	}
+}
+
+mio_policy_general_experimental_development_teams = {
+	icon = GFX_mio_policy_experimental_development_teams
+	allowed = { always = yes }
+	available = { has_mio_size > 5}
+	organization_modifier = {
+		military_industrial_organization_research_bonus = 0.2
+	}
+}
+
+mio_policy_NOR_general_permanent_industrial_revolution = {
+	icon = GFX_idea_eng_spirit_of_the_industrial_revolution
+	allowed = { 
+		always = no
+	}
+	available = { 
+		has_mio_size > 5
+		# put a country specific thing here
+		# STG only maybe?
+	}
+	organization_modifier = {
+		military_industrial_organization_research_bonus = 0.1
+	}
+
+	production_bonus = {
+		same_as_mio = {
+			production_resource_need_factor = -0.1
+		}
+	}
+}
+
diff --git a/common/military_industrial_organization/policies/eaw_policies.txt b/common/military_industrial_organization/policies/eaw_policies.txt
new file mode 100644
index 00000000000..681f9feb0c0
--- /dev/null
+++ b/common/military_industrial_organization/policies/eaw_policies.txt
@@ -0,0 +1,67 @@
+mio_policy_HIP_land_flechette_rifles = {
+	icon = GFX_idea_company_pile_of_guns
+	allowed = { 
+		
+		OR = {
+			has_mio_equipment_type = infantry
+			has_mio_equipment_type = magical_equipment
+		} 
+		owner = { original_tag = HIP } 	
+	}
+	available = {
+		has_mio_size > 5
+	}
+	visible = { 
+		owner = {
+			has_country_flag = HIP_project_salvo_succeeded
+		}
+	}
+	organization_modifier = {
+		military_industrial_organization_research_bonus = 0.1
+	}
+
+	equipment_bonus = {
+		same_as_mio = {
+			ap_attack = 0.25
+			soft_attack = 0.05
+			hard_attack = 0.25
+			defense = 0.05
+			breakthrough = 0.05
+			build_cost_ic = 0.25
+			reliability = -0.1
+		}
+	}
+}
+
+
+mio_policy_HIP_land_caseless_rifles = {
+	icon = GFX_idea_company_pile_of_guns
+	allowed = { 
+		
+		OR = {
+			has_mio_equipment_type = infantry
+			has_mio_equipment_type = magical_equipment
+		} 
+		owner = { original_tag = HIP } 	
+	}
+	available = {
+		has_mio_size > 5
+	}
+	visible = { 
+		owner = {
+			has_country_flag = HIP_project_salvo_succeeded
+		}
+	}
+	organization_modifier = {
+		military_industrial_organization_research_bonus = 0.1
+	}
+
+	equipment_bonus = {
+		same_as_mio = {
+			soft_attack = 0.05
+			defense = 0.05
+			breakthrough = 0.05
+		}
+	}
+}
+
diff --git a/common/modifiers/00_static_modifiers.txt b/common/modifiers/00_static_modifiers.txt
index fa81ad18550..f082e2f0125 100644
--- a/common/modifiers/00_static_modifiers.txt
+++ b/common/modifiers/00_static_modifiers.txt
@@ -191,7 +191,7 @@ compliance_effect_base = {
 compliance_effect = {
 	local_factories = 0.65
 	local_non_core_manpower = 0.18
-	local_resources = 0.60
+	local_resources = 0.65 #was 0.6
 }
 
 # On States that are owned by a non-core country
@@ -324,7 +324,7 @@ ITA_military_agreements = {
 stability_good_modifier = {
 	industrial_capacity_factory = 0.20
 	industrial_capacity_dockyard = 0.20
-	consumer_goods_factor = -0.05
+	consumer_goods_factor = -0.20
 	political_power_factor = 0.1
 }
 
diff --git a/common/names/00_names.txt b/common/names/00_names.txt
index c82e831f6ce..6a2122503b3 100644
--- a/common/names/00_names.txt
+++ b/common/names/00_names.txt
@@ -2172,7 +2172,7 @@ KAT = {
 		Darkclaw Grimwing Grimclaw Hardbeak Silverplume Beamclaw Stormborn Goldplume Whitefeather Starbill
 		Sunclaw Rainfeather Rockbeak Bluebeak Silverwing Blackfeather Sterbenclaw Windwing Lighttalon Sunwing
 	}
-	callsigns = { "Bubi" "Assi" "The Black Devil" "The Golden Knight Of Griffonia" "Dolfo" "Fighter of Griffenheim" "Petit Rouge" "Pritzl" "The Red Baron" "The Red Battle-flyer" "The Red Knight" "Reeste" }
+	callsigns = { "Bubi" "Assi" "The Black Devil" "The Golden Knight Of Griffonia" "Dolfo" "Fighter of Griffenheim" "Petit Rouge" "Pritzl" "The Red Baron" "The Red Battle-flyer" "The Red Knight" "Reeste" "Scheiss Vogel" }
 
 	prefix = o_unternehmen
 	operation = {
@@ -2262,7 +2262,7 @@ ANG = {
 		Darkclaw Grimwing Grimclaw Hardbeak Silverplume Beamclaw Stormborn Goldplume Whitefeather Starbill
 		Sunclaw Rainfeather Rockbeak Bluebeak Silverwing Blackfeather Sterbenclaw Windwing Lighttalon Sunwing
 	}
-	callsigns = { "Bubi" "Assi" "The Black Devil" "The Golden Knight Of Griffonia" "Dolfo" "Fighter of Griffenheim" "Petit Rouge" "Pritzl" "The Red Baron" "The Red Battle-flyer" "The Red Knight" "Reeste" }
+	callsigns = { "Bubi" "Assi" "The Black Devil" "The Golden Knight Of Griffonia" "Dolfo" "Fighter of Griffenheim" "Petit Rouge" "Pritzl" "The Red Baron" "The Red Battle-flyer" "The Red Knight" "Reeste" "Scheiss Vogel" }
 
 	prefix = o_unternehmen
 	operation = {
@@ -3745,7 +3745,6 @@ JEB = {
 	callsigns = { "Draco" "Fast" "Sparrow" "Ripper" "Sundance" "Twitch" "Farmer" "Weasel" "Target Practice" "Invisible" "The Mute" "Carpenter"}
 
 	operation = {
-		operation = {
 		0 = {
 			o_Hirondelle
 			o_Faucon
diff --git a/common/national_focus/00_titlebar_styles.txt b/common/national_focus/00_titlebar_styles.txt
new file mode 100644
index 00000000000..21b1a9f6480
--- /dev/null
+++ b/common/national_focus/00_titlebar_styles.txt
@@ -0,0 +1,18 @@
+style = {
+	name = default_style
+	default = yes
+
+	unavailable = GFX_focus_unavailable
+	completed = GFX_focus_completed
+	available = GFX_focus_can_start
+	current = GFX_focus_current
+}
+
+style = {
+	name = RIV_focus_style
+
+	unavailable = GFX_focus_unavailable_joint
+	completed = GFX_focus_completed_joint
+	available = GFX_focus_can_start_joint
+	current = GFX_focus_current_joint
+}
diff --git a/common/national_focus/AET.txt b/common/national_focus/AET.txt
index 7e78677de01..d12d7ac3e95 100644
--- a/common/national_focus/AET.txt
+++ b/common/national_focus/AET.txt
@@ -1095,6 +1095,21 @@ shared_focus = {
 		add_political_power = -30
 		add_equipment_to_stockpile = { type = infantry_equipment_0 amount = 800 producer = GRI }
 		add_equipment_to_stockpile = { type = artillery_equipment_1 amount = 200 producer = GRI }
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_equipment_subsidy = {
+				cic = 250
+				equipment_type = infantry_equipment
+				seller_tags = { GRI STW ANG FEA BRZ PYT YAL KAT ROU }
+			}
+			add_equipment_subsidy = {
+				cic = 250
+				equipment_type = artillery_equipment
+				seller_tags = { GRI STW ANG FEA BRZ PYT YAL KAT ROU }
+			}
+		}
 	}
 	search_filters = { FOCUS_FILTER_POLITICAL }
 }
@@ -1518,6 +1533,21 @@ shared_focus = {
 		add_political_power = -30
 		add_equipment_to_stockpile = { type = infantry_equipment_0 amount = 900 producer = JER }
 		add_equipment_to_stockpile = { type = artillery_equipment_1 amount = 100 producer = JER }
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_equipment_subsidy = {
+				cic = 250
+				equipment_type = infantry_equipment
+				seller_tags = { JER JFT VIN JRR JEB TRD FEZ AET HEL FLO POM }
+			}
+			add_equipment_subsidy = {
+				cic = 250
+				equipment_type = artillery_equipment
+				seller_tags = { JER JFT VIN JRR JEB TRD FEZ AET HEL FLO POM }
+			}
+		}
 	}
 	search_filters = { FOCUS_FILTER_POLITICAL }
 }
@@ -5270,6 +5300,16 @@ shared_focus = {
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus AET_army_5"
 		add_equipment_to_stockpile = { type = infantry_equipment_0 amount = 1500 producer = GRI }
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_equipment_subsidy = {
+				cic = 500
+				equipment_type = infantry_equipment
+				seller_tags = { GRI STW ANG FEA BRZ PYT YAL KAT ROU }
+			}
+		}
 		add_ideas = AET_recylce_muskets
 	}
 }
@@ -5931,11 +5971,30 @@ shared_focus = {
 	ai_will_do = { factor = 100 }
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus AET_air_6"
-		add_tech_bonus = {
-			name = special_forces_bonus
-			bonus = 1.0
-			uses = 1
-			category = para_tech
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_doctrine_cost_reduction = {
+				name = special_forces_bonus
+				cost_reduction = 0.75
+				uses = 1
+				category = cat_paratroopers_doctrine
+			}
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 0.75
+				uses = 1
+				category = para_tech
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 1.0
+				uses = 1
+				category = para_tech
+			}
 		}
 	}
 	search_filters = { FOCUS_FILTER_RESEARCH }
@@ -6770,6 +6829,16 @@ shared_focus = {
 				producer = CHN
 			}
 		}
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_equipment_subsidy = {
+				cic = 500
+				equipment_type = small_plane_airframe
+				seller_tags = { CHN CCN OLE PLB }
+			}
+		}
 		495 = {
 			add_building_construction = {
 				type = air_base
@@ -6819,6 +6888,16 @@ shared_focus = {
 			amount = 750
 			producer = CHN
 		}
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_equipment_subsidy = {
+				cic = 500
+				equipment_type = light_tank_chassis
+				seller_tags = { CHN CCN OLE PLB }
+			}
+		}
 		random_owned_controlled_state = {
 			limit = {
 				free_building_slots = {
diff --git a/common/national_focus/ANG.txt b/common/national_focus/ANG.txt
index 16200a8bee0..5e7b9e45c5c 100644
--- a/common/national_focus/ANG.txt
+++ b/common/national_focus/ANG.txt
@@ -393,6 +393,16 @@ shared_focus = {
 		army_experience = 15
 		add_equipment_to_stockpile = { type = infantry_equipment amount = 1000 producer = GRI }
 		custom_effect_tooltip = ANG_ranger_tp
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_equipment_subsidy = {
+				cic = 500
+				equipment_type = infantry_equipment
+				seller_tags = { GRI STW FEA BRZ PYT YAL KAT ROU }
+			}
+		}
 		hidden_effect = {
 			load_oob = "ANG_rangers_1"
 		}
@@ -500,6 +510,26 @@ shared_focus = {
 		add_equipment_to_stockpile = { type = infantry_equipment amount = 900 producer = GRI }
 		add_equipment_to_stockpile = { type = artillery_equipment amount = 300 producer = GRI }
 		add_equipment_to_stockpile = { type = support_equipment amount = 150 producer = GRI }
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_equipment_subsidy = {
+				cic = 250
+				equipment_type = infantry_equipment
+				seller_tags = { GRI STW FEA BRZ PYT YAL KAT ROU }
+			}
+			add_equipment_subsidy = {
+				cic = 250
+				equipment_type = artillery_equipment
+				seller_tags = { GRI STW FEA BRZ PYT YAL KAT ROU }
+			}
+			add_equipment_subsidy = {
+				cic = 250
+				equipment_type = support_equipment
+				seller_tags = { GRI STW FEA BRZ PYT YAL KAT ROU }
+			}
+		}
 	}
 	search_filters = { FOCUS_FILTER_INDUSTRY }
 }
@@ -595,16 +625,30 @@ shared_focus = {
 	}
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus ANG_special_forces"
-		add_tech_bonus = {
-			name = special_forces_bonus
-			bonus = 1.0
-			uses = 2
-			technology = paratroopers
-			technology = paratroopers2
-			technology = marines
-			technology = marines2
-			technology = tech_mountaineers
-			technology = tech_mountaineers2
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_doctrine_cost_reduction = {
+				name = special_forces_bonus
+				cost_reduction = 0.5
+				uses = 2
+				category = special_forces_doctrine
+			}
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 0.5
+				uses = 2
+				category = special_forces_tech
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 1.0
+				uses = 2
+				category = special_forces_tech
+			}
 		}
 	}
 	search_filters = { FOCUS_FILTER_RESEARCH }
@@ -1339,11 +1383,30 @@ shared_focus = {
 	}
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus ANG_paratrooper_project"
-		add_tech_bonus = {
-			name = paratrooper_bonus
-			bonus = 1.0
-			uses = 2
-			category = para_tech
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_doctrine_cost_reduction = {
+				name = special_forces_bonus
+				cost_reduction = 0.50
+				uses = 2
+				category = cat_paratroopers_doctrine
+			}
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 0.50
+				uses = 2
+				category = para_tech
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 1.0
+				uses = 2
+				category = para_tech
+			}
 		}
 	}
 	search_filters = { FOCUS_FILTER_RESEARCH }
@@ -1474,8 +1537,6 @@ shared_focus = {
 	}
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus ANG_electronics_research"
-		custom_effect_tooltip = available_designer
-		show_ideas_tooltip = ANG_electronics_co
 		add_tech_bonus = {
 			name = electronics_bonus
 			bonus = 1.0
@@ -2350,13 +2411,30 @@ shared_focus = {
 	}
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus ANG_marine_f"
-		add_tech_bonus = {
-			name = navy_bonus
-			bonus = 1.0
-			uses = 1
-			technology = marines
-			technology = marines2
-			technology = marines3
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_doctrine_cost_reduction = {
+				name = special_forces_bonus
+				cost_reduction = 0.75
+				uses = 1
+				category = cat_marines_doctrine
+			}
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 0.75
+				uses = 1
+				category = marine_tech
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 1.0
+				uses = 1
+				category = marine_tech
+			}
 		}
 	}
 	search_filters = { FOCUS_FILTER_RESEARCH }
diff --git a/common/national_focus/ARA.txt b/common/national_focus/ARA.txt
index efbb045d90b..33a8479d3ce 100644
--- a/common/national_focus/ARA.txt
+++ b/common/national_focus/ARA.txt
@@ -208,6 +208,16 @@ focus_tree = {
 					producer = WNG
 				}
 			}
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_equipment_subsidy = {
+					cic = 500
+					equipment_type = small_plane_airframe
+					seller_tags = { EQC WNG TAL JES FAL SIC MIT CYA }
+				}
+			}
 		}
 	}
 
@@ -1307,6 +1317,16 @@ focus_tree = {
 				category = artillery
 			}
 			add_equipment_to_stockpile = { type = artillery_equipment_1 amount = 500 producer = WNG }
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_equipment_subsidy = {
+					cic = 500
+					equipment_type = artillery_equipment
+					seller_tags = { EQC WNG TAL JES ARA FAL SIC MIT CYA FRN }
+				}
+			}
 		}
 		search_filters = { FOCUS_FILTER_RESEARCH }
 	}
@@ -1332,6 +1352,16 @@ focus_tree = {
 				category = infantry_weapons
 			}
 			add_equipment_to_stockpile = { type = infantry_equipment_1 amount = 1000 producer = GRF }
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_equipment_subsidy = {
+					cic = 500
+					equipment_type = infantry_equipment
+					seller_tags = { EQC WNG TAL JES ARA FAL SIC MIT CYA FRN }
+				}
+			}
 		}
 		search_filters = { FOCUS_FILTER_RESEARCH }
 	}
@@ -1462,11 +1492,30 @@ focus_tree = {
 		}
 		completion_reward = {
 			log = "[GetDateText]: [Root.GetName]: Focus ARA_spec_ops_program"
-			add_tech_bonus = {
-				name = special_forces_bonus
-				bonus = 1.0
-				uses = 2
-				category = special_forces_tech
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_doctrine_cost_reduction = {
+					name = special_forces_bonus
+					cost_reduction = 0.50
+					uses = 2
+					category = special_forces_doctrine
+				}
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 0.50
+					uses = 2
+					category = special_forces_tech
+				}
+			}
+			else = {
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 1.0
+					uses = 2
+					category = special_forces_tech
+				}
 			}
 		}
 		search_filters = { FOCUS_FILTER_RESEARCH }
diff --git a/common/national_focus/AVI.txt b/common/national_focus/AVI.txt
index 97fbbb05622..23d7fcef305 100644
--- a/common/national_focus/AVI.txt
+++ b/common/national_focus/AVI.txt
@@ -2676,16 +2676,30 @@ shared_focus = {
 
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus forces_that_are_special"
-		add_tech_bonus = {
-			name = special_forces_bonus
-			bonus = 1.0
-			uses = 1
-			technology = paratroopers
-			technology = paratroopers2
-			technology = marines
-			technology = marines2
-			technology = tech_mountaineers
-			technology = tech_mountaineers2
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_doctrine_cost_reduction = {
+				name = special_forces_bonus
+				cost_reduction = 0.75
+				uses = 1
+				category = special_forces_doctrine
+			}
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 0.75
+				uses = 1
+				category = special_forces_tech
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 1.0
+				uses = 1
+				category = special_forces_tech
+			}
 		}
 	}
 	search_filters = { FOCUS_FILTER_RESEARCH }
@@ -2937,13 +2951,30 @@ shared_focus = {
 
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus avian_air_assault_academy"
-		add_tech_bonus = {
-			name = paratrooper_bonus
-			bonus = 0.5
-			uses = 3
-			technology = paratroopers
-			technology = paratroopers2
-			technology = paratroopers3
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_doctrine_cost_reduction = {
+				name = special_forces_bonus
+				cost_reduction = 0.35
+				uses = 2
+				category = cat_paratroopers_doctrine
+			}
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 0.5
+				uses = 2
+				category = para_tech
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 0.5
+				uses = 3
+				category = para_tech
+			}
 		}
 	}
 	search_filters = { FOCUS_FILTER_RESEARCH }
@@ -4410,6 +4441,16 @@ shared_focus = {
 			amount = 1500
 			producer = GRI
 		}
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_equipment_subsidy = {
+				cic = 500
+				equipment_type = support_equipment
+				seller_tags = { GRI STW ANG FEA BRZ PYT YAL KAT ROU }
+			}
+		}
 	}
 }
 shared_focus = {
diff --git a/common/national_focus/BAK.txt b/common/national_focus/BAK.txt
index 48e3cd12d1f..b832bccfdf3 100644
--- a/common/national_focus/BAK.txt
+++ b/common/national_focus/BAK.txt
@@ -10039,8 +10039,24 @@ shared_focus = {
 	}
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus BAK_develop_car_industry"
-		custom_effect_tooltip = available_designer
-		show_ideas_tooltip = BAK_tailvoz
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}    
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = BAK_tailvoz_organization
+			mio:BAK_tailvoz_organization = {
+				add_mio_funds = 350
+			}
+			hidden_effect = {
+				add_ideas = BAK_tailvoz_hidden
+			}
+			custom_effect_tooltip = BAK_tailvoz_hidden_tt
+		}
+		else = {
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = BAK_tailvoz
+		}
 		random_owned_controlled_state = {
 			limit = {
 				free_building_slots = {
@@ -10101,8 +10117,20 @@ shared_focus = {
 	}
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus BAK_support_clothing_industry"
-		custom_effect_tooltip = available_designer
-		show_ideas_tooltip = BAK_lisica
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}    
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = BAK_lisica_organization
+			mio:BAK_lisica_organization = {
+				add_mio_funds = 350
+			}
+		}
+		else = {
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = BAK_lisica
+		}
 		random_owned_controlled_state = {
 			limit = {
 				free_building_slots = {
@@ -11690,16 +11718,32 @@ shared_focus = {
 	}
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus BAK_expand_department"
-		add_tech_bonus = {
-			name = special_forces_bonus
-			bonus = 1.0
-			uses = 2
-			technology = paratroopers
-			technology = paratroopers2
-			technology = paratroopers3
-			technology = tech_mountaineers
-			technology = tech_mountaineers2
-			technology = tech_mountaineers3
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_doctrine_cost_reduction = {
+				name = special_forces_bonus
+				cost_reduction = 0.5
+				uses = 2
+				category = special_forces_doctrine
+			}
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 0.5
+				uses = 2
+				category = para_tech
+				category = mountaineers_tech
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 1.0
+				uses = 2
+				category = para_tech
+				category = mountaineers_tech
+			}
 		}
 	}
 	search_filters = { FOCUS_FILTER_RESEARCH }
@@ -12592,13 +12636,30 @@ shared_focus = {
 	}
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus BAK_examine_the_marines"
-		add_tech_bonus = {
-			name = navy_bonus
-			bonus = 1.0
-			uses = 2
-			technology = marines
-			technology = marines2
-			technology = marines3
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_doctrine_cost_reduction = {
+				name = special_forces_bonus
+				cost_reduction = 0.5
+				uses = 2
+				category = cat_marines_doctrine
+			}
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 0.5
+				uses = 2
+				category = marine_tech
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 1.0
+				uses = 2
+				category = marine_tech
+			}
 		}
 	}
 	search_filters = { FOCUS_FILTER_RESEARCH }
diff --git a/common/national_focus/BAL.txt b/common/national_focus/BAL.txt
index e46a6fcb869..f5e6b349490 100644
--- a/common/national_focus/BAL.txt
+++ b/common/national_focus/BAL.txt
@@ -4463,6 +4463,16 @@ focus_tree = {
 				producer = SRS		
 				amount = 500
 			}
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_equipment_subsidy = {
+					cic = 500
+					equipment_type = infantry_equipment
+					seller_trigger = is_communist_seller_trigger
+				}
+			}
 		}
 		search_filters = { FOCUS_FILTER_RESEARCH }
 	}
diff --git a/common/national_focus/BAN.txt b/common/national_focus/BAN.txt
index e44b1228d59..0100ee6bd78 100644
--- a/common/national_focus/BAN.txt
+++ b/common/national_focus/BAN.txt
@@ -1043,6 +1043,16 @@ focus_tree = {
 		completion_reward = {
 			log = "[GetDateText]: [Root.GetName]: Focus BAN_imperial_rifles"
 			add_equipment_to_stockpile = { type = infantry_equipment amount = 1500 producer = LUS }
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_equipment_subsidy = {
+					cic = 500
+					equipment_type = infantry_equipment
+					seller_tags = { LUS BRF GRW GRU GRY }
+				}
+			}
 		}
 	}
 
@@ -3087,11 +3097,30 @@ focus_tree = {
 		}
 		completion_reward = {
 			log = "[GetDateText]: [Root.GetName]: Focus BAN_our_mountains"
-			add_tech_bonus = {
-				name = special_forces_bonus
-				bonus = 1.0
-				uses = 1
-				category = mountaineers_tech
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_doctrine_cost_reduction = {
+					name = special_forces_bonus
+					cost_reduction = 0.75
+					uses = 1
+					category = cat_mountaineers_doctrine
+				}
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 0.75
+					uses = 1
+					category = mountaineers_tech
+				}
+			}
+			else = {
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 1.0
+					uses = 1
+					category = mountaineers_tech
+				}
 			}
 		}
 		search_filters = { FOCUS_FILTER_RESEARCH }
@@ -3174,11 +3203,30 @@ focus_tree = {
 		}
 		completion_reward = {
 			log = "[GetDateText]: [Root.GetName]: Focus BAN_special_forces"
-			add_tech_bonus = {
-				name = special_forces_bonus
-				bonus = 1.0
-				uses = 2
-				category = special_forces_tech
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_doctrine_cost_reduction = {
+					name = special_forces_bonus
+					cost_reduction = 0.50
+					uses = 2
+					category = special_forces_doctrine
+				}
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 0.50
+					uses = 2
+					category = special_forces_tech
+				}
+			}
+			else = {
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 1.0
+					uses = 2
+					category = special_forces_tech
+				}
 			}
 		}
 		search_filters = { FOCUS_FILTER_RESEARCH }
diff --git a/common/national_focus/BAR.txt b/common/national_focus/BAR.txt
index 4f992fda155..dfdda280a1f 100644
--- a/common/national_focus/BAR.txt
+++ b/common/national_focus/BAR.txt
@@ -310,6 +310,16 @@ shared_focus = {
 	}
 	completion_reward = {
 		add_equipment_to_stockpile = { type = infantry_equipment_1 amount = 2000 producer = GRI }
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_equipment_subsidy = {
+				cic = 500
+				equipment_type = infantry_equipment
+				seller_tags = { GRI STW ANG FEA BRZ PYT YAL KAT ROU }
+			}
+		}
 	}
 	search_filters = { FOCUS_FILTER_ARMY_BONUS FOCUS_FILTER_RESEARCH }
 }
@@ -378,6 +388,16 @@ shared_focus = {
 			}
 		}
 		add_equipment_to_stockpile = { type = infantry_equipment_1 amount = 1000 producer = GRI }
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_equipment_subsidy = {
+				cic = 500
+				equipment_type = infantry_equipment
+				seller_tags = { GRI STW ANG FEA BRZ PYT YAL KAT ROU }
+			}
+		}
 	}
 	search_filters = { FOCUS_FILTER_INDUSTRY }
 }
@@ -2375,6 +2395,12 @@ shared_focus = { #main
 		}
 	}
 	completion_reward = {
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_potential_special_forces_tree = yes
+		}
 		if = {
 			limit = {
 				is_ai = yes
@@ -3213,12 +3239,12 @@ shared_focus = {
 					infantry = { x = 0 y = 1 }
 					infantry = { x = 0 y = 2 }
 					infantry = { x = 0 y = 3 }
-					infantry = { x = 0 y = 4 }
 					infantry = { x = 1 y = 0 }
 					infantry = { x = 1 y = 1 }
 					infantry = { x = 1 y = 2 }
 					infantry = { x = 1 y = 3 }
-					infantry = { x = 1 y = 4 }
+					infantry = { x = 2 y = 0 }
+					infantry = { x = 2 y = 1 }
 				}
 				support = {
 					military_police = { x = 0 y = 0 } 
@@ -4015,6 +4041,11 @@ shared_focus = {
 	completion_reward = {
 		set_country_flag = BAR_undead_science
 		custom_effect_tooltip = BAR_undead_science_unlock_advisors
+		hidden_effect = {
+			every_military_industrial_organization = {
+				set_mio_icon = GFX_idea_BAR_undead_advisor
+			}
+		}
 	}
 }
 shared_focus = { 
@@ -4140,11 +4171,30 @@ shared_focus = {
 		focus = BAR_undead_officers
 	}
 	completion_reward = {
-		add_tech_bonus = {
-			name = special_forces_bonus
-			bonus = 1.0
-			uses = 2
-			category = special_forces_tech
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_doctrine_cost_reduction = {
+				name = special_forces_bonus
+				cost_reduction = 0.50
+				uses = 2
+				category = special_forces_doctrine
+			}
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 0.50
+				uses = 2
+				category = special_forces_tech
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 1.0
+				uses = 2
+				category = special_forces_tech
+			}
 		}
 	}
 	search_filters = { FOCUS_FILTER_RESEARCH }
@@ -5170,11 +5220,30 @@ shared_focus = {
 		focus = BAR_demon_commando
 	}
 	completion_reward = {
-		add_tech_bonus = {
-			name = special_forces_bonus
-			bonus = 1
-			uses = 2
-			category = mountaineers_tech
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_doctrine_cost_reduction = {
+				name = special_forces_bonus
+				cost_reduction = 0.50
+				uses = 2
+				category = cat_mountaineers_doctrine
+			}
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 0.50
+				uses = 2
+				category = mountaineers_tech
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 1.0
+				uses = 2
+				category = mountaineers_tech
+			}
 		}
 	}
 	search_filters = { FOCUS_FILTER_RESEARCH }
@@ -5193,11 +5262,30 @@ shared_focus = {
 		focus = BAR_demon_commando
 	}
 	completion_reward = {
-		add_tech_bonus = {
-			name = special_forces_bonus
-			bonus = 1
-			uses = 2
-			category = marine_tech
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_doctrine_cost_reduction = {
+				name = special_forces_bonus
+				cost_reduction = 0.50
+				uses = 2
+				category = cat_marines_doctrine
+			}
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 0.50
+				uses = 2
+				category = marine_tech
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 1.0
+				uses = 2
+				category = marine_tech
+			}
 		}
 	}
 	search_filters = { FOCUS_FILTER_RESEARCH }
@@ -7625,11 +7713,30 @@ shared_focus = {
 		focus = BAR_viira_inf_magic_guns
 	}
 	completion_reward = {
-		add_tech_bonus = {
-			name = special_forces_bonus
-			category = mountaineers_tech
-			uses = 2
-			bonus = 1
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_doctrine_cost_reduction = {
+				name = special_forces_bonus
+				cost_reduction = 0.50
+				uses = 2
+				category = cat_mountaineers_doctrine
+			}
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 0.50
+				uses = 2
+				category = mountaineers_tech
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 1.0
+				uses = 2
+				category = mountaineers_tech
+			}
 		}
 	}
 	search_filters = { FOCUS_FILTER_RESEARCH }
@@ -8559,11 +8666,30 @@ shared_focus = {
 		focus = BAR_mass_rifles
 	}
 	completion_reward = {
-		add_tech_bonus = {
-			name = special_forces_bonus
-			category = mountaineers_tech
-			uses = 2
-			bonus = 1
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_doctrine_cost_reduction = {
+				name = special_forces_bonus
+				cost_reduction = 0.50
+				uses = 2
+				category = cat_mountaineers_doctrine
+			}
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 0.50
+				uses = 2
+				category = mountaineers_tech
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 1.0
+				uses = 2
+				category = mountaineers_tech
+			}
 		}
 	}
 	search_filters = { FOCUS_FILTER_RESEARCH }
@@ -9103,11 +9229,30 @@ shared_focus = {
 		focus = BAR_zone_defence
 	}
 	completion_reward = {
-		add_tech_bonus = {
-			name = special_forces_bonus
-			category = mountaineers_tech
-			uses = 1
-			bonus = 1
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_doctrine_cost_reduction = {
+				name = special_forces_bonus
+				cost_reduction = 0.75
+				uses = 1
+				category = cat_mountaineers_doctrine
+			}
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 0.75
+				uses = 1
+				category = mountaineers_tech
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 1.0
+				uses = 1
+				category = mountaineers_tech
+			}
 		}
 	}
 	search_filters = { FOCUS_FILTER_RESEARCH }
@@ -9571,12 +9716,12 @@ shared_focus = {
 						mountaineers = { x = 0 y = 1 }
 						mountaineers = { x = 0 y = 2 }
 						mountaineers = { x = 0 y = 3 }
-						mountaineers = { x = 0 y = 4 }
 						mountaineers = { x = 1 y = 0 }
 						mountaineers = { x = 1 y = 1 }
 						mountaineers = { x = 1 y = 2 }
 						mountaineers = { x = 1 y = 3 }
-						mountaineers = { x = 1 y = 4 }
+						mountaineers = { x = 2 y = 0 }
+						mountaineers = { x = 2 y = 1 }
 					}
 				}
 			}
@@ -9593,12 +9738,12 @@ shared_focus = {
 						infantry = { x = 0 y = 1 }
 						infantry = { x = 0 y = 2 }
 						infantry = { x = 0 y = 3 }
-						infantry = { x = 0 y = 4 }
 						infantry = { x = 1 y = 0 }
 						infantry = { x = 1 y = 1 }
 						infantry = { x = 1 y = 2 }
 						infantry = { x = 1 y = 3 }
-						infantry = { x = 1 y = 4 }
+						infantry = { x = 2 y = 0 }
+						infantry = { x = 2 y = 1 }
 					}
 				}
 			}
@@ -10074,11 +10219,30 @@ shared_focus = {
 		focus = BAR_cultist_experience
 	}
 	completion_reward = {
-		add_tech_bonus = {
-			name = special_forces_bonus
-			category = mountaineers_tech
-			uses = 2
-			bonus = 1
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_doctrine_cost_reduction = {
+				name = special_forces_bonus
+				cost_reduction = 0.50
+				uses = 2
+				category = cat_mountaineers_doctrine
+			}
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 0.50
+				uses = 2
+				category = mountaineers_tech
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 1.0
+				uses = 2
+				category = mountaineers_tech
+			}
 		}
 	}
 	search_filters = { FOCUS_FILTER_RESEARCH }
diff --git a/common/national_focus/BAT.txt b/common/national_focus/BAT.txt
index 3f19a668e06..4ad8647296c 100644
--- a/common/national_focus/BAT.txt
+++ b/common/national_focus/BAT.txt
@@ -3681,11 +3681,30 @@ shared_focus = {
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus BAT_the_lunar_marines"
 		custom_effect_tooltip = BAT_the_lunar_marines_tp
-		add_tech_bonus = {
-		    name = infantry_bonus
-			bonus = 3.0
-			uses = 1
-			category = marine_tech
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_doctrine_cost_reduction = {
+				name = special_forces_bonus
+				cost_reduction = 0.80
+				uses = 1
+				category = cat_marines_doctrine
+			}
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 1.0
+				uses = 1
+				category = marine_tech
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 3.0
+				uses = 1
+				category = marine_tech
+			}
 		}
 		hidden_effect = {
 		    load_oob = "BAT_ram_ranch"
@@ -7242,11 +7261,30 @@ shared_focus = {
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus BAT_the_lunar_marines"
 		custom_effect_tooltip = BAT_the_lunar_marines_tp
-		add_tech_bonus = {
-		    name = infantry_bonus
-			bonus = 3.0
-			uses = 1
-			category = marine_tech
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_doctrine_cost_reduction = {
+				name = special_forces_bonus
+				cost_reduction = 0.80
+				uses = 1
+				category = cat_marines_doctrine
+			}
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 1.0
+				uses = 1
+				category = marine_tech
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 3.0
+				uses = 1
+				category = marine_tech
+			}
 		}
 		hidden_effect = {
 		    load_oob = "BAT_ram_ranch"
@@ -9198,12 +9236,30 @@ shared_focus = {
 			}
 		}
 		else = {
-		    add_tech_bonus = {
-				name = paratrooper_bonus
-				bonus = 3.0
-				uses = 1
-				technology = paratroopers2
-				technology = paratroopers3
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_doctrine_cost_reduction = {
+					name = special_forces_bonus
+					cost_reduction = 0.80
+					uses = 1
+					category = cat_paratroopers_doctrine
+				}
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 1.0
+					uses = 1
+				category = para_tech
+				}
+			}
+			else = {
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 3.0
+					uses = 1
+					category = para_tech
+				}
 			}
 		}
 		hidden_effect = {
@@ -12139,11 +12195,30 @@ shared_focus = {
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus BAT_b6"
 		add_ideas = BAT_stirling_clique
-		add_tech_bonus = {
-			name = special_forces_bonus
-			bonus = 3.0
-			uses = 1
-			category = special_forces_tech
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_doctrine_cost_reduction = {
+				name = special_forces_bonus
+				cost_reduction = 0.80
+				uses = 1
+				category = special_forces_doctrine
+			}
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 1.0
+				uses = 1
+				category = special_forces_tech
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 3.0
+				uses = 1
+				category = special_forces_tech
+			}
 		}
 		hidden_effect = {
 		    add_to_variable = { 
@@ -12390,12 +12465,30 @@ shared_focus = {
 			}
 		}
 		else = {
-		    add_tech_bonus = {
-				name = paratrooper_bonus
-				bonus = 3.0
-				uses = 1
-				technology = paratroopers2
-				technology = paratroopers3
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_doctrine_cost_reduction = {
+					name = special_forces_bonus
+					cost_reduction = 0.80
+					uses = 1
+					category = cat_paratroopers_doctrine
+				}
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 1.0
+					uses = 1
+				category = para_tech
+				}
+			}
+			else = {
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 3.0
+					uses = 1
+					category = para_tech
+				}
 			}
 		}
 		hidden_effect = {
@@ -13561,11 +13654,30 @@ shared_focus = {
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus BAT_b30"
 		custom_effect_tooltip = BAT_the_lunar_marines_tp
-		add_tech_bonus = {
-		    name = infantry_bonus
-			bonus = 3.0
-			uses = 1
-			category = marine_tech
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_doctrine_cost_reduction = {
+				name = special_forces_bonus
+				cost_reduction = 0.80
+				uses = 1
+				category = cat_marines_doctrine
+			}
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 1.0
+				uses = 1
+				category = marine_tech
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 3.0
+				uses = 1
+				category = marine_tech
+			}
 		}
 		hidden_effect = {
 		    load_oob = "BAT_ram_ranch"
@@ -18263,11 +18375,30 @@ shared_focus = {
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus BAT_e31"
 		add_ideas = BAT_expanded_SAS
-		add_tech_bonus = {
-			name = special_forces_bonus
-			bonus = 3.0
-			uses = 1
-			category = special_forces_tech
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_doctrine_cost_reduction = {
+				name = special_forces_bonus
+				cost_reduction = 0.80
+				uses = 1
+				category = special_forces_doctrine
+			}
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 1.0
+				uses = 1
+				category = special_forces_tech
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 3.0
+				uses = 1
+				category = special_forces_tech
+			}
 		}
 	}
 	search_filters = { 
@@ -20416,11 +20547,30 @@ shared_focus = {
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus BAT_f30"
 		add_ideas = BAT_expanded_SAS
-		add_tech_bonus = {
-			name = special_forces_bonus
-			bonus = 3.0
-			uses = 1
-			category = special_forces_tech
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_doctrine_cost_reduction = {
+				name = special_forces_bonus
+				cost_reduction = 0.80
+				uses = 1
+				category = special_forces_doctrine
+			}
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 1.0
+				uses = 1
+				category = special_forces_tech
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 3.0
+				uses = 1
+				category = special_forces_tech
+			}
 		}
 	}
 	search_filters = { 
@@ -24699,11 +24849,30 @@ shared_focus = {
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus BAT_h27"
 		add_ideas = BAT_expanded_SAS
-		add_tech_bonus = {
-			name = special_forces_bonus
-			bonus = 3.0
-			uses = 1
-			category = special_forces_tech
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_doctrine_cost_reduction = {
+				name = special_forces_bonus
+				cost_reduction = 0.80
+				uses = 1
+				category = special_forces_doctrine
+			}
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 1.0
+				uses = 1
+				category = special_forces_tech
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 3.0
+				uses = 1
+				category = special_forces_tech
+			}
 		}
 	}
 	search_filters = { 
diff --git a/common/national_focus/BRF.txt b/common/national_focus/BRF.txt
index 8ac33b19854..2c313fe4b1a 100644
--- a/common/national_focus/BRF.txt
+++ b/common/national_focus/BRF.txt
@@ -3876,6 +3876,21 @@ focus_tree = {
 				uses = 1
 				category = cat_mobile_warfare
 			}
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}    
+				custom_effect_tooltip = available_mio_tt
+				show_mio_tooltip = BRF_medium_tank_manufacturer_organization
+				mio:BRF_medium_tank_manufacturer_organization = {
+					add_mio_size = 1
+					add_mio_funds = 650
+				}
+			}
+			else = {
+				custom_effect_tooltip = available_designer
+				show_ideas_tooltip = BRF_medium_tank_manufacturer
+			}
 		}
     search_filters = { FOCUS_FILTER_RESEARCH }
 		ai_will_do = {
@@ -4784,6 +4799,16 @@ focus_tree = {
 					producer = WNG
 				}
 			}
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_equipment_subsidy = {
+					cic = 500
+					equipment_type = small_plane_airframe
+					seller_tags = { EQC WNG TAL JES ARA FAL SIC MIT CYA }
+				}
+			}
 		}
 	}
 
@@ -5032,13 +5057,30 @@ focus_tree = {
 		}
 		completion_reward = {
 			log = "[GetDateText]: [Root.GetName]: Focus BRF_paratrooper_project"
-			add_tech_bonus = {
-				name = paratrooper_bonus
-				bonus = 0.25
-				uses = 2
-				technology = paratroopers
-				technology = paratroopers2
-				technology = paratroopers3
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_doctrine_cost_reduction = {
+					name = special_forces_bonus
+					cost_reduction = 0.5
+					uses = 1
+					category = cat_paratroopers_doctrine
+				}
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 0.25
+					uses = 2
+				category = para_tech
+				}
+			}
+			else = {
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 0.25
+					uses = 2
+					category = para_tech
+				}
 			}
 		}
 	}
diff --git a/common/national_focus/BRZ.txt b/common/national_focus/BRZ.txt
index 3174441b4d8..f54543a88df 100644
--- a/common/national_focus/BRZ.txt
+++ b/common/national_focus/BRZ.txt
@@ -1623,8 +1623,21 @@ focus_tree = {
 				country_event = { id = bronzehill.12 hours = 3 }
 			}
 			custom_effect_tooltip = if_they_accept
-			custom_effect_tooltip = available_designer
-			show_ideas_tooltip = BRZ_beakker
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}    
+				custom_effect_tooltip = available_mio_tt
+				show_mio_tooltip = BRZ_beakker_organization
+				mio:BRZ_beakker_organization = {
+					add_mio_size = 1
+					add_mio_funds = 500
+				}
+			}
+			else = {
+				custom_effect_tooltip = available_designer
+				show_ideas_tooltip = BRZ_beakker
+			}
 		}
 	}
 
diff --git a/common/national_focus/BRZ_shared.txt b/common/national_focus/BRZ_shared.txt
index 45f6061248c..5c2debbc3ee 100644
--- a/common/national_focus/BRZ_shared.txt
+++ b/common/national_focus/BRZ_shared.txt
@@ -644,8 +644,21 @@
 				uses = 2
 				category = motorized_equipment
 			}
-			custom_effect_tooltip = available_designer
-			show_ideas_tooltip = BRZ_baf
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}    
+				custom_effect_tooltip = available_mio_tt
+				show_mio_tooltip = BRZ_baf_organization
+				mio:BRZ_baf_organization = {
+					add_mio_size = 1
+					add_mio_funds = 650
+				}
+			}
+			else = {
+				custom_effect_tooltip = available_designer
+				show_ideas_tooltip = BRZ_baf
+			}
 		}
 
 	completion_reward = {
@@ -660,8 +673,21 @@
 				uses = 2
 				category = motorized_equipment
 			}
-			custom_effect_tooltip = available_designer
-			show_ideas_tooltip = BRZ_baf
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}    
+				custom_effect_tooltip = available_mio_tt
+				show_mio_tooltip = BRZ_baf_organization
+				mio:BRZ_baf_organization = {
+					add_mio_size = 1
+					add_mio_funds = 650
+				}
+			}
+			else = {
+				custom_effect_tooltip = available_designer
+				show_ideas_tooltip = BRZ_baf
+			}
 		}
 		search_filters = { FOCUS_FILTER_INDUSTRY FOCUS_FILTER_RESEARCH }
 	}
@@ -2053,11 +2079,30 @@
 
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus BRZ_high_altitued_training"
-			add_tech_bonus = {
-				name = BRZ_high_altitued_training
-				bonus = 1.0
-				uses = 2
-				category = mountaineers_tech
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_doctrine_cost_reduction = {
+					name = special_forces_bonus
+					cost_reduction = 0.50
+					uses = 2
+					category = cat_mountaineers_doctrine
+				}
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 0.50
+					uses = 2
+					category = mountaineers_tech
+				}
+			}
+			else = {
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 1.0
+					uses = 2
+					category = mountaineers_tech
+				}
 			}
 			add_tech_bonus = {
 				name = BRZ_high_altitued_training
@@ -2459,11 +2504,30 @@
 
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus BRZ_paratroopers"
-			add_tech_bonus = {
-				name = BRZ_paratroopers
-				bonus = 1.0
-				uses = 2
-				category = para_tech
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_doctrine_cost_reduction = {
+					name = special_forces_bonus
+					cost_reduction = 0.50
+					uses = 2
+					category = cat_paratroopers_doctrine
+				}
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 0.50
+					uses = 2
+					category = para_tech
+				}
+			}
+			else = {
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 1.0
+					uses = 2
+					category = para_tech
+				}
 			}
 		}
 		search_filters = { FOCUS_FILTER_RESEARCH }
diff --git a/common/national_focus/BUF.txt b/common/national_focus/BUF.txt
index da2a5f68142..a017c53b265 100644
--- a/common/national_focus/BUF.txt
+++ b/common/national_focus/BUF.txt
@@ -959,6 +959,21 @@ focus_tree = {
 			hidden_effect = {
 				increase_society_development_gradual = yes
 			}
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}    
+				custom_effect_tooltip = available_mio_tt
+				show_mio_tooltip = BUF_infantry_manufacturer_organization
+				mio:BUF_infantry_manufacturer_organization = {
+					add_mio_size = 2
+					add_mio_funds = 800
+				}
+			}
+			else = {
+				custom_effect_tooltip = available_designer
+				show_ideas_tooltip = BUF_infantry_manufacturer
+			}
 		}
 		search_filters = { FOCUS_FILTER_RESEARCH }
 	}
diff --git a/common/national_focus/CCN.txt b/common/national_focus/CCN.txt
index c0defe7feeb..525953be183 100644
--- a/common/national_focus/CCN.txt
+++ b/common/national_focus/CCN.txt
@@ -113,6 +113,16 @@ focus_tree = {
 			add_equipment_to_stockpile = { type = infantry_equipment_1 amount = 500 producer = CRY }
 			add_equipment_to_stockpile = { type = infantry_equipment_1 amount = 250 producer = STG }
 			add_equipment_to_stockpile = { type = infantry_equipment_1 amount = 250 producer = OLE }
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_equipment_subsidy = {
+					cic = 500
+					equipment_type = infantry_equipment
+					seller_tags = { EQS CRY NLR VAN SCS LSP NMS CES JUN BAL OLE STG STL TEM BUF }
+				}
+			}
 		}
 	}
 	focus = {
@@ -3160,12 +3170,32 @@ focus_tree = {
 
 		completion_reward = {
 			log = "[GetDateText]: [Root.GetName]: Focus CCN_Paratroopers"
-			add_tech_bonus = {
-				name = special_forces_bonus
-				bonus = 1.0
-				uses = 1
-				ahead_reduction = 2
-				category = para_tech
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_doctrine_cost_reduction = {
+					name = special_forces_bonus
+					cost_reduction = 0.75
+					uses = 1
+					category = cat_paratroopers_doctrine
+				}
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 0.75
+					uses = 1
+					ahead_reduction = 2
+					category = para_tech
+				}
+			}
+			else = {
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 1.0
+					uses = 1
+					ahead_reduction = 2
+					category = para_tech
+				}
 			}
 		}
 		search_filters = { FOCUS_FILTER_RESEARCH }
@@ -3907,11 +3937,30 @@ focus_tree = {
 				uses = 2
 				category = tp_tech
 			}
-			add_tech_bonus = {
-				name = marine_bonus
-				bonus = 0.5
-				uses = 1
-				category = marine_tech
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_doctrine_cost_reduction = {
+					name = special_forces_bonus
+					cost_reduction = 0.5
+					uses = 1
+					category = cat_marines_doctrine
+				}
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 0.5
+					uses = 1
+					category = marine_tech
+				}
+			}
+			else = {
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 0.5
+					uses = 1
+					category = marine_tech
+				}
 			}
 		}
 		search_filters = { FOCUS_FILTER_NAVY_BONUS FOCUS_FILTER_RESEARCH }
diff --git a/common/national_focus/CES.txt b/common/national_focus/CES.txt
index 83f0d65a9c7..82f764fd49e 100644
--- a/common/national_focus/CES.txt
+++ b/common/national_focus/CES.txt
@@ -159,8 +159,20 @@ shared_focus = {
 	y = 2
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus CES_naval_production"
-		custom_effect_tooltip = available_ship_designer
-		show_ideas_tooltip = stableside_naval_company
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}    
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = CES_stableside_naval_company_organization
+			mio:CES_stableside_naval_company_organization = {
+				add_mio_funds = 350
+			}
+		}
+		else = {
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = stableside_naval_company
+		}
 	}
 }
 shared_focus = {
diff --git a/common/national_focus/CHN.txt b/common/national_focus/CHN.txt
index d305cf84e6d..b41941f217d 100644
--- a/common/national_focus/CHN.txt
+++ b/common/national_focus/CHN.txt
@@ -2726,12 +2726,32 @@ focus_tree = {
 
 		completion_reward = {
 			log = "[GetDateText]: [Root.GetName]: Focus CHN_Paratroopers"
-			add_tech_bonus = {
-				name = special_forces_bonus
-				bonus = 1.0
-				uses = 1
-				ahead_reduction = 2
-				category = para_tech
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_doctrine_cost_reduction = {
+					name = special_forces_bonus
+					cost_reduction = 0.75
+					uses = 1
+					category = cat_paratroopers_doctrine
+				}
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 0.75
+					uses = 1
+					ahead_reduction = 2
+					category = para_tech
+				}
+			}
+			else = {
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 1.0
+					uses = 1
+					ahead_reduction = 2
+					category = para_tech
+				}
 			}
 		}
 		search_filters = { FOCUS_FILTER_RESEARCH }
@@ -4151,11 +4171,30 @@ focus_tree = {
 				uses = 2
 				category = tp_tech
 			}
-			add_tech_bonus = {
-				name = marine_bonus
-				bonus = 0.5
-				uses = 1
-				category = marine_tech
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_doctrine_cost_reduction = {
+					name = special_forces_bonus
+					cost_reduction = 0.5
+					uses = 1
+					category = cat_marines_doctrine
+				}
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 0.5
+					uses = 1
+					category = marine_tech
+				}
+			}
+			else = {
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 0.5
+					uses = 1
+					category = marine_tech
+				}
 			}
 		}
 		search_filters = { FOCUS_FILTER_NAVY_BONUS FOCUS_FILTER_RESEARCH }
@@ -5479,8 +5518,21 @@ focus_tree = {
 			log = "[GetDateText]: [Root.GetName]: Focus CHN_post_war_2_h"
 			country_event = { id = changelings_paxchrysalia.37 hours = 1 }
 			custom_effect_tooltip = MAN_line_break
-			custom_effect_tooltip = available_designer
-			show_ideas_tooltip = CHN_tank_sirius_mustang
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}    
+				custom_effect_tooltip = available_mio_tt
+				show_mio_tooltip = CHN_tank_sirius_mustang_organization
+				mio:CHN_tank_sirius_mustang_organization = {
+					add_mio_size = 2
+					add_mio_funds = 1200
+				}
+			}
+			else = {
+				custom_effect_tooltip = available_designer
+				show_ideas_tooltip = CHN_tank_sirius_mustang
+			}
 			custom_effect_tooltip = available_industrial_concern
 			show_ideas_tooltip = chn_oil_concern
 		}
diff --git a/common/national_focus/CRY.txt b/common/national_focus/CRY.txt
index cca64ab5388..28f1e973f83 100644
--- a/common/national_focus/CRY.txt
+++ b/common/national_focus/CRY.txt
@@ -1216,8 +1216,21 @@ shared_focus = {
 	y = 1
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus CRY_somammocomplex"
-		custom_effect_tooltip = available_designer
-		show_ideas_tooltip = sombra_arms
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}    
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = CRY_sombra_arms_organization
+			mio:CRY_sombra_arms_organization = {
+				add_mio_size = 1
+				add_mio_funds = 350
+			}
+		}
+		else = {
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = sombra_arms
+		}
 		three_random_arms_factory = yes
 	}
 }
@@ -1597,8 +1610,21 @@ shared_focus = {
 	y = 2
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus CRY_darkar"
-		custom_effect_tooltip = available_designer
-		show_ideas_tooltip = darkar_design
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}    
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = CRY_darkar_design_organization
+			mio:CRY_darkar_design_organization = {
+				add_mio_size = 1
+				add_mio_funds = 350
+			}
+		}
+		else = {
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = darkar_design
+		}
 	}
 
 }
@@ -1679,12 +1705,37 @@ shared_focus = {
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus CRY_somdustrial_concerns"
 		two_random_industrial_complex = yes
-		custom_effect_tooltip = available_designer
-		show_ideas_tooltip = citrum
-		custom_effect_tooltip = available_designer
-		show_ideas_tooltip = nyx
-		custom_effect_tooltip = available_designer
-		show_ideas_tooltip = ventus
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}    
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = CRY_citrum_organization
+			mio:CRY_citrum_organization = {
+				add_mio_size = 1
+				add_mio_funds = 200
+			}
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = CRY_nyx_organization
+			mio:CRY_nyx_organization = {
+				add_mio_size = 1
+				add_mio_funds = 200
+			}
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = CRY_ventus_organization
+			mio:CRY_ventus_organization = {
+				add_mio_size = 1
+				add_mio_funds = 200
+			}
+		}
+		else = {
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = citrum
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = nyx
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = ventus
+		}
 	}
 }
 shared_focus = {
@@ -2090,6 +2141,21 @@ shared_focus = {
 			uses = 1
 			category = industry
 		}
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}    
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = CRY_small_arms_concern_organization
+			mio:CRY_small_arms_concern_organization = {
+				add_mio_size = 1
+				add_mio_funds = 500
+			}
+		}
+		else = {
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = small_arms_concern
+		}
 	}
 	search_filters = { FOCUS_FILTER_RESEARCH }
 }
diff --git a/common/national_focus/CRY_NLR.txt b/common/national_focus/CRY_NLR.txt
index bb7a0d69e48..fda29c6338f 100644
--- a/common/national_focus/CRY_NLR.txt
+++ b/common/national_focus/CRY_NLR.txt
@@ -587,8 +587,21 @@ focus_tree = {
 		completion_reward = {
 			log = "[GetDateText]: [Root.GetName]: Focus CRY_NLR_weapons_for_cause"
 			two_random_arms_factory = yes
-			custom_effect_tooltip = available_designer
-			show_ideas_tooltip = magical_small_arms
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}    
+				custom_effect_tooltip = available_mio_tt
+				show_mio_tooltip = CRY_magical_small_arms_organization
+				mio:CRY_magical_small_arms_organization = {
+					add_mio_size = 1
+					add_mio_funds = 500
+				}
+			}
+			else = {
+				custom_effect_tooltip = available_designer
+				show_ideas_tooltip = magical_small_arms
+			}
 		}
 	}
 	focus = {
diff --git a/common/national_focus/CTH.txt b/common/national_focus/CTH.txt
index d8b4e5576eb..a7583bacc15 100644
--- a/common/national_focus/CTH.txt
+++ b/common/national_focus/CTH.txt
@@ -1601,6 +1601,21 @@ focus_tree = {
 				amount = 150 
 				producer = WNG 
 			}
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_equipment_subsidy = {
+					cic = 250
+					equipment_type = infantry_equipment
+					seller_tags = { HIP WIN ZUM WAR BAT TBK ZAR CGI MCW }
+				}
+				add_equipment_subsidy = {
+					cic = 250
+					equipment_type = artillery_equipment
+					seller_tags = { EQC WNG TAL JES ARA FAL SIC MIT CYA FRN }
+				}
+			}
 			add_tech_bonus = {
 				name = infantry_weapons_bonus
 				bonus = 1.0
@@ -1753,8 +1768,21 @@ focus_tree = {
 		available_if_capitulated = no
 
 		completion_reward = {
-			custom_effect_tooltip = available_designer
-			show_ideas_tooltip = CTH_heavy_tank_manufacturer
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}    
+				custom_effect_tooltip = available_mio_tt
+				show_mio_tooltip = CTH_heavy_tank_manufacturer_organization
+				mio:CTH_heavy_tank_manufacturer_organization = {
+					add_mio_size = 1
+					add_mio_funds = 600
+				}
+			}
+			else = {
+				custom_effect_tooltip = available_designer
+				show_ideas_tooltip = CTH_heavy_tank_manufacturer
+			}
 			set_country_flag = CTH_heavy_tank_manufacturer_unlocked
 			add_tech_bonus = {
 				name = BRF_armor_research
@@ -1890,11 +1918,30 @@ focus_tree = {
 				CTH_marines_tech = 1
 			}
 			custom_effect_tooltip = CTH_marines_tech_tt
-			add_tech_bonus = {
-				name = special_forces_bonus
-				bonus = 1.0
-				uses = 1
-				category = marine_tech
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_doctrine_cost_reduction = {
+					name = special_forces_bonus
+					cost_reduction = 0.75
+					uses = 1
+					category = cat_marines_doctrine
+				}
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 0.75
+					uses = 1
+					category = marine_tech
+				}
+			}
+			else = {
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 1.0
+					uses = 1
+					category = marine_tech
+				}
 			}
 		}
 	}
@@ -6531,11 +6578,30 @@ focus_tree = {
 				CTH_marines_tech = 1
 			}
 			custom_effect_tooltip = CTH_marines_tech_tt
-			add_tech_bonus = {
-				name = special_forces_bonus
-				bonus = 1.0
-				uses = 1
-				category = marine_tech
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_doctrine_cost_reduction = {
+					name = special_forces_bonus
+					cost_reduction = 0.75
+					uses = 1
+					category = cat_marines_doctrine
+				}
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 0.75
+					uses = 1
+					category = marine_tech
+				}
+			}
+			else = {
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 1.0
+					uses = 1
+					category = marine_tech
+				}
 			}
 			CTH_increase_navy_dominance = yes
 		}
@@ -10448,11 +10514,30 @@ focus_tree = {
 					add_idea = CTC_popular_army_3_idea
 				}
 			}
-			add_tech_bonus = {
-				name = special_forces_bonus
-				bonus = 1.0
-				uses = 2
-				category = special_forces_tech
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_doctrine_cost_reduction = {
+					name = special_forces_bonus
+					cost_reduction = 0.50
+					uses = 2
+					category = special_forces_doctrine
+				}
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 0.50
+					uses = 2
+					category = special_forces_tech
+				}
+			}
+			else = {
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 1.0
+					uses = 2
+					category = special_forces_tech
+				}
 			}
 		}
 	}
@@ -11302,6 +11387,16 @@ focus_tree = {
 				amount = 1500
 				producer = MCW
 			}
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_equipment_subsidy = {
+					cic = 500
+					equipment_type = infantry_equipment
+					seller_tags = { HIP WIN ZUM WAR BAT TBK ZAR CGI MCW }
+				}
+			}
 		}
 	}
 	focus = {
diff --git a/common/national_focus/CTH_Monzano.txt b/common/national_focus/CTH_Monzano.txt
index 88314b97a74..abc59769b60 100644
--- a/common/national_focus/CTH_Monzano.txt
+++ b/common/national_focus/CTH_Monzano.txt
@@ -939,6 +939,10 @@ shared_focus = {
 	available_if_capitulated = no
 
 	completion_reward = {
+		if = {
+			limit = {NOT = {has_tech = tech_trucks }}
+			set_technology = {tech_trucks = 1}
+		}
 		if = {
 			limit = {NOT = {has_tech = motorised_infantry}}
 			set_technology = {motorised_infantry = 1}
diff --git a/common/national_focus/CTL.txt b/common/national_focus/CTL.txt
index c604e3bd47d..3c8d2887389 100644
--- a/common/national_focus/CTL.txt
+++ b/common/national_focus/CTL.txt
@@ -927,11 +927,30 @@ shared_focus = {
 		add_ideas = CTL_marines_idea
 		custom_effect_tooltip = CTL_marines_tt
 		country_event = { hours = 12 id = chital.177 }
-		add_tech_bonus = {
-			name = special_forces_bonus
-			bonus = 0.5
-			uses = 1
-			category = marine_tech
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_doctrine_cost_reduction = {
+				name = special_forces_bonus
+				cost_reduction = 0.5
+				uses = 1
+				category = cat_marines_doctrine
+			}
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 0.5
+				uses = 1
+				category = marine_tech
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 0.5
+				uses = 1
+				category = marine_tech
+			}
 		}
 		hidden_effect = {
 			if = {
@@ -1028,8 +1047,21 @@ shared_focus = {
 	relative_position_id = CTL_restoring_our_pride
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus CTL_naval_designer"
-		custom_effect_tooltip = available_designer
-		show_ideas_tooltip = CTL_special_naval_manufacturer
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}    
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = CTL_special_naval_manufacturer_organization
+			mio:CTL_special_naval_manufacturer_organization = {
+				add_mio_size = 1
+				add_mio_funds = 600
+			}
+		}
+		else = {
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = CTL_special_naval_manufacturer
+		}
 		MCW = {
 			add_opinion_modifier = {
 				target = CTL
@@ -1405,8 +1437,21 @@ shared_focus = {
 	prerequisite = { focus = CTL_mass_assault_lol_funni focus = CTL_omg_epic_kemerskai_tactics }
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus CTL_depoliticize_the_army"
-		custom_effect_tooltip = available_designer
-		show_ideas_tooltip = CTL_titan_infantry
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}    
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = CTL_titan_infantry_organization
+			mio:CTL_titan_infantry_organization = {
+				add_mio_size = 1
+				add_mio_funds = 350
+			}
+		}
+		else = {
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = CTL_titan_infantry
+		}
 		add_timed_idea = {
 			idea = CTL_purging_army
 			days = 720
@@ -1457,17 +1502,57 @@ shared_focus = {
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus CTL_special_forces_divisions"
 		one_random_arms_factory = yes
-		add_tech_bonus = {
-			name = BRZ_high_altitued_training
-			bonus = 1.0
-			uses = 1
-			category = mountaineers_tech
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_doctrine_cost_reduction = {
+				name = special_forces_bonus
+				cost_reduction = 0.75
+				uses = 1
+				category = cat_mountaineers_doctrine
+			}
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 0.75
+				uses = 1
+				category = mountaineers_tech
+			}
 		}
-		add_tech_bonus = {
-			name = STW_valschermtroepen
-			bonus = 1.0
-			uses = 1
-			category = para_tech
+		else = {
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 1.0
+				uses = 1
+				category = mountaineers_tech
+			}
+		}
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_doctrine_cost_reduction = {
+				name = special_forces_bonus
+				cost_reduction = 0.75
+				uses = 1
+				category = cat_paratroopers_doctrine
+			}
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 0.75
+				uses = 1
+				ahead_reduction = 2
+				category = para_tech
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 1.0
+				uses = 1
+				ahead_reduction = 2
+				category = para_tech
+			}
 		}
 	}
 }
@@ -1540,6 +1625,32 @@ shared_focus = {
 		log = "[GetDateText]: [Root.GetName]: Focus CTL_create_the_chitali_air_force"
 		air_experience = 10
 		add_ideas = CTL_air_force_creation
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}    
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = CTL_valdeland_munitions_factory_organization
+			mio:CTL_valdeland_munitions_factory_organization = {
+				add_mio_funds = 300
+			}
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = CTL_shreenauth_aviation_organization
+			mio:CTL_shreenauth_aviation_organization = {
+				add_mio_funds = 300
+			}
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = CTL_bhaat_aircraft_organization
+			mio:CTL_bhaat_aircraft_organization = {
+				add_mio_funds = 300
+			}
+		}
+		else = {
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = CTL_valdeland_munitions_factory
+			show_ideas_tooltip = CTL_shreenauth_aviation
+			show_ideas_tooltip = CTL_bhaat_aircraft
+		}
 	}
 }
 shared_focus = {
@@ -1554,8 +1665,20 @@ shared_focus = {
 	prerequisite = { focus = CTL_create_the_chitali_air_force }
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus CTL_gadra_family_industrial_plans"
-		custom_effect_tooltip = available_designer
-		show_ideas_tooltip = CTL_air_gadra
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}    
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = CTL_air_gadra_organization
+			mio:CTL_air_gadra_organization = {
+				add_mio_funds = 600
+			}
+		}
+		else = {
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = CTL_air_gadra
+		}
 		one_random_arms_factory = yes
 		random_owned_state = {
 			add_extra_state_shared_building_slots = 2
@@ -1694,6 +1817,16 @@ shared_focus = {
 				producer = MCW
 			}
 		}
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_equipment_subsidy = {
+				cic = 500
+				equipment_type = small_plane_airframe
+				seller_tags = { HIP WIN CTH ZUM WAR BAT TBK ZAR CGI MCW }
+			}
+		}
 	}
 }
 shared_focus = {
@@ -1840,8 +1973,21 @@ shared_focus = {
 	prerequisite = { focus = CTL_jakubs_obsession focus = CTL_the_tried_and_tested }
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus CTL_entrench_jakobite_control"
-		custom_effect_tooltip = available_designer
-		show_ideas_tooltip = CTL_royal_armory_of_chital 
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}    
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = CTL_royal_armory_of_chital_organization
+			mio:CTL_royal_armory_of_chital_organization = {
+				add_mio_size = 1
+				add_mio_funds = 500
+			}
+		}
+		else = {
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = CTL_royal_armory_of_chital
+		}
 		two_random_arms_factory = yes
 		one_random_arms_factory = yes
 	}
@@ -1972,7 +2118,7 @@ shared_focus = {
 		log = "[GetDateText]: [Root.GetName]: Focus CTL_reopen_the_benjen_iv_industrial_bureau"
 		country_event = chital.67
 		custom_effect_tooltip = CTL_we_industry_now_tt
-		set_variable = { CTL_ib_consumer_goods_factor = -0.01 }
+		set_variable = { CTL_ib_consumer_goods_factor = -0.02 }
 		set_variable = { CTL_ib_production_factory_max_efficiency_factor = 0.03 }
 		set_variable = { CTL_ib_industrial_capacity_factory_factor = 0.03 }
 		set_variable = { CTL_ib_political_power_factor = -0.15 }
@@ -2297,7 +2443,7 @@ shared_focus = {
 	}
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus CTL_freedom_in_markets"
-		subtract_from_variable = { CTL_ib_consumer_goods_factor = 0.04 }
+		subtract_from_variable = { CTL_ib_consumer_goods_factor = 0.08 }
 		subtract_from_variable = { CTL_ib_production_factory_max_efficiency_factor = 0.06 }
 		custom_effect_tooltip = CTL_free_market_focus_tt
 	}
@@ -2327,7 +2473,7 @@ shared_focus = {
 	}
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus CTL_minimum_wage"
-		add_to_variable = { CTL_ib_consumer_goods_factor = 0.03 }
+		add_to_variable = { CTL_ib_consumer_goods_factor = 0.06 }
 		add_to_variable = { CTL_ib_production_factory_max_efficiency_factor = 0.1 }
 		custom_effect_tooltip = CTL_minimum_wage_focus_tt
 	}
@@ -2351,7 +2497,7 @@ shared_focus = {
 	}
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus CTL_self_sufficiency_always"
-		subtract_from_variable = { CTL_ib_consumer_goods_factor = 0.03 }
+		subtract_from_variable = { CTL_ib_consumer_goods_factor = 0.06 }
 		custom_effect_tooltip = CTL_trade_tt
 		random_owned_state = {
 			add_resource = {
@@ -2388,7 +2534,7 @@ shared_focus = {
 	}
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus CTL_restart_the_eastern_trade_routes"
-		subtract_from_variable = { CTL_ib_consumer_goods_factor = 0.03 }
+		subtract_from_variable = { CTL_ib_consumer_goods_factor = 0.06 }
 		custom_effect_tooltip = CTL_trade_tt
 		random_owned_state = {
 			add_resource = {
@@ -2433,7 +2579,7 @@ shared_focus = {
 	}
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus CTL_aid_from_the_macawians"
-		subtract_from_variable = { CTL_ib_consumer_goods_factor = 0.03 }
+		subtract_from_variable = { CTL_ib_consumer_goods_factor = 0.06 }
 		custom_effect_tooltip = CTL_trade_tt
 		random_owned_state = {
 			add_resource = {
@@ -2496,7 +2642,7 @@ shared_focus = {
 	}
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus CTL_protect_employers"
-		subtract_from_variable = { CTL_ib_consumer_goods_factor = 0.03 }
+		subtract_from_variable = { CTL_ib_consumer_goods_factor = 0.06 }
 		add_to_variable = { CTL_ib_political_power_factor = 0.1 }
 		custom_effect_tooltip = CTL_employers_first_tt
 	}
diff --git a/common/national_focus/CVA.txt b/common/national_focus/CVA.txt
index 4d75c4f3e45..57fe3389834 100644
--- a/common/national_focus/CVA.txt
+++ b/common/national_focus/CVA.txt
@@ -1193,6 +1193,16 @@ shared_focus = {
 			amount = 2000 
 			producer = WNG 
 		}
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_equipment_subsidy = {
+				cic = 500
+				equipment_type = infantry_equipment
+				seller_tags = { EQC WNG TAL JES ARA FAL SIC MIT CYA FRN }
+			}
+		}
 	}
 	search_filters = { 
 	    FOCUS_FILTER_ARMY_BONUS
@@ -11319,8 +11329,21 @@ shared_focus = {
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus CVA_CTH_kesslers_cars"
 		one_random_arms_factory = yes
-		custom_effect_tooltip = available_designer
-		show_ideas_tooltip = CVA_CTH_kesslers_cars_designer
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}    
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = CVA_CTH_kesslers_cars_designer_organization
+			mio:CVA_CTH_kesslers_cars_designer_organization = {
+				add_mio_size = 1
+				add_mio_funds = 350
+			}
+		}
+		else = {
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = CVA_CTH_kesslers_cars_designer
+		}
 		hidden_effect = {
 		    country_event = {
 				id = colthaginian_federation.34
@@ -12595,6 +12618,16 @@ shared_focus = {
 				producer = STG
 			}
 		}
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_equipment_subsidy = {
+				cic = 500
+				equipment_type = small_plane_airframe
+				seller_tags = { YAK JAK GRF GFF PNG STG STL }
+			}
+		}
 	}
 	search_filters = { 
 	    FOCUS_FILTER_AIRFORCE_BONUS 
@@ -12624,8 +12657,21 @@ shared_focus = {
 			uses = 2
 			category = cat_light_armor
 		}
-		custom_effect_tooltip = available_designer
-		show_ideas_tooltip = CVA_CTH_AVA_tanks
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}    
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = CVA_CTH_AVA_tanks_organization
+			mio:CVA_CTH_AVA_tanks_organization = {
+				add_mio_size = 1
+				add_mio_funds = 500
+			}
+		}
+		else = {
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = CVA_CTH_AVA_tanks
+		}
 	}
 	search_filters = { 
 	    FOCUS_FILTER_ARMY_BONUS 
@@ -12774,12 +12820,30 @@ shared_focus = {
 			}
 		}
 		else = {
-		    add_tech_bonus = {
-				name = paratrooper_bonus
-				bonus = 3.0
-				uses = 1
-				technology = paratroopers2
-				technology = paratroopers3
+		    if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_doctrine_cost_reduction = {
+					name = special_forces_bonus
+					cost_reduction = 0.80
+					uses = 1
+					category = cat_paratroopers_doctrine
+				}
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 1.0
+					uses = 1
+				category = para_tech
+				}
+			}
+			else = {
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 3.0
+					uses = 1
+					category = para_tech
+				}
 			}
 		}
 		hidden_effect = {
@@ -16734,8 +16798,21 @@ shared_focus = {
 				amount = 500
 			}
 		}
+		else_if = {
+			limit = {
+			    has_tech = tech_trucks
+		    }
+			set_technology = {
+				motorised_infantry = 1
+			}
+			add_equipment_to_stockpile = {
+				type = motorized_equipment
+				amount = 500
+			}
+		}
 		else = {
 			set_technology = {
+				tech_trucks = 1
 				motorised_infantry = 1
 			}
 			add_equipment_to_stockpile = {
@@ -17789,11 +17866,30 @@ shared_focus = {
 	}
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus CVA_CTH_2_d17"
-		add_tech_bonus = {
-			name = navy_bonus
-			bonus = 1.0
-			uses = 2
-			category = marine_tech
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_doctrine_cost_reduction = {
+				name = special_forces_bonus
+				cost_reduction = 0.50
+				uses = 2
+				category = cat_marines_doctrine
+			}
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 0.50
+				uses = 2
+				category = marine_tech
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 1.0
+				uses = 2
+				category = marine_tech
+			}
 		}
 		if = {
 			limit = {
@@ -21088,11 +21184,30 @@ shared_focus = {
 				add_ideas = CVA_CTH_special_forces_command_pragmatist
 			}
 		}
-        add_tech_bonus = {
-			name = special_forces_bonus
-			bonus = 1.0
-			uses = 2
-			category = special_forces_tech
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_doctrine_cost_reduction = {
+				name = special_forces_bonus
+				cost_reduction = 0.50
+				uses = 2
+				category = special_forces_doctrine
+			}
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 0.50
+				uses = 2
+				category = special_forces_tech
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 1.0
+				uses = 2
+				category = special_forces_tech
+			}
 		}
 	}
 	search_filters = { 
@@ -21150,7 +21265,6 @@ shared_focus = {
 					add_resource = {
 						type = aluminium
 						amount = 12
-						state = 703
 					}
 				}
 			}
diff --git a/common/national_focus/CYA.txt b/common/national_focus/CYA.txt
index 38780a58250..a1e19c5b524 100644
--- a/common/national_focus/CYA.txt
+++ b/common/national_focus/CYA.txt
@@ -159,11 +159,11 @@ shared_focus = {
 				name = "Matrosenbrigade"
 				priority = 0
 					regiments = {
-					infantry = { x = 0 y = 0 }
-					infantry = { x = 0 y = 1 }
-					infantry = { x = 0 y = 2 }
-					infantry = { x = 0 y = 3 }
-					infantry = { x = 0 y = 4 }
+						infantry = { x = 0 y = 0 }
+						infantry = { x = 0 y = 1 }
+						infantry = { x = 0 y = 2 }
+						infantry = { x = 0 y = 3 }
+						infantry = { x = 1 y = 0 }
 				}
 			}
 	
@@ -2014,11 +2014,30 @@ shared_focus = {
 
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus CYA_seebataillon"
-		add_tech_bonus = {
-			name = marine_bonus
-			bonus = 0.5
-			uses = 2
-			category = marine_tech
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_doctrine_cost_reduction = {
+				name = special_forces_bonus
+				cost_reduction = 0.35
+				uses = 2
+				category = cat_marines_doctrine
+			}
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 0.50
+				uses = 2
+				category = marine_tech
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 0.5
+				uses = 2
+				category = marine_tech
+			}
 		}
 		custom_effect_tooltip = cya_spawn_marine_tt
 		hidden_effect = {
@@ -2076,11 +2095,30 @@ shared_focus = {
 			uses = 2
 			category = tp_tech
 		}
-		add_tech_bonus = {
-			name = special_forces_bonus
-			bonus = 0.75
-			uses = 1
-			category = para_tech
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_doctrine_cost_reduction = {
+				name = special_forces_bonus
+				cost_reduction = 0.5
+				uses = 1
+				category = cat_paratroopers_doctrine
+			}
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 0.5
+				uses = 1
+				category = para_tech
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 0.75
+				uses = 1
+				category = para_tech
+			}
 		}
 	}
 	search_filters = { FOCUS_FILTER_NAVY_BONUS FOCUS_FILTER_RESEARCH }
@@ -5785,8 +5823,21 @@ shared_focus = {
 
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus CYA_horst_arms"
-		custom_effect_tooltip = available_designer
-		show_ideas_tooltip = horst_arms
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}    
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = CYA_horst_arms_organization
+			mio:CYA_horst_arms_organization = {
+				add_mio_size = 1
+				add_mio_funds = 500
+			}
+		}
+		else = {
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = horst_arms
+		}
 	}
 }
 
@@ -6216,7 +6267,7 @@ shared_focus = {
 					infantry = { x = 0 y = 1 }
 					infantry = { x = 0 y = 2 }
 					infantry = { x = 0 y = 3 }
-					infantry = { x = 0 y = 4 }
+					infantry = { x = 1 y = 0 }
 				}
 			}
 	
diff --git a/common/national_focus/DED_aprilfool.txt b/common/national_focus/DED_aprilfool.txt
index 80340e48a9f..e1b1b8eca26 100644
--- a/common/national_focus/DED_aprilfool.txt
+++ b/common/national_focus/DED_aprilfool.txt
@@ -326,12 +326,12 @@ shared_focus = {
 						infantry = { x = 0 y = 1 }
 						infantry = { x = 0 y = 2 }
 						infantry = { x = 0 y = 3 }
-						infantry = { x = 0 y = 4 }
 						infantry = { x = 1 y = 0 }
 						infantry = { x = 1 y = 1 }
 						infantry = { x = 1 y = 2 }
 						infantry = { x = 1 y = 3 }
-						infantry = { x = 1 y = 4 }
+						infantry = { x = 2 y = 0 }
+						infantry = { x = 2 y = 1 }
 					}
 					support = {
 						dark_mages = { x = 0 y = 0 }
@@ -533,22 +533,22 @@ shared_focus = {
 						infantry = { x = 0 y = 1 }
 						infantry = { x = 0 y = 2 }
 						infantry = { x = 0 y = 3 }
-						infantry = { x = 0 y = 4 }
 						infantry = { x = 1 y = 0 }
 						infantry = { x = 1 y = 1 }
 						infantry = { x = 1 y = 2 }
 						infantry = { x = 1 y = 3 }
-						infantry = { x = 1 y = 4 }
 						infantry = { x = 2 y = 0 }
 						infantry = { x = 2 y = 1 }
 						infantry = { x = 2 y = 2 }
 						infantry = { x = 2 y = 3 }
-						infantry = { x = 2 y = 4 }
 						infantry = { x = 3 y = 0 }
 						infantry = { x = 3 y = 1 }
 						infantry = { x = 3 y = 2 }
 						infantry = { x = 3 y = 3 }
-						infantry = { x = 3 y = 4 }
+						infantry = { x = 4 y = 0 }
+						infantry = { x = 4 y = 1 }
+						infantry = { x = 4 y = 2 }
+						infantry = { x = 4 y = 3 }
 					}
 				}
 			}
@@ -1234,12 +1234,12 @@ shared_focus = {
 						bone_abomination = { x = 0 y = 1 }
 						bone_abomination = { x = 0 y = 2 }
 						bone_abomination = { x = 0 y = 3 }
-						bone_abomination = { x = 0 y = 4 }
 						bone_abomination = { x = 1 y = 0 }
 						bone_abomination = { x = 1 y = 1 }
 						bone_abomination = { x = 1 y = 2 }
 						bone_abomination = { x = 1 y = 3 }
-						bone_abomination = { x = 1 y = 4 }
+						bone_abomination = { x = 2 y = 0 }
+						bone_abomination = { x = 2 y = 1 }
 					}
 				}
 			}
@@ -1504,7 +1504,7 @@ shared_focus = {
 					infantry = { x = 0 y = 1 }
 					infantry = { x = 0 y = 2 }
 					infantry = { x = 0 y = 3 }
-					infantry = { x = 0 y = 4 }
+					infantry = { x = 1 y = 0 }
 				}
 			}
 			random_owned_controlled_state = {
@@ -1922,7 +1922,7 @@ shared_focus = {
 		}
 		set_country_leader_description = {
 			ideology = fascism
-			name = ""
+			desc = ""
 		}
 		hidden_effect = {
 			set_cosmetic_tag = DED_VAM
@@ -2033,12 +2033,12 @@ shared_focus = {
 					infantry = { x = 0 y = 1 }
 					infantry = { x = 0 y = 2 }
 					infantry = { x = 0 y = 3 }
-					infantry = { x = 0 y = 4 }
 					infantry = { x = 1 y = 0 }
 					infantry = { x = 1 y = 1 }
 					infantry = { x = 1 y = 2 }
 					infantry = { x = 1 y = 3 }
-					infantry = { x = 1 y = 4 }
+					infantry = { x = 2 y = 0 }
+					infantry = { x = 2 y = 1 }			
 				}
 			}
 
@@ -2382,7 +2382,7 @@ shared_focus = {
 		}
 		set_country_leader_description = {
 			ideology = fascism
-			name = ""
+			desc = ""
 		}
 		country_event = { id = dedaprilfool.216 days = 1 }
 	}
@@ -2466,11 +2466,30 @@ shared_focus = {
 	y = 1
 
 	completion_reward = {
-		add_tech_bonus = {
-			name = special_forces_bonus
-			bonus = 2
-			uses = 3
-			category = special_forces_tech
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_doctrine_cost_reduction = {
+				name = special_forces_bonus
+				cost_reduction = 0.50
+				uses = 3
+				category = special_forces_doctrine
+			}
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 0.75
+				uses = 3
+				category = special_forces_tech
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 2.0
+				uses = 3
+				category = special_forces_tech
+			}
 		}
 		add_equipment_to_stockpile = { type = melee_equipment_0 amount = 1500 producer = DED }
 
diff --git a/common/national_focus/DMT.txt b/common/national_focus/DMT.txt
index 0c0d6c95206..ae4f57e1d14 100644
--- a/common/national_focus/DMT.txt
+++ b/common/national_focus/DMT.txt
@@ -2937,11 +2937,30 @@ focus_tree = {
 
 		completion_reward = {
 			log = "[GetDateText]: [Root.GetName]: Focus DMT_our_mountains"
-			add_tech_bonus = {
-				name = DMT_our_mountains
-				bonus = 3
-				uses = 1
-				category = mountaineers_tech
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_doctrine_cost_reduction = {
+					name = special_forces_bonus
+					cost_reduction = 0.80
+					uses = 1
+					category = cat_mountaineers_doctrine
+				}
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 1.0
+					uses = 1
+					category = mountaineers_tech
+				}
+			}
+			else = {
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 3.0
+					uses = 1
+					category = mountaineers_tech
+				}
 			}
 		}
 		search_filters = { FOCUS_FILTER_RESEARCH }
diff --git a/common/national_focus/ELF.txt b/common/national_focus/ELF.txt
index 710107b102b..e328ce62f28 100644
--- a/common/national_focus/ELF.txt
+++ b/common/national_focus/ELF.txt
@@ -424,12 +424,12 @@ shared_focus = {
 					pegasi = { x = 0 y = 1 }
 					pegasi = { x = 0 y = 2 }
 					pegasi = { x = 0 y = 3 }
-					pegasi = { x = 0 y = 4 }
 					pegasi = { x = 1 y = 0 }
 					pegasi = { x = 1 y = 1 }
 					pegasi = { x = 1 y = 2 }
 					pegasi = { x = 1 y = 3 }
-					pegasi = { x = 1 y = 4 }
+					pegasi = { x = 2 y = 0 }
+					pegasi = { x = 2 y = 1 }
 				}
 				support = {
 					recon = { x = 0 y = 0 }
@@ -578,18 +578,61 @@ shared_focus = {
 		log = "[GetDateText]: [Root.GetName]: Focus ELF_left_2_a"
 		add_political_power = 150
 		set_country_flag = ELF_collectivised_war_effort
-		custom_effect_tooltip = available_designer
-        show_ideas_tooltip = ELF_mustang
-		custom_effect_tooltip = available_designer
-        show_ideas_tooltip = ELF_shoof
-		custom_effect_tooltip = available_designer
-        show_ideas_tooltip = ELF_sirius
-		custom_effect_tooltip = available_designer
-        show_ideas_tooltip = ELF_light_aircraft_manufacturer
-		custom_effect_tooltip = available_designer
-        show_ideas_tooltip = ELF_heavy_aircraft_manufacturer
-		custom_effect_tooltip = available_designer
-        show_ideas_tooltip = ELF_naval_aircraft_manufacturer
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}    
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = ELF_mustang_organization
+			mio:ELF_mustang_organization = {
+				add_mio_size = 2
+				add_mio_funds = 200
+			}
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = ELF_shoof_organization
+			mio:ELF_shoof_organization = {
+				add_mio_size = 2
+				add_mio_funds = 200
+			}
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = ELF_sirius_organization
+			mio:ELF_sirius_organization = {
+				add_mio_size = 2
+				add_mio_funds = 200
+			}
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = ELF_light_aircraft_manufacturer_organization
+			mio:ELF_light_aircraft_manufacturer_organization = {
+				add_mio_size = 2
+				add_mio_funds = 200
+			}
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = ELF_heavy_aircraft_manufacturer_organization
+			mio:ELF_heavy_aircraft_manufacturer_organization = {
+				add_mio_size = 2
+				add_mio_funds = 200
+			}
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = ELF_naval_aircraft_manufacturer_organization
+			mio:ELF_naval_aircraft_manufacturer_organization = {
+				add_mio_size = 2
+				add_mio_funds = 200
+			}
+		}
+		else = {
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = ELF_mustang
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = ELF_shoof
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = ELF_sirius
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = ELF_light_aircraft_manufacturer
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = ELF_heavy_aircraft_manufacturer
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = ELF_naval_aircraft_manufacturer
+		}
 	}
 	search_filters = { FOCUS_FILTER_POLITICAL }
 }
diff --git a/common/national_focus/EQC.txt b/common/national_focus/EQC.txt
index 4f52114bac0..038a8bab494 100644
--- a/common/national_focus/EQC.txt
+++ b/common/national_focus/EQC.txt
@@ -679,8 +679,21 @@ focus_tree = {
 				}
 				custom_effect_tooltip = available_theorist
 				show_ideas_tooltip = moon_dancer
-				custom_effect_tooltip = available_designer
-				show_ideas_tooltip = EQC_commonwealth_aircraft_corporation
+				if = {
+					limit = {
+						has_dlc = "Arms Against Tyranny"
+					}    
+					custom_effect_tooltip = available_mio_tt
+					show_mio_tooltip = EQC_commonwealth_aircraft_corporation_organization
+					mio:EQC_commonwealth_aircraft_corporation_organization = {
+						add_mio_size = 2
+						add_mio_funds = 800
+					}
+				}
+				else = {
+					custom_effect_tooltip = available_designer
+					show_ideas_tooltip = EQC_commonwealth_aircraft_corporation
+				}
 			}
 
 			hidden_effect = {
diff --git a/common/national_focus/EQC_SOL.txt b/common/national_focus/EQC_SOL.txt
index a319544a8c1..2aa0d9ee891 100644
--- a/common/national_focus/EQC_SOL.txt
+++ b/common/national_focus/EQC_SOL.txt
@@ -1174,13 +1174,12 @@ focus_tree = {
 						infantry = { x = 0 y = 1 }
 						infantry = { x = 0 y = 2 }
 						infantry = { x = 0 y = 3 }
-						infantry = { x = 0 y = 4 }
-
 						infantry = { x = 1 y = 0 }
 						infantry = { x = 1 y = 1 }
 						infantry = { x = 1 y = 2 }
 						infantry = { x = 1 y = 3 }
-						infantry = { x = 1 y = 4 }
+						infantry = { x = 2 y = 0 }
+						infantry = { x = 2 y = 1 }				
 					}
 					support = {
 						anti_tank = { x = 0 y = 0 }
diff --git a/common/national_focus/EQC_shared.txt b/common/national_focus/EQC_shared.txt
index 7e0c6996bed..06dbb0b8ad7 100644
--- a/common/national_focus/EQC_shared.txt
+++ b/common/national_focus/EQC_shared.txt
@@ -316,11 +316,30 @@ shared_focus = {
 			uses = 1
 			category = land_doctrine
 		}
-		add_tech_bonus = {
-			name = marine_bonus
-			bonus = 1.0
-			uses = 1
-			category = marine_tech
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_doctrine_cost_reduction = {
+				name = special_forces_bonus
+				cost_reduction = 0.5
+				uses = 1
+				category = cat_marines_doctrine
+			}
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 0.5
+				uses = 1
+				category = marine_tech
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 0.5
+				uses = 1
+				category = marine_tech
+			}
 		}
 	}
 	search_filters = { FOCUS_FILTER_RESEARCH }
@@ -423,13 +442,34 @@ shared_focus = {
 		log = "[GetDateText]: [Root.GetName]: Focus EQC_section_z"
 		custom_effect_tooltip = EQC_section_z_tech_effect
 		hidden_effect = { set_technology = { popup = no EQC_section_z_tech = 1 } }
-		add_tech_bonus = {
-			name = EQC_section_z
-			bonus = 1.5
-			uses = 2
-			ahead_reduction = 2
-			category = special_forces_tech
-			category = recon_tech
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_doctrine_cost_reduction = {
+				name = special_forces_bonus
+				cost_reduction = 0.50
+				uses = 1
+				category = special_forces_doctrine
+			}
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 1.0
+				uses = 2
+				ahead_reduction = 2
+				category = special_forces_tech
+				category = recon_tech
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 1.5
+				uses = 2
+				ahead_reduction = 2
+				category = special_forces_tech
+				category = recon_tech
+			}
 		}
 	}
 	search_filters = { FOCUS_FILTER_RESEARCH }
@@ -2857,8 +2897,21 @@ shared_focus = {
 		log = "[GetDateText]: [Root.GetName]: Focus EQC_transoceanic_support"
 		custom_effect_tooltip = available_theorist
 		show_ideas_tooltip = moon_dancer
-		custom_effect_tooltip = available_designer
-		show_ideas_tooltip = EQC_commonwealth_aircraft_corporation
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}    
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = EQC_commonwealth_aircraft_corporation_organization
+			mio:EQC_commonwealth_aircraft_corporation_organization = {
+				add_mio_size = 1
+				add_mio_funds = 600
+			}
+		}
+		else = {
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = EQC_commonwealth_aircraft_corporation
+		}
 	}
 }
 
diff --git a/common/national_focus/FAL.txt b/common/national_focus/FAL.txt
index 55b7e042769..aca1dc30d4f 100644
--- a/common/national_focus/FAL.txt
+++ b/common/national_focus/FAL.txt
@@ -4890,11 +4890,30 @@ focus_tree = {
 
 		completion_reward = {
 			log = "[GetDateText]: [Root.GetName]: Focus FAL_aquatic_fighters"
-			add_tech_bonus = {
-				name = marine_bonus
-				bonus = 1.0
-				uses = 2
-				category = marine_tech
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_doctrine_cost_reduction = {
+					name = special_forces_bonus
+					cost_reduction = 0.50
+					uses = 2
+					category = cat_marines_doctrine
+				}
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 0.50
+					uses = 2
+					category = marine_tech
+				}
+			}
+			else = {
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 1.0
+					uses = 2
+					category = marine_tech
+				}
 			}
 		}
 		search_filters = { FOCUS_FILTER_RESEARCH }
diff --git a/common/national_focus/FAT.txt b/common/national_focus/FAT.txt
index a9b6a45e00e..0396bf4d2d0 100644
--- a/common/national_focus/FAT.txt
+++ b/common/national_focus/FAT.txt
@@ -12377,11 +12377,30 @@ shared_focus = {
 		log = "[GetDateText]: [Root.GetName]: Focus FAT_perfect_the_marines"
 		add_war_support = 0.05
 		add_stability = 0.05
-		add_tech_bonus = {
-			name = special_forces_bonus
-			bonus = 1
-			uses = 2
-			category = marine_tech
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_doctrine_cost_reduction = {
+				name = special_forces_bonus
+				cost_reduction = 0.50
+				uses = 2
+				category = cat_marines_doctrine
+			}
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 0.50
+				uses = 2
+				category = marine_tech
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 1.0
+				uses = 2
+				category = marine_tech
+			}
 		}
 	}
 	search_filters = { FOCUS_FILTER_STABILITY FOCUS_FILTER_WAR_SUPPORT FOCUS_FILTER_RESEARCH }
diff --git a/common/national_focus/FBK.txt b/common/national_focus/FBK.txt
index 96e04df5d01..fee9dccfe68 100644
--- a/common/national_focus/FBK.txt
+++ b/common/national_focus/FBK.txt
@@ -18,6 +18,7 @@ focus_tree = {
 	shared_focus = FBK_state_weaponry
 	shared_focus = FBK_proper_pay
 	shared_focus = FBK_airforce
+	shared_focus = RIV_dreams_of_a_federation
 
 	focus = {
 		id = FBK_council
@@ -1283,11 +1284,30 @@ focus_tree = {
 		available_if_capitulated = yes
 		completion_reward = {
 			log = "[GetDateText]: [Root.GetName]: Focus FBK_stormtroopers"
-			add_tech_bonus = {
-				name = special_forces_bonus
-				bonus = 1.0
-				uses = 2
-				category = special_forces_tech
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_doctrine_cost_reduction = {
+					name = special_forces_bonus
+					cost_reduction = 0.50
+					uses = 2
+					category = special_forces_doctrine
+				}
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 0.50
+					uses = 2
+					category = special_forces_tech
+				}
+			}
+			else = {
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 1.0
+					uses = 2
+					category = special_forces_tech
+				}
 			}
 		}
 		search_filters = { FOCUS_FILTER_RESEARCH }
@@ -1308,6 +1328,16 @@ focus_tree = {
 		completion_reward = {
 			log = "[GetDateText]: [Root.GetName]: Focus FBK_imperial_equipment"
 			add_equipment_to_stockpile = { type = infantry_equipment_0 amount = 2000 producer = GRI }
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_equipment_subsidy = {
+					cic = 500
+					equipment_type = infantry_equipment
+					seller_tags = { GRI STW ANG FEA BRZ PYT YAL KAT ROU }
+				}
+			}
 		}
 	}
 
@@ -3075,6 +3105,21 @@ focus_tree = {
 		completion_reward = {
 			log = "[GetDateText]: [Root.GetName]: Focus FBK_pirates"
 			add_ideas = FBK_renewed_piracy_idea
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}    
+				custom_effect_tooltip = available_mio_tt
+				show_mio_tooltip = FBK_advisor30_organization
+				mio:FBK_advisor30_organization = {
+					add_mio_size = 2
+					add_mio_funds = 350
+				}
+			}
+			else = {
+				custom_effect_tooltip = available_designer
+				show_ideas_tooltip = FBK_advisor30
+			}
 		}
 		search_filters = { FOCUS_FILTER_ARMY_BONUS FOCUS_FILTER_NAVY_BONUS }
 	}
@@ -3236,11 +3281,30 @@ focus_tree = {
 		cost = 10
 		completion_reward = {
 			log = "[GetDateText]: [Root.GetName]: Focus FBK_landing_parties"
-			add_tech_bonus = {
-				name = marine_bonus
-				bonus = 1.0
-				uses = 1
-				category = marine_tech
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_doctrine_cost_reduction = {
+					name = special_forces_bonus
+					cost_reduction = 0.75
+					uses = 1
+					category = cat_marines_doctrine
+				}
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 0.75
+					uses = 1
+					category = marine_tech
+				}
+			}
+			else = {
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 1.0
+					uses = 1
+					category = marine_tech
+				}
 			}
 			add_tech_bonus = {
 				name = tp_bonus
diff --git a/common/national_focus/FEA.txt b/common/national_focus/FEA.txt
index aa1d506916c..8d8f94041b8 100644
--- a/common/national_focus/FEA.txt
+++ b/common/national_focus/FEA.txt
@@ -2168,11 +2168,30 @@ shared_focus = {
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus FEA_superior_4"
 		add_ideas = FEA_spec_ops_initiative
-		add_tech_bonus = {
-			name = special_forces_bonus
-			bonus = 1.0
-			uses = 2
-			category = special_forces_tech
+		if = {
+			limit = {
+					has_dlc = "Arms Against Tyranny"
+			}
+			add_doctrine_cost_reduction = {
+				name = special_forces_bonus
+				cost_reduction = 0.50
+				uses = 2
+				category = special_forces_doctrine
+			}
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 0.50
+				uses = 2
+				category = special_forces_tech
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 1.0
+				uses = 2
+				category = special_forces_tech
+			}
 		}
 	}
 	search_filters = { FOCUS_FILTER_ARMY_BONUS FOCUS_FILTER_RESEARCH }
@@ -2294,6 +2313,16 @@ shared_focus = {
 			category = infantry_weapons
 		}
 		add_equipment_to_stockpile = { type = infantry_equipment_0 amount = 1250 producer = GRF }
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_equipment_subsidy = {
+				cic = 500
+				equipment_type = infantry_equipment
+				seller_tags = { YAK JAK GRF GFF PNG STG STL }
+			}
+		}
 	}
 	search_filters = { FOCUS_FILTER_RESEARCH }
 }
@@ -2319,6 +2348,16 @@ shared_focus = {
 			category = artillery
 		}
 		add_equipment_to_stockpile = { type = artillery_equipment_1 amount = 500 producer = GRF }
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_equipment_subsidy = {
+				cic = 500
+				equipment_type = artillery_equipment
+				seller_tags = { YAK JAK GRF GFF PNG STG STL }
+			}
+		}
 	}
 	search_filters = { FOCUS_FILTER_RESEARCH }
 }
@@ -2344,6 +2383,16 @@ shared_focus = {
 			category = support_tech
 		}
 		add_equipment_to_stockpile = { type = support_equipment_1 amount = 250 producer = GRF }
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_equipment_subsidy = {
+				cic = 500
+				equipment_type = support_equipment
+				seller_tags = { YAK JAK GRF GFF PNG STG STL }
+			}
+		}
 	}
 	search_filters = { FOCUS_FILTER_RESEARCH }
 }
@@ -2457,6 +2506,16 @@ shared_focus = {
 			category = infantry_weapons
 		}
 		add_equipment_to_stockpile = { type = infantry_equipment_0 amount = 3000 producer = GRF }
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_equipment_subsidy = {
+				cic = 500
+				equipment_type = infantry_equipment
+				seller_tags = { YAK JAK GRF GFF PNG STG STL }
+			}
+		}
 	}
 	search_filters = { FOCUS_FILTER_RESEARCH }
 }
@@ -2482,6 +2541,16 @@ shared_focus = {
 			category = artillery
 		}
 		add_equipment_to_stockpile = { type = artillery_equipment_1 amount = 1500 producer = GRF }
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_equipment_subsidy = {
+				cic = 500
+				equipment_type = artillery_equipment
+				seller_tags = { YAK JAK GRF GFF PNG STG STL }
+			}
+		}
 	}
 	search_filters = { FOCUS_FILTER_RESEARCH }
 }
@@ -2507,6 +2576,16 @@ shared_focus = {
 			category = support_tech
 		}
 		add_equipment_to_stockpile = { type = support_equipment_1 amount = 750 producer = GRF }
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_equipment_subsidy = {
+				cic = 500
+				equipment_type = support_equipment
+				seller_tags = { YAK JAK GRF GFF PNG STG STL }
+			}
+		}
 	}
 	search_filters = { FOCUS_FILTER_RESEARCH }
 }
@@ -3162,11 +3241,30 @@ shared_focus = {
 	}
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus FEA_marines"
-		add_tech_bonus = {
-			name = special_forces_bonus
-			bonus = 1.0
-			uses = 2
-			category = marine_tech
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_doctrine_cost_reduction = {
+				name = special_forces_bonus
+				cost_reduction = 0.50
+				uses = 2
+				category = cat_marines_doctrine
+			}
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 0.50
+				uses = 2
+				category = marine_tech
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 1.0
+				uses = 2
+				category = marine_tech
+			}
 		}
 	}
 	search_filters = { FOCUS_FILTER_RESEARCH }
@@ -3695,11 +3793,30 @@ shared_focus = {
 	}
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus FEA_paratroopers"
-		add_tech_bonus = {
-			name = special_forces_bonus
-			bonus = 3
-			uses = 1
-			category = para_tech
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_doctrine_cost_reduction = {
+				name = special_forces_bonus
+				cost_reduction = 0.80
+				uses = 1
+				category = cat_paratroopers_doctrine
+			}
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 1.0
+				uses = 1
+				category = para_tech
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 3.0
+				uses = 1
+				category = para_tech
+			}
 		}
 	}
 	search_filters = { FOCUS_FILTER_RESEARCH }
diff --git a/common/national_focus/FEZ.txt b/common/national_focus/FEZ.txt
index 78dd9c56810..ac2200c4dfe 100644
--- a/common/national_focus/FEZ.txt
+++ b/common/national_focus/FEZ.txt
@@ -2963,12 +2963,32 @@ focus_tree = {
 		completion_reward = {
 			log = "[GetDateText]: [Root.GetName]: Focus FEZ_special_forces"
 			add_ideas = FEZ_special_strength
-			add_tech_bonus = {
-				name = special_forces_bonus
-				bonus = 1.0
-				uses = 2
-				category = mountaineers_tech
-				category = para_tech
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_doctrine_cost_reduction = {
+					name = special_forces_bonus
+					cost_reduction = 0.50
+					uses = 2
+					category = special_forces_doctrine
+				}
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 0.50
+					uses = 2
+					category = mountaineers_tech
+					category = para_tech
+				}
+			}
+			else = {
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 1.0
+					uses = 2
+					category = mountaineers_tech
+					category = para_tech
+				}
 			}
 		}
 		search_filters = { FOCUS_FILTER_ARMY_BONUS FOCUS_FILTER_RESEARCH }
@@ -4056,11 +4076,30 @@ focus_tree = {
 
 		completion_reward = {
 			log = "[GetDateText]: [Root.GetName]: Focus FEZ_aquatic_fighters"
-			add_tech_bonus = {
-				name = marine_bonus
-				bonus = 1.0
-				uses = 2
-				category = marine_tech
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_doctrine_cost_reduction = {
+					name = special_forces_bonus
+					cost_reduction = 0.50
+					uses = 2
+					category = cat_marines_doctrine
+				}
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 0.50
+					uses = 2
+					category = marine_tech
+				}
+			}
+			else = {
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 1.0
+					uses = 2
+					category = marine_tech
+				}
 			}
 		}
 		search_filters = { FOCUS_FILTER_RESEARCH }
diff --git a/common/national_focus/FIR.txt b/common/national_focus/FIR.txt
index 0525b579f9a..14bdcd20d17 100644
--- a/common/national_focus/FIR.txt
+++ b/common/national_focus/FIR.txt
@@ -20,6 +20,7 @@ focus_tree = {
 	shared_focus = FBK_airforce
 	shared_focus = FIR_peaceful_resolution
 	shared_focus = FIR_end_of_civil_war
+	shared_focus = RIV_dreams_of_a_federation
 }
 
 focus_tree = {
@@ -45,6 +46,7 @@ focus_tree = {
 	shared_focus = FBK_airforce
 	shared_focus = FIR_peaceful_resolution
 	shared_focus = FIR_end_of_civil_war
+	shared_focus = RIV_dreams_of_a_federation
 
 	focus = {
 		id = FIR_great_spirit
@@ -437,6 +439,7 @@ focus_tree = {
 	shared_focus = FBK_airforce
 	shared_focus = FIR_peaceful_resolution
 	shared_focus = FIR_end_of_civil_war
+	shared_focus = RIV_dreams_of_a_federation
 
 	focus = {
 		id = FIR_avatar_rises
@@ -747,6 +750,7 @@ focus_tree = {
 	shared_focus = FBK_airforce
 	shared_focus = FIR_peaceful_resolution
 	shared_focus = FIR_end_of_civil_war
+	shared_focus = RIV_dreams_of_a_federation
 
 
 	focus = {
@@ -1077,14 +1081,12 @@ focus_tree = {
 					infantry = { x = 0 y = 1 }
 					infantry = { x = 0 y = 2 }
 					infantry = { x = 0 y = 3 }
-					infantry = { x = 0 y = 4 }
-
 					infantry = { x = 1 y = 0 }
 					infantry = { x = 1 y = 1 }
 					infantry = { x = 1 y = 2 }
 					infantry = { x = 1 y = 3 }
-					infantry = { x = 1 y = 4 }
-
+					infantry = { x = 2 y = 0 }
+					infantry = { x = 2 y = 1 }			
 				}
 			}
 
@@ -1687,6 +1689,7 @@ focus_tree = {
 	shared_focus = FBK_airforce
 	shared_focus = FIR_peaceful_resolution
 	shared_focus = FIR_end_of_civil_war
+	shared_focus = RIV_dreams_of_a_federation
 
 	focus = {
 		id = FIR_federation_member
diff --git a/common/national_focus/FLO.txt b/common/national_focus/FLO.txt
index 30758d4ca0f..e1a4b1489c8 100644
--- a/common/national_focus/FLO.txt
+++ b/common/national_focus/FLO.txt
@@ -2435,6 +2435,21 @@ focus_tree = {
 			log = "[GetDateText]: [Root.GetName]: Focus FLO_purchase_moar_weapons"
 			add_equipment_to_stockpile = { type = infantry_equipment amount = 750 producer = JER }
 			add_equipment_to_stockpile = { type = infantry_equipment amount = 750 producer = GRI }
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_equipment_subsidy = {
+					cic = 250
+					equipment_type = infantry_equipment
+					seller_tags = { JER JFT VIN JRR JEB TRD FEZ AET HEL FLO POM }
+				}
+				add_equipment_subsidy = {
+					cic = 250
+					equipment_type = infantry_equipment
+					seller_tags = { GRI STW ANG FEA BRZ PYT YAL KAT ROU }
+				}
+			}
 			add_tech_bonus = {
 				name = infantry_weapons_bonus
 				bonus = 1.0
@@ -2676,6 +2691,21 @@ focus_tree = {
 			log = "[GetDateText]: [Root.GetName]: Focus FLO_purchase_weapons"
 			add_equipment_to_stockpile = { type = infantry_equipment amount = 500 producer = JER }
 			add_equipment_to_stockpile = { type = infantry_equipment amount = 500 producer = GRI }
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_equipment_subsidy = {
+					cic = 250
+					equipment_type = infantry_equipment
+					seller_tags = { JER JFT VIN JRR JEB TRD FEZ AET HEL FLO POM }
+				}
+				add_equipment_subsidy = {
+					cic = 250
+					equipment_type = infantry_equipment
+					seller_tags = { GRI STW ANG FEA BRZ PYT YAL KAT ROU }
+				}
+			}
 			add_tech_bonus = {
 				name = infantry_weapons_bonus
 				bonus = 2.0
@@ -3047,6 +3077,16 @@ focus_tree = {
 				amount = 200 
 				producer = GRF 
 			}
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_equipment_subsidy = {
+					cic = 500
+					equipment_type = anti_tank_equipment
+					seller_tags = { YAK JAK GRF GFF PNG STG STL }
+				}
+			}
 			add_tech_bonus = {
 				name = generic_tech_bonus
 				bonus = 1.0
@@ -3140,6 +3180,16 @@ focus_tree = {
 					producer = JER
 				}
 			}
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_equipment_subsidy = {
+					cic = 250
+					equipment_type = small_plane_airframe
+					seller_tags = { JER JFT VIN JRR JEB TRD FEZ AET HEL POM }
+				}
+			}
 			if = {
 				limit = {
 					has_dlc = "By Blood Alone"
@@ -3207,6 +3257,16 @@ focus_tree = {
 					producer = GRI
 				}
 			}
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_equipment_subsidy = {
+					cic = 250
+					equipment_type = small_plane_airframe
+					seller_tags = { GRI STW ANG FEA BRZ PYT YAL KAT ROU }
+				}
+			}
 		}
 		search_filters = { FOCUS_FILTER_RESEARCH }
 	}
@@ -6184,6 +6244,21 @@ focus_tree = {
 			log = "[GetDateText]: [Root.GetName]: Focus FLO_arm_the_people"
 			add_equipment_to_stockpile = { type = infantry_equipment amount = 1000 producer = JER }
 			add_equipment_to_stockpile = { type = artillery_equipment amount = 300 producer = JER }
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_equipment_subsidy = {
+					cic = 250
+					equipment_type = infantry_equipment
+					seller_tags = { JER JFT VIN JRR JEB TRD FEZ AET HEL FLO POM }
+				}
+				add_equipment_subsidy = {
+					cic = 250
+					equipment_type = artillery_equipment
+					seller_tags = { JER JFT VIN JRR JEB TRD FEZ AET HEL FLO POM }
+				}
+			}
 			add_tech_bonus = {
 				name = infantry_weapons_bonus
 				bonus = 1.0
@@ -7441,6 +7516,37 @@ focus_tree = {
 		completion_reward = {
 			log = "[GetDateText]: [Root.GetName]: Focus FLO_long_live_the_king"
 			country_event = flowena.127
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}    
+				custom_effect_tooltip = available_mio_tt
+				show_mio_tooltip = FLO_mistral_organization
+				mio:FLO_mistral_organization = {
+					add_mio_size = 1
+					add_mio_funds = 250
+				}
+				custom_effect_tooltip = available_mio_tt
+				show_mio_tooltip = FLO_loup_shipping_organization
+				mio:FLO_loup_shipping_organization = {
+					add_mio_size = 1
+					add_mio_funds = 250
+				}
+				custom_effect_tooltip = available_mio_tt
+				show_mio_tooltip = FLO_manufacture_aquileia_FLO_organization
+				mio:FLO_manufacture_aquileia_FLO_organization = {
+					add_mio_size = 1
+					add_mio_funds = 250
+				}
+			}
+			else = {
+				custom_effect_tooltip = available_designer
+				show_ideas_tooltip = FLO_mistral
+				custom_effect_tooltip = available_designer
+				show_mio_tooltip = FLO_loup_shipping
+				custom_effect_tooltip = available_designer
+				show_mio_tooltip = FLO_manufacture_aquileia_FLO
+			}
 		}
 	}
 }
diff --git a/common/national_focus/FRE.txt b/common/national_focus/FRE.txt
index 8aad2dc564c..df56b2ab606 100644
--- a/common/national_focus/FRE.txt
+++ b/common/national_focus/FRE.txt
@@ -1850,6 +1850,16 @@ focus_tree = {
 			    amount = 1000
 				producer = RCT
 		    }
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_equipment_subsidy = {
+					cic = 500
+					equipment_type = infantry_equipment
+					seller_tags = { RCT LCT NIM WIT BAK DEP DMT FBK WAT FIR }
+				}
+			}
 			add_tech_bonus = {
 				name = FRE_weapon_development
 				bonus = 1.0
@@ -1927,6 +1937,16 @@ focus_tree = {
 			    amount = 250
 				producer = RCT
 		    }
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_equipment_subsidy = {
+					cic = 500
+					equipment_type = support_equipment
+					seller_tags = { RCT LCT NIM WIT BAK DEP DMT FBK WAT FIR }
+				}
+			}
 			add_tech_bonus = {
 				name = FRE_artillery_development
 				bonus = 1.0
@@ -1968,11 +1988,30 @@ focus_tree = {
 				mountain_warfare = 1
 			}
 			custom_effect_tooltip = GRF_mountain_training_2_tp
-			add_tech_bonus = {
-				name = FRE_mountain_home
-				bonus = 1.0
-				uses = 2
-				category = mountaineers_tech
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_doctrine_cost_reduction = {
+					name = special_forces_bonus
+					cost_reduction = 0.50
+					uses = 2
+					category = cat_mountaineers_doctrine
+				}
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 0.50
+					uses = 2
+					category = mountaineers_tech
+				}
+			}
+			else = {
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 1.0
+					uses = 2
+					category = mountaineers_tech
+				}
 			}
 			custom_effect_tooltip = RAJ_revive_the_screw_guns_effect
 			hidden_effect = { set_technology = { popup = no mountain_gun = 1 } }
@@ -2179,6 +2218,16 @@ focus_tree = {
 					set_technology = { early_fighter = 1 }
 				}
 				add_equipment_to_stockpile = { type = fighter_equipment_0 amount = 25 producer = NIM }
+				if = {
+					limit = {
+						has_dlc = "Arms Against Tyranny"
+					}
+					add_equipment_subsidy = {
+						cic = 500
+						equipment_type = medium_plane_airframe
+						seller_tags = { RCT LCT NIM WIT BAK DEP DMT FBK WAT FIR }
+					}
+				}
 			}
 		}
 		search_filters = { FOCUS_FILTER_RESEARCH }
@@ -2259,6 +2308,16 @@ focus_tree = {
 					set_technology = { early_bomber = 1 }
 				}
 				add_equipment_to_stockpile = { type = tac_bomber_equipment_0 amount = 12 producer = LCT }
+				if = {
+					limit = {
+						has_dlc = "Arms Against Tyranny"
+					}
+					add_equipment_subsidy = {
+						cic = 500
+						equipment_type = medium_plane_airframe
+						seller_tags = { RCT LCT NIM WIT BAK DEP DMT FBK WAT FIR }
+					}
+				}
 			}
 		}
 		search_filters = { FOCUS_FILTER_RESEARCH }
@@ -2520,8 +2579,21 @@ focus_tree = {
 
 		completion_reward = {
 			log = "[GetDateText]: [Root.GetName]: Focus FRE_start_fighter_industry"
-			custom_effect_tooltip = available_designer
-			show_ideas_tooltip = FRE_fighter_industry
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}    
+				custom_effect_tooltip = available_mio_tt
+				show_mio_tooltip = FRE_fighter_industry_organization
+				mio:FRE_fighter_industry_organization = {
+					add_mio_size = 1
+					add_mio_funds = 500
+				}
+			}
+			else = {
+				custom_effect_tooltip = available_designer
+				show_ideas_tooltip = FRE_fighter_industry
+			}
 		}
 	}
 
@@ -2553,8 +2625,21 @@ focus_tree = {
 
 		completion_reward = {
 			log = "[GetDateText]: [Root.GetName]: Focus FRE_start_bomber_industry"
-			custom_effect_tooltip = available_designer
-			show_ideas_tooltip = FRE_bomber_industry
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}    
+				custom_effect_tooltip = available_mio_tt
+				show_mio_tooltip = FRE_bomber_industry_organization
+				mio:FRE_bomber_industry_organization = {
+					add_mio_size = 1
+					add_mio_funds = 500
+				}
+			}
+			else = {
+				custom_effect_tooltip = available_designer
+				show_ideas_tooltip = FRE_bomber_industry
+			}
 		}
 	}
 	
diff --git a/common/national_focus/FRN.txt b/common/national_focus/FRN.txt
index ab60fbe12b6..adfd4eea28c 100644
--- a/common/national_focus/FRN.txt
+++ b/common/national_focus/FRN.txt
@@ -1706,8 +1706,21 @@ shared_focus = {
 			}
 		}
 		set_country_flag = FRN_arms_contract
-		custom_effect_tooltip = available_designer
-		show_ideas_tooltip = FRN_greda
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}    
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = FRN_greda_organization
+			mio:FRN_greda_organization = {
+				add_mio_size = 1
+				add_mio_funds = 800
+			}
+		}
+		else = {
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = FRN_greda
+		}
 	}
 	search_filters = { FOCUS_FILTER_INDUSTRY }
 }
@@ -2423,6 +2436,26 @@ shared_focus = {
 		}
 		add_equipment_to_stockpile = { type = artillery_equipment_1 amount = 250 producer = WNG }
 		add_equipment_to_stockpile = { type = support_equipment_1 amount = 150 producer = WNG }
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_equipment_subsidy = {
+				cic = 250
+				equipment_type = infantry_equipment
+				seller_tags = { EQC WNG TAL JES ARA FAL SIC MIT CYA }
+			}
+			add_equipment_subsidy = {
+				cic = 250
+				equipment_type = artillery_equipment
+				seller_tags = { EQC WNG TAL JES ARA FAL SIC MIT CYA }
+			}
+			add_equipment_subsidy = {
+				cic = 250
+				equipment_type = support_equipment
+				seller_tags = { EQC WNG TAL JES ARA FAL SIC MIT CYA }
+			}
+		}
 	}
 }
 shared_focus = {
@@ -7663,6 +7696,16 @@ shared_focus = {
 			producer = WNG				
 			amount = 1000
 		}
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_equipment_subsidy = {
+				cic = 500
+				equipment_type = infantry_equipment
+				seller_tags = { EQC WNG TAL JES ARA FAL SIC MIT CYA }
+			}
+		}
 	}
 	search_filters = { FOCUS_FILTER_RESEARCH }
 }
@@ -7702,11 +7745,35 @@ shared_focus = {
 				producer = WNG
 			}
 		}
+		else_if = {
+			limit = {
+				has_tech = tech_trucks
+			}
+			set_technology = {
+				motorised_infantry = 1
+			}
+			add_equipment_to_stockpile = { 
+				type = motorized_equipment 
+				amount = 250
+				producer = WNG
+			}
+		}
 		else = {
 			set_technology = {
+				tech_trucks = 1
 				motorised_infantry = 1
 			}
 		}
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_equipment_subsidy = {
+				cic = 500
+				equipment_type = motorized_equipment
+				seller_tags = { EQC WNG TAL JES ARA FAL SIC MIT CYA }
+			}
+		}
 	}
 	search_filters = { FOCUS_FILTER_RESEARCH }
 }
@@ -8146,12 +8213,24 @@ shared_focus = {
 	}
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus FRN_tractor_factories"
-		custom_effect_tooltip = available_designer
-		show_ideas_tooltip = FRN_light_tank_manufacturer
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}    
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = FRN_light_tank_manufacturer_organization
+			mio:FRN_light_tank_manufacturer_organization = {
+				add_mio_size = 1
+				add_mio_funds = 350
+			}
+		}
+		else = {
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = FRN_light_tank_manufacturer
+		}
 		481 = {
 			add_extra_state_shared_building_slots = 1
-			add_building_construction =
-			{
+			add_building_construction = {
 				type = arms_factory
 				level = 1
 				instant_build = yes
diff --git a/common/national_focus/GFF.txt b/common/national_focus/GFF.txt
index 51834b520d8..2f3a495d2b9 100644
--- a/common/national_focus/GFF.txt
+++ b/common/national_focus/GFF.txt
@@ -120,6 +120,16 @@ focus_tree = {
 				amount = 1500
 				producer = STG
 			}
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_equipment_subsidy = {
+					cic = 500
+					equipment_type = infantry_equipment
+					seller_tags = { YAK JAK GRF GFF PNG STG STL }
+				}
+			}
 		}
 	}
 
@@ -367,6 +377,16 @@ focus_tree = {
 				amount = 2500
 				producer = STG
 			}
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_equipment_subsidy = {
+					cic = 500
+					equipment_type = infantry_equipment
+					seller_tags = { YAK JAK GRF GFF PNG STG STL }
+				}
+			}
 		}
 	}
 	focus = {
@@ -1893,6 +1913,16 @@ focus_tree = {
 			else = {
 				add_equipment_to_stockpile = { type = small_plane_cas_airframe amount = 50 producer = GRF }
 			}
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_equipment_subsidy = {
+					cic = 500
+					equipment_type = small_plane_cas_airframe
+					seller_tags = { YAK JAK GRF PNG STG STL }
+				}
+			}
 		}
 		search_filters = { FOCUS_FILTER_RESEARCH }
 	}
diff --git a/common/national_focus/GRF.txt b/common/national_focus/GRF.txt
index 09f8f0092e0..8ba562ae8ff 100644
--- a/common/national_focus/GRF.txt
+++ b/common/national_focus/GRF.txt
@@ -365,6 +365,27 @@ focus_tree = {
 					instant_build = yes
 				}
 			}
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}    
+				custom_effect_tooltip = available_mio_tt
+				show_mio_tooltip = GRF_talon_organization
+				mio:GRF_talon_organization = {
+					add_mio_funds = 200
+				}
+				custom_effect_tooltip = available_mio_tt
+				show_mio_tooltip = GRF_triton_manufacturer_organization
+				mio:GRF_triton_manufacturer_organization = {
+					add_mio_funds = 200
+				}
+			}
+			else = {
+				custom_effect_tooltip = available_designer
+				show_ideas_tooltip = talon
+				custom_effect_tooltip = available_designer
+				show_ideas_tooltip = triton_manufacturer
+			}
 		}
 		search_filters = { FOCUS_FILTER_INDUSTRY }
 	}
@@ -6991,6 +7012,16 @@ focus_tree = {
 				amount = 300
 				producer = CHN
 			}
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_equipment_subsidy = {
+					cic = 500
+					equipment_type = light_tank_chassis
+					seller_tags = { CHN CCN OLE PLB }
+				}
+			}
 		}
 		search_filters = { FOCUS_FILTER_RESEARCH }
 	}
@@ -8134,11 +8165,30 @@ focus_tree = {
 
 		completion_reward = {
 			log = "[GetDateText]: [Root.GetName]: Focus GRF_paratroopers"
-			add_tech_bonus = {
-				name = paratrooper_bonus
-				bonus = 1.0
-				uses = 1
-				category = para_tech
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_doctrine_cost_reduction = {
+					name = special_forces_bonus
+					cost_reduction = 0.75
+					uses = 1
+					category = cat_paratroopers_doctrine
+				}
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 0.75
+					uses = 1
+					category = para_tech
+				}
+			}
+			else = {
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 1.0
+					uses = 1
+					category = para_tech
+				}
 			}
 		}
 		search_filters = { FOCUS_FILTER_RESEARCH }
@@ -8890,6 +8940,21 @@ focus_tree = {
 					instant_build = yes
 				}
 			}
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}    
+				custom_effect_tooltip = available_mio_tt
+				show_mio_tooltip = GRF_grf_united_shipbuilding_corporation_organization
+				mio:GRF_grf_united_shipbuilding_corporation_organization = {
+					add_mio_size = 2
+					add_mio_funds = 800
+				}
+			}
+			else = {
+				custom_effect_tooltip = available_designer
+				show_ideas_tooltip = grf_united_shipbuilding_corporation
+			}
 		}
 		search_filters = { FOCUS_FILTER_INDUSTRY }
 	}
diff --git a/common/national_focus/GRI.txt b/common/national_focus/GRI.txt
index 18762f5aa52..ee2c548723c 100644
--- a/common/national_focus/GRI.txt
+++ b/common/national_focus/GRI.txt
@@ -4108,8 +4108,20 @@ shared_focus = {
 	ai_will_do = { factor = 11 }
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus GRI_crona_industry"
-		custom_effect_tooltip = available_designer
-		show_ideas_tooltip = imperial_arms_co
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}    
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = GRI_imperial_arms_co_organization
+			mio:GRI_imperial_arms_co_organization = {
+				add_mio_funds = 350
+			}
+		}
+		else = {
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = imperial_arms_co
+		}
 		437 = {
 			add_extra_state_shared_building_slots = 1
 			add_building_construction = {
@@ -4947,13 +4959,30 @@ shared_focus = {
 
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus GRI_marine_infantry_f"
-		add_tech_bonus = {
-			name = special_forces_bonus
-			bonus = 3.0
-			uses = 1
-			technology = marines
-			technology = marines2
-			technology = marines3
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_doctrine_cost_reduction = {
+				name = special_forces_bonus
+				cost_reduction = 0.80
+				uses = 1
+				category = cat_marines_doctrine
+			}
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 1.0
+				uses = 1
+				category = marine_tech
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 3.0
+				uses = 1
+				category = marine_tech
+			}
 		}
 	}
 	search_filters = { FOCUS_FILTER_RESEARCH }
@@ -5236,19 +5265,30 @@ shared_focus = {
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus GRI_special_forces_inititaitve"
 		add_ideas = GRI_special_forces
-		add_tech_bonus = {
-			name = special_forces_bonus
-			bonus = 3.0
-			uses = 1
-			technology = paratroopers
-			technology = paratroopers2
-			technology = paratroopers3
-			technology = marines
-			technology = marines2
-			technology = marines3
-			technology = tech_mountaineers
-			technology = tech_mountaineers2
-			technology = tech_mountaineers3
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_doctrine_cost_reduction = {
+				name = special_forces_bonus
+				cost_reduction = 0.80
+				uses = 1
+				category = special_forces_doctrine
+			}
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 1.0
+				uses = 1
+			category = special_forces_tech
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 3.0
+				uses = 1
+				category = special_forces_tech
+			}
 		}
 	}
 	search_filters = { FOCUS_FILTER_ARMY_BONUS FOCUS_FILTER_RESEARCH }
@@ -5568,8 +5608,20 @@ shared_focus = {
 
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus GRI_lowstein_motorized_contract"
-		custom_effect_tooltip = available_designer
-		show_ideas_tooltip = lionstone
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}    
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = GRI_lionstone_organization
+			mio:GRI_lionstone_organization = {
+				add_mio_funds = 350
+			}
+		}
+		else = {
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = lionstone
+		}
 		add_tech_bonus = {
 			name = mech_bonus
 			bonus = 0.5
diff --git a/common/national_focus/GRI_aprilfools_shared.txt b/common/national_focus/GRI_aprilfools_shared.txt
index d2b5a8cea02..9c5f1ef9961 100644
--- a/common/national_focus/GRI_aprilfools_shared.txt
+++ b/common/national_focus/GRI_aprilfools_shared.txt
@@ -411,7 +411,7 @@ shared_focus = {
 	}
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: GRI_AF_unto_itself"
-		add_to_variable = {GRI_AF_consumer_goods_factor_var = -0.05}
+		add_to_variable = {GRI_AF_consumer_goods_factor_var = -0.1}
 		custom_effect_tooltip = GRI_AF_unto_itself_tt
 		add_stability = 0.05
 	}
diff --git a/common/national_focus/GRU.txt b/common/national_focus/GRU.txt
index 26c8f76e834..4eaa60032ca 100644
--- a/common/national_focus/GRU.txt
+++ b/common/national_focus/GRU.txt
@@ -2259,11 +2259,30 @@ shared_focus = {
 	
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus GRU_military_shared_1"
-		add_tech_bonus = {
-			name = marine_bonus
-			bonus = 0.75
-			uses = 1
-			category = marine_tech
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_doctrine_cost_reduction = {
+				name = special_forces_bonus
+				cost_reduction = 0.50
+				uses = 1
+				category = cat_marines_doctrine
+			}
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 0.50
+				uses = 1
+				category = marine_tech
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 0.75
+				uses = 1
+				category = marine_tech
+			}
 		}
 		add_tech_bonus = {
 			name = tp_bonus
@@ -2344,11 +2363,30 @@ shared_focus = {
 	
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus GRU_military_shared_2"
-		add_tech_bonus = {
-			name = special_forces_bonus
-			bonus = 0.5
-			uses = 2
-			category = para_tech
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_doctrine_cost_reduction = {
+				name = special_forces_bonus
+				cost_reduction = 0.50
+				uses = 2
+				category = cat_paratroopers_doctrine
+			}
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 0.50
+				uses = 2
+				category = para_tech
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 1.0
+				uses = 2
+				category = para_tech
+			}
 		}
 	}
 	search_filters = { FOCUS_FILTER_RESEARCH }
diff --git a/common/national_focus/GRW.txt b/common/national_focus/GRW.txt
index e81bc27d771..d1bbfb88612 100644
--- a/common/national_focus/GRW.txt
+++ b/common/national_focus/GRW.txt
@@ -3493,11 +3493,30 @@ focus_tree = {
 		y = 1
 		completion_reward = {
 			log = "[GetDateText]: [Root.GetName]: Focus GRW_marines_f"
-			add_tech_bonus = {
-				name = special_forces_bonus
-				bonus = 1.0
-				uses = 2
-				category = marine_tech
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_doctrine_cost_reduction = {
+					name = special_forces_bonus
+					cost_reduction = 0.50
+					uses = 2
+					category = cat_marines_doctrine
+				}
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 0.50
+					uses = 2
+					category = marine_tech
+				}
+			}
+			else = {
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 1.0
+					uses = 2
+					category = marine_tech
+				}
 			}
 		}
 		search_filters = { FOCUS_FILTER_RESEARCH }
@@ -3762,8 +3781,21 @@ focus_tree = {
 				uses = 2
 				category = armor
 			}
-			custom_effect_tooltip = available_designer
-			show_ideas_tooltip = GRW_tank_manufacturer
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}    
+				custom_effect_tooltip = available_mio_tt
+				show_mio_tooltip = GRW_tank_manufacturer_organization
+				mio:GRW_tank_manufacturer_organization = {
+					add_mio_size = 1
+					add_mio_funds = 500
+				}
+			}
+			else = {
+				custom_effect_tooltip = available_designer
+				show_ideas_tooltip = GRW_tank_manufacturer
+			}
 		}
 		search_filters = { FOCUS_FILTER_RESEARCH }
 	}
diff --git a/common/national_focus/GRY_shared.txt b/common/national_focus/GRY_shared.txt
index 22d33579476..e73c3987e9c 100644
--- a/common/national_focus/GRY_shared.txt
+++ b/common/national_focus/GRY_shared.txt
@@ -191,11 +191,30 @@ shared_focus = {
 	cost = 8
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus GRY_adapt_to_mountain_warfare"
-		add_tech_bonus = {
-			name = special_forces_bonus
-			bonus = 1
-			uses = 2
-			category = mountaineers_tech
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_doctrine_cost_reduction = {
+				name = special_forces_bonus
+				cost_reduction = 0.50
+				uses = 2
+				category = cat_mountaineers_doctrine
+			}
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 0.50
+				uses = 2
+				category = mountaineers_tech
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 1.0
+				uses = 2
+				category = mountaineers_tech
+			}
 		}
 	}
 	search_filters = { FOCUS_FILTER_RESEARCH }
@@ -353,11 +372,30 @@ shared_focus = {
 	cost = 8
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus GRY_the_past"
-		add_tech_bonus = {
-			name = special_forces_bonus
-			bonus = 1
-			uses = 3
-			category = special_forces_tech
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_doctrine_cost_reduction = {
+				name = special_forces_bonus
+				cost_reduction = 0.50
+				uses = 3
+				category = special_forces_doctrine
+			}
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 0.50
+				uses = 3
+				category = special_forces_tech
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 1.0
+				uses = 3
+				category = special_forces_tech
+			}
 		}
 	}
 	search_filters = { FOCUS_FILTER_RESEARCH }
@@ -857,11 +895,30 @@ shared_focus = {
 	cost = 8
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus GRY_marine_focus"
-		add_tech_bonus = {
-			name = marine_bonus
-			bonus = 1
-			uses = 1
-			category = marine_tech
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_doctrine_cost_reduction = {
+				name = special_forces_bonus
+				cost_reduction = 0.75
+				uses = 1
+				category = cat_marines_doctrine
+			}
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 0.75
+				uses = 1
+				category = marine_tech
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 1.0
+				uses = 1
+				category = marine_tech
+			}
 		}
 	}
 	search_filters = { FOCUS_FILTER_RESEARCH }
@@ -1791,11 +1848,30 @@ shared_focus = {
 	cost = 8
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus GRY_cossacks_are_naturals"
-		add_tech_bonus = {
-			name = special_forces_bonus
-			bonus = 1
-			uses = 2
-			category = para_tech
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_doctrine_cost_reduction = {
+				name = special_forces_bonus
+				cost_reduction = 0.50
+				uses = 2
+				category = cat_paratroopers_doctrine
+			}
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 0.50
+				uses = 2
+				category = para_tech
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 1.0
+				uses = 2
+				category = para_tech
+			}
 		}
 	}
 	search_filters = { FOCUS_FILTER_RESEARCH }
@@ -1870,8 +1946,20 @@ shared_focus = {
 	cost = 8
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus GRY_naval_company"
-		custom_effect_tooltip = available_designer
-		show_ideas_tooltip = GRY_navy_concern
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}    
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = GRY_navy_concern_organization
+			mio:GRY_navy_concern_organization = {
+				add_mio_funds = 350
+			}
+		}
+		else = {
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = GRY_navy_concern
+		}
 	}
 }
 
@@ -1887,8 +1975,20 @@ shared_focus = {
 	cost = 8
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus GRY_air_company"
-		custom_effect_tooltip = available_designer
-		show_ideas_tooltip = GRY_air_concern
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}    
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = GRY_air_concern_organization
+			mio:GRY_air_concern_organization = {
+				add_mio_funds = 350
+			}
+		}
+		else = {
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = GRY_air_concern
+		}
 	}
 }
 
diff --git a/common/national_focus/HAU.txt b/common/national_focus/HAU.txt
index d136bea8a4d..0a7a900ca28 100644
--- a/common/national_focus/HAU.txt
+++ b/common/national_focus/HAU.txt
@@ -255,6 +255,21 @@ focus_tree = {
 			    amount = 250
                 producer = GRI				
 			}
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_equipment_subsidy = {
+					cic = 250
+					equipment_type = infantry_equipment
+					seller_tags = { GRI STW ANG FEA BRZ PYT YAL KAT ROU }
+				}
+				add_equipment_subsidy = {
+					cic = 250
+					equipment_type = artillery_equipment
+					seller_tags = { GRI STW ANG FEA BRZ PYT YAL KAT ROU }
+				}
+			}
 		}
 	}
 	
@@ -2007,6 +2022,26 @@ focus_tree = {
 			add_equipment_to_stockpile = { type = infantry_equipment_1 amount = 1100 producer = GRF }
 			add_equipment_to_stockpile = { type = artillery_equipment_1 amount = 150 producer = GRF }
 			add_equipment_to_stockpile = { type = support_equipment_1 amount = 100 producer = GRF }
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_equipment_subsidy = {
+					cic = 250
+					equipment_type = infantry_equipment
+					seller_tags = { YAK JAK GRF GFF PNG STG STL }
+				}
+				add_equipment_subsidy = {
+					cic = 250
+					equipment_type = artillery_equipment
+					seller_tags = { YAK JAK GRF GFF PNG STG STL }
+				}
+				add_equipment_subsidy = {
+					cic = 250
+					equipment_type = support_equipment
+					seller_tags = { YAK JAK GRF GFF PNG STG STL }
+				}
+			}
 			random_owned_controlled_state = {
 				limit = {
 					free_building_slots = {
@@ -2060,12 +2095,30 @@ focus_tree = {
 				limit = {
 					has_tech = paratroopers
 				}
-				add_tech_bonus = {
-					name = infantry_weapons_bonus
-					bonus = 1.0
-					uses = 1
-					technology = paratroopers2
-					technology = paratroopers3
+				if = {
+					limit = {
+						has_dlc = "Arms Against Tyranny"
+					}
+					add_doctrine_cost_reduction = {
+						name = special_forces_bonus
+						cost_reduction = 0.75
+						uses = 1
+						category = cat_paratroopers_doctrine
+					}
+					add_tech_bonus = {
+						name = special_forces_bonus
+						bonus = 0.75
+						uses = 1
+						category = para_tech
+					}
+				}
+				else = {
+					add_tech_bonus = {
+						name = special_forces_bonus
+						bonus = 1.0
+						uses = 1
+						category = para_tech
+					}
 				}
 			}
 			else = {
@@ -2118,16 +2171,30 @@ focus_tree = {
 		}
 		completion_reward = {
 			log = "[GetDateText]: [Root.GetName]: Focus HAU_special_forces_drive"
-			add_tech_bonus = {
-				name = special_forces_bonus
-				bonus = 1.0
-				uses = 2
-				technology = paratroopers
-				technology = paratroopers2
-				technology = marines
-				technology = marines2
-				technology = tech_mountaineers
-				technology = tech_mountaineers2
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_doctrine_cost_reduction = {
+					name = special_forces_bonus
+					cost_reduction = 0.5
+					uses = 2
+					category = special_forces_doctrine
+				}
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 0.5
+					uses = 2
+					category = special_forces_tech
+				}
+			}
+			else = {
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 1.0
+					uses = 2
+					category = special_forces_tech
+				}
 			}
 		}
 		search_filters = { FOCUS_FILTER_RESEARCH }
@@ -3027,25 +3094,75 @@ focus_tree = {
 			custom_effect_tooltip = HAU_battleship_tp
 			if = {
 				limit = {
-					has_tech = early_battleship
+					has_dlc = "Man the Guns"
 				}
-				add_tech_bonus = {
-					name = navy_bonus
-					bonus = 1.0
-					uses = 1
-					category = bb_tech
+				
+				if = {
+					limit = {
+						has_tech = early_ship_hull_heavy
+					}
+					add_tech_bonus = {
+						name = navy_bonus
+						bonus = 1.0
+						uses = 1
+						category = bb_tech
+					}
+				}
+				else = {
+					custom_effect_tooltip = HAU_battleship_tech_tp
+					hidden_effect = {
+						set_technology = {
+							early_ship_hull_heavy = 1
+						}
+					}
 				}
+				create_equipment_variant = {
+					name = "Weltenfresser Class"
+					type = ship_hull_heavy_1
+					name_group = HAU_BB_BC_HISTORICAL
+					parent_version = 0
+					modules = {
+						fixed_ship_battery_slot = ship_heavy_battery_2
+						fixed_ship_anti_air_slot = ship_anti_air_1
+						fixed_ship_fire_control_system_slot = ship_fire_control_system_1
+						fixed_ship_radar_slot = empty
+						fixed_ship_engine_slot = heavy_ship_engine_1
+						fixed_ship_secondaries_slot = ship_secondaries_1
+						fixed_ship_armor_slot = ship_armor_bb_1
+						front_1_custom_slot = ship_anti_air_1
+						mid_1_custom_slot = empty
+						mid_2_custom_slot = ship_secondaries_1
+						rear_1_custom_slot = ship_heavy_battery_2
+					}
+				}
+				hidden_effect = {
+					load_oob = "HAU_battleship_spawn"
+				}
+
 			}
 			else = {
-				custom_effect_tooltip = HAU_battleship_tech_tp
-				hidden_effect = {
-					set_technology = {
-						early_battleship = 1
+				if = {
+					limit = {
+						has_tech = early_battleship
+					}
+					add_tech_bonus = {
+						name = navy_bonus
+						bonus = 1.0
+						uses = 1
+						category = bb_tech
 					}
 				}
-			}
-			hidden_effect = {
-				load_oob = "HAU_battleship_spawn"
+				else = {
+					custom_effect_tooltip = HAU_battleship_tech_tp
+					hidden_effect = {
+						set_technology = {
+							early_battleship = 1
+						}
+					}
+				}
+				hidden_effect = {
+					load_oob = "HAU_battleship_spawn_legacy"
+				}
 			}
 		}
 		search_filters = { FOCUS_FILTER_MANPOWER FOCUS_FILTER_RESEARCH }
diff --git a/common/national_focus/HEL.txt b/common/national_focus/HEL.txt
index aa1ff7cc742..9880863489b 100644
--- a/common/national_focus/HEL.txt
+++ b/common/national_focus/HEL.txt
@@ -503,6 +503,16 @@ shared_focus = {
 		add_equipment_to_stockpile = { type = infantry_equipment_0 amount = 125 producer = JER }
 		add_equipment_to_stockpile = { type = infantry_equipment_0 amount = 100 producer = FLO }
 		add_equipment_to_stockpile = { type = infantry_equipment_0 amount = 50 producer = POM }
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_equipment_subsidy = {
+				cic = 500
+				equipment_type = infantry_equipment
+				seller_tags = { JER JFT VIN JRR JEB TRD FEZ AET FLO POM }
+			}
+		}
 	}
 	search_filters = { FOCUS_FILTER_INDUSTRY }
 }
@@ -2953,6 +2963,21 @@ shared_focus = {
 		add_equipment_to_stockpile = { type = infantry_equipment amount = 350 producer = HEL }
 		add_equipment_to_stockpile = { type = infantry_equipment amount = 250 producer = TRD }
 		add_equipment_to_stockpile = { type = infantry_equipment amount = 250 producer = GRI }
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_equipment_subsidy = {
+				cic = 250
+				equipment_type = infantry_equipment
+				seller_tags = { JER JFT VIN JRR JEB TRD FEZ AET FLO POM }
+			}
+			add_equipment_subsidy = {
+				cic = 250
+				equipment_type = infantry_equipment
+				seller_tags = { GRI STW ANG FEA BRZ PYT YAL KAT ROU }
+			}
+		}
 	}
 }
 
diff --git a/common/national_focus/HIP.txt b/common/national_focus/HIP.txt
index cad8adb59ed..c463ad2cd03 100644
--- a/common/national_focus/HIP.txt
+++ b/common/national_focus/HIP.txt
@@ -14248,9 +14248,28 @@ shared_focus = {
 		available_if_capitulated = no
 
 		completion_reward = {
-			custom_effect_tooltip = available_designer
-			show_ideas_tooltip = HIP_consolidated_aircraft
-			show_ideas_tooltip = HIP_bellbreeze_aircraft_corporation
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}    
+				custom_effect_tooltip = available_mio_tt
+				show_mio_tooltip = HIP_consolidated_aircraft_organization
+				mio:HIP_consolidated_aircraft_organization = {
+					add_mio_size = 1
+					add_mio_funds = 400
+				}
+				custom_effect_tooltip = available_mio_tt
+				show_mio_tooltip = HIP_bellbreeze_aircraft_corporation_organization
+				mio:HIP_bellbreeze_aircraft_corporation_organization = {
+					add_mio_size = 1
+					add_mio_funds = 400
+				}
+			}
+			else = {
+				custom_effect_tooltip = available_designer
+				show_ideas_tooltip = HIP_consolidated_aircraft
+				show_ideas_tooltip = HIP_bellbreeze_aircraft_corporation
+			}
 		}
 	}
 	shared_focus = {
@@ -15327,8 +15346,21 @@ shared_focus = {
 		available_if_capitulated = no
 
 		completion_reward = {
-			custom_effect_tooltip = available_designer
-			show_ideas_tooltip = HIP_star_tank_manufacturer
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}    
+				custom_effect_tooltip = available_mio_tt
+				show_mio_tooltip = HIP_star_tank_manufacturer_organization
+				mio:HIP_star_tank_manufacturer_organization = {
+					add_mio_size = 2
+					add_mio_funds = 800
+				}
+			}
+			else = {
+				custom_effect_tooltip = available_designer
+				show_ideas_tooltip = HIP_star_tank_manufacturer
+			}
 		}
 	}
 	shared_focus = {
@@ -18248,7 +18280,7 @@ shared_focus = {
 		available_if_capitulated = no
 
 		completion_reward = {
-			add_to_variable = { HIP_anarchist_consumer_goods_factor = -0.05 }
+			add_to_variable = { HIP_anarchist_consumer_goods_factor = -0.1 }
 			custom_effect_tooltip = HIP_anarchist_society_6
 			country_event = hippocommie.108
 		}
@@ -18866,7 +18898,7 @@ shared_focus = {
 		available_if_capitulated = no
 
 		completion_reward = {
-			add_to_variable = { HIP_coalition_consumer_goods_factor = 0.05 }
+			add_to_variable = { HIP_coalition_consumer_goods_factor = 0.1 }
 			add_to_variable = {	HIP_coalition_army_core_defence_factor = 0.2 }
 			add_to_variable = { HIP_coalition_monthly_population = 0.2 }
 			custom_effect_tooltip = HIP_coalition_reconstruction_7
@@ -19982,11 +20014,30 @@ shared_focus = {
 		available_if_capitulated = no
 
 		completion_reward = {
-			add_tech_bonus = {
-				name = HIP_expand_the_marine_corps
-				category = marine_tech
-				bonus = 1
-				uses = 2
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_doctrine_cost_reduction = {
+					name = special_forces_bonus
+					cost_reduction = 0.50
+					uses = 2
+					category = cat_marines_doctrine
+				}
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 0.50
+					uses = 2
+					category = marine_tech
+				}
+			}
+			else = {
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 1.0
+					uses = 2
+					category = marine_tech
+				}
 			}
 			add_tech_bonus = {
 				name = HIP_expand_the_marine_corps
@@ -20971,8 +21022,20 @@ shared_focus = {
 		available_if_capitulated = no
 
 		completion_reward = {
-			custom_effect_tooltip = available_designer
-			show_ideas_tooltip = HIP_bellbreeze_aircraft_corporation
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}    
+				custom_effect_tooltip = available_mio_tt
+				show_mio_tooltip = HIP_bellbreeze_aircraft_corporation_organization
+				mio:HIP_bellbreeze_aircraft_corporation_organization = {
+					add_mio_funds = 350
+				}
+			}
+			else = {
+				custom_effect_tooltip = available_designer
+				show_ideas_tooltip = HIP_bellbreeze_aircraft_corporation
+			}
 			if = {
     	        limit = {
     	            has_dlc = "By Blood Alone"
@@ -21797,11 +21860,30 @@ shared_focus = {
 		available_if_capitulated = no
 
 		completion_reward = {
-			add_tech_bonus = {
-				name = HIP_air_to_ground_warfare
-				bonus = 1
-				uses = 2
-				category = para_tech
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_doctrine_cost_reduction = {
+					name = special_forces_bonus
+					cost_reduction = 0.50
+					uses = 2
+					category = cat_paratroopers_doctrine
+				}
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 0.50
+					uses = 2
+					category = para_tech
+				}
+			}
+			else = {
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 1.0
+					uses = 2
+					category = para_tech
+				}
 			}
 		}
 	}
@@ -21940,11 +22022,30 @@ shared_focus = {
 		available_if_capitulated = no
 
 		completion_reward = {
-			add_tech_bonus = {
-				name = HIP_mountain_warfare_school
-				category = mountaineers_tech
-				uses = 2
-				bonus = 1
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_doctrine_cost_reduction = {
+					name = special_forces_bonus
+					cost_reduction = 0.50
+					uses = 2
+					category = cat_mountaineers_doctrine
+				}
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 0.50
+					uses = 2
+					category = mountaineers_tech
+				}
+			}
+			else = {
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 1.0
+					uses = 2
+					category = mountaineers_tech
+				}
 			}
 		}
 	}
@@ -22529,8 +22630,21 @@ shared_focus = {
 		available_if_capitulated = no
 
 		completion_reward = {
-			custom_effect_tooltip = available_designer
-			show_ideas_tooltip = HIP_consolidated_aircraft
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}    
+				custom_effect_tooltip = available_mio_tt
+				show_mio_tooltip = HIP_consolidated_aircraft_organization
+				mio:HIP_consolidated_aircraft_organization = {
+					add_mio_size = 1
+					add_mio_funds = 500
+				}
+			}
+			else = {
+				custom_effect_tooltip = available_designer
+				show_ideas_tooltip = HIP_consolidated_aircraft
+			}
 		}
 	}
 
@@ -23222,7 +23336,7 @@ shared_focus = {
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus HIP_SIR_no_time_for_games"
 		add_ideas = HIP_siren_economy
-		set_variable = { HIP_MAGIC_consumer_goods_factor = 0.05 }
+		set_variable = { HIP_MAGIC_consumer_goods_factor = 0.1 }
 		set_variable = { HIP_SIR_MAGIC_economy_level = 1 }
 		custom_effect_tooltip = HIP_SIR_economy_unlock_tt
 	}
@@ -24137,6 +24251,7 @@ shared_focus = {
 		if = {
 			limit = {
 				NOT = {
+					has_dlc = "Arms Against Tyranny"
 					has_idea = HIP_marbreeze_herring
 					has_idea = HIP_crystalstar_corporation
 					has_idea = HIP_army_ordnance_department
@@ -24151,6 +24266,7 @@ shared_focus = {
 		if = {
 			limit = {
 				NOT = {
+					has_dlc = "Arms Against Tyranny"
 					has_idea = HIP_summershores_armory
 					has_idea = HIP_lightstar_motor_company
 					has_idea = HIP_royal_island_arsenal
@@ -24164,6 +24280,7 @@ shared_focus = {
 		if = {
 			limit = {
 				NOT = {
+					has_dlc = "Arms Against Tyranny"
 					has_idea = HIP_shell_oil
 					has_idea = HIP_standard_electric
 					has_idea = HIP_general_machines
@@ -24178,6 +24295,7 @@ shared_focus = {
 		if = {
 			limit = {
 				NOT = {
+					has_dlc = "Arms Against Tyranny"
 					has_idea = HIP_national_aeronautical_association
 					has_idea = HIP_bellbreeze_aircraft_corporation
 					has_idea = HIP_lightning
@@ -24195,6 +24313,7 @@ shared_focus = {
 		if = {
 			limit = {
 				NOT = {
+					has_dlc = "Arms Against Tyranny"
 					has_idea = HIP_clawes_naval_yard
 					has_idea = HIP_electric_boat_company
 					has_idea = HIP_aris_trench_naval_yard
@@ -24255,7 +24374,7 @@ shared_focus = {
 			limit = {
 				is_ai = yes
 			}
-			add_to_variable = { HIP_MAGIC_consumer_goods_factor = -0.01 }
+			add_to_variable = { HIP_MAGIC_consumer_goods_factor = -0.02 }
 			add_to_variable = { HIP_MAGIC_production_speed_buildings_factor = 0.02 }
 			add_to_variable = { HIP_MAGIC_conscription = 0.01 }
 			add_to_variable = { HIP_MAGIC_recruitable_seapony_pop = 0.01 }
@@ -24363,7 +24482,7 @@ shared_focus = {
 			limit = {
 				is_ai = yes
 			}
-			add_to_variable = { HIP_MAGIC_consumer_goods_factor = -0.01 }
+			add_to_variable = { HIP_MAGIC_consumer_goods_factor = -0.02 }
 			add_to_variable = { HIP_MAGIC_production_speed_buildings_factor = 0.02 }
 			add_to_variable = { HIP_MAGIC_conscription = 0.01 }
 			add_to_variable = { HIP_MAGIC_recruitable_seapony_pop = 0.01 }
@@ -25104,7 +25223,7 @@ shared_focus = {
 			limit = {
 				is_ai = yes
 			}
-			add_to_variable = { HIP_MAGIC_consumer_goods_factor = -0.025 }
+			add_to_variable = { HIP_MAGIC_consumer_goods_factor = -0.05 }
 			add_to_variable = { HIP_MAGIC_production_speed_buildings_factor = 0.05 }
 			add_to_variable = { HIP_MAGIC_conscription = 0.025 }
 			add_to_variable = { HIP_MAGIC_recruitable_seapony_pop = 0.025 }
@@ -25156,7 +25275,7 @@ shared_focus = {
 				limit = {
 					is_ai = yes
 				}
-				add_to_variable = { HIP_MAGIC_consumer_goods_factor = -0.015 }
+				add_to_variable = { HIP_MAGIC_consumer_goods_factor = -0.03 }
 				add_to_variable = { HIP_MAGIC_production_speed_buildings_factor = 0.03 }
 				add_to_variable = { HIP_MAGIC_conscription = 0.015 }
 				add_to_variable = { HIP_MAGIC_recruitable_seapony_pop = 0.015 }
@@ -25500,7 +25619,7 @@ shared_focus = {
 			limit = {
 				is_ai = yes
 			}
-			add_to_variable = { HIP_MAGIC_consumer_goods_factor = -0.03 }
+			add_to_variable = { HIP_MAGIC_consumer_goods_factor = -0.06 }
 			add_to_variable = { HIP_MAGIC_production_speed_buildings_factor = 0.06 }
 			add_to_variable = { HIP_MAGIC_conscription = 0.03 }
 			add_to_variable = { HIP_MAGIC_recruitable_seapony_pop = 0.03 }
@@ -25647,7 +25766,7 @@ shared_focus = {
 			limit = {
 				is_ai = yes
 			}
-			add_to_variable = { HIP_MAGIC_consumer_goods_factor = -0.025 }
+			add_to_variable = { HIP_MAGIC_consumer_goods_factor = -0.05 }
 			add_to_variable = { HIP_MAGIC_production_speed_buildings_factor = 0.05 }
 			add_to_variable = { HIP_MAGIC_conscription = 0.025 }
 			add_to_variable = { HIP_MAGIC_recruitable_seapony_pop = 0.025 }
@@ -26428,7 +26547,7 @@ shared_focus = {
 				is_ai = yes
 				has_completed_focus = HIP_SIR_all_we_need_is_us
 			}
-			add_to_variable = { HIP_MAGIC_consumer_goods_factor = 0.025 }
+			add_to_variable = { HIP_MAGIC_consumer_goods_factor = 0.05 }
 			add_to_variable = { HIP_MAGIC_production_speed_buildings_factor = -0.05 }
 			add_to_variable = { HIP_MAGIC_conscription = -0.025 }
 			add_to_variable = { HIP_MAGIC_recruitable_seapony_pop = -0.025 }
@@ -28224,8 +28343,8 @@ shared_focus = {
 	}
 }
 
-shared_focus = {
-	id = HIP_SIR_combine_the_corporations
+shared_focus = { ### NOTE FOR SECOND PASS ###
+	id = HIP_SIR_combine_the_corporations 
 	icon = GFX_goal_HIP_SIR_SNA_combine_corporations
 	x = -1
 	y = 1
@@ -28985,7 +29104,7 @@ shared_focus = {
 				limit = {
 					is_ai = yes
 				}
-				add_to_variable = { HIP_MAGIC_consumer_goods_factor = 0.01 }
+				add_to_variable = { HIP_MAGIC_consumer_goods_factor = 0.02 }
 				add_to_variable = { HIP_MAGIC_production_speed_buildings_factor = -0.02 }
 				add_to_variable = { HIP_MAGIC_conscription = -0.01 }
 				add_to_variable = { HIP_MAGIC_recruitable_seapony_pop = -0.01 }
diff --git a/common/national_focus/HLQ.txt b/common/national_focus/HLQ.txt
index 81d1d23d106..e940a7b6f15 100644
--- a/common/national_focus/HLQ.txt
+++ b/common/national_focus/HLQ.txt
@@ -6802,6 +6802,16 @@ focus_tree = {
 					producer = GRI
 				}
 			}
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_equipment_subsidy = {
+					cic = 500
+					equipment_type = small_plane_airframe
+					seller_tags = { GRI STW ANG FEA BRZ PYT YAL KAT ROU }
+				}
+			}
 		}
 		search_filters = { FOCUS_FILTER_AIRFORCE_BONUS }
 	}
@@ -7010,6 +7020,16 @@ focus_tree = {
 					producer = GRI
 				}
 			}
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_equipment_subsidy = {
+					cic = 500
+					equipment_type = medium_plane_airframe
+					seller_tags = { GRI STW ANG FEA BRZ PYT YAL KAT ROU }
+				}
+			}
 		}
 		search_filters = { FOCUS_FILTER_AIRFORCE_BONUS }
 	}
@@ -7108,12 +7128,31 @@ focus_tree = {
 
 		completion_reward = {
 			log = "[GetDateText]: [Root.GetName]: Focus HLQ_airborne"
-			add_tech_bonus = {
-			    name = special_forces_bonus
-			    bonus = 3.0
-			    uses = 1
-			    category = para_tech
-		    }
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_doctrine_cost_reduction = {
+					name = special_forces_bonus
+					cost_reduction = 0.80
+					uses = 1
+					category = cat_paratroopers_doctrine
+				}
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 1.0
+					uses = 1
+					category = para_tech
+				}
+			}
+			else = {
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 3.0
+					uses = 1
+					category = para_tech
+				}
+			}
 		}
 		search_filters = { FOCUS_FILTER_RESEARCH }
 		search_filters = { FOCUS_FILTER_AIRFORCE_BONUS FOCUS_FILTER_RESEARCH }
@@ -7320,13 +7359,30 @@ focus_tree = {
 
 		completion_reward = {
 			log = "[GetDateText]: [Root.GetName]: Focus HLQ_the_marine_infantry"
-			add_tech_bonus = {
-				name = navy_bonus
-				bonus = 1.0
-				uses = 1
-				technology = marines
-				technology = marines2
-				technology = marines3
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_doctrine_cost_reduction = {
+					name = special_forces_bonus
+					cost_reduction = 0.75
+					uses = 1
+					category = cat_marines_doctrine
+				}
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 0.75
+					uses = 1
+					category = marine_tech
+				}
+			}
+			else = {
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 1.0
+					uses = 1
+					category = marine_tech
+				}
 			}
 		}
 		search_filters = { FOCUS_FILTER_RESEARCH }
@@ -8322,7 +8378,6 @@ focus_tree = {
 			add_corps_commander_role = {
 				character = HLQ_wolfhard_fischart
 
-				portrait_path = "gfx/leaders/Asia/portrait_griffon_generic_land_3.dds"
 				traits = { griffon_race_trait skilled_staffer winter_specialist }
 				skill = 2
 				attack_skill = 3
@@ -8343,7 +8398,6 @@ focus_tree = {
 			add_corps_commander_role = {
 				character = HLQ_julian_feininger
 
-				portrait_path = "gfx/leaders/Asia/portrait_griffon_generic_land_1.dds"
 				traits = { griffon_race_trait old_guard brilliant_strategist }
 				skill = 3
 				attack_skill = 3
diff --git a/common/national_focus/JER.txt b/common/national_focus/JER.txt
index d1c05668995..7dc258c155f 100644
--- a/common/national_focus/JER.txt
+++ b/common/national_focus/JER.txt
@@ -6596,8 +6596,21 @@ focus_tree = {
 		}
 		completion_reward = {
 			log = "[GetDateText]: [Root.GetName]: Focus JER_support_automobile_industry"
-			custom_effect_tooltip = available_designer
-		    show_ideas_tooltip = leopard_jer
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}    
+				custom_effect_tooltip = available_mio_tt
+				show_mio_tooltip = JER_leopard_jer_organization
+				mio:JER_leopard_jer_organization = {
+					add_mio_size = 1
+					add_mio_funds = 200
+				}
+			}
+			else = {
+				custom_effect_tooltip = available_designer
+				show_ideas_tooltip = leopard_jer
+			}
 			one_random_arms_factory = yes
 		}
 	}
@@ -7174,11 +7187,30 @@ focus_tree = {
 		}
 		completion_reward = {
 			log = "[GetDateText]: [Root.GetName]: Focus JER_pridean_marine_traditions"
-			add_tech_bonus = {
-				name = navy_bonus
-				bonus = 1.0
-				uses = 2
-				category = marine_tech
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_doctrine_cost_reduction = {
+					name = special_forces_bonus
+					cost_reduction = 0.50
+					uses = 2
+					category = cat_marines_doctrine
+				}
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 0.50
+					uses = 2
+					category = marine_tech
+				}
+			}
+			else = {
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 1.0
+					uses = 2
+					category = marine_tech
+				}
 			}
 		}
 		search_filters = { FOCUS_FILTER_RESEARCH }
@@ -7539,11 +7571,30 @@ focus_tree = {
 		completion_reward = {
 			log = "[GetDateText]: [Root.GetName]: Focus JER_special_forces_department"
 			add_ideas = JER_special_forces_department_idea
-			add_tech_bonus = {
-				name = special_forces_bonus
-				bonus = 3.0
-				uses = 1
-				category = special_forces_tech
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_doctrine_cost_reduction = {
+					name = special_forces_bonus
+					cost_reduction = 0.80
+					uses = 1
+					category = special_forces_doctrine
+				}
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 1.0
+					uses = 1
+					category = special_forces_tech
+				}
+			}
+			else = {
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 3.0
+					uses = 1
+					category = special_forces_tech
+				}
 			}
 		}
 		search_filters = { FOCUS_FILTER_RESEARCH FOCUS_FILTER_ARMY_BONUS }
diff --git a/common/national_focus/JES.txt b/common/national_focus/JES.txt
index 40fa11a0233..f5936e8b9b4 100644
--- a/common/national_focus/JES.txt
+++ b/common/national_focus/JES.txt
@@ -42,6 +42,21 @@ shared_focus = {
 			producer = JER
 		}
 		add_equipment_to_stockpile = { type = support_equipment_1 amount = 250 producer = JER }
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_equipment_subsidy = {
+				cic = 250
+				equipment_type = infantry_equipment
+				seller_tags = { JER JFT VIN JRR JEB TRD FEZ AET HEL FLO POM }
+			}
+			add_equipment_subsidy = {
+				cic = 250
+				equipment_type = support_equipment
+				seller_tags = { JER JFT VIN JRR JEB TRD FEZ AET HEL FLO POM }
+			}
+		}
 	}
 }
 shared_focus = {
@@ -835,8 +850,20 @@ shared_focus = {
 			uses = 2
 			category = infantry_weapons
 		}
-		custom_effect_tooltip = available_designer
-		show_ideas_tooltip = JES_improved_infantry_designer
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}    
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = JES_improved_infantry_designer_organization
+			mio:JES_improved_infantry_designer_organization = {
+				add_mio_funds = 350
+			}
+		}
+		else = {
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = JES_improved_infantry_designer
+		}
 	}
 	search_filters = { FOCUS_FILTER_RESEARCH }
 }
@@ -938,6 +965,18 @@ shared_focus = {
 				amount = 500
 			}
 		}
+		else_if = {
+			limit = {
+				has_tech = tech_trucks
+			}
+			set_technology = {
+				motorised_infantry = 1
+			}
+			add_equipment_to_stockpile = { 
+				type = motorized_equipment 
+				amount = 250
+			}
+		}
 		else = {
 			set_technology = {
 				motorised_infantry = 1
@@ -973,6 +1012,16 @@ shared_focus = {
 			category = artillery
 		}
 		add_equipment_to_stockpile = { type = artillery_equipment amount = 250 producer = JER }
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_equipment_subsidy = {
+				cic = 500
+				equipment_type = artillery_equipment
+				seller_tags = { JER JFT VIN JRR JEB TRD FEZ AET HEL FLO POM }
+			}
+		}
 	}
 	search_filters = { FOCUS_FILTER_RESEARCH }
 }
@@ -1002,8 +1051,21 @@ shared_focus = {
 			uses = 2
 			category = armor
 		}
-		custom_effect_tooltip = available_designer
-		show_ideas_tooltip = JES_medium_tank_manufacturer
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}    
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = JES_medium_tank_manufacturer_organization
+			mio:JES_medium_tank_manufacturer_organization = {
+				add_mio_size = 1
+				add_mio_funds = 500
+			}
+		}
+		else = {
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = JES_medium_tank_manufacturer
+		}
 	}
 	search_filters = { FOCUS_FILTER_RESEARCH }
 }
diff --git a/common/national_focus/JUN.txt b/common/national_focus/JUN.txt
index c2ecddc7fc4..2e4a4877b06 100644
--- a/common/national_focus/JUN.txt
+++ b/common/national_focus/JUN.txt
@@ -811,6 +811,16 @@ shared_focus = {
 		    amount = 750
 			producer = EQS
 		}
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_equipment_subsidy = {
+				cic = 500
+				equipment_type = support_equipment
+				seller_tags = { EQS CRY NLR VAN SCS LSP NMS CES BAL TEM BUF }
+			}
+		}
 	}
 	search_filters = { FOCUS_FILTER_RESEARCH }
 }
@@ -1149,11 +1159,30 @@ shared_focus = {
 	}
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus JUN_spec_ops_department"
-		add_tech_bonus = {
-			name = special_forces_bonus
-			bonus = 1.0
-			uses = 2
-			category = special_forces_tech
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_doctrine_cost_reduction = {
+				name = special_forces_bonus
+				cost_reduction = 0.50
+				uses = 2
+				category = special_forces_doctrine
+			}
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 0.50
+				uses = 2
+				category = special_forces_tech
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 1.0
+				uses = 2
+				category = special_forces_tech
+			}
 		}
 	}
 	search_filters = { FOCUS_FILTER_RESEARCH }
diff --git a/common/national_focus/KAT.txt b/common/national_focus/KAT.txt
index af00dc492f6..afeb37452ef 100644
--- a/common/national_focus/KAT.txt
+++ b/common/national_focus/KAT.txt
@@ -8194,17 +8194,31 @@ shared_focus = {
 	}
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus KAT_special_forces"
-		add_tech_bonus = {
-			name = special_forces_bonus
-			bonus = 0.5
-			uses = 2
-			technology = paratroopers
-			technology = paratroopers2
-			technology = marines
-			technology = marines2
-			technology = tech_mountaineers
-			technology = tech_mountaineers2
-		}
+		if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_doctrine_cost_reduction = {
+					name = special_forces_bonus
+					cost_reduction = 0.35
+					uses = 1
+					category = special_forces_doctrine
+				}
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 0.5
+					uses = 2
+					category = special_forces_tech
+				}
+			}
+			else = {
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 0.5
+					uses = 2
+					category = special_forces_tech
+				}
+			}
 	}
 	search_filters = {
 		FOCUS_FILTER_RESEARCH
@@ -11535,11 +11549,30 @@ shared_focus = {
 	}
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus KAT_paratrooper_project"
-		add_tech_bonus = {
-			name = paratrooper_bonus
-			bonus = 1
-			uses = 2
-			category = para_tech
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_doctrine_cost_reduction = {
+				name = special_forces_bonus
+				cost_reduction = 0.50
+				uses = 2
+				category = cat_paratroopers_doctrine
+			}
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 0.50
+				uses = 2
+				category = para_tech
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 1.0
+				uses = 2
+				category = para_tech
+			}
 		}
 	}
 	search_filters = {
@@ -11932,13 +11965,30 @@ shared_focus = {
 	}
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus KAT_marine_f"
-		add_tech_bonus = {
-			name = navy_bonus
-			bonus = 1
-			uses = 1
-			technology = marines
-			technology = marines2
-			technology = marines3
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_doctrine_cost_reduction = {
+				name = special_forces_bonus
+				cost_reduction = 0.75
+				uses = 1
+				category = cat_marines_doctrine
+			}
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 0.75
+				uses = 1
+				category = marine_tech
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 1.0
+				uses = 1
+				category = marine_tech
+			}
 		}
 	}
 	search_filters = {
diff --git a/common/national_focus/KIR.txt b/common/national_focus/KIR.txt
index fe262045151..d124431e3c6 100644
--- a/common/national_focus/KIR.txt
+++ b/common/national_focus/KIR.txt
@@ -605,7 +605,7 @@ shared_focus = {
 
 shared_focus = {
 	id = KIR_focus_3c
-	icon = GFX_goal_KIR_banner
+	icon = GFX_goal_KIR_bannerkirin
 	relative_position_id = KIR_focus_1
 	x = 6
 	y = 2
@@ -733,7 +733,7 @@ shared_focus = {
 		}
 		custom_effect_tooltip = KIR_silence_consumergoods1_tt
 		hidden_effect = {
-			subtract_from_variable = { var = KIR_the_silence_consumer_goods_var value = 0.03 }
+			subtract_from_variable = { var = KIR_the_silence_consumer_goods_var value = 0.06 }
 		}
 		custom_effect_tooltip = KIR_silence_polpowergain4_tt
 		hidden_effect = {
@@ -2101,6 +2101,16 @@ shared_focus = {
 			category = motorized_equipment
 		}
 		add_equipment_to_stockpile = { type = motorized_equipment amount = 300 producer = GRI }
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_equipment_subsidy = {
+				cic = 500
+				equipment_type = motorized_equipment
+				seller_tags = { GRI STW ANG FEA BRZ PYT YAL KAT ROU }
+			}
+		}
 	}
 }
 
@@ -3132,7 +3142,7 @@ shared_focus = {
 		}
 		custom_effect_tooltip = KIR_silence_consumergoods_tt
 		hidden_effect = {
-			subtract_from_variable = { var = KIR_the_silence_consumer_goods_var value = 0.05 }
+			subtract_from_variable = { var = KIR_the_silence_consumer_goods_var value = 0.1 }
 		}
 		custom_effect_tooltip = KIR_line_break
 		swap_ideas = { add_idea = civilian_economy remove_idea = undisturbed_isolation }
@@ -3404,7 +3414,7 @@ shared_focus = {
 		custom_effect_tooltip = KIR_modify_silence_tt
 		custom_effect_tooltip = KIR_silence_consumergoods2_tt
 		hidden_effect = {
-			subtract_from_variable = { var = KIR_the_silence_consumer_goods_var value = 0.02 }
+			subtract_from_variable = { var = KIR_the_silence_consumer_goods_var value = 0.04 }
 		}
 		custom_effect_tooltip = KIR_line_break
 		increase_society_development_gradual = yes
@@ -3546,11 +3556,107 @@ shared_focus = {
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus KIR_focus_9d"
 		set_country_flag = KIR_armour_bureau_available
-		custom_effect_tooltip = available_designer
 		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+				has_dlc = "La Resistance"
+			}
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = KIR_armour_bureau_LaR_organization
+			mio:KIR_armour_bureau_LaR_organization = {
+				add_mio_size = 1
+				add_mio_funds = 400
+			}
+			add_tech_bonus = {
+				name = tank_research
+				bonus = 2
+				uses = 1
+				technology = armored_car1
+				technology = armored_car2
+				technology = armored_car3
+				technology = armored_car_at_upgrade
+			}
+			add_equipment_to_stockpile = { type = armored_car_equipment amount = 120 producer = EQS }
+			add_equipment_subsidy = {
+				cic = 500
+				equipment_type = armored_car_equipment
+				seller_tags = { EQS CRY NLR VAN SCS LSP NMS CES JUN BAL TEM BUF }
+			}
+		}
+		else_if = {
+			limit = { 
+				has_dlc = "Arms Against Tyranny"
+				has_dlc = "No Step Back"
+			}
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = KIR_armour_bureau_organization
+			mio:KIR_armour_bureau_organization = {
+				add_mio_size = 1
+				add_mio_funds = 400
+			}
+			add_tech_bonus = {
+				name = tank_research
+				bonus = 2
+				uses = 1
+				category = cat_light_armor
+			}
+			create_equipment_variant = {
+				name = "Yak Tank"
+				type = light_tank_chassis_0
+				parent_version = 0
+				modules = {
+					main_armament_slot = tank_heavy_machine_gun
+					turret_type_slot = tank_light_one_man_tank_turret
+					suspension_type_slot = tank_bogie_suspension
+					armor_type_slot = tank_riveted_armor
+					engine_type_slot = tank_gasoline_engine
+				}
+				upgrades = {
+					tank_nsb_engine_upgrade = 1
+					tank_nsb_armor_upgrade = 1
+				}
+				icon = "GFX_commonwealth_2d_gwtank_medium"
+			}
+			add_equipment_to_stockpile = { type = light_tank_chassis amount = 120 producer = EQS version_name = "Yak Tank" }
+			add_equipment_subsidy = {
+				cic = 500
+				equipment_type = light_tank_chassis
+				seller_tags = { EQS CRY NLR VAN SCS LSP NMS CES JUN BAL TEM BUF }
+			}
+		}
+		else_if = {
+			limit = { 
+				has_dlc = "Arms Against Tyranny"
+			}
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = KIR_armour_bureau_organization
+			mio:KIR_armour_bureau_organization = {
+				add_mio_size = 1
+				add_mio_funds = 400
+			}
+			add_tech_bonus = {
+				name = tank_research
+				bonus = 2
+				uses = 1
+				category = cat_light_armor
+			}
+			add_equipment_to_stockpile = { type = light_tank_chassis amount = 120 producer = EQS }
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_equipment_subsidy = {
+					cic = 500
+					equipment_type = light_tank_chassis
+					seller_tags = { EQS CRY NLR VAN SCS LSP NMS CES JUN BAL TEM BUF }
+				}
+			}
+		}
+		else_if = {
 			limit = {
 				has_dlc = "La Resistance"
 			}
+			custom_effect_tooltip = available_designer
 			show_ideas_tooltip = KIR_armour_bureau_LaR
 			add_tech_bonus = {
 				name = tank_research
@@ -3567,6 +3673,7 @@ shared_focus = {
 			limit = {
 				has_dlc = "No Step Back"
 			}
+			custom_effect_tooltip = available_designer
 			show_ideas_tooltip = KIR_armour_bureau
 			add_tech_bonus = {
 				name = tank_research
@@ -3591,7 +3698,7 @@ shared_focus = {
 				}
 				icon = "GFX_commonwealth_2d_gwtank_medium"
 			}
-			add_equipment_to_stockpile = { type = light_tank_chassis amount = 120 producer = EQS version_name = "Yak Tank" }
+			add_equipment_to_stockpile = { type = light_tank_chassis amount = 120 producer = EQS variant_name = "Yak Tank" }
 		}
 		else = {
 			show_ideas_tooltip = KIR_armour_bureau
@@ -7005,8 +7112,8 @@ shared_focus = {
 		#############################
 		set_variable = { var = KIS_treasury_debt_PP_RATIO_var value = 250000 } ## For every 5k in debt, -2% PP factor
 		set_variable = { var = KIS_treasury_debt_PP_RATIO_var_DISPLAY value = 2 }
-		set_variable = { var = KIS_treasury_debt_consumer_goods_RATIO_var value = 500000 } ## For every 5k in debt, +1% consumer goods factor
-		set_variable = { var = KIS_treasury_debt_consumer_goods_RATIO_var_DISPLAY value = 1 }
+		set_variable = { var = KIS_treasury_debt_consumer_goods_RATIO_var value = 250000 } ## For every 5k in debt, +2% consumer goods factor
+		set_variable = { var = KIS_treasury_debt_consumer_goods_RATIO_var_DISPLAY value = 2 }
 		######################
 		## Determine Prices ##
 		######################
@@ -10808,15 +10915,10 @@ shared_focus = {
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus KIR_empire_focus_coc4"
 		country_event = { id = kirin_council.352 hours = 1 }
-		save_current_manpower = yes
-		every_controlled_state = {
-			limit = {
-				is_core_of = COC
-			}
-			add_resistance = -5
-			add_manpower = -10000
-		}
-		restore_previous_manpower = yes
+		set_country_flag = unlocked_forced_labor_occupation_improved_EaW
+		set_country_flag = unlocked_harsh_quotas_occupation_improved_EaW
+		custom_effect_tooltip = forced_labor_occupation_improved_EaW_tt
+		custom_effect_tooltip = harsh_quotas_occupation_improved_EaW_tt
 	}
 }
 
@@ -13575,11 +13677,30 @@ shared_focus = {
 		custom_effect_tooltip = KIR_line_break
 		add_research_slot = 1
 		set_country_flag = KIC_small_arms_inventor_available
-		custom_effect_tooltip = available_designer_individual
-		show_ideas_tooltip = KIC_small_arms_inventor
 		set_country_flag = KIC_aerospace_engineer_available
-		custom_effect_tooltip = available_designer_individual
-		show_ideas_tooltip = KIC_aerospace_engineer
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}    
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = KIC_small_arms_inventor_organization
+			mio:KIC_small_arms_inventor_organization = {
+				add_mio_size = 1
+				add_mio_funds = 400
+			}
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = KIC_aerospace_engineer_organization
+			mio:KIC_aerospace_engineer_organization = {
+				add_mio_size = 1
+				add_mio_funds = 400
+			}
+		}
+		else = {
+			custom_effect_tooltip = available_designer_individual
+			show_ideas_tooltip = KIC_small_arms_inventor
+			custom_effect_tooltip = available_designer_individual
+			show_ideas_tooltip = KIC_aerospace_engineer
+		}
 	}
 }
 
@@ -13927,6 +14048,17 @@ shared_focus = {
 		custom_effect_tooltip = KIR_line_break
 		custom_effect_tooltip = KIR_republic_postwar_focus_20a_tt
 		hidden_effect = {
+			if = {
+				limit = {
+					NOT = {
+						has_tech = tech_trucks
+					}
+				}
+				set_technology = {
+					popup = no
+					tech_trucks = 1
+				}
+			}
 			if = {
 				limit = {
 					NOT = {
@@ -14063,11 +14195,10 @@ shared_focus = {
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus KIR_republic_postwar_focus_20c"
 		country_event = { id = kirin_republic.46 hours = 1 }
-		add_popularity = {
-			ideology = communism
-			popularity = -0.03
-		}
-		custom_effect_tooltip = KIC_concentration_camps_unlock_tt
+		set_country_flag = unlocked_forced_labor_occupation_improved_EaW
+		set_country_flag = unlocked_harsh_quotas_occupation_improved_EaW
+		custom_effect_tooltip = forced_labor_occupation_improved_EaW_tt
+		custom_effect_tooltip = harsh_quotas_occupation_improved_EaW_tt
 	}
 }
 
@@ -14185,12 +14316,31 @@ shared_focus = {
 			uses = 1
 			category = cat_medium_armor
 		}
-		custom_effect_tooltip = available_designer_individual
-		show_ideas_tooltip = KIC_tank_designer_1
 		set_country_flag = KIC_tank_designer_1_available
-		custom_effect_tooltip = available_designer_individual
-		show_ideas_tooltip = KIC_tank_designer_2
 		set_country_flag = KIC_tank_designer_2_available
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}    
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = KIC_tank_designer_1_organization
+			mio:KIC_tank_designer_1_organization = {
+				add_mio_size = 1
+				add_mio_funds = 400
+			}
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = KIC_tank_designer_2_organization
+			mio:KIC_tank_designer_2_organization = {
+				add_mio_size = 1
+				add_mio_funds = 400
+			}
+		}
+		else = {
+			custom_effect_tooltip = available_designer_individual
+			show_ideas_tooltip = KIC_tank_designer_1
+			custom_effect_tooltip = available_designer_individual
+			show_ideas_tooltip = KIC_tank_designer_2
+		}
 	}
 	
 	search_filters = { FOCUS_FILTER_KIC_ARMY }
@@ -14288,12 +14438,31 @@ shared_focus = {
 			uses = 1
 			category = naval_doctrine
 		}
-		custom_effect_tooltip = available_designer
-		show_ideas_tooltip = KIR_DM_aerospace_engineering
 		set_country_flag = KIR_DM_aerospace_engineering_available
-		custom_effect_tooltip = available_designer
-		show_ideas_tooltip = KIR_DM_maritime_systems
 		set_country_flag = KIR_DM_maritime_systems_available
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}    
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = KIR_DM_aerospace_engineering_organization
+			mio:KIR_DM_aerospace_engineering_organization = {
+				add_mio_size = 1
+				add_mio_funds = 600
+			}
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = KIR_DM_maritime_systems_organization
+			mio:KIR_DM_maritime_systems_organization = {
+				add_mio_size = 1
+				add_mio_funds = 600
+			}
+		}
+		else = {
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = KIR_DM_aerospace_engineering
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = KIR_DM_maritime_systems
+		}
 	}
 	
 	search_filters = { FOCUS_FILTER_KIC_ARMY }
@@ -14594,6 +14763,7 @@ shared_focus = {
 	}
 	
 	available = {
+		has_country_flag = KIC_8_hundred_days_campaign_completed_flag
 		has_country_flag = KIC_democratic_ending_flag
 	}
 	
@@ -14632,6 +14802,7 @@ shared_focus = {
 	
 	available = {
 		has_manpower > 25000
+		has_country_flag = KIC_8_hundred_days_campaign_completed_flag
 		has_country_flag = KIC_authoritarian_ending_flag
 	}
 	
@@ -15107,23 +15278,7 @@ shared_focus = {
 		y = -1
 	}
 	
-	available = {
-		if = {
-			limit = {
-				has_country_flag = KIC_democratic_ending_flag
-			}
-			OR = {
-				ZLU = {
-					has_added_tension_amount > 4
-				}
-				ZOO = {
-					has_added_tension_amount > 4
-				}
-			}
-		}
-	}
-	
-	cost = 3.6
+	cost = 10
 
 	ai_will_do = {
 		factor = 50
@@ -15134,27 +15289,62 @@ shared_focus = {
 	
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus KIR_republic_postwar_focus_XY"
-		create_wargoal = {
-			type = annex_everything
-			target = ZLU
-		}
-		create_wargoal = {
-			type = annex_everything
-			target = ZOO
-		}
-		hidden_effect = {
-			ZLU = {
-				add_ai_strategy = {
-					type = prepare_for_war
-					id = KIC
-					value = 1000
+		every_country = {
+			limit = {
+				NOT = {
+					is_subject_of = KIC
+					has_war_with = KIC
+				}
+				OR = {
+					controls_state = 1126
+					controls_state = 1127
+					controls_state = 1128
+					controls_state = 1129
+					controls_state = 1130
+					controls_state = 1131
+					controls_state = 1132
+					controls_state = 1133
+					controls_state = 1134
+					controls_state = 1135
 				}
 			}
-			ZOO = {
-				add_ai_strategy = {
-					type = prepare_for_war
-					id = KIC
-					value = 1000
+			every_country = {
+				limit = {
+					tag = KIC
+				}
+				custom_effect_tooltip = KIR_republic_postwar_focus_XY_WG_tt 
+			}
+		}
+		for_each_scope_loop = {
+			array = global.countries
+			if = {
+				limit = {
+					NOT = {
+						is_subject_of = KIC
+						has_war_with = KIC
+					}
+					OR = {
+						controls_state = 1126
+						controls_state = 1127
+						controls_state = 1128
+						controls_state = 1129
+						controls_state = 1130
+						controls_state = 1131
+						controls_state = 1132
+						controls_state = 1133
+						controls_state = 1134
+						controls_state = 1135
+					}
+				}
+				KIC = {
+					create_wargoal = { type = annex_everything target = PREV }
+				}
+				hidden_effect = {
+					add_ai_strategy = {
+						type = prepare_for_war
+						id = KIC
+						value = 1000
+					}
 				}
 			}
 		}
@@ -15172,6 +15362,101 @@ shared_focus = {
 			1134 = { set_variable = { BANNER_JURISDICTION_VARS_CAP = 0.25 } set_variable = { BANNER_JURISDICTION_NUMBER = 59 } set_variable = { FlagCoreVar = 5 } set_variable = { FlagBorderVar = 7 } }
 			1135 = { set_variable = { BANNER_JURISDICTION_VARS_CAP = 0.25 } set_variable = { BANNER_JURISDICTION_NUMBER = 60 } set_variable = { FlagCoreVar = 6 } set_variable = { FlagBorderVar = 7 } }
 		}
+		add_war_support = 0.05
+	}
+}
+
+shared_focus = {
+	id = KIR_republic_postwar_focus_ZY
+	icon = GFX_goal_KIR_kaiser
+	relative_position_id = KIR_republic_postwar_focus_4b
+	x = 0
+	y = 2
+
+	prerequisite = {
+		focus = KIR_republic_postwar_focus_4b
+	}
+	
+	allow_branch = {
+		OR = {
+			has_country_flag = KIC_authoritarian_ending_flag
+			has_country_flag = KIC_democratic_ending_flag
+		}
+	}
+	
+	offset = {
+		trigger = {
+			has_country_flag = KIC_authoritarian_ending_flag
+		}
+		x = 1
+		y = -1
+	}
+	
+	cost = 7.2
+
+	ai_will_do = {
+		factor = 50
+	}
+	
+	will_lead_to_war_with = ROA
+	will_lead_to_war_with = TSV
+	
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus KIR_republic_postwar_focus_ZY"
+		every_neighbor_country = {
+			limit = {
+				NOT = {
+					is_ally_with = KIC
+					is_guaranteed_by = KIC
+					has_war_with = KIC
+				}
+				any_controlled_state = {
+					OR = {
+						region = 312
+						region = 313
+						region = 317
+					}
+				}
+			}
+			every_country = {
+				limit = {
+					tag = KIC
+				}
+				custom_effect_tooltip = KIR_republic_postwar_focus_ZY_WG_tt 
+			}
+		}
+		for_each_scope_loop = {
+			array = ROOT.neighbors
+			if = {
+				limit = {
+					NOT = {
+						is_ally_with = KIC
+						is_guaranteed_by = KIC
+						has_war_with = KIC
+					}
+					any_controlled_state = {
+						OR = {
+							region = 312
+							region = 313
+							region = 317
+						}
+					}
+				}
+				KIC = {
+					create_wargoal = { type = puppet_wargoal_focus target = PREV }
+				}
+				hidden_effect = {
+					add_ai_strategy = {
+						type = prepare_for_war
+						id = KIC
+						value = 1000
+					}
+				}
+			}
+		}
+		custom_effect_tooltip = KIR_line_break
+		add_command_power = 25
+		add_war_support = 0.05
 	}
 }
 
@@ -15308,6 +15593,14 @@ shared_focus = {
 				}
 				swap_ideas = { add_idea = KIR_wingluck_consortium_WLWW remove_idea = KIR_wingluck_consortium }
 			}
+			else_if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				mio:KIR_wingluck_consortium_organization = {
+					unlock_mio_trait_tooltip = KIR_VaKA_WLWW_organization
+				}
+			}
 		}
 	}
 }
@@ -15478,6 +15771,18 @@ shared_focus = {
 				}
 				swap_ideas = { add_idea = KIR_fragrance_shipyards_ADPE remove_idea = KIR_fragrance_shipyards }
 			}
+			else_if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				mio:KIR_fragrance_shipyards_organization = {
+					unlock_mio_trait_tooltip = KIR_VaKA_ADPE_organization
+				}
+				mio:KIR_fragrance_shipyards_organization= {
+					set_mio_icon = GFX_idea_KIR_fragrance_shipyards
+				}
+				
+			}
 		}
 	}
 }
@@ -16047,6 +16352,14 @@ shared_focus = {
 				}
 				swap_ideas = { add_idea = KIR_rhapsody_arsenal_LCAB remove_idea = KIR_rhapsody_arsenal }
 			}
+			else_if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				mio:KIR_rhapsody_arsenal_organization = {
+					unlock_mio_trait_tooltip = KIR_VaKA_LCAB_organization
+				}
+			}
 		}
 	}
 }
@@ -16474,31 +16787,54 @@ shared_focus = {
 		log = "[GetDateText]: [Root.GetName]: Focus KIR_ARMOUR_3"
 		set_country_flag = KIR_armour_bureau_VMWP_available
 		if = {
-			limit = {
-				has_dlc = "La Resistance"
-			}
-			custom_effect_tooltip = KIR_ARMOUR_3_LaR_tt
-		}
-		else_if = {
-			limit = {
-				NOT = {
+			limit = { has_dlc = "Arms Against Tyranny" }
+			if = {
+				limit = {
 					has_dlc = "La Resistance"
 				}
+				mio:KIR_armour_bureau_LaR_organization = {
+					unlock_mio_trait_tooltip = KIR_VaKA_VMWP_LaR_organization
+				}
+			}
+			else_if = {
+				limit = {
+					NOT = {
+						has_dlc = "La Resistance"
+					}
+				}
+				mio:KIR_armour_bureau_organization = {
+					unlock_mio_trait_tooltip = KIR_VaKA_VMWP_organization
+				}
 			}
-			custom_effect_tooltip = KIR_ARMOUR_3_tt
 		}
-		hidden_effect = {
+		else = {
 			if = {
 				limit = {
-					has_idea = KIR_armour_bureau
+					has_dlc = "La Resistance"
 				}
-				swap_ideas = { add_idea = KIR_armour_bureau_VMWP remove_idea = KIR_armour_bureau }
+				custom_effect_tooltip = KIR_ARMOUR_3_LaR_tt
 			}
 			else_if = {
 				limit = {
-					has_idea = KIR_armour_bureau_LaR
+					NOT = {
+						has_dlc = "La Resistance"
+					}
+				}
+				custom_effect_tooltip = KIR_ARMOUR_3_tt
+			}
+			hidden_effect = {
+				if = {
+					limit = {
+						has_idea = KIR_armour_bureau
+					}
+					swap_ideas = { add_idea = KIR_armour_bureau_VMWP remove_idea = KIR_armour_bureau }
+				}
+				else_if = {
+					limit = {
+						has_idea = KIR_armour_bureau_LaR
+					}
+					swap_ideas = { add_idea = KIR_armour_bureau_VMWP_LaR remove_idea = KIR_armour_bureau_LaR }
 				}
-				swap_ideas = { add_idea = KIR_armour_bureau_VMWP_LaR remove_idea = KIR_armour_bureau_LaR }
 			}
 		}
 	}
@@ -18278,6 +18614,16 @@ shared_focus = {
 			amount = 3000
 			producer = EQS
 		}
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_equipment_subsidy = {
+				cic = 500
+				equipment_type = infantry_equipment
+				seller_tags = { EQS CRY NLR VAN SCS LSP NMS CES JUN BAL TEM BUF }
+			}
+		}
 	}
 }
 
@@ -18841,7 +19187,7 @@ shared_focus = {
 
 shared_focus = {
 	id = KIR_civil_war_focus_5d
-	icon = GFX_goal_KIR_banner
+	icon = GFX_goal_KIR_bannerkirin
 	relative_position_id = KIR_civil_war_focus_3s
 	x = 0
 	y = 2
@@ -19129,6 +19475,16 @@ shared_focus = {
 			amount = 300
 			producer = EQS
 		}
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_equipment_subsidy = {
+				cic = 500
+				equipment_type = support_equipment
+				seller_tags = { EQS CRY NLR VAN SCS LSP NMS CES JUN BAL TEM BUF }
+			}
+		}
 		custom_effect_tooltip = KIR_line_break
 		set_country_flag = KIR_mahogany_available
 		custom_effect_tooltip = available_political_advisor
@@ -21663,8 +22019,16 @@ shared_focus = {
 		country_event = { id = kirin_council.117 hours = 3 }
 		custom_effect_tooltip = KIR_line_break
 		set_country_flag = CFR_imago_parastatal_available
-		custom_effect_tooltip = available_designer
-		show_ideas_tooltip = CFR_imago_parastatal
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_ideas = CFR_imago_parastatal_AAT
+		}
+		else = {
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = CFR_imago_parastatal
+		}
 	}
 }
 
@@ -21710,6 +22074,12 @@ shared_focus = {
 			}
 			swap_ideas = { add_idea = CFR_imago_parastatal_SIGNALS remove_idea = CFR_imago_parastatal }
 		}
+		else_if = {
+			limit = {
+				has_idea = CFR_imago_parastatal_AAT
+			}
+			swap_ideas = { add_idea = CFR_imago_parastatal_SIGNALS_AAT remove_idea = CFR_imago_parastatal_AAT }
+		}
 		else_if = {
 			limit = {
 				NOT = {
@@ -22438,16 +22808,6 @@ shared_focus = {
 	x = 1
 	y = 1
 	
-	offset = {
-		trigger = {
-			NOT = {
-				has_country_flag = CHN_FRV_CHN_active_flag
-			}
-		}
-		x = 0
-		y = -2
-	}
-	
 	available = {
 		is_ai = no
 	}
@@ -22662,6 +23022,31 @@ shared_focus = {
 			add_equipment_to_stockpile = { type = infantry_equipment amount = 200 producer = EQS }
 			add_equipment_to_stockpile = { type = infantry_equipment amount = 200 producer = STG }
 			add_equipment_to_stockpile = { type = infantry_equipment amount = 200 producer = CHN }
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_equipment_subsidy = {
+					cic = 250
+					equipment_type = infantry_equipment
+					seller_tags = { EQS CRY NLR VAN SCS LSP NMS CES JUN BAL TEM BUF }
+				}
+				add_equipment_subsidy = {
+					cic = 250
+					equipment_type = infantry_equipment
+					seller_tags = { YAK JAK GRF GFF PNG STG STL }
+				}
+				add_equipment_subsidy = {
+					cic = 250
+					equipment_type = infantry_equipment
+					seller_tags = { GRI STW ANG FEA BRZ PYT YAL KAT ROU }
+				}
+				add_equipment_subsidy = {
+					cic = 250
+					equipment_type = infantry_equipment
+					seller_tags = { JER JFT VIN JRR JEB TRD FEZ AET HEL FLO POM }
+				}
+			}
 			set_country_flag = FRV_Focus_Inf_Eq_Bonus
 		}
 	}
@@ -22695,6 +23080,31 @@ shared_focus = {
 			add_equipment_to_stockpile = { type = infantry_equipment amount = 200 producer = EQS }
 			add_equipment_to_stockpile = { type = infantry_equipment amount = 200 producer = STG }
 			add_equipment_to_stockpile = { type = infantry_equipment amount = 200 producer = CHN }
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_equipment_subsidy = {
+					cic = 250
+					equipment_type = infantry_equipment
+					seller_tags = { EQS CRY NLR VAN SCS LSP NMS CES JUN BAL TEM BUF }
+				}
+				add_equipment_subsidy = {
+					cic = 250
+					equipment_type = infantry_equipment
+					seller_tags = { YAK JAK GRF GFF PNG STG STL }
+				}
+				add_equipment_subsidy = {
+					cic = 250
+					equipment_type = infantry_equipment
+					seller_tags = { GRI STW ANG FEA BRZ PYT YAL KAT ROU }
+				}
+				add_equipment_subsidy = {
+					cic = 250
+					equipment_type = infantry_equipment
+					seller_tags = { JER JFT VIN JRR JEB TRD FEZ AET HEL FLO POM }
+				}
+			}
 			set_country_flag = FRV_Focus_Inf_Eq_Bonus
 		}
 	}
@@ -22856,6 +23266,31 @@ shared_focus = {
 			add_equipment_to_stockpile = { type = infantry_equipment amount = 200 producer = EQS }
 			add_equipment_to_stockpile = { type = infantry_equipment amount = 200 producer = STG }
 			add_equipment_to_stockpile = { type = infantry_equipment amount = 200 producer = CHN }
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_equipment_subsidy = {
+					cic = 250
+					equipment_type = infantry_equipment
+					seller_tags = { EQS CRY NLR VAN SCS LSP NMS CES JUN BAL TEM BUF }
+				}
+				add_equipment_subsidy = {
+					cic = 250
+					equipment_type = infantry_equipment
+					seller_tags = { YAK JAK GRF GFF PNG STG STL }
+				}
+				add_equipment_subsidy = {
+					cic = 250
+					equipment_type = infantry_equipment
+					seller_tags = { GRI STW ANG FEA BRZ PYT YAL KAT ROU }
+				}
+				add_equipment_subsidy = {
+					cic = 250
+					equipment_type = infantry_equipment
+					seller_tags = { JER JFT VIN JRR JEB TRD FEZ AET HEL FLO POM }
+				}
+			}
 			set_country_flag = FRV_Focus_Inf_Eq_Bonus
 		}
 	}
@@ -22889,6 +23324,31 @@ shared_focus = {
 			add_equipment_to_stockpile = { type = infantry_equipment amount = 200 producer = EQS }
 			add_equipment_to_stockpile = { type = infantry_equipment amount = 200 producer = STG }
 			add_equipment_to_stockpile = { type = infantry_equipment amount = 200 producer = CHN }
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_equipment_subsidy = {
+					cic = 250
+					equipment_type = infantry_equipment
+					seller_tags = { EQS CRY NLR VAN SCS LSP NMS CES JUN BAL TEM BUF }
+				}
+				add_equipment_subsidy = {
+					cic = 250
+					equipment_type = infantry_equipment
+					seller_tags = { YAK JAK GRF GFF PNG STG STL }
+				}
+				add_equipment_subsidy = {
+					cic = 250
+					equipment_type = infantry_equipment
+					seller_tags = { GRI STW ANG FEA BRZ PYT YAL KAT ROU }
+				}
+				add_equipment_subsidy = {
+					cic = 250
+					equipment_type = infantry_equipment
+					seller_tags = { JER JFT VIN JRR JEB TRD FEZ AET HEL FLO POM }
+				}
+			}
 			set_country_flag = FRV_Focus_Inf_Eq_Bonus
 		}
 	}
@@ -22909,8 +23369,21 @@ shared_focus = {
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus FRV_Focus_15"
 		set_country_flag = KIR_FRV_pearl_works_available
-		custom_effect_tooltip = available_designer
-		show_ideas_tooltip = KIR_FRV_pearl_works
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}    
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = KIR_FRV_pearl_works_organization
+			mio:KIR_FRV_pearl_works_organization = {
+				add_mio_size = 1
+				add_mio_funds = 350
+			}
+		}
+		else = {
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = KIR_FRV_pearl_works
+		}
 		set_country_flag = KIR_FRV_producers_combine_available
 		custom_effect_tooltip = available_industrial_concern
 		show_ideas_tooltip = KIR_FRV_producers_combine
@@ -23309,25 +23782,25 @@ shared_focus = {
 		hidden_effect = {
 			if = {
 				limit = {
-					has_full_control_of_state = 1058
+					controls_state = 1058
 				}
 				add_to_temp_variable = { KIRGetKSRConstituents = 1 }
 			}
 			if = {
 				limit = {
-					has_full_control_of_state = 1054
+					controls_state = 1054
 				}
 				add_to_temp_variable = { KIRGetKSRConstituents = 1 }
 			}
 			if = {
 				limit = {
-					has_full_control_of_state = 1083
+					controls_state = 1083
 				}
 				add_to_temp_variable = { KIRGetKSRConstituents = 1 }
 			}
 			if = {
 				limit = {
-					has_full_control_of_state = 924
+					controls_state = 924
 				}
 				add_to_temp_variable = { KIRGetKSRConstituents = 1 }
 			}
@@ -23367,25 +23840,25 @@ shared_focus = {
 		custom_effect_tooltip = FRV_Focus_20_tt
 		if = {
 			limit = {
-				has_full_control_of_state = 1058
+				controls_state = 1058
 			}
 			custom_effect_tooltip = FRV_KSR_BSM_tt
 		}
 		if = {
 			limit = {
-				has_full_control_of_state = 1054
+				controls_state = 1054
 			}
 			custom_effect_tooltip = FRV_KSR_CRZ_tt
 		}
 		if = {
 			limit = {
-				has_full_control_of_state = 1083
+				controls_state = 1083
 			}
 			custom_effect_tooltip = FRV_KSR_MCR_tt
 		}
 		if = {
 			limit = {
-				has_full_control_of_state = 924
+				controls_state = 924
 			}
 			custom_effect_tooltip = FRV_KSR_MCT_tt
 		}
@@ -23963,8 +24436,21 @@ shared_focus = {
 			}
 		}
 		set_country_flag = KIR_fern_flare_designer_available
-		custom_effect_tooltip = available_designer_individual
-		show_ideas_tooltip = KIR_fern_flare_designer
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}    
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = KIR_fern_flare_designer_organization
+			mio:KIR_fern_flare_designer_organization = {
+				add_mio_size = 1
+				add_mio_funds = 200
+			}
+		}
+		else = {
+			custom_effect_tooltip = available_designer_individual
+			show_ideas_tooltip = KIR_fern_flare_designer
+			}
 	}
 }
 
@@ -25114,6 +25600,21 @@ shared_focus = {
 			amount = 2500
 			producer = EQS
 		}
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_equipment_subsidy = {
+				cic = 250
+				equipment_type = infantry_equipment
+				seller_tags = { EQS CRY NLR VAN SCS LSP NMS CES JUN BAL TEM BUF }
+			}
+			add_equipment_subsidy = {
+				cic = 250
+				equipment_type = artillery_equipment
+				seller_tags = { EQS CRY NLR VAN SCS LSP NMS CES JUN BAL TEM BUF }
+			}
+		}
 	}
 }
 
@@ -25497,7 +25998,11 @@ shared_focus = {
 					promote_leader = yes
 					remove_unit_leader_trait = old_guard
 					add_unit_leader_trait = organisational_leader
-					set_leader_portrait = "GFX_portrait_KIR_firethorn_new_uniform"
+					set_portraits = {
+						army = {
+							large = "GFX_portrait_KIR_firethorn_new_uniform"
+						}
+					}
 				}
 			}
 			every_possible_country = {
@@ -26525,9 +27030,14 @@ shared_focus = {
 		set_temp_variable = { temp_KIR_diary_entry  = 11 }
 		KIR_diary_add_entry_to_protagonist = yes
 		custom_effect_tooltip = KIR_line_break
-		custom_effect_tooltip = KIR_POST_3A_tt
-		set_country_flag = KIR_Balance_of_the_Realm_Enabled
-		KIR_Get_Balance_of_the_Realm = yes
+		if = {
+			limit = {
+				is_ai = no
+			}
+			custom_effect_tooltip = KIR_POST_3A_tt
+			set_country_flag = KIR_Balance_of_the_Realm_Enabled
+			KIR_Get_Balance_of_the_Realm = yes
+		}
 	}
 }
 
@@ -26613,21 +27123,53 @@ shared_focus = {
 			KIR_diary_add_entry_to_protagonist = yes
 			custom_effect_tooltip = KIR_line_break
 		}
-		custom_effect_tooltip = available_designer
-		show_ideas_tooltip = KIR_cog_plow_bull_co
 		set_country_flag = KIR_cog_plow_bull_co_available
-		custom_effect_tooltip = available_designer
-		show_ideas_tooltip = KIR_crane_heavy_industries
 		set_country_flag = KIR_crane_heavy_industries_available
-		custom_effect_tooltip = available_designer
-		show_ideas_tooltip = KIR_wingluck_consortium
 		set_country_flag = KIR_wingluck_consortium_available
-		custom_effect_tooltip = available_designer
-		show_ideas_tooltip = KIR_dreamboat
 		set_country_flag = KIR_dreamboat_available
-		custom_effect_tooltip = available_designer
-		show_ideas_tooltip = KIR_scarlet_sails_shipyards
 		set_country_flag = KIR_scarlet_sails_shipyards_available
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = KIR_cog_plow_bull_co_organization
+			mio:KIR_cog_plow_bull_co_organization = {
+				add_mio_funds = 250
+			}
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = KIR_crane_heavy_industries_organization
+			mio:KIR_crane_heavy_industries_organization = {
+				add_mio_funds = 250
+			}
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = KIR_wingluck_consortium_organization
+			mio:KIR_wingluck_consortium_organization = {
+				add_mio_funds = 250
+			}
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = KIR_dreamboat_organization
+			mio:KIR_dreamboat_organization = {
+				add_mio_funds = 250
+			}
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = KIR_scarlet_sails_shipyards_organization
+			mio:KIR_scarlet_sails_shipyards_organization = {
+				add_mio_funds = 250
+			}
+		}
+		else = {
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = KIR_cog_plow_bull_co
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = KIR_crane_heavy_industries
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = KIR_wingluck_consortium
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = KIR_dreamboat
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = KIR_scarlet_sails_shipyards
+		}
 	}
 }
 
@@ -27407,7 +27949,7 @@ shared_focus = {
 			subtract_from_variable = { KIR_STATE_YAMEN_COST_VAR_NEGATIVE = 25 }
 			set_variable = { KIR_CONSOCSYS_YAMEN_political_power_gain_var = 0.1 }
 			set_variable = { KIR_CONSOCSYS_YAMEN_command_power_gain_var = 0.1 }
-			set_variable = { KIR_CONSOCSYS_YAMEN_consumer_goods_factor_var = 0.002 }
+			set_variable = { KIR_CONSOCSYS_YAMEN_consumer_goods_factor_var = 0.004 }
 			set_variable = { KIR_CONSOCSYS_YAMEN_research_speed_factor_var = 0.01 }
 			set_variable = { KIR_CONSOCSYS_YAMEN_war_support_factor_var = 0.01 }
 			set_variable = { KIR_CONSOCSYS_YAMEN_local_resources_factor_var = 0.01 }
@@ -27418,7 +27960,7 @@ shared_focus = {
 			set_variable = { KIR_CONSOCSYS_YAMEN_production_speed_buildings_factor_var = 0.01 }
 			set_variable = { KIR_CONSOCSYS_SYNERGY_political_power_gain_var = 0.2 }
 			set_variable = { KIR_CONSOCSYS_SYNERGY_command_power_gain_var = 0.2 }
-			set_variable = { KIR_CONSOCSYS_SYNERGY_consumer_goods_factor_var = 0.004 }
+			set_variable = { KIR_CONSOCSYS_SYNERGY_consumer_goods_factor_var = 0.008 }
 			set_variable = { KIR_CONSOCSYS_SYNERGY_research_speed_factor_var = 0.02 }
 			set_variable = { KIR_CONSOCSYS_SYNERGY_war_support_factor_var = 0.02 }
 			set_variable = { KIR_CONSOCSYS_SYNERGY_local_resources_factor_var = 0.02 }
@@ -27787,7 +28329,7 @@ shared_focus = {
 	x = -11
 	y = 3
 
-	cost = 5
+	cost = 8.7
 
 	ai_will_do = {
 		factor = 5
@@ -27814,6 +28356,7 @@ shared_focus = {
 			limit = {
 				has_country_flag = KIR_POST_COM_1_failed_to_prevent_poverty
 			}
+			country_event = { id = kirin.207 hours = 1 }
 			decrease_poverty = yes
 		}
 		else_if = {
@@ -27821,6 +28364,8 @@ shared_focus = {
 				NOT = { has_country_flag = KIR_POST_COM_1_failed_to_prevent_poverty }
 			}
 			custom_effect_tooltip = KIR_POST_COM_1_tt
+			country_event = { id = kirin.207 hours = 1 }
+			custom_effect_tooltip = KIR_line_break
 		}
 		increase_society_development_gradual = yes
 	}
@@ -28176,8 +28721,21 @@ shared_focus = {
 		country_event = { id = kirin.71 hours = 3 }
 		custom_effect_tooltip = KIR_line_break
 		set_country_flag = KIR_kirin_holding_group_available
-		custom_effect_tooltip = available_designer
-		show_ideas_tooltip = KIR_kirin_holding_group_materiel
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}    
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = KIR_kirin_holding_group_materiel_organization
+			mio:KIR_kirin_holding_group_materiel_organization = {
+				add_mio_size = 1
+				add_mio_funds = 400
+			}
+		}
+		else = {
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = KIR_kirin_holding_group_materiel
+		}
 	}
 }
 
@@ -28191,12 +28749,12 @@ shared_focus = {
 	cost = 10
 
 	ai_will_do = {
-		factor = 5
-	}
-	
-	bypass = {
-		1058 = {
-			is_owned_and_controlled_by = ROOT
+		factor = 0
+		modifier = {
+			add = 5
+			1058 = {
+				is_owned_and_controlled_by = KIR
+			}
 		}
 	}
 	
@@ -28228,118 +28786,144 @@ shared_focus = {
 	
 	select_effect = {
 		hidden_effect = {
-			KIR_POST_BOU_3A_Get_Ref_Support = yes
-			every_country = {
+			if = {
 				limit = {
-					OR = {
-						tag = ROOT
-						1058 = {
-							is_owned_and_controlled_by = PREV
+					1058 = {
+						NOT = {
+							is_owned_and_controlled_by = KIR
 						}
 					}
 				}
-				country_event = { id = kirin.400 days = 6 }
-				country_event = { id = kirin.401 days = 12 }
+				KIR_POST_BOU_3A_Get_Ref_Support = yes
+				every_country = {
+					limit = {
+						OR = {
+							tag = ROOT
+							1058 = {
+								is_owned_and_controlled_by = PREV
+							}
+						}
+					}
+					country_event = { id = kirin.400 days = 6 }
+					country_event = { id = kirin.401 days = 12 }
+				}
 			}
 		}
 	}
 	
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus KIR_POST_BOU_3A"
-		every_country = {
+		if = {
 			limit = {
-				OR = {
-					tag = ROOT
-					1058 = {
-						is_owned_and_controlled_by = PREV
+				1058 = {
+					NOT = {
+						is_owned_and_controlled_by = KIR
 					}
 				}
 			}
-			if = {
+			every_country = {
 				limit = {
-					check_variable = { KIR.GetBlossomRefSupport < 0.75 }
-					check_variable = { KIR.GetBlossomRefSupport > 0.49 }
-				}
-				random_list = {
-					1 = {
-						modifier = {
-							factor = 1.2
-							check_variable = { KIR.GetBlossomRefSupport > 0.54 }
-						}
-						modifier = {
-							factor = 1.3
-							check_variable = { KIR.GetBlossomRefSupport > 0.59 }
-						}
-						modifier = {
-							factor = 1.4
-							check_variable = { KIR.GetBlossomRefSupport > 0.64 }
+					OR = {
+						tag = ROOT
+						1058 = {
+							is_owned_and_controlled_by = PREV
 						}
-						modifier = {
-							factor = 1.5
-							check_variable = { KIR.GetBlossomRefSupport > 0.69 }
+					}
+				}
+				if = {
+					limit = {
+						check_variable = { KIR.GetBlossomRefSupport < 0.75 }
+						check_variable = { KIR.GetBlossomRefSupport > 0.49 }
+					}
+					random_list = {
+						1 = {
+							modifier = {
+								factor = 1.2
+								check_variable = { KIR.GetBlossomRefSupport > 0.54 }
+							}
+							modifier = {
+								factor = 1.3
+								check_variable = { KIR.GetBlossomRefSupport > 0.59 }
+							}
+							modifier = {
+								factor = 1.4
+								check_variable = { KIR.GetBlossomRefSupport > 0.64 }
+							}
+							modifier = {
+								factor = 1.5
+								check_variable = { KIR.GetBlossomRefSupport > 0.69 }
+							}
+							modifier = {
+								factor = 1.25
+								has_tech = tech_kirin_astrology
+							}
+							effect_tooltip = { news_event = { id = kirin.405 } }
 						}
-						modifier = {
-							factor = 1.25
-							has_tech = tech_kirin_astrology
+						1 = {
+							effect_tooltip = { news_event = { id = kirin.406 } }
 						}
-						effect_tooltip = { news_event = { id = kirin.405 } }
-					}
-					1 = {
-						effect_tooltip = { news_event = { id = kirin.406 } }
 					}
 				}
-			}
-			else_if = {
-				limit = {
-					check_variable = { KIR.GetBlossomRefSupport > 0.74 }
+				else_if = {
+					limit = {
+						check_variable = { KIR.GetBlossomRefSupport > 0.74 }
+					}
+					effect_tooltip = { news_event = { id = kirin.405 } }
 				}
-				effect_tooltip = { news_event = { id = kirin.405 } }
 			}
-		}
-		hidden_effect = {
-			if = {
-				limit = {
-					check_variable = { KIR.GetBlossomRefSupport < 0.75 }
-					check_variable = { KIR.GetBlossomRefSupport > 0.49 }
-				}
-				random_list = {
-					1 = {
-						modifier = {
-							factor = 1.2
-							check_variable = { KIR.GetBlossomRefSupport > 0.54 }
-						}
-						modifier = {
-							factor = 1.3
-							check_variable = { KIR.GetBlossomRefSupport > 0.59 }
-						}
-						modifier = {
-							factor = 1.4
-							check_variable = { KIR.GetBlossomRefSupport > 0.64 }
-						}
-						modifier = {
-							factor = 1.5
-							check_variable = { KIR.GetBlossomRefSupport > 0.69 }
+			hidden_effect = {
+				if = {
+					limit = {
+						check_variable = { KIR.GetBlossomRefSupport < 0.75 }
+						check_variable = { KIR.GetBlossomRefSupport > 0.49 }
+					}
+					random_list = {
+						1 = {
+							modifier = {
+								factor = 1.2
+								check_variable = { KIR.GetBlossomRefSupport > 0.54 }
+							}
+							modifier = {
+								factor = 1.3
+								check_variable = { KIR.GetBlossomRefSupport > 0.59 }
+							}
+							modifier = {
+								factor = 1.4
+								check_variable = { KIR.GetBlossomRefSupport > 0.64 }
+							}
+							modifier = {
+								factor = 1.5
+								check_variable = { KIR.GetBlossomRefSupport > 0.69 }
+							}
+							modifier = {
+								factor = 1.25
+								has_tech = tech_kirin_astrology
+							}
+							news_event = { id = kirin.405 hours = 9 }
 						}
-						modifier = {
-							factor = 1.25
-							has_tech = tech_kirin_astrology
+						1 = {
+							news_event = { id = kirin.406 hours = 9 }
 						}
-						news_event = { id = kirin.405 hours = 9 }
 					}
-					1 = {
-						news_event = { id = kirin.406 hours = 9 }
+				}
+				else_if = {
+					limit = {
+						check_variable = { KIR.GetBlossomRefSupport > 0.74 }
 					}
+					news_event = { id = kirin.405 hours = 9 }
 				}
+				KIR_POST_BOU_3A_Get_Ref_Support = yes
 			}
-			else_if = {
-				limit = {
-					check_variable = { KIR.GetBlossomRefSupport > 0.74 }
+			custom_effect_tooltip = KIR_POST_BOU_3A_tt
+		}
+		else_if = {
+			limit = {
+				1058 = {
+					is_owned_and_controlled_by = KIR
 				}
-				news_event = { id = kirin.405 hours = 9 }
 			}
-			KIR_POST_BOU_3A_Get_Ref_Support = yes
+			KIR = { add_state_core = 1058 }
 		}
-		custom_effect_tooltip = KIR_POST_BOU_3A_tt
 	}
 }
 
@@ -28443,7 +29027,7 @@ shared_focus = {
 	x = 4
 	y = 1
 
-	cost = 5
+	cost = 8.7
 
 	ai_will_do = {
 		factor = 5
@@ -28470,6 +29054,7 @@ shared_focus = {
 			limit = {
 				has_country_flag = KIR_POST_8_failed_to_prevent_poverty
 			}
+			country_event = { id = kirin.206 hours = 1 }
 			decrease_poverty = yes
 		}
 		else_if = {
@@ -28477,6 +29062,7 @@ shared_focus = {
 				NOT = { has_country_flag = KIR_POST_8_failed_to_prevent_poverty }
 			}
 			custom_effect_tooltip = KIR_POST_8_tt
+			country_event = { id = kirin.206 hours = 1 }
 		}
 		decrease_illiteracy = yes
 	}
@@ -28720,9 +29306,16 @@ shared_focus = {
 	}
 	
 	available = {
-		OR = {
-			has_non_aggression_pact_with = 1158.owner
-			is_in_faction_with = 1158.owner
+		1158 = {
+			owner = {
+				NOT = { has_war_with = KIR }
+				OR = {
+					has_non_aggression_pact_with = KIR
+					is_in_faction_with = KIR
+					has_opinion_modifier = KIR_incandescent_embassy
+					has_opinion = { target = KIR value > 44 }
+				}
+			}
 		}
 	}
 	
diff --git a/common/national_focus/LAK.txt b/common/national_focus/LAK.txt
index cc3f4360016..41d6682c40a 100644
--- a/common/national_focus/LAK.txt
+++ b/common/national_focus/LAK.txt
@@ -446,6 +446,16 @@ shared_focus = {
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus LAK_call_in_the_favours"
 		add_equipment_to_stockpile = { type = infantry_equipment amount = 1000 producer = WNG }
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_equipment_subsidy = {
+				cic = 500
+				equipment_type = infantry_equipment
+				seller_tags = { EQC WNG TAL JES ARA FAL SIC MIT CYA }
+			}
+		}
 		add_manpower = 5000
 	}
 	search_filters = { FOCUS_FILTER_MANPOWER }
diff --git a/common/national_focus/LCT.txt b/common/national_focus/LCT.txt
index fdd5a31a0b9..aff661ee541 100644
--- a/common/national_focus/LCT.txt
+++ b/common/national_focus/LCT.txt
@@ -787,7 +787,7 @@ focus_tree = {
 			log = "[GetDateText]: [Root.GetName]: Focus LCT_cult_of_the_prince"
 			add_ideas = LCT_prince_cult
 			custom_effect_tooltip = available_political_advisor
-			show_ideas_tooltip = LCT_prince_of_terror
+			show_ideas_tooltip = LCT_small_grin
 		}
 		search_filters = { FOCUS_FILTER_POLITICAL FOCUS_FILTER_STABILITY FOCUS_FILTER_WAR_SUPPORT }
 	}
@@ -3247,7 +3247,7 @@ focus_tree = {
 			log = "[GetDateText]: [Root.GetName]: Focus LCT_fortification_studies"
 			add_ideas = LCT_fortification_focus
 			custom_effect_tooltip = available_political_advisor
-			show_ideas_tooltip = LCT_fortification
+			show_ideas_tooltip = LCT_beaver_run
 		}
 		search_filters = { FOCUS_FILTER_INDUSTRY }
 	}
@@ -4907,11 +4907,30 @@ focus_tree = {
 
 		completion_reward = {
 			log = "[GetDateText]: [Root.GetName]: Focus LCT_spec_ops"
-			add_tech_bonus = {
-				name = LCT_special_forces
-				bonus = 1.0
-				uses = 2
-				category = special_forces_tech
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_doctrine_cost_reduction = {
+					name = special_forces_bonus
+					cost_reduction = 0.50
+					uses = 2
+					category = special_forces_doctrine
+				}
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 0.50
+					uses = 2
+					category = special_forces_tech
+				}
+			}
+			else = {
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 1.0
+					uses = 2
+					category = special_forces_tech
+				}
 			}
 		}
 		search_filters = { FOCUS_FILTER_RESEARCH }
@@ -5095,10 +5114,21 @@ focus_tree = {
 
 		completion_reward = {
 			log = "[GetDateText]: [Root.GetName]: Focus LCT_unlock_fighter_man"
-			custom_effect_tooltip = available_designer
-			show_ideas_tooltip = LCT_light_air_man
-
-			
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}    
+				custom_effect_tooltip = available_mio_tt
+				show_mio_tooltip = LCT_light_air_man_organization
+				mio:LCT_light_air_man_organization = {
+					add_mio_funds = 350
+				}
+				
+			}
+			else = {
+				custom_effect_tooltip = available_designer
+				show_ideas_tooltip = LCT_light_air_man
+			}
 		}
 	}
 
@@ -5220,8 +5250,20 @@ focus_tree = {
 
 		completion_reward = {
 			log = "[GetDateText]: [Root.GetName]: Focus LCT_unlock_med_air_man"
-			custom_effect_tooltip = available_designer
-			show_ideas_tooltip = LCT_med_air_man
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}    
+				custom_effect_tooltip = available_mio_tt
+				show_mio_tooltip = LCT_med_air_man_organization
+				mio:LCT_light_air_man_organization = {
+					add_mio_funds = 350
+				}
+			}
+			else = {
+				custom_effect_tooltip = available_designer
+				show_ideas_tooltip = LCT_med_air_man
+			}
 			if = {
 				limit = {
 					has_dlc = "By Blood Alone"
@@ -5922,8 +5964,20 @@ focus_tree = {
 
 		completion_reward = {
 			log = "[GetDateText]: [Root.GetName]: Focus LCT_carrier_focus"
-			custom_effect_tooltip = available_designer
-			show_ideas_tooltip = LCT_pacific_manufacturer
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}    
+				custom_effect_tooltip = available_mio_tt
+				show_mio_tooltip = LCT_pacific_manufacturer_organization
+				mio:LCT_pacific_manufacturer_organization = {
+					add_mio_funds = 400
+				}
+			}
+			else = {
+				custom_effect_tooltip = available_designer
+				show_ideas_tooltip = LCT_pacific_manufacturer
+			}
 			add_doctrine_cost_reduction = {
 				name = cat_base_strike
 				cost_reduction = 0.5
@@ -6009,8 +6063,20 @@ focus_tree = {
 
 		completion_reward = {
 			log = "[GetDateText]: [Root.GetName]: Focus LCT_capital_focus"
-			custom_effect_tooltip = available_designer
-			show_ideas_tooltip = LCT_atlantic_manufacturer
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}    
+				custom_effect_tooltip = available_mio_tt
+				show_mio_tooltip = LCT_atlantic_manufacturer_organization
+				mio:LCT_atlantic_manufacturer_organization = {
+					add_mio_funds = 400
+				}
+			}
+			else = {
+				custom_effect_tooltip = available_designer
+				show_ideas_tooltip = LCT_atlantic_manufacturer
+			}
 			add_doctrine_cost_reduction = {
 				name = cat_fleet_in_being
 				cost_reduction = 0.5
@@ -6141,11 +6207,30 @@ focus_tree = {
 
 		completion_reward = {
 			log = "[GetDateText]: [Root.GetName]: Focus LCT_establish_snlf"
-			add_tech_bonus = {
-				name = LCT_establish_snlf
-				bonus = 1.0
-				uses = 2
-				category = marine_tech
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_doctrine_cost_reduction = {
+					name = special_forces_bonus
+					cost_reduction = 0.50
+					uses = 2
+					category = cat_marines_doctrine
+				}
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 0.50
+					uses = 2
+					category = marine_tech
+				}
+			}
+			else = {
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 1.0
+					uses = 2
+					category = marine_tech
+				}
 			}
 		}
 		search_filters = { FOCUS_FILTER_RESEARCH }
@@ -6205,9 +6290,21 @@ focus_tree = {
 
 		completion_reward = {
 			log = "[GetDateText]: [Root.GetName]: Focus LCT_carriers"
-			custom_effect_tooltip = available_designer
-			show_ideas_tooltip = LCT_nav_air_man
-
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}    
+				custom_effect_tooltip = available_mio_tt
+				show_mio_tooltip = LCT_nav_air_man_organization
+				mio:LCT_nav_air_man_organization = {
+					add_mio_size = 1
+					add_mio_funds = 500
+				}
+			}
+			else = {
+				custom_effect_tooltip = available_designer
+				show_ideas_tooltip = LCT_nav_air_man
+			}
 			add_tech_bonus = {
 				name = LCT_carriers
 				bonus = 1.0
@@ -6491,6 +6588,21 @@ focus_tree = {
 					set_technology = { torpedo_cruiser_mtg = 1 }
 				}
 			}
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}    
+				custom_effect_tooltip = available_mio_tt
+				show_mio_tooltip = LCT_atlantic_manufacturer_organization
+				mio:LCT_atlantic_manufacturer_organization = {
+					add_mio_size = 1
+					add_mio_funds = 500
+				}
+			}
+			else = {
+				custom_effect_tooltip = available_designer
+				show_ideas_tooltip = LCT_atlantic_manufacturer
+			}
 			navy_experience = 25
 		}
 		search_filters = { FOCUS_FILTER_NAVY_BONUS FOCUS_FILTER_RESEARCH }
diff --git a/common/national_focus/LNS.txt b/common/national_focus/LNS.txt
index f6afd49a9d7..d524c9e9a5a 100644
--- a/common/national_focus/LNS.txt
+++ b/common/national_focus/LNS.txt
@@ -1,10002 +1,10124 @@
-focus_tree = {
-	id = longsword_focus
-
-	country = {
-		factor = 0
-
-		modifier = {
-			add = 10
-			tag = LNS
-		}
-	}
-	default = no
-	continuous_focus_position = { x = 250 y = 2050 }
-
-	shared_focus = LNS_resist_and_bite
-	shared_focus = LNS_the_military_resists
-	shared_focus = LNS_the_plan_continues
-}
-
-focus_tree = {
-	id = longsword_focus_fascist_civil_war
-
-	country = {
-		factor = 0
-
-		modifier = {
-			add = 5
-			tag = LNS
-		}
-	}
-	default = no
-	continuous_focus_position = { x = 250 y = 2050 }
-
-	shared_focus = LNS_fascist_civil_war
-}
-
-focus_tree = {
-	id = longsword_focus_commie_civil_war
-
-	country = {
-		factor = 0
-
-		modifier = {
-			add = 5
-			tag = LNS
-		}
-	}
-	default = no
-	continuous_focus_position = { x = 250 y = 2050 }
-
-	shared_focus = LNS_commie_civil_war
-}
-
-focus_tree = {
-	id = longsword_focus_neutral_civil_war
-
-	country = {
-		factor = 0
-
-		modifier = {
-			add = 5
-			tag = LNS
-		}
-	}
-	default = no
-	continuous_focus_position = { x = 250 y = 2050 }
-
-	shared_focus = LNS_neutral_civil_war
-}
-
-focus_tree = {
-	id = longsword_focus_bandit_victory_tree
-
-	country = {
-		factor = 0
-
-		modifier = {
-			add = 10
-			tag = LNS
-			has_government = fascism
-		}
-	}
-	default = no
-	continuous_focus_position = { x = 250 y = 1650 }
-
-	shared_focus = LNS_bandit_victory
-}
-focus_tree = {
-	id = new_longsword_focus_commie_tree 
-
-	country = {
-		factor = 0
-
-		modifier = {
-			add = 5
-			tag = LSC
-		}
-	}
-	default = no
-	continuous_focus_position = { x = 1500 y = 800 }
-
-	shared_focus = LSC_constitutional_convention
-	shared_focus = LSC_IIA
-	shared_focus = LSC_hellquill_harcom
-}
-focus_tree = {
-	id = new_longsword_focus_fascist_tree 
-
-	country = {
-		factor = 0
-		
-		modifier = {
-			add = 10
-			tag = LSC
-			has_government = fascism
-		}
-	}
-	default = no
-	continuous_focus_position = { x = 1500 y = 800 }
-
-	shared_focus = LSC_constitutional_convention
-	shared_focus = LSC_IIA
-	shared_focus = LSC_hellquill_supremacist
-}
-focus_tree = {
-	id = new_longsword_focus_military_tree
-
-	country = {
-		factor = 0
-
-		modifier = {
-			add = 10
-			tag = LSM
-			has_government = neutrality
-		}
-	}
-	default = no
-	continuous_focus_position = { x = 0 y = 1950 }
-
-	shared_focus = LSM_zeltstadt_meeting
-	shared_focus = LSM_national_army
-	shared_focus = LSM_rosewood_order
-	shared_focus = LSM_hellquill
-}
-
-#####################
-### The Partisans ###
-#####################
-
-shared_focus = {
-	id = LNS_resist_and_bite
-	icon = GFX_goal_offensive_army
-	cost = 1.00
-	mutually_exclusive = { focus = LNS_the_military_resists }
-	mutually_exclusive = { focus = LNS_the_plan_continues }
-	ai_will_do = { factor = 120 }
-	x = 6
-	y = 0
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_resist_and_bite"
-		country_event = longsword.1
-	}
-}
-
-shared_focus = {
-	id = LNS_our_friends_in_hellquill
-	icon = GFX_goal_generic_major_alliance_pony_griffon
-	x = -2
-	y = 1
-	relative_position_id = LNS_resist_and_bite
-	cost = 2.00
-	prerequisite = { focus = LNS_resist_and_bite }
-
-	ai_will_do = {
-		factor = 100
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_our_friends_in_hellquill"
-		country_event = longsword.2
-	}
-}
-
-shared_focus = {
-	id = LNS_target_collaborators
-	icon = GFX_goal_secret_agents
-	x = -1
-	y = 2
-	relative_position_id = LNS_resist_and_bite
-	cost = 2.00
-	prerequisite = { focus = LNS_spread_pamphlets }
-	prerequisite = { focus = LNS_our_friends_in_hellquill }
-
-	ai_will_do = {
-		factor = 100
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_target_collaborators"
-		country_event = longsword.19
-	}
-}
-
-shared_focus = {
-	id = LNS_spread_pamphlets
-	icon = GFX_goal_big_news
-	x = 0
-	y = 1
-	relative_position_id = LNS_resist_and_bite
-	cost = 2.00
-	prerequisite = { focus = LNS_resist_and_bite }
-
-	ai_will_do = {
-		factor = 100
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_spread_pamphlets"
-		country_event = longsword.18
-	}
-}
-
-shared_focus = {
-	id = LNS_steal_equipment
-	icon = GFX_goal_national_arsenal
-	x = 1
-	y = 2
-	relative_position_id = LNS_resist_and_bite
-	cost = 2.00
-	prerequisite = { focus = LNS_spread_pamphlets }
-	prerequisite = { focus = LNS_organize_cells }
-
-	ai_will_do = {
-		factor = 100
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_steal_equipment"
-		country_event = longsword.24
-	}
-}
-
-shared_focus = {
-	id = LNS_organize_cells
-	icon = GFX_goal_unicorn_soldier
-	x = 2
-	y = 1
-	relative_position_id = LNS_resist_and_bite
-	cost = 2.00
-	prerequisite = { focus = LNS_resist_and_bite }
-
-	ai_will_do = {
-		factor = 100
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_organize_cells"
-		country_event = longsword.23
-	}
-}
-
-shared_focus = {
-	id = LNS_the_secret_government
-	icon = GFX_goal_government_icon
-	x = 0
-	y = 3
-	relative_position_id = LNS_resist_and_bite
-	cost = 2.00
-	prerequisite = { focus = LNS_target_collaborators }
-	prerequisite = { focus = LNS_steal_equipment }
-
-	ai_will_do = {
-		factor = 100
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_the_secret_government"
-		country_event = longsword.25
-		hidden_effect = {
-			country_event = { days = 14 id = longsword.26 }
-		}
-	}
-}
-
-shared_focus = {
-	id = LNS_sabotage_them
-	icon = GFX_goal_break_rifle
-	x = -1
-	y = 4
-	relative_position_id = LNS_resist_and_bite
-	cost = 2.00
-	prerequisite = { focus = LNS_the_secret_government }
-
-	ai_will_do = {
-		factor = 100
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_sabotage_them"
-		country_event = longsword.27
-	}
-}
-
-shared_focus = {
-	id = LNS_an_example
-	icon = GFX_goal_split_helmet
-	x = 1
-	y = 4
-	relative_position_id = LNS_resist_and_bite
-	cost = 2.00
-	prerequisite = { focus = LNS_the_secret_government }
-
-	ai_will_do = {
-		factor = 100
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_an_example"
-		country_event = longsword.28
-	}
-}
-
-shared_focus = {
-	id = LNS_the_uprising
-	icon = GFX_goal_revolution_pony
-	x = 0
-	y = 5
-	relative_position_id = LNS_resist_and_bite
-	cost = 2.00
-	prerequisite = { focus = LNS_sabotage_them }
-	prerequisite = { focus = LNS_an_example }
-
-	ai_will_do = {
-		factor = 100
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_the_uprising"
-		country_event = longsword.29
-	}
-}
-
-#####################
-### The Military ###
-#####################
-
-shared_focus = {
-	id = LNS_the_military_resists
-	icon = GFX_goal_military_academy
-	cost = 1.00
-	mutually_exclusive = { focus = LNS_resist_and_bite }
-	mutually_exclusive = { focus = LNS_the_plan_continues }
-	ai_will_do = { factor = 120 }
-	x = 12
-	y = 0
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_the_military_resists"
-		country_event = longsword.42
-	}
-}
-
-shared_focus = {
-	id = LNS_reassign_units
-	icon = GFX_goal_planning_bonus
-	x = -2
-	y = 1
-	relative_position_id = LNS_the_military_resists
-	cost = 2.00
-	prerequisite = { focus = LNS_the_military_resists }
-
-	ai_will_do = {
-		factor = 100
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_reassign_units"
-		country_event = longsword.43
-	}
-}
-
-shared_focus = {
-	id = LNS_our_duty
-	icon = GFX_goal_conscription
-	x = -1
-	y = 2
-	relative_position_id = LNS_the_military_resists
-	cost = 2.00
-	prerequisite = { focus = LNS_ensure_loyalty }
-	prerequisite = { focus = LNS_reassign_units }
-
-	ai_will_do = {
-		factor = 100
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_our_duty"
-		country_event = longsword.49
-	}
-}
-
-shared_focus = {
-	id = LNS_ensure_loyalty
-	icon = GFX_focus_generic_military_mission
-	x = 0
-	y = 1
-	relative_position_id = LNS_the_military_resists
-	cost = 2.00
-	prerequisite = { focus = LNS_the_military_resists }
-
-	ai_will_do = {
-		factor = 100
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_ensure_loyalty"
-		country_event = longsword.45
-	}
-}
-
-shared_focus = {
-	id = LNS_black_market_contacts
-	icon = GFX_goal_collaborate_local_elites
-	x = 1
-	y = 2
-	relative_position_id = LNS_the_military_resists
-	cost = 2.00
-	prerequisite = { focus = LNS_ensure_loyalty }
-	prerequisite = { focus = LNS_requisition_weapons }
-
-	ai_will_do = {
-		factor = 100
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_black_market_contacts"
-		country_event = longsword.50
-	}
-}
-
-shared_focus = {
-	id = LNS_requisition_weapons
-	icon = GFX_goal_munitions_factories
-	x = 2
-	y = 1
-	relative_position_id = LNS_the_military_resists
-	cost = 2.00
-	prerequisite = { focus = LNS_the_military_resists }
-
-	ai_will_do = {
-		factor = 100
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_requisition_weapons"
-		country_event = longsword.51
-	}
-}
-
-shared_focus = {
-	id = LNS_refuse_orders
-	icon = GFX_goal_authority
-	x = 0
-	y = 3
-	relative_position_id = LNS_the_military_resists
-	cost = 2.00
-	prerequisite = { focus = LNS_our_duty }
-	prerequisite = { focus = LNS_black_market_contacts }
-
-	ai_will_do = {
-		factor = 100
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_refuse_orders"
-		country_event = longsword.52
-	}
-}
-
-shared_focus = {
-	id = LNS_target_reformisten
-	icon = GFX_goal_MAF_African_Pilots
-	x = -1
-	y = 4
-	relative_position_id = LNS_the_military_resists
-	cost = 2.00
-	prerequisite = { focus = LNS_refuse_orders }
-
-	ai_will_do = {
-		factor = 100
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_target_reformisten"
-		country_event = longsword.54
-	}
-}
-
-shared_focus = {
-	id = LNS_target_partisans
-	icon = GFX_goal_broken_red_star
-	x = 1
-	y = 4
-	relative_position_id = LNS_the_military_resists
-	cost = 2.00
-	prerequisite = { focus = LNS_refuse_orders }
-
-	ai_will_do = {
-		factor = 100
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_target_partisans"
-		country_event = longsword.55
-	}
-}
-
-shared_focus = {
-	id = LNS_the_madgriffon_of_longsword
-	icon = GFX_focus_generic_strike_at_democracy1
-	x = 0
-	y = 5
-	relative_position_id = LNS_the_military_resists
-	cost = 2.00
-	prerequisite = { focus = LNS_target_reformisten }
-	prerequisite = { focus = LNS_target_partisans }
-
-	ai_will_do = {
-		factor = 100
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_the_madgriffon_of_longsword"
-		country_event = longsword.56
-	}
-}
-
-#####################
-### The Reformisten ###
-#####################
-
-shared_focus = {
-	id = LNS_the_plan_continues
-	icon = GFX_goal_skull_treaty2
-	cost = 1.00
-	mutually_exclusive = { focus = LNS_the_military_resists }
-	mutually_exclusive = { focus = LNS_resist_and_bite }
-	ai_will_do = { factor = 120 }
-	x = 18
-	y = 0
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_the_plan_continues"
-		country_event = longsword.62
-	}
-}
-
-shared_focus = {
-	id = LNS_investigate_the_military
-	icon = GFX_goal_skull_treaty
-	x = -2
-	y = 1
-	relative_position_id = LNS_the_plan_continues
-	cost = 2.00
-	prerequisite = { focus = LNS_the_plan_continues }
-
-	ai_will_do = {
-		factor = 100
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_investigate_the_military"
-		country_event = longsword.63
-	}
-}
-
-shared_focus = {
-	id = LNS_root_out_traitors
-	icon = GFX_goal_GEA_guerilla_warfare
-	x = -1
-	y = 2
-	relative_position_id = LNS_the_plan_continues
-	cost = 2.00
-	prerequisite = { focus = LNS_public_executions }
-	prerequisite = { focus = LNS_investigate_the_military }
-
-	ai_will_do = {
-		factor = 100
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_root_out_traitors"
-		country_event = longsword.68
-	}
-}
-
-shared_focus = {
-	id = LNS_public_executions
-	icon = GFX_goal_forced_res
-	x = 0
-	y = 1
-	relative_position_id = LNS_the_plan_continues
-	cost = 2.00
-	prerequisite = { focus = LNS_the_plan_continues }
-
-	ai_will_do = {
-		factor = 100
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_public_executions"
-		country_event = longsword.65
-	}
-}
-
-shared_focus = {
-	id = LNS_work_them_to_the_bone
-	icon = GFX_goal_forced_inf
-	x = 1
-	y = 2
-	relative_position_id = LNS_the_plan_continues
-	cost = 2.00
-	prerequisite = { focus = LNS_public_executions }
-	prerequisite = { focus = LNS_steal_their_property }
-
-	ai_will_do = {
-		factor = 100
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_work_them_to_the_bone"
-		country_event = longsword.72
-	}
-}
-
-shared_focus = {
-	id = LNS_steal_their_property
-	icon = GFX_goal_forced_con
-	x = 2
-	y = 1
-	relative_position_id = LNS_the_plan_continues
-	cost = 2.00
-	prerequisite = { focus = LNS_the_plan_continues }
-
-	ai_will_do = {
-		factor = 100
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_steal_their_property"
-		country_event = longsword.70
-	}
-}
-
-shared_focus = {
-	id = LNS_plans_backfire
-	icon = GFX_HOL_crackdown_natpop
-	x = 0
-	y = 3
-	relative_position_id = LNS_the_plan_continues
-	cost = 2.00
-	prerequisite = { focus = LNS_root_out_traitors }
-	prerequisite = { focus = LNS_work_them_to_the_bone }
-
-	ai_will_do = {
-		factor = 100
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_plans_backfire"
-		country_event = longsword.74
-	}
-}
-
-shared_focus = {
-	id = LNS_panic_in_the_countryside
-	icon = GFX_goal_skull_fortification
-	x = -1
-	y = 4
-	relative_position_id = LNS_the_plan_continues
-	cost = 2.00
-	prerequisite = { focus = LNS_plans_backfire }
-
-	ai_will_do = {
-		factor = 100
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_panic_in_the_countryside"
-		country_event = longsword.75
-	}
-}
-
-shared_focus = {
-	id = LNS_mass_mutinies
-	icon = GFX_goal_forced_mil
-	x = 1
-	y = 4
-	relative_position_id = LNS_the_plan_continues
-	cost = 2.00
-	prerequisite = { focus = LNS_plans_backfire }
-
-	ai_will_do = {
-		factor = 100
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_mass_mutinies"
-		country_event = longsword.76
-	}
-}
-
-shared_focus = {
-	id = LNS_mass_uprising
-	icon = GFX_goal_generic_liberty_statue
-	x = 0
-	y = 5
-	relative_position_id = LNS_the_plan_continues
-	cost = 2.00
-	prerequisite = { focus = LNS_panic_in_the_countryside }
-	prerequisite = { focus = LNS_mass_mutinies }
-
-	ai_will_do = {
-		factor = 100
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_mass_uprising"
-		country_event = longsword.77
-	}
-}
-
-#####################
-### Fascist Civil War Tree ###
-#####################
-
-shared_focus = {
-	id = LNS_fascist_civil_war
-	icon = GFX_goal_ideology_national_populist
-	cost = 1.00
-	available = { always = no }
-	bypass = { has_global_flag = LNS_civil_war_flag }
-	ai_will_do = { factor = 120 }
-	x = 8
-	y = 0
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_fascist_civil_war"
-		custom_effect_tooltip = unlock_focuses
-	}
-}
-
-shared_focus = {
-	id = LNS_emergency_conscription
-	icon = GFX_goal_conscription
-	x = -1
-	y = 1
-	relative_position_id = LNS_fascist_civil_war
-	cost = 2.00
-	prerequisite = { focus = LNS_fascist_civil_war }
-
-	ai_will_do = {
-		factor = 100
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_emergency_conscription"
-		add_manpower = 3000
-		add_war_support = 0.05
-	}
-	search_filters = { FOCUS_FILTER_MANPOWER FOCUS_FILTER_WAR_SUPPORT }
-}
-
-shared_focus = {
-	id = LNS_hasty_militias
-	icon = GFX_goal_national_arsenal
-	x = -2
-	y = 2
-	relative_position_id = LNS_fascist_civil_war
-	cost = 2.00
-	prerequisite = { focus = LNS_emergency_conscription }
-
-	ai_will_do = {
-		factor = 100
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_hasty_militias"
-		add_manpower = 5000
-		custom_effect_tooltip = LNS_hasty_militias_tp
-		hidden_effect = {
-			load_oob = "LNS_militia"
-		}
-	}
-	search_filters = { FOCUS_FILTER_MANPOWER }
-}
-
-shared_focus = {
-	id = LNS_child_soldiers
-	icon = GFX_goal_graveyard
-	x = -2
-	y = 3
-	relative_position_id = LNS_fascist_civil_war
-	cost = 2.00
-	prerequisite = { focus = LNS_hasty_militias }
-
-	ai_will_do = {
-		factor = 100
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_child_soldiers"
-		add_manpower = 7000
-		add_stability = -0.10
-	}
-	search_filters = { FOCUS_FILTER_MANPOWER FOCUS_FILTER_STABILITY }
-}
-
-shared_focus = {
-	id = LNS_grab_the_pistols
-	icon = GFX_goal_secret_agents
-	x = 1
-	y = 1
-	relative_position_id = LNS_fascist_civil_war
-	cost = 2.00
-	prerequisite = { focus = LNS_fascist_civil_war }
-
-	ai_will_do = {
-		factor = 100
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_grab_the_pistols"
-		add_equipment_to_stockpile = { type = infantry_equipment_0 amount = 500 producer = LNS }
-	}
-}
-
-shared_focus = {
-	id = LNS_grab_the_muskets
-	icon = GFX_goal_military_academy
-	x = 2
-	y = 2
-	relative_position_id = LNS_fascist_civil_war
-	cost = 2.00
-	prerequisite = { focus = LNS_grab_the_pistols }
-
-	ai_will_do = {
-		factor = 100
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_grab_the_muskets"
-		add_equipment_to_stockpile = { type = melee_equipment_1 amount = 750 producer = LNS }
-	}
-}
-
-shared_focus = {
-	id = LNS_sharpen_spears
-	icon = GFX_goal_skull_treaty
-	x = 2
-	y = 3
-	relative_position_id = LNS_fascist_civil_war
-	cost = 2.00
-	prerequisite = { focus = LNS_grab_the_muskets }
-
-	ai_will_do = {
-		factor = 100
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_sharpen_spears"
-		add_equipment_to_stockpile = { type = melee_equipment_0 amount = 1000 producer = LNS }
-	}
-}
-
-shared_focus = {
-	id = LNS_houses_to_factories
-	icon = GFX_goal_skull_fortification
-	x = 0
-	y = 2
-	relative_position_id = LNS_fascist_civil_war
-	cost = 2.00
-	prerequisite = { focus = LNS_fascist_civil_war }
-
-	ai_will_do = {
-		factor = 100
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_houses_to_factories"
-		552 = {
-			add_extra_state_shared_building_slots = 1
-			add_building_construction = {
-				type = arms_factory
-				level = 1
-				instant_build = yes
-			}
-		}
-	}
-	search_filters = { FOCUS_FILTER_INDUSTRY }
-}
-
-shared_focus = {
-	id = LNS_we_need_more
-	icon = GFX_goal_silver_reserve
-	x = 0
-	y = 3
-	relative_position_id = LNS_fascist_civil_war
-	cost = 2.00
-	prerequisite = { focus = LNS_houses_to_factories }
-
-	ai_will_do = {
-		factor = 100
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_we_need_more"
-		552 = {
-			add_extra_state_shared_building_slots = 1
-			add_building_construction = {
-				type = industrial_complex
-				level = 1
-				instant_build = yes
-			}
-		}
-	}
-	search_filters = { FOCUS_FILTER_INDUSTRY }
-}
-
-shared_focus = {
-	id = LNS_final_push
-	icon = GFX_goal_authority
-	x = 0
-	y = 4
-	relative_position_id = LNS_fascist_civil_war
-	cost = 2.00
-	prerequisite = { focus = LNS_we_need_more }
-	prerequisite = { focus = LNS_child_soldiers }
-	prerequisite = { focus = LNS_sharpen_spears }
-
-	ai_will_do = {
-		factor = 100
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_final_push"
-		add_timed_idea = { idea = LNS_final_push_idea days = 180 }
-	}
-}
-
-#####################
-### Communist Civil War Tree ###
-#####################
-
-shared_focus = {
-	id = LNS_commie_civil_war
-	icon = GFX_goal_revolution
-	cost = 1.00
-	available = { always = no }
-	bypass = { has_global_flag = LNS_civil_war_flag }
-	ai_will_do = { factor = 120 }
-	x = 8
-	y = 0
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_commie_civil_war"
-		custom_effect_tooltip = unlock_focuses
-	}
-}
-
-shared_focus = {
-	id = LNS_the_faith_of_the_people
-	icon = GFX_goal_red_star_dove
-	x = -1
-	y = 1
-	relative_position_id = LNS_commie_civil_war
-	cost = 2.00
-	prerequisite = { focus = LNS_commie_civil_war }
-
-	ai_will_do = {
-		factor = 100
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_the_faith_of_the_people"
-		add_war_support = 0.05
-		add_stability = 0.05
-		add_manpower = 3000
-	}
-	search_filters = { FOCUS_FILTER_MANPOWER FOCUS_FILTER_STABILITY FOCUS_FILTER_WAR_SUPPORT }
-}
-
-shared_focus = {
-	id = LNS_peoples_militias
-	icon = GFX_goal_ideology_totalist
-	x = -2
-	y = 2
-	relative_position_id = LNS_commie_civil_war
-	cost = 2.00
-	prerequisite = { focus = LNS_the_faith_of_the_people }
-
-	ai_will_do = {
-		factor = 100
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_peoples_militias"
-		add_manpower = 3000
-		custom_effect_tooltip = LNS_hasty_militias_tp
-		hidden_effect = {
-			load_oob = "LSC_militia"
-		}
-	}
-	search_filters = { FOCUS_FILTER_MANPOWER }
-}
-
-shared_focus = {
-	id = LNS_foreign_volunteers
-	icon = GFX_goal_red_star
-	x = -2
-	y = 3
-	relative_position_id = LNS_commie_civil_war
-	cost = 2.00
-	prerequisite = { focus = LNS_peoples_militias }
-
-	ai_will_do = {
-		factor = 100
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_foreign_volunteers"
-		add_manpower = 1500
-		add_equipment_to_stockpile = { type = infantry_equipment_1 amount = 500 producer = RCT }
-		add_equipment_to_stockpile = { type = infantry_equipment_1 amount = 250 producer = GRW }
-	}
-	search_filters = { FOCUS_FILTER_MANPOWER }
-}
-
-shared_focus = {
-	id = LNS_cottage_industry
-	icon = GFX_goal_commune_politics
-	x = 0
-	y = 2
-	relative_position_id = LNS_commie_civil_war
-	cost = 2.00
-	prerequisite = { focus = LNS_commie_civil_war }
-
-	ai_will_do = {
-		factor = 100
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_cottage_industry"
-		505 = {
-			add_extra_state_shared_building_slots = 1
-			add_building_construction = {
-				type = industrial_complex
-				level = 1
-				instant_build = yes
-			}
-		}
-	}
-	search_filters = { FOCUS_FILTER_INDUSTRY }
-}
-
-shared_focus = {
-	id = LNS_underground_arms_factories
-	icon = GFX_goal_munitions_factories
-	x = 0
-	y = 3
-	relative_position_id = LNS_commie_civil_war
-	cost = 2.00
-	prerequisite = { focus = LNS_cottage_industry }
-
-	ai_will_do = {
-		factor = 100
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_underground_arms_factories"
-		505 = {
-			add_extra_state_shared_building_slots = 1
-			add_building_construction = {
-				type = arms_factory
-				level = 1
-				instant_build = yes
-			}
-		}
-	}
-	search_filters = { FOCUS_FILTER_INDUSTRY }
-}
-
-shared_focus = {
-	id = LNS_wartime_propaganda
-	icon = GFX_goal_syndicalist_industry
-	x = 1
-	y = 1
-	relative_position_id = LNS_commie_civil_war
-	cost = 2.00
-	prerequisite = { focus = LNS_commie_civil_war }
-
-	ai_will_do = {
-		factor = 100
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_wartime_propaganda"
-		add_war_support = 0.05
-		add_political_power = 50
-		add_popularity = { ideology = communism popularity = 0.05 }
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL FOCUS_FILTER_WAR_SUPPORT }
-}
-
-shared_focus = {
-	id = LNS_smuggle_guns
-	icon = GFX_goal_secret_agents_red
-	x = 2
-	y = 2
-	relative_position_id = LNS_commie_civil_war
-	cost = 2.00
-	prerequisite = { focus = LNS_wartime_propaganda }
-
-	ai_will_do = {
-		factor = 100
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_smuggle_guns"
-		add_equipment_to_stockpile = { type = infantry_equipment_0 amount = 500 producer = LCT }
-	}
-}
-
-shared_focus = {
-	id = LNS_breakout_musuem_pieces
-	icon = GFX_goal_national_arsenal
-	x = 2
-	y = 3
-	relative_position_id = LNS_commie_civil_war
-	cost = 2.00
-	prerequisite = { focus = LNS_smuggle_guns }
-
-	ai_will_do = {
-		factor = 100
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_breakout_musuem_pieces"
-		add_equipment_to_stockpile = { type = melee_equipment_1 amount = 1000 producer = LNS }
-	}
-}
-
-shared_focus = {
-	id = LNS_to_victory
-	icon = GFX_goal_purge_opposition
-	x = 0
-	y = 4
-	relative_position_id = LNS_commie_civil_war
-	cost = 2.00
-	prerequisite = { focus = LNS_foreign_volunteers }
-	prerequisite = { focus = LNS_underground_arms_factories }
-	prerequisite = { focus = LNS_breakout_musuem_pieces }
-
-	ai_will_do = {
-		factor = 100
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_to_victory"
-		add_timed_idea = { idea = LNS_final_push_idea days = 180 }
-	}
-}
-
-#####################
-### Military Government Civil War Tree ###
-#####################
-
-shared_focus = {
-	id = LNS_neutral_civil_war
-	icon = GFX_goal_authority
-	cost = 1.00
-	available = { always = no }
-	bypass = { has_global_flag = LNS_civil_war_flag }
-	ai_will_do = { factor = 120 }
-	x = 8
-	y = 0
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_neutral_civil_war"
-		custom_effect_tooltip = unlock_focuses
-	}
-}
-
-shared_focus = {
-	id = LNS_keep_calm
-	icon = GFX_goal_government_icon
-	x = -1
-	y = 1
-	relative_position_id = LNS_neutral_civil_war
-	cost = 2.00
-	prerequisite = { focus = LNS_neutral_civil_war }
-
-	ai_will_do = {
-		factor = 100
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_keep_calm"
-		add_stability = 0.10
-		add_war_support = 0.05
-		add_political_power = 50
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL FOCUS_FILTER_WAR_SUPPORT FOCUS_FILTER_STABILITY }
-}
-
-shared_focus = {
-	id = LNS_keep_it_professional
-	icon = GFX_goal_military_academy
-	x = -2
-	y = 2
-	relative_position_id = LNS_neutral_civil_war
-	cost = 2.00
-	prerequisite = { focus = LNS_keep_calm }
-
-	ai_will_do = {
-		factor = 100
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_keep_it_professional"
-		add_manpower = 2500
-		custom_effect_tooltip = LSM_reserves_tp
-		hidden_effect = {
-			load_oob = "LSM_militia"
-		}
-	}
-	search_filters = { FOCUS_FILTER_MANPOWER }
-}
-
-shared_focus = {
-	id = LNS_and_man_the_cannons
-	icon = GFX_goal_national_artillery
-	x = -2
-	y = 3
-	relative_position_id = LNS_neutral_civil_war
-	cost = 2.00
-	prerequisite = { focus = LNS_keep_it_professional }
-
-	ai_will_do = {
-		factor = 100
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_and_man_the_cannons"
-		add_manpower = 750
-		army_experience = 5
-		add_equipment_to_stockpile = { type = artillery_equipment_1 amount = 250 producer = GRI }
-	}
-	search_filters = { FOCUS_FILTER_MANPOWER FOCUS_FILTER_ARMY_BONUS }
-}
-
-shared_focus = {
-	id = LNS_smalltime_industry
-	icon = GFX_goal_generic_construct_civ_factory
-	x = 0
-	y = 2
-	relative_position_id = LNS_neutral_civil_war
-	cost = 2.00
-	prerequisite = { focus = LNS_neutral_civil_war }
-
-	ai_will_do = {
-		factor = 100
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_smalltime_industry"
-		540 = {
-			add_extra_state_shared_building_slots = 1
-			add_building_construction = {
-				type = industrial_complex
-				level = 1
-				instant_build = yes
-			}
-		}
-	}
-	search_filters = { FOCUS_FILTER_INDUSTRY }
-}
-
-shared_focus = {
-	id = LNS_military_industry
-	icon = GFX_goal_generic_construct_mil_factory
-	x = 0
-	y = 3
-	relative_position_id = LNS_neutral_civil_war
-	cost = 2.00
-	prerequisite = { focus = LNS_smalltime_industry }
-
-	ai_will_do = {
-		factor = 100
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_military_industry"
-		540 = {
-			add_extra_state_shared_building_slots = 1
-			add_building_construction = {
-				type = arms_factory
-				level = 1
-				instant_build = yes
-			}
-		}
-	}
-	search_filters = { FOCUS_FILTER_INDUSTRY }
-}
-
-shared_focus = {
-	id = LNS_old_rifles
-	icon = GFX_goal_national_arsenal
-	x = 1
-	y = 1
-	relative_position_id = LNS_neutral_civil_war
-	cost = 2.00
-	prerequisite = { focus = LNS_neutral_civil_war }
-
-	ai_will_do = {
-		factor = 100
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_old_rifles"
-		add_equipment_to_stockpile = { type = infantry_equipment_0 amount = 750 producer = LNS }
-	}
-}
-
-shared_focus = {
-	id = LNS_service_gurantees_citizenship
-	icon = GFX_goal_industrial_pony
-	x = 2
-	y = 2
-	relative_position_id = LNS_neutral_civil_war
-	cost = 2.00
-	prerequisite = { focus = LNS_old_rifles }
-
-	ai_will_do = {
-		factor = 100
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_service_gurantees_citizenship"
-		add_manpower = 2500
-		add_political_power = -25
-	}
-	search_filters = { FOCUS_FILTER_MANPOWER FOCUS_FILTER_POLITICAL }
-}
-
-shared_focus = {
-	id = LNS_desperate_measures
-	icon = GFX_goal_secret_agents
-	x = 2
-	y = 3
-	relative_position_id = LNS_neutral_civil_war
-	cost = 2.00
-	prerequisite = { focus = LNS_service_gurantees_citizenship }
-
-	ai_will_do = {
-		factor = 100
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_desperate_measures"
-		add_equipment_to_stockpile = { type = melee_equipment_1 amount = 1200 producer = LNS }
-	}
-}
-
-shared_focus = {
-	id = LNS_semper_fi
-	icon = GFX_goal_offensive_army
-	x = 0
-	y = 4
-	relative_position_id = LNS_neutral_civil_war
-	cost = 2.00
-	prerequisite = { focus = LNS_and_man_the_cannons }
-	prerequisite = { focus = LNS_military_industry }
-	prerequisite = { focus = LNS_desperate_measures }
-
-	ai_will_do = {
-		factor = 100
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_semper_fi"
-		add_timed_idea = { idea = LNS_final_push_idea days = 180 }
-	}
-}
-
-#####################
-### Bandit Nation / Politics ###
-#####################
-
-shared_focus = {
-	id = LNS_bandit_victory
-	icon = GFX_goal_LEC_monkey
-	cost = 1.00
-	available = { always = no }
-	bypass = { has_country_flag = LNS_bandit_takeover }
-	ai_will_do = { factor = 120 }
-	x = 12
-	y = 0
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_bandit_victory"
-		custom_effect_tooltip = unlock_focuses
-	}
-}
-
-shared_focus = {
-	id = LNS_consolidate_power
-	icon = GFX_goal_step_on_skull
-	x = 0
-	y = 1
-	relative_position_id = LNS_bandit_victory
-	cost = 5.00
-	prerequisite = { focus = LNS_bandit_victory }
-
-	ai_will_do = {
-		factor = 120
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_consolidate_power"
-		add_war_support = 0.05
-		add_stability = 0.05
-		add_popularity = { ideology = fascism popularity = 0.05 }
-		hidden_effect = {
-			HLQ = { add_to_ROOT_potential_cores = yes }
-		}
-	}
-	search_filters = { FOCUS_FILTER_STABILITY FOCUS_FILTER_WAR_SUPPORT }
-}
-
-shared_focus = {
-	id = LNS_a_chance_meeting
-	icon = GFX_goal_ideology_national_populist
-	x = -6
-	y = 1
-	relative_position_id = LNS_consolidate_power
-	cost = 5.00
-	prerequisite = { focus = LNS_consolidate_power }
-	available = {
-		is_subject = no
-		MNC = {
-			exists = yes
-			has_country_leader = { 
-				character = MNC_eriviar_sunstriker
-				ruling_only = yes 
-			}
-			is_subject = no
-			NOT = { has_war_with = ROOT }
-		}
-	}
-
-	ai_will_do = {
-		factor = 120
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_a_chance_meeting"
-		country_event = { days = 1 id = longsword.81 }
-	}
-}
-
-shared_focus = {
-	id = LNS_a_lovely_gift
-	icon = GFX_goal_gold_reserve
-	x = -1
-	y = 1
-	relative_position_id = LNS_a_chance_meeting
-	cost = 6.00
-	prerequisite = { focus = LNS_a_chance_meeting }
-	available = {
-		is_subject = no
-		MNC = {
-			exists = yes
-			has_country_leader = { 
-				character = MNC_eriviar_sunstriker
-				ruling_only = yes 
-			}
-			is_subject = no
-			NOT = { has_war_with = ROOT }
-		}
-	}
-
-	ai_will_do = {
-		factor = 120
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_a_lovely_gift"
-		MNC = { country_event = { days = 1 id = longsword.83 } }
-	}
-}
-
-shared_focus = {
-	id = LNS_some_wonderful_protection
-	icon = GFX_goal_conscription
-	x = -1
-	y = 3
-	relative_position_id = LNS_a_chance_meeting
-	cost = 8.00
-	prerequisite = { focus = LNS_a_lovely_gift }
-	prerequisite = { focus = LNS_a_return_gift }
-	available = {
-		is_subject = no
-		MNC = {
-			exists = yes
-			has_country_leader = { 
-				character = MNC_eriviar_sunstriker
-				ruling_only = yes 
-			}
-			is_subject = no
-			NOT = { has_war_with = ROOT }
-		}
-	}
-
-	ai_will_do = {
-		factor = 120
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_some_wonderful_protection"
-		custom_effect_tooltip = LNS_bodyguards_tp
-		hidden_effect = {
-			if = {
-				limit = { NOT = { has_tech = tech_mountaineers } }
-				set_technology = { tech_mountaineers = 1 }
-			}
-			fix_weapon_techs = yes
-			load_oob = "LNS_sunstriker_bandits"
-		}
-	}
-	search_filters = { FOCUS_FILTER_MANPOWER FOCUS_FILTER_RESEARCH }
-}
-
-shared_focus = {
-	id = LNS_a_return_gift
-	icon = GFX_goal_GEA_guerilla_warfare
-	x = 0
-	y = 2
-	relative_position_id = LNS_a_chance_meeting
-	cost = 8.00
-	prerequisite = { focus = LNS_a_lovely_gift focus = LNS_a_pleasant_evening }
-	available = {
-		is_subject = no
-		MNC = {
-			exists = yes
-			has_country_leader = { 
-				character = MNC_eriviar_sunstriker
-				ruling_only = yes 
-			}
-			is_subject = no
-			NOT = { has_war_with = ROOT }
-		}
-	}
-
-	ai_will_do = {
-		factor = 120
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_a_return_gift"
-		custom_effect_tooltip = LNS_loot_2_tp
-		add_to_variable = {
-			var = loot
-			value = 2
-		}
-		add_opinion_modifier = { target = MNC modifier = LNS_a_lovely_gift_modifier }
-	}
-}
-
-shared_focus = {
-	id = LNS_a_pleasant_evening
-	icon = GFX_goal_collaborate_local_elites
-	x = 1
-	y = 1
-	relative_position_id = LNS_a_chance_meeting
-	cost = 7.00
-	prerequisite = { focus = LNS_a_chance_meeting }
-	available = {
-		is_subject = no
-		MNC = {
-			exists = yes
-			has_country_leader = { 
-				character = MNC_eriviar_sunstriker
-				ruling_only = yes 
-			}
-			is_subject = no
-			NOT = { has_war_with = ROOT }
-		}
-	}
-
-	ai_will_do = {
-		factor = 120
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_a_pleasant_evening"
-		MNC = { country_event = { days = 1 id = longsword.84 } }
-	}
-}
-
-shared_focus = {
-	id = LNS_maar_is_amused
-	icon = GFX_goal_devotion_to_maar
-	x = 1
-	y = 3
-	relative_position_id = LNS_a_chance_meeting
-	cost = 8.00
-	prerequisite = { focus = LNS_a_return_gift }
-	prerequisite = { focus = LNS_a_pleasant_evening }
-	available = {
-		is_subject = no
-		MNC = {
-			exists = yes
-			has_country_leader = { 
-				character = MNC_eriviar_sunstriker
-				ruling_only = yes 
-			}
-			is_subject = no
-			NOT = { has_war_with = ROOT }
-		}
-	}
-	bypass = {
-		OR = {
-			has_country_flag = LNS_rejected
-			MNC = { NOT = { has_government = fascism } }
-		}
-	}
-
-	ai_will_do = {
-		factor = 120
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_maar_is_amused"
-		custom_effect_tooltip = LNS_random_tp
-		hidden_effect = {
-			random_list = {
-				16 = {
-					add_political_power = 100
-				}
-				16 = {
-					add_stability = 0.05
-				}
-				16 = {
-					add_war_support = 0.05
-				}
-				20 = {
-					add_manpower = 30000
-				}
-				16 = {
-					random_owned_controlled_state = {
-						limit = {
-							free_building_slots = {
-								building = arms_factory
-								size > 0
-								include_locked = yes
-							}
-							OR = {
-								is_in_home_area = yes
-								NOT = {
-									owner = {
-										any_owned_state = {
-											free_building_slots = {
-												building = arms_factory
-												size > 0
-												include_locked = yes
-											}
-											is_in_home_area = yes
-										}
-									}
-								}
-							}
-						}
-						add_extra_state_shared_building_slots = 1
-						add_building_construction = {
-							type = arms_factory
-							level = 1
-							instant_build = yes
-						}
-					}
-				}
-				16 = {
-					random_owned_controlled_state = {
-						limit = {
-							free_building_slots = {
-								building = industrial_complex
-								size > 0
-								include_locked = yes
-							}
-							OR = {
-								is_in_home_area = yes
-								NOT = {
-									owner = {
-										any_owned_state = {
-											free_building_slots = {
-												building = industrial_complex
-												size > 0
-												include_locked = yes
-											}
-											is_in_home_area = yes
-										}
-									}
-								}
-							}
-						}
-						add_extra_state_shared_building_slots = 1
-						add_building_construction = {
-							type = industrial_complex
-							level = 1
-							instant_build = yes
-						}
-					}
-				}
-			}
-		}
-	}
-	search_filters = { FOCUS_FILTER_MANPOWER FOCUS_FILTER_POLITICAL FOCUS_FILTER_INDUSTRY FOCUS_FILTER_STABILITY FOCUS_FILTER_WAR_SUPPORT }
-}
-
-shared_focus = {
-	id = LNS_the_sunstriker_wedding
-	icon = GFX_goal_new_temple
-	x = 0
-	y = 4
-	relative_position_id = LNS_a_chance_meeting
-	cost = 8.00
-	prerequisite = { focus = LNS_some_wonderful_protection }
-	prerequisite = { focus = LNS_maar_is_amused }
-	available = {
-		is_subject = no
-		MNC = {
-			exists = yes
-			has_country_leader = { 
-				character = MNC_eriviar_sunstriker
-				ruling_only = yes 
-			}
-			is_subject = no
-			NOT = { has_war_with = ROOT }
-		}
-	}
-
-	ai_will_do = {
-		factor = 120
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_the_sunstriker_wedding"
-		MNC = { country_event = { days = 1 id = longsword.91 } }
-	}
-}
-
-shared_focus = {
-	id = LNS_defenceless_ponies
-	icon = GFX_focus_firtree
-	x = -4
-	y = 1
-	relative_position_id = LNS_consolidate_power
-	cost = 5.00
-	prerequisite = { focus = LNS_consolidate_power }
-	available = {
-		is_subject = no
-		owns_state = 633
-	}
-	bypass = {
-		OR = {
-			owns_state = 650
-			owns_state = 453
-		}
-	}
-	ai_will_do = {
-		factor = 120
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_defenceless_ponies"
-		custom_effect_tooltip = LNS_borderwars_unlocked
-		add_war_support = 0.05
-	}
-}
-shared_focus = {
-	id = LNS_beasts_of_burden
-	icon = GFX_goal_generic_slavery_pony
-	x = 1
-	y = 1
-	relative_position_id = LNS_defenceless_ponies
-	cost = 5.00
-	prerequisite = { focus = LNS_defenceless_ponies }
-	available = {
-		is_subject = no
-		owns_state = 650
-	}
-
-	ai_will_do = {
-		factor = 120
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_beasts_of_burden"
-		add_state_core = 650
-		add_ideas = LNS_beasts_of_burden_idea
-	}
-}
-shared_focus = {
-	id = LNS_mines_of_silverfalls
-	icon = GFX_goal_silver_reserve
-	x = -1
-	y = 1
-	relative_position_id = LNS_beasts_of_burden
-	cost = 5.00
-	prerequisite = { focus = LNS_beasts_of_burden }
-	available = {
-		is_subject = no
-		owns_state = 453
-	}
-
-	ai_will_do = {
-		factor = 120
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_mines_of_silverfalls"
-		add_state_core = 453
-		add_resource = {
-			type = steel
-			amount = 8
-			state = 453
-		}
-		custom_effect_tooltip = LNS_loot_3_tp
-		add_to_variable = {
-			var = loot
-			value = 3
-		}
-	}
-}
-
-shared_focus = {
-	id = LNS_enslave_the_illiterate
-	icon = GFX_goal_skull_fortification
-	x = -2
-	y = 1
-	relative_position_id = LNS_consolidate_power
-	cost = 8.00
-	prerequisite = { focus = LNS_consolidate_power }
-
-	ai_will_do = {
-		factor = 120
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_enslave_the_illiterate"
-		custom_effect_tooltip = LNS_education_tp
-		hidden_effect = {
-			country_event = { days = 300 id = longsword.95 }
-		}
-	}
-}
-
-shared_focus = {
-	id = LNS_massive_drug_fields
-	icon = GFX_goal_SZC_opium_tax
-	x = -2
-	y = 3
-	relative_position_id = LNS_consolidate_power
-	cost = 10.00
-	prerequisite = { focus = LNS_enslave_the_illiterate }
-
-	ai_will_do = {
-		factor = 120
-	}
-	available = {
-		552 = { is_owned_and_controlled_by = ROOT }
-		540 = { is_owned_and_controlled_by = ROOT }
-		505 = { is_owned_and_controlled_by = ROOT }
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_massive_drug_fields"
-		add_ideas = LNS_opium_fields
-		552 = {
-			add_extra_state_shared_building_slots = 1
-		}
-		540 = {
-			add_extra_state_shared_building_slots = 1
-		}
-		505 = {
-			add_extra_state_shared_building_slots = 1
-		}
-	}
-	search_filters = { FOCUS_FILTER_STABILITY FOCUS_FILTER_INDUSTRY FOCUS_FILTER_POLITICAL }
-}
-
-shared_focus = {
-	id = LNS_imperial_markets
-	icon = GFX_goal_bag_of_money
-	x = -2
-	y = 5
-	relative_position_id = LNS_consolidate_power
-	cost = 10.00
-	prerequisite = { focus = LNS_massive_drug_fields }
-
-	ai_will_do = {
-		factor = 120
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_imperial_markets"
-		add_political_power = 100
-		add_war_support = 0.05
-		add_stability = 0.05
-	}
-	search_filters = { FOCUS_FILTER_STABILITY FOCUS_FILTER_WAR_SUPPORT FOCUS_FILTER_POLITICAL }
-}
-
-shared_focus = {
-	id = LNS_despoil_the_land
-	icon = GFX_goal_forced_res
-	x = 0
-	y = 1
-	relative_position_id = LNS_consolidate_power
-	cost = 8.00
-	prerequisite = { focus = LNS_consolidate_power }
-
-	ai_will_do = {
-		factor = 120
-	}
-	available = {
-		552 = { is_controlled_by = ROOT }
-		540 = { is_controlled_by = ROOT }
-		505 = { is_controlled_by = ROOT }
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_despoil_the_land"
-		custom_effect_tooltip = LNS_loot_3_tp
-		add_to_variable = {
-			var = loot
-			value = 3
-		}
-		save_current_manpower = yes
-		552 = {
-			add_manpower = -15000
-		}
-		540 = {
-			add_manpower = -15000
-		}
-		505 = {
-			add_manpower = -15000
-		}
-		restore_previous_manpower = yes
-	}
-	search_filters = { FOCUS_FILTER_MANPOWER }
-}
-
-shared_focus = {
-	id = LNS_lesson_of_the_reformisten
-	icon = GFX_goal_slavery
-	x = -1
-	y = 2
-	relative_position_id = LNS_consolidate_power
-	cost = 8.00
-	prerequisite = { focus = LNS_despoil_the_land }
-
-	ai_will_do = {
-		factor = 120
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_lesson_of_the_reformisten"
-		add_ideas = LNS_meatshields
-	}
-	search_filters = { FOCUS_FILTER_MANPOWER FOCUS_FILTER_STABILITY FOCUS_FILTER_POLITICAL }
-}
-
-shared_focus = {
-	id = LNS_into_the_mines
-	icon = GFX_focus_indy_excavations
-	x = -1
-	y = 4
-	relative_position_id = LNS_consolidate_power
-	cost = 8.00
-	prerequisite = { focus = LNS_lesson_of_the_reformisten }
-	prerequisite = { focus = LNS_an_iron_grip }
-
-	ai_will_do = {
-		factor = 120
-	}
-	available = {
-		505 = { is_owned_and_controlled_by = ROOT }
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_into_the_mines"
-		swap_ideas = {
-			remove_idea = LNS_meatshields
-			add_idea = LNS_meatshields_1
-		}
-		add_resource = {
-			type = steel
-			amount = 8
-			state = 505
-		}
-	}
-	search_filters = { FOCUS_FILTER_MANPOWER FOCUS_FILTER_STABILITY FOCUS_FILTER_INDUSTRY FOCUS_FILTER_POLITICAL }
-}
-
-shared_focus = {
-	id = LNS_an_iron_grip
-	icon = GFX_goal_national_populism
-	x = 0
-	y = 3
-	relative_position_id = LNS_consolidate_power
-	cost = 8.00
-	prerequisite = { focus = LNS_lesson_of_the_reformisten focus = LNS_target_practice }
-
-	ai_will_do = {
-		factor = 120
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_an_iron_grip"
-		add_war_support = 0.10
-		add_stability = 0.05
-		add_popularity = { ideology = fascism popularity = 0.05 }
-	}
-	search_filters = { FOCUS_FILTER_STABILITY FOCUS_FILTER_WAR_SUPPORT }
-}
-
-shared_focus = {
-	id = LNS_target_practice
-	icon = GFX_goal_Modern_Weapons
-	x = 1
-	y = 2
-	relative_position_id = LNS_consolidate_power
-	cost = 8.00
-	prerequisite = { focus = LNS_despoil_the_land }
-
-	ai_will_do = {
-		factor = 120
-	}
-	available = {
-		552 = { is_controlled_by = ROOT }
-		540 = { is_controlled_by = ROOT }
-		505 = { is_controlled_by = ROOT }
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_target_practice"
-		army_experience = 25
-		add_manpower = 30000
-		add_corps_commander_role = {
-			character = LNS_werner_shadowfeather
-
-			traits = { trickster trait_reckless griffon_race_trait }
-			skill = 2
-			attack_skill = 3
-			defense_skill = 1
-			planning_skill = 1
-			logistics_skill = 2
-		} custom_effect_tooltip = LNS_werner_stats_tp
-		save_current_manpower = yes
-		552 = {
-			add_manpower = -10000
-		}
-		540 = {
-			add_manpower = -10000
-		}
-		505 = {
-			add_manpower = -10000
-		}
-		restore_previous_manpower = yes
-	}
-	search_filters = { FOCUS_FILTER_ARMY_BONUS FOCUS_FILTER_MANPOWER }
-}
-
-shared_focus = {
-	id = LNS_organ_donors
-	icon = GFX_goal_generic_dangerous_deal_pony_griffon
-	x = 1
-	y = 4
-	relative_position_id = LNS_consolidate_power
-	cost = 8.00
-	prerequisite = { focus = LNS_target_practice }
-	prerequisite = { focus = LNS_an_iron_grip }
-
-	ai_will_do = {
-		factor = 120
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_organ_donors"
-		custom_effect_tooltip = LNS_gradual_loot_tp
-		hidden_effect = {
-			country_event = { days = 180 id = longsword.97 }
-		}
-	}
-}
-
-shared_focus = {
-	id = LNS_reinvest_our_profits
-	icon = GFX_goal_gold_up
-	x = 0
-	y = 5
-	relative_position_id = LNS_consolidate_power
-	cost = 10.00
-	prerequisite = { focus = LNS_into_the_mines }
-	prerequisite = { focus = LNS_organ_donors }
-
-	ai_will_do = {
-		factor = 120
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_reinvest_our_profits"
-		increase_society_development = yes
-		increase_science_base = yes
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL FOCUS_FILTER_RESEARCH }
-}
-
-shared_focus = {
-	id = LNS_we_are_rich
-	icon = GFX_goal_endless_money
-	x = 0
-	y = 6
-	relative_position_id = LNS_consolidate_power
-	cost = 10.00
-	prerequisite = { focus = LNS_imperial_markets }
-	prerequisite = { focus = LNS_reinvest_our_profits }
-	prerequisite = { focus = LNS_black_market_arms_industry }
-
-	ai_will_do = {
-		factor = 120
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_we_are_rich"
-		add_research_slot = 1
-		increase_society_development = yes
-		increase_science_base = yes
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL FOCUS_FILTER_RESEARCH }
-}
-
-shared_focus = {
-	id = LNS_legalize_poverty
-	icon = GFX_goal_skull_treaty2
-	x = 2
-	y = 1
-	relative_position_id = LNS_consolidate_power
-	cost = 8.00
-	prerequisite = { focus = LNS_consolidate_power }
-
-	ai_will_do = {
-		factor = 120
-	}
-	available = {
-		any_owned_state = {
-			is_controlled_by = ROOT
-			free_building_slots = {
-				building = industrial_complex
-				size > 0
-				include_locked = yes
-			}
-		}
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_legalize_poverty"
-		decrease_poverty = yes
-		add_political_power = -75
-		random_owned_controlled_state = {
-			limit = {
-				free_building_slots = {
-					building = industrial_complex
-					size > 0
-					include_locked = yes
-				}
-				OR = {
-					is_in_home_area = yes
-					NOT = {
-						owner = {
-							any_owned_state = {
-								free_building_slots = {
-									building = industrial_complex
-									size > 0
-									include_locked = yes
-								}
-								is_in_home_area = yes
-							}
-						}
-					}
-				}
-			}
-			add_extra_state_shared_building_slots = 1
-			add_building_construction = {
-				type = industrial_complex
-				level = 1
-				instant_build = yes
-			}
-		}
-	}
-	search_filters = { FOCUS_FILTER_INDUSTRY FOCUS_FILTER_POLITICAL }
-}
-
-shared_focus = {
-	id = LNS_work_programs
-	icon = GFX_goal_forced_con
-	x = 2
-	y = 3
-	relative_position_id = LNS_consolidate_power
-	cost = 10.00
-	prerequisite = { focus = LNS_legalize_poverty }
-
-	ai_will_do = {
-		factor = 120
-	}
-	available = {
-		any_owned_state = {
-			is_controlled_by = ROOT
-			free_building_slots = {
-				building = industrial_complex
-				size > 0
-				include_locked = yes
-			}
-		}
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_work_programs"
-		decrease_poverty = yes
-		add_political_power = -100
-		random_owned_controlled_state = {
-			limit = {
-				free_building_slots = {
-					building = industrial_complex
-					size > 0
-					include_locked = yes
-				}
-				OR = {
-					is_in_home_area = yes
-					NOT = {
-						owner = {
-							any_owned_state = {
-								free_building_slots = {
-									building = industrial_complex
-									size > 0
-									include_locked = yes
-								}
-								is_in_home_area = yes
-							}
-						}
-					}
-				}
-			}
-			add_extra_state_shared_building_slots = 1
-			add_building_construction = {
-				type = industrial_complex
-				level = 1
-				instant_build = yes
-			}
-		}
-		random_owned_controlled_state = {
-			limit = {
-				free_building_slots = {
-					building = industrial_complex
-					size > 0
-					include_locked = yes
-				}
-				OR = {
-					is_in_home_area = yes
-					NOT = {
-						owner = {
-							any_owned_state = {
-								free_building_slots = {
-									building = industrial_complex
-									size > 0
-									include_locked = yes
-								}
-								is_in_home_area = yes
-							}
-						}
-					}
-				}
-			}
-			add_extra_state_shared_building_slots = 1
-			add_building_construction = {
-				type = industrial_complex
-				level = 1
-				instant_build = yes
-			}
-		}
-	}
-	search_filters = { FOCUS_FILTER_INDUSTRY FOCUS_FILTER_POLITICAL }
-}
-
-shared_focus = {
-	id = LNS_black_market_arms_industry
-	icon = GFX_goal_forced_mil
-	x = 2
-	y = 5
-	relative_position_id = LNS_consolidate_power
-	cost = 10.00
-	prerequisite = { focus = LNS_work_programs }
-
-	ai_will_do = {
-		factor = 120
-	}
-	available = {
-		any_owned_state = {
-			is_controlled_by = ROOT
-			free_building_slots = {
-				building = arms_factory
-				size > 0
-				include_locked = yes
-			}
-		}
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_black_market_arms_industry"
-		random_owned_controlled_state = {
-			limit = {
-				free_building_slots = {
-					building = arms_factory
-					size > 0
-					include_locked = yes
-				}
-				OR = {
-					is_in_home_area = yes
-					NOT = {
-						owner = {
-							any_owned_state = {
-								free_building_slots = {
-									building = arms_factory
-									size > 0
-									include_locked = yes
-								}
-								is_in_home_area = yes
-							}
-						}
-					}
-				}
-			}
-			add_extra_state_shared_building_slots = 1
-			add_building_construction = {
-				type = arms_factory
-				level = 1
-				instant_build = yes
-			}
-		}
-		random_owned_controlled_state = {
-			limit = {
-				free_building_slots = {
-					building = arms_factory
-					size > 0
-					include_locked = yes
-				}
-				OR = {
-					is_in_home_area = yes
-					NOT = {
-						owner = {
-							any_owned_state = {
-								free_building_slots = {
-									building = arms_factory
-									size > 0
-									include_locked = yes
-								}
-								is_in_home_area = yes
-							}
-						}
-					}
-				}
-			}
-			add_extra_state_shared_building_slots = 1
-			add_building_construction = {
-				type = arms_factory
-				level = 1
-				instant_build = yes
-			}
-		}
-	}
-	search_filters = { FOCUS_FILTER_INDUSTRY }
-}
-shared_focus = {
-	id = LNS_southern_sister
-	icon = GFX_goal_ban_blackrock
-	x = 4
-	y = 1
-	relative_position_id = LNS_consolidate_power
-	cost = 5.00
-	prerequisite = { focus = LNS_consolidate_power }
-	available = {
-		is_subject = no
-	}
-	bypass = {
-		BAN = {
-			OR = {
-				exists = no
-				is_subject = yes
-				NOT = {
-					has_government = fascism
-				}
-				has_war_with = ROOT
-			}
-		}
-	}
-	ai_will_do = {
-		factor = 120
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_southern_sister"
-		country_event = longsword.170
-		BAN = {
-			country_event = longsword.170
-		}
-	}
-}
-shared_focus = {
-	id = LNS_ally_blackrock
-	icon = GFX_goal_generic_military_deal
-	x = -1
-	y = 1
-	relative_position_id = LNS_southern_sister
-	cost = 5.00
-	prerequisite = { focus = LNS_southern_sister }
-	available = {
-		is_subject = no
-	}
-	bypass = {
-		BAN = {
-			OR = {
-				exists = no
-				is_subject = yes
-				NOT = {
-					has_government = fascism
-				}
-				has_war_with = ROOT
-				is_in_faction_with = ROOT
-			}
-		}
-	}
-	ai_will_do = {
-		factor = 120
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_ally_blackrock"
-		BAN = {
-			country_event = longsword.171
-		}
-	}
-}
-shared_focus = {
-	id = LNS_split_lushi
-	icon = GFX_goal_crown_and_swords
-	x = 1
-	y = 1
-	relative_position_id = LNS_ally_blackrock
-	cost = 8.00
-	prerequisite = { focus = LNS_ally_blackrock }
-	will_lead_to_war_with = LUS
-	bypass = {
-		LUS = {
-			OR = {
-				exists = no
-				has_war_with = ROOT
-				is_subject_of = ROOT
-				is_in_faction_with = ROOT
-			}
-		}
-	}
-	ai_will_do = {
-		factor = 120
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_split_lushi"
-		create_wargoal = {
-			target = LUS
-			type = annex_everything
-		}
-	}
-	search_filters = { FOCUS_FILTER_ANNEXATION }
-}
-
-shared_focus = {
-	id = LNS_friendship_is_banditry
-	icon = GFX_goal_nested_fortifications
-	x = 6
-	y = 1
-	relative_position_id = LNS_consolidate_power
-	cost = 8.00
-	prerequisite = { focus = LNS_consolidate_power }
-
-	ai_will_do = {
-		factor = 120
-	}
-	available = {
-		552 = { is_owned_and_controlled_by = ROOT }
-		540 = { is_owned_and_controlled_by = ROOT }
-		505 = { is_owned_and_controlled_by = ROOT }
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_friendship_is_banditry"
-		540 = {
-			add_building_construction = {
-				type = bunker
-				level = 1
-				province = 12893
-				instant_build = yes
-			}
-			add_building_construction = {
-				type = bunker
-				level = 1
-				province = 2055
-				instant_build = yes
-			}
-		}
-		552 = {
-			add_building_construction = {
-				type = bunker
-				level = 1
-				province = 9908
-				instant_build = yes
-			}
-			add_building_construction = {
-				type = bunker
-				level = 1
-				province = 9918
-				instant_build = yes
-			}
-			add_building_construction = {
-				type = bunker
-				level = 1
-				province = 9795
-				instant_build = yes
-			}
-			add_building_construction = {
-				type = bunker
-				level = 1
-				province = 11828
-				instant_build = yes
-			}
-			add_building_construction = {
-				type = bunker
-				level = 1
-				province = 11775
-				instant_build = yes
-			}
-			add_building_construction = {
-				type = bunker
-				level = 1
-				province = 978
-				instant_build = yes
-			}
-			add_building_construction = {
-				type = bunker
-				level = 1
-				province = 11770
-				instant_build = yes
-			}
-			add_building_construction = {
-				type = bunker
-				level = 1
-				province = 10083
-				instant_build = yes
-			}
-		}
-		505 = {
-			add_building_construction = {
-				type = bunker
-				level = 1
-				province = 7070
-				instant_build = yes
-			}
-		}
-	}
-	search_filters = { FOCUS_FILTER_INDUSTRY }
-}
-
-shared_focus = {
-	id = LNS_girls_night_out
-	icon = GFX_goal_focus_TRD_bottleforcyrus
-	x = -1
-	y = 1
-	relative_position_id = LNS_friendship_is_banditry
-	cost = 10.00
-	prerequisite = { focus = LNS_friendship_is_banditry }
-	available = {
-		any_owned_state = {
-			is_controlled_by = ROOT
-			free_building_slots = {
-				building = industrial_complex
-				size > 0
-				include_locked = yes
-			}
-		}
-	}
-
-	ai_will_do = {
-		factor = 120
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_girls_night_out"
-		add_political_power = -50
-		random_owned_controlled_state = {
-			limit = {
-				free_building_slots = {
-					building = industrial_complex
-					size > 0
-					include_locked = yes
-				}
-				OR = {
-					is_in_home_area = yes
-					NOT = {
-						owner = {
-							any_owned_state = {
-								free_building_slots = {
-									building = industrial_complex
-									size > 0
-									include_locked = yes
-								}
-								is_in_home_area = yes
-							}
-						}
-					}
-				}
-			}
-			add_extra_state_shared_building_slots = 1
-			add_building_construction = {
-				type = industrial_complex
-				level = 1
-				instant_build = yes
-			}
-		}
-	}
-	search_filters = { FOCUS_FILTER_INDUSTRY FOCUS_FILTER_POLITICAL }
-}
-
-shared_focus = {
-	id = LNS_smuggling
-	icon = GFX_goal_LEC_Cigarettes
-	x = -1
-	y = 3
-	relative_position_id = LNS_friendship_is_banditry
-	cost = 10.00
-	prerequisite = { focus = LNS_girls_night_out }
-	prerequisite = { focus = LNS_besties }
-	available = {
-		any_owned_state = {
-			is_controlled_by = ROOT
-			free_building_slots = {
-				building = industrial_complex
-				size > 0
-				include_locked = yes
-			}
-		}
-	}
-
-	ai_will_do = {
-		factor = 120
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_smuggling"
-		add_political_power = -75
-		random_owned_controlled_state = {
-			limit = {
-				free_building_slots = {
-					building = industrial_complex
-					size > 0
-					include_locked = yes
-				}
-				OR = {
-					is_in_home_area = yes
-					NOT = {
-						owner = {
-							any_owned_state = {
-								free_building_slots = {
-									building = industrial_complex
-									size > 0
-									include_locked = yes
-								}
-								is_in_home_area = yes
-							}
-						}
-					}
-				}
-			}
-			add_extra_state_shared_building_slots = 1
-			add_building_construction = {
-				type = industrial_complex
-				level = 1
-				instant_build = yes
-			}
-		}
-		random_owned_controlled_state = {
-			limit = {
-				free_building_slots = {
-					building = industrial_complex
-					size > 0
-					include_locked = yes
-				}
-				OR = {
-					is_in_home_area = yes
-					NOT = {
-						owner = {
-							any_owned_state = {
-								free_building_slots = {
-									building = industrial_complex
-									size > 0
-									include_locked = yes
-								}
-								is_in_home_area = yes
-							}
-						}
-					}
-				}
-			}
-			add_extra_state_shared_building_slots = 1
-			add_building_construction = {
-				type = industrial_complex
-				level = 1
-				instant_build = yes
-			}
-		}
-	}
-	search_filters = { FOCUS_FILTER_INDUSTRY FOCUS_FILTER_POLITICAL }
-}
-
-shared_focus = {
-	id = LNS_besties
-	icon = GFX_goal_gold_reserve_2
-	x = 0
-	y = 2
-	relative_position_id = LNS_friendship_is_banditry
-	cost = 8.00
-	prerequisite = { focus = LNS_girls_night_out focus = LNS_naniwich_mountain_trip }
-
-	ai_will_do = {
-		factor = 120
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_besties"
-		custom_effect_tooltip = LNS_loot_3_tp
-		add_to_variable = {
-			var = loot
-			value = 3
-		}
-	}
-}
-
-shared_focus = {
-	id = LNS_naniwich_mountain_trip
-	icon = GFX_goal_offensive_army
-	x = 1
-	y = 1
-	relative_position_id = LNS_friendship_is_banditry
-	cost = 10.00
-	prerequisite = { focus = LNS_friendship_is_banditry }
-	available = {
-		any_owned_state = {
-			is_controlled_by = ROOT
-			free_building_slots = {
-				building = arms_factory
-				size > 0
-				include_locked = yes
-			}
-		}
-	}
-
-	ai_will_do = {
-		factor = 120
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_naniwich_mountain_trip"
-		add_political_power = -25
-		random_owned_controlled_state = {
-			limit = {
-				free_building_slots = {
-					building = arms_factory
-					size > 0
-					include_locked = yes
-				}
-				OR = {
-					is_in_home_area = yes
-					NOT = {
-						owner = {
-							any_owned_state = {
-								free_building_slots = {
-									building = arms_factory
-									size > 0
-									include_locked = yes
-								}
-								is_in_home_area = yes
-							}
-						}
-					}
-				}
-			}
-			add_extra_state_shared_building_slots = 1
-			add_building_construction = {
-				type = arms_factory
-				level = 1
-				instant_build = yes
-			}
-		}
-	}
-	search_filters = { FOCUS_FILTER_INDUSTRY FOCUS_FILTER_POLITICAL }
-}
-
-shared_focus = {
-	id = LNS_arms_trade
-	icon = GFX_goal_Arms_Export
-	x = 1
-	y = 3
-	relative_position_id = LNS_friendship_is_banditry
-	cost = 8.00
-	prerequisite = { focus = LNS_naniwich_mountain_trip }
-	prerequisite = { focus = LNS_besties }
-	available = {
-		any_owned_state = {
-			is_controlled_by = ROOT
-			free_building_slots = {
-				building = arms_factory
-				size > 0
-				include_locked = yes
-			}
-		}
-	}
-
-	ai_will_do = {
-		factor = 120
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_arms_trade"
-		add_political_power = -25
-		random_owned_controlled_state = {
-			limit = {
-				free_building_slots = {
-					building = arms_factory
-					size > 0
-					include_locked = yes
-				}
-				OR = {
-					is_in_home_area = yes
-					NOT = {
-						owner = {
-							any_owned_state = {
-								free_building_slots = {
-									building = arms_factory
-									size > 0
-									include_locked = yes
-								}
-								is_in_home_area = yes
-							}
-						}
-					}
-				}
-			}
-			add_extra_state_shared_building_slots = 1
-			add_building_construction = {
-				type = arms_factory
-				level = 1
-				instant_build = yes
-			}
-		}
-	}
-	search_filters = { FOCUS_FILTER_INDUSTRY FOCUS_FILTER_POLITICAL }
-}
-
-shared_focus = {
-	id = LNS_longswordian_dream
-	icon = GFX_goal_chn_economic_plan
-	x = 0
-	y = 4
-	relative_position_id = LNS_friendship_is_banditry
-	cost = 8.00
-	prerequisite = { focus = LNS_smuggling }
-	prerequisite = { focus = LNS_arms_trade }
-
-	ai_will_do = {
-		factor = 120
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_longswordian_dream"
-		add_ideas = LNS_dream_idea
-		add_popularity = { 
-			ideology = fascism 
-			popularity = 0.1
-		}
-	}
-}
-
-#####################
-### Bandit / Army ###
-#####################
-
-shared_focus = {
-	id = LNS_bandit_army
-	icon = GFX_goal_MAF_African_Pilots
-	x = -10
-	y = 1
-	relative_position_id = LNS_bandit_victory
-	cost = 5.00
-	prerequisite = { focus = LNS_bandit_victory }
-
-	ai_will_do = {
-		factor = 60
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_bandit_army"
-		army_experience = 20
-	}
-	search_filters = { FOCUS_FILTER_ARMY_BONUS }
-}
-
-shared_focus = {
-	id = LNS_get_guns
-	icon = GFX_goal_van_rifles
-	x = -2
-	y = 1
-	relative_position_id = LNS_bandit_army
-	cost = 8.00
-	prerequisite = { focus = LNS_bandit_army }
-
-	ai_will_do = {
-		factor = 60
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_get_guns"
-		add_tech_bonus = {
-			name = infantry_weapons_bonus
-			bonus = 1.0
-			uses = 1
-			category = infantry_weapons
-		}
-		add_equipment_to_stockpile = { type = infantry_equipment amount = 750 producer = HLQ }
-		add_equipment_to_stockpile = { type = infantry_equipment amount = 500 producer = LUS }
-		add_equipment_to_stockpile = { type = infantry_equipment amount = 250 producer = LCT }
-	}
-	search_filters = { FOCUS_FILTER_RESEARCH }
-}
-
-shared_focus = {
-	id = LNS_basic_artillery
-	icon = GFX_goal_national_artillery
-	x = -2
-	y = 3
-	relative_position_id = LNS_bandit_army
-	cost = 10.00
-	prerequisite = { focus = LNS_get_guns }
-
-	ai_will_do = {
-		factor = 60
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_basic_artillery"
-		add_equipment_to_stockpile = { type = artillery_equipment_1 amount = 500 producer = HLQ }
-		add_tech_bonus = {
-			name = infantry_weapons_bonus
-			bonus = 1.0
-			uses = 1
-			category = artillery
-		}
-	}
-	search_filters = { FOCUS_FILTER_RESEARCH }
-}
-
-shared_focus = {
-	id = LNS_pull_out_shovels
-	icon = GFX_goal_forced_res
-	x = -1
-	y = 2
-	relative_position_id = LNS_bandit_army
-	cost = 10.00
-	prerequisite = { focus = LNS_get_guns }
-	prerequisite = { focus = LNS_organize_warbands }
-
-	ai_will_do = {
-		factor = 60
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_pull_out_shovels"
-		add_equipment_to_stockpile = { type = support_equipment_1 amount = 300 producer = LCT }
-		add_tech_bonus = {
-			name = infantry_bonus
-			bonus = 1.0
-			uses = 1
-			category = support_tech
-		}
-	}
-	search_filters = { FOCUS_FILTER_RESEARCH }
-}
-
-shared_focus = {
-	id = LNS_organize_warbands
-	icon = GFX_goal_national_arsenal
-	x = 0
-	y = 1
-	relative_position_id = LNS_bandit_army
-	cost = 8.00
-	prerequisite = { focus = LNS_bandit_army }
-
-	ai_will_do = {
-		factor = 60
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_organize_warbands"
-		add_manpower = 40000
-		army_experience = 15
-	}
-	search_filters = { FOCUS_FILTER_MANPOWER FOCUS_FILTER_ARMY_BONUS }
-}
-
-shared_focus = {
-	id = LNS_appoint_leaders
-	icon = GFX_focus_generic_military_mission
-	x = 2
-	y = 1
-	relative_position_id = LNS_bandit_army
-	cost = 8.00
-	prerequisite = { focus = LNS_bandit_army }
-
-	ai_will_do = {
-		factor = 60
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_appoint_leaders"
-		army_experience = 15
-		add_corps_commander_role = {
-			character = LNS_joachim_ehrenberg
-
-			traits = { infantry_officer trait_reckless griffon_race_trait }
-			skill = 2
-			attack_skill = 4
-			defense_skill = 1
-			planning_skill = 3
-			logistics_skill = 2
-		} custom_effect_tooltip = LNS_joachim_stats_tp
-		add_corps_commander_role = {
-			character = LNS_augustin_lichter
-
-			traits = { ranger griffon_race_trait }
-			skill = 2
-			attack_skill = 3
-			defense_skill = 1
-			planning_skill = 1
-			logistics_skill = 2
-		} custom_effect_tooltip = LNS_augustin_stats_tp
-		add_corps_commander_role = {
-			character = LNS_dionysus_mooncrest
-
-			traits = { expert_improviser griffon_race_trait }
-			skill = 2
-			attack_skill = 1
-			defense_skill = 3
-			planning_skill = 1
-			logistics_skill = 2
-		} custom_effect_tooltip = LNS_dionysus_stats_tp
-	}
-	search_filters = { FOCUS_FILTER_ARMY_BONUS }
-}
-
-shared_focus = {
-	id = LNS_personal_armies
-	icon = GFX_goal_authority
-	x = 2
-	y = 3
-	relative_position_id = LNS_bandit_army
-	cost = 10.00
-	prerequisite = { focus = LNS_appoint_leaders }
-
-	ai_will_do = {
-		factor = 60
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_personal_armies"
-		add_manpower = 20000
-		add_ideas = LNS_personal_armies_idea
-	}
-	search_filters = { FOCUS_FILTER_MANPOWER FOCUS_FILTER_ARMY_BONUS }
-}
-
-shared_focus = {
-	id = LNS_new_tactics
-	icon = GFX_goal_generic_position_armies
-	x = 1
-	y = 2
-	relative_position_id = LNS_bandit_army
-	cost = 10.00
-	prerequisite = { focus = LNS_appoint_leaders }
-	prerequisite = { focus = LNS_organize_warbands }
-
-	ai_will_do = {
-		factor = 60
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_new_tactics"
-		add_doctrine_cost_reduction = {
-			name = land_doc_bonus
-			cost_reduction = 0.5
-			uses = 2
-			category = land_doctrine
-		}
-	}
-	search_filters = { FOCUS_FILTER_RESEARCH }
-}
-
-shared_focus = {
-	id = LNS_hit_and_run
-	icon = GFX_goal_planning_bonus
-	x = 0
-	y = 3
-	relative_position_id = LNS_bandit_army
-	cost = 10.00
-	prerequisite = { focus = LNS_pull_out_shovels }
-	prerequisite = { focus = LNS_new_tactics }
-
-	ai_will_do = {
-		factor = 60
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_hit_and_run"
-		add_ideas = LNS_hit_and_run_idea
-	}
-	search_filters = { FOCUS_FILTER_ARMY_BONUS }
-}
-
-shared_focus = {
-	id = LNS_tank_raiding_brigade
-	icon = GFX_focus_NZL_bob_semple_tank
-	x = -1
-	y = 4
-	relative_position_id = LNS_bandit_army
-	cost = 10.00
-	prerequisite = { focus = LNS_hit_and_run }
-	prerequisite = { focus = LNS_basic_artillery }
-
-	ai_will_do = {
-		factor = 60
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_tank_raiding_brigade"
-		if = {
-			limit = {
-				OR = {
-					has_tech = gwtank
-					has_tech = gwtank_chassis
-				}
-			}
-			add_tech_bonus = {
-				name = light_tank_bonus
-				bonus = 1.0
-				uses = 1
-				category = cat_light_armor
-			}
-			else = {
-				if = {
-					limit = {
-						has_dlc = "No Step Back"
-					}
-					set_technology = {
-						gwtank_chassis = 1
-					}
-				}
-				else = {			
-					set_technology = {
-						gwtank = 1
-					}
-				}
-			}
-		}
-		add_equipment_to_stockpile = {
-			type = gw_tank_equipment
-			amount = 150
-			producer = LNS
-		}
-	}
-	search_filters = { FOCUS_FILTER_RESEARCH }
-}
-
-shared_focus = {
-	id = LNS_baggage
-	icon = GFX_goal_forced_inf
-	x = 1
-	y = 4
-	relative_position_id = LNS_bandit_army
-	cost = 10.00
-	prerequisite = { focus = LNS_hit_and_run }
-	prerequisite = { focus = LNS_personal_armies }
-
-	ai_will_do = {
-		factor = 60
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_baggage"
-		add_ideas = LNS_baggae_idea
-	}
-	search_filters = { FOCUS_FILTER_ARMY_BONUS }
-}
-
-shared_focus = {
-	id = LNS_the_apocalypse
-	icon = GFX_goal_Black_State_Rising_2
-	x = 0
-	y = 5
-	relative_position_id = LNS_bandit_army
-	cost = 10.00
-	prerequisite = { focus = LNS_baggage }
-	prerequisite = { focus = LNS_tank_raiding_brigade }
-
-	ai_will_do = {
-		factor = 60
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_the_apocalypse"
-		custom_effect_tooltip = LNS_despoiler_tp
-		hidden_effect = {
-			load_oob = "LNS_despoiler_brigades"
-		}
-	}
-	search_filters = { FOCUS_FILTER_MANPOWER }
-}
-
-#####################
-### Bandit Airforce ###
-#####################
-
-shared_focus = {
-	id = LNS_bandit_airforce
-	icon = GFX_goal_POL_recon_aircraft
-	x = 10
-	y = 1
-	relative_position_id = LNS_bandit_victory
-	cost = 5.00
-	prerequisite = { focus = LNS_bandit_victory }
-
-	ai_will_do = {
-		factor = 40
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_bandit_airforce"
-		air_experience = 20
-	}
-	search_filters = { FOCUS_FILTER_AIRFORCE_BONUS }
-}
-
-shared_focus = {
-	id = LNS_fighters
-	icon = GFX_goal_generic_air_fighter
-	x = -2
-	y = 1
-	relative_position_id = LNS_bandit_airforce
-	cost = 8.00
-	prerequisite = { focus = LNS_bandit_airforce }
-
-	ai_will_do = {
-		factor = 40
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_fighters"
-		if = {
-			limit = {
-				has_dlc = "By Blood Alone"
-			}
-			add_tech_bonus = {
-				name = fighter_bonus
-				bonus = 1.0
-				uses = 1
-				category = light_fighter
-			}
-			add_equipment_to_stockpile = {
-				type = small_plane_airframe_0
-				producer = GRI
-				variant_name = "Fluggerät Heureka"
-				amount = 100
-			}
-		}
-		else = {
-			add_tech_bonus = {
-				name = fighter_bonus
-				bonus = 1.0
-				uses = 1
-				category = light_fighter
-			}
-			add_equipment_to_stockpile = {
-				type = fighter_equipment_0
-				amount = 100
-				producer = GRI
-			}
-		}
-	}
-	search_filters = { FOCUS_FILTER_RESEARCH }
-}
-
-shared_focus = {
-	id = LNS_heavier_fighters
-	icon = GFX_focus_chi_flying_tigers
-	x = -2
-	y = 3
-	relative_position_id = LNS_bandit_airforce
-	cost = 10.00
-	prerequisite = { focus = LNS_fighters }
-
-	ai_will_do = {
-		factor = 40
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_heavier_fighters"
-		if = {
-            limit = {
-                has_dlc = "By Blood Alone"
-            }
-			add_tech_bonus = {
-				name = medium_air
-				bonus = 1.0
-				uses = 1
-				category = medium_air
-			}
-			add_tech_bonus = {
-				name = cat_air_guns
-				bonus = 0.75
-				uses = 2
-				category = cat_air_guns
-			}
-		}
-		else = {
-			add_tech_bonus = {
-				name = fighter_bonus
-				bonus = 3.0
-				uses = 1
-				category = cat_heavy_fighter
-			}
-		}
-	}
-	search_filters = { FOCUS_FILTER_RESEARCH }
-}
-
-shared_focus = {
-	id = LNS_airfields
-	icon = GFX_goal_generic_air_production
-	x = 0
-	y = 1
-	relative_position_id = LNS_bandit_airforce
-	cost = 8.00
-	prerequisite = { focus = LNS_bandit_airforce }
-
-	ai_will_do = {
-		factor = 40
-	}
-	available = {
-		540 = { is_owned_and_controlled_by = ROOT }
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_airfields"
-		540 = {
-			add_extra_state_shared_building_slots = 1
-			add_building_construction = {
-				type = air_base
-				level = 1
-				instant_build = yes
-			}
-		}
-	}
-	search_filters = { FOCUS_FILTER_INDUSTRY }
-}
-
-shared_focus = {
-	id = LNS_our_own_doctrine
-	icon = GFX_goal_generic_build_airforce
-	x = -1
-	y = 2
-	relative_position_id = LNS_bandit_airforce
-	cost = 10.00
-	prerequisite = { focus = LNS_airfields }
-	prerequisite = { focus = LNS_fighters }
-
-	ai_will_do = {
-		factor = 40
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_our_own_doctrine"
-		add_doctrine_cost_reduction = {
-			name = air_doc_bonus
-			cost_reduction = 0.75
-			uses = 1
-			category = air_doctrine
-		}
-		air_experience = 15
-	}
-	search_filters = { FOCUS_FILTER_AIRFORCE_BONUS FOCUS_FILTER_RESEARCH }
-}
-
-shared_focus = {
-	id = LNS_close_air_support
-	icon = GFX_goal_generic_CAS
-	x = 1
-	y = 2
-	relative_position_id = LNS_bandit_airforce
-	cost = 10.00
-	prerequisite = { focus = LNS_airfields }
-	prerequisite = { focus = LNS_bombers }
-
-	ai_will_do = {
-		factor = 40
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_close_air_support"
-		if = {
-            limit = {
-                has_dlc = "By Blood Alone"
-            }
-			add_tech_bonus = {
-				name = rocketry
-				bonus = 0.75
-				uses = 1
-				category = rocketry
-			}
-			add_tech_bonus = {
-				name = cat_anti_tank
-				bonus = 0.5
-				uses = 2
-				category = cat_anti_tank
-			}
-		}
-		else = {
-			add_tech_bonus = {
-				name = bomber_bonus
-				bonus = 3.0
-				uses = 1
-				category = cas_bomber
-			}
-		}
-	}
-	search_filters = { FOCUS_FILTER_RESEARCH }
-}
-
-shared_focus = {
-	id = LNS_further_developments
-	icon = GFX_goal_generic_air_doctrine
-	x = 0
-	y = 3
-	relative_position_id = LNS_bandit_airforce
-	cost = 10.00
-	prerequisite = { focus = LNS_our_own_doctrine }
-	prerequisite = { focus = LNS_close_air_support }
-
-	ai_will_do = {
-		factor = 40
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_further_developments"
-		add_tech_bonus = {
-			name = air_doc_bonus
-			bonus = 1.0
-			uses = 2
-			category = air_doctrine
-		}
-		air_experience = 15
-	}
-	search_filters = { FOCUS_FILTER_AIRFORCE_BONUS FOCUS_FILTER_RESEARCH }
-}
-
-shared_focus = {
-	id = LNS_bombers
-	icon = GFX_goal_generic_air_bomber
-	x = 2
-	y = 1
-	relative_position_id = LNS_bandit_airforce
-	cost = 8.00
-	prerequisite = { focus = LNS_bandit_airforce }
-
-	ai_will_do = {
-		factor = 40
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_bombers"
-		if = {
-            limit = {
-                has_dlc = "By Blood Alone"
-            }
-			add_tech_bonus = {
-				name = medium_air
-				bonus = 3.0
-				uses = 1
-				category = medium_air
-			}
-		}
-		else = {
-			add_tech_bonus = {
-				name = tactical_bomber
-				bonus = 3.0
-				uses = 1
-				category = tactical_bomber
-			}
-		}
-	}
-	search_filters = { FOCUS_FILTER_RESEARCH }
-}
-
-shared_focus = {
-	id = LNS_strategic_bombers
-	icon = GFX_goal_generic_occupy_start_war
-	x = 2
-	y = 3
-	relative_position_id = LNS_bandit_airforce
-	cost = 10.00
-	prerequisite = { focus = LNS_bombers }
-
-	ai_will_do = {
-		factor = 40
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_strategic_bombers"
-		if = {
-            limit = {
-                has_dlc = "By Blood Alone"
-            }
-			add_tech_bonus = {
-				name = heavy_air
-				bonus = 3.0
-				uses = 1
-				category = heavy_air
-			}
-		}
-		else = {
-			add_tech_bonus = {
-				name = bomber_bonus
-				bonus = 3.0
-				uses = 1
-				category = cat_strategic_bomber
-			}
-		}
-	}
-	search_filters = { FOCUS_FILTER_RESEARCH }
-}
-
-shared_focus = {
-	id = LNS_ace_fighters
-	icon = GFX_goal_leopardo_government
-	x = -1
-	y = 4
-	relative_position_id = LNS_bandit_airforce
-	cost = 10.00
-	prerequisite = { focus = LNS_heavier_fighters }
-	prerequisite = { focus = LNS_further_developments }
-
-	ai_will_do = {
-		factor = 40
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_ace_fighters"
-		add_ideas = LNS_ace_fighters_idea
-	}
-	search_filters = { FOCUS_FILTER_AIRFORCE_BONUS }
-}
-
-shared_focus = {
-	id = LNS_napalm
-	icon = GFX_goal_MAF_Napalm
-	x = 1
-	y = 4
-	relative_position_id = LNS_bandit_airforce
-	cost = 10.00
-	prerequisite = { focus = LNS_strategic_bombers }
-	prerequisite = { focus = LNS_further_developments }
-
-	ai_will_do = {
-		factor = 40
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_napalm"
-		add_ideas = LNS_napalm_idea
-	}
-	search_filters = { FOCUS_FILTER_AIRFORCE_BONUS }
-}
-
-shared_focus = {
-	id = LNS_jet_experiments
-	icon = GFX_focus_rocketry
-	x = 0
-	y = 5
-	relative_position_id = LNS_bandit_airforce
-	cost = 10.00
-	prerequisite = { focus = LNS_ace_fighters }
-	prerequisite = { focus = LNS_napalm }
-
-	ai_will_do = {
-		factor = 40
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LNS_jet_experiments"
-		add_tech_bonus = {
-			name = LNS_jet_experiments
-			bonus = 3
-			uses = 1
-			category = jet_technology
-		}
-	}
-	search_filters = { FOCUS_FILTER_RESEARCH }
-}
-
-###############################################################
-### Longsword Republic (LSC) Political Tree ###
-###############################################################
-
-shared_focus = {
-	id = LSC_constitutional_convention
-	icon = GFX_focus_indy_democratic_process
-	cost = 10
-	ai_will_do = { factor = 100 }
-	select_effect = {
-		country_event = longsword.102
-	}
-	x = 6
-	y = 0
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_constitutional_convention"
-		custom_effect_tooltip = unlock_focuses
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-shared_focus = {
-	id = LSC_fate_of_rosewood
-	icon = GFX_goal_griffon_knights
-	cost = 4
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSC_constitutional_convention }
-	x = 6
-	y = 1
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_constitutional_convention"
-		country_event = longsword.107
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-shared_focus = {
-	id = LSC_lemiamas_suolis
-	icon = GFX_goal_improve_industry
-	cost = 6
-	ai_will_do = { factor = 120 }
-	prerequisite = { focus = LSC_constitutional_convention }
-	x = 3
-	y = 1
-	relative_position_id = LSC_constitutional_convention
-	available = { 
-		has_war = no
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_lemiamas_suolis"
-		set_variable = {
-			var = LSC_factory_goals
-			value = ROOT.num_of_factories
-		}
-		multiply_variable = { LSC_factory_goals = 2 } 
-		if = {
-			limit = {
-				check_variable = { LSC_factory_goals < 15 }
-			}
-			set_variable = {
-				var = LSC_factory_goals
-				value = 15
-			}
-		}
-		activate_mission = LSC_three_year_plan
-		LNS_reduce_civil_war_recovery = yes
-	}
-	search_filters = { FOCUS_FILTER_INDUSTRY }
-}
-shared_focus = {
-	id = LSC_social_services
-	icon = GFX_goal_endless_money
-	cost = 6
-	ai_will_do = { 
-		factor = 100 
-		modifier = {
-			factor = 1.5
-			has_active_mission = LSC_three_year_plan
-		}
-	}
-	prerequisite = { focus = LSC_lemiamas_suolis }
-	x = 1
-	y = 2
-	relative_position_id = LSC_constitutional_convention
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_social_services"
-		add_stability = 0.05
-		custom_effect_tooltip = LNS_poverty_tp
-		hidden_effect = {
-			country_event = { days = 160 id = longsword.40 }
-		}
-		LNS_reduce_civil_war_recovery = yes
-	}
-	search_filters = { FOCUS_FILTER_INDUSTRY }
-}
-shared_focus = {
-	id = LSC_urbanization
-	icon = GFX_goal_ITA_urban
-	cost = 6
-	ai_will_do = { 
-		factor = 100
-		modifier = {
-			factor = 1.5
-			has_active_mission = LSC_three_year_plan
-		}
-	}
-	prerequisite = { focus = LSC_lemiamas_suolis }
-	x = 2
-	y = 3
-	relative_position_id = LSC_constitutional_convention
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_urbanization"
-		custom_effect_tooltip = LSC_urbanization_decisions_tooltip
-		increase_society_development_with_tt = yes
-	}
-	search_filters = { FOCUS_FILTER_INDUSTRY }
-}
-shared_focus = {
-	id = LSC_railway_modernization
-	icon = GFX_goal_generic_railroad
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSC_lemiamas_suolis }
-	x = 3
-	y = 2
-	relative_position_id = LSC_constitutional_convention
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_railway_modernization"
-		custom_effect_tooltip = LSC_railway_modernization_decision_tooltip
-		LNS_reduce_civil_war_recovery = yes
-	}
-	search_filters = { FOCUS_FILTER_INDUSTRY }
-}
-shared_focus = {
-	id = LSC_land_redistribution
-	icon = GFX_goal_OTT_Land_Reform
-	cost = 6
-	ai_will_do = { 
-		factor = 100
-		modifier = {
-			factor = 1.5
-			has_active_mission = LSC_three_year_plan
-		}
-	}
-	prerequisite = { focus = LSC_lemiamas_suolis }
-	x = 5
-	y = 2
-	relative_position_id = LSC_constitutional_convention
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_railway_modernization"
-		505 = { add_extra_state_shared_building_slots = 1 }
-		540 = { add_extra_state_shared_building_slots = 1 }
-		552 = { add_extra_state_shared_building_slots = 1 }
-		add_ideas = LNS_land_reform_1
-		LNS_reduce_civil_war_recovery = yes
-	}
-	search_filters = { FOCUS_FILTER_INDUSTRY }
-}
-shared_focus = {
-	id = LSC_textile_industry
-	icon = GFX_goal_SZC_silk
-	cost = 6
-	ai_will_do = { 
-		factor = 100
-		modifier = {
-			factor = 1.5
-			has_active_mission = LSC_three_year_plan
-		}
-	}
-	prerequisite = { focus = LSC_land_redistribution }
-	x = 4
-	y = 3
-	relative_position_id = LSC_constitutional_convention
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_textile_industry"
-		505 = {
-			add_extra_state_shared_building_slots = 1
-			add_building_construction = {
-				type = industrial_complex
-				level = 1
-				instant_build = yes
-			}
-		}
-		LNS_reduce_civil_war_recovery = yes
-	}
-	search_filters = { FOCUS_FILTER_INDUSTRY }
-}
-shared_focus = {
-	id = LSC_rural_reconstruction
-	icon = GFX_goal_agricultural_aid
-	cost = 6
-	ai_will_do = { 
-		factor = 100
-		modifier = {
-			factor = 1.5
-			has_active_mission = LSC_three_year_plan
-		}
-	}
-	prerequisite = { focus = LSC_land_redistribution }
-	x = 6
-	y = 3
-	relative_position_id = LSC_constitutional_convention
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_rural_reconstruction"
-		LNS_reduce_civil_war_recovery = yes
-		add_tech_bonus = {
-			name = LSC_rural_reconstruction
-			bonus = 0.5
-			uses = 1
-			category = construction_tech
-		}
-	}
-	search_filters = { FOCUS_FILTER_INDUSTRY }
-}
-shared_focus = {
-	id = LSC_export_agriculture
-	icon = GFX_goal_bag_of_money_pony_griffon
-	cost = 6
-	ai_will_do = { 
-		factor = 100
-		modifier = {
-			factor = 1.5
-			has_active_mission = LSC_three_year_plan
-		}
-	}
-	prerequisite = { focus = LSC_rural_reconstruction }
-	prerequisite = { focus = LSC_textile_industry }
-	x = 5
-	y = 4
-	relative_position_id = LSC_constitutional_convention
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_rural_reconstruction"
-		LNS_reduce_civil_war_recovery = yes
-		unlock_decision_tooltip = LSC_forestry_development
-		custom_effect_tooltip = LSC_export_routes_tooltip
-	}
-	search_filters = { FOCUS_FILTER_INDUSTRY }
-}
-shared_focus = {
-	id = LSC_central_industrial_region
-	icon = GFX_goal_factory_complex
-	cost = 6
-	ai_will_do = { 
-		factor = 100
-		modifier = {
-			factor = 1.5
-			has_active_mission = LSC_three_year_plan
-		}
-	}
-	prerequisite = { focus = LSC_urbanization }
-	prerequisite = { focus = LSC_social_services }
-	x = 1
-	y = 4
-	relative_position_id = LSC_constitutional_convention
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_central_industrial_region"
-		unlock_decision_tooltip = LSC_new_swordsson_district
-		unlock_decision_tooltip = LSC_unity_district
-		unlock_decision_tooltip = LSC_blood_district
-		add_tech_bonus = {
-			name = LSC_central_industrial_region
-			bonus = 0.5
-			uses = 2
-			category = industry
-		}
-		LNS_reduce_civil_war_recovery = yes
-	}
-	search_filters = { FOCUS_FILTER_INDUSTRY }
-}
-shared_focus = {
-	id = LSC_applied_research
-	icon = GFX_goal_supremacy_of_will
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSC_central_industrial_region }
-	x = 2
-	y = 5
-	relative_position_id = LSC_constitutional_convention
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_applied_research"
-		add_research_slot = 1
-		Improve_Science_Base = yes
-		LNS_reduce_civil_war_recovery = yes
-	}
-	search_filters = { FOCUS_FILTER_RESEARCH }
-}
-shared_focus = {
-	id = LSC_new_arms_industries
-	icon = GFX_goal_generic_army_tank_2
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSC_central_industrial_region }
-	x = 0
-	y = 5
-	relative_position_id = LSC_constitutional_convention
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_applied_research"
-		two_random_arms_factory = yes
-		add_tech_bonus = {
-			name = LSC_new_arms_industries
-			bonus = 0.5
-			uses = 1
-			category = cat_light_armor
-		}
-		add_tech_bonus = {
-			name = LSC_new_arms_industries
-			bonus = 0.5
-			uses = 1
-			category = infantry_weapons
-		}
-	}
-	search_filters = { FOCUS_FILTER_INDUSTRY }
-}
-shared_focus = {
-	id = LSC_resource_prospects
-	icon = GFX_focus_indy_excavations
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSC_central_industrial_region }
-	x = 4
-	y = 5
-	relative_position_id = LSC_constitutional_convention
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_resource_prospects"
-		add_resource = {
-			type = aluminium
-			amount = 16
-			state = 540
-		}
-		add_resource = {
-			type = steel
-			amount = 10
-			state = 540
-		}
-	}
-	search_filters = { FOCUS_FILTER_INDUSTRY }
-}
-shared_focus = {
-	id = LSC_agrarian_revolution
-	icon = GFX_goal_ideology_democratic_socialist
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSC_constitutional_convention }
-	x = -3
-	y = 1
-	relative_position_id = LSC_constitutional_convention
-	allow_branch = {
-		has_government = communism
-		NOT = {
-			OR = {
-				has_country_leader = {
-					character = LSC_abba_povner
-					ruling_only = yes
-				}
-				has_country_leader = {
-					character = LSC_ludwig_von_pliater
-					ruling_only = yes
-				}
-			}
-		}
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_agrarian_revolution"
-		add_political_power = 150
-		add_stability = 0.1
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-shared_focus = {
-	id = LSC_popular_education
-	icon = GFX_goal_PAN_Create_the_Universidad_de_Panama
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSC_agrarian_revolution }
-	x = -3
-	y = 2
-	relative_position_id = LSC_constitutional_convention
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_popular_education"
-		custom_effect_tooltip = LNS_education_tp
-		hidden_effect = {
-			country_event = { days = 180 id = longsword.33 }
-		}
-	}
-	search_filters = { FOCUS_FILTER_RESEARCH }
-}
-shared_focus = {
-	id = LSC_unknown_hero_monument
-	icon = GFX_goal_generic_pony_soldier
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSC_agrarian_revolution }
-	x = -5
-	y = 2
-	relative_position_id = LSC_constitutional_convention
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_unknown_hero_monument"
-		add_manpower = 5000
-		add_war_support = 0.1
-	}
-	search_filters = { FOCUS_FILTER_ARMY_BONUS }
-}
-shared_focus = {
-	id = LSC_internationalism
-	icon = GFX_goal_generic_war_with_comintern
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSC_agrarian_revolution }
-	x = -6
-	y = 3
-	relative_position_id = LSC_constitutional_convention
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_internationalism"
-		add_ideas = LNS_internationalism_idea
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-shared_focus = {
-	id = LSC_foreign_volunteers
-	icon = GFX_goal_griffon_special_force
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSC_internationalism }
-	x = -6
-	y = 4
-	relative_position_id = LSC_constitutional_convention
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_foreign_volunteers"
-		swap_ideas = {
-			remove_idea = LNS_internationalism_idea
-			add_idea = LNS_internationalism_idea_2
-		}
-	}
-	search_filters = { FOCUS_FILTER_ARMY_BONUS }
-}
-shared_focus = {
-	id = LSC_voluntary_collectivization
-	icon = GFX_focus_collective_housing
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSC_agrarian_revolution }
-	x = -1
-	y = 2
-	relative_position_id = LSC_constitutional_convention
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_voluntary_collectivization"
-		add_ideas = LNS_collectivization_idea_1
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-shared_focus = {
-	id = LSC_ancestor_worship
-	icon = GFX_goal_compassionaite_politics
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSC_voluntary_collectivization }
-	prerequisite = { focus = LSC_unknown_hero_monument }
-	mutually_exclusive = { focus = LSC_no_masters }
-	x = -4
-	y = 3
-	relative_position_id = LSC_constitutional_convention
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_ancestor_worship"
-		add_ideas = LNS_free_unions
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-shared_focus = {
-	id = LSC_no_masters
-	icon = GFX_goal_commune_politics
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSC_voluntary_collectivization }
-	prerequisite = { focus = LSC_unknown_hero_monument }
-	mutually_exclusive = { focus = LSC_ancestor_worship }
-	x = -2
-	y = 3
-	relative_position_id = LSC_constitutional_convention
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_no_masters"
-		add_ideas = LNS_controlled_unions
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-shared_focus = {
-	id = LSC_posniaks
-	icon = GFX_goal_generic_archonism
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { 
-		focus = LSC_no_masters 
-		focus = LSC_ancestor_worship 
-	}
-	x = -3
-	y = 4
-	relative_position_id = LSC_constitutional_convention
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_posniaks"
-		country_event = longsword.106
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-shared_focus = {
-	id = LSC_tractor_stations
-	icon = GFX_goal_SOV_tractors
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSC_voluntary_collectivization }
-	x = -1
-	y = 4
-	relative_position_id = LSC_constitutional_convention
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_tractor_stations"
-		swap_ideas = {
-			remove_idea = LNS_collectivization_idea_1
-			add_idea = LNS_collectivization_idea_2
-		}
-		one_random_industrial_complex = yes
-		one_random_industrial_complex = yes
-	}
-	search_filters = { FOCUS_FILTER_INDUSTRY }
-}
-shared_focus = {
-	id = LSC_secret_services
-	icon = GFX_goal_ideology_totalist
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSC_voluntary_collectivization }
-	x = 0
-	y = 3
-	relative_position_id = LSC_constitutional_convention
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_secret_services"
-		if = {
-			limit = {
-				has_dlc = "La Resistance"
-			}
-			add_ideas = LNS_secret_services_idea_lar
-		}
-		else = {
-			add_ideas = LNS_secret_services_idea
-		}
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-shared_focus = {
-	id = LSC_role_division
-	icon = GFX_goal_socialist_industry
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSC_tractor_stations }
-	x = -2
-	y = 5
-	relative_position_id = LSC_constitutional_convention
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_role_division"
-		swap_ideas = {
-			remove_idea = LNS_collectivization_idea_2
-			add_idea = LNS_collectivization_idea_3
-		}
-	}
-	search_filters = { FOCUS_FILTER_INDUSTRY }
-}
-shared_focus = {
-	id = LSC_agrarian_realism
-	icon = GFX_UK_art_avantgarde
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSC_tractor_stations }
-	x = -3
-	y = 6
-	relative_position_id = LSC_constitutional_convention
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_agrarian_realism"
-		add_stability = 0.1
-		add_popularity = { 
-			ideology = communism 
-			popularity = 0.2
-		}
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-shared_focus = {
-	id = LSC_rights_of_the_people
-	icon = GFX_goal_generic_liberty_statue
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSC_tractor_stations }
-	prerequisite = { focus = LSC_internationalism }
-	prerequisite = { focus = LSC_posniaks }
-	x = -4
-	y = 5
-	relative_position_id = LSC_constitutional_convention
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_rights_of_the_people"
-		add_ideas = LNS_civil_rights_idea
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-
-shared_focus = {
-	id = LSC_divine_revolution
-	icon = GFX_goal_ideology_strasserist 
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSC_constitutional_convention }
-	x = -3
-	y = 1
-	relative_position_id = LSC_constitutional_convention
-	allow_branch = {
-		has_government = communism
-		OR = {
-			has_country_leader = {
-				character = LSC_abba_povner
-				ruling_only = yes
-			}
-			has_country_leader = {
-				character = LSC_ludwig_von_pliater
-				ruling_only = yes
-			}
-		}
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_divine_revolution"
-		add_political_power = 150
-		add_war_support = 0.1
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-
-shared_focus = {
-	id = LSC_monument_to_the_fallen
-	icon = GFX_goal_graveyard
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSC_divine_revolution }
-	x = -2
-	y = 1
-	relative_position_id = LSC_divine_revolution
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_monument_to_the_fallen"
-		add_manpower = 15000
-		add_war_support = 0.10
-		hidden_effect = {
-			country_event = { days = 30 id = longsword.176 }
-		}
-	}
-	search_filters = { FOCUS_FILTER_ARMY_BONUS }
-}
-
-shared_focus = {
-	id = LSC_and_punish_their_killers
-	icon = GFX_goal_guillotine
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSC_monument_to_the_fallen }
-	x = -1
-	y = 1
-	relative_position_id = LSC_monument_to_the_fallen
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_and_punish_their_killers"
-		save_current_manpower = yes
-		552 = {
-			add_manpower = -5000
-		}
-		540 = {
-			add_manpower = -5000
-		}
-		505 = {
-			add_manpower = -5000
-		}
-		restore_previous_manpower = yes
-		add_equipment_to_stockpile = {
-			type = infantry_equipment_0
-			amount = 500
-			producer = LNS
-		}
-		add_equipment_to_stockpile = {
-			type = support_equipment_1
-			amount = 100
-			producer = LNS
-		}
-		hidden_effect = {
-			country_event = { days = 30 id = longsword.177 }
-		}
-	}
-	search_filters = { FOCUS_FILTER_ARMY_BONUS }
-}
-
-
-shared_focus = {
-	id = LSC_teach_faith_and_history
-	icon = GFX_goal_PAN_Create_the_Universidad_de_Panama
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSC_divine_revolution }
-	x = 0
-	y = 1
-	relative_position_id = LSC_divine_revolution
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_teach_faith_and_history"
-		custom_effect_tooltip = LNS_education_tp
-		hidden_effect = {
-			country_event = { days = 180 id = longsword.33 }
-		}
-	}
-	search_filters = { FOCUS_FILTER_RESEARCH }
-}
-
-shared_focus = {
-	id = LSC_rebuild_the_temples
-	icon = GFX_goal_forest_spirit
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSC_divine_revolution }
-	x = 2
-	y = 1
-	relative_position_id = LSC_divine_revolution
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_rebuild_the_temples"
-		add_ideas = LNS_religious_society_1
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-
-shared_focus = {
-	id = LSC_expand_avengers
-	icon = GFX_goal_strasserite_oppression
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSC_rebuild_the_temples }
-	x = 0
-	y = 2
-	relative_position_id = LSC_rebuild_the_temples
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_expand_avengers"
-		add_ideas = LNS_nakam_secret_police
-		hidden_effect = {
-			country_event = { days = 30 id = longsword.181 }
-		}
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-
-shared_focus = {
-	id = LSC_warrior_priests
-	icon = GFX_goal_tree_of_harmony
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSC_rebuild_the_temples }
-	x = 1
-	y = 1
-	relative_position_id = LSC_rebuild_the_temples
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_warrior_priests"
-		swap_ideas = {
-			remove_idea = LNS_religious_society_1
-			add_idea = LNS_religious_society_2
-		}
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-
-shared_focus = {
-	id = LSC_bring_them_back_to_the_real_path
-	icon = GFX_goal_generic_archonism
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSC_rebuild_the_temples }
-	prerequisite = { focus = LSC_monument_to_the_fallen }
-	x = -1
-	y = 2
-	relative_position_id = LSC_divine_revolution
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_bring_them_back_to_the_real_path"
-		add_ideas = LNS_newfound_fervor
-		hidden_effect = {
-			country_event = { days = 30 id = longsword.178 }
-		}
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-
-shared_focus = {
-	id = LSC_welcome_back_outcasts
-	icon = GFX_goal_NOR_passport_convention
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSC_rebuild_the_temples }
-	prerequisite = { focus = LSC_monument_to_the_fallen }
-	x = 1
-	y = 2
-	relative_position_id = LSC_divine_revolution
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_welcome_back_outcasts"
-		add_ideas = LNS_return_to_genesis
-		hidden_effect = {
-			country_event = { days = 30 id = longsword.174 }
-		}
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-
-shared_focus = {
-	id = LSC_griffon_believers
-	icon = GFX_focus_indy_red_griffon_knights
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSC_welcome_back_outcasts }
-	prerequisite = { focus = LSC_bring_them_back_to_the_real_path }
-	x = 0
-	y = 3
-	relative_position_id = LSC_divine_revolution
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_griffon_believers"
-		add_ideas = LNS_griffon_converts
-		hidden_effect = {
-			country_event = { days = 30 id = longsword.175 }
-		}
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-
-
-
-shared_focus = {
-	id = LSC_her_dream
-	icon = GFX_goal_ideology_democratic_socialist
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSC_monument_to_the_fallen }
-	x = 0
-	y = 2
-	relative_position_id = LSC_monument_to_the_fallen
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_her_dream"
-		add_ideas = LNS_collectivization_idea_1
-	}
-	search_filters = { FOCUS_FILTER_ARMY_BONUS }
-}
-
-shared_focus = {
-	id = LSC_hands_off_collectivization
-	icon = GFX_focus_collective_housing
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSC_her_dream }
-	x = -1
-	y = 1
-	relative_position_id = LSC_her_dream
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_hands_off_collectivization"
-		one_random_industrial_complex = yes
-		one_random_industrial_complex = yes
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-
-shared_focus = {
-	id = LSC_basic_rights_for_longswordians
-	icon = GFX_goal_generic_liberty_statue
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSC_her_dream}
-	x = 1
-	y = 1
-	relative_position_id = LSC_her_dream
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_basic_rights_for_longswordians"
-		add_ideas = LNS_civil_rights_idea
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-
-shared_focus = {
-	id = LSC_agrarian_lifestyle
-	icon = GFX_goal_coop_farms
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSC_basic_rights_for_longswordians }
-	prerequisite = { focus = LSC_hands_off_collectivization } 
-	x = 0
-	y = 2
-	relative_position_id = LSC_her_dream
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_agrarian_lifestyle"
-		swap_ideas = {
-			remove_idea = LNS_collectivization_idea_1
-			add_idea = LNS_collectivization_idea_3
-		}
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-
-
-
-shared_focus = {
-	id = LSC_national_restoration
-	icon = GFX_goal_ideology_harmonist
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSC_constitutional_convention }
-	x = -3
-	y = 1
-	relative_position_id = LSC_constitutional_convention
-	allow_branch = {
-		OR = {
-			has_government = democratic
-			has_government = neutrality
-		}
-		NOT = {
-			has_country_leader = {
-				character = LSC_golden_morning
-				ruling_only = yes
-			}
-		}
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_national_restoration"
-		add_political_power = 150
-		add_stability = 0.1
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-shared_focus = {
-	id = LSC_national_education
-	icon = GFX_goal_PAN_Create_the_Universidad_de_Panama
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSC_national_restoration }
-	allow_branch = {
-		has_government = democratic
-	}
-	x = -3
-	y = 2
-	relative_position_id = LSC_constitutional_convention
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_national_education"
-		custom_effect_tooltip = LNS_education_tp
-		hidden_effect = {
-			country_event = { days = 180 id = longsword.33 }
-		}
-	}
-	search_filters = { FOCUS_FILTER_RESEARCH }
-}
-shared_focus = {
-	id = LSC_restitution_of_ownership
-	icon = GFX_focus_indy_unequal_treaties
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSC_national_restoration }
-	x = -1
-	y = 2
-	relative_position_id = LSC_constitutional_convention
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_restitution_of_ownership"
-		one_random_industrial_complex = yes
-		hidden_effect = {
-			country_event = longsword.138
-		}
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-shared_focus = {
-	id = LSC_rebuild_varena
-	icon = GFX_goal_new_temple
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSC_restitution_of_ownership }
-	x = 0
-	y = 3
-	relative_position_id = LSC_constitutional_convention
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_rebuild_varena"
-		505 = {
-			add_building_construction = {
-				type = bunker
-				level = 2
-				province = 5038
-				instant_build = yes
-			}
-		}
-		add_ideas = LNS_harmonic_society_1
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-shared_focus = {
-	id = LSC_kriwe_classes
-	icon = GFX_goal_tree_of_harmony
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSC_rebuild_varena }
-	x = -1
-	y = 4
-	relative_position_id = LSC_constitutional_convention
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_kriwe_classes"
-		swap_ideas = {
-			remove_idea = LNS_harmonic_society_1
-			add_idea = LNS_harmonic_society_2
-		}
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-shared_focus = {
-	id = LSC_promote_local_dialects
-	icon = GFX_goal_bookstack
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSC_restitution_of_ownership }
-	prerequisite = { focus = LSC_national_education }
-	allow_branch = {
-		has_government = democratic
-	}
-	x = -2
-	y = 3
-	relative_position_id = LSC_constitutional_convention
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_promote_local_dialects"
-		add_ideas = LNS_linguistic_freedom
-		add_political_power = 100
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-shared_focus = {
-	id = LSC_convert_posniaks
-	icon = GFX_goal_generic_archonism
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSC_restitution_of_ownership focus = LSC_establish_seimas }
-	x = -3
-	y = 4
-	relative_position_id = LSC_constitutional_convention
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_convert_posniaks"
-		add_ideas = LNS_two_peoples_idea
-		add_war_support = -0.05
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-shared_focus = {
-	id = LSC_establish_seimas
-	icon = GFX_goal_generic_lau_democracy
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSC_national_restoration }
-	x = -5
-	y = 2
-	relative_position_id = LSC_constitutional_convention
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_establish_seimas"
-		add_ideas = LNS_harmonic_democracy_1
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-shared_focus = {
-	id = LSC_sixty_corporations
-	icon = GFX_goal_state_economy
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSC_establish_seimas }
-	x = -4
-	y = 3
-	relative_position_id = LSC_constitutional_convention
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_sixty_corporations"
-		swap_ideas = {
-			remove_idea = LNS_harmonic_democracy_1
-			add_idea = LNS_harmonic_democracy_2
-		}
-		one_random_industrial_complex = yes
-	}
-	search_filters = { FOCUS_FILTER_INDUSTRY }
-}
-shared_focus = {
-	id = LSC_griffon_territorial_autonomies
-	icon = GFX_goal_generic_major_alliance_pony_griffon
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSC_establish_seimas }
-	x = -6
-	y = 3
-	relative_position_id = LSC_constitutional_convention
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_griffon_territorial_autonomies"
-		540 = {
-			add_state_modifier = {
-				modifier = {
-					state_production_speed_buildings_factor = 0.2
-					local_manpower = 0.15
-				}
-			}
-		}
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-shared_focus = {
-	id = LSC_enforce_local_democracy
-	icon = GFX_focus_indy_give_democracy
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSC_sixty_corporations }
-	prerequisite = { focus = LSC_griffon_territorial_autonomies }
-	x = -5
-	y = 4
-	relative_position_id = LSC_constitutional_convention
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_enforce_local_democracy"
-		swap_ideas = {
-			remove_idea = LNS_harmonic_democracy_2
-			add_idea = LNS_harmonic_democracy_3
-		}
-		add_manpower = 5000
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-shared_focus = {
-	id = LSC_autarky
-	icon = GFX_Steel
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSC_enforce_local_democracy }
-	x = -6
-	y = 5
-	relative_position_id = LSC_constitutional_convention
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_autarky"
-		add_tech_bonus = {
-			name = LSC_autarky
-			bonus = 1
-			uses = 2
-			category = synth_resources
-		}
-		add_resource = {
-			type = steel
-			amount = 8
-			state = 540
-		}
-	}
-	search_filters = { FOCUS_FILTER_INDUSTRY }
-}
-shared_focus = {
-	id = LSC_folwark_system
-	icon = GFX_goal_agrarian_reform
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSC_enforce_local_democracy }
-	x = -4
-	y = 5
-	relative_position_id = LSC_constitutional_convention
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_folwark_system"
-		every_state = {
-			limit = { 
-				is_core_of = ROOT 
-				is_owned_by = ROOT
-			}
-			add_building_construction = {
-				type = infrastructure
-				level = 1
-				instant_build = yes
-			}
-		}
-	}
-	search_filters = { FOCUS_FILTER_INDUSTRY }
-}
-shared_focus = {
-	id = LSC_harmonic_identity
-	icon = GFX_goal_crown_and_swords
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSC_convert_posniaks }
-	prerequisite = { focus = LSC_promote_local_dialects }
-	x = -2
-	y = 5
-	relative_position_id = LSC_constitutional_convention
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_harmonic_identity"
-		add_ideas = LNS_ducal_legacy_1
-		hidden_effect = {
-			country_event = longsword.139
-		}
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-shared_focus = {
-	id = LSC_national_myth
-	icon = GFX_goal_generic_harmony
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSC_harmonic_identity }
-	prerequisite = { focus = LSC_folwark_system }
-	prerequisite = { focus = LSC_autarky }
-	x = -4
-	y = 6
-	relative_position_id = LSC_constitutional_convention
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_national_myth"
-		swap_ideas = {
-			remove_idea = LNS_ducal_legacy_1
-			add_idea = LNS_ducal_legacy_2
-		}
-		hidden_effect = {
-			country_event = longsword.140
-		}
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-shared_focus = {
-	id = LSC_violet_revolution
-	icon = GFX_goal_national_populism
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSC_constitutional_convention }
-	x = -3
-	y = 1
-	relative_position_id = LSC_constitutional_convention
-	allow_branch = {
-		OR = {
-			has_government = fascism
-			has_country_leader = {
-				character = LSC_golden_morning
-				ruling_only = yes
-			}
-		}
-	}
-	available = { 
-		has_country_flag = LSC_defeated_povner
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_national_restoration"
-		add_political_power = 100
-		add_stability = 0.1
-		set_variable = { LSC_transformation_tyranny = 0 }
-		set_variable = { LSC_transformation_tyranny_2 = 0 }
-		set_variable = { LSC_transformation_political_power_factor = 0.15 }
-		set_variable = { LSC_transformation_conscription_factor = 0 }
-		set_variable = { LSC_transformation_consumer_goods_factor = 0 }
-		set_variable = { LSC_transformation_production_factory_max_efficiency_factor = 0 }
-		set_variable = { LSC_transformation_industrial_capacity_factory = 0 }
-		set_variable = { LSC_transformation_research_speed_factor = 0 }
-		set_variable = { LSC_transformation_war_support_factor = 0 }
-		set_variable = { LSC_transformation_army_morale_factor = 0 }
-		set_variable = { LSC_transformation_training_time_factor = 0 }
-		set_variable = { LSC_transformation_mobilization_laws_cost_factor = 0 }
-		set_variable = { LSC_transformation_political_advisor_cost_factor = 0 }
-		add_dynamic_modifier = { modifier = LSC_national_transformation }
-		hidden_effect = {
-			country_event = { days = 180 id = longsword.184 }
-		}
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL } 
-}
-shared_focus = {
-	id = LSC_fascist_education
-	icon = GFX_goal_PAN_Create_the_Universidad_de_Panama
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSC_violet_revolution }
-	x = -1
-	y = 2
-	relative_position_id = LSC_constitutional_convention
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_national_education"
-		custom_effect_tooltip = LNS_education_tp
-		hidden_effect = {
-			country_event = { days = 180 id = longsword.33 }
-		}
-	}
-	search_filters = { FOCUS_FILTER_RESEARCH }
-}
-shared_focus = {
-	id = LSC_interspecies_study_groups
-	icon = GFX_goal_generic_scientific_exchange_pony_griffon
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSC_fascist_education }
-	x = 0
-	y = 3
-	relative_position_id = LSC_constitutional_convention
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_interspecies_study_groups"
-		add_to_variable = { LSC_transformation_research_speed_factor = 0.05 }
-		custom_effect_tooltip = LSC_interspecies_study_groups_tooltip
-		add_tech_bonus = {
-			name = race_tech_bonus
-			bonus = 1
-			uses = 1
-			category = race_tech
-		}
-		hidden_effect = {
-			country_event = longsword.116
-		}
-	}
-	search_filters = { FOCUS_FILTER_RESEARCH }
-}
-shared_focus = {
-	id = LSC_pantheon_construction
-	icon = GFX_goal_generic_archonism
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSC_violet_revolution }
-	x = -3
-	y = 2
-	relative_position_id = LSC_constitutional_convention
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_pantheon_construction"
-		add_to_variable = { LSC_transformation_war_support_factor = 0.1 }
-		subtract_from_variable = { LSC_transformation_consumer_goods_factor = 0.05 }
-		custom_effect_tooltip = LSC_pantheon_construction_tooltip
-		hidden_effect = {
-			country_event = longsword.117
-		}
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-shared_focus = {
-	id = LSC_language_reconstruction
-	icon = GFX_focus_generic_diplomatic_treaty_pony
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSC_pantheon_construction }
-	prerequisite = { focus = LSC_fascist_education }
-	x = -2
-	y = 3
-	relative_position_id = LSC_constitutional_convention
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_language_reconstruction"
-		add_to_variable = { LSC_transformation_war_support_factor = 0.1 }
-		add_to_variable = { LSC_transformation_conscription_factor = 0.1 }
-		custom_effect_tooltip = LSC_language_reconstruction_tooltip
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-shared_focus = {
-	id = LSC_ideocracy
-	icon = GFX_goal_authoritarian
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSC_violet_revolution }
-	x = -4
-	y = 3
-	relative_position_id = LSC_constitutional_convention
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_ideocracy"
-		add_manpower = 10000
-		add_country_leader_trait = soldier_of_destiny
-		hidden_effect = {
-			country_event = longsword.118
-		}
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-shared_focus = {
-	id = LSC_forced_integration
-	icon = GFX_goal_generic_dangerous_deal_pony_griffon
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSC_ideocracy }
-	x = -6
-	y = 4
-	relative_position_id = LSC_constitutional_convention
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_forced_integration"
-		add_to_variable = { LSC_transformation_conscription_factor = 0.1 }
-		custom_effect_tooltip = LSC_forced_integration_tooltip
-		if = {
-			limit = { NOT = { has_tech = tech_pegasi } }
-			set_technology = { tech_pegasi = 1 }
-			fix_weapon_techs = yes
-		}
-		custom_effect_tooltip = LNS_integrated_division_template_gained
-		hidden_effect = {
-			load_oob = "LSC_integrated"
-		}
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-shared_focus = {
-	id = LSC_vadeiva_cult
-	icon = GFX_goal_generic_pony_unicorn
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSC_ideocracy }
-	x = -4
-	y = 4
-	relative_position_id = LSC_constitutional_convention
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_vadeiva_cult"
-		add_to_variable = { LSC_transformation_political_power_factor = 0.05 }
-		add_to_variable = { LSC_transformation_army_morale_factor = 0.1 }
-		custom_effect_tooltip = LSC_vadeiva_cult_tooltip
-		hidden_effect = {
-			country_event = longsword.119
-		}
-	}
-	search_filters = { FOCUS_FILTER_ARMY_BONUS }
-}
-shared_focus = {
-	id = LSC_little_books
-	icon = GFX_goal_pony_passport
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSC_vadeiva_cult }
-	prerequisite = { focus = LSC_forced_integration }
-	x = -5
-	y = 5
-	relative_position_id = LSC_constitutional_convention
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_little_books"
-		add_to_variable = { LSC_transformation_conscription_factor = 0.05 }
-		add_to_variable = { LSC_research_decision_time = -40 }
-		custom_effect_tooltip = LSC_little_books_tooltip
-		hidden_effect = {
-			country_event = longsword.120
-		}
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-shared_focus = {
-	id = LSC_political_spectacle
-	icon = GFX_goal_ideology_national_populist
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSC_little_books }
-	x = -6
-	y = 6
-	relative_position_id = LSC_constitutional_convention
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_political_spectacle"
-		subtract_from_variable = { LSC_transformation_mobilization_laws_cost_factor = 0.25 }
-		subtract_from_variable = { LSC_transformation_political_advisor_cost_factor = 0.25 }
-		custom_effect_tooltip = LSC_political_spectacle_tooltip
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-shared_focus = {
-	id = LSC_national_body_stratification
-	icon = GFX_goal_dark_arms
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSC_little_books }
-	x = -4
-	y = 6
-	relative_position_id = LSC_constitutional_convention
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_national_body_stratification"
-		custom_effect_tooltip = GRI_war_economy_tp
-		add_ideas = war_economy
-		set_country_flag = war_economy_only_flag
-		hidden_effect = {
-			country_event = longsword.121
-		}
-	}
-	search_filters = { FOCUS_FILTER_INDUSTRY }
-}
-shared_focus = {
-	id = LSC_mandatory_firearms_training
-	icon = GFX_goal_generic_pony_volunteer
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSC_vadeiva_cult }
-	x = -3
-	y = 5
-	relative_position_id = LSC_constitutional_convention
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_little_books"
-		subtract_from_variable = { LSC_transformation_training_time_factor = 0.1 }
-		custom_effect_tooltip = LSC_mandatory_firearms_training_tooltip
-		add_ideas = LNS_a_gun_in_every_home_idea
-	}
-	search_filters = { FOCUS_FILTER_ARMY_BONUS }
-}
-shared_focus = {
-	id = LSC_supremacy_of_will
-	icon = GFX_goal_pony_labour
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSC_ideocracy }
-	x = -2
-	y = 4
-	relative_position_id = LSC_constitutional_convention
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_supremacy_of_will"
-		add_to_variable = { LSC_transformation_research_speed_factor = 0.02 }
-		add_to_variable = { LSC_transformation_production_factory_max_efficiency_factor = 0.05 }
-		custom_effect_tooltip = LSC_supremacy_of_will_tooltip
-	}
-	search_filters = { FOCUS_FILTER_INDUSTRY }
-}
-shared_focus = {
-	id = LSC_militarized_labour
-	icon = GFX_goal_forced_con
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSC_supremacy_of_will }
-	prerequisite = { focus = LSC_fascist_education }
-	x = -1
-	y = 6
-	relative_position_id = LSC_constitutional_convention
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_militarized_labour"
-		add_to_variable = { LSC_transformation_production_factory_max_efficiency_factor = 0.05 }
-		add_to_variable = { LSC_transformation_industrial_capacity_factory = 0.1 }
-		add_to_variable = { LSC_transformation_conscription_factor = -0.05 }
-		custom_effect_tooltip = LSC_militarized_labour_tooltip
-	}
-	search_filters = { FOCUS_FILTER_INDUSTRY }
-}
-shared_focus = {
-	id = LSC_longsword_above_all
-	icon = GFX_goal_generic_national_unity_claws
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSC_militarized_labour }
-	prerequisite = { focus = LSC_mandatory_firearms_training }
-	prerequisite = { focus = LSC_national_body_stratification }
-	x = -3
-	y = 7
-	relative_position_id = LSC_constitutional_convention
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_longsword_above_all"
-		add_ideas = LNS_integral_liberation
-		hidden_effect = {
-			country_event = longsword.122
-		}
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-shared_focus = {
-	id = LSC_primitive_accumulation
-	icon = GFX_goal_SZC_improvised_farming_machinery
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSC_militarized_labour }
-	x = -1
-	y = 7
-	relative_position_id = LSC_constitutional_convention
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_primitive_accumulation"
-		save_current_manpower = yes
-		every_state = {
-			limit = { 
-				is_core_of = HLQ 
-				is_owned_by = LSC
-			}
-			add_building_construction = {
-				type = infrastructure
-				level = 1
-				instant_build = yes
-			}
-			add_building_construction = {
-				type = industrial_complex
-				level = 1
-				instant_build = yes
-			}
-			add_manpower = -15000
-		}
-		552 = {
-			add_building_construction = {
-				type = infrastructure
-				level = 1
-				instant_build = yes
-			}
-			add_building_construction = {
-				type = industrial_complex
-				level = 1
-				instant_build = yes
-			}
-			add_manpower = -20000
-		}
-		505 = {
-			add_building_construction = {
-				type = infrastructure
-				level = 1
-				instant_build = yes
-			}
-			add_building_construction = {
-				type = industrial_complex
-				level = 1
-				instant_build = yes
-			}
-			add_manpower = -20000
-		}
-		540 = {
-			add_building_construction = {
-				type = infrastructure
-				level = 1
-				instant_build = yes
-			}
-			add_building_construction = {
-				type = industrial_complex
-				level = 1
-				instant_build = yes
-			}
-			add_manpower = -20000
-		}
-		restore_previous_manpower = yes
-	}
-	search_filters = { FOCUS_FILTER_INDUSTRY }
-}
-shared_focus = {
-	id = LSC_economic_subordination
-	icon = GFX_goal_state_economy
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSC_violet_revolution }
-	x = -5
-	y = 2
-	relative_position_id = LSC_constitutional_convention
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_economic_subordination"
-		one_random_arms_factory = yes
-		one_random_arms_factory = yes
-		one_random_industrial_complex = yes
-	}
-	search_filters = { FOCUS_FILTER_INDUSTRY }
-}
-shared_focus = {
-	id = LSC_full_employment
-	icon = GFX_goal_forced_res
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSC_economic_subordination }
-	x = -6
-	y = 3
-	relative_position_id = LSC_constitutional_convention
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_economic_subordination"
-		add_to_variable = { LSC_transformation_production_factory_max_efficiency_factor = 0.1 }
-		add_to_variable = { LSC_transformation_industrial_capacity_factory = 0.1 }
-		custom_effect_tooltip = LSC_full_employment_tooltip
-	}
-	search_filters = { FOCUS_FILTER_INDUSTRY }
-}
-
-###############################################################
-### Longsword Republic (LSC) Foreign Trees ###
-###############################################################
-
-shared_focus = {
-	id = LSC_hellquill_harcom
-	icon = GFX_goal_Free_the_Ponies_of_Hellquill_1
-	x = 6
-	y = 6
-	cost = 4
-	available = { 
-		has_completed_focus = LSC_constitutional_convention
-		NOT = {
-			has_active_mission = LSC_three_year_plan
-		}
-	}
-	bypass = {
-		NOT = { can_declare_war_on = HLQ }
-	}
-		allow_branch = {
-		is_subject = no
-	}
-
-	ai_will_do = {
-		factor = 100
-		modifier = {
-			factor = 0
-			num_divisions < 12
-		}
-	}
-	will_lead_to_war_with = HLQ
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_hellquill_harcom"
-		if = {
-			limit = {
-				HLQ = {
-					OR = {
-						has_government = communism
-						has_government = democratic
-					}
-				}
-			}
-			country_event = longsword.35
-		}
-		else_if = {
-			limit = {
-				HLQ = {
-					OR = {
-						has_government = fascism
-						has_government = neutrality
-					}
-				}
-			}
-			every_state = {
-				limit = { is_core_of = HLQ }
-				add_claim_by = ROOT
-			}
-			create_wargoal = {
-				type = annex_everything
-				target = HLQ
-			}
-			country_event = longsword.115
-		}
-	}
-	search_filters = { FOCUS_FILTER_ANNEXATION }
-}
-shared_focus = {
-	id = LSC_integrate_hellquill
-	icon = GFX_goal_generic_ponykind
-	cost = 6
-	ai_will_do = { factor = 100 }
-
-	x = 1
-	y = 1
-	relative_position_id = LSC_hellquill_harcom
-	prerequisite = { focus = LSC_hellquill_harcom }
-	available = {
-		HLQ = { exists = no }
-		OR = {
-			owns_state = 537
-			owns_state = 553
-			owns_state = 633
-			owns_state = 634
-		}
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_integrate_hellquill"
-		HLQ = { add_to_ROOT_potential_cores = yes }
-	}
-	search_filters = { FOCUS_FILTER_ANNEXATION }
-}
-shared_focus = {
-	id = LSC_vartai_republic
-	icon = GFX_goal_molotov_ribbentrop_pact_pony
-	cost = 6
-	ai_will_do = { factor = 100 }
-
-	x = 2
-	y = 2
-	relative_position_id = LSC_hellquill_harcom
-	prerequisite = { focus = LSC_integrate_hellquill }
-	available = {
-		HLQ = { exists = no }
-		owns_state = 537
-		owns_state = 553
-		owns_state = 633
-		owns_state = 634
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_vartai_republic"
-		set_cosmetic_tag = LSC_vartai
-		increase_society_development_with_tt = yes
-		hidden_effect = {
-			country_event = longsword.32
-		}
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-shared_focus = {
-	id = LSC_fate_of_reformisten
-	icon = GFX_HOL_crackdown_natpop
-	cost = 6
-	ai_will_do = { factor = 100 }
-
-	x = -1
-	y = 1
-	relative_position_id = LSC_hellquill_harcom
-	prerequisite = { focus = LSC_hellquill_harcom }
-	available = {
-		HLQ = { exists = no }
-		owns_state = 537
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_fate_of_reformisten"
-		country_event = longsword.108
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-shared_focus = {
-	id = LSC_hellquill_reconstruction
-	icon = GFX_goal_generic_lau_construction
-	cost = 6
-	ai_will_do = { factor = 100 }
-
-	x = -2
-	y = 2
-	relative_position_id = LSC_hellquill_harcom
-	prerequisite = { focus = LSC_fate_of_reformisten }
-	available = {
-		OR = {
-			owns_state = 537
-			owns_state = 553
-			owns_state = 633
-			owns_state = 634
-		}
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_hellquill_reconstruction"
-		unlock_decision_category_tooltip = LSC_Hellquill_reconstruction_decisions
-	}
-	search_filters = { FOCUS_FILTER_INDUSTRY }
-}
-shared_focus = {
-	id = LSC_seek_allies
-	icon = GFX_goal_solar_attack_griffonia
-	cost = 6
-	ai_will_do = { factor = 100 }
-	
-	allow_branch = {
-		NOT = {
-			OR = {
-				has_country_leader = {
-					character = LSC_abba_povner
-					ruling_only = yes
-				}
-				has_country_leader = {
-					character = LSC_ludwig_von_pliater
-					ruling_only = yes
-				}
-			}
-		}
-	}
-
-	x = 0
-	y = 2
-	relative_position_id = LSC_hellquill_harcom
-	prerequisite = { focus = LSC_hellquill_harcom }
-	available = {
-		HLQ = { exists = no }
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_seek_allies"
-		custom_effect_tooltip = LSC_can_ally_tooltip
-		hidden_effect = {
-			    if = {
-				    limit = {
-					    has_country_leader = {
-						character = LSC_flawless_justice
-						ruling_only = yes
-							}
-						}
-						LSC = {
-						country_event = longsword.191
-					}
-				}
-			}
-		}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-
-
-shared_focus = {
-	id = LSC_our_destiny
-	icon = GFX_goal_RUS_white_legacy
-	cost = 3
-	ai_will_do = { factor = 100 }
-	
-	available = { 
-       OR = {
-			382 = {
-				owner = {
-						tag = LSC
-					}
-				}
-			387 = {
-				owner = {
-						tag = LSC
-					}
-				}
-			}
-		}
-	allow_branch = {
-		has_government = democratic
-	    has_country_leader = {
-			character = LSC_flawless_justice
-			ruling_only = yes
-		}
-	}
-	
-	prerequisite = { focus = LSC_seek_allies }
-
-	x = 0
-	y = 3
-	relative_position_id = LSC_hellquill_harcom
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_seek_allies"
-		add_manpower = 10000
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-
-shared_focus = {
-	id = LSC_the_frozen_north
-	icon = GFX_goal_riv_pacify_the_north
-	cost = 6
-	ai_will_do = { factor = 100 }
-	
-
-	
-	prerequisite = { focus = LSC_our_destiny }
-
-	x = -2
-	y = 1
-	relative_position_id = LSC_our_destiny
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_seek_allies"
-		create_wargoal = {
-					type = puppet_wargoal_focus
-					target = FIR
-				}
-			if = {
-				limit = {
-					FBK = {
-						OR = {
-							has_government = fascism
-							has_government = neutrality
-						}
-						NOT = {
-							is_in_faction_with = ROOT
-						}
-					}
-				}
-				create_wargoal = {
-					type = puppet_wargoal_focus
-					target = FBK
-				}
-			}
-			if = {
-				limit = {
-					WAT = {
-						OR = {
-							has_government = fascism
-							has_government = neutrality
-						}
-						NOT = {
-							is_in_faction_with = ROOT
-						}
-					}
-				}
-				create_wargoal = {
-					type = puppet_wargoal_focus
-					target = WAT
-				}
-			}
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-
-shared_focus = {
-	id = LSC_the_new_shield
-	icon = GFX_goal_LUS_clover
-	cost = 6
-	ai_will_do = { factor = 100 }
-
-	
-	prerequisite = { focus = LSC_our_destiny }
-
-	x = 2
-	y = 1
-	relative_position_id = LSC_our_destiny
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_seek_allies"
-		create_wargoal = {
-					type = annex_everything
-					target = LUS
-		}
-			if = {
-				limit = {
-					BRF = {
-					exists = yes
-						OR = {
-							has_government = fascism
-							has_government = neutrality
-						}
-						NOT = {
-							is_in_faction_with = ROOT
-						}
-					}
-				}
-				create_wargoal = {
-					type = puppet_wargoal_focus
-					target = BRF
-				}
-			}
-			if = {
-				limit = {
-					GRY = {
-					exists = yes
-						OR = {
-							has_government = fascism
-							has_government = neutrality
-						}
-						NOT = {
-							is_in_faction_with = ROOT
-						}
-					}
-				}
-				create_wargoal = {
-					type = puppet_wargoal_focus
-					target = GRY		
-					}
-			}
-			if = {
-				limit = {
-					GRW = {
-					exists = yes
-						OR = {
-							has_government = fascism
-							has_government = neutrality
-						}
-						NOT = {
-							is_in_faction_with = ROOT
-						}
-					}
-				}
-				create_wargoal = {
-					type = puppet_wargoal_focus
-					target = GRW
-				}
-			}
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-
-
-shared_focus = {
-	id = LSC_blessing_of_the_gods
-	icon = GFX_goal_sunshine
-	cost = 6
-	ai_will_do = { factor = 100 }
-	
-	
-	prerequisite = { focus = LSC_our_destiny }
-
-available = {
-has_completed_focus = LSC_kriwe_classes
-}
-	x = 0
-	y = 1
-	relative_position_id = LSC_our_destiny
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_seek_allies"
-		hidden_effect = {
-		country_event = { days = 0 id = longsword.189 }
-		}
-		swap_ideas = {
-			remove_idea = LNS_harmonic_society_2
-			add_idea = LNS_harmonic_society_3
-		}
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-
-shared_focus = {
-	id = LSC_legion_without_borders
-	icon = GFX_PAP_legionary_spirit
-	cost = 6
-	ai_will_do = { factor = 100 }
-	
-	
-	prerequisite = { focus = LSC_blessing_of_the_gods}
-
-	available = {
-		has_completed_focus = LSC_national_myth
-	}
-
-	x = -1
-	y = 1
-	relative_position_id = LSC_blessing_of_the_gods
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_seek_allies"
-		swap_ideas = {
-			remove_idea = LNS_ducal_legacy_2
-			add_idea = LNS_ducal_legacy_3
-		}
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-
-shared_focus = {
-	id = LSC_the_vartai_card
-	icon = GFX_goal_NOR_passport_convention
-	cost = 6
-	ai_will_do = { factor = 100 }
-	
-	available = {
-		has_completed_focus = LSC_promote_local_dialects
-	}
-	
-	prerequisite = { focus = LSC_blessing_of_the_gods }
-
-	x = 1
-	y = 1
-	relative_position_id = LSC_blessing_of_the_gods
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_seek_allies"
-		swap_ideas = {
-			remove_idea = LNS_linguistic_freedom
-			add_idea = LNS_linguistic_freedom2
-		}
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-
-shared_focus = {
-	id = LSC_betrayal_into_glory
-	icon = GFX_goal_solar_phoenix
-	cost = 5
-	ai_will_do = { factor = 100 }
-	
-	
-	available = { 
-       OR = {
-		has_completed_focus = LSC_divine_justice
-	     387 = {
-				owner = {
-						tag = LSC
-					}
-				}
-			}
-		}
-	
-	
-	prerequisite = { focus = LSC_our_destiny }
-
-	x = -5
-	y = 1
-	relative_position_id = LSC_our_destiny
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_seek_allies"
-		if = {
-				limit = {
-					DMT = {
-					exists = yes
-					NOT = {
-							is_in_faction_with = ROOT
-						}
-					}
-				}
-				create_wargoal = {
-					type = puppet_wargoal_focus
-					target = DMT
-				}
-			}
-			if = {
-				limit = {
-					DEP = {
-					exists = yes
-					NOT = {
-							is_in_faction_with = ROOT
-						}
-					}
-				}
-				create_wargoal = {
-					type = annex_everything
-					target = DEP		
-					}
-			}
-			if = {
-				limit = {
-					LCT = {
-					exists = yes
-					NOT = {
-							is_in_faction_with = ROOT
-						}
-					}
-				}
-				create_wargoal = {
-					type = annex_everything
-					target = LCT
-				}
-			}
-		
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-
-shared_focus = {
-	id = LSC_deponya
-	icon = GFX_focus_hun_elect_a_king
-	cost = 6
-	ai_will_do = { factor = 100 }
-	
-	prerequisite = { focus = LSC_betrayal_into_glory }
-available = {
-544 = {
-		is_owned_and_controlled_by = ROOT
-	}
-	}
-	x = 2
-	y = 1
-	relative_position_id = LSC_betrayal_into_glory
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_seek_allies"
-		DEP = { add_to_ROOT_potential_cores = yes }
-        
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-
-shared_focus = {
-	id = LSC_lake_city
-	icon = GFX_focus_jap_zaibatsu
-	cost = 6
-	ai_will_do = { factor = 100 }
-	
-	prerequisite = { focus = LSC_betrayal_into_glory }
-available = {
-387 = {
-		is_owned_and_controlled_by = ROOT
-	}
-	}
-	x = 0
-	y = 1
-	relative_position_id = LSC_betrayal_into_glory
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_seek_allies"
-				LCT = { add_to_ROOT_potential_cores = yes }
-
-		add_ideas = LNS_guilds_subjugated
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-
-shared_focus = {
-	id = LSC_diamond_mountain
-	icon = GFX_focus_DMT_hall_of_the_mountain_king
-	cost = 6
-	ai_will_do = { factor = 100 }
-	
-	prerequisite = { focus = LSC_betrayal_into_glory }
-	available = {
-			637 = {
-				owner = {
-					OR = {
-						tag = ROOT
-						is_subject_of = ROOT
-					}
-				}
-			}
-		}
-	x = -2
-	y = 1
-	relative_position_id = LSC_betrayal_into_glory
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_seek_allies"
-		custom_effect_tooltip = available_designer
-        show_ideas_tooltip = DMT_Var_Alsas_Forge
-		custom_effect_tooltip = available_designer
-        show_ideas_tooltip = DMT_Kal_Spankaz_Forge
-		custom_effect_tooltip = available_designer
-        show_ideas_tooltip = DMT_Terri_Azur_Forge
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-
-shared_focus = {
-	id = LSC_perhaps_more_awaits
-	icon = GFX_goal_generic_pony_unicorn
-	cost = 6
-	ai_will_do = { factor = 100 }
-	
-	
-	prerequisite = { focus = LSC_diamond_mountain
-	focus = LSC_lake_city
-	focus = LSC_deponya }
-
-	x = 0
-	y = 2
-	relative_position_id = LSC_betrayal_into_glory
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_seek_allies"
-		add_ideas = LNS_destiny_awaits
-		hidden_effect = {
-		country_event = longsword.187
-		}
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-
-
-
-
-shared_focus = {
-	id = LSC_divine_justice
-	icon = GFX_goal_Duskclaw_Icon_Vacant
-	cost = 5
-	ai_will_do = { factor = 100 }
-	
-	bypass = {
-		382 = {
-				owner = {
-						tag = LSC
-					}
-				}
-	}
-	available = {
-			has_completed_focus = LSC_betrayal_into_glory
-			if = {
-					limit = {
-						GRD = {
-							OR = {
-								tag = GRI
-								tag = BRZ
-								tag = ANG
-								tag = FEA
-								tag = KAT
-								tag = PYT
-								tag = ROU
-								tag = TRD
-								tag = YAL
-								tag = STW
-							}
-						}
-					}
-					has_global_flag = GRI_empire_rising_flag
-				}	
-			}
-	prerequisite = { focus = LSC_our_destiny }
-	x = 5
-	y = 1
-	relative_position_id = LSC_our_destiny
-	completion_reward = {
-			log = "[GetDateText]: [Root.GetName]: Focus LSC_divine_justice"
-			hidden_effect = {
-				create_wargoal = { 
-					type = annex_everything 
-					target = GRD 
-				}
-			}
-			declare_war_on = { 
-				type = annex_everything 
-				target = GRD 
-			}
-			if = {
-				limit = {
-					FEA = {
-						exists = yes
-						NOT = {
-							is_in_faction_with = ROOT
-							is_subject_of = ROOT
-							has_war_with = ROOT
-						}
-					}
-				}
-				hidden_effect = {
-					create_wargoal = { 
-						type = annex_everything 
-						target = FEA
-					}
-				}
-				declare_war_on = { 
-					type = annex_everything 
-					target = FEA
-				}
-			}
-			if = {
-				limit = {
-					STW = {
-						exists = yes
-						NOT = {
-							is_in_faction_with = ROOT
-							is_subject_of = ROOT
-							has_war_with = ROOT
-						}
-					}
-				}
-				hidden_effect = {
-					create_wargoal = { 
-						type = annex_everything 
-						target = STW
-					}
-				}
-				declare_war_on = { 
-					type = annex_everything 
-					target = STW
-				}
-			}
-			if = {
-				limit = {
-					ANG = {
-						exists = yes
-						NOT = {
-							is_in_faction_with = ROOT
-							is_subject_of = ROOT
-							has_war_with = ROOT
-						}
-					}
-				}
-				hidden_effect = {
-					create_wargoal = { 
-						type = annex_everything 
-						target = ANG
-					}
-				}
-				declare_war_on = { 
-					type = annex_everything 
-					target = ANG
-				}
-			}
-			if = {
-				limit = {
-					PYT = {
-						exists = yes
-						NOT = {
-							is_in_faction_with = ROOT
-							is_subject_of = ROOT
-							has_war_with = ROOT
-						}
-					}
-				}
-				hidden_effect = {
-					create_wargoal = { 
-						type = annex_everything 
-						target = PYT
-					}
-				}
-				declare_war_on = { 
-					type = annex_everything 
-					target = PYT
-				}
-			}
-			if = {
-				limit = {
-					ROU = {
-						exists = yes
-						NOT = {
-							is_in_faction_with = ROOT
-							is_subject_of = ROOT
-							has_war_with = ROOT
-						}
-					}
-				}
-				hidden_effect = {
-					create_wargoal = { 
-						type = annex_everything 
-						target = ROU
-					}
-				}
-				declare_war_on = { 
-					type = annex_everything 
-					target = ROU
-				}
-			}
-			if = {
-				limit = {
-					KAT = {
-						exists = yes
-						NOT = {
-							is_in_faction_with = ROOT
-							is_subject_of = ROOT
-							has_war_with = ROOT
-						}
-					}
-				}
-				hidden_effect = {
-					create_wargoal = { 
-						type = annex_everything 
-						target = KAT
-					}
-				}
-				declare_war_on = { 
-					type = annex_everything 
-					target = KAT
-				}
-			}
-			if = {
-				limit = {
-					BRZ = {
-						exists = yes
-						NOT = {
-							is_in_faction_with = ROOT
-							is_subject_of = ROOT
-							has_war_with = ROOT
-						}
-					}
-				}
-				hidden_effect = {
-					create_wargoal = { 
-						type = annex_everything 
-						target = BRZ
-					}
-				}
-				declare_war_on = { 
-					type = annex_everything 
-					target = BRZ
-				}
-			}
-			if = {
-				limit = {
-					YAL = {
-						exists = yes
-						NOT = {
-							is_in_faction_with = ROOT
-							is_subject_of = ROOT
-							has_war_with = ROOT
-						}
-					}
-				}
-				hidden_effect = {
-					create_wargoal = { 
-						type = annex_everything 
-						target = YAL
-					}
-				}
-				declare_war_on = { 
-					type = annex_everything 
-					target = YAL
-				}
-			}
-		}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-
-shared_focus = {
-	id = LSC_an_inheritance_denied
-	icon = GFX_goal_POR_royal_edicts
-	cost = 5
-	ai_will_do = { factor = 100 }
-	
-	available = {
-		382 = {
-				owner = {
-						tag = LSC
-					}
-				}
-			}
-	
-	prerequisite = { focus = LSC_divine_justice }
-	x = 0
-	y = 1
-	relative_position_id = LSC_divine_justice
-	completion_reward = {
-	hidden_effect = {
-		country_event = longsword.185
-		}
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_seek_allies"
-		set_cosmetic_tag = LSC_duchy
-		set_country_leader_ideology = harmonic_constitutionalism
-		if = {
-			 limit = {
-				 LSC = {
-					    is_in_faction = yes
-						}
-					}
-				add_political_power = 100	
-			}
-		else_if = {
-			    limit = {
-				    LSC = {
-					    NOT = {
-					        is_river_fed_member = no
-						}
-					}
-				}
-			create_faction = "LSC_flawless_faction"
-			}
-		}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-
-shared_focus = {
-	id = LSC_old_ties_and_new_friendships
-	icon = GFX_goal_collaborate_local_elites_pony
-	cost = 5
-	ai_will_do = { factor = 100 }
-	
-	
-	available = {
-		382 = {
-				owner = {
-						tag = LSC
-					}
-				}
-			}
-	prerequisite = { focus = LSC_divine_justice }
-	x = -2
-	y = 1
-	relative_position_id = LSC_divine_justice
-	completion_reward = {
-		if = {
-		limit = {
-			NOT = {
-			has_global_flag = GRI_grover_vi_dead
-			}
-		}
-			LSC = {
-				country_event = longsword.186
-			}
-		}
-		add_ideas = LSC_local_auxiliaries
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-
-shared_focus = {
-	id = LSC_new_corporations
-	icon = GFX_goal_generic_lau_factory
-	cost = 5
-	ai_will_do = { factor = 100 }
-	
-	available = {
-		382 = {
-				owner = {
-						tag = LSC
-					}
-				}
-			}
-			
-	prerequisite = { focus = LSC_divine_justice }
-	x = 2
-	y = 1
-	relative_position_id = LSC_divine_justice
-	completion_reward = {
-		add_ideas = GRI_industrial_center_east
-		custom_effect_tooltip = available_designer
-		show_ideas_tooltip = pride
-		custom_effect_tooltip = available_designer
-		show_ideas_tooltip = feat_company_6
-		custom_effect_tooltip = available_designer
-		show_ideas_tooltip = STW_standardisation_concern
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-
-shared_focus = {
-	id = LSC_truly_duke_reborn
-	icon = GFX_focus_indy_swing_the_sword
-	cost = 5
-	ai_will_do = { factor = 100 }
-	
-	
-	prerequisite = { 
-	focus = LSC_new_corporations
-    focus = LSC_old_ties_and_new_friendships
-    focus = LSC_an_inheritance_denied	
-	}
-	
-	x = 0
-	y = 2
-	relative_position_id = LSC_divine_justice
-	completion_reward = {
-	hidden_effect = {
-		country_event = longsword.192
-		}
-	custom_effect_tooltip = RCT_can_justify
-			hidden_effect = {
-				set_rule = {
-					can_only_justify_war_on_threat_country = no
-					can_declare_war_on_same_ideology = yes
-				}
-			}
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-
-
-
-shared_focus = {
-	id = LSC_never_again
-	icon = GFX_goal_fire
-	cost = 6
-	ai_will_do = { factor = 100 }
-	
-	allow_branch = {
-		OR = {
-			has_country_leader = {
-				character = LSC_abba_povner
-				ruling_only = yes
-			}
-			has_country_leader = {
-				character = LSC_ludwig_von_pliater
-				ruling_only = yes
-			}
-		}
-	}
-
-	x = 0
-	y = 2
-	relative_position_id = LSC_hellquill_harcom
-	prerequisite = { focus = LSC_hellquill_harcom }
-	available = {
-		HLQ = { exists = no }
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_never_again"
-		create_faction = "LSC_povner_faction"
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-shared_focus = {
-	id = LSC_prepare_arsenic
-	icon = GFX_goal_forced_res
-	cost = 6
-	ai_will_do = { factor = 100 }
-
-	x = -2
-	y = 3
-	relative_position_id = LSC_hellquill_harcom
-	prerequisite = { focus = LSC_never_again }
-	available = {
-		HLQ = { exists = no }
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_prepare_arsenic"
-		unlock_decision_tooltip = LSC_distribute_arsenic
-	}
-	search_filters = { FOCUS_FILTER_ARMY_BONUS }
-}
-shared_focus = {
-	id = LSC_black_books
-	icon = GFX_goal_bookstack
-	cost = 6
-	ai_will_do = { factor = 100 }
-
-	x = 0
-	y = 3
-	relative_position_id = LSC_hellquill_harcom
-	prerequisite = { focus = LSC_never_again }
-	available = {
-		HLQ = { exists = no }
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_black_books"
-		unlock_decision_tooltip = LSC_begin_assassinations
-	}
-	search_filters = { FOCUS_FILTER_ARMY_BONUS }
-}
-shared_focus = {
-	id = LSC_fanatic_army
-	icon = GFX_goal_griffon_levy
-	cost = 6
-	ai_will_do = { factor = 100 }
-
-	x = 2
-	y = 3
-	relative_position_id = LSC_hellquill_harcom
-	prerequisite = { focus = LSC_never_again }
-	available = {
-		HLQ = { exists = no }
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_fanatic_army"
-		custom_effect_tooltip = LNS_povner_division_gained
-		division_template = {
-			name = "Žygiuojančios vėlės"
-			division_names_group = LSC_INF_02
-			regiments = {
-				infantry = { x = 0 y = 0 }
-				infantry = { x = 0 y = 1 }
-				infantry = { x = 0 y = 2 }
-				infantry = { x = 0 y = 3 }
-				infantry = { x = 0 y = 4 }
-				infantry = { x = 1 y = 0 }
-				infantry = { x = 1 y = 1 }
-				infantry = { x = 1 y = 2 }
-				infantry = { x = 1 y = 3 }
-				infantry = { x = 1 y = 4 }
-			}
-		}
-		hidden_effect = {
-			505 = {
-				create_unit = {
-					division = "division_template = \"Žygiuojančios vėlės\" start_experience_factor = 0.9 start_equipment_factor = 1"
-					owner = ROOT
-					count = 10
-				}
-			}
-		}
-	}
-	search_filters = { FOCUS_FILTER_ARMY_BONUS }
-}
-shared_focus = {
-	id = LSC_burn_herzland
-	icon = GFX_goal_gri
-	cost = 3
-	ai_will_do = { 
-		factor = 100 
-		modifier = {
-			factor = 0
-			has_army_manpower = {
-				size < 200000
-			}
-		}
-		modifier = {
-			factor = 0
-			has_war = yes
-		}
-	}
-	
-	available = {
-		has_country_leader = {
-			character = LSC_abba_povner
-			ruling_only = yes
-		}
-		is_subject = no
-	}
-	bypass = {
-		GRD = {
-			OR = {
-				exists = no
-				is_subject_of = ROOT
-				has_war_with = ROOT
-			}
-		}
-	}
-	
-	will_lead_to_war_with = GRI
-	will_lead_to_war_with = ANG
-	will_lead_to_war_with = PYT
-	will_lead_to_war_with = YAL
-	will_lead_to_war_with = ROU
-	will_lead_to_war_with = KAT
-	will_lead_to_war_with = STW
-	will_lead_to_war_with = BRZ
-	will_lead_to_war_with = FEA
-
-	x = 0
-	y = 4
-	relative_position_id = LSC_hellquill_harcom
-	prerequisite = { focus = LSC_prepare_arsenic }
-	prerequisite = { focus = LSC_black_books }
-	prerequisite = { focus = LSC_fanatic_army }
-	available = {
-		HLQ = { exists = no }
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_burn_herzland"
-		hidden_effect = {
-		create_wargoal = {
-				type = annex_everything
-				target = GRI
-			}
-			create_wargoal = {
-				type = annex_everything
-				target = STW
-			}
-			create_wargoal = {
-				type = annex_everything
-				target = YAL
-			}
-			create_wargoal = {
-				type = annex_everything
-				target = PYT
-			}
-			create_wargoal = {
-				type = annex_everything
-				target = ROU
-			}
-			create_wargoal = {
-				type = annex_everything
-				target = ANG
-			}
-			create_wargoal = {
-				type = annex_everything
-				target = KAT
-			}
-			create_wargoal = {
-				type = annex_everything
-				target = BRZ
-			}
-			create_wargoal = {
-				type = annex_everything
-				target = FEA
-			}
-			}
-			declare_war_on = { 
-			type = annex_everything 
-			target = GRI
-		}
-		declare_war_on = { 
-			type = annex_everything 
-			target = STW
-		}
-		declare_war_on = { 
-			type = annex_everything 
-			target = YAL
-		}
-		declare_war_on = { 
-			type = annex_everything 
-			target = PYT
-		}
-		declare_war_on = { 
-			type = annex_everything 
-			target = ROU 
-		}
-		declare_war_on = { 
-			type = annex_everything 
-			target = ANG
-		}
-		declare_war_on = { 
-			type = annex_everything 
-			target = KAT
-		}
-		declare_war_on = { 
-			type = annex_everything 
-			target = BRZ
-		}
-		declare_war_on = { 
-			type = annex_everything 
-			target = FEA
-		}
-		add_ideas = LNS_povner_crusade
-			
-			
-
-	}
-	search_filters = { FOCUS_FILTER_ANNEXATION }
-}
-
-shared_focus = {
-	id = LSC_hellquill_supremacist
-	icon = GFX_goal_Free_the_Ponies_of_Hellquill_1
-	x = 9
-	y = 6
-	cost = 4
-	available = { 
-		has_completed_focus = LSC_constitutional_convention
-		NOT = {
-			has_active_mission = LSC_three_year_plan
-		}
-	}
-	bypass = {
-		NOT = { can_declare_war_on = HLQ }
-	}
-		allow_branch = {
-		is_subject = no
-	}
-
-	ai_will_do = {
-		factor = 100
-		modifier = {
-			factor = 0
-			has_army_manpower = {
-				size < 50000
-			}
-		}
-	}
-	will_lead_to_war_with = HLQ
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_hellquill_supremacist"
-		every_state = {
-			limit = { is_core_of = HLQ }
-			add_claim_by = ROOT
-		}
-		create_wargoal = {
-			type = annex_everything
-			target = HLQ
-		}
-		country_event = longsword.115
-	}
-	search_filters = { FOCUS_FILTER_ANNEXATION }
-}
-shared_focus = {
-	id = LSC_destroy_reformisten
-	icon = GFX_goal_No_Half_Measures
-	cost = 6
-	ai_will_do = { factor = 100 }
-
-	x = 0
-	y = 1
-	relative_position_id = LSC_hellquill_supremacist
-	prerequisite = { focus = LSC_hellquill_supremacist }
-	available = {
-		HLQ = { exists = no }
-		owns_state = 537
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_fate_of_reformisten"
-		add_stability = 0.1
-		save_current_manpower = yes
-		537 = {
-			add_manpower = -1600
-		}
-		553 = {
-			add_manpower = -1600
-		}
-		633 = {
-			add_manpower = -1600
-		}
-		634 = {
-			add_manpower = -1600
-		}
-		restore_previous_manpower = yes
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-shared_focus = {
-	id = LSC_hellquill_reconstruction_supremacist
-	icon = GFX_goal_generic_lau_construction
-	cost = 6
-	ai_will_do = { factor = 100 }
-
-	x = -2
-	y = 1
-	relative_position_id = LSC_hellquill_supremacist
-	prerequisite = { focus = LSC_hellquill_supremacist }
-	available = {
-		OR = {
-			owns_state = 537
-			owns_state = 553
-			owns_state = 633
-			owns_state = 634
-		}
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_hellquill_reconstruction_supremacist"
-		unlock_decision_category_tooltip = LSC_Hellquill_reconstruction_decisions
-	}
-	search_filters = { FOCUS_FILTER_INDUSTRY }
-}
-shared_focus = {
-	id = LSC_integrate_hellquill_supremacist
-	icon = GFX_goal_generic_ponykind
-	cost = 6
-	ai_will_do = { factor = 100 }
-
-	x = 2
-	y = 1
-	relative_position_id = LSC_hellquill_supremacist
-	prerequisite = { focus = LSC_hellquill_supremacist }
-	available = {
-		HLQ = { exists = no }
-		OR = {
-			owns_state = 537
-			owns_state = 553
-			owns_state = 633
-			owns_state = 634
-		}
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_integrate_hellquill_supremacist"
-		HLQ = { add_to_ROOT_potential_cores = yes }
-	}
-	search_filters = { FOCUS_FILTER_ANNEXATION }
-}
-shared_focus = {
-	id = LSC_sirdis
-	icon = GFX_goal_crystal_heart
-	cost = 6
-	ai_will_do = { factor = 100 }
-
-	x = 0
-	y = 2
-	relative_position_id = LSC_hellquill_supremacist
-	prerequisite = { focus = LSC_integrate_hellquill_supremacist }
-	prerequisite = { focus = LSC_destroy_reformisten }
-	prerequisite = { focus = LSC_hellquill_reconstruction_supremacist }
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_sirdis"
-		set_cosmetic_tag = LSC_sirdis
-		increase_society_development_with_tt = yes
-		create_faction = "LSC_supremacist_faction"
-		country_event = longsword.32
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-shared_focus = {
-	id = LSC_attack_west
-	icon = GFX_goal_gri
-	cost = 3
-	ai_will_do = { 
-		factor = 100 
-		modifier = {
-			factor = 0
-			has_army_manpower = {
-				size < 200000
-			}
-		}
-		modifier = {
-			factor = 0
-			GRI = {
-				has_war = no
-			}
-		}
-		modifier = {
-			factor = 0
-			has_war = yes
-		}
-	}
-	
-	available = {
-		has_government = fascism
-		is_subject = no
-		if = {
-			limit = {
-				GRD = {
-					OR = {
-						tag = GRI
-						tag = BRZ
-						tag = ANG
-						tag = FEA
-						tag = KAT
-						tag = PYT
-						tag = ROU
-						tag = TRD
-						tag = YAL
-					}
-					owns_state = 382
-				}
-			}
-			has_global_flag = GRI_empire_rising_flag
-		}
-	}
-	bypass = {
-		OR = {
-			owns_state = 382
-			var:382.owner = {
-				is_subject_of = ROOT
-			}
-			var:382.owner = {
-				has_war_with = ROOT
-			}
-		}
-	}
-	
-	will_lead_to_war_with = GRD # tag alias for event_target:griffonian_empire
-
-	x = -2
-	y = 3
-	relative_position_id = LSC_hellquill_supremacist
-	prerequisite = { focus = LSC_sirdis }
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_attack_west"
-		declare_war_on = { type = annex_everything target = 382.owner }
-	}
-	search_filters = { FOCUS_FILTER_ANNEXATION }
-}
-shared_focus = {
-	id = LSC_restore_universities
-	icon = GFX_goal_supremacy_of_will
-	cost = 6
-	ai_will_do = { factor = 100 }
-	
-	available = {
-	    ROU = {
-			OR = {
-				exists = no
-				is_subject_of = ROOT
-			}
-		}
-		owns_state = 674
-	}
-
-	x = -3
-	y = 4
-	relative_position_id = LSC_hellquill_supremacist
-	prerequisite = { focus = LSC_attack_west }
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_restore_universities"
-		add_ideas = GRI_university
-	}
-	search_filters = { FOCUS_FILTER_ANNEXATION }
-}
-shared_focus = {
-	id = LSC_fate_of_grover
-	icon = GFX_goal_grover_vi
-	cost = 6
-	ai_will_do = { factor = 100 }
-	
-	available = {
-		owns_state = 382
-		NOT = { has_war_with = GRD }
-	}
-	bypass = {
-		has_global_flag = GRI_grover_vi_dead
-	}
-
-	x = -1
-	y = 4
-	relative_position_id = LSC_hellquill_supremacist
-	prerequisite = { focus = LSC_attack_west }
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_fate_of_grover"
-		country_event = longsword.128
-	}
-	search_filters = { FOCUS_FILTER_ANNEXATION }
-}
-shared_focus = {
-	id = LSC_integrate_herzland
-	icon = GFX_goal_generic_military_deal_pony
-	cost = 6
-	ai_will_do = { factor = 100 }
-	
-	available = {
-	    GRI = {
-			OR = {
-				exists = no
-				is_subject_of = ROOT
-			}
-		}
-	}
-	bypass = {
-	    all_of = {
-			array = GRI.core_states
-			var:v = { is_core_of = ROOT }
-		}
-	}
-
-	x = -2
-	y = 5
-	relative_position_id = LSC_hellquill_supremacist
-	prerequisite = { focus = LSC_attack_west }
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_integrate_herzland"
-		ANG = { add_to_ROOT_potential_cores = yes }
-		KAT = { add_to_ROOT_potential_cores = yes }
-		YAL = { add_to_ROOT_potential_cores = yes }
-		PYT = { add_to_ROOT_potential_cores = yes }
-		ROU = { add_to_ROOT_potential_cores = yes }
-		BRZ = { add_to_ROOT_potential_cores = yes }
-		STW = { add_to_ROOT_potential_cores = yes }
-		FEA = { add_to_ROOT_potential_cores = yes }
-		GRI = { add_to_ROOT_potential_cores = yes }
-	}
-	search_filters = { FOCUS_FILTER_ANNEXATION }
-}
-shared_focus = {
-	id = LSC_attack_east
-	icon = GFX_focus_riv_form_federation
-	cost = 3
-	ai_will_do = { 
-		factor = 100 
-		modifier = {
-			factor = 0
-			has_army_manpower = {
-				size < 200000
-			}
-		}
-		modifier = {
-			factor = 0
-			has_war = yes
-		}
-	}
-	available = {
-		has_government = fascism
-		is_subject = no
-		OR = {
-			country_exists = RIV
-			country_exists = RCT
-			country_exists = LCT
-			country_exists = NIM
-			country_exists = WIT
-			country_exists = BAK
-			country_exists = DEP
-			country_exists = FRE
-			country_exists = DMT
-		}
-	}
-	bypass = {
-		DMT = {
-			OR = {
-				exists = no
-				is_subject_of = ROOT
-				has_war_with = ROOT
-			}
-		}
-		BAK = {
-			OR = {
-				exists = no
-				is_subject_of = ROOT
-				has_war_with = ROOT
-			}
-		}
-		DEP = {
-			OR = {
-				exists = no
-				is_subject_of = ROOT
-				has_war_with = ROOT
-			}
-		}
-		LCT = {
-			OR = {
-				exists = no
-				is_subject_of = ROOT
-				has_war_with = ROOT
-			}
-		}
-		RCT = {
-			OR = {
-				exists = no
-				is_subject_of = ROOT
-				has_war_with = ROOT
-			}
-		}
-		WIT = {
-			OR = {
-				exists = no
-				is_subject_of = ROOT
-				has_war_with = ROOT
-			}
-		}
-		NIM = {
-			OR = {
-				exists = no
-				is_subject_of = ROOT
-				has_war_with = ROOT
-			}
-		}
-		FRE = {
-			OR = {
-				exists = no
-				is_subject_of = ROOT
-				has_war_with = ROOT
-			}
-		}
-		RIV = {
-			OR = {
-				exists = no
-				is_subject_of = ROOT
-				has_war_with = ROOT
-			}
-		}
-	}
-	will_lead_to_war_with = DMT
-	will_lead_to_war_with = BAK
-	will_lead_to_war_with = DEP
-	will_lead_to_war_with = LCT
-	will_lead_to_war_with = RCT
-	will_lead_to_war_with = WIT
-	will_lead_to_war_with = NIM
-	will_lead_to_war_with = FRE
-
-	x = 2
-	y = 3
-	relative_position_id = LSC_hellquill_supremacist
-	prerequisite = { focus = LSC_sirdis }
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_attack_east"
-		if = {
-			limit = {
-				DMT = {
-					exists = yes
-					NOT = {
-						is_subject_of = ROOT
-						has_war_with = ROOT
-					}
-				}
-			}
-			declare_war_on = { type = annex_everything target = DMT }
-		}
-		if = {
-			limit = {
-				BAK = {
-					exists = yes
-					NOT = {
-						is_subject_of = ROOT
-						has_war_with = ROOT
-					}
-				}
-			}
-			declare_war_on = { type = annex_everything target = BAK }
-		}
-		if = {
-			limit = {
-				DEP = {
-					exists = yes
-					NOT = {
-						is_subject_of = ROOT
-						has_war_with = ROOT
-					}
-				}
-			}
-			declare_war_on = { type = annex_everything target = DEP }
-		}
-		if = {
-			limit = {
-				LCT = {
-					exists = yes
-					NOT = {
-						is_subject_of = ROOT
-						has_war_with = ROOT
-					}
-				}
-			}
-			declare_war_on = { type = annex_everything target = LCT }
-		}
-		if = {
-			limit = {
-				RCT = {
-					exists = yes
-					NOT = {
-						is_subject_of = ROOT
-						has_war_with = ROOT
-					}
-				}
-			}
-			declare_war_on = { type = annex_everything target = RCT }
-		}
-		if = {
-			limit = {
-				WIT = {
-					exists = yes
-					NOT = {
-						is_subject_of = ROOT
-						has_war_with = ROOT
-					}
-				}
-			}
-			declare_war_on = { type = annex_everything target = WIT }
-		}
-		if = {
-			limit = {
-				NIM = {
-					exists = yes
-					NOT = {
-						is_subject_of = ROOT
-						has_war_with = ROOT
-					}
-				}
-			}
-			declare_war_on = { type = annex_everything target = NIM }
-		}
-		if = {
-			limit = {
-				FRE = {
-					exists = yes
-					NOT = {
-						is_subject_of = ROOT
-						has_war_with = ROOT
-					}
-				}
-			}
-			declare_war_on = { type = annex_everything target = FRE }
-		}
-		if = {
-			limit = {
-				RIV = {
-					exists = yes
-					NOT = {
-						is_subject_of = ROOT
-						has_war_with = ROOT
-					}
-				}
-			}
-			declare_war_on = { type = annex_everything target = RIV }
-		}
-	}
-	search_filters = { FOCUS_FILTER_ANNEXATION }
-}
-shared_focus = {
-	id = LSC_include_new_species
-	icon = GFX_focus_DMT_hall_of_the_mountain_king
-	cost = 6
-	ai_will_do = { factor = 100 }
-	
-	available = {
-	    DMT = {
-			OR = {
-				exists = no
-				is_subject_of = ROOT
-			}
-		}
-		has_full_control_of_state = 637
-	}
-
-	x = 3
-	y = 4
-	relative_position_id = LSC_hellquill_supremacist
-	prerequisite = { focus = LSC_attack_east }
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_include_new_species"
-		custom_effect_tooltip = LSC_unlock_dog_leaders
-		if = {
-			limit = { NOT = { has_tech = tech_ironpaws } }
-			set_technology = { tech_ironpaws = 1 }
-		}
-		fix_weapon_techs = yes
-		DMT = { add_to_ROOT_potential_cores = yes }
-		BAK = { add_to_ROOT_potential_cores = yes }
-	}
-	search_filters = { FOCUS_FILTER_ANNEXATION }
-}
-shared_focus = {
-	id = LSC_abolish_riverfed
-	icon = GFX_goal_river_fed_suppression
-	cost = 6
-	ai_will_do = { factor = 100 }
-	
-	available = {
-	    RCT = {
-			OR = {
-				exists = no
-				is_subject_of = ROOT
-			}
-		}
-		has_full_control_of_state = 619
-	}
-
-	x = 1
-	y = 4
-	relative_position_id = LSC_hellquill_supremacist
-	prerequisite = { focus = LSC_attack_east }
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_abolish_riverfed"
-		add_ideas = LNS_riverfed_abolished
-		NIM = { add_to_ROOT_potential_cores = yes }
-		FRE = { add_to_ROOT_potential_cores = yes }
-		WIT = { add_to_ROOT_potential_cores = yes }
-	}
-	search_filters = { FOCUS_FILTER_ANNEXATION }
-}
-shared_focus = {
-	id = LSC_integrate_riverfed
-	icon = GFX_goal_ideology_national_populist
-	cost = 6
-	ai_will_do = { factor = 100 }
-	
-	available = {
-	    RCT = {
-			OR = {
-				exists = no
-				is_subject_of = ROOT
-			}
-		}
-		has_full_control_of_state = 619
-	}
-
-	x = 2
-	y = 5
-	relative_position_id = LSC_hellquill_supremacist
-	prerequisite = { focus = LSC_attack_east }
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_integrate_riverfed"
-		RCT = { add_to_ROOT_potential_cores = yes }
-		LCT = { add_to_ROOT_potential_cores = yes }
-		DEP = { add_to_ROOT_potential_cores = yes }
-	}
-	search_filters = { FOCUS_FILTER_ANNEXATION }
-}
-shared_focus = {
-	id = LSC_griffking_empire
-	icon = GFX_griffking_utopia
-	cost = 6
-	ai_will_do = { factor = 100 }
-	available = {
-		has_full_control_of_state = 674
-		has_full_control_of_state = 619
-		has_full_control_of_state = 382
-		has_full_control_of_state = 387
-		has_war = no
-	}
-
-	x = 0
-	y = 6
-	relative_position_id = LSC_hellquill_supremacist
-	prerequisite = { focus = LSC_integrate_herzland }
-	prerequisite = { focus = LSC_integrate_riverfed }
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_griffking_empire"
-		add_stability = 0.1
-		add_political_power = 100
-		hidden_effect = { set_country_flag = { flag = holds_griffon_capital value = 1 } }
-		drop_cosmetic_tag = yes
-		set_cosmetic_tag = LSC_griffking_empire_cosmetic
-		save_global_event_target_as = griffonian_empire
-		set_variable = { global.griffonian_empire_var = THIS }
-		custom_effect_tooltip = LSC_endless_war_tooltip
-		hidden_effect = {
-			news_event = { id = longsword.123 hours = 1 }
-			country_event = { id = longsword.129 hours = 2 }
-			every_country = {
-				limit = {
-					is_griffon_continent_griffon_country = yes
-				}
-				add_opinion_modifier = { target = ROOT modifier = LCT_hates_for_griffon_empire_opinion }
-				add_opinion_modifier = { target = ROOT modifier = embargo }
-
-				add_ai_strategy = {
-					type = antagonize
-					id = ROOT
-					value = 300
-				}
-			}
-			every_country = {
-				limit = {
-					is_griffon_continent_griffon_country = yes
-					num_of_factories > 50
-				}
-				country_event = { id = longsword.124 hours = 6 }
-			}
-		}
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-shared_focus = {
-	id = LSC_endgame
-	icon = GFX_goal_white_magic_symbol
-	cost = 20
-	ai_will_do = { factor = 100 }
-	available = {
-		has_war = no
-	}
-
-	x = 0
-	y = 7
-	relative_position_id = LSC_hellquill_supremacist
-	prerequisite = { focus = LSC_griffking_empire }
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_endgame"
-		remove_dynamic_modifier = { modifier = LSC_griffon_resistance }
-		custom_effect_tooltip = LSC_endgame_tooltip
-		clr_country_flag = war_economy_only_flag
-		add_ideas = civilian_economy
-		set_country_flag = demilitarized
-		country_event = longsword.130
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-
-###############################################################
-### Longsword Republic (LSC) Military Tree ###
-###############################################################
-
-shared_focus = {
-	id = LSC_IIA
-	icon = GFX_goal_national_arsenal
-	cost = 6
-	ai_will_do = { factor = 100 }
-	available = { 
-		has_completed_focus = LSC_constitutional_convention
-	}
-
-	x = 18
-	y = 0
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_IIA"
-		army_experience = 25
-		add_ideas = LNS_proper_army_idea
-		hidden_effect = {
-			set_technology = {
-				popup = no
-				guerrila_warfare_enable = 0
-			}
-		}
-	}
-	search_filters = { FOCUS_FILTER_ARMY_BONUS }
-}
-shared_focus = {
-	id = LSC_defensive_army
-	icon = GFX_goal_generic_drafted_army
-	cost = 6
-	ai_will_do = { factor = 100 }
-
-	x = 1
-	y = 1
-	relative_position_id = LSC_IIA
-	prerequisite = { focus = LSC_IIA }
-	mutually_exclusive = { focus = LSC_offensive_army }
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_defensive_army"
-		swap_ideas = {
-			remove_idea = LNS_proper_army_idea
-			add_idea = LNS_proper_army_idea_1
-		}
-	}
-	search_filters = { FOCUS_FILTER_ARMY_BONUS }
-}
-shared_focus = {
-	id = LSC_weapons_fund
-	icon = GFX_goal_Modern_Weapons
-	cost = 6
-	ai_will_do = { factor = 100 }
-
-	x = 1
-	y = 2
-	relative_position_id = LSC_IIA
-	prerequisite = { focus = LSC_defensive_army }
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_weapons_fund"
-		add_ideas = LNS_weapons_production
-		add_equipment_to_stockpile = {
-			type = infantry_equipment_0
-			amount = 1500
-			producer = LNS
-		}
-	}
-	search_filters = { FOCUS_FILTER_ARMY_BONUS }
-}
-shared_focus = {
-	id = LSC_attrition_tactics
-	icon = GFX_SIA_jungletraining
-	cost = 6
-	ai_will_do = { factor = 100 }
-
-	x = 0
-	y = 3
-	relative_position_id = LSC_IIA
-	prerequisite = { focus = LSC_defensive_army }
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_attrition_tactics"
-		set_technology = { LSC_forest_warfare = 1 }
-		custom_effect_tooltip = LSC_forest_warfare_effect
-	}
-	search_filters = { FOCUS_FILTER_ARMY_BONUS }
-}
-shared_focus = {
-	id = LSC_engineer_earthworks
-	icon = GFX_goal_generic_construction2
-	cost = 6
-	ai_will_do = { factor = 100 }
-
-	x = 2
-	y = 3
-	relative_position_id = LSC_IIA
-	prerequisite = { focus = LSC_weapons_fund }
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_engineer_earthworks"
-		if = {
-			limit = { NOT = { has_tech = tech_engineers } }
-			set_technology = { tech_engineers = 1 }
-			add_tech_bonus = {
-				name = LSC_engineer_earthworks
-				bonus = 0.75
-				uses = 1
-				category = engineers_tech
-			}
-			else = {
-				add_tech_bonus = {
-					name = LSC_engineer_earthworks
-					bonus = 0.75
-					uses = 2
-					category = engineers_tech
-				}
-			}
-		}
-	}
-	search_filters = { FOCUS_FILTER_ARMY_BONUS }
-}
-shared_focus = {
-	id = LSC_ILKS
-	icon = GFX_focus_generic_support_the_left_right
-	cost = 6
-	ai_will_do = { factor = 100 }
-
-	x = 1
-	y = 4
-	relative_position_id = LSC_IIA
-	prerequisite = { focus = LSC_engineer_earthworks }
-	prerequisite = { focus = LSC_attrition_tactics }
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_ILKS"
-		add_war_support = 0.1
-		add_ideas = LNS_ILKS
-	}
-	search_filters = { FOCUS_FILTER_MANPOWER }
-}
-shared_focus = {
-	id = LSC_nation_defense_planning
-	icon = GFX_goal_officers
-	cost = 6
-	ai_will_do = { factor = 100 }
-
-	x = 3
-	y = 4
-	relative_position_id = LSC_IIA
-	prerequisite = { focus = LSC_engineer_earthworks }
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_ILKS"
-		add_doctrine_cost_reduction = {
-			name = land_doc_bonus
-			cost_reduction = 0.5
-			uses = 2
-			category = land_doctrine
-		}
-	}
-	search_filters = { FOCUS_FILTER_ARMY_BONUS }
-}
-shared_focus = {
-	id = LSC_arms_manufacturing
-	icon = GFX_goal_factory_complex
-	cost = 6
-	ai_will_do = { factor = 100 }
-
-	x = 3
-	y = 2
-	relative_position_id = LSC_IIA
-	prerequisite = { 
-		focus = LSC_offensive_army
-		focus = LSC_defensive_army
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_arms_manufacturing"
-		add_tech_bonus = {
-			name = LSC_arms_manufacturing
-			bonus = 0.5
-			uses = 1
-			category = infantry_weapons
-		}
-		505 = {
-			add_extra_state_shared_building_slots = 1
-			add_building_construction = {
-				type = arms_factory
-				level = 1
-				instant_build = yes
-			}
-		}
-	}
-	search_filters = { FOCUS_FILTER_INDUSTRY }
-}
-shared_focus = {
-	id = LSC_offensive_army
-	icon = GFX_focus_indy_tanks_across_the_border
-	cost = 6
-	ai_will_do = { factor = 100 }
-
-	x = 5
-	y = 1
-	relative_position_id = LSC_IIA
-	prerequisite = { focus = LSC_IIA }
-	mutually_exclusive = { focus = LSC_defensive_army }
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_offensive_army"
-		swap_ideas = {
-			remove_idea = LNS_proper_army_idea
-			add_idea = LNS_proper_army_idea_2
-		}
-	}
-	search_filters = { FOCUS_FILTER_ARMY_BONUS }
-}
-shared_focus = {
-	id = LSC_bite_and_hold
-	icon = GFX_goal_offensive_army
-	cost = 6
-	ai_will_do = { factor = 100 }
-
-	x = 5
-	y = 2
-	relative_position_id = LSC_IIA
-	prerequisite = { focus = LSC_offensive_army }
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_offensive_army"
-		add_ideas = LNS_bite_and_hold
-		add_doctrine_cost_reduction = {
-			name = land_doc_bonus
-			cost_reduction = 0.5
-			uses = 1
-			category = land_doctrine
-		}
-	}
-	search_filters = { FOCUS_FILTER_ARMY_BONUS }
-}
-shared_focus = {
-	id = LSC_offensive_tactics
-	icon = GFX_goal_military_mission_soldier
-	cost = 6
-	ai_will_do = { factor = 100 }
-
-	x = 8
-	y = 2
-	relative_position_id = LSC_IIA
-	prerequisite = { focus = LSC_offensive_army }
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_offensive_tactics"
-		every_army_leader = {
-			add_attack = 1
-		}
-	}
-	search_filters = { FOCUS_FILTER_ARMY_BONUS }
-}
-shared_focus = {
-	id = LSC_magical_infantry_focus
-	icon = GFX_goal_magical_weapon_focus
-	cost = 6
-	ai_will_do = { factor = 100 }
-
-	x = 10
-	y = 3
-	relative_position_id = LSC_IIA
-	prerequisite = { focus = LSC_offensive_tactics }
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_magical_infantry_focus"
-		add_ideas = LNS_healing_spells_idea
-		if = {
-			limit = { NOT = { has_tech = magical_weapons } }
-			custom_effect_tooltip = LNS_magical_infantry_unlocked
-			hidden_effect = {
-				set_technology = { magical_weapons = 1 }
-			}
-		}
-		custom_effect_tooltip = LNS_magical_division_template_gained
-		division_template = {
-			name = "Naujo tipo magiškoji kariauna"
-			division_names_group = LNS_MAG_01
-			regiments = {
-				magical_infantry = { x = 0 y = 0 }
-				magical_infantry = { x = 0 y = 1 }
-				magical_infantry = { x = 0 y = 2 }
-				magical_infantry = { x = 0 y = 3 }
-				magical_infantry = { x = 1 y = 0 }
-				magical_infantry = { x = 1 y = 1 }
-				magical_infantry = { x = 1 y = 2 }
-				artillery_brigade = { x = 1 y = 3 }
-			}
-		
-			support = {
-				artillery = { x = 0 y = 0 }
-			}
-		}
-	}
-	search_filters = { FOCUS_FILTER_ARMY_BONUS }
-}
-shared_focus = {
-	id = LSC_armored_unit
-	icon = GFX_goal_generic_army_tanks
-	cost = 6
-	ai_will_do = { factor = 100 }
-
-	x = 8
-	y = 3
-	relative_position_id = LSC_IIA
-	prerequisite = { focus = LSC_offensive_tactics }
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_armored_unit"
-		custom_effect_tooltip = LNS_armored_division_template_gained
-		if = {
-			limit = {
-				NOT = {
-					has_tech = gwtank
-					has_tech = gwtank_chassis
-				}
-			}
-			if = {
-				limit = {
-					has_dlc = "No Step Back"
-				}
-				set_technology = {
-					gwtank_chassis = 1
-				}
-			}
-			else = {			
-				set_technology = {
-					gwtank = 1
-				}
-			}
-		}
-		else = {
-			add_tech_bonus = {
-				name = LSM_tank_development
-				bonus = 1
-				uses = 1
-				category = armor
-			}
-		}
-		division_template = {
-			name = "Šarvuočių rinktinė"
-			division_names_group = LSC_ARM_01
-			regiments = {
-				light_armor = { x = 0 y = 0 }
-				light_armor = { x = 0 y = 1 }
-				light_armor = { x = 0 y = 2 }
-				infantry = { x = 1 y = 0 }
-				infantry = { x = 1 y = 1 }
-			}
-			support = {
-				artillery = { x = 0 y = 0 }
-			}
-		}
-		hidden_effect = {
-			505 = {
-				create_unit = {
-					division = "division_template = \"Šarvuočių rinktinė\" start_experience_factor = 0.5 start_equipment_factor = 1"
-					owner = ROOT
-					count = 1
-				}
-			}
-		}
-	}
-	search_filters = { FOCUS_FILTER_ARMY_BONUS }
-}
-shared_focus = {
-	id = LSC_live_combat_exercises
-	icon = GFX_goal_military_academy
-	cost = 6
-	ai_will_do = { factor = 100 }
-
-	x = 6
-	y = 3
-	relative_position_id = LSC_IIA
-	prerequisite = { focus = LSC_offensive_tactics }
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_live_combat_exercises"
-		add_doctrine_cost_reduction = {
-			name = land_doc_bonus
-			cost_reduction = 0.5
-			uses = 2
-			category = land_doctrine
-		}
-	}
-	search_filters = { FOCUS_FILTER_ARMY_BONUS }
-}
-shared_focus = {
-	id = LSC_innovative_military
-	icon = GFX_goal_double_research
-	cost = 6
-	ai_will_do = { factor = 100 }
-
-	x = 7
-	y = 4
-	relative_position_id = LSC_IIA
-	prerequisite = { focus = LSC_live_combat_exercises }
-	prerequisite = { focus = LSC_armored_unit }
-	prerequisite = { focus = LSC_magical_infantry_focus }
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_innovative_military"
-		add_ideas = LNS_innovative_military
-		add_tech_bonus = {
-			name = LSC_innovative_military
-			bonus = 0.5
-			uses = 1
-			category = motorized_equipment
-		}
-		add_tech_bonus = {
-			name = LSC_innovative_military
-			bonus = 0.5
-			uses = 1
-			category = support_tech
-		}
-	}
-	search_filters = { FOCUS_FILTER_ARMY_BONUS }
-}
-shared_focus = {
-	id = LSC_fortifications
-	icon = GFX_goal_nested_fortifications
-	cost = 12
-	ai_will_do = { factor = 100 }
-
-	x = 5
-	y = 5
-	relative_position_id = LSC_IIA
-	prerequisite = { 
-		focus = LSC_innovative_military 
-		focus = LSC_ILKS
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_fortifications"
-		540 = {
-			add_building_construction = {
-				type = bunker
-				level = 2
-				province = 12893
-				instant_build = yes
-			}
-			add_building_construction = {
-				type = bunker
-				level = 2
-				province = 2055
-				instant_build = yes
-			}
-		}
-		552 = {
-			add_building_construction = {
-				type = bunker
-				level = 2
-				province = 9908
-				instant_build = yes
-			}
-			add_building_construction = {
-				type = bunker
-				level = 2
-				province = 9918
-				instant_build = yes
-			}
-			add_building_construction = {
-				type = bunker
-				level = 2
-				province = 9795
-				instant_build = yes
-			}
-			add_building_construction = {
-				type = bunker
-				level = 2
-				province = 11828
-				instant_build = yes
-			}
-			add_building_construction = {
-				type = bunker
-				level = 2
-				province = 11775
-				instant_build = yes
-			}
-			add_building_construction = {
-				type = bunker
-				level = 2
-				province = 978
-				instant_build = yes
-			}
-			add_building_construction = {
-				type = bunker
-				level = 2
-				province = 11770
-				instant_build = yes
-			}
-			add_building_construction = {
-				type = bunker
-				level = 2
-				province = 10083
-				instant_build = yes
-			}
-		}
-		505 = {
-			add_building_construction = {
-				type = bunker
-				level = 2
-				province = 7070
-				instant_build = yes
-			}
-		}
-	}
-	search_filters = { FOCUS_FILTER_INDUSTRY }
-}
-shared_focus = {
-	id = LSC_national_spirit
-	icon = GFX_goal_Dare_to_Die_Corps
-	cost = 6
-	ai_will_do = { factor = 100 }
-
-	x = 2
-	y = 5
-	relative_position_id = LSC_IIA
-	prerequisite = { 
-		focus = LSC_innovative_military 
-		focus = LSC_ILKS
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_national_spirit"
-		add_ideas = LSC_entschlossenheit
-	}
-	search_filters = { FOCUS_FILTER_ARMY_BONUS }
-}
-shared_focus = {
-	id = LSC_military_academy
-	icon = GFX_goal_military_mission_pony
-	cost = 6
-	ai_will_do = { factor = 100 }
-
-	x = 4
-	y = 3
-	relative_position_id = LSC_IIA
-	prerequisite = { 
-		focus = LSC_weapons_fund 
-		focus = LSC_bite_and_hold 
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_military_academy"
-		add_research_slot = 1
-		Improve_Science_Base = yes
-	}
-	search_filters = { FOCUS_FILTER_RESEARCH }
-}
-shared_focus = {
-	id = LSC_griffon_tech
-	icon = GFX_goal_griffon_soldier
-	cost = 6
-	ai_will_do = { factor = 100 }
-
-	x = -1
-	y = 1
-	relative_position_id = LSC_IIA
-	prerequisite = { focus = LSC_IIA }
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_griffon_tech"
-		unlock_decision_category_tooltip = LNS_griffon_tech_research
-	}
-	search_filters = { FOCUS_FILTER_RESEARCH }
-}
-shared_focus = {
-	id = LSC_national_airforce
-	icon = GFX_goal_air_armada
-	cost = 6
-	ai_will_do = { factor = 100 }
-
-	x = -3
-	y = 2
-	relative_position_id = LSC_IIA
-	prerequisite = { focus = LSC_IIA }
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_national_airforce"
-		540 = {
-			add_building_construction = {
-				type = air_base
-				level = 2
-				instant_build = yes
-			}
-		}
-		add_doctrine_cost_reduction = {
-			name = air_doc_bonus
-			cost_reduction = 0.5
-			uses = 2
-			category = air_doctrine
-		}
-	}
-	search_filters = { FOCUS_FILTER_AIRFORCE_BONUS }
-}
-shared_focus = {
-	id = LSC_duster_places
-	icon = GFX_focus_AUS_agriculture
-	cost = 6
-	ai_will_do = { factor = 100 }
-
-	x = -4
-	y = 3
-	relative_position_id = LSC_IIA
-	prerequisite = { focus = LSC_national_airforce }
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_duster_places"
-		540 = {
-			add_extra_state_shared_building_slots = 1
-		}
-		505 = {
-			add_extra_state_shared_building_slots = 1
-		}
-		552 = {
-			add_extra_state_shared_building_slots = 1
-		}
-		add_tech_bonus = {
-			name = fighter_bonus
-			bonus = 0.5
-			uses = 1
-			category = light_fighter
-		}
-	}
-	search_filters = { FOCUS_FILTER_INDUSTRY }
-}
-shared_focus = {
-	id = LSC_fighter_focus
-	icon = GFX_goal_POL_recon_aircraft
-	cost = 6
-	ai_will_do = { factor = 100 }
-
-	x = -2
-	y = 3
-	relative_position_id = LSC_IIA
-	prerequisite = { focus = LSC_national_airforce }
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_fighter_focus"
-		if = {
-			limit = {
-				has_dlc = "By Blood Alone"
-			}
-			if = {
-				limit = { NOT = { has_tech = iw_small_airframe } }
-				set_technology = { iw_small_airframe = 1 }
-			}
-			set_technology = {
-				aa_lmg = 1
-				engines_1 = 1
-			}
-			add_tech_bonus = {
-				name = fighter_bonus
-				bonus = 1.0
-				uses = 1
-				category = light_air
-			}
-			generic_early_fighter = yes
-			add_equipment_to_stockpile = {
-				type = small_plane_airframe_0
-				variant_name = "Early Fighter"
-				amount = 75
-			}
-		}
-		else = {
-			if = {
-				limit = { NOT = { has_tech = early_fighter } }
-				set_technology = { early_fighter = 1 }
-			}
-			add_tech_bonus = {
-				name = fighter_bonus
-				bonus = 1.0
-				uses = 1
-				category = light_air
-			}
-			add_equipment_to_stockpile = {
-				type = fighter_equipment_0
-				amount = 75
-			}
-		}
-	}
-	search_filters = { FOCUS_FILTER_AIRFORCE_BONUS }
-}
-shared_focus = {
-	id = LSC_defense_strategy
-	icon = GFX_focus_generic_air_defense2
-	cost = 6
-	ai_will_do = { factor = 100 }
-
-	x = -3
-	y = 4
-	relative_position_id = LSC_IIA
-	prerequisite = { focus = LSC_national_airforce }
-	mutually_exclusive = { focus = LSC_mass_air_production }
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_defense_strategy"
-		505 = {
-			add_building_construction = {
-				type = anti_air_building
-				level = 2
-				instant_build = yes
-			}
-		}
-		540 = {
-			add_building_construction = {
-				type = anti_air_building
-				level = 2
-				instant_build = yes
-			}
-		}
-		552 = {
-			add_building_construction = {
-				type = anti_air_building
-				level = 2
-				instant_build = yes
-			}
-		}
-	}
-	search_filters = { FOCUS_FILTER_INDUSTRY }
-}
-shared_focus = {
-	id = LSC_mass_air_production
-	icon = GFX_goal_bombs_away
-	cost = 6
-	ai_will_do = { factor = 100 }
-
-	x = -1
-	y = 4
-	relative_position_id = LSC_IIA
-	prerequisite = { focus = LSC_fighter_focus }
-	mutually_exclusive = { focus = LSC_defense_strategy }
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_mass_air_production"
-		add_doctrine_cost_reduction = {
-			name = air_doc_bonus
-			cost_reduction = 0.5
-			uses = 2
-			category = air_doctrine
-		}
-		add_ideas = LNS_plane_factory_idea
-	}
-	search_filters = { FOCUS_FILTER_AIRFORCE_BONUS }
-}
-
-###############################################################
-### Longsword Governorate (LSM) Political Tree ###
-###############################################################
-
-shared_focus = {
-	id = LSM_zeltstadt_meeting
-	icon = GFX_goal_COS_Peace
-	cost = 6
-	ai_will_do = { factor = 100 }
-	select_effect = {
-		country_event = longsword.136
-	}
-	x = 6
-	y = 0
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSM_zeltstadt_meeting"
-		custom_effect_tooltip = unlock_focuses
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-shared_focus = {
-	id = LSM_go_with_wavewing
-	icon = GFX_goal_griffon_knights
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSM_zeltstadt_meeting }
-	available = {
-		always = no
-	}
-	x = -4
-	y = 1
-	relative_position_id = LSM_zeltstadt_meeting
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSM_go_with_wavewing"
-		custom_effect_tooltip = unlock_focuses
-		set_variable = { LSM_wavewing_event_chain_check = 0 }
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-shared_focus = {
-	id = LSM_burn_revolutionary_books
-	icon = GFX_goal_fire
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSM_go_with_wavewing }
-	x = 2
-	y = 1
-	relative_position_id = LSM_go_with_wavewing
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSM_burn_revolutionary_books"
-		hidden_effect = {
-			LSM_wavewing_event_chain_check = yes
-		}
-		add_popularity = { ideology = communism popularity = -0.1 }
-		add_popularity = { ideology = fascism popularity = -0.1 }
-		add_popularity = { ideology = democratic popularity = -0.1 }
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-shared_focus = {
-	id = LSM_assembly_of_knights
-	icon = GFX_goal_generic_castle
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSM_go_with_wavewing }
-	x = 0
-	y = 1
-	relative_position_id = LSM_go_with_wavewing
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSM_assembly_of_knights"
-		hidden_effect = {
-			LSM_wavewing_event_chain_check = yes
-		}
-		add_political_power = 150
-		add_stability = 0.05
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-shared_focus = {
-	id = LSM_court_of_commoners
-	icon = GFX_goal_generic_elections
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSM_assembly_of_knights }
-	x = 1
-	y = 2
-	relative_position_id = LSM_go_with_wavewing
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSM_court_of_commoners"
-		hidden_effect = {
-			LSM_wavewing_event_chain_check = yes
-		}
-		add_ideas = LNS_court_of_commoners
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-shared_focus = {
-	id = LSM_virtue_policy
-	icon = GFX_goal_generic_archonism
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSM_assembly_of_knights }
-	x = 0
-	y = 3
-	relative_position_id = LSM_go_with_wavewing
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSM_virtue_policy"
-		hidden_effect = {
-			LSM_wavewing_event_chain_check = yes
-		}
-		add_ideas = LNS_virtue_policy
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-shared_focus = {
-	id = LSM_patronage_arts_sciences
-	icon = GFX_goal_continuous_research
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSM_virtue_policy }
-	x = 1
-	y = 4
-	relative_position_id = LSM_go_with_wavewing
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSM_patronage_arts_sciences"
-		hidden_effect = {
-			LSM_wavewing_event_chain_check = yes
-		}
-		add_ideas = LNS_patronage_of_arts
-		add_tech_bonus = {
-			name = LSM_patronage_arts_sciences
-			bonus = 0.5
-			uses = 1
-			category = race_tech
-		}
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-shared_focus = {
-	id = LSM_warrior_peasantry
-	icon = GFX_goal_griffon_agriculture
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSM_virtue_policy }
-	x = -1
-	y = 4
-	relative_position_id = LSM_go_with_wavewing
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSM_warrior_peasantry"
-		hidden_effect = {
-			LSM_wavewing_event_chain_check = yes
-		}
-		add_ideas = LNS_wehrbauer_system
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-shared_focus = {
-	id = LSM_smalltime_industry
-	icon = GFX_goal_industrial_pony
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSM_warrior_peasantry }
-	x = 0
-	y = 5
-	relative_position_id = LSM_go_with_wavewing
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSM_smalltime_industry"
-		hidden_effect = {
-			LSM_wavewing_event_chain_check = yes
-		}
-		one_random_industrial_complex = yes
-		one_random_industrial_complex = yes
-	}
-	search_filters = { FOCUS_FILTER_INDUSTRY }
-}
-shared_focus = {
-	id = LSM_pale_of_settlement
-	icon = GFX_goal_generic_dangerous_deal_pony_griffon
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSM_warrior_peasantry }
-	x = -2
-	y = 5
-	relative_position_id = LSM_go_with_wavewing
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSM_pale_of_settlement"
-		hidden_effect = {
-			LSM_wavewing_event_chain_check = yes
-		}
-		save_current_manpower = yes
-		552 = {
-			add_manpower = -100000
-		}
-		540 = {
-			add_manpower = -100000
-		}
-		505 = {
-			add_extra_state_shared_building_slots = 2
-			add_manpower = 200000
-		}
-	}
-	search_filters = { FOCUS_FILTER_INDUSTRY }
-}
-shared_focus = {
-	id = LSM_modernization_of_agriculture
-	icon = GFX_goal_agricultural_aid
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSM_warrior_peasantry }
-	x = -3
-	y = 6
-	relative_position_id = LSM_go_with_wavewing
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSM_modernization_of_agriculture"
-		hidden_effect = {
-			LSM_wavewing_event_chain_check = yes
-		}
-		add_tech_bonus = {
-			name = LSM_modernization_of_agriculture
-			bonus = 1
-			uses = 2
-			category = construction_tech
-			category = industry
-		}
-	}
-	search_filters = { FOCUS_FILTER_INDUSTRY }
-}
-shared_focus = {
-	id = LSM_crusades_archive
-	icon = GFX_goal_bookstack
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSM_virtue_policy }
-	x = -4
-	y = 4
-	relative_position_id = LSM_go_with_wavewing
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSM_crusades_archive"
-		hidden_effect = {
-			LSM_wavewing_event_chain_check = yes
-		}
-		unlock_decision_category_tooltip = LSM_great_archives
-		set_variable = { LSM_stories_collected = 0 }
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-shared_focus = {
-	id = LSM_zeltstadt_super_castle
-	icon = GFX_goal_generic_lau_construction
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSM_crusades_archive }
-	available = {
-		custom_trigger_tooltip = {
-			tooltip = LSM_three_stories_collected
-			check_variable = { LSM_stories_collected > 2 }
-		}
-	}
-	x = -4
-	y = 5
-	relative_position_id = LSM_go_with_wavewing
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSM_zeltstadt_super_castle"
-		hidden_effect = {
-			LSM_wavewing_event_chain_check = yes
-		}
-		505 = {
-			add_building_construction = {
-				type = bunker
-				level = 3
-				province = 9773
-				instant_build = yes
-			}
-			add_state_modifier = {
-				modifier = {
-					local_manpower = 0.15
-				}
-			}
-		}
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-shared_focus = {
-	id = LSM_reenactments
-	icon = GFX_goal_griffon_special_force
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSM_crusades_archive }
-	available = {
-		custom_trigger_tooltip = {
-			tooltip = LSM_three_stories_collected
-			check_variable = { LSM_stories_collected > 2 }
-		}
-	}
-	x = -6
-	y = 5
-	relative_position_id = LSM_go_with_wavewing
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: LSM_reenactments"
-		hidden_effect = {
-			LSM_wavewing_event_chain_check = yes
-		}
-		add_manpower = 5000
-		add_ideas = LNS_battle_reenactments
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-shared_focus = {
-	id = LSM_landtag
-	icon = GFX_focus_generic_monarchy_2
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { 
-		focus = LSM_zeltstadt_super_castle 
-		focus = LSM_modernization_of_agriculture
-	}
-	x = -4
-	y = 7
-	relative_position_id = LSM_go_with_wavewing
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: LSM_landtag"
-		hidden_effect = {
-			LSM_wavewing_event_chain_check = yes
-		}
-		swap_ideas = {
-			remove_idea = LNS_virtue_policy
-			add_idea = LNS_virtue_policy_2
-		}
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-shared_focus = {
-	id = LSM_devolution
-	icon = GFX_focus_generic_authoritarian_government
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSM_go_with_wavewing }
-	x = -2
-	y = 1
-	relative_position_id = LSM_go_with_wavewing
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSM_devolution"
-		hidden_effect = {
-			LSM_wavewing_event_chain_check = yes
-		}
-		add_ideas = LNS_devolution_1
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-shared_focus = {
-	id = LSM_rural_communes
-	icon = GFX_goal_communist_potatoes
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSM_devolution }
-	x = -3
-	y = 2
-	relative_position_id = LSM_go_with_wavewing
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSM_rural_communes"
-		hidden_effect = {
-			LSM_wavewing_event_chain_check = yes
-		}
-		552 = {
-			add_extra_state_shared_building_slots = 1
-		}
-		540 = {
-			add_extra_state_shared_building_slots = 1
-		}
-		505 = {
-			add_extra_state_shared_building_slots = 1
-		}
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-shared_focus = {
-	id = LSM_komtur_system
-	icon = GFX_focus_ger_return_of_the_kaiser
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSM_devolution }
-	x = -1
-	y = 2
-	relative_position_id = LSM_go_with_wavewing
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSM_komtur_system"
-		hidden_effect = {
-			LSM_wavewing_event_chain_check = yes
-		}
-		swap_ideas = {
-			remove_idea = LNS_devolution_1
-			add_idea = LNS_devolution_2
-		}
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-shared_focus = {
-	id = LSM_decentralize_education_system
-	icon = GFX_goal_griffon_books
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSM_komtur_system }
-	prerequisite = { focus = LSM_rural_communes }
-	x = -2
-	y = 3
-	relative_position_id = LSM_go_with_wavewing
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSM_decentralize_education_system"
-		hidden_effect = {
-			LSM_wavewing_event_chain_check = yes
-		}
-		swap_ideas = {
-			remove_idea = LNS_devolution_2
-			add_idea = LNS_devolution_3
-		}
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-shared_focus = {
-	id = LSM_go_with_silvertalon
-	icon = GFX_goal_griffon_soldier
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSM_zeltstadt_meeting }
-	available = {
-		always = no
-	}
-	x = 5
-	y = 1
-	relative_position_id = LSM_zeltstadt_meeting
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSM_go_with_silvertalon"
-		custom_effect_tooltip = unlock_focuses
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-shared_focus = {
-	id = LSM_provisional_government
-	icon = GFX_goal_government_icon
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSM_go_with_silvertalon }
-	x = 6
-	y = 2
-	relative_position_id = LSM_zeltstadt_meeting
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSM_provisional_government"
-		add_stability = 0.1
-		add_political_power = 100
-		effect_tooltip = {
-			add_ideas = LSM_PA_SilWork
-		}
-		hidden_effect = {
-			country_event = longsword.141
-		}
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-shared_focus = {
-	id = LSM_new_state_organization
-	icon = GFX_goal_news
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSM_provisional_government }
-	available = {
-		owns_state = 552
-		owns_state = 540
-		owns_state = 505
-	}
-	x = 6
-	y = 4
-	relative_position_id = LSM_zeltstadt_meeting
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSM_new_state_organization"
-		552 = {
-			add_extra_state_shared_building_slots = 1
-			add_manpower = 25000
-		}
-		540 = {
-			add_extra_state_shared_building_slots = 1
-			add_manpower = 25000
-		}
-		505 = {
-			add_extra_state_shared_building_slots = 1
-			add_manpower = 25000
-		}
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-shared_focus = {
-	id = LSM_soldier_worship
-	icon = GFX_goal_chn_axis_build_infantry_grey
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSM_go_with_silvertalon }
-	x = 4
-	y = 2
-	relative_position_id = LSM_zeltstadt_meeting
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSM_soldier_worship"
-		add_ideas = LNS_soldier_worship_idea_1
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-shared_focus = {
-	id = LSM_young_griffs
-	icon = GFX_goal_griffon_harmony_char
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSM_soldier_worship }
-	x = 3
-	y = 3
-	relative_position_id = LSM_zeltstadt_meeting
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSM_young_griffs"
-		swap_ideas = {
-			remove_idea = LNS_soldier_worship_idea_1
-			add_idea = LNS_soldier_worship_idea_2
-		}
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-shared_focus = {
-	id = LSM_military_pensions
-	icon = GFX_DAH_Topke
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSM_soldier_worship }
-	x = 4
-	y = 4
-	relative_position_id = LSM_zeltstadt_meeting
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSM_military_pensions"
-		add_ideas = LNS_military_pensions
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-shared_focus = {
-	id = LSM_military_police_f
-	icon = GFX_goal_secret_agents
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSM_soldier_worship }
-	x = 5
-	y = 3
-	relative_position_id = LSM_zeltstadt_meeting
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSM_military_police_f"
-		add_ideas = LNS_military_police_idea
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-shared_focus = {
-	id = LSM_pony_suffrage
-	icon = GFX_goal_unicorn_soldier
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSM_new_state_organization }
-	x = 3
-	y = 5
-	relative_position_id = LSM_zeltstadt_meeting
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSM_pony_suffrage"
-		custom_effect_tooltip = available_political_advisor
-		show_ideas_tooltip = LSM_pony_1
-		show_ideas_tooltip = LSM_pony_2
-		show_ideas_tooltip = LSM_pony_3
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-shared_focus = {
-	id = LSM_import_legal_advisors
-	icon = GFX_goal_bag_of_money_pony_griffon
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSM_new_state_organization }
-	x = 5
-	y = 5
-	relative_position_id = LSM_zeltstadt_meeting
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSM_import_legal_advisors"
-		add_political_power = 150
-		hidden_effect = {
-			country_event = longsword.142
-		}
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-shared_focus = {
-	id = LSM_bill_of_rights
-	icon = GFX_focus_indy_pacifist_state
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSM_new_state_organization }
-	x = 7
-	y = 5
-	relative_position_id = LSM_zeltstadt_meeting
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSM_import_legal_advisors"
-		add_ideas = LNS_civil_rights_idea
-		hidden_effect = {
-			country_event = longsword.143
-		}
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-shared_focus = {
-	id = LSM_fight_corruption
-	icon = GFX_focus_indy_unequal_treaties
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSM_bill_of_rights }
-	prerequisite = { focus = LSM_import_legal_advisors }
-	prerequisite = { focus = LSM_pony_suffrage }
-	mutually_exclusive = { focus = LSM_fight_extremism }
-	x = 4
-	y = 6
-	relative_position_id = LSM_zeltstadt_meeting
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSM_fight_corruption"
-		country_event = longsword.144
-		effect_tooltip = {
-			add_timed_idea = { idea = LNS_fighting_corruption days = 180 }
-		}
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-shared_focus = {
-	id = LSM_fight_extremism
-	icon = GFX_HOL_crackdown_natpop
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSM_bill_of_rights }
-	prerequisite = { focus = LSM_import_legal_advisors }
-	prerequisite = { focus = LSM_pony_suffrage }
-	mutually_exclusive = { focus = LSM_fight_corruption }
-	x = 6
-	y = 6
-	relative_position_id = LSM_zeltstadt_meeting
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: LSM_fight_extremism"
-		country_event = longsword.145
-		effect_tooltip = {
-			add_timed_idea = { idea = LNS_fighting_extremists days = 180 }
-		}
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-shared_focus = {
-	id = LSM_engelberg_government
-	icon = GFX_goal_generic_harmony
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSM_fight_extremism focus = LSM_fight_corruption }
-	select_effect = {
-		hidden_effect = {
-			country_event = { days = 7 id = longsword.146 }
-		}
-	}
-	x = 5
-	y = 7
-	relative_position_id = LSM_zeltstadt_meeting
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: LSM_engelberg_government"
-		custom_effect_tooltip = LSM_impending_democracy_failure_tooltip
-		# ...
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-shared_focus = {
-	id = LSM_national_healing
-	icon = GFX_goal_ideology_authoritarian_democrat
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSM_engelberg_government }
-	allow_branch = {
-		has_completed_focus = LSM_engelberg_government
-	}
-	x = 0
-	y = 1
-	relative_position_id = LSM_engelberg_government
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: LSM_national_healing"
-		add_ideas = LNS_national_healing_1
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-shared_focus = {
-	id = LSM_balanced_personhood
-	icon = GFX_goal_griffon_chair
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSM_national_healing }
-	x = -1
-	y = 2
-	relative_position_id = LSM_engelberg_government
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: LSM_balanced_personhood"
-		add_ideas = LNS_balanced_personhood_1
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-shared_focus = {
-	id = LSM_military_governments
-	icon = GFX_goal_HOL_ban_paramilitary
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSM_balanced_personhood }
-	x = -4
-	y = 3
-	relative_position_id = LSM_engelberg_government
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: LSM_military_governments"
-		add_manpower = 15000
-		add_political_power = 100
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-shared_focus = {
-	id = LSM_authority_structure
-	icon = GFX_focus_generic_authoritarian_government
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSM_balanced_personhood }
-	x = -2
-	y = 3
-	relative_position_id = LSM_engelberg_government
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: LSM_authority_structure"
-		swap_ideas = {
-			remove_idea = LNS_balanced_personhood_1
-			add_idea = LNS_balanced_personhood_2
-		}
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-shared_focus = {
-	id = LSM_moral_education
-	icon = GFX_goal_griffon_parchment
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSM_balanced_personhood }
-	x = 0
-	y = 3
-	relative_position_id = LSM_engelberg_government
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: LSM_moral_education"
-		add_ideas = LNS_new_culture_1
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-shared_focus = {
-	id = LSM_advisory_councils
-	icon = GFX_goal_generic_trial
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSM_authority_structure }
-	prerequisite = { focus = LSM_military_governments }
-	x = -3
-	y = 4
-	relative_position_id = LSM_engelberg_government
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: LSM_advisory_councils"
-		one_random_industrial_complex = yes
-		one_random_industrial_complex = yes
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-shared_focus = {
-	id = LSM_foster_new_culture
-	icon = GFX_goal_KTG_Bookstack
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSM_moral_education }
-	x = -1
-	y = 4
-	relative_position_id = LSM_engelberg_government
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: LSM_foster_new_culture"
-		swap_ideas = {
-			remove_idea = LNS_new_culture_1
-			add_idea = LNS_new_culture_2
-		}
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-shared_focus = {
-	id = LSM_ideological_study_circles
-	icon = GFX_goal_griffon_books
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSM_foster_new_culture }
-	x = 0
-	y = 5
-	relative_position_id = LSM_engelberg_government
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: LSM_ideological_study_circles"
-		swap_ideas = {
-			remove_idea = LNS_new_culture_2
-			add_idea = LNS_new_culture_3
-		}
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-shared_focus = {
-	id = LSM_form_the_castle
-	icon = GFX_goal_generic_castle
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSM_foster_new_culture }
-	prerequisite = { focus = LSM_advisory_councils }
-	x = -2
-	y = 5
-	relative_position_id = LSM_engelberg_government
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: LSM_form_the_castle"
-		swap_ideas = {
-			remove_idea = LNS_balanced_personhood_2
-			add_idea = LNS_balanced_personhood_3
-		}
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-shared_focus = {
-	id = LSM_no_mercy
-	icon = GFX_goal_purge_opposition
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSM_national_healing }
-	x = 1
-	y = 2
-	relative_position_id = LSM_engelberg_government
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: LSM_no_mercy"
-		add_stability = 0.1
-		save_current_manpower = yes
-		every_state = {
-			add_manpower = -5000
-		}
-		restore_previous_manpower = yes
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-shared_focus = {
-	id = LSM_political_prison_system
-	icon = GFX_goal_HOL_amend_wapenwet
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSM_no_mercy }
-	x = 1
-	y = 4
-	relative_position_id = LSM_engelberg_government
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: LSM_political_prison_system"
-		add_manpower = -1000
-		one_random_industrial_complex = yes
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-shared_focus = {
-	id = LSM_crack_down_on_reformisten
-	icon = GFX_focus_generic_ban_right_wing
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSM_no_mercy }
-	x = 2
-	y = 3
-	relative_position_id = LSM_engelberg_government
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: LSM_crack_down_on_reformisten"
-		if = {
-			limit = {
-				NOT = {
-					has_idea = LNS_bandit_fighting_01
-				}
-			}
-			add_ideas = LNS_bandit_fighting_00
-		}
-		else = {
-			swap_ideas = {
-				remove_idea = LNS_bandit_fighting_01
-				add_idea = LNS_bandit_fighting_1
-			}
-		}
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-shared_focus = {
-	id = LSM_crack_down_on_partisans
-	icon = GFX_goal_generic_war_with_comintern
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSM_no_mercy }
-	x = 4
-	y = 3
-	relative_position_id = LSM_engelberg_government
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: LSM_crack_down_on_partisans"
-		if = {
-			limit = {
-				NOT = {
-					has_idea = LNS_bandit_fighting_00
-				}
-			}
-			add_ideas = LNS_bandit_fighting_01
-		}
-		else = {
-			swap_ideas = {
-				remove_idea = LNS_bandit_fighting_00
-				add_idea = LNS_bandit_fighting_1
-			}
-		}
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-shared_focus = {
-	id = LSM_burn_forests
-	icon = GFX_goal_fire
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSM_crack_down_on_partisans }
-	prerequisite = { focus = LSM_crack_down_on_reformisten }
-	x = 3
-	y = 4
-	relative_position_id = LSM_engelberg_government
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: LSM_burn_forests"
-		swap_ideas = {
-			remove_idea = LNS_bandit_fighting_1
-			add_idea = LNS_bandit_fighting_2
-		}
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-shared_focus = {
-	id = LSM_secret_police
-	icon = GFX_goal_secret_agents
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSM_political_prison_system }
-	prerequisite = { focus = LSM_burn_forests }
-	x = 2
-	y = 5
-	relative_position_id = LSM_engelberg_government
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: LSM_secret_police"
-		if = {
-			limit = { 
-				has_dlc = "La Resistance"
-				has_intelligence_agency = yes				
-			}
-			if = {
-				limit = { NOT = { has_done_agency_upgrade = upgrade_commando_training } }
-				upgrade_intelligence_agency = upgrade_commando_training
-			}
-			if = {
-				limit = { NOT = { has_done_agency_upgrade = upgrade_crypto_strength } }
-				upgrade_intelligence_agency = upgrade_crypto_strength
-			}
-			if = {
-				limit = { NOT = { has_done_agency_upgrade = upgrade_decryption_boost } }
-				upgrade_intelligence_agency = upgrade_decryption_boost
-			}
-		}
-		else_if = {
-			limit = { 
-				has_dlc = "La Resistance"
-				has_intelligence_agency = no 
-			}
-			create_intelligence_agency = yes
-		}
-		else_if = {
-			limit = {
-				NOT = {
-					has_dlc = "La Resistance"
-				}
-			}
-			add_stability = 0.1
-		}
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-shared_focus = {
-	id = LSM_contitution_novelization
-	icon = GFX_goal_magic_of_friendship_end
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSM_secret_police }
-	prerequisite = { focus = LSM_form_the_castle }
-	x = 0
-	y = 6
-	relative_position_id = LSM_engelberg_government
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: LSM_contitution_novelization"
-		swap_ideas = {
-			remove_idea = LNS_national_healing_1
-			add_idea = LNS_national_healing_2
-		}
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-shared_focus = {
-	id = LSM_rekonstruktion
-	icon = GFX_goal_continuous_repairments
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSM_zeltstadt_meeting }
-	x = 0
-	y = 2
-	relative_position_id = LSM_zeltstadt_meeting
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSM_rekonstruktion"
-		LNS_reduce_civil_war_recovery = yes
-		increase_society_development_with_tt = yes
-	}
-	search_filters = { FOCUS_FILTER_INDUSTRY }
-}
-shared_focus = {
-	id = LSM_industrierat
-	icon = GFX_goal_generic_construct_public_housing
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSM_rekonstruktion }
-	x = -1
-	y = 3
-	relative_position_id = LSM_zeltstadt_meeting
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSM_industrierat"
-		LNS_reduce_civil_war_recovery = yes
-		add_ideas = LNS_industrial_education_idea_1
-	}
-	search_filters = { FOCUS_FILTER_INDUSTRY }
-}
-shared_focus = {
-	id = LSM_arms_industries
-	icon = GFX_goal_generic_construct_mil_factory
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSM_industrierat }
-	x = -2
-	y = 4
-	relative_position_id = LSM_zeltstadt_meeting
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSM_arms_industries"
-		LNS_reduce_civil_war_recovery = yes
-		two_random_arms_factory = yes
-		add_tech_bonus = {
-			name = LSM_arms_industries
-			bonus = 1
-			uses = 2
-			category = infantry_weapons
-		}
-	}
-	search_filters = { FOCUS_FILTER_INDUSTRY }
-}
-shared_focus = {
-	id = LSM_cartelization
-	icon = GFX_goal_arms_dealing
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSM_industrierat }
-	x = -1
-	y = 5
-	relative_position_id = LSM_zeltstadt_meeting
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSM_cartelization"
-		LNS_reduce_civil_war_recovery = yes
-		swap_ideas = {
-			remove_idea = LNS_industrial_education_idea_1
-			add_idea = LNS_industrial_education_idea_2
-		}
-	}
-	search_filters = { FOCUS_FILTER_INDUSTRY }
-}
-shared_focus = {
-	id = LSM_rural_education
-	icon = GFX_goal_education
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSM_industrierat }
-	x = 0
-	y = 4
-	relative_position_id = LSM_zeltstadt_meeting
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSM_rural_education"
-		custom_effect_tooltip = LNS_education_tp
-		hidden_effect = {
-			country_event = { days = 180 id = longsword.58 }
-		}
-	}
-	search_filters = { FOCUS_FILTER_INDUSTRY }
-}
-shared_focus = {
-	id = LSM_fight_poverty
-	icon = GFX_goal_griffon_rusty_coin
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSM_rekonstruktion }
-	x = 1
-	y = 3
-	relative_position_id = LSM_zeltstadt_meeting
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSM_rural_education"
-		LNS_reduce_civil_war_recovery = yes
-		custom_effect_tooltip = LNS_poverty_tp
-		hidden_effect = {
-			country_event = { days = 160 id = longsword.60 }
-		}
-	}
-	search_filters = { FOCUS_FILTER_INDUSTRY }
-}
-shared_focus = {
-	id = LSM_railroad_construction
-	icon = GFX_goal_generic_railway_construction
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSM_fight_poverty }
-	x = 2
-	y = 4
-	relative_position_id = LSM_zeltstadt_meeting
-	available = {
-		552 = { is_owned_and_controlled_by = ROOT }
-		540 = { is_owned_and_controlled_by = ROOT }
-		505 = { is_owned_and_controlled_by = ROOT }
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSM_rural_education"
-		LNS_reduce_civil_war_recovery = yes
-		build_railway = {
-			level = 2
-			start_state = 552
-			target_state = 540
-			build_only_on_allied = yes
-		}
-		build_railway = {
-			level = 2
-			start_state = 552
-			target_state = 505
-			build_only_on_allied = yes
-		}
-	}
-	search_filters = { FOCUS_FILTER_INDUSTRY }
-}
-shared_focus = {
-	id = LSM_knighthood_industry
-	icon = GFX_goal_gold_reserve
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSM_fight_poverty }
-	x = 1
-	y = 5
-	relative_position_id = LSM_zeltstadt_meeting
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSM_knighthood_industry"
-		LNS_reduce_civil_war_recovery = yes
-		one_random_industrial_complex = yes
-	}
-	search_filters = { FOCUS_FILTER_INDUSTRY }
-}
-shared_focus = {
-	id = LSM_urbanization
-	icon = GFX_goal_ITA_urban
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSM_knighthood_industry }
-	x = 2
-	y = 6
-	relative_position_id = LSM_zeltstadt_meeting
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSM_urbanization"
-		LNS_reduce_civil_war_recovery = yes
-		552 = {
-			if = {
-				limit = { has_state_category = rural }
-				set_state_category = town
-			}
-			else_if = {
-				limit = { has_state_category = town }
-				set_state_category = large_town
-			}
-			else_if = {
-				limit = { has_state_category = large_town }
-				set_state_category = city
-			}
-			else_if = {
-				limit = { has_state_category = city }
-				set_state_category = large_city
-			}
-			else = {
-				set_state_category = metropolis
-			}
-			add_building_construction = {
-				type = industrial_complex
-				level = 1
-				instant_build = yes
-			}
-		}
-	}
-	search_filters = { FOCUS_FILTER_INDUSTRY }
-}
-shared_focus = {
-	id = LSM_research_base
-	icon = GFX_goal_double_research
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSM_knighthood_industry }
-	x = 0
-	y = 6
-	relative_position_id = LSM_zeltstadt_meeting
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSM_research_base"
-		add_research_slot = 1
-		Improve_Science_Base = yes
-	}
-	search_filters = { FOCUS_FILTER_INDUSTRY }
-}
-shared_focus = {
-	id = LSM_production_standards
-	icon = GFX_focus_indy_industrial_tanks
-	cost = 6
-	ai_will_do = { factor = 100 }
-	prerequisite = { focus = LSM_knighthood_industry }
-	x = -2
-	y = 6
-	relative_position_id = LSM_zeltstadt_meeting
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSM_production_standards"
-		LNS_reduce_civil_war_recovery = yes
-		add_ideas = LNS_state_services_idea
-		add_tech_bonus = {
-			name = LSM_production_standards
-			bonus = 1
-			uses = 2
-			category = industry
-		}
-		increase_society_development_with_tt = yes
-	}
-	search_filters = { FOCUS_FILTER_INDUSTRY }
-}
-
-###############################################################
-### Longsword Governorate (LSM) Foreign Tree ###
-###############################################################
-
-shared_focus = {
-	id = LSM_hellquill
-	icon = GFX_goal_Free_the_Ponies_of_Hellquill_1
-	x = 0
-	y = 7
-	relative_position_id = LSM_zeltstadt_meeting
-	cost = 4
-	available = { 
-		has_completed_focus = LSM_zeltstadt_meeting
-		custom_trigger_tooltip = {
-			tooltip = LSM_has_finished_reconstruction
-			NOT = {
-				OR = {
-					has_idea = LNS_civil_war_recovery_1
-					has_idea = LNS_civil_war_recovery_2
-					has_idea = LNS_civil_war_recovery_3
-					has_idea = LNS_civil_war_recovery_4
-					has_idea = LNS_civil_war_recovery_5
-					has_idea = LNS_civil_war_recovery_6
-					has_idea = LNS_civil_war_recovery_7
-					has_idea = LNS_civil_war_recovery_8
-					has_idea = LNS_civil_war_recovery_9
-				}
-			}
-		}
-	}
-	bypass = {
-		OR = { HLQ = { exists = no } HLQ = { is_subject_of = ROOT } }
-	}
-
-	ai_will_do = {
-		factor = 100
-		modifier = {
-			factor = 0
-			num_divisions < 12
-		}
-	}
-	will_lead_to_war_with = HLQ
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSM_hellquill"
-		if = {
-			limit = {
-				HLQ = {
-					OR = {
-						has_government = neutrality
-						has_government = democratic
-					}
-				}
-			}
-			country_event = { days = 7 id = longsword.35 }
-		}
-		else_if = {
-			limit = {
-				HLQ = {
-					OR = {
-						has_government = fascism
-						has_government = communism
-					}
-				}
-			}
-			every_state = {
-				limit = { is_core_of = HLQ }
-				add_claim_by = ROOT
-			}
-			create_wargoal = {
-				type = annex_everything
-				target = HLQ
-			}
-		}
-	}
-	search_filters = { FOCUS_FILTER_ANNEXATION }
-}
-shared_focus = {
-	id = LSM_integrate_hellquill
-	icon = GFX_goal_generic_intelligence_exchange_pony_griffon
-	cost = 6
-	ai_will_do = { factor = 100 }
-
-	x = 1
-	y = 1
-	relative_position_id = LSM_hellquill
-	prerequisite = { focus = LSM_hellquill }
-	available = {
-		HLQ = { exists = no }
-		OR = {
-			owns_state = 537
-			owns_state = 553
-			owns_state = 633
-			owns_state = 634
-		}
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSM_integrate_hellquill"
-		HLQ = { add_to_ROOT_potential_cores = yes }
-	}
-	search_filters = { FOCUS_FILTER_ANNEXATION }
-}
-shared_focus = {
-	id = LSM_ostgriffonian_state
-	icon = GFX_goal_griffon_shield
-	cost = 6
-	ai_will_do = { factor = 100 }
-
-	x = 2
-	y = 2
-	relative_position_id = LSM_hellquill
-	prerequisite = { focus = LSM_integrate_hellquill }
-	available = {
-		HLQ = { exists = no }
-		OR = {
-			owns_state = 537
-			owns_state = 553
-			owns_state = 633
-			owns_state = 634
-		}
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSM_ostgriffonian_state"
-		set_cosmetic_tag = LSM_ostgriffonia
-		add_ideas = LNS_defend_ost_griffonia
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-shared_focus = {
-	id = LSM_hellquill_reconstruction
-	icon = GFX_goal_generic_lau_construction
-	cost = 6
-	ai_will_do = { factor = 100 }
-
-	x = -1
-	y = 1
-	relative_position_id = LSM_hellquill
-	prerequisite = { focus = LSM_hellquill }
-	available = {
-		OR = {
-			owns_state = 537
-			owns_state = 553
-			owns_state = 633
-			owns_state = 634
-		}
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSM_hellquill_reconstruction"
-		unlock_decision_category_tooltip = LSC_Hellquill_reconstruction_decisions
-	}
-	search_filters = { FOCUS_FILTER_INDUSTRY }
-}
-shared_focus = {
-	id = LSM_return_to_griffonia
-	icon = GFX_goal_gri
-	cost = 6
-	ai_will_do = { factor = 100 }
-
-	x = 0
-	y = 2
-	relative_position_id = LSM_hellquill
-	prerequisite = { focus = LSM_hellquill }
-	available = {
-		HLQ = { exists = no }
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSC_seek_allies"
-		GRD = { add_opinion_modifier = { target = LSM modifier = friendly_government } }
-		unlock_decision_tooltip = LSM_join_the_empire
-	}
-	search_filters = { FOCUS_FILTER_POLITICAL }
-}
-
-###############################################################
-### Longsword Governorate (LSM) Military Tree ###
-###############################################################
-
-shared_focus = {
-	id = LSM_national_army
-	icon = GFX_goal_generic_drafted_army
-	cost = 6
-	ai_will_do = { factor = 100 }
-	available = { 
-		has_completed_focus = LSM_go_with_silvertalon
-	}
-	mutually_exclusive = { focus = LSM_rosewood_order }
-
-	x = 19
-	y = 0
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSM_national_army"
-		army_experience = 25
-		add_ideas = LNS_mixed_army_idea
-	}
-	search_filters = { FOCUS_FILTER_ARMY_BONUS }
-}
-shared_focus = {
-	id = LSM_rosewood_order
-	icon = GFX_goal_crown_and_swords
-	cost = 6
-	ai_will_do = { factor = 100 }
-	available = { 
-		has_completed_focus = LSM_go_with_wavewing
-	}
-	mutually_exclusive = { focus = LSM_national_army }
-
-	x = 17
-	y = 0
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSM_national_army"
-		army_experience = 25
-		add_ideas = LNS_pure_army_idea
-		custom_effect_tooltip = LNS_knight_division_gained
-		hidden_effect = {
-			if = {
-				limit = { NOT = { has_tech = tech_knights } }
-				set_technology = { tech_knights = 1 }
-			}
-			fix_weapon_techs = yes
-		}
-		division_template = {
-			name = "Orden der Palisander"
-			regiments = {
-				knights = { x = 0 y = 0 }
-				knights = { x = 1 y = 0 }
-				knights = { x = 0 y = 1 }
-				knights = { x = 1 y = 1 }
-				knights = { x = 0 y = 2 }
-				knights = { x = 1 y = 2 }
-			}
-			support = {
-				recon = { x = 0 y = 0 }
-			}
-			priority = 2
-		}
-		505 = {
-			create_unit = {
-				division = "name = \"Knights of the Order of Rosewood\" division_template = \"Orden der Palisander\" start_experience_factor = 0.5 start_equipment_factor = 1"
-				owner = ROOT
-				count = 1
-			}
-		}
-	}
-	search_filters = { FOCUS_FILTER_ARMY_BONUS }
-}
-shared_focus = {
-	id = LSM_national_airforce
-	icon = GFX_goal_air_armada
-	cost = 6
-	ai_will_do = { factor = 100 }
-
-	x = -1
-	y = 1
-	relative_position_id = LSM_national_army
-	prerequisite = { 
-		focus = LSM_national_army 
-		focus = LSM_rosewood_order
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSM_national_airforce"
-		540 = {
-			add_building_construction = {
-				type = air_base
-				level = 2
-				instant_build = yes
-			}
-		}
-		add_doctrine_cost_reduction = {
-			name = air_doc_bonus
-			cost_reduction = 0.5
-			uses = 2
-			category = air_doctrine
-		}
-	}
-	search_filters = { FOCUS_FILTER_AIRFORCE_BONUS }
-}
-shared_focus = {
-	id = LSM_battlefield_support
-	icon = GFX_goal_generic_air_fighter2
-	cost = 6
-	ai_will_do = { factor = 100 }
-
-	x = -1
-	y = 2
-	relative_position_id = LSM_national_army
-	prerequisite = { 
-		focus = LSM_national_airforce
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSM_battlefield_support"
-		if = {
-            limit = {
-                has_dlc = "By Blood Alone"
-            }
-			add_tech_bonus = {
-				name = rocketry
-				bonus = 1.0
-				uses = 1
-				category = rocketry
-			}
-			add_tech_bonus = {
-				name = cat_anti_tank
-				bonus = 1.0
-				uses = 1
-				category = cat_anti_tank
-			}
-		}
-		else = {
-			add_tech_bonus = {
-				name = LSM_battlefield_support
-				bonus = 1.0
-				uses = 2
-				category = cas_bomber
-			}
-		}
-	}
-	search_filters = { FOCUS_FILTER_AIRFORCE_BONUS }
-}
-shared_focus = {
-	id = LSM_air_defense
-	icon = GFX_goal_anti_air
-	cost = 6
-	ai_will_do = { factor = 100 }
-
-	x = -2
-	y = 3
-	relative_position_id = LSM_national_army
-	prerequisite = { 
-		focus = LSM_national_airforce
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSM_air_defense"
-		505 = {
-			add_building_construction = {
-				type = anti_air_building
-				level = 2
-				instant_build = yes
-			}
-		}
-		540 = {
-			add_building_construction = {
-				type = anti_air_building
-				level = 2
-				instant_build = yes
-			}
-		}
-		552 = {
-			add_building_construction = {
-				type = anti_air_building
-				level = 2
-				instant_build = yes
-			}
-		}
-	}
-	search_filters = { FOCUS_FILTER_AIRFORCE_BONUS }
-}
-shared_focus = {
-	id = LSM_air_industries
-	icon = GFX_goal_industry_air
-	cost = 6
-	ai_will_do = { factor = 100 }
-
-	x = 1
-	y = 2
-	relative_position_id = LSM_national_army
-	prerequisite = { 
-		focus = LSM_national_airforce
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSM_air_industries"
-		one_random_arms_factory = yes
-		
-		if = {
-			limit = {
-				has_dlc = "By Blood Alone"
-			}
-			add_tech_bonus = {
-				name = fighter_bonus
-				bonus = 1.0
-				uses = 1
-				category = light_air
-			}
-			generic_early_fighter = yes
-			add_equipment_to_stockpile = {
-				type = small_plane_airframe_0
-				variant_name = "Early Fighter"
-				amount = 100
-			}
-		}
-		else = {
-			add_equipment_to_stockpile = {
-				type = fighter_equipment_0
-				amount = 100
-			}
-		}
-	}
-	search_filters = { FOCUS_FILTER_AIRFORCE_BONUS }
-}
-shared_focus = {
-	id = LSM_weapons_modernization
-	icon = GFX_goal_generic_military_equipment
-	cost = 6
-	ai_will_do = { factor = 100 }
-
-	x = 1
-	y = 1
-	relative_position_id = LSM_national_army
-	prerequisite = { 
-		focus = LSM_national_army 
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSM_weapons_modernization"
-		add_tech_bonus = {
-			name = LSM_weapons_modernization
-			bonus = 1
-			uses = 1
-			category = infantry_weapons
-		}
-		add_equipment_to_stockpile = {
-			type = infantry_equipment_0
-			amount = 1500
-			producer = LSM
-		}
-	}
-	search_filters = { FOCUS_FILTER_ARMY_BONUS }
-}
-shared_focus = {
-	id = LSM_mission_tactics
-	icon = GFX_goal_griffon_special_force
-	cost = 6
-	ai_will_do = { factor = 100 }
-
-	x = 3
-	y = 1
-	relative_position_id = LSM_national_army
-	prerequisite = { 
-		focus = LSM_national_army 
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSM_mission_tactics"
-		add_doctrine_cost_reduction = {
-			name = land_doc_bonus
-			cost_reduction = 0.35
-			uses = 2
-			category = land_doctrine
-		}
-	}
-	search_filters = { FOCUS_FILTER_ARMY_BONUS }
-}
-shared_focus = {
-	id = LSM_arms_concentration_doctrine
-	icon = GFX_focus_generic_license_production
-	cost = 6
-	ai_will_do = { factor = 100 }
-
-	x = 3
-	y = 2
-	relative_position_id = LSM_national_army
-	prerequisite = { 
-		focus = LSM_mission_tactics
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSM_arms_concentration_doctrine"
-		add_doctrine_cost_reduction = {
-			name = land_doc_bonus
-			cost_reduction = 0.5
-			uses = 1
-			category = land_doctrine
-		}
-		swap_ideas = {
-			remove_idea = LNS_mixed_army_idea
-			add_idea = LNS_landeswehr_1
-		}
-	}
-	search_filters = { FOCUS_FILTER_ARMY_BONUS }
-}
-shared_focus = {
-	id = LSM_magical_brigades
-	icon = GFX_goal_eqs_magic_horn
-	cost = 6
-	ai_will_do = { factor = 100 }
-
-	x = 4
-	y = 3
-	relative_position_id = LSM_national_army
-	prerequisite = { 
-		focus = LSM_arms_concentration_doctrine
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSM_magical_brigades"
-		add_tech_bonus = {
-			name = LSM_magical_brigades
-			bonus = 1.5
-			uses = 1
-			category = magical_tech
-		}
-		add_ideas = LNS_healing_spells_idea
-	}
-	search_filters = { FOCUS_FILTER_ARMY_BONUS }
-}
-shared_focus = {
-	id = LSM_artillery_modernization
-	icon = GFX_goal_artillery
-	cost = 6
-	ai_will_do = { factor = 100 }
-
-	x = 2
-	y = 3
-	relative_position_id = LSM_national_army
-	prerequisite = { 
-		focus = LSM_arms_concentration_doctrine
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSM_artillery_modernization"
-		add_equipment_to_stockpile = { type = artillery_equipment_1 amount = 750 producer = GRI }
-		add_tech_bonus = {
-			name = LSM_artillery_modernization
-			bonus = 1
-			uses = 2
-			category = artillery
-		}
-	}
-	search_filters = { FOCUS_FILTER_ARMY_BONUS }
-}
-shared_focus = {
-	id = LSM_tank_development
-	icon = GFX_goal_doctrine_tank_warfare
-	cost = 6
-	ai_will_do = { factor = 100 }
-
-	x = 0
-	y = 3
-	relative_position_id = LSM_national_army
-	prerequisite = { 
-		focus = LSM_arms_concentration_doctrine
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSM_tank_development"
-		custom_effect_tooltip = LNS_armored_division_template_gained
-		if = {
-			limit = {
-				NOT = {
-					has_tech = gwtank
-					has_tech = gwtank_chassis
-				}
-			}
-			if = {
-				limit = {
-					has_dlc = "No Step Back"
-				}
-				set_technology = {
-					gwtank_chassis = 1
-				}
-			}
-			else = {			
-				set_technology = {
-					gwtank = 1
-				}
-			}
-		}
-		else = {
-			add_tech_bonus = {
-				name = LSM_tank_development
-				bonus = 1
-				uses = 1
-				category = armor
-			}
-		}
-		division_template = {
-			name = "Langschwertische Panzerbrigade"
-			division_names_group = LSM_ARM_01
-			regiments = {
-				light_armor = { x = 0 y = 0 }
-				light_armor = { x = 0 y = 1 }
-				light_armor = { x = 0 y = 2 }
-				infantry = { x = 1 y = 0 }
-				infantry = { x = 1 y = 1 }
-			}
-			support = {
-				artillery = { x = 0 y = 0 }
-			}
-		}
-		hidden_effect = {
-			505 = {
-				create_unit = {
-					division = "division_template = \"Langschwertische Panzerbrigade\" start_experience_factor = 0.5 start_equipment_factor = 1"
-					owner = ROOT
-					count = 1
-				}
-			}
-		}
-	}
-	search_filters = { FOCUS_FILTER_ARMY_BONUS }
-}
-shared_focus = {
-	id = LSM_modern_supply
-	icon = GFX_goal_generic_support_equipment
-	cost = 6
-	ai_will_do = { factor = 100 }
-
-	x = 2
-	y = 4
-	relative_position_id = LSM_national_army
-	prerequisite = { 
-		focus = LSM_tank_development
-	}
-	prerequisite = { 
-		focus = LSM_artillery_modernization
-	}
-	prerequisite = { 
-		focus = LSM_magical_brigades
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSM_artillery_modernization"
-		add_ideas = LNS_modern_supply
-	}
-	search_filters = { FOCUS_FILTER_ARMY_BONUS }
-}
-shared_focus = {
-	id = LSM_modernize_knighthood
-	icon = GFX_goal_griffon_armor
-	cost = 6
-	ai_will_do = { factor = 100 }
-
-	x = -4
-	y = 1
-	relative_position_id = LSM_national_army
-	prerequisite = { 
-		focus = LSM_rosewood_order
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSM_modernize_knighthood"
-		add_tech_bonus = {
-			name = LSM_modernize_knighthood
-			bonus = 1
-			uses = 1
-			category = knights_tech
-		}
-		unlock_decision_category_tooltip = LSM_knights_research
-	}
-	search_filters = { FOCUS_FILTER_ARMY_BONUS }
-}
-shared_focus = {
-	id = LSM_swift_mobilization
-	icon = GFX_goal_griffon_levy
-	cost = 6
-	ai_will_do = { factor = 100 }
-
-	x = -4
-	y = 3
-	relative_position_id = LSM_national_army
-	prerequisite = { 
-		focus = LSM_modernize_knighthood
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSM_swift_mobilization"
-		swap_ideas = {
-			remove_idea = LNS_pure_army_idea
-			add_idea = LNS_rosewood_1
-		}
-	}
-	search_filters = { FOCUS_FILTER_ARMY_BONUS }
-}
-shared_focus = {
-	id = LSM_civilian_auxiliary
-	icon = GFX_goal_griffon_fez
-	cost = 6
-	ai_will_do = { factor = 100 }
-
-	x = -5
-	y = 2
-	relative_position_id = LSM_national_army
-	prerequisite = { 
-		focus = LSM_modernize_knighthood
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSM_civilian_auxiliary"
-		add_ideas = LNS_civilian_auxiliary
-		add_equipment_to_stockpile = { type = infantry_equipment_1 amount = 1000 producer = GRI }
-		add_tech_bonus = {
-			name = LSM_civilian_auxiliary
-			bonus = 1
-			uses = 1
-			category = infantry_weapons
-		}
-	}
-	search_filters = { FOCUS_FILTER_ARMY_BONUS }
-}
-shared_focus = {
-	id = LSM_small_unit_tactics
-	icon = GFX_focus_generic_provoke_border_clashes
-	cost = 6
-	ai_will_do = { factor = 100 }
-
-	x = -3
-	y = 2
-	relative_position_id = LSM_national_army
-	prerequisite = { 
-		focus = LSM_modernize_knighthood
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSM_small_unit_tactics"
-		add_doctrine_cost_reduction = {
-			name = land_doc_bonus
-			cost_reduction = 0.5
-			uses = 1
-			category = land_doctrine
-		}
-	}
-	search_filters = { FOCUS_FILTER_ARMY_BONUS }
-}
-shared_focus = {
-	id = LSM_artillery_auxiliary
-	icon = GFX_goal_generic_army_artillery2
-	cost = 6
-	ai_will_do = { factor = 100 }
-
-	x = -6
-	y = 3
-	relative_position_id = LSM_national_army
-	prerequisite = { 
-		focus = LSM_civilian_auxiliary
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSM_artillery_auxiliary"
-		add_equipment_to_stockpile = { type = artillery_equipment_1 amount = 750 producer = GRI }
-		add_tech_bonus = {
-			name = LSM_artillery_modernization
-			bonus = 1
-			uses = 2
-			category = artillery
-		}
-	}
-	search_filters = { FOCUS_FILTER_ARMY_BONUS }
-}
-shared_focus = {
-	id = LSM_mechanized_chapters
-	icon = GFX_focus_generic_combined_arms
-	cost = 6
-	ai_will_do = { factor = 100 }
-
-	x = -4
-	y = 4
-	relative_position_id = LSM_national_army
-	prerequisite = { 
-		focus = LSM_artillery_auxiliary
-	}
-	prerequisite = { 
-		focus = LSM_swift_mobilization
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSM_mechanized_chapters"
-		unlock_decision_tooltip = LSM_raise_heavy_armor_knights
-		add_tech_bonus = {
-			name = LSM_mechanized_chapters
-			bonus = 1
-			uses = 1
-			category = armor
-		}
-	}
-	search_filters = { FOCUS_FILTER_ARMY_BONUS }
-}
-shared_focus = {
-	id = LSM_grover_research_institute
-	icon = GFX_focus_research2
-	cost = 6
-	ai_will_do = { factor = 100 }
-
-	x = -2
-	y = 5
-	relative_position_id = LSM_national_army
-	prerequisite = { 
-		focus = LSM_mechanized_chapters
-		focus = LSM_modern_supply
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSM_grover_research_institute"
-		add_research_slot = 1
-		Improve_Science_Base = yes
-	}
-	search_filters = { FOCUS_FILTER_ARMY_BONUS }
-}
-shared_focus = {
-	id = LSM_imperial_exchange_program
-	icon = GFX_goal_GRI_army_expansion
-	cost = 6
-	ai_will_do = { factor = 100 }
-	available = {
-		is_in_faction_with = GRD
-	}
-
-	x = 0
-	y = 5
-	relative_position_id = LSM_national_army
-	prerequisite = { 
-		focus = LSM_mechanized_chapters
-		focus = LSM_modern_supply
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSM_imperial_exchange_program"
-		add_ideas = LNS_imperial_exchange_program
-	}
-	search_filters = { FOCUS_FILTER_ARMY_BONUS }
-}
-shared_focus = {
-	id = LSM_joint_exercises
-	icon = GFX_goal_GRI_heavy_tank
-	cost = 6
-	ai_will_do = { factor = 100 }
-
-	x = -1
-	y = 6
-	relative_position_id = LSM_national_army
-	prerequisite = { 
-		focus = LSM_imperial_exchange_program
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSM_joint_exercises"
-		add_doctrine_cost_reduction = {
-			name = land_doc_bonus
-			cost_reduction = 0.5
-			uses = 1
-			category = land_doctrine
-		}
-	}
-	search_filters = { FOCUS_FILTER_ARMY_BONUS }
-}
-shared_focus = {
-	id = LSM_fortify_frontier
-	icon = GFX_goal_nested_fortifications
-	cost = 10
-	ai_will_do = { factor = 100 }
-
-	x = 1
-	y = 6
-	relative_position_id = LSM_national_army
-	prerequisite = { 
-		focus = LSM_imperial_exchange_program
-	}
-	completion_reward = {
-		log = "[GetDateText]: [Root.GetName]: Focus LSM_fortify_frontier"
-		add_ideas = LNS_fortify_frontier
-		552 = {
-			add_building_construction = {
-				type = bunker
-				level = 1
-				province = 9908
-				instant_build = yes
-			}
-			add_building_construction = {
-				type = bunker
-				level = 1
-				province = 9918
-				instant_build = yes
-			}
-			add_building_construction = {
-				type = bunker
-				level = 1
-				province = 9795
-				instant_build = yes
-			}
-			add_building_construction = {
-				type = bunker
-				level = 1
-				province = 11828
-				instant_build = yes
-			}
-			add_building_construction = {
-				type = bunker
-				level = 1
-				province = 11775
-				instant_build = yes
-			}
-			add_building_construction = {
-				type = bunker
-				level = 1
-				province = 978
-				instant_build = yes
-			}
-			add_building_construction = {
-				type = bunker
-				level = 1
-				province = 11770
-				instant_build = yes
-			}
-			add_building_construction = {
-				type = bunker
-				level = 1
-				province = 10083
-				instant_build = yes
-			}
-		}
-		505 = {
-			add_building_construction = {
-				type = bunker
-				level = 1
-				province = 7070
-				instant_build = yes
-			}
-		}
-	}
-	search_filters = { FOCUS_FILTER_ARMY_BONUS }
-}
+focus_tree = {
+	id = longsword_focus
+
+	country = {
+		factor = 0
+
+		modifier = {
+			add = 10
+			tag = LNS
+		}
+	}
+	default = no
+	continuous_focus_position = { x = 250 y = 2050 }
+
+	shared_focus = LNS_resist_and_bite
+	shared_focus = LNS_the_military_resists
+	shared_focus = LNS_the_plan_continues
+}
+
+focus_tree = {
+	id = longsword_focus_fascist_civil_war
+
+	country = {
+		factor = 0
+
+		modifier = {
+			add = 5
+			tag = LNS
+		}
+	}
+	default = no
+	continuous_focus_position = { x = 250 y = 2050 }
+
+	shared_focus = LNS_fascist_civil_war
+}
+
+focus_tree = {
+	id = longsword_focus_commie_civil_war
+
+	country = {
+		factor = 0
+
+		modifier = {
+			add = 5
+			tag = LNS
+		}
+	}
+	default = no
+	continuous_focus_position = { x = 250 y = 2050 }
+
+	shared_focus = LNS_commie_civil_war
+}
+
+focus_tree = {
+	id = longsword_focus_neutral_civil_war
+
+	country = {
+		factor = 0
+
+		modifier = {
+			add = 5
+			tag = LNS
+		}
+	}
+	default = no
+	continuous_focus_position = { x = 250 y = 2050 }
+
+	shared_focus = LNS_neutral_civil_war
+}
+
+focus_tree = {
+	id = longsword_focus_bandit_victory_tree
+
+	country = {
+		factor = 0
+
+		modifier = {
+			add = 10
+			tag = LNS
+			has_government = fascism
+		}
+	}
+	default = no
+	continuous_focus_position = { x = 250 y = 1650 }
+
+	shared_focus = LNS_bandit_victory
+}
+focus_tree = {
+	id = new_longsword_focus_commie_tree 
+
+	country = {
+		factor = 0
+
+		modifier = {
+			add = 5
+			tag = LSC
+		}
+	}
+	default = no
+	continuous_focus_position = { x = 1500 y = 800 }
+
+	shared_focus = LSC_constitutional_convention
+	shared_focus = LSC_IIA
+	shared_focus = LSC_hellquill_harcom
+}
+focus_tree = {
+	id = new_longsword_focus_fascist_tree 
+
+	country = {
+		factor = 0
+		
+		modifier = {
+			add = 10
+			tag = LSC
+			has_government = fascism
+		}
+	}
+	default = no
+	continuous_focus_position = { x = 1500 y = 800 }
+
+	shared_focus = LSC_constitutional_convention
+	shared_focus = LSC_IIA
+	shared_focus = LSC_hellquill_supremacist
+}
+focus_tree = {
+	id = new_longsword_focus_military_tree
+
+	country = {
+		factor = 0
+
+		modifier = {
+			add = 10
+			tag = LSM
+			has_government = neutrality
+		}
+	}
+	default = no
+	continuous_focus_position = { x = 0 y = 1950 }
+
+	shared_focus = LSM_zeltstadt_meeting
+	shared_focus = LSM_national_army
+	shared_focus = LSM_rosewood_order
+	shared_focus = LSM_hellquill
+}
+
+#####################
+### The Partisans ###
+#####################
+
+shared_focus = {
+	id = LNS_resist_and_bite
+	icon = GFX_goal_offensive_army
+	cost = 1.00
+	mutually_exclusive = { focus = LNS_the_military_resists }
+	mutually_exclusive = { focus = LNS_the_plan_continues }
+	ai_will_do = { factor = 120 }
+	x = 6
+	y = 0
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_resist_and_bite"
+		country_event = longsword.1
+	}
+}
+
+shared_focus = {
+	id = LNS_our_friends_in_hellquill
+	icon = GFX_goal_generic_major_alliance_pony_griffon
+	x = -2
+	y = 1
+	relative_position_id = LNS_resist_and_bite
+	cost = 2.00
+	prerequisite = { focus = LNS_resist_and_bite }
+
+	ai_will_do = {
+		factor = 100
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_our_friends_in_hellquill"
+		country_event = longsword.2
+	}
+}
+
+shared_focus = {
+	id = LNS_target_collaborators
+	icon = GFX_goal_secret_agents
+	x = -1
+	y = 2
+	relative_position_id = LNS_resist_and_bite
+	cost = 2.00
+	prerequisite = { focus = LNS_spread_pamphlets }
+	prerequisite = { focus = LNS_our_friends_in_hellquill }
+
+	ai_will_do = {
+		factor = 100
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_target_collaborators"
+		country_event = longsword.19
+	}
+}
+
+shared_focus = {
+	id = LNS_spread_pamphlets
+	icon = GFX_goal_big_news
+	x = 0
+	y = 1
+	relative_position_id = LNS_resist_and_bite
+	cost = 2.00
+	prerequisite = { focus = LNS_resist_and_bite }
+
+	ai_will_do = {
+		factor = 100
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_spread_pamphlets"
+		country_event = longsword.18
+	}
+}
+
+shared_focus = {
+	id = LNS_steal_equipment
+	icon = GFX_goal_national_arsenal
+	x = 1
+	y = 2
+	relative_position_id = LNS_resist_and_bite
+	cost = 2.00
+	prerequisite = { focus = LNS_spread_pamphlets }
+	prerequisite = { focus = LNS_organize_cells }
+
+	ai_will_do = {
+		factor = 100
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_steal_equipment"
+		country_event = longsword.24
+	}
+}
+
+shared_focus = {
+	id = LNS_organize_cells
+	icon = GFX_goal_unicorn_soldier
+	x = 2
+	y = 1
+	relative_position_id = LNS_resist_and_bite
+	cost = 2.00
+	prerequisite = { focus = LNS_resist_and_bite }
+
+	ai_will_do = {
+		factor = 100
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_organize_cells"
+		country_event = longsword.23
+	}
+}
+
+shared_focus = {
+	id = LNS_the_secret_government
+	icon = GFX_goal_government_icon
+	x = 0
+	y = 3
+	relative_position_id = LNS_resist_and_bite
+	cost = 2.00
+	prerequisite = { focus = LNS_target_collaborators }
+	prerequisite = { focus = LNS_steal_equipment }
+
+	ai_will_do = {
+		factor = 100
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_the_secret_government"
+		country_event = longsword.25
+		hidden_effect = {
+			country_event = { days = 14 id = longsword.26 }
+		}
+	}
+}
+
+shared_focus = {
+	id = LNS_sabotage_them
+	icon = GFX_goal_break_rifle
+	x = -1
+	y = 4
+	relative_position_id = LNS_resist_and_bite
+	cost = 2.00
+	prerequisite = { focus = LNS_the_secret_government }
+
+	ai_will_do = {
+		factor = 100
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_sabotage_them"
+		country_event = longsword.27
+	}
+}
+
+shared_focus = {
+	id = LNS_an_example
+	icon = GFX_goal_split_helmet
+	x = 1
+	y = 4
+	relative_position_id = LNS_resist_and_bite
+	cost = 2.00
+	prerequisite = { focus = LNS_the_secret_government }
+
+	ai_will_do = {
+		factor = 100
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_an_example"
+		country_event = longsword.28
+	}
+}
+
+shared_focus = {
+	id = LNS_the_uprising
+	icon = GFX_goal_revolution_pony
+	x = 0
+	y = 5
+	relative_position_id = LNS_resist_and_bite
+	cost = 2.00
+	prerequisite = { focus = LNS_sabotage_them }
+	prerequisite = { focus = LNS_an_example }
+
+	ai_will_do = {
+		factor = 100
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_the_uprising"
+		country_event = longsword.29
+	}
+}
+
+#####################
+### The Military ###
+#####################
+
+shared_focus = {
+	id = LNS_the_military_resists
+	icon = GFX_goal_military_academy
+	cost = 1.00
+	mutually_exclusive = { focus = LNS_resist_and_bite }
+	mutually_exclusive = { focus = LNS_the_plan_continues }
+	ai_will_do = { factor = 120 }
+	x = 12
+	y = 0
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_the_military_resists"
+		country_event = longsword.42
+	}
+}
+
+shared_focus = {
+	id = LNS_reassign_units
+	icon = GFX_goal_planning_bonus
+	x = -2
+	y = 1
+	relative_position_id = LNS_the_military_resists
+	cost = 2.00
+	prerequisite = { focus = LNS_the_military_resists }
+
+	ai_will_do = {
+		factor = 100
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_reassign_units"
+		country_event = longsword.43
+	}
+}
+
+shared_focus = {
+	id = LNS_our_duty
+	icon = GFX_goal_conscription
+	x = -1
+	y = 2
+	relative_position_id = LNS_the_military_resists
+	cost = 2.00
+	prerequisite = { focus = LNS_ensure_loyalty }
+	prerequisite = { focus = LNS_reassign_units }
+
+	ai_will_do = {
+		factor = 100
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_our_duty"
+		country_event = longsword.49
+	}
+}
+
+shared_focus = {
+	id = LNS_ensure_loyalty
+	icon = GFX_focus_generic_military_mission
+	x = 0
+	y = 1
+	relative_position_id = LNS_the_military_resists
+	cost = 2.00
+	prerequisite = { focus = LNS_the_military_resists }
+
+	ai_will_do = {
+		factor = 100
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_ensure_loyalty"
+		country_event = longsword.45
+	}
+}
+
+shared_focus = {
+	id = LNS_black_market_contacts
+	icon = GFX_goal_collaborate_local_elites
+	x = 1
+	y = 2
+	relative_position_id = LNS_the_military_resists
+	cost = 2.00
+	prerequisite = { focus = LNS_ensure_loyalty }
+	prerequisite = { focus = LNS_requisition_weapons }
+
+	ai_will_do = {
+		factor = 100
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_black_market_contacts"
+		country_event = longsword.50
+	}
+}
+
+shared_focus = {
+	id = LNS_requisition_weapons
+	icon = GFX_goal_munitions_factories
+	x = 2
+	y = 1
+	relative_position_id = LNS_the_military_resists
+	cost = 2.00
+	prerequisite = { focus = LNS_the_military_resists }
+
+	ai_will_do = {
+		factor = 100
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_requisition_weapons"
+		country_event = longsword.51
+	}
+}
+
+shared_focus = {
+	id = LNS_refuse_orders
+	icon = GFX_goal_authority
+	x = 0
+	y = 3
+	relative_position_id = LNS_the_military_resists
+	cost = 2.00
+	prerequisite = { focus = LNS_our_duty }
+	prerequisite = { focus = LNS_black_market_contacts }
+
+	ai_will_do = {
+		factor = 100
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_refuse_orders"
+		country_event = longsword.52
+	}
+}
+
+shared_focus = {
+	id = LNS_target_reformisten
+	icon = GFX_goal_MAF_African_Pilots
+	x = -1
+	y = 4
+	relative_position_id = LNS_the_military_resists
+	cost = 2.00
+	prerequisite = { focus = LNS_refuse_orders }
+
+	ai_will_do = {
+		factor = 100
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_target_reformisten"
+		country_event = longsword.54
+	}
+}
+
+shared_focus = {
+	id = LNS_target_partisans
+	icon = GFX_goal_broken_red_star
+	x = 1
+	y = 4
+	relative_position_id = LNS_the_military_resists
+	cost = 2.00
+	prerequisite = { focus = LNS_refuse_orders }
+
+	ai_will_do = {
+		factor = 100
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_target_partisans"
+		country_event = longsword.55
+	}
+}
+
+shared_focus = {
+	id = LNS_the_madgriffon_of_longsword
+	icon = GFX_focus_generic_strike_at_democracy1
+	x = 0
+	y = 5
+	relative_position_id = LNS_the_military_resists
+	cost = 2.00
+	prerequisite = { focus = LNS_target_reformisten }
+	prerequisite = { focus = LNS_target_partisans }
+
+	ai_will_do = {
+		factor = 100
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_the_madgriffon_of_longsword"
+		country_event = longsword.56
+	}
+}
+
+#####################
+### The Reformisten ###
+#####################
+
+shared_focus = {
+	id = LNS_the_plan_continues
+	icon = GFX_goal_skull_treaty2
+	cost = 1.00
+	mutually_exclusive = { focus = LNS_the_military_resists }
+	mutually_exclusive = { focus = LNS_resist_and_bite }
+	ai_will_do = { factor = 120 }
+	x = 18
+	y = 0
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_the_plan_continues"
+		country_event = longsword.62
+	}
+}
+
+shared_focus = {
+	id = LNS_investigate_the_military
+	icon = GFX_goal_skull_treaty
+	x = -2
+	y = 1
+	relative_position_id = LNS_the_plan_continues
+	cost = 2.00
+	prerequisite = { focus = LNS_the_plan_continues }
+
+	ai_will_do = {
+		factor = 100
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_investigate_the_military"
+		country_event = longsword.63
+	}
+}
+
+shared_focus = {
+	id = LNS_root_out_traitors
+	icon = GFX_goal_GEA_guerilla_warfare
+	x = -1
+	y = 2
+	relative_position_id = LNS_the_plan_continues
+	cost = 2.00
+	prerequisite = { focus = LNS_public_executions }
+	prerequisite = { focus = LNS_investigate_the_military }
+
+	ai_will_do = {
+		factor = 100
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_root_out_traitors"
+		country_event = longsword.68
+	}
+}
+
+shared_focus = {
+	id = LNS_public_executions
+	icon = GFX_goal_forced_res
+	x = 0
+	y = 1
+	relative_position_id = LNS_the_plan_continues
+	cost = 2.00
+	prerequisite = { focus = LNS_the_plan_continues }
+
+	ai_will_do = {
+		factor = 100
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_public_executions"
+		country_event = longsword.65
+	}
+}
+
+shared_focus = {
+	id = LNS_work_them_to_the_bone
+	icon = GFX_goal_forced_inf
+	x = 1
+	y = 2
+	relative_position_id = LNS_the_plan_continues
+	cost = 2.00
+	prerequisite = { focus = LNS_public_executions }
+	prerequisite = { focus = LNS_steal_their_property }
+
+	ai_will_do = {
+		factor = 100
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_work_them_to_the_bone"
+		country_event = longsword.72
+	}
+}
+
+shared_focus = {
+	id = LNS_steal_their_property
+	icon = GFX_goal_forced_con
+	x = 2
+	y = 1
+	relative_position_id = LNS_the_plan_continues
+	cost = 2.00
+	prerequisite = { focus = LNS_the_plan_continues }
+
+	ai_will_do = {
+		factor = 100
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_steal_their_property"
+		country_event = longsword.70
+	}
+}
+
+shared_focus = {
+	id = LNS_plans_backfire
+	icon = GFX_HOL_crackdown_natpop
+	x = 0
+	y = 3
+	relative_position_id = LNS_the_plan_continues
+	cost = 2.00
+	prerequisite = { focus = LNS_root_out_traitors }
+	prerequisite = { focus = LNS_work_them_to_the_bone }
+
+	ai_will_do = {
+		factor = 100
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_plans_backfire"
+		country_event = longsword.74
+	}
+}
+
+shared_focus = {
+	id = LNS_panic_in_the_countryside
+	icon = GFX_goal_skull_fortification
+	x = -1
+	y = 4
+	relative_position_id = LNS_the_plan_continues
+	cost = 2.00
+	prerequisite = { focus = LNS_plans_backfire }
+
+	ai_will_do = {
+		factor = 100
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_panic_in_the_countryside"
+		country_event = longsword.75
+	}
+}
+
+shared_focus = {
+	id = LNS_mass_mutinies
+	icon = GFX_goal_forced_mil
+	x = 1
+	y = 4
+	relative_position_id = LNS_the_plan_continues
+	cost = 2.00
+	prerequisite = { focus = LNS_plans_backfire }
+
+	ai_will_do = {
+		factor = 100
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_mass_mutinies"
+		country_event = longsword.76
+	}
+}
+
+shared_focus = {
+	id = LNS_mass_uprising
+	icon = GFX_goal_generic_liberty_statue
+	x = 0
+	y = 5
+	relative_position_id = LNS_the_plan_continues
+	cost = 2.00
+	prerequisite = { focus = LNS_panic_in_the_countryside }
+	prerequisite = { focus = LNS_mass_mutinies }
+
+	ai_will_do = {
+		factor = 100
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_mass_uprising"
+		country_event = longsword.77
+	}
+}
+
+#####################
+### Fascist Civil War Tree ###
+#####################
+
+shared_focus = {
+	id = LNS_fascist_civil_war
+	icon = GFX_goal_ideology_national_populist
+	cost = 1.00
+	available = { always = no }
+	bypass = { has_global_flag = LNS_civil_war_flag }
+	ai_will_do = { factor = 120 }
+	x = 8
+	y = 0
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_fascist_civil_war"
+		custom_effect_tooltip = unlock_focuses
+	}
+}
+
+shared_focus = {
+	id = LNS_emergency_conscription
+	icon = GFX_goal_conscription
+	x = -1
+	y = 1
+	relative_position_id = LNS_fascist_civil_war
+	cost = 2.00
+	prerequisite = { focus = LNS_fascist_civil_war }
+
+	ai_will_do = {
+		factor = 100
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_emergency_conscription"
+		add_manpower = 3000
+		add_war_support = 0.05
+	}
+	search_filters = { FOCUS_FILTER_MANPOWER FOCUS_FILTER_WAR_SUPPORT }
+}
+
+shared_focus = {
+	id = LNS_hasty_militias
+	icon = GFX_goal_national_arsenal
+	x = -2
+	y = 2
+	relative_position_id = LNS_fascist_civil_war
+	cost = 2.00
+	prerequisite = { focus = LNS_emergency_conscription }
+
+	ai_will_do = {
+		factor = 100
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_hasty_militias"
+		add_manpower = 5000
+		custom_effect_tooltip = LNS_hasty_militias_tp
+		hidden_effect = {
+			load_oob = "LNS_militia"
+		}
+	}
+	search_filters = { FOCUS_FILTER_MANPOWER }
+}
+
+shared_focus = {
+	id = LNS_child_soldiers
+	icon = GFX_goal_graveyard
+	x = -2
+	y = 3
+	relative_position_id = LNS_fascist_civil_war
+	cost = 2.00
+	prerequisite = { focus = LNS_hasty_militias }
+
+	ai_will_do = {
+		factor = 100
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_child_soldiers"
+		add_manpower = 7000
+		add_stability = -0.10
+	}
+	search_filters = { FOCUS_FILTER_MANPOWER FOCUS_FILTER_STABILITY }
+}
+
+shared_focus = {
+	id = LNS_grab_the_pistols
+	icon = GFX_goal_secret_agents
+	x = 1
+	y = 1
+	relative_position_id = LNS_fascist_civil_war
+	cost = 2.00
+	prerequisite = { focus = LNS_fascist_civil_war }
+
+	ai_will_do = {
+		factor = 100
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_grab_the_pistols"
+		add_equipment_to_stockpile = { type = infantry_equipment_0 amount = 500 producer = LNS }
+	}
+}
+
+shared_focus = {
+	id = LNS_grab_the_muskets
+	icon = GFX_goal_military_academy
+	x = 2
+	y = 2
+	relative_position_id = LNS_fascist_civil_war
+	cost = 2.00
+	prerequisite = { focus = LNS_grab_the_pistols }
+
+	ai_will_do = {
+		factor = 100
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_grab_the_muskets"
+		add_equipment_to_stockpile = { type = melee_equipment_1 amount = 750 producer = LNS }
+	}
+}
+
+shared_focus = {
+	id = LNS_sharpen_spears
+	icon = GFX_goal_skull_treaty
+	x = 2
+	y = 3
+	relative_position_id = LNS_fascist_civil_war
+	cost = 2.00
+	prerequisite = { focus = LNS_grab_the_muskets }
+
+	ai_will_do = {
+		factor = 100
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_sharpen_spears"
+		add_equipment_to_stockpile = { type = melee_equipment_0 amount = 1000 producer = LNS }
+	}
+}
+
+shared_focus = {
+	id = LNS_houses_to_factories
+	icon = GFX_goal_skull_fortification
+	x = 0
+	y = 2
+	relative_position_id = LNS_fascist_civil_war
+	cost = 2.00
+	prerequisite = { focus = LNS_fascist_civil_war }
+
+	ai_will_do = {
+		factor = 100
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_houses_to_factories"
+		552 = {
+			add_extra_state_shared_building_slots = 1
+			add_building_construction = {
+				type = arms_factory
+				level = 1
+				instant_build = yes
+			}
+		}
+	}
+	search_filters = { FOCUS_FILTER_INDUSTRY }
+}
+
+shared_focus = {
+	id = LNS_we_need_more
+	icon = GFX_goal_silver_reserve
+	x = 0
+	y = 3
+	relative_position_id = LNS_fascist_civil_war
+	cost = 2.00
+	prerequisite = { focus = LNS_houses_to_factories }
+
+	ai_will_do = {
+		factor = 100
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_we_need_more"
+		552 = {
+			add_extra_state_shared_building_slots = 1
+			add_building_construction = {
+				type = industrial_complex
+				level = 1
+				instant_build = yes
+			}
+		}
+	}
+	search_filters = { FOCUS_FILTER_INDUSTRY }
+}
+
+shared_focus = {
+	id = LNS_final_push
+	icon = GFX_goal_authority
+	x = 0
+	y = 4
+	relative_position_id = LNS_fascist_civil_war
+	cost = 2.00
+	prerequisite = { focus = LNS_we_need_more }
+	prerequisite = { focus = LNS_child_soldiers }
+	prerequisite = { focus = LNS_sharpen_spears }
+
+	ai_will_do = {
+		factor = 100
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_final_push"
+		add_timed_idea = { idea = LNS_final_push_idea days = 180 }
+	}
+}
+
+#####################
+### Communist Civil War Tree ###
+#####################
+
+shared_focus = {
+	id = LNS_commie_civil_war
+	icon = GFX_goal_revolution
+	cost = 1.00
+	available = { always = no }
+	bypass = { has_global_flag = LNS_civil_war_flag }
+	ai_will_do = { factor = 120 }
+	x = 8
+	y = 0
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_commie_civil_war"
+		custom_effect_tooltip = unlock_focuses
+	}
+}
+
+shared_focus = {
+	id = LNS_the_faith_of_the_people
+	icon = GFX_goal_red_star_dove
+	x = -1
+	y = 1
+	relative_position_id = LNS_commie_civil_war
+	cost = 2.00
+	prerequisite = { focus = LNS_commie_civil_war }
+
+	ai_will_do = {
+		factor = 100
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_the_faith_of_the_people"
+		add_war_support = 0.05
+		add_stability = 0.05
+		add_manpower = 3000
+	}
+	search_filters = { FOCUS_FILTER_MANPOWER FOCUS_FILTER_STABILITY FOCUS_FILTER_WAR_SUPPORT }
+}
+
+shared_focus = {
+	id = LNS_peoples_militias
+	icon = GFX_goal_ideology_totalist
+	x = -2
+	y = 2
+	relative_position_id = LNS_commie_civil_war
+	cost = 2.00
+	prerequisite = { focus = LNS_the_faith_of_the_people }
+
+	ai_will_do = {
+		factor = 100
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_peoples_militias"
+		add_manpower = 3000
+		custom_effect_tooltip = LNS_hasty_militias_tp
+		hidden_effect = {
+			load_oob = "LSC_militia"
+		}
+	}
+	search_filters = { FOCUS_FILTER_MANPOWER }
+}
+
+shared_focus = {
+	id = LNS_foreign_volunteers
+	icon = GFX_goal_red_star
+	x = -2
+	y = 3
+	relative_position_id = LNS_commie_civil_war
+	cost = 2.00
+	prerequisite = { focus = LNS_peoples_militias }
+
+	ai_will_do = {
+		factor = 100
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_foreign_volunteers"
+		add_manpower = 1500
+		add_equipment_to_stockpile = { type = infantry_equipment_1 amount = 500 producer = RCT }
+		add_equipment_to_stockpile = { type = infantry_equipment_1 amount = 250 producer = GRW }
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_equipment_subsidy = {
+				cic = 250
+				equipment_type = infantry_equipment
+				seller_tags = { RCT LCT NIM WIT BAK DEP DMT FBK WAT FIR FRE }
+			}
+			add_equipment_subsidy = {
+				cic = 250
+				equipment_type = infantry_equipment
+				seller_tags = { LUS BRF GRW GRU GRY BAN }
+			}
+		}
+	}
+	search_filters = { FOCUS_FILTER_MANPOWER }
+}
+
+shared_focus = {
+	id = LNS_cottage_industry
+	icon = GFX_goal_commune_politics
+	x = 0
+	y = 2
+	relative_position_id = LNS_commie_civil_war
+	cost = 2.00
+	prerequisite = { focus = LNS_commie_civil_war }
+
+	ai_will_do = {
+		factor = 100
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_cottage_industry"
+		505 = {
+			add_extra_state_shared_building_slots = 1
+			add_building_construction = {
+				type = industrial_complex
+				level = 1
+				instant_build = yes
+			}
+		}
+	}
+	search_filters = { FOCUS_FILTER_INDUSTRY }
+}
+
+shared_focus = {
+	id = LNS_underground_arms_factories
+	icon = GFX_goal_munitions_factories
+	x = 0
+	y = 3
+	relative_position_id = LNS_commie_civil_war
+	cost = 2.00
+	prerequisite = { focus = LNS_cottage_industry }
+
+	ai_will_do = {
+		factor = 100
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_underground_arms_factories"
+		505 = {
+			add_extra_state_shared_building_slots = 1
+			add_building_construction = {
+				type = arms_factory
+				level = 1
+				instant_build = yes
+			}
+		}
+	}
+	search_filters = { FOCUS_FILTER_INDUSTRY }
+}
+
+shared_focus = {
+	id = LNS_wartime_propaganda
+	icon = GFX_goal_syndicalist_industry
+	x = 1
+	y = 1
+	relative_position_id = LNS_commie_civil_war
+	cost = 2.00
+	prerequisite = { focus = LNS_commie_civil_war }
+
+	ai_will_do = {
+		factor = 100
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_wartime_propaganda"
+		add_war_support = 0.05
+		add_political_power = 50
+		add_popularity = { ideology = communism popularity = 0.05 }
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL FOCUS_FILTER_WAR_SUPPORT }
+}
+
+shared_focus = {
+	id = LNS_smuggle_guns
+	icon = GFX_goal_secret_agents_red
+	x = 2
+	y = 2
+	relative_position_id = LNS_commie_civil_war
+	cost = 2.00
+	prerequisite = { focus = LNS_wartime_propaganda }
+
+	ai_will_do = {
+		factor = 100
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_smuggle_guns"
+		add_equipment_to_stockpile = { type = infantry_equipment_0 amount = 500 producer = LCT }
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_equipment_subsidy = {
+				cic = 500
+				equipment_type = infantry_equipment
+				seller_tags = { RCT LCT NIM WIT BAK DEP DMT FBK WAT FIR FRE }
+			}
+		}
+	}
+}
+
+shared_focus = {
+	id = LNS_breakout_musuem_pieces
+	icon = GFX_goal_national_arsenal
+	x = 2
+	y = 3
+	relative_position_id = LNS_commie_civil_war
+	cost = 2.00
+	prerequisite = { focus = LNS_smuggle_guns }
+
+	ai_will_do = {
+		factor = 100
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_breakout_musuem_pieces"
+		add_equipment_to_stockpile = { type = melee_equipment_1 amount = 1000 producer = LNS }
+	}
+}
+
+shared_focus = {
+	id = LNS_to_victory
+	icon = GFX_goal_purge_opposition
+	x = 0
+	y = 4
+	relative_position_id = LNS_commie_civil_war
+	cost = 2.00
+	prerequisite = { focus = LNS_foreign_volunteers }
+	prerequisite = { focus = LNS_underground_arms_factories }
+	prerequisite = { focus = LNS_breakout_musuem_pieces }
+
+	ai_will_do = {
+		factor = 100
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_to_victory"
+		add_timed_idea = { idea = LNS_final_push_idea days = 180 }
+	}
+}
+
+#####################
+### Military Government Civil War Tree ###
+#####################
+
+shared_focus = {
+	id = LNS_neutral_civil_war
+	icon = GFX_goal_authority
+	cost = 1.00
+	available = { always = no }
+	bypass = { has_global_flag = LNS_civil_war_flag }
+	ai_will_do = { factor = 120 }
+	x = 8
+	y = 0
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_neutral_civil_war"
+		custom_effect_tooltip = unlock_focuses
+	}
+}
+
+shared_focus = {
+	id = LNS_keep_calm
+	icon = GFX_goal_government_icon
+	x = -1
+	y = 1
+	relative_position_id = LNS_neutral_civil_war
+	cost = 2.00
+	prerequisite = { focus = LNS_neutral_civil_war }
+
+	ai_will_do = {
+		factor = 100
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_keep_calm"
+		add_stability = 0.10
+		add_war_support = 0.05
+		add_political_power = 50
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL FOCUS_FILTER_WAR_SUPPORT FOCUS_FILTER_STABILITY }
+}
+
+shared_focus = {
+	id = LNS_keep_it_professional
+	icon = GFX_goal_military_academy
+	x = -2
+	y = 2
+	relative_position_id = LNS_neutral_civil_war
+	cost = 2.00
+	prerequisite = { focus = LNS_keep_calm }
+
+	ai_will_do = {
+		factor = 100
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_keep_it_professional"
+		add_manpower = 2500
+		custom_effect_tooltip = LSM_reserves_tp
+		hidden_effect = {
+			load_oob = "LSM_militia"
+		}
+	}
+	search_filters = { FOCUS_FILTER_MANPOWER }
+}
+
+shared_focus = {
+	id = LNS_and_man_the_cannons
+	icon = GFX_goal_national_artillery
+	x = -2
+	y = 3
+	relative_position_id = LNS_neutral_civil_war
+	cost = 2.00
+	prerequisite = { focus = LNS_keep_it_professional }
+
+	ai_will_do = {
+		factor = 100
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_and_man_the_cannons"
+		add_manpower = 750
+		army_experience = 5
+		add_equipment_to_stockpile = { type = artillery_equipment_1 amount = 250 producer = GRI }
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_equipment_subsidy = {
+				cic = 500
+				equipment_type = artillery_equipment
+				seller_tags = { GRI STW ANG FEA BRZ PYT YAL KAT ROU }
+			}
+		}
+	}
+	search_filters = { FOCUS_FILTER_MANPOWER FOCUS_FILTER_ARMY_BONUS }
+}
+
+shared_focus = {
+	id = LNS_smalltime_industry
+	icon = GFX_goal_generic_construct_civ_factory
+	x = 0
+	y = 2
+	relative_position_id = LNS_neutral_civil_war
+	cost = 2.00
+	prerequisite = { focus = LNS_neutral_civil_war }
+
+	ai_will_do = {
+		factor = 100
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_smalltime_industry"
+		540 = {
+			add_extra_state_shared_building_slots = 1
+			add_building_construction = {
+				type = industrial_complex
+				level = 1
+				instant_build = yes
+			}
+		}
+	}
+	search_filters = { FOCUS_FILTER_INDUSTRY }
+}
+
+shared_focus = {
+	id = LNS_military_industry
+	icon = GFX_goal_generic_construct_mil_factory
+	x = 0
+	y = 3
+	relative_position_id = LNS_neutral_civil_war
+	cost = 2.00
+	prerequisite = { focus = LNS_smalltime_industry }
+
+	ai_will_do = {
+		factor = 100
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_military_industry"
+		540 = {
+			add_extra_state_shared_building_slots = 1
+			add_building_construction = {
+				type = arms_factory
+				level = 1
+				instant_build = yes
+			}
+		}
+	}
+	search_filters = { FOCUS_FILTER_INDUSTRY }
+}
+
+shared_focus = {
+	id = LNS_old_rifles
+	icon = GFX_goal_national_arsenal
+	x = 1
+	y = 1
+	relative_position_id = LNS_neutral_civil_war
+	cost = 2.00
+	prerequisite = { focus = LNS_neutral_civil_war }
+
+	ai_will_do = {
+		factor = 100
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_old_rifles"
+		add_equipment_to_stockpile = { type = infantry_equipment_0 amount = 750 producer = LNS }
+	}
+}
+
+shared_focus = {
+	id = LNS_service_gurantees_citizenship
+	icon = GFX_goal_industrial_pony
+	x = 2
+	y = 2
+	relative_position_id = LNS_neutral_civil_war
+	cost = 2.00
+	prerequisite = { focus = LNS_old_rifles }
+
+	ai_will_do = {
+		factor = 100
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_service_gurantees_citizenship"
+		add_manpower = 2500
+		add_political_power = -25
+	}
+	search_filters = { FOCUS_FILTER_MANPOWER FOCUS_FILTER_POLITICAL }
+}
+
+shared_focus = {
+	id = LNS_desperate_measures
+	icon = GFX_goal_secret_agents
+	x = 2
+	y = 3
+	relative_position_id = LNS_neutral_civil_war
+	cost = 2.00
+	prerequisite = { focus = LNS_service_gurantees_citizenship }
+
+	ai_will_do = {
+		factor = 100
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_desperate_measures"
+		add_equipment_to_stockpile = { type = melee_equipment_1 amount = 1200 producer = LNS }
+	}
+}
+
+shared_focus = {
+	id = LNS_semper_fi
+	icon = GFX_goal_offensive_army
+	x = 0
+	y = 4
+	relative_position_id = LNS_neutral_civil_war
+	cost = 2.00
+	prerequisite = { focus = LNS_and_man_the_cannons }
+	prerequisite = { focus = LNS_military_industry }
+	prerequisite = { focus = LNS_desperate_measures }
+
+	ai_will_do = {
+		factor = 100
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_semper_fi"
+		add_timed_idea = { idea = LNS_final_push_idea days = 180 }
+	}
+}
+
+#####################
+### Bandit Nation / Politics ###
+#####################
+
+shared_focus = {
+	id = LNS_bandit_victory
+	icon = GFX_goal_LEC_monkey
+	cost = 1.00
+	available = { always = no }
+	bypass = { has_country_flag = LNS_bandit_takeover }
+	ai_will_do = { factor = 120 }
+	x = 12
+	y = 0
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_bandit_victory"
+		custom_effect_tooltip = unlock_focuses
+	}
+}
+
+shared_focus = {
+	id = LNS_consolidate_power
+	icon = GFX_goal_step_on_skull
+	x = 0
+	y = 1
+	relative_position_id = LNS_bandit_victory
+	cost = 5.00
+	prerequisite = { focus = LNS_bandit_victory }
+
+	ai_will_do = {
+		factor = 120
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_consolidate_power"
+		add_war_support = 0.05
+		add_stability = 0.05
+		add_popularity = { ideology = fascism popularity = 0.05 }
+		hidden_effect = {
+			HLQ = { add_to_ROOT_potential_cores = yes }
+		}
+	}
+	search_filters = { FOCUS_FILTER_STABILITY FOCUS_FILTER_WAR_SUPPORT }
+}
+
+shared_focus = {
+	id = LNS_a_chance_meeting
+	icon = GFX_goal_ideology_national_populist
+	x = -6
+	y = 1
+	relative_position_id = LNS_consolidate_power
+	cost = 5.00
+	prerequisite = { focus = LNS_consolidate_power }
+	available = {
+		is_subject = no
+		MNC = {
+			exists = yes
+			has_country_leader = { 
+				character = MNC_eriviar_sunstriker
+				ruling_only = yes 
+			}
+			is_subject = no
+			NOT = { has_war_with = ROOT }
+		}
+	}
+
+	ai_will_do = {
+		factor = 120
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_a_chance_meeting"
+		country_event = { days = 1 id = longsword.81 }
+	}
+}
+
+shared_focus = {
+	id = LNS_a_lovely_gift
+	icon = GFX_goal_gold_reserve
+	x = -1
+	y = 1
+	relative_position_id = LNS_a_chance_meeting
+	cost = 6.00
+	prerequisite = { focus = LNS_a_chance_meeting }
+	available = {
+		is_subject = no
+		MNC = {
+			exists = yes
+			has_country_leader = { 
+				character = MNC_eriviar_sunstriker
+				ruling_only = yes 
+			}
+			is_subject = no
+			NOT = { has_war_with = ROOT }
+		}
+	}
+
+	ai_will_do = {
+		factor = 120
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_a_lovely_gift"
+		MNC = { country_event = { days = 1 id = longsword.83 } }
+	}
+}
+
+shared_focus = {
+	id = LNS_some_wonderful_protection
+	icon = GFX_goal_conscription
+	x = -1
+	y = 3
+	relative_position_id = LNS_a_chance_meeting
+	cost = 8.00
+	prerequisite = { focus = LNS_a_lovely_gift }
+	prerequisite = { focus = LNS_a_return_gift }
+	available = {
+		is_subject = no
+		MNC = {
+			exists = yes
+			has_country_leader = { 
+				character = MNC_eriviar_sunstriker
+				ruling_only = yes 
+			}
+			is_subject = no
+			NOT = { has_war_with = ROOT }
+		}
+	}
+
+	ai_will_do = {
+		factor = 120
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_some_wonderful_protection"
+		custom_effect_tooltip = LNS_bodyguards_tp
+		hidden_effect = {
+			if = {
+				limit = { NOT = { has_tech = tech_mountaineers } }
+				set_technology = { tech_mountaineers = 1 }
+			}
+			fix_weapon_techs = yes
+			load_oob = "LNS_sunstriker_bandits"
+		}
+	}
+	search_filters = { FOCUS_FILTER_MANPOWER FOCUS_FILTER_RESEARCH }
+}
+
+shared_focus = {
+	id = LNS_a_return_gift
+	icon = GFX_goal_GEA_guerilla_warfare
+	x = 0
+	y = 2
+	relative_position_id = LNS_a_chance_meeting
+	cost = 8.00
+	prerequisite = { focus = LNS_a_lovely_gift focus = LNS_a_pleasant_evening }
+	available = {
+		is_subject = no
+		MNC = {
+			exists = yes
+			has_country_leader = { 
+				character = MNC_eriviar_sunstriker
+				ruling_only = yes 
+			}
+			is_subject = no
+			NOT = { has_war_with = ROOT }
+		}
+	}
+
+	ai_will_do = {
+		factor = 120
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_a_return_gift"
+		custom_effect_tooltip = LNS_loot_2_tp
+		add_to_variable = {
+			var = loot
+			value = 2
+		}
+		add_opinion_modifier = { target = MNC modifier = LNS_a_lovely_gift_modifier }
+	}
+}
+
+shared_focus = {
+	id = LNS_a_pleasant_evening
+	icon = GFX_goal_collaborate_local_elites
+	x = 1
+	y = 1
+	relative_position_id = LNS_a_chance_meeting
+	cost = 7.00
+	prerequisite = { focus = LNS_a_chance_meeting }
+	available = {
+		is_subject = no
+		MNC = {
+			exists = yes
+			has_country_leader = { 
+				character = MNC_eriviar_sunstriker
+				ruling_only = yes 
+			}
+			is_subject = no
+			NOT = { has_war_with = ROOT }
+		}
+	}
+
+	ai_will_do = {
+		factor = 120
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_a_pleasant_evening"
+		MNC = { country_event = { days = 1 id = longsword.84 } }
+	}
+}
+
+shared_focus = {
+	id = LNS_maar_is_amused
+	icon = GFX_goal_devotion_to_maar
+	x = 1
+	y = 3
+	relative_position_id = LNS_a_chance_meeting
+	cost = 8.00
+	prerequisite = { focus = LNS_a_return_gift }
+	prerequisite = { focus = LNS_a_pleasant_evening }
+	available = {
+		is_subject = no
+		MNC = {
+			exists = yes
+			has_country_leader = { 
+				character = MNC_eriviar_sunstriker
+				ruling_only = yes 
+			}
+			is_subject = no
+			NOT = { has_war_with = ROOT }
+		}
+	}
+	bypass = {
+		OR = {
+			has_country_flag = LNS_rejected
+			MNC = { NOT = { has_government = fascism } }
+		}
+	}
+
+	ai_will_do = {
+		factor = 120
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_maar_is_amused"
+		custom_effect_tooltip = LNS_random_tp
+		hidden_effect = {
+			random_list = {
+				16 = {
+					add_political_power = 100
+				}
+				16 = {
+					add_stability = 0.05
+				}
+				16 = {
+					add_war_support = 0.05
+				}
+				20 = {
+					add_manpower = 30000
+				}
+				16 = {
+					random_owned_controlled_state = {
+						limit = {
+							free_building_slots = {
+								building = arms_factory
+								size > 0
+								include_locked = yes
+							}
+							OR = {
+								is_in_home_area = yes
+								NOT = {
+									owner = {
+										any_owned_state = {
+											free_building_slots = {
+												building = arms_factory
+												size > 0
+												include_locked = yes
+											}
+											is_in_home_area = yes
+										}
+									}
+								}
+							}
+						}
+						add_extra_state_shared_building_slots = 1
+						add_building_construction = {
+							type = arms_factory
+							level = 1
+							instant_build = yes
+						}
+					}
+				}
+				16 = {
+					random_owned_controlled_state = {
+						limit = {
+							free_building_slots = {
+								building = industrial_complex
+								size > 0
+								include_locked = yes
+							}
+							OR = {
+								is_in_home_area = yes
+								NOT = {
+									owner = {
+										any_owned_state = {
+											free_building_slots = {
+												building = industrial_complex
+												size > 0
+												include_locked = yes
+											}
+											is_in_home_area = yes
+										}
+									}
+								}
+							}
+						}
+						add_extra_state_shared_building_slots = 1
+						add_building_construction = {
+							type = industrial_complex
+							level = 1
+							instant_build = yes
+						}
+					}
+				}
+			}
+		}
+	}
+	search_filters = { FOCUS_FILTER_MANPOWER FOCUS_FILTER_POLITICAL FOCUS_FILTER_INDUSTRY FOCUS_FILTER_STABILITY FOCUS_FILTER_WAR_SUPPORT }
+}
+
+shared_focus = {
+	id = LNS_the_sunstriker_wedding
+	icon = GFX_goal_new_temple
+	x = 0
+	y = 4
+	relative_position_id = LNS_a_chance_meeting
+	cost = 8.00
+	prerequisite = { focus = LNS_some_wonderful_protection }
+	prerequisite = { focus = LNS_maar_is_amused }
+	available = {
+		is_subject = no
+		MNC = {
+			exists = yes
+			has_country_leader = { 
+				character = MNC_eriviar_sunstriker
+				ruling_only = yes 
+			}
+			is_subject = no
+			NOT = { has_war_with = ROOT }
+		}
+	}
+
+	ai_will_do = {
+		factor = 120
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_the_sunstriker_wedding"
+		MNC = { country_event = { days = 1 id = longsword.91 } }
+	}
+}
+
+shared_focus = {
+	id = LNS_defenceless_ponies
+	icon = GFX_focus_firtree
+	x = -4
+	y = 1
+	relative_position_id = LNS_consolidate_power
+	cost = 5.00
+	prerequisite = { focus = LNS_consolidate_power }
+	available = {
+		is_subject = no
+		owns_state = 633
+	}
+	bypass = {
+		OR = {
+			owns_state = 650
+			owns_state = 453
+		}
+	}
+	ai_will_do = {
+		factor = 120
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_defenceless_ponies"
+		custom_effect_tooltip = LNS_borderwars_unlocked
+		add_war_support = 0.05
+	}
+}
+shared_focus = {
+	id = LNS_beasts_of_burden
+	icon = GFX_goal_generic_slavery_pony
+	x = 1
+	y = 1
+	relative_position_id = LNS_defenceless_ponies
+	cost = 5.00
+	prerequisite = { focus = LNS_defenceless_ponies }
+	available = {
+		is_subject = no
+		owns_state = 650
+	}
+
+	ai_will_do = {
+		factor = 120
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_beasts_of_burden"
+		add_state_core = 650
+		add_ideas = LNS_beasts_of_burden_idea
+	}
+}
+shared_focus = {
+	id = LNS_mines_of_silverfalls
+	icon = GFX_goal_silver_reserve
+	x = -1
+	y = 1
+	relative_position_id = LNS_beasts_of_burden
+	cost = 5.00
+	prerequisite = { focus = LNS_beasts_of_burden }
+	available = {
+		is_subject = no
+		owns_state = 453
+	}
+
+	ai_will_do = {
+		factor = 120
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_mines_of_silverfalls"
+		add_state_core = 453
+		add_resource = {
+			type = steel
+			amount = 8
+			state = 453
+		}
+		custom_effect_tooltip = LNS_loot_3_tp
+		add_to_variable = {
+			var = loot
+			value = 3
+		}
+	}
+}
+
+shared_focus = {
+	id = LNS_enslave_the_illiterate
+	icon = GFX_goal_skull_fortification
+	x = -2
+	y = 1
+	relative_position_id = LNS_consolidate_power
+	cost = 8.00
+	prerequisite = { focus = LNS_consolidate_power }
+
+	ai_will_do = {
+		factor = 120
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_enslave_the_illiterate"
+		custom_effect_tooltip = LNS_education_tp
+		hidden_effect = {
+			country_event = { days = 300 id = longsword.95 }
+		}
+	}
+}
+
+shared_focus = {
+	id = LNS_massive_drug_fields
+	icon = GFX_goal_SZC_opium_tax
+	x = -2
+	y = 3
+	relative_position_id = LNS_consolidate_power
+	cost = 10.00
+	prerequisite = { focus = LNS_enslave_the_illiterate }
+
+	ai_will_do = {
+		factor = 120
+	}
+	available = {
+		552 = { is_owned_and_controlled_by = ROOT }
+		540 = { is_owned_and_controlled_by = ROOT }
+		505 = { is_owned_and_controlled_by = ROOT }
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_massive_drug_fields"
+		add_ideas = LNS_opium_fields
+		552 = {
+			add_extra_state_shared_building_slots = 1
+		}
+		540 = {
+			add_extra_state_shared_building_slots = 1
+		}
+		505 = {
+			add_extra_state_shared_building_slots = 1
+		}
+	}
+	search_filters = { FOCUS_FILTER_STABILITY FOCUS_FILTER_INDUSTRY FOCUS_FILTER_POLITICAL }
+}
+
+shared_focus = {
+	id = LNS_imperial_markets
+	icon = GFX_goal_bag_of_money
+	x = -2
+	y = 5
+	relative_position_id = LNS_consolidate_power
+	cost = 10.00
+	prerequisite = { focus = LNS_massive_drug_fields }
+
+	ai_will_do = {
+		factor = 120
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_imperial_markets"
+		add_political_power = 100
+		add_war_support = 0.05
+		add_stability = 0.05
+	}
+	search_filters = { FOCUS_FILTER_STABILITY FOCUS_FILTER_WAR_SUPPORT FOCUS_FILTER_POLITICAL }
+}
+
+shared_focus = {
+	id = LNS_despoil_the_land
+	icon = GFX_goal_forced_res
+	x = 0
+	y = 1
+	relative_position_id = LNS_consolidate_power
+	cost = 8.00
+	prerequisite = { focus = LNS_consolidate_power }
+
+	ai_will_do = {
+		factor = 120
+	}
+	available = {
+		552 = { is_controlled_by = ROOT }
+		540 = { is_controlled_by = ROOT }
+		505 = { is_controlled_by = ROOT }
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_despoil_the_land"
+		custom_effect_tooltip = LNS_loot_3_tp
+		add_to_variable = {
+			var = loot
+			value = 3
+		}
+		save_current_manpower = yes
+		552 = {
+			add_manpower = -15000
+		}
+		540 = {
+			add_manpower = -15000
+		}
+		505 = {
+			add_manpower = -15000
+		}
+		restore_previous_manpower = yes
+	}
+	search_filters = { FOCUS_FILTER_MANPOWER }
+}
+
+shared_focus = {
+	id = LNS_lesson_of_the_reformisten
+	icon = GFX_goal_slavery
+	x = -1
+	y = 2
+	relative_position_id = LNS_consolidate_power
+	cost = 8.00
+	prerequisite = { focus = LNS_despoil_the_land }
+
+	ai_will_do = {
+		factor = 120
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_lesson_of_the_reformisten"
+		add_ideas = LNS_meatshields
+	}
+	search_filters = { FOCUS_FILTER_MANPOWER FOCUS_FILTER_STABILITY FOCUS_FILTER_POLITICAL }
+}
+
+shared_focus = {
+	id = LNS_into_the_mines
+	icon = GFX_focus_indy_excavations
+	x = -1
+	y = 4
+	relative_position_id = LNS_consolidate_power
+	cost = 8.00
+	prerequisite = { focus = LNS_lesson_of_the_reformisten }
+	prerequisite = { focus = LNS_an_iron_grip }
+
+	ai_will_do = {
+		factor = 120
+	}
+	available = {
+		505 = { is_owned_and_controlled_by = ROOT }
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_into_the_mines"
+		swap_ideas = {
+			remove_idea = LNS_meatshields
+			add_idea = LNS_meatshields_1
+		}
+		add_resource = {
+			type = steel
+			amount = 8
+			state = 505
+		}
+	}
+	search_filters = { FOCUS_FILTER_MANPOWER FOCUS_FILTER_STABILITY FOCUS_FILTER_INDUSTRY FOCUS_FILTER_POLITICAL }
+}
+
+shared_focus = {
+	id = LNS_an_iron_grip
+	icon = GFX_goal_national_populism
+	x = 0
+	y = 3
+	relative_position_id = LNS_consolidate_power
+	cost = 8.00
+	prerequisite = { focus = LNS_lesson_of_the_reformisten focus = LNS_target_practice }
+
+	ai_will_do = {
+		factor = 120
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_an_iron_grip"
+		add_war_support = 0.10
+		add_stability = 0.05
+		add_popularity = { ideology = fascism popularity = 0.05 }
+	}
+	search_filters = { FOCUS_FILTER_STABILITY FOCUS_FILTER_WAR_SUPPORT }
+}
+
+shared_focus = {
+	id = LNS_target_practice
+	icon = GFX_goal_Modern_Weapons
+	x = 1
+	y = 2
+	relative_position_id = LNS_consolidate_power
+	cost = 8.00
+	prerequisite = { focus = LNS_despoil_the_land }
+
+	ai_will_do = {
+		factor = 120
+	}
+	available = {
+		552 = { is_controlled_by = ROOT }
+		540 = { is_controlled_by = ROOT }
+		505 = { is_controlled_by = ROOT }
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_target_practice"
+		army_experience = 25
+		add_manpower = 30000
+		add_corps_commander_role = {
+			character = LNS_werner_shadowfeather
+
+			traits = { trickster trait_reckless griffon_race_trait }
+			skill = 2
+			attack_skill = 3
+			defense_skill = 1
+			planning_skill = 1
+			logistics_skill = 2
+		} custom_effect_tooltip = LNS_werner_stats_tp
+		save_current_manpower = yes
+		552 = {
+			add_manpower = -10000
+		}
+		540 = {
+			add_manpower = -10000
+		}
+		505 = {
+			add_manpower = -10000
+		}
+		restore_previous_manpower = yes
+	}
+	search_filters = { FOCUS_FILTER_ARMY_BONUS FOCUS_FILTER_MANPOWER }
+}
+
+shared_focus = {
+	id = LNS_organ_donors
+	icon = GFX_goal_generic_dangerous_deal_pony_griffon
+	x = 1
+	y = 4
+	relative_position_id = LNS_consolidate_power
+	cost = 8.00
+	prerequisite = { focus = LNS_target_practice }
+	prerequisite = { focus = LNS_an_iron_grip }
+
+	ai_will_do = {
+		factor = 120
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_organ_donors"
+		custom_effect_tooltip = LNS_gradual_loot_tp
+		hidden_effect = {
+			country_event = { days = 180 id = longsword.97 }
+		}
+	}
+}
+
+shared_focus = {
+	id = LNS_reinvest_our_profits
+	icon = GFX_goal_gold_up
+	x = 0
+	y = 5
+	relative_position_id = LNS_consolidate_power
+	cost = 10.00
+	prerequisite = { focus = LNS_into_the_mines }
+	prerequisite = { focus = LNS_organ_donors }
+
+	ai_will_do = {
+		factor = 120
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_reinvest_our_profits"
+		increase_society_development = yes
+		increase_science_base = yes
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL FOCUS_FILTER_RESEARCH }
+}
+
+shared_focus = {
+	id = LNS_we_are_rich
+	icon = GFX_goal_endless_money
+	x = 0
+	y = 6
+	relative_position_id = LNS_consolidate_power
+	cost = 10.00
+	prerequisite = { focus = LNS_imperial_markets }
+	prerequisite = { focus = LNS_reinvest_our_profits }
+	prerequisite = { focus = LNS_black_market_arms_industry }
+
+	ai_will_do = {
+		factor = 120
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_we_are_rich"
+		add_research_slot = 1
+		increase_society_development = yes
+		increase_science_base = yes
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL FOCUS_FILTER_RESEARCH }
+}
+
+shared_focus = {
+	id = LNS_legalize_poverty
+	icon = GFX_goal_skull_treaty2
+	x = 2
+	y = 1
+	relative_position_id = LNS_consolidate_power
+	cost = 8.00
+	prerequisite = { focus = LNS_consolidate_power }
+
+	ai_will_do = {
+		factor = 120
+	}
+	available = {
+		any_owned_state = {
+			is_controlled_by = ROOT
+			free_building_slots = {
+				building = industrial_complex
+				size > 0
+				include_locked = yes
+			}
+		}
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_legalize_poverty"
+		decrease_poverty = yes
+		add_political_power = -75
+		random_owned_controlled_state = {
+			limit = {
+				free_building_slots = {
+					building = industrial_complex
+					size > 0
+					include_locked = yes
+				}
+				OR = {
+					is_in_home_area = yes
+					NOT = {
+						owner = {
+							any_owned_state = {
+								free_building_slots = {
+									building = industrial_complex
+									size > 0
+									include_locked = yes
+								}
+								is_in_home_area = yes
+							}
+						}
+					}
+				}
+			}
+			add_extra_state_shared_building_slots = 1
+			add_building_construction = {
+				type = industrial_complex
+				level = 1
+				instant_build = yes
+			}
+		}
+	}
+	search_filters = { FOCUS_FILTER_INDUSTRY FOCUS_FILTER_POLITICAL }
+}
+
+shared_focus = {
+	id = LNS_work_programs
+	icon = GFX_goal_forced_con
+	x = 2
+	y = 3
+	relative_position_id = LNS_consolidate_power
+	cost = 10.00
+	prerequisite = { focus = LNS_legalize_poverty }
+
+	ai_will_do = {
+		factor = 120
+	}
+	available = {
+		any_owned_state = {
+			is_controlled_by = ROOT
+			free_building_slots = {
+				building = industrial_complex
+				size > 0
+				include_locked = yes
+			}
+		}
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_work_programs"
+		decrease_poverty = yes
+		add_political_power = -100
+		random_owned_controlled_state = {
+			limit = {
+				free_building_slots = {
+					building = industrial_complex
+					size > 0
+					include_locked = yes
+				}
+				OR = {
+					is_in_home_area = yes
+					NOT = {
+						owner = {
+							any_owned_state = {
+								free_building_slots = {
+									building = industrial_complex
+									size > 0
+									include_locked = yes
+								}
+								is_in_home_area = yes
+							}
+						}
+					}
+				}
+			}
+			add_extra_state_shared_building_slots = 1
+			add_building_construction = {
+				type = industrial_complex
+				level = 1
+				instant_build = yes
+			}
+		}
+		random_owned_controlled_state = {
+			limit = {
+				free_building_slots = {
+					building = industrial_complex
+					size > 0
+					include_locked = yes
+				}
+				OR = {
+					is_in_home_area = yes
+					NOT = {
+						owner = {
+							any_owned_state = {
+								free_building_slots = {
+									building = industrial_complex
+									size > 0
+									include_locked = yes
+								}
+								is_in_home_area = yes
+							}
+						}
+					}
+				}
+			}
+			add_extra_state_shared_building_slots = 1
+			add_building_construction = {
+				type = industrial_complex
+				level = 1
+				instant_build = yes
+			}
+		}
+	}
+	search_filters = { FOCUS_FILTER_INDUSTRY FOCUS_FILTER_POLITICAL }
+}
+
+shared_focus = {
+	id = LNS_black_market_arms_industry
+	icon = GFX_goal_forced_mil
+	x = 2
+	y = 5
+	relative_position_id = LNS_consolidate_power
+	cost = 10.00
+	prerequisite = { focus = LNS_work_programs }
+
+	ai_will_do = {
+		factor = 120
+	}
+	available = {
+		any_owned_state = {
+			is_controlled_by = ROOT
+			free_building_slots = {
+				building = arms_factory
+				size > 0
+				include_locked = yes
+			}
+		}
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_black_market_arms_industry"
+		random_owned_controlled_state = {
+			limit = {
+				free_building_slots = {
+					building = arms_factory
+					size > 0
+					include_locked = yes
+				}
+				OR = {
+					is_in_home_area = yes
+					NOT = {
+						owner = {
+							any_owned_state = {
+								free_building_slots = {
+									building = arms_factory
+									size > 0
+									include_locked = yes
+								}
+								is_in_home_area = yes
+							}
+						}
+					}
+				}
+			}
+			add_extra_state_shared_building_slots = 1
+			add_building_construction = {
+				type = arms_factory
+				level = 1
+				instant_build = yes
+			}
+		}
+		random_owned_controlled_state = {
+			limit = {
+				free_building_slots = {
+					building = arms_factory
+					size > 0
+					include_locked = yes
+				}
+				OR = {
+					is_in_home_area = yes
+					NOT = {
+						owner = {
+							any_owned_state = {
+								free_building_slots = {
+									building = arms_factory
+									size > 0
+									include_locked = yes
+								}
+								is_in_home_area = yes
+							}
+						}
+					}
+				}
+			}
+			add_extra_state_shared_building_slots = 1
+			add_building_construction = {
+				type = arms_factory
+				level = 1
+				instant_build = yes
+			}
+		}
+	}
+	search_filters = { FOCUS_FILTER_INDUSTRY }
+}
+shared_focus = {
+	id = LNS_southern_sister
+	icon = GFX_goal_ban_blackrock
+	x = 4
+	y = 1
+	relative_position_id = LNS_consolidate_power
+	cost = 5.00
+	prerequisite = { focus = LNS_consolidate_power }
+	available = {
+		is_subject = no
+	}
+	bypass = {
+		BAN = {
+			OR = {
+				exists = no
+				is_subject = yes
+				NOT = {
+					has_government = fascism
+				}
+				has_war_with = ROOT
+			}
+		}
+	}
+	ai_will_do = {
+		factor = 120
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_southern_sister"
+		country_event = longsword.170
+		BAN = {
+			country_event = longsword.170
+		}
+	}
+}
+shared_focus = {
+	id = LNS_ally_blackrock
+	icon = GFX_goal_generic_military_deal
+	x = -1
+	y = 1
+	relative_position_id = LNS_southern_sister
+	cost = 5.00
+	prerequisite = { focus = LNS_southern_sister }
+	available = {
+		is_subject = no
+	}
+	bypass = {
+		BAN = {
+			OR = {
+				exists = no
+				is_subject = yes
+				NOT = {
+					has_government = fascism
+				}
+				has_war_with = ROOT
+				is_in_faction_with = ROOT
+			}
+		}
+	}
+	ai_will_do = {
+		factor = 120
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_ally_blackrock"
+		BAN = {
+			country_event = longsword.171
+		}
+	}
+}
+shared_focus = {
+	id = LNS_split_lushi
+	icon = GFX_goal_crown_and_swords
+	x = 1
+	y = 1
+	relative_position_id = LNS_ally_blackrock
+	cost = 8.00
+	prerequisite = { focus = LNS_ally_blackrock }
+	will_lead_to_war_with = LUS
+	bypass = {
+		LUS = {
+			OR = {
+				exists = no
+				has_war_with = ROOT
+				is_subject_of = ROOT
+				is_in_faction_with = ROOT
+			}
+		}
+	}
+	ai_will_do = {
+		factor = 120
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_split_lushi"
+		create_wargoal = {
+			target = LUS
+			type = annex_everything
+		}
+	}
+	search_filters = { FOCUS_FILTER_ANNEXATION }
+}
+
+shared_focus = {
+	id = LNS_friendship_is_banditry
+	icon = GFX_goal_nested_fortifications
+	x = 6
+	y = 1
+	relative_position_id = LNS_consolidate_power
+	cost = 8.00
+	prerequisite = { focus = LNS_consolidate_power }
+
+	ai_will_do = {
+		factor = 120
+	}
+	available = {
+		552 = { is_owned_and_controlled_by = ROOT }
+		540 = { is_owned_and_controlled_by = ROOT }
+		505 = { is_owned_and_controlled_by = ROOT }
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_friendship_is_banditry"
+		540 = {
+			add_building_construction = {
+				type = bunker
+				level = 1
+				province = 12893
+				instant_build = yes
+			}
+			add_building_construction = {
+				type = bunker
+				level = 1
+				province = 2055
+				instant_build = yes
+			}
+		}
+		552 = {
+			add_building_construction = {
+				type = bunker
+				level = 1
+				province = 9908
+				instant_build = yes
+			}
+			add_building_construction = {
+				type = bunker
+				level = 1
+				province = 9918
+				instant_build = yes
+			}
+			add_building_construction = {
+				type = bunker
+				level = 1
+				province = 9795
+				instant_build = yes
+			}
+			add_building_construction = {
+				type = bunker
+				level = 1
+				province = 11828
+				instant_build = yes
+			}
+			add_building_construction = {
+				type = bunker
+				level = 1
+				province = 11775
+				instant_build = yes
+			}
+			add_building_construction = {
+				type = bunker
+				level = 1
+				province = 978
+				instant_build = yes
+			}
+			add_building_construction = {
+				type = bunker
+				level = 1
+				province = 11770
+				instant_build = yes
+			}
+			add_building_construction = {
+				type = bunker
+				level = 1
+				province = 10083
+				instant_build = yes
+			}
+		}
+		505 = {
+			add_building_construction = {
+				type = bunker
+				level = 1
+				province = 7070
+				instant_build = yes
+			}
+		}
+	}
+	search_filters = { FOCUS_FILTER_INDUSTRY }
+}
+
+shared_focus = {
+	id = LNS_girls_night_out
+	icon = GFX_goal_focus_TRD_bottleforcyrus
+	x = -1
+	y = 1
+	relative_position_id = LNS_friendship_is_banditry
+	cost = 10.00
+	prerequisite = { focus = LNS_friendship_is_banditry }
+	available = {
+		any_owned_state = {
+			is_controlled_by = ROOT
+			free_building_slots = {
+				building = industrial_complex
+				size > 0
+				include_locked = yes
+			}
+		}
+	}
+
+	ai_will_do = {
+		factor = 120
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_girls_night_out"
+		add_political_power = -50
+		random_owned_controlled_state = {
+			limit = {
+				free_building_slots = {
+					building = industrial_complex
+					size > 0
+					include_locked = yes
+				}
+				OR = {
+					is_in_home_area = yes
+					NOT = {
+						owner = {
+							any_owned_state = {
+								free_building_slots = {
+									building = industrial_complex
+									size > 0
+									include_locked = yes
+								}
+								is_in_home_area = yes
+							}
+						}
+					}
+				}
+			}
+			add_extra_state_shared_building_slots = 1
+			add_building_construction = {
+				type = industrial_complex
+				level = 1
+				instant_build = yes
+			}
+		}
+	}
+	search_filters = { FOCUS_FILTER_INDUSTRY FOCUS_FILTER_POLITICAL }
+}
+
+shared_focus = {
+	id = LNS_smuggling
+	icon = GFX_goal_LEC_Cigarettes
+	x = -1
+	y = 3
+	relative_position_id = LNS_friendship_is_banditry
+	cost = 10.00
+	prerequisite = { focus = LNS_girls_night_out }
+	prerequisite = { focus = LNS_besties }
+	available = {
+		any_owned_state = {
+			is_controlled_by = ROOT
+			free_building_slots = {
+				building = industrial_complex
+				size > 0
+				include_locked = yes
+			}
+		}
+	}
+
+	ai_will_do = {
+		factor = 120
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_smuggling"
+		add_political_power = -75
+		random_owned_controlled_state = {
+			limit = {
+				free_building_slots = {
+					building = industrial_complex
+					size > 0
+					include_locked = yes
+				}
+				OR = {
+					is_in_home_area = yes
+					NOT = {
+						owner = {
+							any_owned_state = {
+								free_building_slots = {
+									building = industrial_complex
+									size > 0
+									include_locked = yes
+								}
+								is_in_home_area = yes
+							}
+						}
+					}
+				}
+			}
+			add_extra_state_shared_building_slots = 1
+			add_building_construction = {
+				type = industrial_complex
+				level = 1
+				instant_build = yes
+			}
+		}
+		random_owned_controlled_state = {
+			limit = {
+				free_building_slots = {
+					building = industrial_complex
+					size > 0
+					include_locked = yes
+				}
+				OR = {
+					is_in_home_area = yes
+					NOT = {
+						owner = {
+							any_owned_state = {
+								free_building_slots = {
+									building = industrial_complex
+									size > 0
+									include_locked = yes
+								}
+								is_in_home_area = yes
+							}
+						}
+					}
+				}
+			}
+			add_extra_state_shared_building_slots = 1
+			add_building_construction = {
+				type = industrial_complex
+				level = 1
+				instant_build = yes
+			}
+		}
+	}
+	search_filters = { FOCUS_FILTER_INDUSTRY FOCUS_FILTER_POLITICAL }
+}
+
+shared_focus = {
+	id = LNS_besties
+	icon = GFX_goal_gold_reserve_2
+	x = 0
+	y = 2
+	relative_position_id = LNS_friendship_is_banditry
+	cost = 8.00
+	prerequisite = { focus = LNS_girls_night_out focus = LNS_naniwich_mountain_trip }
+
+	ai_will_do = {
+		factor = 120
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_besties"
+		custom_effect_tooltip = LNS_loot_3_tp
+		add_to_variable = {
+			var = loot
+			value = 3
+		}
+	}
+}
+
+shared_focus = {
+	id = LNS_naniwich_mountain_trip
+	icon = GFX_goal_offensive_army
+	x = 1
+	y = 1
+	relative_position_id = LNS_friendship_is_banditry
+	cost = 10.00
+	prerequisite = { focus = LNS_friendship_is_banditry }
+	available = {
+		any_owned_state = {
+			is_controlled_by = ROOT
+			free_building_slots = {
+				building = arms_factory
+				size > 0
+				include_locked = yes
+			}
+		}
+	}
+
+	ai_will_do = {
+		factor = 120
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_naniwich_mountain_trip"
+		add_political_power = -25
+		random_owned_controlled_state = {
+			limit = {
+				free_building_slots = {
+					building = arms_factory
+					size > 0
+					include_locked = yes
+				}
+				OR = {
+					is_in_home_area = yes
+					NOT = {
+						owner = {
+							any_owned_state = {
+								free_building_slots = {
+									building = arms_factory
+									size > 0
+									include_locked = yes
+								}
+								is_in_home_area = yes
+							}
+						}
+					}
+				}
+			}
+			add_extra_state_shared_building_slots = 1
+			add_building_construction = {
+				type = arms_factory
+				level = 1
+				instant_build = yes
+			}
+		}
+	}
+	search_filters = { FOCUS_FILTER_INDUSTRY FOCUS_FILTER_POLITICAL }
+}
+
+shared_focus = {
+	id = LNS_arms_trade
+	icon = GFX_goal_Arms_Export
+	x = 1
+	y = 3
+	relative_position_id = LNS_friendship_is_banditry
+	cost = 8.00
+	prerequisite = { focus = LNS_naniwich_mountain_trip }
+	prerequisite = { focus = LNS_besties }
+	available = {
+		any_owned_state = {
+			is_controlled_by = ROOT
+			free_building_slots = {
+				building = arms_factory
+				size > 0
+				include_locked = yes
+			}
+		}
+	}
+
+	ai_will_do = {
+		factor = 120
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_arms_trade"
+		add_political_power = -25
+		random_owned_controlled_state = {
+			limit = {
+				free_building_slots = {
+					building = arms_factory
+					size > 0
+					include_locked = yes
+				}
+				OR = {
+					is_in_home_area = yes
+					NOT = {
+						owner = {
+							any_owned_state = {
+								free_building_slots = {
+									building = arms_factory
+									size > 0
+									include_locked = yes
+								}
+								is_in_home_area = yes
+							}
+						}
+					}
+				}
+			}
+			add_extra_state_shared_building_slots = 1
+			add_building_construction = {
+				type = arms_factory
+				level = 1
+				instant_build = yes
+			}
+		}
+	}
+	search_filters = { FOCUS_FILTER_INDUSTRY FOCUS_FILTER_POLITICAL }
+}
+
+shared_focus = {
+	id = LNS_longswordian_dream
+	icon = GFX_goal_chn_economic_plan
+	x = 0
+	y = 4
+	relative_position_id = LNS_friendship_is_banditry
+	cost = 8.00
+	prerequisite = { focus = LNS_smuggling }
+	prerequisite = { focus = LNS_arms_trade }
+
+	ai_will_do = {
+		factor = 120
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_longswordian_dream"
+		add_ideas = LNS_dream_idea
+		add_popularity = { 
+			ideology = fascism 
+			popularity = 0.1
+		}
+	}
+}
+
+#####################
+### Bandit / Army ###
+#####################
+
+shared_focus = {
+	id = LNS_bandit_army
+	icon = GFX_goal_MAF_African_Pilots
+	x = -10
+	y = 1
+	relative_position_id = LNS_bandit_victory
+	cost = 5.00
+	prerequisite = { focus = LNS_bandit_victory }
+
+	ai_will_do = {
+		factor = 60
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_bandit_army"
+		army_experience = 20
+	}
+	search_filters = { FOCUS_FILTER_ARMY_BONUS }
+}
+
+shared_focus = {
+	id = LNS_get_guns
+	icon = GFX_goal_van_rifles
+	x = -2
+	y = 1
+	relative_position_id = LNS_bandit_army
+	cost = 8.00
+	prerequisite = { focus = LNS_bandit_army }
+
+	ai_will_do = {
+		factor = 60
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_get_guns"
+		add_tech_bonus = {
+			name = infantry_weapons_bonus
+			bonus = 1.0
+			uses = 1
+			category = infantry_weapons
+		}
+		add_equipment_to_stockpile = { type = infantry_equipment amount = 750 producer = HLQ }
+		add_equipment_to_stockpile = { type = infantry_equipment amount = 500 producer = LUS }
+		add_equipment_to_stockpile = { type = infantry_equipment amount = 250 producer = LCT }
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_equipment_subsidy = {
+				cic = 250
+				equipment_type = infantry_equipment
+				seller_tags = { LUS BRF GRW GRU GRY BAN }
+			}
+			add_equipment_subsidy = {
+				cic = 250
+				equipment_type = infantry_equipment
+				seller_tags = { RCT LCT NIM WIT BAK DEP DMT FBK WAT FIR FRE }
+			}
+		}
+	}
+	search_filters = { FOCUS_FILTER_RESEARCH }
+}
+
+shared_focus = {
+	id = LNS_basic_artillery
+	icon = GFX_goal_national_artillery
+	x = -2
+	y = 3
+	relative_position_id = LNS_bandit_army
+	cost = 10.00
+	prerequisite = { focus = LNS_get_guns }
+
+	ai_will_do = {
+		factor = 60
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_basic_artillery"
+		add_equipment_to_stockpile = { type = artillery_equipment_1 amount = 500 producer = HLQ }
+		add_tech_bonus = {
+			name = infantry_weapons_bonus
+			bonus = 1.0
+			uses = 1
+			category = artillery
+		}
+	}
+	search_filters = { FOCUS_FILTER_RESEARCH }
+}
+
+shared_focus = {
+	id = LNS_pull_out_shovels
+	icon = GFX_goal_forced_res
+	x = -1
+	y = 2
+	relative_position_id = LNS_bandit_army
+	cost = 10.00
+	prerequisite = { focus = LNS_get_guns }
+	prerequisite = { focus = LNS_organize_warbands }
+
+	ai_will_do = {
+		factor = 60
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_pull_out_shovels"
+		add_equipment_to_stockpile = { type = support_equipment_1 amount = 300 producer = LCT }
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_equipment_subsidy = {
+				cic = 500
+				equipment_type = support_equipment
+				seller_tags = { RCT LCT NIM WIT BAK DEP DMT FBK WAT FIR FRE }
+			}
+		}
+		add_tech_bonus = {
+			name = infantry_bonus
+			bonus = 1.0
+			uses = 1
+			category = support_tech
+		}
+	}
+	search_filters = { FOCUS_FILTER_RESEARCH }
+}
+
+shared_focus = {
+	id = LNS_organize_warbands
+	icon = GFX_goal_national_arsenal
+	x = 0
+	y = 1
+	relative_position_id = LNS_bandit_army
+	cost = 8.00
+	prerequisite = { focus = LNS_bandit_army }
+
+	ai_will_do = {
+		factor = 60
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_organize_warbands"
+		add_manpower = 40000
+		army_experience = 15
+	}
+	search_filters = { FOCUS_FILTER_MANPOWER FOCUS_FILTER_ARMY_BONUS }
+}
+
+shared_focus = {
+	id = LNS_appoint_leaders
+	icon = GFX_focus_generic_military_mission
+	x = 2
+	y = 1
+	relative_position_id = LNS_bandit_army
+	cost = 8.00
+	prerequisite = { focus = LNS_bandit_army }
+
+	ai_will_do = {
+		factor = 60
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_appoint_leaders"
+		army_experience = 15
+		add_corps_commander_role = {
+			character = LNS_joachim_ehrenberg
+
+			traits = { infantry_officer trait_reckless griffon_race_trait }
+			skill = 2
+			attack_skill = 4
+			defense_skill = 1
+			planning_skill = 3
+			logistics_skill = 2
+		} custom_effect_tooltip = LNS_joachim_stats_tp
+		add_corps_commander_role = {
+			character = LNS_augustin_lichter
+
+			traits = { ranger griffon_race_trait }
+			skill = 2
+			attack_skill = 3
+			defense_skill = 1
+			planning_skill = 1
+			logistics_skill = 2
+		} custom_effect_tooltip = LNS_augustin_stats_tp
+		add_corps_commander_role = {
+			character = LNS_dionysus_mooncrest
+
+			traits = { expert_improviser griffon_race_trait }
+			skill = 2
+			attack_skill = 1
+			defense_skill = 3
+			planning_skill = 1
+			logistics_skill = 2
+		} custom_effect_tooltip = LNS_dionysus_stats_tp
+	}
+	search_filters = { FOCUS_FILTER_ARMY_BONUS }
+}
+
+shared_focus = {
+	id = LNS_personal_armies
+	icon = GFX_goal_authority
+	x = 2
+	y = 3
+	relative_position_id = LNS_bandit_army
+	cost = 10.00
+	prerequisite = { focus = LNS_appoint_leaders }
+
+	ai_will_do = {
+		factor = 60
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_personal_armies"
+		add_manpower = 20000
+		add_ideas = LNS_personal_armies_idea
+	}
+	search_filters = { FOCUS_FILTER_MANPOWER FOCUS_FILTER_ARMY_BONUS }
+}
+
+shared_focus = {
+	id = LNS_new_tactics
+	icon = GFX_goal_generic_position_armies
+	x = 1
+	y = 2
+	relative_position_id = LNS_bandit_army
+	cost = 10.00
+	prerequisite = { focus = LNS_appoint_leaders }
+	prerequisite = { focus = LNS_organize_warbands }
+
+	ai_will_do = {
+		factor = 60
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_new_tactics"
+		add_doctrine_cost_reduction = {
+			name = land_doc_bonus
+			cost_reduction = 0.5
+			uses = 2
+			category = land_doctrine
+		}
+	}
+	search_filters = { FOCUS_FILTER_RESEARCH }
+}
+
+shared_focus = {
+	id = LNS_hit_and_run
+	icon = GFX_goal_planning_bonus
+	x = 0
+	y = 3
+	relative_position_id = LNS_bandit_army
+	cost = 10.00
+	prerequisite = { focus = LNS_pull_out_shovels }
+	prerequisite = { focus = LNS_new_tactics }
+
+	ai_will_do = {
+		factor = 60
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_hit_and_run"
+		add_ideas = LNS_hit_and_run_idea
+	}
+	search_filters = { FOCUS_FILTER_ARMY_BONUS }
+}
+
+shared_focus = {
+	id = LNS_tank_raiding_brigade
+	icon = GFX_focus_NZL_bob_semple_tank
+	x = -1
+	y = 4
+	relative_position_id = LNS_bandit_army
+	cost = 10.00
+	prerequisite = { focus = LNS_hit_and_run }
+	prerequisite = { focus = LNS_basic_artillery }
+
+	ai_will_do = {
+		factor = 60
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_tank_raiding_brigade"
+		if = {
+			limit = {
+				OR = {
+					has_tech = gwtank
+					has_tech = gwtank_chassis
+				}
+			}
+			add_tech_bonus = {
+				name = light_tank_bonus
+				bonus = 1.0
+				uses = 1
+				category = cat_light_armor
+			}
+			else = {
+				if = {
+					limit = {
+						has_dlc = "No Step Back"
+					}
+					set_technology = {
+						gwtank_chassis = 1
+					}
+				}
+				else = {			
+					set_technology = {
+						gwtank = 1
+					}
+				}
+			}
+		}
+		add_equipment_to_stockpile = {
+			type = gw_tank_equipment
+			amount = 150
+			producer = LNS
+		}
+	}
+	search_filters = { FOCUS_FILTER_RESEARCH }
+}
+
+shared_focus = {
+	id = LNS_baggage
+	icon = GFX_goal_forced_inf
+	x = 1
+	y = 4
+	relative_position_id = LNS_bandit_army
+	cost = 10.00
+	prerequisite = { focus = LNS_hit_and_run }
+	prerequisite = { focus = LNS_personal_armies }
+
+	ai_will_do = {
+		factor = 60
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_baggage"
+		add_ideas = LNS_baggae_idea
+	}
+	search_filters = { FOCUS_FILTER_ARMY_BONUS }
+}
+
+shared_focus = {
+	id = LNS_the_apocalypse
+	icon = GFX_goal_Black_State_Rising_2
+	x = 0
+	y = 5
+	relative_position_id = LNS_bandit_army
+	cost = 10.00
+	prerequisite = { focus = LNS_baggage }
+	prerequisite = { focus = LNS_tank_raiding_brigade }
+
+	ai_will_do = {
+		factor = 60
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_the_apocalypse"
+		custom_effect_tooltip = LNS_despoiler_tp
+		hidden_effect = {
+			load_oob = "LNS_despoiler_brigades"
+		}
+	}
+	search_filters = { FOCUS_FILTER_MANPOWER }
+}
+
+#####################
+### Bandit Airforce ###
+#####################
+
+shared_focus = {
+	id = LNS_bandit_airforce
+	icon = GFX_goal_POL_recon_aircraft
+	x = 10
+	y = 1
+	relative_position_id = LNS_bandit_victory
+	cost = 5.00
+	prerequisite = { focus = LNS_bandit_victory }
+
+	ai_will_do = {
+		factor = 40
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_bandit_airforce"
+		air_experience = 20
+	}
+	search_filters = { FOCUS_FILTER_AIRFORCE_BONUS }
+}
+
+shared_focus = {
+	id = LNS_fighters
+	icon = GFX_goal_generic_air_fighter
+	x = -2
+	y = 1
+	relative_position_id = LNS_bandit_airforce
+	cost = 8.00
+	prerequisite = { focus = LNS_bandit_airforce }
+
+	ai_will_do = {
+		factor = 40
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_fighters"
+		if = {
+			limit = {
+				has_dlc = "By Blood Alone"
+			}
+			add_tech_bonus = {
+				name = fighter_bonus
+				bonus = 1.0
+				uses = 1
+				category = light_fighter
+			}
+			add_equipment_to_stockpile = {
+				type = small_plane_airframe_0
+				producer = GRI
+				variant_name = "Fluggerät Heureka"
+				amount = 100
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = fighter_bonus
+				bonus = 1.0
+				uses = 1
+				category = light_fighter
+			}
+			add_equipment_to_stockpile = {
+				type = fighter_equipment_0
+				amount = 100
+				producer = GRI
+			}
+		}
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_equipment_subsidy = {
+				cic = 500
+				equipment_type = small_plane_airframe
+				seller_tags = { GRI STW ANG FEA BRZ PYT YAL KAT ROU }
+			}
+		}
+	}
+	search_filters = { FOCUS_FILTER_RESEARCH }
+}
+
+shared_focus = {
+	id = LNS_heavier_fighters
+	icon = GFX_focus_chi_flying_tigers
+	x = -2
+	y = 3
+	relative_position_id = LNS_bandit_airforce
+	cost = 10.00
+	prerequisite = { focus = LNS_fighters }
+
+	ai_will_do = {
+		factor = 40
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_heavier_fighters"
+		if = {
+            limit = {
+                has_dlc = "By Blood Alone"
+            }
+			add_tech_bonus = {
+				name = medium_air
+				bonus = 1.0
+				uses = 1
+				category = medium_air
+			}
+			add_tech_bonus = {
+				name = cat_air_guns
+				bonus = 0.75
+				uses = 2
+				category = cat_air_guns
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = fighter_bonus
+				bonus = 3.0
+				uses = 1
+				category = cat_heavy_fighter
+			}
+		}
+	}
+	search_filters = { FOCUS_FILTER_RESEARCH }
+}
+
+shared_focus = {
+	id = LNS_airfields
+	icon = GFX_goal_generic_air_production
+	x = 0
+	y = 1
+	relative_position_id = LNS_bandit_airforce
+	cost = 8.00
+	prerequisite = { focus = LNS_bandit_airforce }
+
+	ai_will_do = {
+		factor = 40
+	}
+	available = {
+		540 = { is_owned_and_controlled_by = ROOT }
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_airfields"
+		540 = {
+			add_extra_state_shared_building_slots = 1
+			add_building_construction = {
+				type = air_base
+				level = 1
+				instant_build = yes
+			}
+		}
+	}
+	search_filters = { FOCUS_FILTER_INDUSTRY }
+}
+
+shared_focus = {
+	id = LNS_our_own_doctrine
+	icon = GFX_goal_generic_build_airforce
+	x = -1
+	y = 2
+	relative_position_id = LNS_bandit_airforce
+	cost = 10.00
+	prerequisite = { focus = LNS_airfields }
+	prerequisite = { focus = LNS_fighters }
+
+	ai_will_do = {
+		factor = 40
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_our_own_doctrine"
+		add_doctrine_cost_reduction = {
+			name = air_doc_bonus
+			cost_reduction = 0.75
+			uses = 1
+			category = air_doctrine
+		}
+		air_experience = 15
+	}
+	search_filters = { FOCUS_FILTER_AIRFORCE_BONUS FOCUS_FILTER_RESEARCH }
+}
+
+shared_focus = {
+	id = LNS_close_air_support
+	icon = GFX_goal_generic_CAS
+	x = 1
+	y = 2
+	relative_position_id = LNS_bandit_airforce
+	cost = 10.00
+	prerequisite = { focus = LNS_airfields }
+	prerequisite = { focus = LNS_bombers }
+
+	ai_will_do = {
+		factor = 40
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_close_air_support"
+		if = {
+            limit = {
+                has_dlc = "By Blood Alone"
+            }
+			add_tech_bonus = {
+				name = rocketry
+				bonus = 0.75
+				uses = 1
+				category = rocketry
+			}
+			add_tech_bonus = {
+				name = cat_anti_tank
+				bonus = 0.5
+				uses = 2
+				category = cat_anti_tank
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = bomber_bonus
+				bonus = 3.0
+				uses = 1
+				category = cas_bomber
+			}
+		}
+	}
+	search_filters = { FOCUS_FILTER_RESEARCH }
+}
+
+shared_focus = {
+	id = LNS_further_developments
+	icon = GFX_goal_generic_air_doctrine
+	x = 0
+	y = 3
+	relative_position_id = LNS_bandit_airforce
+	cost = 10.00
+	prerequisite = { focus = LNS_our_own_doctrine }
+	prerequisite = { focus = LNS_close_air_support }
+
+	ai_will_do = {
+		factor = 40
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_further_developments"
+		add_tech_bonus = {
+			name = air_doc_bonus
+			bonus = 1.0
+			uses = 2
+			category = air_doctrine
+		}
+		air_experience = 15
+	}
+	search_filters = { FOCUS_FILTER_AIRFORCE_BONUS FOCUS_FILTER_RESEARCH }
+}
+
+shared_focus = {
+	id = LNS_bombers
+	icon = GFX_goal_generic_air_bomber
+	x = 2
+	y = 1
+	relative_position_id = LNS_bandit_airforce
+	cost = 8.00
+	prerequisite = { focus = LNS_bandit_airforce }
+
+	ai_will_do = {
+		factor = 40
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_bombers"
+		if = {
+            limit = {
+                has_dlc = "By Blood Alone"
+            }
+			add_tech_bonus = {
+				name = medium_air
+				bonus = 3.0
+				uses = 1
+				category = medium_air
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = tactical_bomber
+				bonus = 3.0
+				uses = 1
+				category = tactical_bomber
+			}
+		}
+	}
+	search_filters = { FOCUS_FILTER_RESEARCH }
+}
+
+shared_focus = {
+	id = LNS_strategic_bombers
+	icon = GFX_goal_generic_occupy_start_war
+	x = 2
+	y = 3
+	relative_position_id = LNS_bandit_airforce
+	cost = 10.00
+	prerequisite = { focus = LNS_bombers }
+
+	ai_will_do = {
+		factor = 40
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_strategic_bombers"
+		if = {
+            limit = {
+                has_dlc = "By Blood Alone"
+            }
+			add_tech_bonus = {
+				name = heavy_air
+				bonus = 3.0
+				uses = 1
+				category = heavy_air
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = bomber_bonus
+				bonus = 3.0
+				uses = 1
+				category = cat_strategic_bomber
+			}
+		}
+	}
+	search_filters = { FOCUS_FILTER_RESEARCH }
+}
+
+shared_focus = {
+	id = LNS_ace_fighters
+	icon = GFX_goal_leopardo_government
+	x = -1
+	y = 4
+	relative_position_id = LNS_bandit_airforce
+	cost = 10.00
+	prerequisite = { focus = LNS_heavier_fighters }
+	prerequisite = { focus = LNS_further_developments }
+
+	ai_will_do = {
+		factor = 40
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_ace_fighters"
+		add_ideas = LNS_ace_fighters_idea
+	}
+	search_filters = { FOCUS_FILTER_AIRFORCE_BONUS }
+}
+
+shared_focus = {
+	id = LNS_napalm
+	icon = GFX_goal_MAF_Napalm
+	x = 1
+	y = 4
+	relative_position_id = LNS_bandit_airforce
+	cost = 10.00
+	prerequisite = { focus = LNS_strategic_bombers }
+	prerequisite = { focus = LNS_further_developments }
+
+	ai_will_do = {
+		factor = 40
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_napalm"
+		add_ideas = LNS_napalm_idea
+	}
+	search_filters = { FOCUS_FILTER_AIRFORCE_BONUS }
+}
+
+shared_focus = {
+	id = LNS_jet_experiments
+	icon = GFX_focus_rocketry
+	x = 0
+	y = 5
+	relative_position_id = LNS_bandit_airforce
+	cost = 10.00
+	prerequisite = { focus = LNS_ace_fighters }
+	prerequisite = { focus = LNS_napalm }
+
+	ai_will_do = {
+		factor = 40
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LNS_jet_experiments"
+		add_tech_bonus = {
+			name = LNS_jet_experiments
+			bonus = 3
+			uses = 1
+			category = jet_technology
+		}
+	}
+	search_filters = { FOCUS_FILTER_RESEARCH }
+}
+
+###############################################################
+### Longsword Republic (LSC) Political Tree ###
+###############################################################
+
+shared_focus = {
+	id = LSC_constitutional_convention
+	icon = GFX_focus_indy_democratic_process
+	cost = 10
+	ai_will_do = { factor = 100 }
+	select_effect = {
+		country_event = longsword.102
+	}
+	x = 6
+	y = 0
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_constitutional_convention"
+		custom_effect_tooltip = unlock_focuses
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+shared_focus = {
+	id = LSC_fate_of_rosewood
+	icon = GFX_goal_griffon_knights
+	cost = 4
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSC_constitutional_convention }
+	x = 6
+	y = 1
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_constitutional_convention"
+		country_event = longsword.107
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+shared_focus = {
+	id = LSC_lemiamas_suolis
+	icon = GFX_goal_improve_industry
+	cost = 6
+	ai_will_do = { factor = 120 }
+	prerequisite = { focus = LSC_constitutional_convention }
+	x = 3
+	y = 1
+	relative_position_id = LSC_constitutional_convention
+	available = { 
+		has_war = no
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_lemiamas_suolis"
+		set_variable = {
+			var = LSC_factory_goals
+			value = ROOT.num_of_factories
+		}
+		multiply_variable = { LSC_factory_goals = 2 } 
+		if = {
+			limit = {
+				check_variable = { LSC_factory_goals < 15 }
+			}
+			set_variable = {
+				var = LSC_factory_goals
+				value = 15
+			}
+		}
+		activate_mission = LSC_three_year_plan
+		LNS_reduce_civil_war_recovery = yes
+	}
+	search_filters = { FOCUS_FILTER_INDUSTRY }
+}
+shared_focus = {
+	id = LSC_social_services
+	icon = GFX_goal_endless_money
+	cost = 6
+	ai_will_do = { 
+		factor = 100 
+		modifier = {
+			factor = 1.5
+			has_active_mission = LSC_three_year_plan
+		}
+	}
+	prerequisite = { focus = LSC_lemiamas_suolis }
+	x = 1
+	y = 2
+	relative_position_id = LSC_constitutional_convention
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_social_services"
+		add_stability = 0.05
+		custom_effect_tooltip = LNS_poverty_tp
+		hidden_effect = {
+			country_event = { days = 160 id = longsword.40 }
+		}
+		LNS_reduce_civil_war_recovery = yes
+	}
+	search_filters = { FOCUS_FILTER_INDUSTRY }
+}
+shared_focus = {
+	id = LSC_urbanization
+	icon = GFX_goal_ITA_urban
+	cost = 6
+	ai_will_do = { 
+		factor = 100
+		modifier = {
+			factor = 1.5
+			has_active_mission = LSC_three_year_plan
+		}
+	}
+	prerequisite = { focus = LSC_lemiamas_suolis }
+	x = 2
+	y = 3
+	relative_position_id = LSC_constitutional_convention
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_urbanization"
+		custom_effect_tooltip = LSC_urbanization_decisions_tooltip
+		increase_society_development_with_tt = yes
+	}
+	search_filters = { FOCUS_FILTER_INDUSTRY }
+}
+shared_focus = {
+	id = LSC_railway_modernization
+	icon = GFX_goal_generic_railroad
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSC_lemiamas_suolis }
+	x = 3
+	y = 2
+	relative_position_id = LSC_constitutional_convention
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_railway_modernization"
+		custom_effect_tooltip = LSC_railway_modernization_decision_tooltip
+		LNS_reduce_civil_war_recovery = yes
+	}
+	search_filters = { FOCUS_FILTER_INDUSTRY }
+}
+shared_focus = {
+	id = LSC_land_redistribution
+	icon = GFX_goal_OTT_Land_Reform
+	cost = 6
+	ai_will_do = { 
+		factor = 100
+		modifier = {
+			factor = 1.5
+			has_active_mission = LSC_three_year_plan
+		}
+	}
+	prerequisite = { focus = LSC_lemiamas_suolis }
+	x = 5
+	y = 2
+	relative_position_id = LSC_constitutional_convention
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_railway_modernization"
+		505 = { add_extra_state_shared_building_slots = 1 }
+		540 = { add_extra_state_shared_building_slots = 1 }
+		552 = { add_extra_state_shared_building_slots = 1 }
+		add_ideas = LNS_land_reform_1
+		LNS_reduce_civil_war_recovery = yes
+	}
+	search_filters = { FOCUS_FILTER_INDUSTRY }
+}
+shared_focus = {
+	id = LSC_textile_industry
+	icon = GFX_goal_SZC_silk
+	cost = 6
+	ai_will_do = { 
+		factor = 100
+		modifier = {
+			factor = 1.5
+			has_active_mission = LSC_three_year_plan
+		}
+	}
+	prerequisite = { focus = LSC_land_redistribution }
+	x = 4
+	y = 3
+	relative_position_id = LSC_constitutional_convention
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_textile_industry"
+		505 = {
+			add_extra_state_shared_building_slots = 1
+			add_building_construction = {
+				type = industrial_complex
+				level = 1
+				instant_build = yes
+			}
+		}
+		LNS_reduce_civil_war_recovery = yes
+	}
+	search_filters = { FOCUS_FILTER_INDUSTRY }
+}
+shared_focus = {
+	id = LSC_rural_reconstruction
+	icon = GFX_goal_agricultural_aid
+	cost = 6
+	ai_will_do = { 
+		factor = 100
+		modifier = {
+			factor = 1.5
+			has_active_mission = LSC_three_year_plan
+		}
+	}
+	prerequisite = { focus = LSC_land_redistribution }
+	x = 6
+	y = 3
+	relative_position_id = LSC_constitutional_convention
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_rural_reconstruction"
+		LNS_reduce_civil_war_recovery = yes
+		add_tech_bonus = {
+			name = LSC_rural_reconstruction
+			bonus = 0.5
+			uses = 1
+			category = construction_tech
+		}
+	}
+	search_filters = { FOCUS_FILTER_INDUSTRY }
+}
+shared_focus = {
+	id = LSC_export_agriculture
+	icon = GFX_goal_bag_of_money_pony_griffon
+	cost = 6
+	ai_will_do = { 
+		factor = 100
+		modifier = {
+			factor = 1.5
+			has_active_mission = LSC_three_year_plan
+		}
+	}
+	prerequisite = { focus = LSC_rural_reconstruction }
+	prerequisite = { focus = LSC_textile_industry }
+	x = 5
+	y = 4
+	relative_position_id = LSC_constitutional_convention
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_rural_reconstruction"
+		LNS_reduce_civil_war_recovery = yes
+		unlock_decision_tooltip = LSC_forestry_development
+		custom_effect_tooltip = LSC_export_routes_tooltip
+	}
+	search_filters = { FOCUS_FILTER_INDUSTRY }
+}
+shared_focus = {
+	id = LSC_central_industrial_region
+	icon = GFX_goal_factory_complex
+	cost = 6
+	ai_will_do = { 
+		factor = 100
+		modifier = {
+			factor = 1.5
+			has_active_mission = LSC_three_year_plan
+		}
+	}
+	prerequisite = { focus = LSC_urbanization }
+	prerequisite = { focus = LSC_social_services }
+	x = 1
+	y = 4
+	relative_position_id = LSC_constitutional_convention
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_central_industrial_region"
+		unlock_decision_tooltip = LSC_new_swordsson_district
+		unlock_decision_tooltip = LSC_unity_district
+		unlock_decision_tooltip = LSC_blood_district
+		add_tech_bonus = {
+			name = LSC_central_industrial_region
+			bonus = 0.5
+			uses = 2
+			category = industry
+		}
+		LNS_reduce_civil_war_recovery = yes
+	}
+	search_filters = { FOCUS_FILTER_INDUSTRY }
+}
+shared_focus = {
+	id = LSC_applied_research
+	icon = GFX_goal_supremacy_of_will
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSC_central_industrial_region }
+	x = 2
+	y = 5
+	relative_position_id = LSC_constitutional_convention
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_applied_research"
+		add_research_slot = 1
+		Improve_Science_Base = yes
+		LNS_reduce_civil_war_recovery = yes
+	}
+	search_filters = { FOCUS_FILTER_RESEARCH }
+}
+shared_focus = {
+	id = LSC_new_arms_industries
+	icon = GFX_goal_generic_army_tank_2
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSC_central_industrial_region }
+	x = 0
+	y = 5
+	relative_position_id = LSC_constitutional_convention
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_applied_research"
+		two_random_arms_factory = yes
+		add_tech_bonus = {
+			name = LSC_new_arms_industries
+			bonus = 0.5
+			uses = 1
+			category = cat_light_armor
+		}
+		add_tech_bonus = {
+			name = LSC_new_arms_industries
+			bonus = 0.5
+			uses = 1
+			category = infantry_weapons
+		}
+	}
+	search_filters = { FOCUS_FILTER_INDUSTRY }
+}
+shared_focus = {
+	id = LSC_resource_prospects
+	icon = GFX_focus_indy_excavations
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSC_central_industrial_region }
+	x = 4
+	y = 5
+	relative_position_id = LSC_constitutional_convention
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_resource_prospects"
+		add_resource = {
+			type = aluminium
+			amount = 16
+			state = 540
+		}
+		add_resource = {
+			type = steel
+			amount = 10
+			state = 540
+		}
+	}
+	search_filters = { FOCUS_FILTER_INDUSTRY }
+}
+shared_focus = {
+	id = LSC_agrarian_revolution
+	icon = GFX_goal_ideology_democratic_socialist
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSC_constitutional_convention }
+	x = -3
+	y = 1
+	relative_position_id = LSC_constitutional_convention
+	allow_branch = {
+		has_government = communism
+		NOT = {
+			OR = {
+				has_country_leader = {
+					character = LSC_abba_povner
+					ruling_only = yes
+				}
+				has_country_leader = {
+					character = LSC_ludwig_von_pliater
+					ruling_only = yes
+				}
+			}
+		}
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_agrarian_revolution"
+		add_political_power = 150
+		add_stability = 0.1
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+shared_focus = {
+	id = LSC_popular_education
+	icon = GFX_goal_PAN_Create_the_Universidad_de_Panama
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSC_agrarian_revolution }
+	x = -3
+	y = 2
+	relative_position_id = LSC_constitutional_convention
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_popular_education"
+		custom_effect_tooltip = LNS_education_tp
+		hidden_effect = {
+			country_event = { days = 180 id = longsword.33 }
+		}
+	}
+	search_filters = { FOCUS_FILTER_RESEARCH }
+}
+shared_focus = {
+	id = LSC_unknown_hero_monument
+	icon = GFX_goal_generic_pony_soldier
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSC_agrarian_revolution }
+	x = -5
+	y = 2
+	relative_position_id = LSC_constitutional_convention
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_unknown_hero_monument"
+		add_manpower = 5000
+		add_war_support = 0.1
+	}
+	search_filters = { FOCUS_FILTER_ARMY_BONUS }
+}
+shared_focus = {
+	id = LSC_internationalism
+	icon = GFX_goal_generic_war_with_comintern
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSC_agrarian_revolution }
+	x = -6
+	y = 3
+	relative_position_id = LSC_constitutional_convention
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_internationalism"
+		add_ideas = LNS_internationalism_idea
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+shared_focus = {
+	id = LSC_foreign_volunteers
+	icon = GFX_goal_griffon_special_force
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSC_internationalism }
+	x = -6
+	y = 4
+	relative_position_id = LSC_constitutional_convention
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_foreign_volunteers"
+		swap_ideas = {
+			remove_idea = LNS_internationalism_idea
+			add_idea = LNS_internationalism_idea_2
+		}
+	}
+	search_filters = { FOCUS_FILTER_ARMY_BONUS }
+}
+shared_focus = {
+	id = LSC_voluntary_collectivization
+	icon = GFX_focus_collective_housing
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSC_agrarian_revolution }
+	x = -1
+	y = 2
+	relative_position_id = LSC_constitutional_convention
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_voluntary_collectivization"
+		add_ideas = LNS_collectivization_idea_1
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+shared_focus = {
+	id = LSC_ancestor_worship
+	icon = GFX_goal_compassionaite_politics
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSC_voluntary_collectivization }
+	prerequisite = { focus = LSC_unknown_hero_monument }
+	mutually_exclusive = { focus = LSC_no_masters }
+	x = -4
+	y = 3
+	relative_position_id = LSC_constitutional_convention
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_ancestor_worship"
+		add_ideas = LNS_free_unions
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+shared_focus = {
+	id = LSC_no_masters
+	icon = GFX_goal_commune_politics
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSC_voluntary_collectivization }
+	prerequisite = { focus = LSC_unknown_hero_monument }
+	mutually_exclusive = { focus = LSC_ancestor_worship }
+	x = -2
+	y = 3
+	relative_position_id = LSC_constitutional_convention
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_no_masters"
+		add_ideas = LNS_controlled_unions
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+shared_focus = {
+	id = LSC_posniaks
+	icon = GFX_goal_generic_archonism
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { 
+		focus = LSC_no_masters 
+		focus = LSC_ancestor_worship 
+	}
+	x = -3
+	y = 4
+	relative_position_id = LSC_constitutional_convention
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_posniaks"
+		country_event = longsword.106
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+shared_focus = {
+	id = LSC_tractor_stations
+	icon = GFX_goal_SOV_tractors
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSC_voluntary_collectivization }
+	x = -1
+	y = 4
+	relative_position_id = LSC_constitutional_convention
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_tractor_stations"
+		swap_ideas = {
+			remove_idea = LNS_collectivization_idea_1
+			add_idea = LNS_collectivization_idea_2
+		}
+		one_random_industrial_complex = yes
+		one_random_industrial_complex = yes
+	}
+	search_filters = { FOCUS_FILTER_INDUSTRY }
+}
+shared_focus = {
+	id = LSC_secret_services
+	icon = GFX_goal_ideology_totalist
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSC_voluntary_collectivization }
+	x = 0
+	y = 3
+	relative_position_id = LSC_constitutional_convention
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_secret_services"
+		if = {
+			limit = {
+				has_dlc = "La Resistance"
+			}
+			add_ideas = LNS_secret_services_idea_lar
+		}
+		else = {
+			add_ideas = LNS_secret_services_idea
+		}
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+shared_focus = {
+	id = LSC_role_division
+	icon = GFX_goal_socialist_industry
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSC_tractor_stations }
+	x = -2
+	y = 5
+	relative_position_id = LSC_constitutional_convention
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_role_division"
+		swap_ideas = {
+			remove_idea = LNS_collectivization_idea_2
+			add_idea = LNS_collectivization_idea_3
+		}
+	}
+	search_filters = { FOCUS_FILTER_INDUSTRY }
+}
+shared_focus = {
+	id = LSC_agrarian_realism
+	icon = GFX_UK_art_avantgarde
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSC_tractor_stations }
+	x = -3
+	y = 6
+	relative_position_id = LSC_constitutional_convention
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_agrarian_realism"
+		add_stability = 0.1
+		add_popularity = { 
+			ideology = communism 
+			popularity = 0.2
+		}
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+shared_focus = {
+	id = LSC_rights_of_the_people
+	icon = GFX_goal_generic_liberty_statue
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSC_tractor_stations }
+	prerequisite = { focus = LSC_internationalism }
+	prerequisite = { focus = LSC_posniaks }
+	x = -4
+	y = 5
+	relative_position_id = LSC_constitutional_convention
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_rights_of_the_people"
+		add_ideas = LNS_civil_rights_idea
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+
+shared_focus = {
+	id = LSC_divine_revolution
+	icon = GFX_goal_ideology_strasserist 
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSC_constitutional_convention }
+	x = -3
+	y = 1
+	relative_position_id = LSC_constitutional_convention
+	allow_branch = {
+		has_government = communism
+		OR = {
+			has_country_leader = {
+				character = LSC_abba_povner
+				ruling_only = yes
+			}
+			has_country_leader = {
+				character = LSC_ludwig_von_pliater
+				ruling_only = yes
+			}
+		}
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_divine_revolution"
+		add_political_power = 150
+		add_war_support = 0.1
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+
+shared_focus = {
+	id = LSC_monument_to_the_fallen
+	icon = GFX_goal_graveyard
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSC_divine_revolution }
+	x = -2
+	y = 1
+	relative_position_id = LSC_divine_revolution
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_monument_to_the_fallen"
+		add_manpower = 15000
+		add_war_support = 0.10
+		hidden_effect = {
+			country_event = { days = 30 id = longsword.176 }
+		}
+	}
+	search_filters = { FOCUS_FILTER_ARMY_BONUS }
+}
+
+shared_focus = {
+	id = LSC_and_punish_their_killers
+	icon = GFX_goal_guillotine
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSC_monument_to_the_fallen }
+	x = -1
+	y = 1
+	relative_position_id = LSC_monument_to_the_fallen
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_and_punish_their_killers"
+		save_current_manpower = yes
+		552 = {
+			add_manpower = -5000
+		}
+		540 = {
+			add_manpower = -5000
+		}
+		505 = {
+			add_manpower = -5000
+		}
+		restore_previous_manpower = yes
+		add_equipment_to_stockpile = {
+			type = infantry_equipment_0
+			amount = 500
+			producer = LNS
+		}
+		add_equipment_to_stockpile = {
+			type = support_equipment_1
+			amount = 100
+			producer = LNS
+		}
+		hidden_effect = {
+			country_event = { days = 30 id = longsword.177 }
+		}
+	}
+	search_filters = { FOCUS_FILTER_ARMY_BONUS }
+}
+
+
+shared_focus = {
+	id = LSC_teach_faith_and_history
+	icon = GFX_goal_PAN_Create_the_Universidad_de_Panama
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSC_divine_revolution }
+	x = 0
+	y = 1
+	relative_position_id = LSC_divine_revolution
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_teach_faith_and_history"
+		custom_effect_tooltip = LNS_education_tp
+		hidden_effect = {
+			country_event = { days = 180 id = longsword.33 }
+		}
+	}
+	search_filters = { FOCUS_FILTER_RESEARCH }
+}
+
+shared_focus = {
+	id = LSC_rebuild_the_temples
+	icon = GFX_goal_forest_spirit
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSC_divine_revolution }
+	x = 2
+	y = 1
+	relative_position_id = LSC_divine_revolution
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_rebuild_the_temples"
+		add_ideas = LNS_religious_society_1
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+
+shared_focus = {
+	id = LSC_expand_avengers
+	icon = GFX_goal_strasserite_oppression
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSC_rebuild_the_temples }
+	x = 0
+	y = 2
+	relative_position_id = LSC_rebuild_the_temples
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_expand_avengers"
+		add_ideas = LNS_nakam_secret_police
+		hidden_effect = {
+			country_event = { days = 30 id = longsword.181 }
+		}
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+
+shared_focus = {
+	id = LSC_warrior_priests
+	icon = GFX_goal_tree_of_harmony
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSC_rebuild_the_temples }
+	x = 1
+	y = 1
+	relative_position_id = LSC_rebuild_the_temples
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_warrior_priests"
+		swap_ideas = {
+			remove_idea = LNS_religious_society_1
+			add_idea = LNS_religious_society_2
+		}
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+
+shared_focus = {
+	id = LSC_bring_them_back_to_the_real_path
+	icon = GFX_goal_generic_archonism
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSC_rebuild_the_temples }
+	prerequisite = { focus = LSC_monument_to_the_fallen }
+	x = -1
+	y = 2
+	relative_position_id = LSC_divine_revolution
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_bring_them_back_to_the_real_path"
+		add_ideas = LNS_newfound_fervor
+		hidden_effect = {
+			country_event = { days = 30 id = longsword.178 }
+		}
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+
+shared_focus = {
+	id = LSC_welcome_back_outcasts
+	icon = GFX_goal_NOR_passport_convention
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSC_rebuild_the_temples }
+	prerequisite = { focus = LSC_monument_to_the_fallen }
+	x = 1
+	y = 2
+	relative_position_id = LSC_divine_revolution
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_welcome_back_outcasts"
+		add_ideas = LNS_return_to_genesis
+		hidden_effect = {
+			country_event = { days = 30 id = longsword.174 }
+		}
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+
+shared_focus = {
+	id = LSC_griffon_believers
+	icon = GFX_focus_indy_red_griffon_knights
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSC_welcome_back_outcasts }
+	prerequisite = { focus = LSC_bring_them_back_to_the_real_path }
+	x = 0
+	y = 3
+	relative_position_id = LSC_divine_revolution
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_griffon_believers"
+		add_ideas = LNS_griffon_converts
+		hidden_effect = {
+			country_event = { days = 30 id = longsword.175 }
+		}
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+
+
+
+shared_focus = {
+	id = LSC_her_dream
+	icon = GFX_goal_ideology_democratic_socialist
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSC_monument_to_the_fallen }
+	x = 0
+	y = 2
+	relative_position_id = LSC_monument_to_the_fallen
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_her_dream"
+		add_ideas = LNS_collectivization_idea_1
+	}
+	search_filters = { FOCUS_FILTER_ARMY_BONUS }
+}
+
+shared_focus = {
+	id = LSC_hands_off_collectivization
+	icon = GFX_focus_collective_housing
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSC_her_dream }
+	x = -1
+	y = 1
+	relative_position_id = LSC_her_dream
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_hands_off_collectivization"
+		one_random_industrial_complex = yes
+		one_random_industrial_complex = yes
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+
+shared_focus = {
+	id = LSC_basic_rights_for_longswordians
+	icon = GFX_goal_generic_liberty_statue
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSC_her_dream}
+	x = 1
+	y = 1
+	relative_position_id = LSC_her_dream
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_basic_rights_for_longswordians"
+		add_ideas = LNS_civil_rights_idea
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+
+shared_focus = {
+	id = LSC_agrarian_lifestyle
+	icon = GFX_goal_coop_farms
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSC_basic_rights_for_longswordians }
+	prerequisite = { focus = LSC_hands_off_collectivization } 
+	x = 0
+	y = 2
+	relative_position_id = LSC_her_dream
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_agrarian_lifestyle"
+		swap_ideas = {
+			remove_idea = LNS_collectivization_idea_1
+			add_idea = LNS_collectivization_idea_3
+		}
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+
+
+
+shared_focus = {
+	id = LSC_national_restoration
+	icon = GFX_goal_ideology_harmonist
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSC_constitutional_convention }
+	x = -3
+	y = 1
+	relative_position_id = LSC_constitutional_convention
+	allow_branch = {
+		OR = {
+			has_government = democratic
+			has_government = neutrality
+		}
+		NOT = {
+			has_country_leader = {
+				character = LSC_golden_morning
+				ruling_only = yes
+			}
+		}
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_national_restoration"
+		add_political_power = 150
+		add_stability = 0.1
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+shared_focus = {
+	id = LSC_national_education
+	icon = GFX_goal_PAN_Create_the_Universidad_de_Panama
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSC_national_restoration }
+	allow_branch = {
+		has_government = democratic
+	}
+	x = -3
+	y = 2
+	relative_position_id = LSC_constitutional_convention
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_national_education"
+		custom_effect_tooltip = LNS_education_tp
+		hidden_effect = {
+			country_event = { days = 180 id = longsword.33 }
+		}
+	}
+	search_filters = { FOCUS_FILTER_RESEARCH }
+}
+shared_focus = {
+	id = LSC_restitution_of_ownership
+	icon = GFX_focus_indy_unequal_treaties
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSC_national_restoration }
+	x = -1
+	y = 2
+	relative_position_id = LSC_constitutional_convention
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_restitution_of_ownership"
+		one_random_industrial_complex = yes
+		hidden_effect = {
+			country_event = longsword.138
+		}
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+shared_focus = {
+	id = LSC_rebuild_varena
+	icon = GFX_goal_new_temple
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSC_restitution_of_ownership }
+	x = 0
+	y = 3
+	relative_position_id = LSC_constitutional_convention
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_rebuild_varena"
+		505 = {
+			add_building_construction = {
+				type = bunker
+				level = 2
+				province = 5038
+				instant_build = yes
+			}
+		}
+		add_ideas = LNS_harmonic_society_1
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+shared_focus = {
+	id = LSC_kriwe_classes
+	icon = GFX_goal_tree_of_harmony
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSC_rebuild_varena }
+	x = -1
+	y = 4
+	relative_position_id = LSC_constitutional_convention
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_kriwe_classes"
+		swap_ideas = {
+			remove_idea = LNS_harmonic_society_1
+			add_idea = LNS_harmonic_society_2
+		}
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+shared_focus = {
+	id = LSC_promote_local_dialects
+	icon = GFX_goal_bookstack
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSC_restitution_of_ownership }
+	prerequisite = { focus = LSC_national_education }
+	allow_branch = {
+		has_government = democratic
+	}
+	x = -2
+	y = 3
+	relative_position_id = LSC_constitutional_convention
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_promote_local_dialects"
+		add_ideas = LNS_linguistic_freedom
+		add_political_power = 100
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+shared_focus = {
+	id = LSC_convert_posniaks
+	icon = GFX_goal_generic_archonism
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSC_restitution_of_ownership focus = LSC_establish_seimas }
+	x = -3
+	y = 4
+	relative_position_id = LSC_constitutional_convention
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_convert_posniaks"
+		add_ideas = LNS_two_peoples_idea
+		add_war_support = -0.05
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+shared_focus = {
+	id = LSC_establish_seimas
+	icon = GFX_goal_generic_lau_democracy
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSC_national_restoration }
+	x = -5
+	y = 2
+	relative_position_id = LSC_constitutional_convention
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_establish_seimas"
+		add_ideas = LNS_harmonic_democracy_1
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+shared_focus = {
+	id = LSC_sixty_corporations
+	icon = GFX_goal_state_economy
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSC_establish_seimas }
+	x = -4
+	y = 3
+	relative_position_id = LSC_constitutional_convention
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_sixty_corporations"
+		swap_ideas = {
+			remove_idea = LNS_harmonic_democracy_1
+			add_idea = LNS_harmonic_democracy_2
+		}
+		one_random_industrial_complex = yes
+	}
+	search_filters = { FOCUS_FILTER_INDUSTRY }
+}
+shared_focus = {
+	id = LSC_griffon_territorial_autonomies
+	icon = GFX_goal_generic_major_alliance_pony_griffon
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSC_establish_seimas }
+	x = -6
+	y = 3
+	relative_position_id = LSC_constitutional_convention
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_griffon_territorial_autonomies"
+		540 = {
+			add_state_modifier = {
+				modifier = {
+					state_production_speed_buildings_factor = 0.2
+					local_manpower = 0.15
+				}
+			}
+		}
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+shared_focus = {
+	id = LSC_enforce_local_democracy
+	icon = GFX_focus_indy_give_democracy
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSC_sixty_corporations }
+	prerequisite = { focus = LSC_griffon_territorial_autonomies }
+	x = -5
+	y = 4
+	relative_position_id = LSC_constitutional_convention
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_enforce_local_democracy"
+		swap_ideas = {
+			remove_idea = LNS_harmonic_democracy_2
+			add_idea = LNS_harmonic_democracy_3
+		}
+		add_manpower = 5000
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+shared_focus = {
+	id = LSC_autarky
+	icon = GFX_Steel
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSC_enforce_local_democracy }
+	x = -6
+	y = 5
+	relative_position_id = LSC_constitutional_convention
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_autarky"
+		add_tech_bonus = {
+			name = LSC_autarky
+			bonus = 1
+			uses = 2
+			category = synth_resources
+		}
+		add_resource = {
+			type = steel
+			amount = 8
+			state = 540
+		}
+	}
+	search_filters = { FOCUS_FILTER_INDUSTRY }
+}
+shared_focus = {
+	id = LSC_folwark_system
+	icon = GFX_goal_agrarian_reform
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSC_enforce_local_democracy }
+	x = -4
+	y = 5
+	relative_position_id = LSC_constitutional_convention
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_folwark_system"
+		every_state = {
+			limit = { 
+				is_core_of = ROOT 
+				is_owned_by = ROOT
+			}
+			add_building_construction = {
+				type = infrastructure
+				level = 1
+				instant_build = yes
+			}
+		}
+	}
+	search_filters = { FOCUS_FILTER_INDUSTRY }
+}
+shared_focus = {
+	id = LSC_harmonic_identity
+	icon = GFX_goal_crown_and_swords
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSC_convert_posniaks }
+	prerequisite = { focus = LSC_promote_local_dialects }
+	x = -2
+	y = 5
+	relative_position_id = LSC_constitutional_convention
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_harmonic_identity"
+		add_ideas = LNS_ducal_legacy_1
+		hidden_effect = {
+			country_event = longsword.139
+		}
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+shared_focus = {
+	id = LSC_national_myth
+	icon = GFX_goal_generic_harmony
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSC_harmonic_identity }
+	prerequisite = { focus = LSC_folwark_system }
+	prerequisite = { focus = LSC_autarky }
+	x = -4
+	y = 6
+	relative_position_id = LSC_constitutional_convention
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_national_myth"
+		swap_ideas = {
+			remove_idea = LNS_ducal_legacy_1
+			add_idea = LNS_ducal_legacy_2
+		}
+		hidden_effect = {
+			country_event = longsword.140
+		}
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+shared_focus = {
+	id = LSC_violet_revolution
+	icon = GFX_goal_national_populism
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSC_constitutional_convention }
+	x = -3
+	y = 1
+	relative_position_id = LSC_constitutional_convention
+	allow_branch = {
+		OR = {
+			has_government = fascism
+			has_country_leader = {
+				character = LSC_golden_morning
+				ruling_only = yes
+			}
+		}
+	}
+	available = { 
+		has_country_flag = LSC_defeated_povner
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_national_restoration"
+		add_political_power = 100
+		add_stability = 0.1
+		set_variable = { LSC_transformation_tyranny = 0 }
+		set_variable = { LSC_transformation_tyranny_2 = 0 }
+		set_variable = { LSC_transformation_political_power_factor = 0.15 }
+		set_variable = { LSC_transformation_conscription_factor = 0 }
+		set_variable = { LSC_transformation_consumer_goods_factor = 0 }
+		set_variable = { LSC_transformation_production_factory_max_efficiency_factor = 0 }
+		set_variable = { LSC_transformation_industrial_capacity_factory = 0 }
+		set_variable = { LSC_transformation_research_speed_factor = 0 }
+		set_variable = { LSC_transformation_war_support_factor = 0 }
+		set_variable = { LSC_transformation_army_morale_factor = 0 }
+		set_variable = { LSC_transformation_training_time_factor = 0 }
+		set_variable = { LSC_transformation_mobilization_laws_cost_factor = 0 }
+		set_variable = { LSC_transformation_political_advisor_cost_factor = 0 }
+		add_dynamic_modifier = { modifier = LSC_national_transformation }
+		hidden_effect = {
+			country_event = { days = 180 id = longsword.184 }
+		}
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL } 
+}
+shared_focus = {
+	id = LSC_fascist_education
+	icon = GFX_goal_PAN_Create_the_Universidad_de_Panama
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSC_violet_revolution }
+	x = -1
+	y = 2
+	relative_position_id = LSC_constitutional_convention
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_national_education"
+		custom_effect_tooltip = LNS_education_tp
+		hidden_effect = {
+			country_event = { days = 180 id = longsword.33 }
+		}
+	}
+	search_filters = { FOCUS_FILTER_RESEARCH }
+}
+shared_focus = {
+	id = LSC_interspecies_study_groups
+	icon = GFX_goal_generic_scientific_exchange_pony_griffon
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSC_fascist_education }
+	x = 0
+	y = 3
+	relative_position_id = LSC_constitutional_convention
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_interspecies_study_groups"
+		add_to_variable = { LSC_transformation_research_speed_factor = 0.05 }
+		custom_effect_tooltip = LSC_interspecies_study_groups_tooltip
+		add_tech_bonus = {
+			name = race_tech_bonus
+			bonus = 1
+			uses = 1
+			category = race_tech
+		}
+		hidden_effect = {
+			country_event = longsword.116
+		}
+	}
+	search_filters = { FOCUS_FILTER_RESEARCH }
+}
+shared_focus = {
+	id = LSC_pantheon_construction
+	icon = GFX_goal_generic_archonism
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSC_violet_revolution }
+	x = -3
+	y = 2
+	relative_position_id = LSC_constitutional_convention
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_pantheon_construction"
+		add_to_variable = { LSC_transformation_war_support_factor = 0.1 }
+		subtract_from_variable = { LSC_transformation_consumer_goods_factor = 0.1 }
+		custom_effect_tooltip = LSC_pantheon_construction_tooltip
+		hidden_effect = {
+			country_event = longsword.117
+		}
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+shared_focus = {
+	id = LSC_language_reconstruction
+	icon = GFX_focus_generic_diplomatic_treaty_pony
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSC_pantheon_construction }
+	prerequisite = { focus = LSC_fascist_education }
+	x = -2
+	y = 3
+	relative_position_id = LSC_constitutional_convention
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_language_reconstruction"
+		add_to_variable = { LSC_transformation_war_support_factor = 0.1 }
+		add_to_variable = { LSC_transformation_conscription_factor = 0.1 }
+		custom_effect_tooltip = LSC_language_reconstruction_tooltip
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+shared_focus = {
+	id = LSC_ideocracy
+	icon = GFX_goal_authoritarian
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSC_violet_revolution }
+	x = -4
+	y = 3
+	relative_position_id = LSC_constitutional_convention
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_ideocracy"
+		add_manpower = 10000
+		add_country_leader_trait = soldier_of_destiny
+		hidden_effect = {
+			country_event = longsword.118
+		}
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+shared_focus = {
+	id = LSC_forced_integration
+	icon = GFX_goal_generic_dangerous_deal_pony_griffon
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSC_ideocracy }
+	x = -6
+	y = 4
+	relative_position_id = LSC_constitutional_convention
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_forced_integration"
+		add_to_variable = { LSC_transformation_conscription_factor = 0.1 }
+		custom_effect_tooltip = LSC_forced_integration_tooltip
+		if = {
+			limit = { NOT = { has_tech = tech_pegasi } }
+			set_technology = { tech_pegasi = 1 }
+			fix_weapon_techs = yes
+		}
+		custom_effect_tooltip = LNS_integrated_division_template_gained
+		hidden_effect = {
+			load_oob = "LSC_integrated"
+		}
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+shared_focus = {
+	id = LSC_vadeiva_cult
+	icon = GFX_goal_generic_pony_unicorn
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSC_ideocracy }
+	x = -4
+	y = 4
+	relative_position_id = LSC_constitutional_convention
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_vadeiva_cult"
+		add_to_variable = { LSC_transformation_political_power_factor = 0.05 }
+		add_to_variable = { LSC_transformation_army_morale_factor = 0.1 }
+		custom_effect_tooltip = LSC_vadeiva_cult_tooltip
+		hidden_effect = {
+			country_event = longsword.119
+		}
+	}
+	search_filters = { FOCUS_FILTER_ARMY_BONUS }
+}
+shared_focus = {
+	id = LSC_little_books
+	icon = GFX_goal_pony_passport
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSC_vadeiva_cult }
+	prerequisite = { focus = LSC_forced_integration }
+	x = -5
+	y = 5
+	relative_position_id = LSC_constitutional_convention
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_little_books"
+		add_to_variable = { LSC_transformation_conscription_factor = 0.05 }
+		add_to_variable = { LSC_research_decision_time = -40 }
+		custom_effect_tooltip = LSC_little_books_tooltip
+		hidden_effect = {
+			country_event = longsword.120
+		}
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+shared_focus = {
+	id = LSC_political_spectacle
+	icon = GFX_goal_ideology_national_populist
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSC_little_books }
+	x = -6
+	y = 6
+	relative_position_id = LSC_constitutional_convention
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_political_spectacle"
+		subtract_from_variable = { LSC_transformation_mobilization_laws_cost_factor = 0.25 }
+		subtract_from_variable = { LSC_transformation_political_advisor_cost_factor = 0.25 }
+		custom_effect_tooltip = LSC_political_spectacle_tooltip
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+shared_focus = {
+	id = LSC_national_body_stratification
+	icon = GFX_goal_dark_arms
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSC_little_books }
+	x = -4
+	y = 6
+	relative_position_id = LSC_constitutional_convention
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_national_body_stratification"
+		custom_effect_tooltip = GRI_war_economy_tp
+		add_ideas = war_economy
+		set_country_flag = war_economy_only_flag
+		hidden_effect = {
+			country_event = longsword.121
+		}
+	}
+	search_filters = { FOCUS_FILTER_INDUSTRY }
+}
+shared_focus = {
+	id = LSC_mandatory_firearms_training
+	icon = GFX_goal_generic_pony_volunteer
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSC_vadeiva_cult }
+	x = -3
+	y = 5
+	relative_position_id = LSC_constitutional_convention
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_little_books"
+		subtract_from_variable = { LSC_transformation_training_time_factor = 0.1 }
+		custom_effect_tooltip = LSC_mandatory_firearms_training_tooltip
+		add_ideas = LNS_a_gun_in_every_home_idea
+	}
+	search_filters = { FOCUS_FILTER_ARMY_BONUS }
+}
+shared_focus = {
+	id = LSC_supremacy_of_will
+	icon = GFX_goal_pony_labour
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSC_ideocracy }
+	x = -2
+	y = 4
+	relative_position_id = LSC_constitutional_convention
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_supremacy_of_will"
+		add_to_variable = { LSC_transformation_research_speed_factor = 0.02 }
+		add_to_variable = { LSC_transformation_production_factory_max_efficiency_factor = 0.05 }
+		custom_effect_tooltip = LSC_supremacy_of_will_tooltip
+	}
+	search_filters = { FOCUS_FILTER_INDUSTRY }
+}
+shared_focus = {
+	id = LSC_militarized_labour
+	icon = GFX_goal_forced_con
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSC_supremacy_of_will }
+	prerequisite = { focus = LSC_fascist_education }
+	x = -1
+	y = 6
+	relative_position_id = LSC_constitutional_convention
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_militarized_labour"
+		add_to_variable = { LSC_transformation_production_factory_max_efficiency_factor = 0.05 }
+		add_to_variable = { LSC_transformation_industrial_capacity_factory = 0.1 }
+		add_to_variable = { LSC_transformation_conscription_factor = -0.05 }
+		custom_effect_tooltip = LSC_militarized_labour_tooltip
+	}
+	search_filters = { FOCUS_FILTER_INDUSTRY }
+}
+shared_focus = {
+	id = LSC_longsword_above_all
+	icon = GFX_goal_generic_national_unity_claws
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSC_militarized_labour }
+	prerequisite = { focus = LSC_mandatory_firearms_training }
+	prerequisite = { focus = LSC_national_body_stratification }
+	x = -3
+	y = 7
+	relative_position_id = LSC_constitutional_convention
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_longsword_above_all"
+		add_ideas = LNS_integral_liberation
+		hidden_effect = {
+			country_event = longsword.122
+		}
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+shared_focus = {
+	id = LSC_primitive_accumulation
+	icon = GFX_goal_SZC_improvised_farming_machinery
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSC_militarized_labour }
+	x = -1
+	y = 7
+	relative_position_id = LSC_constitutional_convention
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_primitive_accumulation"
+		save_current_manpower = yes
+		every_state = {
+			limit = { 
+				is_core_of = HLQ 
+				is_owned_by = LSC
+			}
+			add_building_construction = {
+				type = infrastructure
+				level = 1
+				instant_build = yes
+			}
+			add_building_construction = {
+				type = industrial_complex
+				level = 1
+				instant_build = yes
+			}
+			add_manpower = -15000
+		}
+		552 = {
+			add_building_construction = {
+				type = infrastructure
+				level = 1
+				instant_build = yes
+			}
+			add_building_construction = {
+				type = industrial_complex
+				level = 1
+				instant_build = yes
+			}
+			add_manpower = -20000
+		}
+		505 = {
+			add_building_construction = {
+				type = infrastructure
+				level = 1
+				instant_build = yes
+			}
+			add_building_construction = {
+				type = industrial_complex
+				level = 1
+				instant_build = yes
+			}
+			add_manpower = -20000
+		}
+		540 = {
+			add_building_construction = {
+				type = infrastructure
+				level = 1
+				instant_build = yes
+			}
+			add_building_construction = {
+				type = industrial_complex
+				level = 1
+				instant_build = yes
+			}
+			add_manpower = -20000
+		}
+		restore_previous_manpower = yes
+	}
+	search_filters = { FOCUS_FILTER_INDUSTRY }
+}
+shared_focus = {
+	id = LSC_economic_subordination
+	icon = GFX_goal_state_economy
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSC_violet_revolution }
+	x = -5
+	y = 2
+	relative_position_id = LSC_constitutional_convention
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_economic_subordination"
+		one_random_arms_factory = yes
+		one_random_arms_factory = yes
+		one_random_industrial_complex = yes
+	}
+	search_filters = { FOCUS_FILTER_INDUSTRY }
+}
+shared_focus = {
+	id = LSC_full_employment
+	icon = GFX_goal_forced_res
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSC_economic_subordination }
+	x = -6
+	y = 3
+	relative_position_id = LSC_constitutional_convention
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_economic_subordination"
+		add_to_variable = { LSC_transformation_production_factory_max_efficiency_factor = 0.1 }
+		add_to_variable = { LSC_transformation_industrial_capacity_factory = 0.1 }
+		custom_effect_tooltip = LSC_full_employment_tooltip
+	}
+	search_filters = { FOCUS_FILTER_INDUSTRY }
+}
+
+###############################################################
+### Longsword Republic (LSC) Foreign Trees ###
+###############################################################
+
+shared_focus = {
+	id = LSC_hellquill_harcom
+	icon = GFX_goal_Free_the_Ponies_of_Hellquill_1
+	x = 6
+	y = 6
+	cost = 4
+	available = { 
+		has_completed_focus = LSC_constitutional_convention
+		NOT = {
+			has_active_mission = LSC_three_year_plan
+		}
+	}
+	bypass = {
+		NOT = { can_declare_war_on = HLQ }
+	}
+		allow_branch = {
+		is_subject = no
+	}
+
+	ai_will_do = {
+		factor = 100
+		modifier = {
+			factor = 0
+			num_divisions < 12
+		}
+	}
+	will_lead_to_war_with = HLQ
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_hellquill_harcom"
+		if = {
+			limit = {
+				HLQ = {
+					OR = {
+						has_government = communism
+						has_government = democratic
+					}
+				}
+			}
+			country_event = longsword.35
+		}
+		else_if = {
+			limit = {
+				HLQ = {
+					OR = {
+						has_government = fascism
+						has_government = neutrality
+					}
+				}
+			}
+			every_state = {
+				limit = { is_core_of = HLQ }
+				add_claim_by = ROOT
+			}
+			create_wargoal = {
+				type = annex_everything
+				target = HLQ
+			}
+			country_event = longsword.115
+		}
+	}
+	search_filters = { FOCUS_FILTER_ANNEXATION }
+}
+shared_focus = {
+	id = LSC_integrate_hellquill
+	icon = GFX_goal_generic_ponykind
+	cost = 6
+	ai_will_do = { factor = 100 }
+
+	x = 1
+	y = 1
+	relative_position_id = LSC_hellquill_harcom
+	prerequisite = { focus = LSC_hellquill_harcom }
+	available = {
+		HLQ = { exists = no }
+		OR = {
+			owns_state = 537
+			owns_state = 553
+			owns_state = 633
+			owns_state = 634
+		}
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_integrate_hellquill"
+		HLQ = { add_to_ROOT_potential_cores = yes }
+	}
+	search_filters = { FOCUS_FILTER_ANNEXATION }
+}
+shared_focus = {
+	id = LSC_vartai_republic
+	icon = GFX_goal_molotov_ribbentrop_pact_pony
+	cost = 6
+	ai_will_do = { factor = 100 }
+
+	x = 2
+	y = 2
+	relative_position_id = LSC_hellquill_harcom
+	prerequisite = { focus = LSC_integrate_hellquill }
+	available = {
+		HLQ = { exists = no }
+		owns_state = 537
+		owns_state = 553
+		owns_state = 633
+		owns_state = 634
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_vartai_republic"
+		set_cosmetic_tag = LSC_vartai
+		increase_society_development_with_tt = yes
+		hidden_effect = {
+			country_event = longsword.32
+		}
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+shared_focus = {
+	id = LSC_fate_of_reformisten
+	icon = GFX_HOL_crackdown_natpop
+	cost = 6
+	ai_will_do = { factor = 100 }
+
+	x = -1
+	y = 1
+	relative_position_id = LSC_hellquill_harcom
+	prerequisite = { focus = LSC_hellquill_harcom }
+	available = {
+		HLQ = { exists = no }
+		owns_state = 537
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_fate_of_reformisten"
+		country_event = longsword.108
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+shared_focus = {
+	id = LSC_hellquill_reconstruction
+	icon = GFX_goal_generic_lau_construction
+	cost = 6
+	ai_will_do = { factor = 100 }
+
+	x = -2
+	y = 2
+	relative_position_id = LSC_hellquill_harcom
+	prerequisite = { focus = LSC_fate_of_reformisten }
+	available = {
+		OR = {
+			owns_state = 537
+			owns_state = 553
+			owns_state = 633
+			owns_state = 634
+		}
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_hellquill_reconstruction"
+		unlock_decision_category_tooltip = LSC_Hellquill_reconstruction_decisions
+	}
+	search_filters = { FOCUS_FILTER_INDUSTRY }
+}
+shared_focus = {
+	id = LSC_seek_allies
+	icon = GFX_goal_solar_attack_griffonia
+	cost = 6
+	ai_will_do = { factor = 100 }
+	
+	allow_branch = {
+		NOT = {
+			OR = {
+				has_country_leader = {
+					character = LSC_abba_povner
+					ruling_only = yes
+				}
+				has_country_leader = {
+					character = LSC_ludwig_von_pliater
+					ruling_only = yes
+				}
+			}
+		}
+	}
+
+	x = 0
+	y = 2
+	relative_position_id = LSC_hellquill_harcom
+	prerequisite = { focus = LSC_hellquill_harcom }
+	available = {
+		HLQ = { exists = no }
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_seek_allies"
+		custom_effect_tooltip = LSC_can_ally_tooltip
+		hidden_effect = {
+			    if = {
+				    limit = {
+					    has_country_leader = {
+						character = LSC_flawless_justice
+						ruling_only = yes
+							}
+						}
+						LSC = {
+						country_event = longsword.191
+					}
+				}
+			}
+		}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+
+
+shared_focus = {
+	id = LSC_our_destiny
+	icon = GFX_goal_RUS_white_legacy
+	cost = 3
+	ai_will_do = { factor = 100 }
+	
+	available = { 
+       OR = {
+			382 = {
+				owner = {
+						tag = LSC
+					}
+				}
+			387 = {
+				owner = {
+						tag = LSC
+					}
+				}
+			}
+		}
+	allow_branch = {
+		has_government = democratic
+	    has_country_leader = {
+			character = LSC_flawless_justice
+			ruling_only = yes
+		}
+	}
+	
+	prerequisite = { focus = LSC_seek_allies }
+
+	x = 0
+	y = 3
+	relative_position_id = LSC_hellquill_harcom
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_seek_allies"
+		add_manpower = 10000
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+
+shared_focus = {
+	id = LSC_the_frozen_north
+	icon = GFX_goal_riv_pacify_the_north
+	cost = 6
+	ai_will_do = { factor = 100 }
+	
+
+	
+	prerequisite = { focus = LSC_our_destiny }
+
+	x = -2
+	y = 1
+	relative_position_id = LSC_our_destiny
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_seek_allies"
+		create_wargoal = {
+					type = puppet_wargoal_focus
+					target = FIR
+				}
+			if = {
+				limit = {
+					FBK = {
+						OR = {
+							has_government = fascism
+							has_government = neutrality
+						}
+						NOT = {
+							is_in_faction_with = ROOT
+						}
+					}
+				}
+				create_wargoal = {
+					type = puppet_wargoal_focus
+					target = FBK
+				}
+			}
+			if = {
+				limit = {
+					WAT = {
+						OR = {
+							has_government = fascism
+							has_government = neutrality
+						}
+						NOT = {
+							is_in_faction_with = ROOT
+						}
+					}
+				}
+				create_wargoal = {
+					type = puppet_wargoal_focus
+					target = WAT
+				}
+			}
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+
+shared_focus = {
+	id = LSC_the_new_shield
+	icon = GFX_goal_LUS_clover
+	cost = 6
+	ai_will_do = { factor = 100 }
+
+	
+	prerequisite = { focus = LSC_our_destiny }
+
+	x = 2
+	y = 1
+	relative_position_id = LSC_our_destiny
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_seek_allies"
+		create_wargoal = {
+					type = annex_everything
+					target = LUS
+		}
+			if = {
+				limit = {
+					BRF = {
+					exists = yes
+						OR = {
+							has_government = fascism
+							has_government = neutrality
+						}
+						NOT = {
+							is_in_faction_with = ROOT
+						}
+					}
+				}
+				create_wargoal = {
+					type = puppet_wargoal_focus
+					target = BRF
+				}
+			}
+			if = {
+				limit = {
+					GRY = {
+					exists = yes
+						OR = {
+							has_government = fascism
+							has_government = neutrality
+						}
+						NOT = {
+							is_in_faction_with = ROOT
+						}
+					}
+				}
+				create_wargoal = {
+					type = puppet_wargoal_focus
+					target = GRY		
+					}
+			}
+			if = {
+				limit = {
+					GRW = {
+					exists = yes
+						OR = {
+							has_government = fascism
+							has_government = neutrality
+						}
+						NOT = {
+							is_in_faction_with = ROOT
+						}
+					}
+				}
+				create_wargoal = {
+					type = puppet_wargoal_focus
+					target = GRW
+				}
+			}
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+
+
+shared_focus = {
+	id = LSC_blessing_of_the_gods
+	icon = GFX_goal_sunshine
+	cost = 6
+	ai_will_do = { factor = 100 }
+	
+	
+	prerequisite = { focus = LSC_our_destiny }
+
+available = {
+has_completed_focus = LSC_kriwe_classes
+}
+	x = 0
+	y = 1
+	relative_position_id = LSC_our_destiny
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_seek_allies"
+		hidden_effect = {
+		country_event = { days = 0 id = longsword.189 }
+		}
+		swap_ideas = {
+			remove_idea = LNS_harmonic_society_2
+			add_idea = LNS_harmonic_society_3
+		}
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+
+shared_focus = {
+	id = LSC_legion_without_borders
+	icon = GFX_PAP_legionary_spirit
+	cost = 6
+	ai_will_do = { factor = 100 }
+	
+	
+	prerequisite = { focus = LSC_blessing_of_the_gods}
+
+	available = {
+		has_completed_focus = LSC_national_myth
+	}
+
+	x = -1
+	y = 1
+	relative_position_id = LSC_blessing_of_the_gods
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_seek_allies"
+		swap_ideas = {
+			remove_idea = LNS_ducal_legacy_2
+			add_idea = LNS_ducal_legacy_3
+		}
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+
+shared_focus = {
+	id = LSC_the_vartai_card
+	icon = GFX_goal_NOR_passport_convention
+	cost = 6
+	ai_will_do = { factor = 100 }
+	
+	available = {
+		has_completed_focus = LSC_promote_local_dialects
+	}
+	
+	prerequisite = { focus = LSC_blessing_of_the_gods }
+
+	x = 1
+	y = 1
+	relative_position_id = LSC_blessing_of_the_gods
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_seek_allies"
+		swap_ideas = {
+			remove_idea = LNS_linguistic_freedom
+			add_idea = LNS_linguistic_freedom2
+		}
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+
+shared_focus = {
+	id = LSC_betrayal_into_glory
+	icon = GFX_goal_solar_phoenix
+	cost = 5
+	ai_will_do = { factor = 100 }
+	
+	
+	available = { 
+       OR = {
+		has_completed_focus = LSC_divine_justice
+	     387 = {
+				owner = {
+						tag = LSC
+					}
+				}
+			}
+		}
+	
+	
+	prerequisite = { focus = LSC_our_destiny }
+
+	x = -5
+	y = 1
+	relative_position_id = LSC_our_destiny
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_seek_allies"
+		if = {
+				limit = {
+					DMT = {
+					exists = yes
+					NOT = {
+							is_in_faction_with = ROOT
+						}
+					}
+				}
+				create_wargoal = {
+					type = puppet_wargoal_focus
+					target = DMT
+				}
+			}
+			if = {
+				limit = {
+					DEP = {
+					exists = yes
+					NOT = {
+							is_in_faction_with = ROOT
+						}
+					}
+				}
+				create_wargoal = {
+					type = annex_everything
+					target = DEP		
+					}
+			}
+			if = {
+				limit = {
+					LCT = {
+					exists = yes
+					NOT = {
+							is_in_faction_with = ROOT
+						}
+					}
+				}
+				create_wargoal = {
+					type = annex_everything
+					target = LCT
+				}
+			}
+		
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+
+shared_focus = {
+	id = LSC_deponya
+	icon = GFX_focus_hun_elect_a_king
+	cost = 6
+	ai_will_do = { factor = 100 }
+	
+	prerequisite = { focus = LSC_betrayal_into_glory }
+available = {
+544 = {
+		is_owned_and_controlled_by = ROOT
+	}
+	}
+	x = 2
+	y = 1
+	relative_position_id = LSC_betrayal_into_glory
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_seek_allies"
+		DEP = { add_to_ROOT_potential_cores = yes }
+        
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+
+shared_focus = {
+	id = LSC_lake_city
+	icon = GFX_focus_jap_zaibatsu
+	cost = 6
+	ai_will_do = { factor = 100 }
+	
+	prerequisite = { focus = LSC_betrayal_into_glory }
+available = {
+387 = {
+		is_owned_and_controlled_by = ROOT
+	}
+	}
+	x = 0
+	y = 1
+	relative_position_id = LSC_betrayal_into_glory
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_seek_allies"
+				LCT = { add_to_ROOT_potential_cores = yes }
+
+		add_ideas = LNS_guilds_subjugated
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+
+shared_focus = {
+	id = LSC_diamond_mountain
+	icon = GFX_focus_DMT_hall_of_the_mountain_king
+	cost = 6
+	ai_will_do = { factor = 100 }
+	
+	prerequisite = { focus = LSC_betrayal_into_glory }
+	available = {
+			637 = {
+				owner = {
+					OR = {
+						tag = ROOT
+						is_subject_of = ROOT
+					}
+				}
+			}
+		}
+	x = -2
+	y = 1
+	relative_position_id = LSC_betrayal_into_glory
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_seek_allies"
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}    
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = DMT_Var_Alsas_Forge_organization
+			mio:DMT_Var_Alsas_Forge_organization = {
+				add_mio_funds = 300
+			}
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = DMT_Kal_Spankaz_Forge_organization
+			mio:DMT_Kal_Spankaz_Forge_organization = {
+				add_mio_funds = 300
+			}
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = DMT_Terri_Azur_Forge_organization
+			mio:DMT_Terri_Azur_Forge_organization = {
+				add_mio_funds = 300
+			}
+		}
+		else = {
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = DMT_Var_Alsas_Forge
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = DMT_Kal_Spankaz_Forge
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = DMT_Terri_Azur_Forge
+		}
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+
+shared_focus = {
+	id = LSC_perhaps_more_awaits
+	icon = GFX_goal_generic_pony_unicorn
+	cost = 6
+	ai_will_do = { factor = 100 }
+	
+	
+	prerequisite = { focus = LSC_diamond_mountain
+	focus = LSC_lake_city
+	focus = LSC_deponya }
+
+	x = 0
+	y = 2
+	relative_position_id = LSC_betrayal_into_glory
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_seek_allies"
+		add_ideas = LNS_destiny_awaits
+		hidden_effect = {
+		country_event = longsword.187
+		}
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+
+
+
+
+shared_focus = {
+	id = LSC_divine_justice
+	icon = GFX_goal_Duskclaw_Icon_Vacant
+	cost = 5
+	ai_will_do = { factor = 100 }
+	
+	bypass = {
+		382 = {
+				owner = {
+						tag = LSC
+					}
+				}
+	}
+	available = {
+			has_completed_focus = LSC_betrayal_into_glory
+			if = {
+					limit = {
+						GRD = {
+							OR = {
+								tag = GRI
+								tag = BRZ
+								tag = ANG
+								tag = FEA
+								tag = KAT
+								tag = PYT
+								tag = ROU
+								tag = TRD
+								tag = YAL
+								tag = STW
+							}
+						}
+					}
+					has_global_flag = GRI_empire_rising_flag
+				}	
+			}
+	prerequisite = { focus = LSC_our_destiny }
+	x = 5
+	y = 1
+	relative_position_id = LSC_our_destiny
+	completion_reward = {
+			log = "[GetDateText]: [Root.GetName]: Focus LSC_divine_justice"
+			hidden_effect = {
+				create_wargoal = { 
+					type = annex_everything 
+					target = GRD 
+				}
+			}
+			declare_war_on = { 
+				type = annex_everything 
+				target = GRD 
+			}
+			if = {
+				limit = {
+					FEA = {
+						exists = yes
+						NOT = {
+							is_in_faction_with = ROOT
+							is_subject_of = ROOT
+							has_war_with = ROOT
+						}
+					}
+				}
+				hidden_effect = {
+					create_wargoal = { 
+						type = annex_everything 
+						target = FEA
+					}
+				}
+				declare_war_on = { 
+					type = annex_everything 
+					target = FEA
+				}
+			}
+			if = {
+				limit = {
+					STW = {
+						exists = yes
+						NOT = {
+							is_in_faction_with = ROOT
+							is_subject_of = ROOT
+							has_war_with = ROOT
+						}
+					}
+				}
+				hidden_effect = {
+					create_wargoal = { 
+						type = annex_everything 
+						target = STW
+					}
+				}
+				declare_war_on = { 
+					type = annex_everything 
+					target = STW
+				}
+			}
+			if = {
+				limit = {
+					ANG = {
+						exists = yes
+						NOT = {
+							is_in_faction_with = ROOT
+							is_subject_of = ROOT
+							has_war_with = ROOT
+						}
+					}
+				}
+				hidden_effect = {
+					create_wargoal = { 
+						type = annex_everything 
+						target = ANG
+					}
+				}
+				declare_war_on = { 
+					type = annex_everything 
+					target = ANG
+				}
+			}
+			if = {
+				limit = {
+					PYT = {
+						exists = yes
+						NOT = {
+							is_in_faction_with = ROOT
+							is_subject_of = ROOT
+							has_war_with = ROOT
+						}
+					}
+				}
+				hidden_effect = {
+					create_wargoal = { 
+						type = annex_everything 
+						target = PYT
+					}
+				}
+				declare_war_on = { 
+					type = annex_everything 
+					target = PYT
+				}
+			}
+			if = {
+				limit = {
+					ROU = {
+						exists = yes
+						NOT = {
+							is_in_faction_with = ROOT
+							is_subject_of = ROOT
+							has_war_with = ROOT
+						}
+					}
+				}
+				hidden_effect = {
+					create_wargoal = { 
+						type = annex_everything 
+						target = ROU
+					}
+				}
+				declare_war_on = { 
+					type = annex_everything 
+					target = ROU
+				}
+			}
+			if = {
+				limit = {
+					KAT = {
+						exists = yes
+						NOT = {
+							is_in_faction_with = ROOT
+							is_subject_of = ROOT
+							has_war_with = ROOT
+						}
+					}
+				}
+				hidden_effect = {
+					create_wargoal = { 
+						type = annex_everything 
+						target = KAT
+					}
+				}
+				declare_war_on = { 
+					type = annex_everything 
+					target = KAT
+				}
+			}
+			if = {
+				limit = {
+					BRZ = {
+						exists = yes
+						NOT = {
+							is_in_faction_with = ROOT
+							is_subject_of = ROOT
+							has_war_with = ROOT
+						}
+					}
+				}
+				hidden_effect = {
+					create_wargoal = { 
+						type = annex_everything 
+						target = BRZ
+					}
+				}
+				declare_war_on = { 
+					type = annex_everything 
+					target = BRZ
+				}
+			}
+			if = {
+				limit = {
+					YAL = {
+						exists = yes
+						NOT = {
+							is_in_faction_with = ROOT
+							is_subject_of = ROOT
+							has_war_with = ROOT
+						}
+					}
+				}
+				hidden_effect = {
+					create_wargoal = { 
+						type = annex_everything 
+						target = YAL
+					}
+				}
+				declare_war_on = { 
+					type = annex_everything 
+					target = YAL
+				}
+			}
+		}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+
+shared_focus = {
+	id = LSC_an_inheritance_denied
+	icon = GFX_goal_POR_royal_edicts
+	cost = 5
+	ai_will_do = { factor = 100 }
+	
+	available = {
+		382 = {
+				owner = {
+						tag = LSC
+					}
+				}
+			}
+	
+	prerequisite = { focus = LSC_divine_justice }
+	x = 0
+	y = 1
+	relative_position_id = LSC_divine_justice
+	completion_reward = {
+	hidden_effect = {
+		country_event = longsword.185
+		}
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_seek_allies"
+		set_cosmetic_tag = LSC_duchy
+		set_country_leader_ideology = harmonic_constitutionalism
+		if = {
+			 limit = {
+				 LSC = {
+					    is_in_faction = yes
+						}
+					}
+				add_political_power = 100	
+			}
+		else_if = {
+			    limit = {
+				    LSC = {
+					    NOT = {
+					        is_river_fed_member = no
+						}
+					}
+				}
+			create_faction = "LSC_flawless_faction"
+			}
+		}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+
+shared_focus = {
+	id = LSC_old_ties_and_new_friendships
+	icon = GFX_goal_collaborate_local_elites_pony
+	cost = 5
+	ai_will_do = { factor = 100 }
+	
+	
+	available = {
+		382 = {
+				owner = {
+						tag = LSC
+					}
+				}
+			}
+	prerequisite = { focus = LSC_divine_justice }
+	x = -2
+	y = 1
+	relative_position_id = LSC_divine_justice
+	completion_reward = {
+		if = {
+		limit = {
+			NOT = {
+			has_global_flag = GRI_grover_vi_dead
+			}
+		}
+			LSC = {
+				country_event = longsword.186
+			}
+		}
+		add_ideas = LSC_local_auxiliaries
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+
+shared_focus = {
+	id = LSC_new_corporations
+	icon = GFX_goal_generic_lau_factory
+	cost = 5
+	ai_will_do = { factor = 100 }
+	
+	available = {
+		382 = {
+				owner = {
+						tag = LSC
+					}
+				}
+			}
+			
+	prerequisite = { focus = LSC_divine_justice }
+	x = 2
+	y = 1
+	relative_position_id = LSC_divine_justice
+	completion_reward = {
+		add_ideas = GRI_industrial_center_east
+		custom_effect_tooltip = available_designer
+		show_ideas_tooltip = pride
+		custom_effect_tooltip = available_designer
+		show_ideas_tooltip = feat_company_6
+		custom_effect_tooltip = available_designer
+		show_ideas_tooltip = STW_standardisation_concern
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+
+shared_focus = {
+	id = LSC_truly_duke_reborn
+	icon = GFX_focus_indy_swing_the_sword
+	cost = 5
+	ai_will_do = { factor = 100 }
+	
+	
+	prerequisite = { 
+	focus = LSC_new_corporations
+    focus = LSC_old_ties_and_new_friendships
+    focus = LSC_an_inheritance_denied	
+	}
+	
+	x = 0
+	y = 2
+	relative_position_id = LSC_divine_justice
+	completion_reward = {
+	hidden_effect = {
+		country_event = longsword.192
+		}
+	custom_effect_tooltip = RCT_can_justify
+			hidden_effect = {
+				set_rule = {
+					can_only_justify_war_on_threat_country = no
+					can_declare_war_on_same_ideology = yes
+				}
+			}
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+
+
+
+shared_focus = {
+	id = LSC_never_again
+	icon = GFX_goal_fire
+	cost = 6
+	ai_will_do = { factor = 100 }
+	
+	allow_branch = {
+		OR = {
+			has_country_leader = {
+				character = LSC_abba_povner
+				ruling_only = yes
+			}
+			has_country_leader = {
+				character = LSC_ludwig_von_pliater
+				ruling_only = yes
+			}
+		}
+	}
+
+	x = 0
+	y = 2
+	relative_position_id = LSC_hellquill_harcom
+	prerequisite = { focus = LSC_hellquill_harcom }
+	available = {
+		HLQ = { exists = no }
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_never_again"
+		create_faction = "LSC_povner_faction"
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+shared_focus = {
+	id = LSC_prepare_arsenic
+	icon = GFX_goal_forced_res
+	cost = 6
+	ai_will_do = { factor = 100 }
+
+	x = -2
+	y = 3
+	relative_position_id = LSC_hellquill_harcom
+	prerequisite = { focus = LSC_never_again }
+	available = {
+		HLQ = { exists = no }
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_prepare_arsenic"
+		unlock_decision_tooltip = LSC_distribute_arsenic
+	}
+	search_filters = { FOCUS_FILTER_ARMY_BONUS }
+}
+shared_focus = {
+	id = LSC_black_books
+	icon = GFX_goal_bookstack
+	cost = 6
+	ai_will_do = { factor = 100 }
+
+	x = 0
+	y = 3
+	relative_position_id = LSC_hellquill_harcom
+	prerequisite = { focus = LSC_never_again }
+	available = {
+		HLQ = { exists = no }
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_black_books"
+		unlock_decision_tooltip = LSC_begin_assassinations
+	}
+	search_filters = { FOCUS_FILTER_ARMY_BONUS }
+}
+shared_focus = {
+	id = LSC_fanatic_army
+	icon = GFX_goal_griffon_levy
+	cost = 6
+	ai_will_do = { factor = 100 }
+
+	x = 2
+	y = 3
+	relative_position_id = LSC_hellquill_harcom
+	prerequisite = { focus = LSC_never_again }
+	available = {
+		HLQ = { exists = no }
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_fanatic_army"
+		custom_effect_tooltip = LNS_povner_division_gained
+		division_template = {
+			name = "Žygiuojančios vėlės"
+			division_names_group = LSC_INF_02
+			regiments = {
+				infantry = { x = 0 y = 0 }
+				infantry = { x = 0 y = 1 }
+				infantry = { x = 0 y = 2 }
+				infantry = { x = 0 y = 3 }
+				infantry = { x = 0 y = 4 }
+				infantry = { x = 1 y = 0 }
+				infantry = { x = 1 y = 1 }
+				infantry = { x = 1 y = 2 }
+				infantry = { x = 1 y = 3 }
+				infantry = { x = 1 y = 4 }
+			}
+		}
+		hidden_effect = {
+			505 = {
+				create_unit = {
+					division = "division_template = \"Žygiuojančios vėlės\" start_experience_factor = 0.9 start_equipment_factor = 1"
+					owner = ROOT
+					count = 10
+				}
+			}
+		}
+	}
+	search_filters = { FOCUS_FILTER_ARMY_BONUS }
+}
+shared_focus = {
+	id = LSC_burn_herzland
+	icon = GFX_goal_gri
+	cost = 3
+	ai_will_do = { 
+		factor = 100 
+		modifier = {
+			factor = 0
+			has_army_manpower = {
+				size < 200000
+			}
+		}
+		modifier = {
+			factor = 0
+			has_war = yes
+		}
+	}
+	
+	available = {
+		has_country_leader = {
+			character = LSC_abba_povner
+			ruling_only = yes
+		}
+		is_subject = no
+	}
+	bypass = {
+		GRD = {
+			OR = {
+				exists = no
+				is_subject_of = ROOT
+				has_war_with = ROOT
+			}
+		}
+	}
+	
+	will_lead_to_war_with = GRI
+	will_lead_to_war_with = ANG
+	will_lead_to_war_with = PYT
+	will_lead_to_war_with = YAL
+	will_lead_to_war_with = ROU
+	will_lead_to_war_with = KAT
+	will_lead_to_war_with = STW
+	will_lead_to_war_with = BRZ
+	will_lead_to_war_with = FEA
+
+	x = 0
+	y = 4
+	relative_position_id = LSC_hellquill_harcom
+	prerequisite = { focus = LSC_prepare_arsenic }
+	prerequisite = { focus = LSC_black_books }
+	prerequisite = { focus = LSC_fanatic_army }
+	available = {
+		HLQ = { exists = no }
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_burn_herzland"
+		hidden_effect = {
+		create_wargoal = {
+				type = annex_everything
+				target = GRI
+			}
+			create_wargoal = {
+				type = annex_everything
+				target = STW
+			}
+			create_wargoal = {
+				type = annex_everything
+				target = YAL
+			}
+			create_wargoal = {
+				type = annex_everything
+				target = PYT
+			}
+			create_wargoal = {
+				type = annex_everything
+				target = ROU
+			}
+			create_wargoal = {
+				type = annex_everything
+				target = ANG
+			}
+			create_wargoal = {
+				type = annex_everything
+				target = KAT
+			}
+			create_wargoal = {
+				type = annex_everything
+				target = BRZ
+			}
+			create_wargoal = {
+				type = annex_everything
+				target = FEA
+			}
+			}
+			declare_war_on = { 
+			type = annex_everything 
+			target = GRI
+		}
+		declare_war_on = { 
+			type = annex_everything 
+			target = STW
+		}
+		declare_war_on = { 
+			type = annex_everything 
+			target = YAL
+		}
+		declare_war_on = { 
+			type = annex_everything 
+			target = PYT
+		}
+		declare_war_on = { 
+			type = annex_everything 
+			target = ROU 
+		}
+		declare_war_on = { 
+			type = annex_everything 
+			target = ANG
+		}
+		declare_war_on = { 
+			type = annex_everything 
+			target = KAT
+		}
+		declare_war_on = { 
+			type = annex_everything 
+			target = BRZ
+		}
+		declare_war_on = { 
+			type = annex_everything 
+			target = FEA
+		}
+		add_ideas = LNS_povner_crusade
+			
+			
+
+	}
+	search_filters = { FOCUS_FILTER_ANNEXATION }
+}
+
+shared_focus = {
+	id = LSC_hellquill_supremacist
+	icon = GFX_goal_Free_the_Ponies_of_Hellquill_1
+	x = 9
+	y = 6
+	cost = 4
+	available = { 
+		has_completed_focus = LSC_constitutional_convention
+		NOT = {
+			has_active_mission = LSC_three_year_plan
+		}
+	}
+	bypass = {
+		NOT = { can_declare_war_on = HLQ }
+	}
+		allow_branch = {
+		is_subject = no
+	}
+
+	ai_will_do = {
+		factor = 100
+		modifier = {
+			factor = 0
+			has_army_manpower = {
+				size < 50000
+			}
+		}
+	}
+	will_lead_to_war_with = HLQ
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_hellquill_supremacist"
+		every_state = {
+			limit = { is_core_of = HLQ }
+			add_claim_by = ROOT
+		}
+		create_wargoal = {
+			type = annex_everything
+			target = HLQ
+		}
+		country_event = longsword.115
+	}
+	search_filters = { FOCUS_FILTER_ANNEXATION }
+}
+shared_focus = {
+	id = LSC_destroy_reformisten
+	icon = GFX_goal_No_Half_Measures
+	cost = 6
+	ai_will_do = { factor = 100 }
+
+	x = 0
+	y = 1
+	relative_position_id = LSC_hellquill_supremacist
+	prerequisite = { focus = LSC_hellquill_supremacist }
+	available = {
+		HLQ = { exists = no }
+		owns_state = 537
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_fate_of_reformisten"
+		add_stability = 0.1
+		save_current_manpower = yes
+		537 = {
+			add_manpower = -1600
+		}
+		553 = {
+			add_manpower = -1600
+		}
+		633 = {
+			add_manpower = -1600
+		}
+		634 = {
+			add_manpower = -1600
+		}
+		restore_previous_manpower = yes
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+shared_focus = {
+	id = LSC_hellquill_reconstruction_supremacist
+	icon = GFX_goal_generic_lau_construction
+	cost = 6
+	ai_will_do = { factor = 100 }
+
+	x = -2
+	y = 1
+	relative_position_id = LSC_hellquill_supremacist
+	prerequisite = { focus = LSC_hellquill_supremacist }
+	available = {
+		OR = {
+			owns_state = 537
+			owns_state = 553
+			owns_state = 633
+			owns_state = 634
+		}
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_hellquill_reconstruction_supremacist"
+		unlock_decision_category_tooltip = LSC_Hellquill_reconstruction_decisions
+	}
+	search_filters = { FOCUS_FILTER_INDUSTRY }
+}
+shared_focus = {
+	id = LSC_integrate_hellquill_supremacist
+	icon = GFX_goal_generic_ponykind
+	cost = 6
+	ai_will_do = { factor = 100 }
+
+	x = 2
+	y = 1
+	relative_position_id = LSC_hellquill_supremacist
+	prerequisite = { focus = LSC_hellquill_supremacist }
+	available = {
+		HLQ = { exists = no }
+		OR = {
+			owns_state = 537
+			owns_state = 553
+			owns_state = 633
+			owns_state = 634
+		}
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_integrate_hellquill_supremacist"
+		HLQ = { add_to_ROOT_potential_cores = yes }
+	}
+	search_filters = { FOCUS_FILTER_ANNEXATION }
+}
+shared_focus = {
+	id = LSC_sirdis
+	icon = GFX_goal_crystal_heart
+	cost = 6
+	ai_will_do = { factor = 100 }
+
+	x = 0
+	y = 2
+	relative_position_id = LSC_hellquill_supremacist
+	prerequisite = { focus = LSC_integrate_hellquill_supremacist }
+	prerequisite = { focus = LSC_destroy_reformisten }
+	prerequisite = { focus = LSC_hellquill_reconstruction_supremacist }
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_sirdis"
+		set_cosmetic_tag = LSC_sirdis
+		increase_society_development_with_tt = yes
+		create_faction = "LSC_supremacist_faction"
+		country_event = longsword.32
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+shared_focus = {
+	id = LSC_attack_west
+	icon = GFX_goal_gri
+	cost = 3
+	ai_will_do = { 
+		factor = 100 
+		modifier = {
+			factor = 0
+			has_army_manpower = {
+				size < 200000
+			}
+		}
+		modifier = {
+			factor = 0
+			GRI = {
+				has_war = no
+			}
+		}
+		modifier = {
+			factor = 0
+			has_war = yes
+		}
+	}
+	
+	available = {
+		has_government = fascism
+		is_subject = no
+		if = {
+			limit = {
+				GRD = {
+					OR = {
+						tag = GRI
+						tag = BRZ
+						tag = ANG
+						tag = FEA
+						tag = KAT
+						tag = PYT
+						tag = ROU
+						tag = TRD
+						tag = YAL
+					}
+					owns_state = 382
+				}
+			}
+			has_global_flag = GRI_empire_rising_flag
+		}
+	}
+	bypass = {
+		OR = {
+			owns_state = 382
+			var:382.owner = {
+				is_subject_of = ROOT
+			}
+			var:382.owner = {
+				has_war_with = ROOT
+			}
+		}
+	}
+	
+	will_lead_to_war_with = GRD # tag alias for event_target:griffonian_empire
+
+	x = -2
+	y = 3
+	relative_position_id = LSC_hellquill_supremacist
+	prerequisite = { focus = LSC_sirdis }
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_attack_west"
+		declare_war_on = { type = annex_everything target = 382.owner }
+	}
+	search_filters = { FOCUS_FILTER_ANNEXATION }
+}
+shared_focus = {
+	id = LSC_restore_universities
+	icon = GFX_goal_supremacy_of_will
+	cost = 6
+	ai_will_do = { factor = 100 }
+	
+	available = {
+	    ROU = {
+			OR = {
+				exists = no
+				is_subject_of = ROOT
+			}
+		}
+		owns_state = 674
+	}
+
+	x = -3
+	y = 4
+	relative_position_id = LSC_hellquill_supremacist
+	prerequisite = { focus = LSC_attack_west }
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_restore_universities"
+		add_ideas = GRI_university
+	}
+	search_filters = { FOCUS_FILTER_ANNEXATION }
+}
+shared_focus = {
+	id = LSC_fate_of_grover
+	icon = GFX_goal_grover_vi
+	cost = 6
+	ai_will_do = { factor = 100 }
+	
+	available = {
+		owns_state = 382
+		NOT = { has_war_with = GRD }
+	}
+	bypass = {
+		has_global_flag = GRI_grover_vi_dead
+	}
+
+	x = -1
+	y = 4
+	relative_position_id = LSC_hellquill_supremacist
+	prerequisite = { focus = LSC_attack_west }
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_fate_of_grover"
+		country_event = longsword.128
+	}
+	search_filters = { FOCUS_FILTER_ANNEXATION }
+}
+shared_focus = {
+	id = LSC_integrate_herzland
+	icon = GFX_goal_generic_military_deal_pony
+	cost = 6
+	ai_will_do = { factor = 100 }
+	
+	available = {
+	    GRI = {
+			OR = {
+				exists = no
+				is_subject_of = ROOT
+			}
+		}
+	}
+	bypass = {
+	    all_of = {
+			array = GRI.core_states
+			var:v = { is_core_of = ROOT }
+		}
+	}
+
+	x = -2
+	y = 5
+	relative_position_id = LSC_hellquill_supremacist
+	prerequisite = { focus = LSC_attack_west }
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_integrate_herzland"
+		ANG = { add_to_ROOT_potential_cores = yes }
+		KAT = { add_to_ROOT_potential_cores = yes }
+		YAL = { add_to_ROOT_potential_cores = yes }
+		PYT = { add_to_ROOT_potential_cores = yes }
+		ROU = { add_to_ROOT_potential_cores = yes }
+		BRZ = { add_to_ROOT_potential_cores = yes }
+		STW = { add_to_ROOT_potential_cores = yes }
+		FEA = { add_to_ROOT_potential_cores = yes }
+		GRI = { add_to_ROOT_potential_cores = yes }
+	}
+	search_filters = { FOCUS_FILTER_ANNEXATION }
+}
+shared_focus = {
+	id = LSC_attack_east
+	icon = GFX_focus_riv_form_federation
+	cost = 3
+	ai_will_do = { 
+		factor = 100 
+		modifier = {
+			factor = 0
+			has_army_manpower = {
+				size < 200000
+			}
+		}
+		modifier = {
+			factor = 0
+			has_war = yes
+		}
+	}
+	available = {
+		has_government = fascism
+		is_subject = no
+		OR = {
+			country_exists = RIV
+			country_exists = RCT
+			country_exists = LCT
+			country_exists = NIM
+			country_exists = WIT
+			country_exists = BAK
+			country_exists = DEP
+			country_exists = FRE
+			country_exists = DMT
+		}
+	}
+	bypass = {
+		DMT = {
+			OR = {
+				exists = no
+				is_subject_of = ROOT
+				has_war_with = ROOT
+			}
+		}
+		BAK = {
+			OR = {
+				exists = no
+				is_subject_of = ROOT
+				has_war_with = ROOT
+			}
+		}
+		DEP = {
+			OR = {
+				exists = no
+				is_subject_of = ROOT
+				has_war_with = ROOT
+			}
+		}
+		LCT = {
+			OR = {
+				exists = no
+				is_subject_of = ROOT
+				has_war_with = ROOT
+			}
+		}
+		RCT = {
+			OR = {
+				exists = no
+				is_subject_of = ROOT
+				has_war_with = ROOT
+			}
+		}
+		WIT = {
+			OR = {
+				exists = no
+				is_subject_of = ROOT
+				has_war_with = ROOT
+			}
+		}
+		NIM = {
+			OR = {
+				exists = no
+				is_subject_of = ROOT
+				has_war_with = ROOT
+			}
+		}
+		FRE = {
+			OR = {
+				exists = no
+				is_subject_of = ROOT
+				has_war_with = ROOT
+			}
+		}
+		RIV = {
+			OR = {
+				exists = no
+				is_subject_of = ROOT
+				has_war_with = ROOT
+			}
+		}
+	}
+	will_lead_to_war_with = DMT
+	will_lead_to_war_with = BAK
+	will_lead_to_war_with = DEP
+	will_lead_to_war_with = LCT
+	will_lead_to_war_with = RCT
+	will_lead_to_war_with = WIT
+	will_lead_to_war_with = NIM
+	will_lead_to_war_with = FRE
+
+	x = 2
+	y = 3
+	relative_position_id = LSC_hellquill_supremacist
+	prerequisite = { focus = LSC_sirdis }
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_attack_east"
+		if = {
+			limit = {
+				DMT = {
+					exists = yes
+					NOT = {
+						is_subject_of = ROOT
+						has_war_with = ROOT
+					}
+				}
+			}
+			declare_war_on = { type = annex_everything target = DMT }
+		}
+		if = {
+			limit = {
+				BAK = {
+					exists = yes
+					NOT = {
+						is_subject_of = ROOT
+						has_war_with = ROOT
+					}
+				}
+			}
+			declare_war_on = { type = annex_everything target = BAK }
+		}
+		if = {
+			limit = {
+				DEP = {
+					exists = yes
+					NOT = {
+						is_subject_of = ROOT
+						has_war_with = ROOT
+					}
+				}
+			}
+			declare_war_on = { type = annex_everything target = DEP }
+		}
+		if = {
+			limit = {
+				LCT = {
+					exists = yes
+					NOT = {
+						is_subject_of = ROOT
+						has_war_with = ROOT
+					}
+				}
+			}
+			declare_war_on = { type = annex_everything target = LCT }
+		}
+		if = {
+			limit = {
+				RCT = {
+					exists = yes
+					NOT = {
+						is_subject_of = ROOT
+						has_war_with = ROOT
+					}
+				}
+			}
+			declare_war_on = { type = annex_everything target = RCT }
+		}
+		if = {
+			limit = {
+				WIT = {
+					exists = yes
+					NOT = {
+						is_subject_of = ROOT
+						has_war_with = ROOT
+					}
+				}
+			}
+			declare_war_on = { type = annex_everything target = WIT }
+		}
+		if = {
+			limit = {
+				NIM = {
+					exists = yes
+					NOT = {
+						is_subject_of = ROOT
+						has_war_with = ROOT
+					}
+				}
+			}
+			declare_war_on = { type = annex_everything target = NIM }
+		}
+		if = {
+			limit = {
+				FRE = {
+					exists = yes
+					NOT = {
+						is_subject_of = ROOT
+						has_war_with = ROOT
+					}
+				}
+			}
+			declare_war_on = { type = annex_everything target = FRE }
+		}
+		if = {
+			limit = {
+				RIV = {
+					exists = yes
+					NOT = {
+						is_subject_of = ROOT
+						has_war_with = ROOT
+					}
+				}
+			}
+			declare_war_on = { type = annex_everything target = RIV }
+		}
+	}
+	search_filters = { FOCUS_FILTER_ANNEXATION }
+}
+shared_focus = {
+	id = LSC_include_new_species
+	icon = GFX_focus_DMT_hall_of_the_mountain_king
+	cost = 6
+	ai_will_do = { factor = 100 }
+	
+	available = {
+	    DMT = {
+			OR = {
+				exists = no
+				is_subject_of = ROOT
+			}
+		}
+		has_full_control_of_state = 637
+	}
+
+	x = 3
+	y = 4
+	relative_position_id = LSC_hellquill_supremacist
+	prerequisite = { focus = LSC_attack_east }
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_include_new_species"
+		custom_effect_tooltip = LSC_unlock_dog_leaders
+		if = {
+			limit = { NOT = { has_tech = tech_ironpaws } }
+			set_technology = { tech_ironpaws = 1 }
+		}
+		fix_weapon_techs = yes
+		DMT = { add_to_ROOT_potential_cores = yes }
+		BAK = { add_to_ROOT_potential_cores = yes }
+	}
+	search_filters = { FOCUS_FILTER_ANNEXATION }
+}
+shared_focus = {
+	id = LSC_abolish_riverfed
+	icon = GFX_goal_river_fed_suppression
+	cost = 6
+	ai_will_do = { factor = 100 }
+	
+	available = {
+	    RCT = {
+			OR = {
+				exists = no
+				is_subject_of = ROOT
+			}
+		}
+		has_full_control_of_state = 619
+	}
+
+	x = 1
+	y = 4
+	relative_position_id = LSC_hellquill_supremacist
+	prerequisite = { focus = LSC_attack_east }
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_abolish_riverfed"
+		add_ideas = LNS_riverfed_abolished
+		NIM = { add_to_ROOT_potential_cores = yes }
+		FRE = { add_to_ROOT_potential_cores = yes }
+		WIT = { add_to_ROOT_potential_cores = yes }
+	}
+	search_filters = { FOCUS_FILTER_ANNEXATION }
+}
+shared_focus = {
+	id = LSC_integrate_riverfed
+	icon = GFX_goal_ideology_national_populist
+	cost = 6
+	ai_will_do = { factor = 100 }
+	
+	available = {
+	    RCT = {
+			OR = {
+				exists = no
+				is_subject_of = ROOT
+			}
+		}
+		has_full_control_of_state = 619
+	}
+
+	x = 2
+	y = 5
+	relative_position_id = LSC_hellquill_supremacist
+	prerequisite = { focus = LSC_attack_east }
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_integrate_riverfed"
+		RCT = { add_to_ROOT_potential_cores = yes }
+		LCT = { add_to_ROOT_potential_cores = yes }
+		DEP = { add_to_ROOT_potential_cores = yes }
+	}
+	search_filters = { FOCUS_FILTER_ANNEXATION }
+}
+shared_focus = {
+	id = LSC_griffking_empire
+	icon = GFX_griffking_utopia
+	cost = 6
+	ai_will_do = { factor = 100 }
+	available = {
+		has_full_control_of_state = 674
+		has_full_control_of_state = 619
+		has_full_control_of_state = 382
+		has_full_control_of_state = 387
+		has_war = no
+	}
+
+	x = 0
+	y = 6
+	relative_position_id = LSC_hellquill_supremacist
+	prerequisite = { focus = LSC_integrate_herzland }
+	prerequisite = { focus = LSC_integrate_riverfed }
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_griffking_empire"
+		add_stability = 0.1
+		add_political_power = 100
+		hidden_effect = { set_country_flag = { flag = holds_griffon_capital value = 1 } }
+		drop_cosmetic_tag = yes
+		set_cosmetic_tag = LSC_griffking_empire_cosmetic
+		save_global_event_target_as = griffonian_empire
+		set_variable = { global.griffonian_empire_var = THIS }
+		custom_effect_tooltip = LSC_endless_war_tooltip
+		hidden_effect = {
+			news_event = { id = longsword.123 hours = 1 }
+			country_event = { id = longsword.129 hours = 2 }
+			every_country = {
+				limit = {
+					is_griffon_continent_griffon_country = yes
+				}
+				add_opinion_modifier = { target = ROOT modifier = LCT_hates_for_griffon_empire_opinion }
+				add_opinion_modifier = { target = ROOT modifier = embargo }
+
+				add_ai_strategy = {
+					type = antagonize
+					id = ROOT
+					value = 300
+				}
+			}
+			every_country = {
+				limit = {
+					is_griffon_continent_griffon_country = yes
+					num_of_factories > 50
+				}
+				country_event = { id = longsword.124 hours = 6 }
+			}
+		}
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+shared_focus = {
+	id = LSC_endgame
+	icon = GFX_goal_white_magic_symbol
+	cost = 20
+	ai_will_do = { factor = 100 }
+	available = {
+		has_war = no
+	}
+
+	x = 0
+	y = 7
+	relative_position_id = LSC_hellquill_supremacist
+	prerequisite = { focus = LSC_griffking_empire }
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_endgame"
+		remove_dynamic_modifier = { modifier = LSC_griffon_resistance }
+		custom_effect_tooltip = LSC_endgame_tooltip
+		clr_country_flag = war_economy_only_flag
+		add_ideas = civilian_economy
+		set_country_flag = demilitarized
+		country_event = longsword.130
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+
+###############################################################
+### Longsword Republic (LSC) Military Tree ###
+###############################################################
+
+shared_focus = {
+	id = LSC_IIA
+	icon = GFX_goal_national_arsenal
+	cost = 6
+	ai_will_do = { factor = 100 }
+	available = { 
+		has_completed_focus = LSC_constitutional_convention
+	}
+
+	x = 18
+	y = 0
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_IIA"
+		army_experience = 25
+		add_ideas = LNS_proper_army_idea
+		hidden_effect = {
+			set_technology = {
+				popup = no
+				guerrila_warfare_enable = 0
+			}
+		}
+	}
+	search_filters = { FOCUS_FILTER_ARMY_BONUS }
+}
+shared_focus = {
+	id = LSC_defensive_army
+	icon = GFX_goal_generic_drafted_army
+	cost = 6
+	ai_will_do = { factor = 100 }
+
+	x = 1
+	y = 1
+	relative_position_id = LSC_IIA
+	prerequisite = { focus = LSC_IIA }
+	mutually_exclusive = { focus = LSC_offensive_army }
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_defensive_army"
+		swap_ideas = {
+			remove_idea = LNS_proper_army_idea
+			add_idea = LNS_proper_army_idea_1
+		}
+	}
+	search_filters = { FOCUS_FILTER_ARMY_BONUS }
+}
+shared_focus = {
+	id = LSC_weapons_fund
+	icon = GFX_goal_Modern_Weapons
+	cost = 6
+	ai_will_do = { factor = 100 }
+
+	x = 1
+	y = 2
+	relative_position_id = LSC_IIA
+	prerequisite = { focus = LSC_defensive_army }
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_weapons_fund"
+		add_ideas = LNS_weapons_production
+		add_equipment_to_stockpile = {
+			type = infantry_equipment_0
+			amount = 1500
+			producer = LNS
+		}
+	}
+	search_filters = { FOCUS_FILTER_ARMY_BONUS }
+}
+shared_focus = {
+	id = LSC_attrition_tactics
+	icon = GFX_SIA_jungletraining
+	cost = 6
+	ai_will_do = { factor = 100 }
+
+	x = 0
+	y = 3
+	relative_position_id = LSC_IIA
+	prerequisite = { focus = LSC_defensive_army }
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_attrition_tactics"
+		set_technology = { LSC_forest_warfare = 1 }
+		custom_effect_tooltip = LSC_forest_warfare_effect
+	}
+	search_filters = { FOCUS_FILTER_ARMY_BONUS }
+}
+shared_focus = {
+	id = LSC_engineer_earthworks
+	icon = GFX_goal_generic_construction2
+	cost = 6
+	ai_will_do = { factor = 100 }
+
+	x = 2
+	y = 3
+	relative_position_id = LSC_IIA
+	prerequisite = { focus = LSC_weapons_fund }
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_engineer_earthworks"
+		if = {
+			limit = { NOT = { has_tech = tech_engineers } }
+			set_technology = { tech_engineers = 1 }
+			add_tech_bonus = {
+				name = LSC_engineer_earthworks
+				bonus = 0.75
+				uses = 1
+				category = engineers_tech
+			}
+			else = {
+				add_tech_bonus = {
+					name = LSC_engineer_earthworks
+					bonus = 0.75
+					uses = 2
+					category = engineers_tech
+				}
+			}
+		}
+	}
+	search_filters = { FOCUS_FILTER_ARMY_BONUS }
+}
+shared_focus = {
+	id = LSC_ILKS
+	icon = GFX_focus_generic_support_the_left_right
+	cost = 6
+	ai_will_do = { factor = 100 }
+
+	x = 1
+	y = 4
+	relative_position_id = LSC_IIA
+	prerequisite = { focus = LSC_engineer_earthworks }
+	prerequisite = { focus = LSC_attrition_tactics }
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_ILKS"
+		add_war_support = 0.1
+		add_ideas = LNS_ILKS
+	}
+	search_filters = { FOCUS_FILTER_MANPOWER }
+}
+shared_focus = {
+	id = LSC_nation_defense_planning
+	icon = GFX_goal_officers
+	cost = 6
+	ai_will_do = { factor = 100 }
+
+	x = 3
+	y = 4
+	relative_position_id = LSC_IIA
+	prerequisite = { focus = LSC_engineer_earthworks }
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_ILKS"
+		add_doctrine_cost_reduction = {
+			name = land_doc_bonus
+			cost_reduction = 0.5
+			uses = 2
+			category = land_doctrine
+		}
+	}
+	search_filters = { FOCUS_FILTER_ARMY_BONUS }
+}
+shared_focus = {
+	id = LSC_arms_manufacturing
+	icon = GFX_goal_factory_complex
+	cost = 6
+	ai_will_do = { factor = 100 }
+
+	x = 3
+	y = 2
+	relative_position_id = LSC_IIA
+	prerequisite = { 
+		focus = LSC_offensive_army
+		focus = LSC_defensive_army
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_arms_manufacturing"
+		add_tech_bonus = {
+			name = LSC_arms_manufacturing
+			bonus = 0.5
+			uses = 1
+			category = infantry_weapons
+		}
+		505 = {
+			add_extra_state_shared_building_slots = 1
+			add_building_construction = {
+				type = arms_factory
+				level = 1
+				instant_build = yes
+			}
+		}
+	}
+	search_filters = { FOCUS_FILTER_INDUSTRY }
+}
+shared_focus = {
+	id = LSC_offensive_army
+	icon = GFX_focus_indy_tanks_across_the_border
+	cost = 6
+	ai_will_do = { factor = 100 }
+
+	x = 5
+	y = 1
+	relative_position_id = LSC_IIA
+	prerequisite = { focus = LSC_IIA }
+	mutually_exclusive = { focus = LSC_defensive_army }
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_offensive_army"
+		swap_ideas = {
+			remove_idea = LNS_proper_army_idea
+			add_idea = LNS_proper_army_idea_2
+		}
+	}
+	search_filters = { FOCUS_FILTER_ARMY_BONUS }
+}
+shared_focus = {
+	id = LSC_bite_and_hold
+	icon = GFX_goal_offensive_army
+	cost = 6
+	ai_will_do = { factor = 100 }
+
+	x = 5
+	y = 2
+	relative_position_id = LSC_IIA
+	prerequisite = { focus = LSC_offensive_army }
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_offensive_army"
+		add_ideas = LNS_bite_and_hold
+		add_doctrine_cost_reduction = {
+			name = land_doc_bonus
+			cost_reduction = 0.5
+			uses = 1
+			category = land_doctrine
+		}
+	}
+	search_filters = { FOCUS_FILTER_ARMY_BONUS }
+}
+shared_focus = {
+	id = LSC_offensive_tactics
+	icon = GFX_goal_military_mission_soldier
+	cost = 6
+	ai_will_do = { factor = 100 }
+
+	x = 8
+	y = 2
+	relative_position_id = LSC_IIA
+	prerequisite = { focus = LSC_offensive_army }
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_offensive_tactics"
+		every_army_leader = {
+			add_attack = 1
+		}
+	}
+	search_filters = { FOCUS_FILTER_ARMY_BONUS }
+}
+shared_focus = {
+	id = LSC_magical_infantry_focus
+	icon = GFX_goal_magical_weapon_focus
+	cost = 6
+	ai_will_do = { factor = 100 }
+
+	x = 10
+	y = 3
+	relative_position_id = LSC_IIA
+	prerequisite = { focus = LSC_offensive_tactics }
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_magical_infantry_focus"
+		add_ideas = LNS_healing_spells_idea
+		if = {
+			limit = { NOT = { has_tech = magical_weapons } }
+			custom_effect_tooltip = LNS_magical_infantry_unlocked
+			hidden_effect = {
+				set_technology = { magical_weapons = 1 }
+			}
+		}
+		custom_effect_tooltip = LNS_magical_division_template_gained
+		division_template = {
+			name = "Naujo tipo magiškoji kariauna"
+			division_names_group = LNS_MAG_01
+			regiments = {
+				magical_infantry = { x = 0 y = 0 }
+				magical_infantry = { x = 0 y = 1 }
+				magical_infantry = { x = 0 y = 2 }
+				magical_infantry = { x = 0 y = 3 }
+				magical_infantry = { x = 1 y = 0 }
+				magical_infantry = { x = 1 y = 1 }
+				magical_infantry = { x = 1 y = 2 }
+				artillery_brigade = { x = 2 y = 0 }
+			}
+		
+			support = {
+				artillery = { x = 0 y = 0 }
+			}
+		}
+	}
+	search_filters = { FOCUS_FILTER_ARMY_BONUS }
+}
+shared_focus = {
+	id = LSC_armored_unit
+	icon = GFX_goal_generic_army_tanks
+	cost = 6
+	ai_will_do = { factor = 100 }
+
+	x = 8
+	y = 3
+	relative_position_id = LSC_IIA
+	prerequisite = { focus = LSC_offensive_tactics }
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_armored_unit"
+		custom_effect_tooltip = LNS_armored_division_template_gained
+		if = {
+			limit = {
+				NOT = {
+					has_tech = gwtank
+					has_tech = gwtank_chassis
+				}
+			}
+			if = {
+				limit = {
+					has_dlc = "No Step Back"
+				}
+				set_technology = {
+					gwtank_chassis = 1
+				}
+			}
+			else = {			
+				set_technology = {
+					gwtank = 1
+				}
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = LSM_tank_development
+				bonus = 1
+				uses = 1
+				category = armor
+			}
+		}
+		division_template = {
+			name = "Šarvuočių rinktinė"
+			division_names_group = LSC_ARM_01
+			regiments = {
+				light_armor = { x = 0 y = 0 }
+				light_armor = { x = 0 y = 1 }
+				light_armor = { x = 0 y = 2 }
+				infantry = { x = 1 y = 0 }
+				infantry = { x = 1 y = 1 }
+			}
+			support = {
+				artillery = { x = 0 y = 0 }
+			}
+		}
+		hidden_effect = {
+			505 = {
+				create_unit = {
+					division = "division_template = \"Šarvuočių rinktinė\" start_experience_factor = 0.5 start_equipment_factor = 1"
+					owner = ROOT
+					count = 1
+				}
+			}
+		}
+	}
+	search_filters = { FOCUS_FILTER_ARMY_BONUS }
+}
+shared_focus = {
+	id = LSC_live_combat_exercises
+	icon = GFX_goal_military_academy
+	cost = 6
+	ai_will_do = { factor = 100 }
+
+	x = 6
+	y = 3
+	relative_position_id = LSC_IIA
+	prerequisite = { focus = LSC_offensive_tactics }
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_live_combat_exercises"
+		add_doctrine_cost_reduction = {
+			name = land_doc_bonus
+			cost_reduction = 0.5
+			uses = 2
+			category = land_doctrine
+		}
+	}
+	search_filters = { FOCUS_FILTER_ARMY_BONUS }
+}
+shared_focus = {
+	id = LSC_innovative_military
+	icon = GFX_goal_double_research
+	cost = 6
+	ai_will_do = { factor = 100 }
+
+	x = 7
+	y = 4
+	relative_position_id = LSC_IIA
+	prerequisite = { focus = LSC_live_combat_exercises }
+	prerequisite = { focus = LSC_armored_unit }
+	prerequisite = { focus = LSC_magical_infantry_focus }
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_innovative_military"
+		add_ideas = LNS_innovative_military
+		add_tech_bonus = {
+			name = LSC_innovative_military
+			bonus = 0.5
+			uses = 1
+			category = motorized_equipment
+		}
+		add_tech_bonus = {
+			name = LSC_innovative_military
+			bonus = 0.5
+			uses = 1
+			category = support_tech
+		}
+	}
+	search_filters = { FOCUS_FILTER_ARMY_BONUS }
+}
+shared_focus = {
+	id = LSC_fortifications
+	icon = GFX_goal_nested_fortifications
+	cost = 12
+	ai_will_do = { factor = 100 }
+
+	x = 5
+	y = 5
+	relative_position_id = LSC_IIA
+	prerequisite = { 
+		focus = LSC_innovative_military 
+		focus = LSC_ILKS
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_fortifications"
+		540 = {
+			add_building_construction = {
+				type = bunker
+				level = 2
+				province = 12893
+				instant_build = yes
+			}
+			add_building_construction = {
+				type = bunker
+				level = 2
+				province = 2055
+				instant_build = yes
+			}
+		}
+		552 = {
+			add_building_construction = {
+				type = bunker
+				level = 2
+				province = 9908
+				instant_build = yes
+			}
+			add_building_construction = {
+				type = bunker
+				level = 2
+				province = 9918
+				instant_build = yes
+			}
+			add_building_construction = {
+				type = bunker
+				level = 2
+				province = 9795
+				instant_build = yes
+			}
+			add_building_construction = {
+				type = bunker
+				level = 2
+				province = 11828
+				instant_build = yes
+			}
+			add_building_construction = {
+				type = bunker
+				level = 2
+				province = 11775
+				instant_build = yes
+			}
+			add_building_construction = {
+				type = bunker
+				level = 2
+				province = 978
+				instant_build = yes
+			}
+			add_building_construction = {
+				type = bunker
+				level = 2
+				province = 11770
+				instant_build = yes
+			}
+			add_building_construction = {
+				type = bunker
+				level = 2
+				province = 10083
+				instant_build = yes
+			}
+		}
+		505 = {
+			add_building_construction = {
+				type = bunker
+				level = 2
+				province = 7070
+				instant_build = yes
+			}
+		}
+	}
+	search_filters = { FOCUS_FILTER_INDUSTRY }
+}
+shared_focus = {
+	id = LSC_national_spirit
+	icon = GFX_goal_Dare_to_Die_Corps
+	cost = 6
+	ai_will_do = { factor = 100 }
+
+	x = 2
+	y = 5
+	relative_position_id = LSC_IIA
+	prerequisite = { 
+		focus = LSC_innovative_military 
+		focus = LSC_ILKS
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_national_spirit"
+		add_ideas = LSC_entschlossenheit
+	}
+	search_filters = { FOCUS_FILTER_ARMY_BONUS }
+}
+shared_focus = {
+	id = LSC_military_academy
+	icon = GFX_goal_military_mission_pony
+	cost = 6
+	ai_will_do = { factor = 100 }
+
+	x = 4
+	y = 3
+	relative_position_id = LSC_IIA
+	prerequisite = { 
+		focus = LSC_weapons_fund 
+		focus = LSC_bite_and_hold 
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_military_academy"
+		add_research_slot = 1
+		Improve_Science_Base = yes
+	}
+	search_filters = { FOCUS_FILTER_RESEARCH }
+}
+shared_focus = {
+	id = LSC_griffon_tech
+	icon = GFX_goal_griffon_soldier
+	cost = 6
+	ai_will_do = { factor = 100 }
+
+	x = -1
+	y = 1
+	relative_position_id = LSC_IIA
+	prerequisite = { focus = LSC_IIA }
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_griffon_tech"
+		unlock_decision_category_tooltip = LNS_griffon_tech_research
+	}
+	search_filters = { FOCUS_FILTER_RESEARCH }
+}
+shared_focus = {
+	id = LSC_national_airforce
+	icon = GFX_goal_air_armada
+	cost = 6
+	ai_will_do = { factor = 100 }
+
+	x = -3
+	y = 2
+	relative_position_id = LSC_IIA
+	prerequisite = { focus = LSC_IIA }
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_national_airforce"
+		540 = {
+			add_building_construction = {
+				type = air_base
+				level = 2
+				instant_build = yes
+			}
+		}
+		add_doctrine_cost_reduction = {
+			name = air_doc_bonus
+			cost_reduction = 0.5
+			uses = 2
+			category = air_doctrine
+		}
+	}
+	search_filters = { FOCUS_FILTER_AIRFORCE_BONUS }
+}
+shared_focus = {
+	id = LSC_duster_places
+	icon = GFX_focus_AUS_agriculture
+	cost = 6
+	ai_will_do = { factor = 100 }
+
+	x = -4
+	y = 3
+	relative_position_id = LSC_IIA
+	prerequisite = { focus = LSC_national_airforce }
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_duster_places"
+		540 = {
+			add_extra_state_shared_building_slots = 1
+		}
+		505 = {
+			add_extra_state_shared_building_slots = 1
+		}
+		552 = {
+			add_extra_state_shared_building_slots = 1
+		}
+		add_tech_bonus = {
+			name = fighter_bonus
+			bonus = 0.5
+			uses = 1
+			category = light_fighter
+		}
+	}
+	search_filters = { FOCUS_FILTER_INDUSTRY }
+}
+shared_focus = {
+	id = LSC_fighter_focus
+	icon = GFX_goal_POL_recon_aircraft
+	cost = 6
+	ai_will_do = { factor = 100 }
+
+	x = -2
+	y = 3
+	relative_position_id = LSC_IIA
+	prerequisite = { focus = LSC_national_airforce }
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_fighter_focus"
+		if = {
+			limit = {
+				has_dlc = "By Blood Alone"
+			}
+			if = {
+				limit = { NOT = { has_tech = iw_small_airframe } }
+				set_technology = { iw_small_airframe = 1 }
+			}
+			set_technology = {
+				aa_lmg = 1
+				engines_1 = 1
+			}
+			add_tech_bonus = {
+				name = fighter_bonus
+				bonus = 1.0
+				uses = 1
+				category = light_air
+			}
+			generic_early_fighter = yes
+			add_equipment_to_stockpile = {
+				type = small_plane_airframe_0
+				variant_name = "Early Fighter"
+				amount = 75
+			}
+		}
+		else = {
+			if = {
+				limit = { NOT = { has_tech = early_fighter } }
+				set_technology = { early_fighter = 1 }
+			}
+			add_tech_bonus = {
+				name = fighter_bonus
+				bonus = 1.0
+				uses = 1
+				category = light_air
+			}
+			add_equipment_to_stockpile = {
+				type = fighter_equipment_0
+				amount = 75
+			}
+		}
+	}
+	search_filters = { FOCUS_FILTER_AIRFORCE_BONUS }
+}
+shared_focus = {
+	id = LSC_defense_strategy
+	icon = GFX_focus_generic_air_defense2
+	cost = 6
+	ai_will_do = { factor = 100 }
+
+	x = -3
+	y = 4
+	relative_position_id = LSC_IIA
+	prerequisite = { focus = LSC_national_airforce }
+	mutually_exclusive = { focus = LSC_mass_air_production }
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_defense_strategy"
+		505 = {
+			add_building_construction = {
+				type = anti_air_building
+				level = 2
+				instant_build = yes
+			}
+		}
+		540 = {
+			add_building_construction = {
+				type = anti_air_building
+				level = 2
+				instant_build = yes
+			}
+		}
+		552 = {
+			add_building_construction = {
+				type = anti_air_building
+				level = 2
+				instant_build = yes
+			}
+		}
+	}
+	search_filters = { FOCUS_FILTER_INDUSTRY }
+}
+shared_focus = {
+	id = LSC_mass_air_production
+	icon = GFX_goal_bombs_away
+	cost = 6
+	ai_will_do = { factor = 100 }
+
+	x = -1
+	y = 4
+	relative_position_id = LSC_IIA
+	prerequisite = { focus = LSC_fighter_focus }
+	mutually_exclusive = { focus = LSC_defense_strategy }
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_mass_air_production"
+		add_doctrine_cost_reduction = {
+			name = air_doc_bonus
+			cost_reduction = 0.5
+			uses = 2
+			category = air_doctrine
+		}
+		add_ideas = LNS_plane_factory_idea
+	}
+	search_filters = { FOCUS_FILTER_AIRFORCE_BONUS }
+}
+
+###############################################################
+### Longsword Governorate (LSM) Political Tree ###
+###############################################################
+
+shared_focus = {
+	id = LSM_zeltstadt_meeting
+	icon = GFX_goal_COS_Peace
+	cost = 6
+	ai_will_do = { factor = 100 }
+	select_effect = {
+		country_event = longsword.136
+	}
+	x = 6
+	y = 0
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSM_zeltstadt_meeting"
+		custom_effect_tooltip = unlock_focuses
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+shared_focus = {
+	id = LSM_go_with_wavewing
+	icon = GFX_goal_griffon_knights
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSM_zeltstadt_meeting }
+	available = {
+		always = no
+	}
+	x = -4
+	y = 1
+	relative_position_id = LSM_zeltstadt_meeting
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSM_go_with_wavewing"
+		custom_effect_tooltip = unlock_focuses
+		set_variable = { LSM_wavewing_event_chain_check = 0 }
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+shared_focus = {
+	id = LSM_burn_revolutionary_books
+	icon = GFX_goal_fire
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSM_go_with_wavewing }
+	x = 2
+	y = 1
+	relative_position_id = LSM_go_with_wavewing
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSM_burn_revolutionary_books"
+		hidden_effect = {
+			LSM_wavewing_event_chain_check = yes
+		}
+		add_popularity = { ideology = communism popularity = -0.1 }
+		add_popularity = { ideology = fascism popularity = -0.1 }
+		add_popularity = { ideology = democratic popularity = -0.1 }
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+shared_focus = {
+	id = LSM_assembly_of_knights
+	icon = GFX_goal_generic_castle
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSM_go_with_wavewing }
+	x = 0
+	y = 1
+	relative_position_id = LSM_go_with_wavewing
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSM_assembly_of_knights"
+		hidden_effect = {
+			LSM_wavewing_event_chain_check = yes
+		}
+		add_political_power = 150
+		add_stability = 0.05
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+shared_focus = {
+	id = LSM_court_of_commoners
+	icon = GFX_goal_generic_elections
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSM_assembly_of_knights }
+	x = 1
+	y = 2
+	relative_position_id = LSM_go_with_wavewing
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSM_court_of_commoners"
+		hidden_effect = {
+			LSM_wavewing_event_chain_check = yes
+		}
+		add_ideas = LNS_court_of_commoners
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+shared_focus = {
+	id = LSM_virtue_policy
+	icon = GFX_goal_generic_archonism
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSM_assembly_of_knights }
+	x = 0
+	y = 3
+	relative_position_id = LSM_go_with_wavewing
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSM_virtue_policy"
+		hidden_effect = {
+			LSM_wavewing_event_chain_check = yes
+		}
+		add_ideas = LNS_virtue_policy
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+shared_focus = {
+	id = LSM_patronage_arts_sciences
+	icon = GFX_goal_continuous_research
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSM_virtue_policy }
+	x = 1
+	y = 4
+	relative_position_id = LSM_go_with_wavewing
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSM_patronage_arts_sciences"
+		hidden_effect = {
+			LSM_wavewing_event_chain_check = yes
+		}
+		add_ideas = LNS_patronage_of_arts
+		add_tech_bonus = {
+			name = LSM_patronage_arts_sciences
+			bonus = 0.5
+			uses = 1
+			category = race_tech
+		}
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+shared_focus = {
+	id = LSM_warrior_peasantry
+	icon = GFX_goal_griffon_agriculture
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSM_virtue_policy }
+	x = -1
+	y = 4
+	relative_position_id = LSM_go_with_wavewing
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSM_warrior_peasantry"
+		hidden_effect = {
+			LSM_wavewing_event_chain_check = yes
+		}
+		add_ideas = LNS_wehrbauer_system
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+shared_focus = {
+	id = LSM_smalltime_industry
+	icon = GFX_goal_industrial_pony
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSM_warrior_peasantry }
+	x = 0
+	y = 5
+	relative_position_id = LSM_go_with_wavewing
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSM_smalltime_industry"
+		hidden_effect = {
+			LSM_wavewing_event_chain_check = yes
+		}
+		one_random_industrial_complex = yes
+		one_random_industrial_complex = yes
+	}
+	search_filters = { FOCUS_FILTER_INDUSTRY }
+}
+shared_focus = {
+	id = LSM_pale_of_settlement
+	icon = GFX_goal_generic_dangerous_deal_pony_griffon
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSM_warrior_peasantry }
+	x = -2
+	y = 5
+	relative_position_id = LSM_go_with_wavewing
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSM_pale_of_settlement"
+		hidden_effect = {
+			LSM_wavewing_event_chain_check = yes
+		}
+		save_current_manpower = yes
+		552 = {
+			add_manpower = -100000
+		}
+		540 = {
+			add_manpower = -100000
+		}
+		505 = {
+			add_extra_state_shared_building_slots = 2
+			add_manpower = 200000
+		}
+	}
+	search_filters = { FOCUS_FILTER_INDUSTRY }
+}
+shared_focus = {
+	id = LSM_modernization_of_agriculture
+	icon = GFX_goal_agricultural_aid
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSM_warrior_peasantry }
+	x = -3
+	y = 6
+	relative_position_id = LSM_go_with_wavewing
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSM_modernization_of_agriculture"
+		hidden_effect = {
+			LSM_wavewing_event_chain_check = yes
+		}
+		add_tech_bonus = {
+			name = LSM_modernization_of_agriculture
+			bonus = 1
+			uses = 2
+			category = construction_tech
+			category = industry
+		}
+	}
+	search_filters = { FOCUS_FILTER_INDUSTRY }
+}
+shared_focus = {
+	id = LSM_crusades_archive
+	icon = GFX_goal_bookstack
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSM_virtue_policy }
+	x = -4
+	y = 4
+	relative_position_id = LSM_go_with_wavewing
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSM_crusades_archive"
+		hidden_effect = {
+			LSM_wavewing_event_chain_check = yes
+		}
+		unlock_decision_category_tooltip = LSM_great_archives
+		set_variable = { LSM_stories_collected = 0 }
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+shared_focus = {
+	id = LSM_zeltstadt_super_castle
+	icon = GFX_goal_generic_lau_construction
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSM_crusades_archive }
+	available = {
+		custom_trigger_tooltip = {
+			tooltip = LSM_three_stories_collected
+			check_variable = { LSM_stories_collected > 2 }
+		}
+	}
+	x = -4
+	y = 5
+	relative_position_id = LSM_go_with_wavewing
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSM_zeltstadt_super_castle"
+		hidden_effect = {
+			LSM_wavewing_event_chain_check = yes
+		}
+		505 = {
+			add_building_construction = {
+				type = bunker
+				level = 3
+				province = 9773
+				instant_build = yes
+			}
+			add_state_modifier = {
+				modifier = {
+					local_manpower = 0.15
+				}
+			}
+		}
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+shared_focus = {
+	id = LSM_reenactments
+	icon = GFX_goal_griffon_special_force
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSM_crusades_archive }
+	available = {
+		custom_trigger_tooltip = {
+			tooltip = LSM_three_stories_collected
+			check_variable = { LSM_stories_collected > 2 }
+		}
+	}
+	x = -6
+	y = 5
+	relative_position_id = LSM_go_with_wavewing
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: LSM_reenactments"
+		hidden_effect = {
+			LSM_wavewing_event_chain_check = yes
+		}
+		add_manpower = 5000
+		add_ideas = LNS_battle_reenactments
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+shared_focus = {
+	id = LSM_landtag
+	icon = GFX_focus_generic_monarchy_2
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { 
+		focus = LSM_zeltstadt_super_castle 
+		focus = LSM_modernization_of_agriculture
+	}
+	x = -4
+	y = 7
+	relative_position_id = LSM_go_with_wavewing
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: LSM_landtag"
+		hidden_effect = {
+			LSM_wavewing_event_chain_check = yes
+		}
+		swap_ideas = {
+			remove_idea = LNS_virtue_policy
+			add_idea = LNS_virtue_policy_2
+		}
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+shared_focus = {
+	id = LSM_devolution
+	icon = GFX_focus_generic_authoritarian_government
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSM_go_with_wavewing }
+	x = -2
+	y = 1
+	relative_position_id = LSM_go_with_wavewing
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSM_devolution"
+		hidden_effect = {
+			LSM_wavewing_event_chain_check = yes
+		}
+		add_ideas = LNS_devolution_1
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+shared_focus = {
+	id = LSM_rural_communes
+	icon = GFX_goal_communist_potatoes
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSM_devolution }
+	x = -3
+	y = 2
+	relative_position_id = LSM_go_with_wavewing
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSM_rural_communes"
+		hidden_effect = {
+			LSM_wavewing_event_chain_check = yes
+		}
+		552 = {
+			add_extra_state_shared_building_slots = 1
+		}
+		540 = {
+			add_extra_state_shared_building_slots = 1
+		}
+		505 = {
+			add_extra_state_shared_building_slots = 1
+		}
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+shared_focus = {
+	id = LSM_komtur_system
+	icon = GFX_focus_ger_return_of_the_kaiser
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSM_devolution }
+	x = -1
+	y = 2
+	relative_position_id = LSM_go_with_wavewing
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSM_komtur_system"
+		hidden_effect = {
+			LSM_wavewing_event_chain_check = yes
+		}
+		swap_ideas = {
+			remove_idea = LNS_devolution_1
+			add_idea = LNS_devolution_2
+		}
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+shared_focus = {
+	id = LSM_decentralize_education_system
+	icon = GFX_goal_griffon_books
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSM_komtur_system }
+	prerequisite = { focus = LSM_rural_communes }
+	x = -2
+	y = 3
+	relative_position_id = LSM_go_with_wavewing
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSM_decentralize_education_system"
+		hidden_effect = {
+			LSM_wavewing_event_chain_check = yes
+		}
+		swap_ideas = {
+			remove_idea = LNS_devolution_2
+			add_idea = LNS_devolution_3
+		}
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+shared_focus = {
+	id = LSM_go_with_silvertalon
+	icon = GFX_goal_griffon_soldier
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSM_zeltstadt_meeting }
+	available = {
+		always = no
+	}
+	x = 5
+	y = 1
+	relative_position_id = LSM_zeltstadt_meeting
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSM_go_with_silvertalon"
+		custom_effect_tooltip = unlock_focuses
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+shared_focus = {
+	id = LSM_provisional_government
+	icon = GFX_goal_government_icon
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSM_go_with_silvertalon }
+	x = 6
+	y = 2
+	relative_position_id = LSM_zeltstadt_meeting
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSM_provisional_government"
+		add_stability = 0.1
+		add_political_power = 100
+		effect_tooltip = {
+			add_ideas = LSM_PA_SilWork
+		}
+		hidden_effect = {
+			country_event = longsword.141
+		}
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+shared_focus = {
+	id = LSM_new_state_organization
+	icon = GFX_goal_news
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSM_provisional_government }
+	available = {
+		owns_state = 552
+		owns_state = 540
+		owns_state = 505
+	}
+	x = 6
+	y = 4
+	relative_position_id = LSM_zeltstadt_meeting
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSM_new_state_organization"
+		552 = {
+			add_extra_state_shared_building_slots = 1
+			add_manpower = 25000
+		}
+		540 = {
+			add_extra_state_shared_building_slots = 1
+			add_manpower = 25000
+		}
+		505 = {
+			add_extra_state_shared_building_slots = 1
+			add_manpower = 25000
+		}
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+shared_focus = {
+	id = LSM_soldier_worship
+	icon = GFX_goal_chn_axis_build_infantry_grey
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSM_go_with_silvertalon }
+	x = 4
+	y = 2
+	relative_position_id = LSM_zeltstadt_meeting
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSM_soldier_worship"
+		add_ideas = LNS_soldier_worship_idea_1
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+shared_focus = {
+	id = LSM_young_griffs
+	icon = GFX_goal_griffon_harmony_char
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSM_soldier_worship }
+	x = 3
+	y = 3
+	relative_position_id = LSM_zeltstadt_meeting
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSM_young_griffs"
+		swap_ideas = {
+			remove_idea = LNS_soldier_worship_idea_1
+			add_idea = LNS_soldier_worship_idea_2
+		}
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+shared_focus = {
+	id = LSM_military_pensions
+	icon = GFX_DAH_Topke
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSM_soldier_worship }
+	x = 4
+	y = 4
+	relative_position_id = LSM_zeltstadt_meeting
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSM_military_pensions"
+		add_ideas = LNS_military_pensions
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+shared_focus = {
+	id = LSM_military_police_f
+	icon = GFX_goal_secret_agents
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSM_soldier_worship }
+	x = 5
+	y = 3
+	relative_position_id = LSM_zeltstadt_meeting
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSM_military_police_f"
+		add_ideas = LNS_military_police_idea
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+shared_focus = {
+	id = LSM_pony_suffrage
+	icon = GFX_goal_unicorn_soldier
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSM_new_state_organization }
+	x = 3
+	y = 5
+	relative_position_id = LSM_zeltstadt_meeting
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSM_pony_suffrage"
+		custom_effect_tooltip = available_political_advisor
+		show_ideas_tooltip = LSM_pony_1
+		show_ideas_tooltip = LSM_pony_2
+		show_ideas_tooltip = LSM_pony_3
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+shared_focus = {
+	id = LSM_import_legal_advisors
+	icon = GFX_goal_bag_of_money_pony_griffon
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSM_new_state_organization }
+	x = 5
+	y = 5
+	relative_position_id = LSM_zeltstadt_meeting
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSM_import_legal_advisors"
+		add_political_power = 150
+		hidden_effect = {
+			country_event = longsword.142
+		}
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+shared_focus = {
+	id = LSM_bill_of_rights
+	icon = GFX_focus_indy_pacifist_state
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSM_new_state_organization }
+	x = 7
+	y = 5
+	relative_position_id = LSM_zeltstadt_meeting
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSM_import_legal_advisors"
+		add_ideas = LNS_civil_rights_idea
+		hidden_effect = {
+			country_event = longsword.143
+		}
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+shared_focus = {
+	id = LSM_fight_corruption
+	icon = GFX_focus_indy_unequal_treaties
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSM_bill_of_rights }
+	prerequisite = { focus = LSM_import_legal_advisors }
+	prerequisite = { focus = LSM_pony_suffrage }
+	mutually_exclusive = { focus = LSM_fight_extremism }
+	x = 4
+	y = 6
+	relative_position_id = LSM_zeltstadt_meeting
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSM_fight_corruption"
+		country_event = longsword.144
+		effect_tooltip = {
+			add_timed_idea = { idea = LNS_fighting_corruption days = 180 }
+		}
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+shared_focus = {
+	id = LSM_fight_extremism
+	icon = GFX_HOL_crackdown_natpop
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSM_bill_of_rights }
+	prerequisite = { focus = LSM_import_legal_advisors }
+	prerequisite = { focus = LSM_pony_suffrage }
+	mutually_exclusive = { focus = LSM_fight_corruption }
+	x = 6
+	y = 6
+	relative_position_id = LSM_zeltstadt_meeting
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: LSM_fight_extremism"
+		country_event = longsword.145
+		effect_tooltip = {
+			add_timed_idea = { idea = LNS_fighting_extremists days = 180 }
+		}
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+shared_focus = {
+	id = LSM_engelberg_government
+	icon = GFX_goal_generic_harmony
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSM_fight_extremism focus = LSM_fight_corruption }
+	select_effect = {
+		hidden_effect = {
+			country_event = { days = 7 id = longsword.146 }
+		}
+	}
+	x = 5
+	y = 7
+	relative_position_id = LSM_zeltstadt_meeting
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: LSM_engelberg_government"
+		custom_effect_tooltip = LSM_impending_democracy_failure_tooltip
+		# ...
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+shared_focus = {
+	id = LSM_national_healing
+	icon = GFX_goal_ideology_authoritarian_democrat
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSM_engelberg_government }
+	allow_branch = {
+		has_completed_focus = LSM_engelberg_government
+	}
+	x = 0
+	y = 1
+	relative_position_id = LSM_engelberg_government
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: LSM_national_healing"
+		add_ideas = LNS_national_healing_1
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+shared_focus = {
+	id = LSM_balanced_personhood
+	icon = GFX_goal_griffon_chair
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSM_national_healing }
+	x = -1
+	y = 2
+	relative_position_id = LSM_engelberg_government
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: LSM_balanced_personhood"
+		add_ideas = LNS_balanced_personhood_1
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+shared_focus = {
+	id = LSM_military_governments
+	icon = GFX_goal_HOL_ban_paramilitary
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSM_balanced_personhood }
+	x = -4
+	y = 3
+	relative_position_id = LSM_engelberg_government
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: LSM_military_governments"
+		add_manpower = 15000
+		add_political_power = 100
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+shared_focus = {
+	id = LSM_authority_structure
+	icon = GFX_focus_generic_authoritarian_government
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSM_balanced_personhood }
+	x = -2
+	y = 3
+	relative_position_id = LSM_engelberg_government
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: LSM_authority_structure"
+		swap_ideas = {
+			remove_idea = LNS_balanced_personhood_1
+			add_idea = LNS_balanced_personhood_2
+		}
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+shared_focus = {
+	id = LSM_moral_education
+	icon = GFX_goal_griffon_parchment
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSM_balanced_personhood }
+	x = 0
+	y = 3
+	relative_position_id = LSM_engelberg_government
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: LSM_moral_education"
+		add_ideas = LNS_new_culture_1
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+shared_focus = {
+	id = LSM_advisory_councils
+	icon = GFX_goal_generic_trial
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSM_authority_structure }
+	prerequisite = { focus = LSM_military_governments }
+	x = -3
+	y = 4
+	relative_position_id = LSM_engelberg_government
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: LSM_advisory_councils"
+		one_random_industrial_complex = yes
+		one_random_industrial_complex = yes
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+shared_focus = {
+	id = LSM_foster_new_culture
+	icon = GFX_goal_KTG_Bookstack
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSM_moral_education }
+	x = -1
+	y = 4
+	relative_position_id = LSM_engelberg_government
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: LSM_foster_new_culture"
+		swap_ideas = {
+			remove_idea = LNS_new_culture_1
+			add_idea = LNS_new_culture_2
+		}
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+shared_focus = {
+	id = LSM_ideological_study_circles
+	icon = GFX_goal_griffon_books
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSM_foster_new_culture }
+	x = 0
+	y = 5
+	relative_position_id = LSM_engelberg_government
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: LSM_ideological_study_circles"
+		swap_ideas = {
+			remove_idea = LNS_new_culture_2
+			add_idea = LNS_new_culture_3
+		}
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+shared_focus = {
+	id = LSM_form_the_castle
+	icon = GFX_goal_generic_castle
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSM_foster_new_culture }
+	prerequisite = { focus = LSM_advisory_councils }
+	x = -2
+	y = 5
+	relative_position_id = LSM_engelberg_government
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: LSM_form_the_castle"
+		swap_ideas = {
+			remove_idea = LNS_balanced_personhood_2
+			add_idea = LNS_balanced_personhood_3
+		}
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+shared_focus = {
+	id = LSM_no_mercy
+	icon = GFX_goal_purge_opposition
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSM_national_healing }
+	x = 1
+	y = 2
+	relative_position_id = LSM_engelberg_government
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: LSM_no_mercy"
+		add_stability = 0.1
+		save_current_manpower = yes
+		every_state = {
+			add_manpower = -5000
+		}
+		restore_previous_manpower = yes
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+shared_focus = {
+	id = LSM_political_prison_system
+	icon = GFX_goal_HOL_amend_wapenwet
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSM_no_mercy }
+	x = 1
+	y = 4
+	relative_position_id = LSM_engelberg_government
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: LSM_political_prison_system"
+		add_manpower = -1000
+		one_random_industrial_complex = yes
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+shared_focus = {
+	id = LSM_crack_down_on_reformisten
+	icon = GFX_focus_generic_ban_right_wing
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSM_no_mercy }
+	x = 2
+	y = 3
+	relative_position_id = LSM_engelberg_government
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: LSM_crack_down_on_reformisten"
+		if = {
+			limit = {
+				NOT = {
+					has_idea = LNS_bandit_fighting_01
+				}
+			}
+			add_ideas = LNS_bandit_fighting_00
+		}
+		else = {
+			swap_ideas = {
+				remove_idea = LNS_bandit_fighting_01
+				add_idea = LNS_bandit_fighting_1
+			}
+		}
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+shared_focus = {
+	id = LSM_crack_down_on_partisans
+	icon = GFX_goal_generic_war_with_comintern
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSM_no_mercy }
+	x = 4
+	y = 3
+	relative_position_id = LSM_engelberg_government
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: LSM_crack_down_on_partisans"
+		if = {
+			limit = {
+				NOT = {
+					has_idea = LNS_bandit_fighting_00
+				}
+			}
+			add_ideas = LNS_bandit_fighting_01
+		}
+		else = {
+			swap_ideas = {
+				remove_idea = LNS_bandit_fighting_00
+				add_idea = LNS_bandit_fighting_1
+			}
+		}
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+shared_focus = {
+	id = LSM_burn_forests
+	icon = GFX_goal_fire
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSM_crack_down_on_partisans }
+	prerequisite = { focus = LSM_crack_down_on_reformisten }
+	x = 3
+	y = 4
+	relative_position_id = LSM_engelberg_government
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: LSM_burn_forests"
+		swap_ideas = {
+			remove_idea = LNS_bandit_fighting_1
+			add_idea = LNS_bandit_fighting_2
+		}
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+shared_focus = {
+	id = LSM_secret_police
+	icon = GFX_goal_secret_agents
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSM_political_prison_system }
+	prerequisite = { focus = LSM_burn_forests }
+	x = 2
+	y = 5
+	relative_position_id = LSM_engelberg_government
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: LSM_secret_police"
+		if = {
+			limit = { 
+				has_dlc = "La Resistance"
+				has_intelligence_agency = yes				
+			}
+			if = {
+				limit = { NOT = { has_done_agency_upgrade = upgrade_commando_training } }
+				upgrade_intelligence_agency = upgrade_commando_training
+			}
+			if = {
+				limit = { NOT = { has_done_agency_upgrade = upgrade_crypto_strength } }
+				upgrade_intelligence_agency = upgrade_crypto_strength
+			}
+			if = {
+				limit = { NOT = { has_done_agency_upgrade = upgrade_decryption_boost } }
+				upgrade_intelligence_agency = upgrade_decryption_boost
+			}
+		}
+		else_if = {
+			limit = { 
+				has_dlc = "La Resistance"
+				has_intelligence_agency = no 
+			}
+			create_intelligence_agency = yes
+		}
+		else_if = {
+			limit = {
+				NOT = {
+					has_dlc = "La Resistance"
+				}
+			}
+			add_stability = 0.1
+		}
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+shared_focus = {
+	id = LSM_contitution_novelization
+	icon = GFX_goal_magic_of_friendship_end
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSM_secret_police }
+	prerequisite = { focus = LSM_form_the_castle }
+	x = 0
+	y = 6
+	relative_position_id = LSM_engelberg_government
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: LSM_contitution_novelization"
+		swap_ideas = {
+			remove_idea = LNS_national_healing_1
+			add_idea = LNS_national_healing_2
+		}
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+shared_focus = {
+	id = LSM_rekonstruktion
+	icon = GFX_goal_continuous_repairments
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSM_zeltstadt_meeting }
+	x = 0
+	y = 2
+	relative_position_id = LSM_zeltstadt_meeting
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSM_rekonstruktion"
+		LNS_reduce_civil_war_recovery = yes
+		increase_society_development_with_tt = yes
+	}
+	search_filters = { FOCUS_FILTER_INDUSTRY }
+}
+shared_focus = {
+	id = LSM_industrierat
+	icon = GFX_goal_generic_construct_public_housing
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSM_rekonstruktion }
+	x = -1
+	y = 3
+	relative_position_id = LSM_zeltstadt_meeting
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSM_industrierat"
+		LNS_reduce_civil_war_recovery = yes
+		add_ideas = LNS_industrial_education_idea_1
+	}
+	search_filters = { FOCUS_FILTER_INDUSTRY }
+}
+shared_focus = {
+	id = LSM_arms_industries
+	icon = GFX_goal_generic_construct_mil_factory
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSM_industrierat }
+	x = -2
+	y = 4
+	relative_position_id = LSM_zeltstadt_meeting
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSM_arms_industries"
+		LNS_reduce_civil_war_recovery = yes
+		two_random_arms_factory = yes
+		add_tech_bonus = {
+			name = LSM_arms_industries
+			bonus = 1
+			uses = 2
+			category = infantry_weapons
+		}
+	}
+	search_filters = { FOCUS_FILTER_INDUSTRY }
+}
+shared_focus = {
+	id = LSM_cartelization
+	icon = GFX_goal_arms_dealing
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSM_industrierat }
+	x = -1
+	y = 5
+	relative_position_id = LSM_zeltstadt_meeting
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSM_cartelization"
+		LNS_reduce_civil_war_recovery = yes
+		swap_ideas = {
+			remove_idea = LNS_industrial_education_idea_1
+			add_idea = LNS_industrial_education_idea_2
+		}
+	}
+	search_filters = { FOCUS_FILTER_INDUSTRY }
+}
+shared_focus = {
+	id = LSM_rural_education
+	icon = GFX_goal_education
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSM_industrierat }
+	x = 0
+	y = 4
+	relative_position_id = LSM_zeltstadt_meeting
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSM_rural_education"
+		custom_effect_tooltip = LNS_education_tp
+		hidden_effect = {
+			country_event = { days = 180 id = longsword.58 }
+		}
+	}
+	search_filters = { FOCUS_FILTER_INDUSTRY }
+}
+shared_focus = {
+	id = LSM_fight_poverty
+	icon = GFX_goal_griffon_rusty_coin
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSM_rekonstruktion }
+	x = 1
+	y = 3
+	relative_position_id = LSM_zeltstadt_meeting
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSM_rural_education"
+		LNS_reduce_civil_war_recovery = yes
+		custom_effect_tooltip = LNS_poverty_tp
+		hidden_effect = {
+			country_event = { days = 160 id = longsword.60 }
+		}
+	}
+	search_filters = { FOCUS_FILTER_INDUSTRY }
+}
+shared_focus = {
+	id = LSM_railroad_construction
+	icon = GFX_goal_generic_railway_construction
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSM_fight_poverty }
+	x = 2
+	y = 4
+	relative_position_id = LSM_zeltstadt_meeting
+	available = {
+		552 = { is_owned_and_controlled_by = ROOT }
+		540 = { is_owned_and_controlled_by = ROOT }
+		505 = { is_owned_and_controlled_by = ROOT }
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSM_rural_education"
+		LNS_reduce_civil_war_recovery = yes
+		build_railway = {
+			level = 2
+			start_state = 552
+			target_state = 540
+			build_only_on_allied = yes
+		}
+		build_railway = {
+			level = 2
+			start_state = 552
+			target_state = 505
+			build_only_on_allied = yes
+		}
+	}
+	search_filters = { FOCUS_FILTER_INDUSTRY }
+}
+shared_focus = {
+	id = LSM_knighthood_industry
+	icon = GFX_goal_gold_reserve
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSM_fight_poverty }
+	x = 1
+	y = 5
+	relative_position_id = LSM_zeltstadt_meeting
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSM_knighthood_industry"
+		LNS_reduce_civil_war_recovery = yes
+		one_random_industrial_complex = yes
+	}
+	search_filters = { FOCUS_FILTER_INDUSTRY }
+}
+shared_focus = {
+	id = LSM_urbanization
+	icon = GFX_goal_ITA_urban
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSM_knighthood_industry }
+	x = 2
+	y = 6
+	relative_position_id = LSM_zeltstadt_meeting
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSM_urbanization"
+		LNS_reduce_civil_war_recovery = yes
+		552 = {
+			if = {
+				limit = { has_state_category = rural }
+				set_state_category = town
+			}
+			else_if = {
+				limit = { has_state_category = town }
+				set_state_category = large_town
+			}
+			else_if = {
+				limit = { has_state_category = large_town }
+				set_state_category = city
+			}
+			else_if = {
+				limit = { has_state_category = city }
+				set_state_category = large_city
+			}
+			else = {
+				set_state_category = metropolis
+			}
+			add_building_construction = {
+				type = industrial_complex
+				level = 1
+				instant_build = yes
+			}
+		}
+	}
+	search_filters = { FOCUS_FILTER_INDUSTRY }
+}
+shared_focus = {
+	id = LSM_research_base
+	icon = GFX_goal_double_research
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSM_knighthood_industry }
+	x = 0
+	y = 6
+	relative_position_id = LSM_zeltstadt_meeting
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSM_research_base"
+		add_research_slot = 1
+		Improve_Science_Base = yes
+	}
+	search_filters = { FOCUS_FILTER_INDUSTRY }
+}
+shared_focus = {
+	id = LSM_production_standards
+	icon = GFX_focus_indy_industrial_tanks
+	cost = 6
+	ai_will_do = { factor = 100 }
+	prerequisite = { focus = LSM_knighthood_industry }
+	x = -2
+	y = 6
+	relative_position_id = LSM_zeltstadt_meeting
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSM_production_standards"
+		LNS_reduce_civil_war_recovery = yes
+		add_ideas = LNS_state_services_idea
+		add_tech_bonus = {
+			name = LSM_production_standards
+			bonus = 1
+			uses = 2
+			category = industry
+		}
+		increase_society_development_with_tt = yes
+	}
+	search_filters = { FOCUS_FILTER_INDUSTRY }
+}
+
+###############################################################
+### Longsword Governorate (LSM) Foreign Tree ###
+###############################################################
+
+shared_focus = {
+	id = LSM_hellquill
+	icon = GFX_goal_Free_the_Ponies_of_Hellquill_1
+	x = 0
+	y = 7
+	relative_position_id = LSM_zeltstadt_meeting
+	cost = 4
+	available = { 
+		has_completed_focus = LSM_zeltstadt_meeting
+		custom_trigger_tooltip = {
+			tooltip = LSM_has_finished_reconstruction
+			NOT = {
+				OR = {
+					has_idea = LNS_civil_war_recovery_1
+					has_idea = LNS_civil_war_recovery_2
+					has_idea = LNS_civil_war_recovery_3
+					has_idea = LNS_civil_war_recovery_4
+					has_idea = LNS_civil_war_recovery_5
+					has_idea = LNS_civil_war_recovery_6
+					has_idea = LNS_civil_war_recovery_7
+					has_idea = LNS_civil_war_recovery_8
+					has_idea = LNS_civil_war_recovery_9
+				}
+			}
+		}
+	}
+	bypass = {
+		OR = { HLQ = { exists = no } HLQ = { is_subject_of = ROOT } }
+	}
+
+	ai_will_do = {
+		factor = 100
+		modifier = {
+			factor = 0
+			num_divisions < 12
+		}
+	}
+	will_lead_to_war_with = HLQ
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSM_hellquill"
+		if = {
+			limit = {
+				HLQ = {
+					OR = {
+						has_government = neutrality
+						has_government = democratic
+					}
+				}
+			}
+			country_event = { days = 7 id = longsword.35 }
+		}
+		else_if = {
+			limit = {
+				HLQ = {
+					OR = {
+						has_government = fascism
+						has_government = communism
+					}
+				}
+			}
+			every_state = {
+				limit = { is_core_of = HLQ }
+				add_claim_by = ROOT
+			}
+			create_wargoal = {
+				type = annex_everything
+				target = HLQ
+			}
+		}
+	}
+	search_filters = { FOCUS_FILTER_ANNEXATION }
+}
+shared_focus = {
+	id = LSM_integrate_hellquill
+	icon = GFX_goal_generic_intelligence_exchange_pony_griffon
+	cost = 6
+	ai_will_do = { factor = 100 }
+
+	x = 1
+	y = 1
+	relative_position_id = LSM_hellquill
+	prerequisite = { focus = LSM_hellquill }
+	available = {
+		HLQ = { exists = no }
+		OR = {
+			owns_state = 537
+			owns_state = 553
+			owns_state = 633
+			owns_state = 634
+		}
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSM_integrate_hellquill"
+		HLQ = { add_to_ROOT_potential_cores = yes }
+	}
+	search_filters = { FOCUS_FILTER_ANNEXATION }
+}
+shared_focus = {
+	id = LSM_ostgriffonian_state
+	icon = GFX_goal_griffon_shield
+	cost = 6
+	ai_will_do = { factor = 100 }
+
+	x = 2
+	y = 2
+	relative_position_id = LSM_hellquill
+	prerequisite = { focus = LSM_integrate_hellquill }
+	available = {
+		HLQ = { exists = no }
+		OR = {
+			owns_state = 537
+			owns_state = 553
+			owns_state = 633
+			owns_state = 634
+		}
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSM_ostgriffonian_state"
+		set_cosmetic_tag = LSM_ostgriffonia
+		add_ideas = LNS_defend_ost_griffonia
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+shared_focus = {
+	id = LSM_hellquill_reconstruction
+	icon = GFX_goal_generic_lau_construction
+	cost = 6
+	ai_will_do = { factor = 100 }
+
+	x = -1
+	y = 1
+	relative_position_id = LSM_hellquill
+	prerequisite = { focus = LSM_hellquill }
+	available = {
+		OR = {
+			owns_state = 537
+			owns_state = 553
+			owns_state = 633
+			owns_state = 634
+		}
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSM_hellquill_reconstruction"
+		unlock_decision_category_tooltip = LSC_Hellquill_reconstruction_decisions
+	}
+	search_filters = { FOCUS_FILTER_INDUSTRY }
+}
+shared_focus = {
+	id = LSM_return_to_griffonia
+	icon = GFX_goal_gri
+	cost = 6
+	ai_will_do = { factor = 100 }
+
+	x = 0
+	y = 2
+	relative_position_id = LSM_hellquill
+	prerequisite = { focus = LSM_hellquill }
+	available = {
+		HLQ = { exists = no }
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSC_seek_allies"
+		GRD = { add_opinion_modifier = { target = LSM modifier = friendly_government } }
+		unlock_decision_tooltip = LSM_join_the_empire
+	}
+	search_filters = { FOCUS_FILTER_POLITICAL }
+}
+
+###############################################################
+### Longsword Governorate (LSM) Military Tree ###
+###############################################################
+
+shared_focus = {
+	id = LSM_national_army
+	icon = GFX_goal_generic_drafted_army
+	cost = 6
+	ai_will_do = { factor = 100 }
+	available = { 
+		has_completed_focus = LSM_go_with_silvertalon
+	}
+	mutually_exclusive = { focus = LSM_rosewood_order }
+
+	x = 19
+	y = 0
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSM_national_army"
+		army_experience = 25
+		add_ideas = LNS_mixed_army_idea
+	}
+	search_filters = { FOCUS_FILTER_ARMY_BONUS }
+}
+shared_focus = {
+	id = LSM_rosewood_order
+	icon = GFX_goal_crown_and_swords
+	cost = 6
+	ai_will_do = { factor = 100 }
+	available = { 
+		has_completed_focus = LSM_go_with_wavewing
+	}
+	mutually_exclusive = { focus = LSM_national_army }
+
+	x = 17
+	y = 0
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSM_national_army"
+		army_experience = 25
+		add_ideas = LNS_pure_army_idea
+		custom_effect_tooltip = LNS_knight_division_gained
+		hidden_effect = {
+			if = {
+				limit = { NOT = { has_tech = tech_knights } }
+				set_technology = { tech_knights = 1 }
+			}
+			fix_weapon_techs = yes
+		}
+		division_template = {
+			name = "Orden der Palisander"
+			regiments = {
+				knights = { x = 0 y = 0 }
+				knights = { x = 1 y = 0 }
+				knights = { x = 0 y = 1 }
+				knights = { x = 1 y = 1 }
+				knights = { x = 0 y = 2 }
+				knights = { x = 1 y = 2 }
+			}
+			support = {
+				recon = { x = 0 y = 0 }
+			}
+			priority = 2
+		}
+		505 = {
+			create_unit = {
+				division = "name = \"Knights of the Order of Rosewood\" division_template = \"Orden der Palisander\" start_experience_factor = 0.5 start_equipment_factor = 1"
+				owner = ROOT
+				count = 1
+			}
+		}
+	}
+	search_filters = { FOCUS_FILTER_ARMY_BONUS }
+}
+shared_focus = {
+	id = LSM_national_airforce
+	icon = GFX_goal_air_armada
+	cost = 6
+	ai_will_do = { factor = 100 }
+
+	x = -1
+	y = 1
+	relative_position_id = LSM_national_army
+	prerequisite = { 
+		focus = LSM_national_army 
+		focus = LSM_rosewood_order
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSM_national_airforce"
+		540 = {
+			add_building_construction = {
+				type = air_base
+				level = 2
+				instant_build = yes
+			}
+		}
+		add_doctrine_cost_reduction = {
+			name = air_doc_bonus
+			cost_reduction = 0.5
+			uses = 2
+			category = air_doctrine
+		}
+	}
+	search_filters = { FOCUS_FILTER_AIRFORCE_BONUS }
+}
+shared_focus = {
+	id = LSM_battlefield_support
+	icon = GFX_goal_generic_air_fighter2
+	cost = 6
+	ai_will_do = { factor = 100 }
+
+	x = -1
+	y = 2
+	relative_position_id = LSM_national_army
+	prerequisite = { 
+		focus = LSM_national_airforce
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSM_battlefield_support"
+		if = {
+            limit = {
+                has_dlc = "By Blood Alone"
+            }
+			add_tech_bonus = {
+				name = rocketry
+				bonus = 1.0
+				uses = 1
+				category = rocketry
+			}
+			add_tech_bonus = {
+				name = cat_anti_tank
+				bonus = 1.0
+				uses = 1
+				category = cat_anti_tank
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = LSM_battlefield_support
+				bonus = 1.0
+				uses = 2
+				category = cas_bomber
+			}
+		}
+	}
+	search_filters = { FOCUS_FILTER_AIRFORCE_BONUS }
+}
+shared_focus = {
+	id = LSM_air_defense
+	icon = GFX_goal_anti_air
+	cost = 6
+	ai_will_do = { factor = 100 }
+
+	x = -2
+	y = 3
+	relative_position_id = LSM_national_army
+	prerequisite = { 
+		focus = LSM_national_airforce
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSM_air_defense"
+		505 = {
+			add_building_construction = {
+				type = anti_air_building
+				level = 2
+				instant_build = yes
+			}
+		}
+		540 = {
+			add_building_construction = {
+				type = anti_air_building
+				level = 2
+				instant_build = yes
+			}
+		}
+		552 = {
+			add_building_construction = {
+				type = anti_air_building
+				level = 2
+				instant_build = yes
+			}
+		}
+	}
+	search_filters = { FOCUS_FILTER_AIRFORCE_BONUS }
+}
+shared_focus = {
+	id = LSM_air_industries
+	icon = GFX_goal_industry_air
+	cost = 6
+	ai_will_do = { factor = 100 }
+
+	x = 1
+	y = 2
+	relative_position_id = LSM_national_army
+	prerequisite = { 
+		focus = LSM_national_airforce
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSM_air_industries"
+		one_random_arms_factory = yes
+		
+		if = {
+			limit = {
+				has_dlc = "By Blood Alone"
+			}
+			add_tech_bonus = {
+				name = fighter_bonus
+				bonus = 1.0
+				uses = 1
+				category = light_air
+			}
+			generic_early_fighter = yes
+			add_equipment_to_stockpile = {
+				type = small_plane_airframe_0
+				variant_name = "Early Fighter"
+				amount = 100
+			}
+		}
+		else = {
+			add_equipment_to_stockpile = {
+				type = fighter_equipment_0
+				amount = 100
+			}
+		}
+	}
+	search_filters = { FOCUS_FILTER_AIRFORCE_BONUS }
+}
+shared_focus = {
+	id = LSM_weapons_modernization
+	icon = GFX_goal_generic_military_equipment
+	cost = 6
+	ai_will_do = { factor = 100 }
+
+	x = 1
+	y = 1
+	relative_position_id = LSM_national_army
+	prerequisite = { 
+		focus = LSM_national_army 
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSM_weapons_modernization"
+		add_tech_bonus = {
+			name = LSM_weapons_modernization
+			bonus = 1
+			uses = 1
+			category = infantry_weapons
+		}
+		add_equipment_to_stockpile = {
+			type = infantry_equipment_0
+			amount = 1500
+			producer = LSM
+		}
+	}
+	search_filters = { FOCUS_FILTER_ARMY_BONUS }
+}
+shared_focus = {
+	id = LSM_mission_tactics
+	icon = GFX_goal_griffon_special_force
+	cost = 6
+	ai_will_do = { factor = 100 }
+
+	x = 3
+	y = 1
+	relative_position_id = LSM_national_army
+	prerequisite = { 
+		focus = LSM_national_army 
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSM_mission_tactics"
+		add_doctrine_cost_reduction = {
+			name = land_doc_bonus
+			cost_reduction = 0.35
+			uses = 2
+			category = land_doctrine
+		}
+	}
+	search_filters = { FOCUS_FILTER_ARMY_BONUS }
+}
+shared_focus = {
+	id = LSM_arms_concentration_doctrine
+	icon = GFX_focus_generic_license_production
+	cost = 6
+	ai_will_do = { factor = 100 }
+
+	x = 3
+	y = 2
+	relative_position_id = LSM_national_army
+	prerequisite = { 
+		focus = LSM_mission_tactics
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSM_arms_concentration_doctrine"
+		add_doctrine_cost_reduction = {
+			name = land_doc_bonus
+			cost_reduction = 0.5
+			uses = 1
+			category = land_doctrine
+		}
+		swap_ideas = {
+			remove_idea = LNS_mixed_army_idea
+			add_idea = LNS_landeswehr_1
+		}
+	}
+	search_filters = { FOCUS_FILTER_ARMY_BONUS }
+}
+shared_focus = {
+	id = LSM_magical_brigades
+	icon = GFX_goal_eqs_magic_horn
+	cost = 6
+	ai_will_do = { factor = 100 }
+
+	x = 4
+	y = 3
+	relative_position_id = LSM_national_army
+	prerequisite = { 
+		focus = LSM_arms_concentration_doctrine
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSM_magical_brigades"
+		add_tech_bonus = {
+			name = LSM_magical_brigades
+			bonus = 1.5
+			uses = 1
+			category = magical_tech
+		}
+		add_ideas = LNS_healing_spells_idea
+	}
+	search_filters = { FOCUS_FILTER_ARMY_BONUS }
+}
+shared_focus = {
+	id = LSM_artillery_modernization
+	icon = GFX_goal_artillery
+	cost = 6
+	ai_will_do = { factor = 100 }
+
+	x = 2
+	y = 3
+	relative_position_id = LSM_national_army
+	prerequisite = { 
+		focus = LSM_arms_concentration_doctrine
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSM_artillery_modernization"
+		add_equipment_to_stockpile = { type = artillery_equipment_1 amount = 750 producer = GRI }
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_equipment_subsidy = {
+				cic = 500
+				equipment_type = artillery_equipment
+				seller_tags = { GRI STW ANG FEA BRZ PYT YAL KAT ROU }
+			}
+		}
+		add_tech_bonus = {
+			name = LSM_artillery_modernization
+			bonus = 1
+			uses = 2
+			category = artillery
+		}
+	}
+	search_filters = { FOCUS_FILTER_ARMY_BONUS }
+}
+shared_focus = {
+	id = LSM_tank_development
+	icon = GFX_goal_doctrine_tank_warfare
+	cost = 6
+	ai_will_do = { factor = 100 }
+
+	x = 0
+	y = 3
+	relative_position_id = LSM_national_army
+	prerequisite = { 
+		focus = LSM_arms_concentration_doctrine
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSM_tank_development"
+		custom_effect_tooltip = LNS_armored_division_template_gained
+		if = {
+			limit = {
+				NOT = {
+					has_tech = gwtank
+					has_tech = gwtank_chassis
+				}
+			}
+			if = {
+				limit = {
+					has_dlc = "No Step Back"
+				}
+				set_technology = {
+					gwtank_chassis = 1
+				}
+			}
+			else = {			
+				set_technology = {
+					gwtank = 1
+				}
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = LSM_tank_development
+				bonus = 1
+				uses = 1
+				category = armor
+			}
+		}
+		division_template = {
+			name = "Langschwertische Panzerbrigade"
+			division_names_group = LSM_ARM_01
+			regiments = {
+				light_armor = { x = 0 y = 0 }
+				light_armor = { x = 0 y = 1 }
+				light_armor = { x = 0 y = 2 }
+				infantry = { x = 1 y = 0 }
+				infantry = { x = 1 y = 1 }
+			}
+			support = {
+				artillery = { x = 0 y = 0 }
+			}
+		}
+		hidden_effect = {
+			505 = {
+				create_unit = {
+					division = "division_template = \"Langschwertische Panzerbrigade\" start_experience_factor = 0.5 start_equipment_factor = 1"
+					owner = ROOT
+					count = 1
+				}
+			}
+		}
+	}
+	search_filters = { FOCUS_FILTER_ARMY_BONUS }
+}
+shared_focus = {
+	id = LSM_modern_supply
+	icon = GFX_goal_generic_support_equipment
+	cost = 6
+	ai_will_do = { factor = 100 }
+
+	x = 2
+	y = 4
+	relative_position_id = LSM_national_army
+	prerequisite = { 
+		focus = LSM_tank_development
+	}
+	prerequisite = { 
+		focus = LSM_artillery_modernization
+	}
+	prerequisite = { 
+		focus = LSM_magical_brigades
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSM_artillery_modernization"
+		add_ideas = LNS_modern_supply
+	}
+	search_filters = { FOCUS_FILTER_ARMY_BONUS }
+}
+shared_focus = {
+	id = LSM_modernize_knighthood
+	icon = GFX_goal_griffon_armor
+	cost = 6
+	ai_will_do = { factor = 100 }
+
+	x = -4
+	y = 1
+	relative_position_id = LSM_national_army
+	prerequisite = { 
+		focus = LSM_rosewood_order
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSM_modernize_knighthood"
+		add_tech_bonus = {
+			name = LSM_modernize_knighthood
+			bonus = 1
+			uses = 1
+			category = knights_tech
+		}
+		unlock_decision_category_tooltip = LSM_knights_research
+	}
+	search_filters = { FOCUS_FILTER_ARMY_BONUS }
+}
+shared_focus = {
+	id = LSM_swift_mobilization
+	icon = GFX_goal_griffon_levy
+	cost = 6
+	ai_will_do = { factor = 100 }
+
+	x = -4
+	y = 3
+	relative_position_id = LSM_national_army
+	prerequisite = { 
+		focus = LSM_modernize_knighthood
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSM_swift_mobilization"
+		swap_ideas = {
+			remove_idea = LNS_pure_army_idea
+			add_idea = LNS_rosewood_1
+		}
+	}
+	search_filters = { FOCUS_FILTER_ARMY_BONUS }
+}
+shared_focus = {
+	id = LSM_civilian_auxiliary
+	icon = GFX_goal_griffon_fez
+	cost = 6
+	ai_will_do = { factor = 100 }
+
+	x = -5
+	y = 2
+	relative_position_id = LSM_national_army
+	prerequisite = { 
+		focus = LSM_modernize_knighthood
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSM_civilian_auxiliary"
+		add_ideas = LNS_civilian_auxiliary
+		add_equipment_to_stockpile = { type = infantry_equipment_1 amount = 1000 producer = GRI }
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_equipment_subsidy = {
+				cic = 500
+				equipment_type = infantry_equipment
+				seller_tags = { GRI STW ANG FEA BRZ PYT YAL KAT ROU }
+			}
+		}
+		add_tech_bonus = {
+			name = LSM_civilian_auxiliary
+			bonus = 1
+			uses = 1
+			category = infantry_weapons
+		}
+	}
+	search_filters = { FOCUS_FILTER_ARMY_BONUS }
+}
+shared_focus = {
+	id = LSM_small_unit_tactics
+	icon = GFX_focus_generic_provoke_border_clashes
+	cost = 6
+	ai_will_do = { factor = 100 }
+
+	x = -3
+	y = 2
+	relative_position_id = LSM_national_army
+	prerequisite = { 
+		focus = LSM_modernize_knighthood
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSM_small_unit_tactics"
+		add_doctrine_cost_reduction = {
+			name = land_doc_bonus
+			cost_reduction = 0.5
+			uses = 1
+			category = land_doctrine
+		}
+	}
+	search_filters = { FOCUS_FILTER_ARMY_BONUS }
+}
+shared_focus = {
+	id = LSM_artillery_auxiliary
+	icon = GFX_goal_generic_army_artillery2
+	cost = 6
+	ai_will_do = { factor = 100 }
+
+	x = -6
+	y = 3
+	relative_position_id = LSM_national_army
+	prerequisite = { 
+		focus = LSM_civilian_auxiliary
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSM_artillery_auxiliary"
+		add_equipment_to_stockpile = { type = artillery_equipment_1 amount = 750 producer = GRI }
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_equipment_subsidy = {
+				cic = 500
+				equipment_type = artillery_equipment
+				seller_tags = { GRI STW ANG FEA BRZ PYT YAL KAT ROU }
+			}
+		}
+		add_tech_bonus = {
+			name = LSM_artillery_modernization
+			bonus = 1
+			uses = 2
+			category = artillery
+		}
+	}
+	search_filters = { FOCUS_FILTER_ARMY_BONUS }
+}
+shared_focus = {
+	id = LSM_mechanized_chapters
+	icon = GFX_focus_generic_combined_arms
+	cost = 6
+	ai_will_do = { factor = 100 }
+
+	x = -4
+	y = 4
+	relative_position_id = LSM_national_army
+	prerequisite = { 
+		focus = LSM_artillery_auxiliary
+	}
+	prerequisite = { 
+		focus = LSM_swift_mobilization
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSM_mechanized_chapters"
+		unlock_decision_tooltip = LSM_raise_heavy_armor_knights
+		add_tech_bonus = {
+			name = LSM_mechanized_chapters
+			bonus = 1
+			uses = 1
+			category = armor
+		}
+	}
+	search_filters = { FOCUS_FILTER_ARMY_BONUS }
+}
+shared_focus = {
+	id = LSM_grover_research_institute
+	icon = GFX_focus_research2
+	cost = 6
+	ai_will_do = { factor = 100 }
+
+	x = -2
+	y = 5
+	relative_position_id = LSM_national_army
+	prerequisite = { 
+		focus = LSM_mechanized_chapters
+		focus = LSM_modern_supply
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSM_grover_research_institute"
+		add_research_slot = 1
+		Improve_Science_Base = yes
+	}
+	search_filters = { FOCUS_FILTER_ARMY_BONUS }
+}
+shared_focus = {
+	id = LSM_imperial_exchange_program
+	icon = GFX_goal_GRI_army_expansion
+	cost = 6
+	ai_will_do = { factor = 100 }
+	available = {
+		is_in_faction_with = GRD
+	}
+
+	x = 0
+	y = 5
+	relative_position_id = LSM_national_army
+	prerequisite = { 
+		focus = LSM_mechanized_chapters
+		focus = LSM_modern_supply
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSM_imperial_exchange_program"
+		add_ideas = LNS_imperial_exchange_program
+	}
+	search_filters = { FOCUS_FILTER_ARMY_BONUS }
+}
+shared_focus = {
+	id = LSM_joint_exercises
+	icon = GFX_goal_GRI_heavy_tank
+	cost = 6
+	ai_will_do = { factor = 100 }
+
+	x = -1
+	y = 6
+	relative_position_id = LSM_national_army
+	prerequisite = { 
+		focus = LSM_imperial_exchange_program
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSM_joint_exercises"
+		add_doctrine_cost_reduction = {
+			name = land_doc_bonus
+			cost_reduction = 0.5
+			uses = 1
+			category = land_doctrine
+		}
+	}
+	search_filters = { FOCUS_FILTER_ARMY_BONUS }
+}
+shared_focus = {
+	id = LSM_fortify_frontier
+	icon = GFX_goal_nested_fortifications
+	cost = 10
+	ai_will_do = { factor = 100 }
+
+	x = 1
+	y = 6
+	relative_position_id = LSM_national_army
+	prerequisite = { 
+		focus = LSM_imperial_exchange_program
+	}
+	completion_reward = {
+		log = "[GetDateText]: [Root.GetName]: Focus LSM_fortify_frontier"
+		add_ideas = LNS_fortify_frontier
+		552 = {
+			add_building_construction = {
+				type = bunker
+				level = 1
+				province = 9908
+				instant_build = yes
+			}
+			add_building_construction = {
+				type = bunker
+				level = 1
+				province = 9918
+				instant_build = yes
+			}
+			add_building_construction = {
+				type = bunker
+				level = 1
+				province = 9795
+				instant_build = yes
+			}
+			add_building_construction = {
+				type = bunker
+				level = 1
+				province = 11828
+				instant_build = yes
+			}
+			add_building_construction = {
+				type = bunker
+				level = 1
+				province = 11775
+				instant_build = yes
+			}
+			add_building_construction = {
+				type = bunker
+				level = 1
+				province = 978
+				instant_build = yes
+			}
+			add_building_construction = {
+				type = bunker
+				level = 1
+				province = 11770
+				instant_build = yes
+			}
+			add_building_construction = {
+				type = bunker
+				level = 1
+				province = 10083
+				instant_build = yes
+			}
+		}
+		505 = {
+			add_building_construction = {
+				type = bunker
+				level = 1
+				province = 7070
+				instant_build = yes
+			}
+		}
+	}
+	search_filters = { FOCUS_FILTER_ARMY_BONUS }
+}
diff --git a/common/national_focus/LSP.txt b/common/national_focus/LSP.txt
index 50de7780170..5fcd9959ae0 100644
--- a/common/national_focus/LSP.txt
+++ b/common/national_focus/LSP.txt
@@ -303,7 +303,7 @@ focus_tree = {
 			hidden_effect = {
 				set_country_leader_description = {
 					ideology = neutrality
-					name = rokenhardesc2
+					desc = rokenhardesc2
 				}
 				load_focus_tree = {
 					tree = LSP_mayor_tree
diff --git a/common/national_focus/LUS.txt b/common/national_focus/LUS.txt
index dfb394908db..8dca8851ec7 100644
--- a/common/national_focus/LUS.txt
+++ b/common/national_focus/LUS.txt
@@ -1879,8 +1879,21 @@ focus_tree = {
 		}
 		completion_reward = {
 			log = "[GetDateText]: [Root.GetName]: Focus LUS_new_artillery"
-			custom_effect_tooltip = available_designer
-			show_ideas_tooltip = LUS_arty_manufacture
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}    
+				custom_effect_tooltip = available_mio_tt
+				show_mio_tooltip = LUS_arty_manufacture_organization
+				mio:LUS_arty_manufacture_organization = {
+					add_mio_size = 1
+					add_mio_funds = 500
+				}		
+			}
+			else = {
+				custom_effect_tooltip = available_designer
+				show_ideas_tooltip = LUS_arty_manufacture
+			}
 			add_tech_bonus = {
 				name = infantry_weapons_bonus
 				bonus = 3
@@ -2077,6 +2090,21 @@ focus_tree = {
 				uses = 1
 				category = cat_light_armor
 			}
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}    
+				custom_effect_tooltip = available_mio_tt
+				show_mio_tooltip = LUS_Nedhern_organization
+				mio:LUS_Nedhern_organization = {
+					add_mio_size = 1
+					add_mio_funds = 500
+				}
+			}
+			else = {
+				custom_effect_tooltip = available_designer
+				show_ideas_tooltip = LUS_Nedhern
+			}
 		}
 		search_filters = { FOCUS_FILTER_RESEARCH }
 	}
@@ -3326,6 +3354,20 @@ focus_tree = {
 				uses = 1
 				category = air_doctrine
 			}
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}    
+				custom_effect_tooltip = available_mio_tt
+				show_mio_tooltip = LUS_barman_organization
+				mio:LUS_barman_organization = {
+					add_mio_funds = 350
+				}
+			}
+			else = {
+				custom_effect_tooltip = available_designer
+				show_ideas_tooltip = LUS_barman
+			}
 		}
 		search_filters = { FOCUS_FILTER_AIRFORCE_BONUS FOCUS_FILTER_INDUSTRY FOCUS_FILTER_RESEARCH }
 	}
diff --git a/common/national_focus/MAN.txt b/common/national_focus/MAN.txt
index 74ddc9e45a8..e34a02bf0c7 100644
--- a/common/national_focus/MAN.txt
+++ b/common/national_focus/MAN.txt
@@ -1181,8 +1181,21 @@ shared_focus = {
 		custom_effect_tooltip = available_industrial_concern
         show_ideas_tooltip = MAN_hova
 		set_country_flag = MAN_unlocked_antax
-		custom_effect_tooltip = available_designer
-        show_ideas_tooltip = MAN_antax
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}    
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = MAN_antax_organization
+			mio:MAN_antax_organization = {
+				add_mio_size = 2
+				add_mio_funds = 800
+			}
+		}
+		else = {
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = MAN_antax
+		}
 	}
 }
 
@@ -1387,6 +1400,12 @@ shared_focus = {
 		army_experience = 30
 		custom_effect_tooltip = MAN_form_incog_div_brigades_tt
 		custom_effect_tooltip = MAN_soryn_inkognito_tt
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_potential_special_forces_tree = yes
+		}
 		hidden_effect = {
 			add_corps_commander_role = {
 				character = MAN_soryn_inkognito
@@ -1685,6 +1704,21 @@ shared_focus = {
 		}
 		add_equipment_to_stockpile = { type = support_equipment amount = 500 producer = CHN }
 		add_equipment_to_stockpile = { type = infantry_equipment amount = 2500 producer = CHN }
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_equipment_subsidy = {
+				cic = 250
+				equipment_type = support_equipment
+				seller_tags = { CHN CCN OLE PLB }
+			}
+			add_equipment_subsidy = {
+				cic = 250
+				equipment_type = infantry_equipment
+				seller_tags = { CHN CCN OLE PLB }
+			}
+		}
 		#custom_effect_tooltip = MAN_unlocks_decisions_to_request_stuff
 		#set_country_flag = MAN_has_unlocked_decisions_to_request_stuff_from_CHN
 	}
@@ -1830,8 +1864,21 @@ shared_focus = {
 			}
 		}
 		set_country_flag = MAN_unlocked_scarab
-		custom_effect_tooltip = available_designer
-        show_ideas_tooltip = MAN_scarab
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}    
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = MAN_scarab_organization
+			mio:MAN_scarab_organization = {
+				add_mio_size = 2
+				add_mio_funds = 800
+			}
+		}
+		else = {
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = MAN_scarab
+		}
 		if = {
 			limit = {
 				OR = {
@@ -4239,8 +4286,21 @@ shared_focus = {
 			callsign = "Jagdmeister"
 			type = support_genius 
 		}
-		custom_effect_tooltip = available_designer
-        show_ideas_tooltip = MAN_bury
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}    
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = MAN_bury_organization
+			mio:MAN_bury_organization = {
+				add_mio_size = 2
+				add_mio_funds = 800
+			}
+		}
+		else = {
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = MAN_bury
+		}
 		set_country_flag = MAN_unlocked_bury
 	}
 	search_filters = { FOCUS_FILTER_AIRFORCE_BONUS }
diff --git a/common/national_focus/MIT.txt b/common/national_focus/MIT.txt
index 19b8b0b3676..f5010d9cd90 100644
--- a/common/national_focus/MIT.txt
+++ b/common/national_focus/MIT.txt
@@ -544,11 +544,30 @@ focus_tree = {
 
 		completion_reward = {
 			log = "[GetDateText]: [Root.GetName]: Focus MIT_paratroopers_focus"
-			add_tech_bonus = {
-				name = special_forces_bonus
-				bonus = 3
-				uses = 1
-				category = para_tech
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_doctrine_cost_reduction = {
+					name = special_forces_bonus
+					cost_reduction = 0.80
+					uses = 1
+					category = cat_paratroopers_doctrine
+				}
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 1.0
+					uses = 1
+					category = para_tech
+				}
+			}
+			else = {
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 3.0
+					uses = 1
+					category = para_tech
+				}
 			}
 		}
 		search_filters = { FOCUS_FILTER_RESEARCH }
@@ -1015,12 +1034,30 @@ focus_tree = {
 		}
 		completion_reward = {
 			log = "[GetDateText]: [Root.GetName]: Focus MIT_expand_the_MCG"
-			add_tech_bonus = {
-				name = marine_bonus
-				bonus = 1
-				uses = 1
-				technology = marines2
-				technology = marines3
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_doctrine_cost_reduction = {
+					name = special_forces_bonus
+					cost_reduction = 0.75
+					uses = 1
+					category = cat_marines_doctrine
+				}
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 0.75
+					uses = 1
+					category = marine_tech
+				}
+			}
+			else = {
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 1.0
+					uses = 1
+					category = marine_tech
+				}
 			}
 			add_tech_bonus = {
 				name = marine_bonus
@@ -3732,12 +3769,12 @@ focus_tree = {
 						infantry = { x = 0 y = 0 }
 						infantry = { x = 0 y = 1 }
 						infantry = { x = 0 y = 2 }
-			
+	    	   		 	infantry = { x = 0 y = 3 }
+						
 	    	   		 	infantry = { x = 1 y = 0 }
 						infantry = { x = 1 y = 1 }
 						infantry = { x = 1 y = 2 }
 			
-	    	   		 	infantry = { x = 2 y = 0 }
 						artillery_brigade = { x = 2 y = 1 }
 						artillery_brigade = { x = 2 y = 2 }
 					}
diff --git a/common/national_focus/MNC.txt b/common/national_focus/MNC.txt
index 432329e236c..4096de256a9 100644
--- a/common/national_focus/MNC.txt
+++ b/common/national_focus/MNC.txt
@@ -2738,6 +2738,16 @@ focus_tree = {
 		completion_reward = {
 			log = "[GetDateText]: [Root.GetName]: Focus MNC_army_12"
 			add_equipment_to_stockpile = { type = infantry_equipment_1 amount = 2000 producer = GRF }
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_equipment_subsidy = {
+					cic = 500
+					equipment_type = infantry_equipment
+					seller_tags = { YAK JAK GRF GFF PNG STG STL }
+				}
+			}
 			random_owned_controlled_state = {
 				limit = {
 					free_building_slots = {
@@ -2853,11 +2863,30 @@ focus_tree = {
 
 		completion_reward = {
 			log = "[GetDateText]: [Root.GetName]: Focus MNC_army_8"
-			add_tech_bonus = {
-				name = special_forces_bonus
-				bonus = 1.0
-				uses = 2
-				category = special_forces_tech
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_doctrine_cost_reduction = {
+					name = special_forces_bonus
+					cost_reduction = 0.50
+					uses = 2
+					category = special_forces_doctrine
+				}
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 0.50
+					uses = 2
+					category = special_forces_tech
+				}
+			}
+			else = {
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 1.0
+					uses = 2
+					category = special_forces_tech
+				}
 			}
 		}
 		search_filters = { FOCUS_FILTER_RESEARCH }
@@ -2986,8 +3015,20 @@ focus_tree = {
 					instant_build = yes
 				}
 			}
-			custom_effect_tooltip = available_designer
-			show_ideas_tooltip = MNC_brantbeak_aircraft_factory
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}    
+				custom_effect_tooltip = available_mio_tt
+				show_mio_tooltip = MNC_brantbeak_aircraft_factory_organization
+				mio:MNC_brantbeak_aircraft_factory_organization = {
+					add_mio_funds = 350
+				}
+			}
+			else = {
+				custom_effect_tooltip = available_designer
+				show_ideas_tooltip = MNC_brantbeak_aircraft_factory
+			}
 		}
 		search_filters = { FOCUS_FILTER_AIRFORCE_BONUS FOCUS_FILTER_INDUSTRY }
 	}
@@ -3035,11 +3076,30 @@ focus_tree = {
 		}
 		completion_reward = {
 			log = "[GetDateText]: [Root.GetName]: Focus MNC_air_7"
-			add_tech_bonus = {
-				name = paratrooper_bonus
-				bonus = 1.0
-				uses = 1
-				category = para_tech
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_doctrine_cost_reduction = {
+					name = special_forces_bonus
+					cost_reduction = 0.75
+					uses = 1
+					category = cat_paratroopers_doctrine
+				}
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 0.75
+					uses = 1
+					category = para_tech
+				}
+			}
+			else = {
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 1.0
+					uses = 1
+					category = para_tech
+				}
 			}
 		}
 		search_filters = { FOCUS_FILTER_RESEARCH }
diff --git a/common/national_focus/NCH_new.txt b/common/national_focus/NCH_new.txt
index 24f0d596153..f8003d072dc 100644
--- a/common/national_focus/NCH_new.txt
+++ b/common/national_focus/NCH_new.txt
@@ -2843,8 +2843,21 @@ focus_tree = {
 		y = 10
 		completion_reward = {
 			log = "[GetDateText]: [Root.GetName]: Focus NCH_inf_weapons"
-			custom_effect_tooltip = available_designer
-			show_ideas_tooltip = NCH_generic_infantry_equipment_manufacturer
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}    
+				custom_effect_tooltip = available_mio_tt
+				show_mio_tooltip = NCH_generic_infantry_equipment_manufacturer_organization
+				mio:NCH_generic_infantry_equipment_manufacturer_organization = {
+					add_mio_size = 1
+					add_mio_funds = 500
+				}
+			}
+			else = {
+				custom_effect_tooltip = available_designer
+				show_ideas_tooltip = NCH_generic_infantry_equipment_manufacturer
+			}
 			
 			set_country_flag = NCH_unlock_infantry_concern_flag
 
@@ -3074,8 +3087,20 @@ focus_tree = {
 		cancel_if_invalid = yes
 		completion_reward = {
 			log = "[GetDateText]: [Root.GetName]: Focus NCH_expand_the_naval_yards"
-			custom_effect_tooltip = available_designer
-			show_ideas_tooltip = longchlois
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}    
+				custom_effect_tooltip = available_mio_tt
+				show_mio_tooltip = NCH_longchlois_organization
+				mio:NCH_longchlois_organization = {
+					add_mio_funds = 350
+				}
+			}
+			else = {
+				custom_effect_tooltip = available_designer
+				show_ideas_tooltip = longchlois
+			}
 			set_country_flag = NCH_naval_yards_flag
 			random_owned_controlled_state = {
 				limit = {
diff --git a/common/national_focus/NCR.txt b/common/national_focus/NCR.txt
index 42368fcf7a7..82872c2933f 100644
--- a/common/national_focus/NCR.txt
+++ b/common/national_focus/NCR.txt
@@ -2566,17 +2566,55 @@ focus_tree = {
 
 		completion_reward = {
 			log = "[GetDateText]: [Root.GetName]: Focus NCR_army_rangers"
-			add_tech_bonus = {
-				name = special_forces_bonus
-				bonus = 1.0
-				uses = 1
-				category = mountaineers_tech
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_doctrine_cost_reduction = {
+					name = special_forces_bonus
+					cost_reduction = 0.75
+					uses = 1
+					category = special_forces_doctrine
+				}
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 0.75
+					uses = 1
+					category = cat_mountaineers_doctrine
+				}
 			}
-			add_tech_bonus = {
-				name = special_forces_bonus
-				bonus = 1.0
-				uses = 1
-				category = special_forces_tech
+			else = {
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 1.0
+					uses = 1
+					category = mountaineers_tech
+				}
+			}
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_doctrine_cost_reduction = {
+					name = special_forces_bonus
+					cost_reduction = 0.75
+					uses = 1
+					category = special_forces_doctrine
+				}
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 0.75
+					uses = 1
+					category = special_forces_tech
+				}
+			}
+			else = {
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 1.0
+					uses = 1
+					category = special_forces_tech
+				}
 			}
 			add_ideas = NCR_rangers
 		}
@@ -3033,6 +3071,26 @@ focus_tree = {
 				amount = 100
 				producer = EQS
 			}
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_equipment_subsidy = {
+					cic = 250
+					equipment_type = infantry_equipment
+					seller_tags = { EQS CRY NLR VAN SCS LSP NMS CES JUN BAL TEM BUF }
+				}
+				add_equipment_subsidy = {
+					cic = 250
+					equipment_type = support_equipment
+					seller_tags = { EQS CRY NLR VAN SCS LSP NMS CES JUN BAL TEM BUF }
+				}
+				add_equipment_subsidy = {
+					cic = 250
+					equipment_type = artillery_equipment
+					seller_tags = { EQS CRY NLR VAN SCS LSP NMS CES JUN BAL TEM BUF }
+				}
+			}
 		}
 	}
 	
@@ -3320,6 +3378,21 @@ focus = {
 				producer = STG
 			}
 		}
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_equipment_subsidy = {
+				cic = 250
+				equipment_type = small_plane_airframe
+				seller_tags = { YAK JAK GRF GFF PNG STG STL }
+			}
+			add_equipment_subsidy = {
+				cic = 250
+				equipment_type = medium_plane_airframe
+				seller_tags = { YAK JAK GRF GFF PNG STG STL }
+			}
+		}
 		add_ideas = NCR_STG_planes_idea	
 	}
 }
@@ -3448,6 +3521,26 @@ focus = {
 				producer = EQS
 			}
 		}
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_equipment_subsidy = {
+				cic = 250
+				equipment_type = small_plane_airframe
+				seller_tags = { EQS CRY NLR VAN SCS LSP NMS CES JUN BAL TEM BUF }
+			}
+			add_equipment_subsidy = {
+				cic = 250
+				equipment_type = small_plane_naval_bomber_airframe
+				seller_tags = { EQS CRY NLR VAN SCS LSP NMS CES JUN BAL TEM BUF }
+			}
+			add_equipment_subsidy = {
+				cic = 250
+				equipment_type = medium_plane_airframe
+				seller_tags = { EQS CRY NLR VAN SCS LSP NMS CES JUN BAL TEM BUF }
+			}
+		}
 		add_ideas = NCR_EQS_planes_idea
 	}
 	
@@ -3576,6 +3669,26 @@ focus = {
 				producer = CHN
 			}
 		}
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_equipment_subsidy = {
+				cic = 250
+				equipment_type = small_plane_airframe
+				seller_tags = { CHN CCN OLE PLB }
+			}
+			add_equipment_subsidy = {
+				cic = 250
+				equipment_type = small_plane_naval_bomber_airframe
+				seller_tags = { CHN CCN OLE PLB }
+			}
+			add_equipment_subsidy = {
+				cic = 250
+				equipment_type = medium_plane_airframe
+				seller_tags = { CHN CCN OLE PLB }
+			}
+		}
 	add_ideas = NCR_CHN_planes_idea
 	}
 }
diff --git a/common/national_focus/NIM.txt b/common/national_focus/NIM.txt
index efe13a3e67c..7d0cc38bb35 100644
--- a/common/national_focus/NIM.txt
+++ b/common/national_focus/NIM.txt
@@ -4109,11 +4109,30 @@ shared_focus = {
 			add_idea = NIM_trials_of_the_cyclone2
 		}
 
-		add_tech_bonus = {
-			name = NIM_improve_spec_ops
-			bonus = 1.0
-			uses = 2
-			category = special_forces_tech
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_doctrine_cost_reduction = {
+				name = special_forces_bonus
+				cost_reduction = 0.50
+				uses = 2
+				category = special_forces_doctrine
+			}
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 0.50
+				uses = 2
+				category = special_forces_tech
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 1.0
+				uses = 2
+				category = special_forces_tech
+			}
 		}
 
 		add_tech_bonus = {
diff --git a/common/national_focus/NLR.txt b/common/national_focus/NLR.txt
index 1810b185d4a..fba064102a9 100644
--- a/common/national_focus/NLR.txt
+++ b/common/national_focus/NLR.txt
@@ -371,11 +371,30 @@ shared_focus = {
 		    limit = {
 			    has_tech = paratroopers
 			}
-			add_tech_bonus = {
-				name = special_forces_bonus
-				bonus = 3.0
-				uses = 1
-				category = para_tech
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_doctrine_cost_reduction = {
+					name = special_forces_bonus
+					cost_reduction = 0.80
+					uses = 1
+					category = cat_paratroopers_doctrine
+				}
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 1.0
+					uses = 1
+					category = para_tech
+				}
+			}
+			else = {
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 3.0
+					uses = 1
+					category = para_tech
+				}
 			}
 		}
 		else = {
@@ -1160,11 +1179,30 @@ shared_focus = {
 		    remove_idea = NLR_lunar_continental_command_idea
 			add_idea = NLR_special_warfare_department_idea
 		}
-		add_tech_bonus = {
-			name = special_forces_bonus
-			bonus = 3.0
-			uses = 1
-			category = special_forces_tech
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_doctrine_cost_reduction = {
+				name = special_forces_bonus
+				cost_reduction = 0.80
+				uses = 1
+				category = special_forces_doctrine
+			}
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 1.0
+				uses = 1
+				category = special_forces_tech
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 3.0
+				uses = 1
+				category = special_forces_tech
+			}
 		}
 	}
 	search_filters = { 
@@ -1599,12 +1637,31 @@ shared_focus = {
 					limit = {
 						has_tech = amphibious_mechanized_infantry
 					}
-					add_tech_bonus = {
-						name = special_forces_bonus
-						bonus = 3.0
-						uses = 1
-						category = marine_tech
-					}	
+					if = {
+						limit = {
+							has_dlc = "Arms Against Tyranny"
+						}
+						add_doctrine_cost_reduction = {
+							name = special_forces_bonus
+							cost_reduction = 0.80
+							uses = 1
+							category = cat_marines_doctrine
+						}
+						add_tech_bonus = {
+							name = special_forces_bonus
+							bonus = 1.0
+							uses = 1
+							category = marine_tech
+						}
+					}
+					else = {
+						add_tech_bonus = {
+							name = special_forces_bonus
+							bonus = 3.0
+							uses = 1
+							category = marine_tech
+						}
+					}
 				}
 				else = {
 					set_technology = {
@@ -1620,12 +1677,32 @@ shared_focus = {
 					limit = {
 						has_tech = marines
 					}
-					add_tech_bonus = {
-						name = special_forces_bonus
-						bonus = 3.0
-						uses = 1
-						category = marine_tech
-						category = cat_mechanized_equipment
+					if = {
+						limit = {
+							has_dlc = "Arms Against Tyranny"
+						}
+						add_doctrine_cost_reduction = {
+							name = special_forces_bonus
+							cost_reduction = 0.80
+							uses = 1
+							category = cat_marines_doctrine
+						}
+						add_tech_bonus = {
+							name = special_forces_bonus
+							bonus = 1.0
+							uses = 1
+							category = marine_tech
+							category = cat_mechanized_equipment
+						}
+					}
+					else = {
+						add_tech_bonus = {
+							name = special_forces_bonus
+							bonus = 3.0
+							uses = 1
+							category = marine_tech
+							category = cat_mechanized_equipment
+						}
 					}
 				}
 				else = {
@@ -1646,11 +1723,30 @@ shared_focus = {
 				limit = {
 					has_tech = marines
 				}
-				add_tech_bonus = {
-					name = special_forces_bonus
-					bonus = 3.0
-					uses = 1
-					category = marine_tech
+				if = {
+					limit = {
+						has_dlc = "Arms Against Tyranny"
+					}
+					add_doctrine_cost_reduction = {
+						name = special_forces_bonus
+						cost_reduction = 0.80
+						uses = 1
+						category = cat_marines_doctrine
+					}
+					add_tech_bonus = {
+						name = special_forces_bonus
+						bonus = 1.0
+						uses = 1
+						category = marine_tech
+					}
+				}
+				else = {
+					add_tech_bonus = {
+						name = special_forces_bonus
+						bonus = 3.0
+						uses = 1
+						category = marine_tech
+					}
 				}
 			}
 			else = {
diff --git a/common/national_focus/OLE.txt b/common/national_focus/OLE.txt
index 1af5abe77e6..822e08b4a90 100644
--- a/common/national_focus/OLE.txt
+++ b/common/national_focus/OLE.txt
@@ -3725,11 +3725,30 @@ focus_tree = {
 		available_if_capitulated = no
 		completion_reward = {
 			log = "[GetDateText]: [Root.GetName]: Focus OLE_storm_the_beaches"
-			add_tech_bonus = {
-				name = marine_bonus
-				bonus = 3.0
-				uses = 2
-				category = marine_tech
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_doctrine_cost_reduction = {
+					name = special_forces_bonus
+					cost_reduction = 0.50
+					uses = 2
+					category = cat_marines_doctrine
+				}
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 1.5
+					uses = 2
+					category = marine_tech
+				}
+			}
+			else = {
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 3.0
+					uses = 2
+					category = marine_tech
+				}
 			}
 			add_ideas = OLE_storm_the_beaches_idea
 		}
diff --git a/common/national_focus/OLV.txt b/common/national_focus/OLV.txt
index 1b3786aec62..fd582dbec15 100644
--- a/common/national_focus/OLV.txt
+++ b/common/national_focus/OLV.txt
@@ -1101,11 +1101,30 @@ shared_focus = {
 	}
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus OLV_marine_f"
-		add_tech_bonus = {
-			name = special_forces_bonus
-			bonus = 3.0
-			uses = 1
-			category = marine_tech
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_doctrine_cost_reduction = {
+				name = special_forces_bonus
+				cost_reduction = 0.80
+				uses = 1
+				category = cat_marines_doctrine
+			}
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 1.0
+				uses = 1
+				category = marine_tech
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 3.0
+				uses = 1
+				category = marine_tech
+			}
 		}
 	}
 	search_filters = { FOCUS_FILTER_RESEARCH }
@@ -1843,11 +1862,30 @@ shared_focus = {
 	}
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus OLV_paratroopers_f"
-		add_tech_bonus = {
-			name = special_forces_bonus
-			bonus = 3.0
-			uses = 1
-			category = para_tech
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_doctrine_cost_reduction = {
+				name = special_forces_bonus
+				cost_reduction = 0.80
+				uses = 1
+				category = cat_paratroopers_doctrine
+			}
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 1.0
+				uses = 1
+				category = para_tech
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 3.0
+				uses = 1
+				category = para_tech
+			}
 		}
 	}
 	search_filters = { FOCUS_FILTER_RESEARCH }
@@ -7173,6 +7211,16 @@ shared_focus = {
 			producer = OLE
 		    amount = 300 
 		}
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_equipment_subsidy = {
+				cic = 500
+				equipment_type = light_tank_chassis
+				seller_tags = { CHN CCN OLE PLB }
+			}
+		}
 	}
 }
 
@@ -7226,6 +7274,16 @@ shared_focus = {
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus OLV_nkvd_divisions"
 		custom_effect_tooltip = OLV_nkvd_divisions_tp
+		if = {
+			limit = {
+			    NOT = {
+				    has_tech = tech_trucks
+				}
+			}
+			set_technology = {
+				tech_trucks = 1
+			}
+		}
 		if = {
 			limit = {
 			    NOT = {
diff --git a/common/national_focus/PCB.txt b/common/national_focus/PCB.txt
index 808e69f8960..b8b17b4eaf7 100644
--- a/common/national_focus/PCB.txt
+++ b/common/national_focus/PCB.txt
@@ -240,11 +240,30 @@ shared_focus = {
 			uses = 1
 			category = tp_tech
 		}
-		add_tech_bonus = {
-			name = marine_bonus
-			bonus = 1.0
-			uses = 1
-			category = marine_tech
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_doctrine_cost_reduction = {
+				name = special_forces_bonus
+				cost_reduction = 0.75
+				uses = 1
+				category = cat_marines_doctrine
+			}
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 0.75
+				uses = 1
+				category = marine_tech
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 1.0
+				uses = 1
+				category = marine_tech
+			}
 		}
 	}
 }
@@ -490,13 +509,34 @@ shared_focus = {
 		log = "[GetDateText]: [Root.GetName]: Focus PCB_jungle_warfare_training"
 		custom_effect_tooltip = RAJ_jungle_training_effect
 		hidden_effect = { set_technology = { jungle_warfare = 1 } }
-		add_tech_bonus = {
-			name = PCB_jungle_warfare_training
-			bonus = 1
-			uses = 2
-			ahead_reduction = 2
-			category = special_forces_tech
-			category = recon_tech
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_doctrine_cost_reduction = {
+				name = special_forces_bonus
+				cost_reduction = 0.50
+				uses = 1
+				category = special_forces_doctrine
+			}
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 0.75
+				uses = 2
+				ahead_reduction = 2
+				category = special_forces_tech
+				category = recon_tech
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 1.0
+				uses = 2
+				ahead_reduction = 2
+				category = special_forces_tech
+				category = recon_tech
+			}
 		}
 	}
 }
@@ -647,8 +687,20 @@ shared_focus = {
 				instant_build = yes
 			}
 		}
-		custom_effect_tooltip = available_designer
-		show_ideas_tooltip = PCB_bukleymane
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}    
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = PCB_bukleymane_organization
+			mio:PCB_bukleymane_organization = {
+				add_mio_funds = 350
+			}
+		}
+		else = {
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = PCB_bukleymane
+		}
 	}
 }
 
@@ -881,8 +933,20 @@ shared_focus = {
 			uses = 1
 			category = naval_doctrine
 		}
-		custom_effect_tooltip = available_designer
-		show_ideas_tooltip = PCB_astimar
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}    
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = PCB_astimar_organization
+			mio:PCB_astimar_organization = {
+				add_mio_funds = 350
+			}
+		}
+		else = {
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = PCB_astimar
+		}
 	}
 }
 #######################
@@ -993,8 +1057,20 @@ shared_focus = {
 				category = light_fighter
 			}
 		}
-		custom_effect_tooltip = available_designer
-		show_ideas_tooltip = PCB_tnca
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}    
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = PCB_tnca_organization
+			mio:PCB_tnca_organization = {
+				add_mio_funds = 350
+			}
+		}
+		else = {
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = PCB_tnca
+		}
 	}
 }
 
diff --git a/common/national_focus/PLB.txt b/common/national_focus/PLB.txt
index ca34df23879..39361adf04d 100644
--- a/common/national_focus/PLB.txt
+++ b/common/national_focus/PLB.txt
@@ -5785,12 +5785,12 @@ focus_tree = {
 						infantry = { x = 0 y = 1 }
 						infantry = { x = 0 y = 2 }
 						infantry = { x = 0 y = 3 }
-						infantry = { x = 0 y = 4 }
 						infantry = { x = 1 y = 0 }
 						infantry = { x = 1 y = 1 }
 						infantry = { x = 1 y = 2 }
 						infantry = { x = 1 y = 3 }
-						infantry = { x = 1 y = 4 }
+						infantry = { x = 2 y = 0 }
+						infantry = { x = 2 y = 1 }
 					}
 				}
 				random_owned_controlled_state = {
@@ -7593,8 +7593,21 @@ focus_tree = {
 
 		completion_reward = {
 			add_ideas = PLB_anker_navy_spirit
-			custom_effect_tooltip = available_ship_designer
-			show_ideas_tooltip  = PLB_clan_anker
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}    
+				custom_effect_tooltip = available_mio_tt
+				show_mio_tooltip = PLB_clan_anker_organization
+				mio:PLB_clan_anker_organization = {
+					add_mio_size = 1
+					add_mio_funds = 500
+				}
+			}
+			else = {
+				custom_effect_tooltip = available_designer
+				show_ideas_tooltip = PLB_clan_anker
+			}
 			62 = {
 				add_extra_state_shared_building_slots = 1
 				add_building_construction = {
@@ -7783,8 +7796,21 @@ focus_tree = {
 
 		completion_reward = {
 			add_ideas = PLB_falsen_navy_spirit
-			custom_effect_tooltip = available_ship_designer
-			show_ideas_tooltip  = PLB_clan_falsen
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}    
+				custom_effect_tooltip = available_mio_tt
+				show_mio_tooltip = PLB_clan_falsen_organization
+				mio:PLB_clan_falsen_organization = {
+					add_mio_size = 1
+					add_mio_funds = 500
+				}
+			}
+			else = {
+				custom_effect_tooltip = available_designer
+				show_ideas_tooltip = PLB_clan_falsen
+			}
 			272 = {
 				add_extra_state_shared_building_slots = 1
 				add_building_construction = {
@@ -11628,17 +11654,17 @@ focus_tree = {
 						infantry = { x = 0 y = 1 }
 						infantry = { x = 0 y = 2 }
 						infantry = { x = 0 y = 3 }
-						infantry = { x = 0 y = 4 }
 						infantry = { x = 1 y = 0 }
 						infantry = { x = 1 y = 1 }
 						infantry = { x = 1 y = 2 }
 						infantry = { x = 1 y = 3 }
-						infantry = { x = 1 y = 4 }
 						infantry = { x = 2 y = 0 }
 						infantry = { x = 2 y = 1 }
 						infantry = { x = 2 y = 2 }
 						infantry = { x = 2 y = 3 }
-						infantry = { x = 2 y = 4 }
+						infantry = { x = 3 y = 0 }
+						infantry = { x = 3 y = 1 }
+						infantry = { x = 3 y = 2 }
 					}
 				}
 	
@@ -11733,6 +11759,7 @@ focus_tree = {
 
 		completion_reward = {
 			add_manpower = 25000
+			set_technology = { tech_trucks = 1 }
 			set_technology = { motorised_infantry = 1 }	
 			add_offsite_building = { 
 				type = arms_factory 
@@ -14419,8 +14446,21 @@ focus_tree = {
 
 	
 		completion_reward = {
-			custom_effect_tooltip = available_ship_designer
-			show_ideas_tooltip  = PLB_clan_anker
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}    
+				custom_effect_tooltip = available_mio_tt
+				show_mio_tooltip = PLB_clan_anker_organization
+				mio:PLB_clan_anker_organization = {
+					add_mio_size = 1
+					add_mio_funds = 500
+				}
+			}
+			else = {
+				custom_effect_tooltip = available_designer
+				show_ideas_tooltip = PLB_clan_anker
+			}
 			custom_effect_tooltip = PLB_anker_fleet_tp
 			hidden_effect = {
 			if = {
@@ -15378,6 +15418,7 @@ focus_tree = {
 
 	
 		completion_reward = {
+		custom_effect_tooltip = JUN_sapper_tp
 			set_technology = {
 				sappers = 1		
 			}
@@ -15529,6 +15570,16 @@ focus_tree = {
 				amount = 150
 				producer = GRI
 			}
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_equipment_subsidy = {
+					cic = 500
+					equipment_type = artillery_equipment
+					seller_tags = { GRI STW ANG FEA BRZ PYT YAL KAT ROU }
+				}
+			}
 			add_tech_bonus = {
 				name = arty_bonus
 				bonus = 1.0
@@ -16566,6 +16617,9 @@ focus_tree = {
 					id = svartpelsb.17
 				}
 			}
+			hidden_effect = {
+				set_cosmetic_tag = PLB_wild_hunt
+			}
 		}
 	}
 
@@ -22166,6 +22220,16 @@ shared_focus = {
 				amount = 300
 				producer = CCN
 			}
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_equipment_subsidy = {
+					cic = 500
+					equipment_type = light_tank_chassis
+					seller_tags = { CHN CCN OLE }
+				}
+			}
 		}
 		search_filters = { FOCUS_FILTER_RESEARCH }
 	}
@@ -26865,18 +26929,57 @@ shared_focus = {
 		y = 2
 
 		completion_reward = {
-			add_tech_bonus = {
-				name = special_forces_bonus
-				bonus = 1.0
-				uses = 2
-				category = special_forces_tech
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_doctrine_cost_reduction = {
+					name = special_forces_bonus
+					cost_reduction = 0.50
+					uses = 2
+					category = special_forces_doctrine
+				}
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 0.50
+					uses = 2
+					category = special_forces_tech
+				}
 			}
-			add_tech_bonus = {
-				name = mountaineer_bonus
-				bonus = 1
-				uses = 1
-				category = mountaineers_tech
-				ahead_reduction = 2
+			else = {
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 1.0
+					uses = 2
+					category = special_forces_tech
+				}
+			}
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_doctrine_cost_reduction = {
+					name = special_forces_bonus
+					cost_reduction = 0.50
+					uses = 1
+					category = cat_mountaineers_doctrine
+				}
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 0.75
+					uses = 1
+					ahead_reduction = 1
+					category = mountaineers_tech
+				}
+			}
+			else = {
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 1
+					uses = 1
+					ahead_reduction = 2
+					category = mountaineers_tech
+				}
 			}
 		}
 		search_filters = { FOCUS_FILTER_RESEARCH }
@@ -28466,7 +28569,7 @@ shared_focus = {
 						engine_type_slot = engine_1_1x
 						special_type_slot_1 = empty
 					}
-					icon = "GFX_STG_early_fighter_medium"
+					icon = "GFX_stalliongrad_2d_early_fighter_medium"
 				}
 				add_equipment_to_stockpile = {
 					type = small_plane_airframe_0
@@ -29571,7 +29674,7 @@ shared_focus = {
 	shared_focus = {
 		id = PLB_queens_guard
 		icon = GFX_goal_chn_man_police
-		cost = 2.00
+		cost = 6.00
 		
 		prerequisite = {
 			focus = PLB_on_top_of_the_world
@@ -29587,6 +29690,8 @@ shared_focus = {
 		y = 1
 
 		completion_reward = {
+			add_command_power = -50
+			add_political_power = -150
 			custom_effect_tooltip = available_political_advisor
 			show_ideas_tooltip  = PLB_queen_guard
 			add_corps_commander_role = {
@@ -29598,10 +29703,35 @@ shared_focus = {
 				planning_skill = 3
 				logistics_skill = 4
 			}
-			add_manpower = 2500
+			set_technology = { popup = yes tech_jager = 1 }
+			set_technology = { popup = yes tech_generic_r = 1 }
+			hidden_effect = {
+				division_template = {
+					name = "Queen's Guard"
+					priority = 2
+					regiments = {
+							jager = { x = 0 y = 0 }
+							jager = { x = 0 y = 1 }
+							jager = { x = 0 y = 2 }
+							jager = { x = 0 y = 3 }
+							jager = { x = 0 y = 4 }
+							jager = { x = 1 y = 0 }
+							jager = { x = 1 y = 1 }
+					}
+				}
+			}
+	
+			random_owned_controlled_state = {
+				prioritize = { 263 }
+				create_unit = {
+					division = "name = \"Carapace's Loyalists\" division_template = \"Queen's Guard\" start_experience_factor = 0.35" 
+					owner = PLB
+				}
+			}
 		}
 		search_filters = { FOCUS_FILTER_MANPOWER }
 	}
+	
 	shared_focus = {
 		id = PLB_call_in_Bjornlings_warband
 		icon = GFX_goal_chn_man_panzergrenadier
@@ -30123,8 +30253,21 @@ shared_focus = {
 		completion_reward = {
 			custom_effect_tooltip = available_political_advisor
 			show_ideas_tooltip  = PLB_mechanite_queen
-			custom_effect_tooltip = available_designer
-			show_ideas_tooltip  = PLB_mechanite_cult
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}    
+				custom_effect_tooltip = available_mio_tt
+				show_mio_tooltip = PLB_mechanite_cult_organization
+				mio:PLB_mechanite_cult_organization = {
+					add_mio_size = 1
+					add_mio_funds = 500
+				}
+			}
+			else = {
+				custom_effect_tooltip = available_designer
+				show_ideas_tooltip = PLB_mechanite_cult
+			}
 		}
 	}
 	shared_focus = {
@@ -30244,8 +30387,21 @@ shared_focus = {
 		completion_reward = {
 			custom_effect_tooltip = available_military_high_command
 			show_ideas_tooltip  = PLB_golden_cavalry_lord
-			custom_effect_tooltip = available_designer
-			show_ideas_tooltip  = PLB_clan_tordentsjerne
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}    
+				custom_effect_tooltip = available_mio_tt
+				show_mio_tooltip = PLB_clan_tordentsjerne_organization
+				mio:PLB_clan_tordentsjerne_organization = {
+					add_mio_size = 1
+					add_mio_funds = 500
+				}
+			}
+			else = {
+				custom_effect_tooltip = available_designer
+				show_ideas_tooltip = PLB_clan_tordentsjerne
+			}
 		}
 	}
 	
@@ -30862,6 +31018,26 @@ shared_focus = {
 			}
 			add_equipment_to_stockpile = { type = support_equipment_1 amount = 200 producer = CHN }
 			add_equipment_to_stockpile = { type = artillery_equipment_1 amount = 200 producer = CHN }
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_equipment_subsidy = {
+					cic = 250
+					equipment_type = infantry_equipment
+					seller_tags = { CHN CCN OLE }
+				}
+				add_equipment_subsidy = {
+					cic = 250
+					equipment_type = support_equipment
+					seller_tags = { CHN CCN OLE }
+				}
+				add_equipment_subsidy = {
+					cic = 250
+					equipment_type = artillery_equipment
+					seller_tags = { CHN CCN OLE }
+				}
+			}
 			add_manpower = 5000
 
 			custom_effect_tooltip = PLB_autonomy_score_add_50
diff --git a/common/national_focus/PYT.txt b/common/national_focus/PYT.txt
index f0a84b005c2..6710966dc57 100644
--- a/common/national_focus/PYT.txt
+++ b/common/national_focus/PYT.txt
@@ -2365,13 +2365,30 @@ shared_focus = {
 	}
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus PYT_marine_f"
-		add_tech_bonus = {
-			name = navy_bonus
-			bonus = 1.0
-			uses = 1
-			technology = marines
-			technology = marines2
-			technology = marines3
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_doctrine_cost_reduction = {
+				name = special_forces_bonus
+				cost_reduction = 0.75
+				uses = 1
+				category = cat_marines_doctrine
+			}
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 0.75
+				uses = 1
+				category = marine_tech
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 1.0
+				uses = 1
+				category = marine_tech
+			}
 		}
 	}
 	search_filters = { FOCUS_FILTER_RESEARCH }
@@ -2985,11 +3002,30 @@ shared_focus = {
 	}
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus PYT_paratrooper_project"
-		add_tech_bonus = {
-			name = paratrooper_bonus
-			bonus = 1.0
-			uses = 2
-			category = para_tech
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_doctrine_cost_reduction = {
+				name = special_forces_bonus
+				cost_reduction = 0.50
+				uses = 2
+				category = cat_paratroopers_doctrine
+			}
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 0.50
+				uses = 2
+				category = para_tech
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 1.0
+				uses = 2
+				category = para_tech
+			}
 		}
 	}
 	search_filters = { FOCUS_FILTER_RESEARCH }
diff --git a/common/national_focus/RCT.txt b/common/national_focus/RCT.txt
index 6effb7072e4..031446d82c4 100644
--- a/common/national_focus/RCT.txt
+++ b/common/national_focus/RCT.txt
@@ -5230,12 +5230,32 @@ focus_tree = {
 
 		completion_reward = {
 			log = "[GetDateText]: [Root.GetName]: Focus RCT_more_marines"
-			add_tech_bonus = {
-				name = marine_bonus
-				bonus = 1.0
-				uses = 1
-				category = marine_tech
-				ahead_reduction = 2
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_doctrine_cost_reduction = {
+					name = special_forces_bonus
+					cost_reduction = 0.75
+					uses = 1
+					category = cat_marines_doctrine
+				}
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 0.75
+					uses = 1
+					ahead_reduction = 2
+					category = marine_tech
+				}
+			}
+			else = {
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 1.0
+					uses = 1
+					ahead_reduction = 2
+					category = marine_tech
+				}
 			}
 		}
 		search_filters = { FOCUS_FILTER_RESEARCH }
diff --git a/common/national_focus/RIV_shared.txt b/common/national_focus/RIV_shared.txt
index 3ab1e4402f5..d8dcb257054 100644
--- a/common/national_focus/RIV_shared.txt
+++ b/common/national_focus/RIV_shared.txt
@@ -1,4 +1,4 @@
-#	shared_focus = {
+#	joint_focus = {
 	#		id = RIV_
 	#		icon = GFX_
 	#		prerequisite = { focus = }
@@ -97,6 +97,28 @@ shared_focus = {
 			has_country_flag = have_regular_puppets
 		}
 	}
+	offset = {
+		x = 21
+		y = 0
+		trigger = {
+			tag = FBK
+		}
+	}
+	offset = {
+		x = 21
+		y = 0
+		trigger = {
+			tag = FIR
+		}
+	}
+	offset = {
+		x = 27
+		y = 0
+		trigger = {
+			tag = FIR
+			has_focus_tree = FIR_focus_evilmagic
+		}
+	}
 
 	allow_branch = {
 		is_river_fed_member = yes
@@ -176,13 +198,15 @@ shared_focus = {
 #####################################
 #####	Unite the Federation	#####
 #####################################
-shared_focus = {
+joint_focus = {
 	id = RIV_science_society
 	icon = GFX_goal_riv_science
 	prerequisite = { focus = RIV_dreams_of_a_federation }
 	x = -3
 	y = 1
 	relative_position_id = RIV_dreams_of_a_federation
+	
+	text_icon = RIV_focus_style
 
 	cost = 10
 
@@ -238,17 +262,15 @@ shared_focus = {
 		}
 	}
 
-	bypass = {
-		any_allied_country = {
-			has_completed_focus = RIV_science_society
-		}
-	}
-
 	cancel_if_invalid = yes
 	continue_if_invalid = no
 	available_if_capitulated = no
 
-	completion_reward = {
+	joint_trigger = {
+		is_river_fed_member = yes
+	}
+
+	completion_reward_joint_originator = {
 		log = "[GetDateText]: [Root.GetName]: Focus RIV_science_society"
 		if = {
 			limit = { has_dlc = "Together for Victory" }
@@ -263,20 +285,43 @@ shared_focus = {
 				category = electronics
 			}
 		}
-		every_other_country = {
-			limit = {
-				is_river_fed_member = yes
-			}
-			country_event = riverfed.1
-		}
 		RIV_add_to_fed_race = yes
 		set_country_flag = RIV_science_society_founder
 		set_global_flag = RIV_science_society_founded
+		hidden_effect = {			
+			every_other_country = {
+				limit = {
+					is_river_fed_member = yes
+				}
+				country_event = riverfed.1
+			}
+		}
+	}
+	completion_reward_joint_member = {
+		effect_tooltip = {
+			country_event = riverfed.1
+		}
+		custom_effect_tooltip = if_they_accept
+		effect_tooltip = {
+			if = {
+				limit = { has_dlc = "Together for Victory" }
+				add_to_tech_sharing_group = RIV_science_society_group
+			}
+			else = {
+				add_tech_bonus = {
+					name = industrial_bonus
+					bonus = 0.65
+					uses = 3
+					category = industry
+					category = electronics
+				}
+			}
+		}
 	}
 	search_filters = { FOCUS_FILTER_RESEARCH FOCUS_FILTER_RIVER_FED_RACE }
 }
 
-shared_focus = {
+joint_focus = {
 	id = RIV_found_the_rcsc
 	icon = GFX_goal_riv_shovels
 	prerequisite = { focus = RIV_science_society }
@@ -284,6 +329,8 @@ shared_focus = {
 	y = 1
 	relative_position_id = RIV_science_society
 
+	text_icon = RIV_focus_style
+
 	cost = 10
 
 	ai_will_do = {
@@ -338,33 +385,45 @@ shared_focus = {
 			has_country_flag = blocked_coalition_focuses_flag
 		}
 	}
-
-	bypass = {
-		any_allied_country = {
-			has_completed_focus = RIV_found_the_rcsc
-		}
+	
+	joint_trigger = {
+		is_river_fed_member = yes
 	}
 
 	cancel_if_invalid = yes
 	continue_if_invalid = no
 	available_if_capitulated = no
 
-	completion_reward = {
+	completion_reward_joint_originator = {
 		log = "[GetDateText]: [Root.GetName]: Focus RIV_found_the_rcsc"
 		swap_ideas = {
 			remove_idea = RIV_member_state
 			add_idea = RIV_rcsc_member
 		}
-		every_other_country = {
-			limit = {
-				is_river_fed_member = yes
+		hidden_effect = {
+			every_other_country = {
+				limit = {
+					is_river_fed_member = yes
+				}
+				country_event = riverfed.2
 			}
-			country_event = riverfed.2
 		}
 		RIV_add_to_fed_race = yes
 		set_country_flag = RIV_rcsc_founder
 		set_global_flag = RIV_rcsc_founded
 	}
+	completion_reward_joint_member = {
+		effect_tooltip = {
+			country_event = riverfed.2
+		}
+		custom_effect_tooltip = if_they_accept
+		effect_tooltip = {
+			swap_ideas = {
+				remove_idea = RIV_member_state
+				add_idea = RIV_rcsc_member
+			}
+		}
+	}
 	search_filters = { FOCUS_FILTER_INDUSTRY FOCUS_FILTER_RIVER_FED_RACE }
 }
 
@@ -373,7 +432,7 @@ shared_focus = {
 #####################################
 
 ### DEP ###
-shared_focus = {
+joint_focus = {
 	id = RIV_develop_DEP
 	icon = GFX_goal_riv_industry_dep
 	prerequisite = { focus = RIV_dreams_of_a_federation }
@@ -381,6 +440,8 @@ shared_focus = {
 	y = 1
 	relative_position_id = RIV_dreams_of_a_federation
 
+	text_icon = RIV_focus_style
+
 	cost = 10
 
 	ai_will_do = {
@@ -437,12 +498,13 @@ shared_focus = {
 			NOT = {
 				is_in_faction_with = DEP
 			}
-			any_allied_country = {
-				has_completed_focus = RIV_develop_DEP
-			}
 		}
 	}
 
+	joint_trigger = {
+		is_river_fed_member = yes
+	}
+	
 	cancel_if_invalid = yes
 	continue_if_invalid = no
 	available_if_capitulated = no
@@ -461,7 +523,7 @@ shared_focus = {
 		}
 	}
 
-	completion_reward = {
+	completion_reward_joint_originator = {
 		log = "[GetDateText]: [Root.GetName]: Focus RIV_develop_DEP"
 		DEP = {
 			random_owned_controlled_state = {
@@ -487,7 +549,7 @@ shared_focus = {
 	search_filters = { FOCUS_FILTER_INDUSTRY FOCUS_FILTER_RIVER_FED_RACE }
 }
 
-shared_focus = {
+joint_focus = {
 	id = RIV_build_roads_in_DEP
 	icon = GFX_goal_riv_infra_dep
 	prerequisite = { focus = RIV_develop_DEP }
@@ -495,6 +557,8 @@ shared_focus = {
 	y = 1
 	relative_position_id = RIV_develop_DEP
 
+	text_icon = RIV_focus_style
+
 	cost = 10
 
 	ai_will_do = {
@@ -551,11 +615,12 @@ shared_focus = {
 			NOT = {
 				is_in_faction_with = DEP
 			}
-			any_allied_country = {
-				has_completed_focus = RIV_build_roads_in_DEP
-			}
 		}
 	}
+	
+	joint_trigger = {
+		is_river_fed_member = yes
+	}
 
 	cancel_if_invalid = yes
 	continue_if_invalid = no
@@ -574,7 +639,7 @@ shared_focus = {
 		}
 	}
 
-	completion_reward = {
+	completion_reward_joint_originator = {
 		log = "[GetDateText]: [Root.GetName]: Focus RIV_build_roads_in_DEP"
 		DEP = {
 			random_owned_controlled_state = {
@@ -598,7 +663,7 @@ shared_focus = {
 	search_filters = { FOCUS_FILTER_INDUSTRY FOCUS_FILTER_RIVER_FED_RACE }
 }
 
-shared_focus = {
+joint_focus = {
 	id = RIV_development_grants_DEP
 	icon = GFX_goal_riv_grants_dep
 	prerequisite = { focus = RIV_build_roads_in_DEP }
@@ -606,6 +671,8 @@ shared_focus = {
 	y = 1
 	relative_position_id = RIV_build_roads_in_DEP
 
+	text_icon = RIV_focus_style
+
 	cost = 10
 
 	ai_will_do = {
@@ -662,18 +729,19 @@ shared_focus = {
 			NOT = {
 				is_in_faction_with = DEP
 			}
-			any_allied_country = {
-				has_completed_focus = RIV_development_grants_DEP
-			}
 		}
 	}
+	
+	joint_trigger = {
+		is_river_fed_member = yes
+	}
 
 	cancel_if_invalid = yes
 	continue_if_invalid = no
 	available_if_capitulated = no
 
 
-	completion_reward = {
+	completion_reward_joint_originator = {
 		log = "[GetDateText]: [Root.GetName]: Focus RIV_development_grants_DEP"
 		DEP = {
 			add_timed_idea = { idea = RIV_development_grants_idea days = 730 }
@@ -686,7 +754,7 @@ shared_focus = {
 }
 
 ### FRE ###
-shared_focus = {
+joint_focus = {
 	id = RIV_develop_FRE
 	icon = GFX_goal_riv_industry_fre
 	prerequisite = { focus = RIV_dreams_of_a_federation }
@@ -694,6 +762,8 @@ shared_focus = {
 	y = 1
 	relative_position_id = RIV_dreams_of_a_federation
 
+	text_icon = RIV_focus_style
+
 	cost = 10
 
 	ai_will_do = {
@@ -750,12 +820,13 @@ shared_focus = {
 	bypass = {
 		OR = {
 			FRE = { exists = no }
-			any_allied_country = {
-				has_completed_focus = RIV_develop_FRE
-			}
 		}
 
 	}
+	
+	joint_trigger = {
+		is_river_fed_member = yes
+	}
 
 	cancel_if_invalid = yes
 	continue_if_invalid = no
@@ -775,7 +846,7 @@ shared_focus = {
 		}
 	}
 
-	completion_reward = {
+	completion_reward_joint_originator = {
 		log = "[GetDateText]: [Root.GetName]: Focus RIV_develop_FRE"
 		FRE = {
 			random_owned_controlled_state = {
@@ -801,7 +872,7 @@ shared_focus = {
 	search_filters = { FOCUS_FILTER_INDUSTRY FOCUS_FILTER_RIVER_FED_RACE }
 }
 
-shared_focus = {
+joint_focus = {
 	id = RIV_build_roads_in_FRE
 	icon = GFX_goal_riv_infra_fre
 	prerequisite = { focus = RIV_develop_FRE }
@@ -809,6 +880,8 @@ shared_focus = {
 	y = 1
 	relative_position_id = RIV_develop_FRE
 
+	text_icon = RIV_focus_style
+
 	cost = 10
 
 	ai_will_do = {
@@ -861,11 +934,12 @@ shared_focus = {
 	bypass = {
 		OR = {
 			FRE = { exists = no }
-			any_allied_country = {
-				has_completed_focus = RIV_build_roads_in_FRE
-			}
 		}
 	}
+	
+	joint_trigger = {
+		is_river_fed_member = yes
+	}
 
 	cancel_if_invalid = yes
 	continue_if_invalid = no
@@ -884,7 +958,7 @@ shared_focus = {
 		}
 	}
 
-	completion_reward = {
+	completion_reward_joint_originator = {
 		log = "[GetDateText]: [Root.GetName]: Focus RIV_build_roads_in_FRE"
 		FRE = {
 			random_owned_controlled_state = {
@@ -908,7 +982,7 @@ shared_focus = {
 	search_filters = { FOCUS_FILTER_INDUSTRY FOCUS_FILTER_RIVER_FED_RACE }
 }
 
-shared_focus = {
+joint_focus = {
 	id = RIV_development_grants_FRE
 	icon = GFX_goal_riv_grants_fre
 	prerequisite = { focus = RIV_build_roads_in_FRE }
@@ -916,6 +990,8 @@ shared_focus = {
 	y = 1
 	relative_position_id = RIV_build_roads_in_FRE
 
+	text_icon = RIV_focus_style
+
 	cost = 10
 
 	ai_will_do = {
@@ -968,17 +1044,18 @@ shared_focus = {
 	bypass = {
 		OR = {
 			FRE = { exists = no }
-			any_allied_country = {
-				has_completed_focus = RIV_development_grants_FRE
-			}
 		}
 	}
+	
+	joint_trigger = {
+		is_river_fed_member = yes
+	}
 
 	cancel_if_invalid = yes
 	continue_if_invalid = no
 	available_if_capitulated = no
 
-	completion_reward = {
+	completion_reward_joint_originator = {
 		log = "[GetDateText]: [Root.GetName]: Focus RIV_development_grants_FRE"
 		FRE = {
 			add_timed_idea = { idea = RIV_development_grants_idea days = 730 }
@@ -992,7 +1069,7 @@ shared_focus = {
 
 ### Shared ###
 
-shared_focus = {
+joint_focus = {
 	id = RIV_found_the_rdc
 	icon = GFX_goal_riv_development
 	prerequisite = { focus = RIV_development_grants_DEP }
@@ -1000,6 +1077,7 @@ shared_focus = {
 	x = 1
 	y = 1
 	relative_position_id = RIV_development_grants_DEP
+	text_icon = RIV_focus_style
 
 	cost = 10
 
@@ -1056,28 +1134,33 @@ shared_focus = {
 		}
 	}
 
-	bypass = {
-		any_allied_country = {
-			has_completed_focus = RIV_found_the_rdc
-		}
-	}
-
 	cancel_if_invalid = yes
 	continue_if_invalid = no
 	available_if_capitulated = no
+	
+	joint_trigger = {
+		is_river_fed_member = yes
+	}
 
-	completion_reward = {
+	completion_reward_joint_originator = {
 		log = "[GetDateText]: [Root.GetName]: Focus RIV_found_the_rdc"
 		add_ideas = RIV_rdc
-		every_other_country = {
-			limit = {
-				is_river_fed_member = yes
-			}
-			country_event = riverfed.14
-		}
 		RIV_add_to_fed_race = yes
 		set_country_flag = RIV_rdc_founder
 		set_global_flag = RIV_rdc_founded
+		hidden_effect = {
+			every_other_country = {
+				limit = {
+					is_river_fed_member = yes
+				}
+				country_event = riverfed.14
+			}
+		}
+	}
+	completion_reward_joint_member = {
+		effect_tooltip = {
+			country_event = riverfed.14
+		}
 	}
 	search_filters = { FOCUS_FILTER_INDUSTRY FOCUS_FILTER_RIVER_FED_RACE }
 }
@@ -1088,7 +1171,7 @@ shared_focus = {
 #####	FED Centralization 2	#####
 #####################################
 
-shared_focus = {
+joint_focus = {
 	id = RIV_found_the_rec
 	icon = GFX_goal_riv_economic_community
 	prerequisite = { focus = RIV_found_the_rcsc }
@@ -1096,6 +1179,7 @@ shared_focus = {
 	x = -2
 	y = 1
 	relative_position_id = RIV_found_the_rdc
+	text_icon = RIV_focus_style
 
 	cost = 10
 
@@ -1157,33 +1241,44 @@ shared_focus = {
 			has_country_flag = blocked_coalition_focuses_flag
 		}
 	}
-
-	bypass = {
-		any_allied_country = {
-			has_completed_focus = RIV_found_the_rec
-		}
+	
+	joint_trigger = {
+		is_river_fed_member = yes
 	}
 
 	cancel_if_invalid = yes
 	continue_if_invalid = no
 	available_if_capitulated = no
 
-	completion_reward = {
+	completion_reward_joint_originator = {
 		log = "[GetDateText]: [Root.GetName]: Focus RIV_found_the_rec"
 		swap_ideas = {
 			remove_idea = RIV_rcsc_member
 			add_idea = RIV_rec_member1
 		}
-		every_other_country = {
+		RIV_add_to_fed_race = yes
+		set_country_flag = RIV_rec_founder
+		set_global_flag = RIV_rec_founded
+		hidden_effect = {
+			every_other_country = {
+				limit = {
+					is_river_fed_member = yes
+					has_idea = RIV_rcsc_member
+				}
+				country_event = riverfed.15
+			}
+		}
+	}
+	completion_reward_joint_member = {
+		custom_effect_tooltip = RIV_found_the_rec_tt
+		if = {
 			limit = {
-				is_river_fed_member = yes
 				has_idea = RIV_rcsc_member
 			}
-			country_event = riverfed.15
+			effect_tooltip = {
+				country_event = riverfed.15
+			}
 		}
-		RIV_add_to_fed_race = yes
-		set_country_flag = RIV_rec_founder
-		set_global_flag = RIV_rec_founded
 	}
 	search_filters = { FOCUS_FILTER_STABILITY FOCUS_FILTER_INDUSTRY FOCUS_FILTER_POLITICAL FOCUS_FILTER_RIVER_FED_RACE }
 }
@@ -1438,7 +1533,7 @@ shared_focus = {
 	search_filters = { FOCUS_FILTER_INDUSTRY FOCUS_FILTER_STABILITY FOCUS_FILTER_RIVER_FED_RACE }
 }
 
-shared_focus = {
+joint_focus = {
 	id = RIV_eastern_transport_fund
 	icon = GFX_goal_riv_river_trans
 	prerequisite = { focus = RIV_rdc_rail_projects }
@@ -1446,6 +1541,7 @@ shared_focus = {
 	x = 0
 	y = 1
 	relative_position_id = RIV_rdc_rail_projects
+	text_icon = RIV_focus_style
 
 	cost = 10
 
@@ -1507,26 +1603,29 @@ shared_focus = {
 		}
 	}
 
-	bypass = {
-		any_allied_country = {
-			has_completed_focus = RIV_eastern_transport_fund
-		}
+	joint_trigger = {
+		is_river_fed_member = yes
 	}
 
 	cancel_if_invalid = yes
 	continue_if_invalid = no
 	available_if_capitulated = no
 
-	completion_reward = {
+	completion_reward_joint_originator = {
 		log = "[GetDateText]: [Root.GetName]: Focus RIV_eastern_transport_fund"
 		swap_ideas = {
 			remove_idea = RIV_rdc
 			add_idea = RIV_rdc2
 		}
 
-		custom_effect_tooltip = RIV_eastern_transport_fund_tt
+		set_country_flag = RIV_etf_founder
+		set_global_flag = RIV_etf_founded
 
-		every_other_country = {
+		RIV_add_to_fed_race = yes
+	}
+	completion_reward_joint_member = {		
+		custom_effect_tooltip = RIV_eastern_transport_fund_tt
+		if = {
 			limit = {
 				has_idea = RIV_rdc
 			}
@@ -1535,22 +1634,18 @@ shared_focus = {
 				add_idea = RIV_rdc2
 			}
 		}
-
-		set_country_flag = RIV_etf_founder
-		set_global_flag = RIV_etf_founded
-
-		RIV_add_to_fed_race = yes
 	}
 	search_filters = { FOCUS_FILTER_INDUSTRY FOCUS_FILTER_RIVER_FED_RACE }
 }
 
-shared_focus = {
+joint_focus = {
 	id = RIV_social_fund
 	icon = GFX_goal_riv_social_fund
 	prerequisite = { focus = RIV_found_the_rec }
 	x = 0
 	y = 1
 	relative_position_id = RIV_found_the_rec
+	text_icon = RIV_focus_style
 
 	cost = 10
 
@@ -1603,43 +1698,55 @@ shared_focus = {
 		}
 	}
 
-	bypass = {
-		any_allied_country = {
-			has_completed_focus = RIV_social_fund
-		}
+	joint_trigger = {
+		is_river_fed_member = yes
 	}
 
 	cancel_if_invalid = yes
 	continue_if_invalid = no
 	available_if_capitulated = no
 
-	completion_reward = {
+	completion_reward_joint_originator = {
 		log = "[GetDateText]: [Root.GetName]: Focus RIV_social_fund"
 		swap_ideas = {
 			remove_idea = RIV_rec_member1
 			add_idea = RIV_rec_member2
 		}
 
-		every_other_country = {
-			limit = {
-				has_idea = RIV_rec_member1
+		hidden_effect = {
+			every_other_country = {
+				limit = {
+					has_idea = RIV_rec_member1
+				}
+				country_event = riverfed.16
 			}
-			country_event = riverfed.16
 		}
 		set_country_flag = RIV_social_fund_founder
 		set_global_flag = RIV_social_fund_founded
 		RIV_add_to_fed_race = yes
 	}
+	completion_reward_joint_member = {
+		custom_effect_tooltip = RIV_social_fund_tt
+		if = {
+			limit = {
+				has_idea = RIV_rec_member1
+			}
+			effect_tooltip = {
+				country_event = riverfed.16
+			}
+		}
+	}
 	search_filters = { FOCUS_FILTER_STABILITY FOCUS_FILTER_INDUSTRY FOCUS_FILTER_POLITICAL FOCUS_FILTER_RIVER_FED_RACE }
 }
 
-shared_focus = {
+joint_focus = {
 	id = RIV_beings_rights
 	icon = GFX_goal_riv_beings_rights
 	prerequisite = { focus = RIV_social_fund }
 	x = 0
 	y = 1
 	relative_position_id = RIV_social_fund
+	text_icon = RIV_focus_style
 
 	cost = 10
 
@@ -1690,32 +1797,29 @@ shared_focus = {
 		}
 	}
 
-	bypass = {
-		any_allied_country = {
-			has_completed_focus = RIV_beings_rights
-		}
+	joint_trigger = {
+		is_river_fed_member = yes
 	}
 
 	cancel_if_invalid = yes
 	continue_if_invalid = no
 	available_if_capitulated = no
 
-	completion_reward = {
+	completion_reward_joint_originator = {
 		log = "[GetDateText]: [Root.GetName]: Focus RIV_beings_rights"
 		add_ideas = RIV_beings_rights_idea
 
-		every_other_country = {
-			limit = {
-				is_river_fed_member = yes
-			}
-			country_event = riverfed.17
-		}
-
 		set_country_flag = RIV_beings_rights_founder
 		set_global_flag = RIV_beings_rights_founded
 
 		RIV_add_to_fed_race = yes
 		hidden_effect = {
+			every_other_country = {
+				limit = {
+					is_river_fed_member = yes
+				}
+				country_event = riverfed.17
+			}
 			if = {
 				limit = {
 					NIM = {
@@ -1746,10 +1850,15 @@ shared_focus = {
 			}
 		}
 	}
+	completion_reward_joint_member = {
+		effect_tooltip = {
+			country_event = riverfed.17
+		}
+	}
 	search_filters = { FOCUS_FILTER_POLITICAL FOCUS_FILTER_STABILITY FOCUS_FILTER_RIVER_FED_RACE }
 }
 
-shared_focus = {
+joint_focus = {
 	id = RIV_river_parliament
 	icon = GFX_goal_riv_pairlament
 	prerequisite = { focus = RIV_social_fund }
@@ -1757,6 +1866,7 @@ shared_focus = {
 	x = 0
 	y = 1
 	relative_position_id = RIV_eastern_transport_fund
+	text_icon = RIV_focus_style
 
 	cost = 10
 
@@ -1822,44 +1932,56 @@ shared_focus = {
 		}
 	}
 
-	bypass = {
-		any_allied_country = {
-			has_completed_focus = RIV_river_parliament
-		}
+	joint_trigger = {
+		is_river_fed_member = yes
 	}
 
 	cancel_if_invalid = yes
 	continue_if_invalid = no
 	available_if_capitulated = no
 
-	completion_reward = {
+	completion_reward_joint_originator = {
 		log = "[GetDateText]: [Root.GetName]: Focus RIV_river_parliament"
 		swap_ideas = {
 			remove_idea = RIV_rec_member2
 			add_idea = RIV_rec_member3
 		}
-
-		every_other_country = {
-			limit = {
-				has_idea = RIV_rec_member2
+		hidden_effect = {
+			every_other_country = {
+				limit = {
+					has_idea = RIV_rec_member2
+				}
+				country_event = riverfed.18
 			}
-			country_event = riverfed.18
 		}
+		
 		set_country_flag = RIV_river_parliament_founder
 		set_global_flag = RIV_river_parliament_founded
 
 		RIV_add_to_fed_race = yes
 	}
+	completion_reward_joint_member = {
+		custom_effect_tooltip = RIV_river_parliament_tt
+		if = {
+			limit = {
+				has_idea = RIV_rec_member2
+			}
+			effect_tooltip = {
+				country_event = riverfed.18
+			}
+		}
+	}
 	search_filters = { FOCUS_FILTER_STABILITY FOCUS_FILTER_INDUSTRY FOCUS_FILTER_POLITICAL FOCUS_FILTER_RIVER_FED_RACE }
 }
 
-shared_focus = {
+joint_focus = {
 	id = RIV_free_movement
 	icon = GFX_goal_riv_free_travel
 	prerequisite = { focus = RIV_river_parliament }
 	x = -1
 	y = 2
 	relative_position_id = RIV_river_parliament
+	text_icon = RIV_focus_style
 
 	cost = 10
 
@@ -1924,37 +2046,48 @@ shared_focus = {
 		}
 	}
 
-	bypass = {
-		any_allied_country = {
-			has_completed_focus = RIV_free_movement
-		}
+	joint_trigger = {
+		is_river_fed_member = yes
 	}
 
 	cancel_if_invalid = yes
 	continue_if_invalid = no
 	available_if_capitulated = no
 
-	completion_reward = {
+	completion_reward_joint_originator = {
 		log = "[GetDateText]: [Root.GetName]: Focus RIV_free_movement"
 		swap_ideas = {
 			remove_idea = RIV_rec_member3
 			add_idea = RIV_rec_member4
 		}
-
-		every_other_country = {
-			limit = {
-				has_idea = RIV_rec_member3
+		hidden_effect = {
+			every_other_country = {
+				limit = {
+					has_idea = RIV_rec_member2
+				}
+				country_event = riverfed.19
 			}
-			country_event = riverfed.19
 		}
+		
 		set_country_flag = RIV_free_movement_founder
 		set_global_flag = RIV_free_movement_founded
 		RIV_add_to_fed_race = yes
 	}
+	completion_reward_joint_member = {
+		custom_effect_tooltip = RIV_free_movement_tt
+		if = {
+			limit = {
+				has_idea = RIV_rec_member3
+			}
+			effect_tooltip = {
+				country_event = riverfed.19
+			}
+		}
+	}
 	search_filters = { FOCUS_FILTER_STABILITY FOCUS_FILTER_INDUSTRY FOCUS_FILTER_POLITICAL FOCUS_FILTER_RIVER_FED_RACE }
 }
 
-shared_focus = {
+joint_focus = {
 	id = RIV_centeral_bank
 	icon = GFX_goal_riv_bank
 	prerequisite = { focus = RIV_river_parliament }
@@ -1962,6 +2095,7 @@ shared_focus = {
 	x = 1
 	y = 1
 	relative_position_id = RIV_river_parliament
+	text_icon = RIV_focus_style
 
 	cost = 10
 
@@ -2025,40 +2159,46 @@ shared_focus = {
 		}
 	}
 
-	bypass = {
-		any_allied_country = {
-			has_completed_focus = RIV_centeral_bank
-		}
+	joint_trigger = {
+		is_river_fed_member = yes
 	}
 
 	cancel_if_invalid = yes
 	continue_if_invalid = no
 	available_if_capitulated = no
 
-	completion_reward = {
+	completion_reward_joint_originator = {
 		log = "[GetDateText]: [Root.GetName]: Focus RIV_centeral_bank"
 		add_ideas = RIV_centeral_bank_idea
 
-		every_other_country = {
-			limit = {
-				is_river_fed_member = yes
+		hidden_effect = {
+			every_other_country = {
+				limit = {
+					is_river_fed_member = yes
+				}
+				country_event = riverfed.20
 			}
-			country_event = riverfed.20
 		}
 		set_country_flag = RIV_centeral_bank_founder
 		set_global_flag = RIV_centeral_bank_founded
 		RIV_add_to_fed_race = yes
 	}
+	completion_reward_joint_member = {
+		effect_tooltip = {
+			country_event = riverfed.20
+		}
+	}
 	search_filters = { FOCUS_FILTER_INDUSTRY FOCUS_FILTER_RIVER_FED_RACE }
 }
 
-shared_focus = {
+joint_focus = {
 	id = RIV_the_rivbit
 	icon = GFX_goal_riv_bits
 	prerequisite = { focus = RIV_centeral_bank }
 	x = 0
 	y = 1
 	relative_position_id = RIV_centeral_bank
+	text_icon = RIV_focus_style
 
 	cost = 10
 
@@ -2123,39 +2263,48 @@ shared_focus = {
 		}
 	}
 
-	bypass = {
-		any_allied_country = {
-			has_completed_focus = RIV_the_rivbit
-		}
+	joint_trigger = {
+		is_river_fed_member = yes
 	}
 
 	cancel_if_invalid = yes
 	continue_if_invalid = no
 	available_if_capitulated = no
 
-	completion_reward = {
+	completion_reward_joint_originator = {
 		log = "[GetDateText]: [Root.GetName]: Focus RIV_the_rivbit"
 		swap_ideas = {
 			remove_idea = RIV_centeral_bank_idea
 			add_idea = RIV_rivbit_idea
 		}
-
-		every_other_country = {
-			limit = {
-				has_idea = RIV_centeral_bank_idea
+		hidden_effect = {
+			every_other_country = {
+				limit = {
+					has_idea = RIV_centeral_bank_idea
+				}
+				country_event = riverfed.21
 			}
-			country_event = riverfed.21
 		}
-
 		set_country_flag = RIV_rivbit_founder
 		set_global_flag = RIV_rivbit_founded
 
 		RIV_add_to_fed_race = yes
 	}
+	completion_reward_joint_member = {
+		custom_effect_tooltip = RIV_the_rivbit_tt
+		effect_tooltip = {
+			if = {			
+				limit = {
+					has_idea = RIV_centeral_bank_idea
+				}
+				country_event = riverfed.21
+			}
+		}
+	}
 	search_filters = { FOCUS_FILTER_INDUSTRY FOCUS_FILTER_RIVER_FED_RACE }
 }
 
-shared_focus = {
+joint_focus = {
 	id = RIV_the_river_union
 	icon = GFX_goal_riv_river_union
 	prerequisite = { focus = RIV_the_rivbit }
@@ -2163,6 +2312,7 @@ shared_focus = {
 	x = -1
 	y = 1
 	relative_position_id = RIV_the_rivbit
+	text_icon = RIV_focus_style
 
 	cost = 10
 
@@ -2226,43 +2376,55 @@ shared_focus = {
 		}
 	}
 
-	bypass = {
-		any_allied_country = {
-			has_completed_focus = RIV_the_river_union
-		}
+	joint_trigger = {
+		is_river_fed_member = yes
 	}
 
 	cancel_if_invalid = yes
 	continue_if_invalid = no
 	available_if_capitulated = no
 
-	completion_reward = {
+	completion_reward_joint_originator = {
 		log = "[GetDateText]: [Root.GetName]: Focus RIV_the_river_union"
 		swap_ideas = {
 			remove_idea = RIV_rec_member4
 			add_idea = RIV_river_union_member1
 		}
-
-		every_other_country = {
-			limit = {
-				has_idea = RIV_rec_member4
+		hidden_effect = {
+			every_other_country = {
+				limit = {
+					has_idea = RIV_rec_member4
+				}
+				country_event = riverfed.22
 			}
-			country_event = riverfed.22
 		}
+
 		set_country_flag = RIV_the_river_union_founder
 		set_global_flag = RIV_the_river_union_founded
 		RIV_add_to_fed_race = yes
 	}
+	completion_reward_joint_member = {
+		custom_effect_tooltip = RIV_the_river_union_tt
+		if = {
+			limit = {
+				has_idea = RIV_rec_member4
+			}
+			effect_tooltip = {
+				country_event = riverfed.22
+			}
+		}
+	}
 	search_filters = { FOCUS_FILTER_STABILITY FOCUS_FILTER_INDUSTRY FOCUS_FILTER_POLITICAL FOCUS_FILTER_RIVER_FED_RACE }
 }
 
-shared_focus = {
+joint_focus = {
 	id = RIV_river_army
 	icon = GFX_goal_riv_army
 	prerequisite = { focus = RIV_the_river_union }
 	x = -1
 	y = 1
 	relative_position_id = RIV_the_river_union
+	text_icon = RIV_focus_style
 
 	cost = 10
 
@@ -2332,43 +2494,57 @@ shared_focus = {
 		}
 	}
 
-	bypass = {
-		any_allied_country = {
-			has_completed_focus = RIV_river_army
-		}
+	joint_trigger = {
+		is_river_fed_member = yes
 	}
 
 	cancel_if_invalid = yes
 	continue_if_invalid = no
 	available_if_capitulated = no
 
-	completion_reward = {
+	completion_reward_joint_originator = {
 		log = "[GetDateText]: [Root.GetName]: Focus RIV_river_army"
 		add_ideas = RIV_river_army_idea
 		set_country_flag = RIV_river_army_founder
 		set_global_flag = RIV_river_army_founded
-		every_other_country = {
+		hidden_effect = {
+			every_other_country = {
+				limit = {
+					or = {
+						has_idea = RIV_river_union_member1
+						has_idea = RIV_river_union_member2
+					}
+				}
+				country_event = riverfed.23
+			}
+		}
+		RIV_add_to_fed_race = yes
+	}
+	completion_reward_joint_member = {
+		custom_effect_tooltip = RIV_river_army_tt
+		if = {
 			limit = {
 				or = {
 					has_idea = RIV_river_union_member1
 					has_idea = RIV_river_union_member2
 				}
 			}
-			country_event = riverfed.23
+			effect_tooltip = {
+				country_event = riverfed.23
+			}
 		}
-
-		RIV_add_to_fed_race = yes
 	}
 	search_filters = { FOCUS_FILTER_ARMY_BONUS FOCUS_FILTER_RIVER_FED_RACE }
 }
 
-shared_focus = {
+joint_focus = {
 	id = RIV_river_government
 	icon = GFX_goal_riv_united_gov
 	prerequisite = { focus = RIV_the_river_union }
 	x = 1
 	y = 1
 	relative_position_id = RIV_the_river_union
+	text_icon = RIV_focus_style
 
 	cost = 10
 
@@ -2433,34 +2609,44 @@ shared_focus = {
 		}
 	}
 
-	bypass = {
-		any_allied_country = {
-			has_completed_focus = RIV_river_government
-		}
+	joint_trigger = {
+		is_river_fed_member = yes
 	}
 
 	cancel_if_invalid = yes
 	continue_if_invalid = no
 	available_if_capitulated = no
 
-	completion_reward = {
+	completion_reward_joint_originator = {
 		log = "[GetDateText]: [Root.GetName]: Focus RIV_river_government"
 		swap_ideas = {
 			remove_idea = RIV_river_union_member1
 			add_idea = RIV_river_union_member2
 		}
-
-		every_other_country = {
-			limit = {
-				has_idea = RIV_river_union_member1
+		hidden_effect = {
+			every_other_country = {
+				limit = {
+					has_idea = RIV_river_union_member1
+				}
+				country_event = riverfed.24
 			}
-			country_event = riverfed.24
 		}
 		set_country_flag = RIV_river_government_founder
 		set_global_flag = RIV_river_government_founded
 
 		RIV_add_to_fed_race = yes
 	}
+	completion_reward_joint_member = {
+		custom_effect_tooltip = RIV_river_government_tt
+		if = {
+			limit = {
+				has_idea = RIV_river_union_member1
+			}
+			effect_tooltip = {
+				country_event = riverfed.24			
+			}
+		}
+	}
 	search_filters = { FOCUS_FILTER_STABILITY FOCUS_FILTER_INDUSTRY FOCUS_FILTER_POLITICAL FOCUS_FILTER_RIVER_FED_RACE }
 }
 
@@ -2472,6 +2658,7 @@ shared_focus = {
 	x = 1
 	y = 1
 	relative_position_id = RIV_river_army
+	text_icon = RIV_focus_style
 
 	cost = 20
 
@@ -3280,13 +3467,14 @@ shared_focus = {
 	search_filters = { FOCUS_FILTER_POLITICAL }
 }
 
-shared_focus = {
+joint_focus = {
 	id = RIV_develop_firtree
 	icon = GFX_goal_riv_befriend_fir
 	prerequisite = { focus = RIV_develop_friends }
 	x = -1
 	y = 1
 	relative_position_id = RIV_develop_friends
+	text_icon = RIV_focus_style
 
 	cost = 10
 
@@ -3352,11 +3540,11 @@ shared_focus = {
 		OR = {
 			NOT = { country_exists = FIR }
 			has_war_with = FIR
-			any_allied_country = {
-				has_completed_focus = RIV_develop_firtree
-			}
 		}
 	}
+	joint_trigger = {
+		is_river_fed_member = yes
+	}
 
 	cancel_if_invalid = yes
 	continue_if_invalid = no
@@ -3380,7 +3568,7 @@ shared_focus = {
 		}
 		custom_effect_tooltip = RIV_fed_race_plus_tt
 	}
-	completion_reward = {
+	completion_reward_joint_originator = {
 		log = "[GetDateText]: [Root.GetName]: Focus RIV_develop_firtree"
 		FIR = {
 			random_owned_controlled_state = {
@@ -3407,13 +3595,14 @@ shared_focus = {
 	search_filters = { FOCUS_FILTER_INDUSTRY FOCUS_FILTER_RIVER_FED_RACE }
 }
 
-shared_focus = {
+joint_focus = {
 	id = RIV_develop_farbrook
 	icon = GFX_goal_riv_befriend_fbk
 	prerequisite = { focus = RIV_develop_friends }
 	x = 1
 	y = 1
 	relative_position_id = RIV_develop_friends
+	text_icon = RIV_focus_style
 
 	cost = 10
 
@@ -3479,11 +3668,12 @@ shared_focus = {
 		OR = {
 			NOT = { country_exists = FBK }
 			has_war_with = FBK
-			any_allied_country = {
-				has_completed_focus = RIV_develop_farbrook
-			}
 		}
 	}
+	joint_trigger = {
+		is_river_fed_member = yes
+	}
+
 
 	cancel_if_invalid = yes
 	continue_if_invalid = no
@@ -3508,7 +3698,7 @@ shared_focus = {
 		custom_effect_tooltip = RIV_fed_race_plus_tt
 	}
 
-	completion_reward = {
+	completion_reward_joint_originator = {
 		log = "[GetDateText]: [Root.GetName]: Focus RIV_develop_farbrook"
 		FBK = {
 			random_owned_controlled_state = {
@@ -3535,13 +3725,14 @@ shared_focus = {
 	search_filters = { FOCUS_FILTER_INDUSTRY FOCUS_FILTER_RIVER_FED_RACE }
 }
 
-shared_focus = {
+joint_focus = {
 	id = RIV_develop_watertowns
 	icon = GFX_goal_riv_befriend_wat
 	prerequisite = { focus = RIV_develop_firtree }
 	x = 0
 	y = 1
 	relative_position_id = RIV_develop_firtree
+	text_icon = RIV_focus_style
 
 	cost = 10
 
@@ -3609,11 +3800,12 @@ shared_focus = {
 		OR = {
 			NOT = { country_exists = WAT }
 			has_war_with = WAT
-			any_allied_country = {
-				has_completed_focus = RIV_develop_watertowns
-			}
 		}
 	}
+	joint_trigger = {
+		is_river_fed_member = yes
+	}
+
 
 	cancel_if_invalid = yes
 	continue_if_invalid = no
@@ -3638,7 +3830,7 @@ shared_focus = {
 		custom_effect_tooltip = RIV_fed_race_plus_tt
 	}
 
-	completion_reward = {
+	completion_reward_joint_originator = {
 		log = "[GetDateText]: [Root.GetName]: Focus RIV_develop_watertowns"
 		WAT = {
 			random_owned_controlled_state = {
diff --git a/common/national_focus/ROU.txt b/common/national_focus/ROU.txt
index 7d822451705..6a23ff7ffe9 100644
--- a/common/national_focus/ROU.txt
+++ b/common/national_focus/ROU.txt
@@ -2415,11 +2415,30 @@ shared_focus = {
 	}
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus ROU_army_9"
-		add_tech_bonus = {
-			name = special_forces_bonus
-			bonus = 1
-			uses = 2
-			category = special_forces_tech
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_doctrine_cost_reduction = {
+				name = special_forces_bonus
+				cost_reduction = 0.50
+				uses = 2
+				category = special_forces_doctrine
+			}
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 0.50
+				uses = 2
+				category = special_forces_tech
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 1.0
+				uses = 2
+				category = special_forces_tech
+			}
 		}
 	}
 	search_filters = { FOCUS_FILTER_RESEARCH }
@@ -2642,6 +2661,16 @@ shared_focus = {
 					}
 				}
 			}
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_equipment_subsidy = {
+					cic = 500
+					equipment_type = small_plane_airframe
+					seller_tags = { GRI STW ANG FEA BRZ PYT YAL KAT }
+				}
+			}
 		}
 	}
 	search_filters = { FOCUS_FILTER_RESEARCH }
@@ -2773,6 +2802,21 @@ shared_focus = {
 				category = tactical_bomber
 			}
 		}
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_equipment_subsidy = {
+				cic = 250
+				equipment_type = small_plane_airframe
+				seller_tags = { GRI STW ANG FEA BRZ PYT YAL KAT }
+			}
+			add_equipment_subsidy = {
+				cic = 250
+				equipment_type = medium_plane_airframe
+				seller_tags = { GRI STW ANG FEA BRZ PYT YAL KAT }
+			}
+		}
 	}
 	search_filters = { FOCUS_FILTER_RESEARCH }
 }
diff --git a/common/national_focus/SCS.txt b/common/national_focus/SCS.txt
index 5b0e9eec95b..53a1c57eec7 100644
--- a/common/national_focus/SCS.txt
+++ b/common/national_focus/SCS.txt
@@ -3980,13 +3980,31 @@ focus_tree = {
 		completion_reward = {
 			log = "[GetDateText]: [Root.GetName]: Focus SCS_southern_cross_marines"
 			log = "[Root.GetName]: Focus no"#Auto-logging
-			add_tech_bonus = {
-				name = WNG_fanteria_marina_bonus
-				bonus = 0.5
-				uses = 2
-				technology = marines
-				technology = marines2
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_doctrine_cost_reduction = {
+					name = special_forces_bonus
+					cost_reduction = 0.35
+					uses = 1
+					category = cat_marines_doctrine
+				}
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 0.5
+					uses = 2
+					category = marine_tech
 				}
+			}
+			else = {
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 0.5
+					uses = 2
+					category = marine_tech
+				}
+			}
 		}
 		search_filters = { FOCUS_FILTER_RESEARCH }
 		}
diff --git a/common/national_focus/SCS_shared.txt b/common/national_focus/SCS_shared.txt
index ef3d1382ae2..ce63513781d 100644
--- a/common/national_focus/SCS_shared.txt
+++ b/common/national_focus/SCS_shared.txt
@@ -1134,18 +1134,31 @@ shared_focus = {
 
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus SCS_private_arms_companies"
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}    
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = SCS_colt_arms_organization
+			mio:SCS_colt_arms_organization = {
+				add_mio_size = 1
+				add_mio_funds = 500
+			}
+		}
+		else = {
 			custom_effect_tooltip = available_designer
 			show_ideas_tooltip = colt_arms
-			random_owned_controlled_state = {
-				add_extra_state_shared_building_slots = 1
-				add_building_construction = {
-					type = arms_factory
-					level = 1
-					instant_build = yes
-				}
+		}
+		random_owned_controlled_state = {
+			add_extra_state_shared_building_slots = 1
+			add_building_construction = {
+				type = arms_factory
+				level = 1
+				instant_build = yes
 			}
 		}
-		search_filters = { FOCUS_FILTER_INDUSTRY }
+	}
+	search_filters = { FOCUS_FILTER_INDUSTRY }
 }
 shared_focus = {
 	id = SCS_public_funding_guns
@@ -1179,18 +1192,31 @@ shared_focus = {
 
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus SCS_public_funding_guns"
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}    
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = SCS_rearington_arms_organization
+			mio:SCS_rearington_arms_organization = {
+				add_mio_size = 1
+				add_mio_funds = 500
+			}
+		}
+		else = {
 			custom_effect_tooltip = available_designer
 			show_ideas_tooltip = rearington_arms
-				random_owned_controlled_state = {
-				add_extra_state_shared_building_slots = 1
-				add_building_construction = {
-					type = arms_factory
-					level = 1
-					instant_build = yes
-				}
+		}
+		random_owned_controlled_state = {
+			add_extra_state_shared_building_slots = 1
+			add_building_construction = {
+				type = arms_factory
+				level = 1
+				instant_build = yes
 			}
 		}
-		search_filters = { FOCUS_FILTER_INDUSTRY }
+	}
+	search_filters = { FOCUS_FILTER_INDUSTRY }
 }
 shared_focus = {
 	id = SCS_dodge_university
@@ -3572,11 +3598,30 @@ shared_focus = {
 	}
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus SCS_marines_bonus"
-		add_tech_bonus = {
-			name = marine_bonus
-			bonus = 1
-			uses = 2
-			category = marine_tech
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_doctrine_cost_reduction = {
+				name = special_forces_bonus
+				cost_reduction = 0.50
+				uses = 2
+				category = cat_marines_doctrine
+			}
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 0.50
+				uses = 2
+				category = marine_tech
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 1.0
+				uses = 2
+				category = marine_tech
+			}
 		}
 	}
 	search_filters = { FOCUS_FILTER_RESEARCH }
diff --git a/common/national_focus/SIC.txt b/common/national_focus/SIC.txt
index d966842d93f..7a36ebb7758 100644
--- a/common/national_focus/SIC.txt
+++ b/common/national_focus/SIC.txt
@@ -5148,11 +5148,30 @@ focus_tree = {
 		}
 		completion_reward = {
 			log = "[GetDateText]: [Root.GetName]: Focus SIC_arahno_montaneros"
-			add_tech_bonus = {
-				name = special_forces_bonus
-				bonus = 1
-				uses = 1
-				category = mountaineers_tech
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_doctrine_cost_reduction = {
+					name = special_forces_bonus
+					cost_reduction = 0.75
+					uses = 1
+					category = cat_mountaineers_doctrine
+				}
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 0.75
+					uses = 1
+					category = mountaineers_tech
+				}
+			}
+			else = {
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 1.0
+					uses = 1
+					category = mountaineers_tech
+				}
 			}
 		}
 		search_filters = { FOCUS_FILTER_RESEARCH }
@@ -5172,11 +5191,30 @@ focus_tree = {
 		}
 		completion_reward = {
 			log = "[GetDateText]: [Root.GetName]: Focus SIC_scarlet_marinas"
-			add_tech_bonus = {
-				name = special_forces_bonus
-				bonus = 1
-				uses = 1
-				category = marine_tech
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_doctrine_cost_reduction = {
+					name = special_forces_bonus
+					cost_reduction = 0.75
+					uses = 1
+					category = cat_marines_doctrine
+				}
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 0.75
+					uses = 1
+					category = marine_tech
+				}
+			}
+			else = {
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 1.0
+					uses = 1
+					category = marine_tech
+				}
 			}
 		}
 		search_filters = { FOCUS_FILTER_RESEARCH }
@@ -5468,8 +5506,21 @@ focus_tree = {
 				}
 				add_extra_state_shared_building_slots = 1
 			}
-			custom_effect_tooltip = available_materiel_manufacturer
-			show_ideas_tooltip = arsenal_sycamore
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}    
+				custom_effect_tooltip = available_mio_tt
+				show_mio_tooltip = SIC_arsenal_sycamore_organization
+				mio:SIC_arsenal_sycamore_organization = {
+					add_mio_size = 1
+					add_mio_funds = 600
+				}
+			}
+			else = {
+				custom_effect_tooltip = available_materiel_manufacturer
+				show_ideas_tooltip = arsenal_sycamore
+			}
 		}
 		search_filters = { FOCUS_FILTER_INDUSTRY }
 	}
@@ -6239,6 +6290,21 @@ focus_tree = {
 				custom_effect_tooltip = UNLOCK_LARGE_CRUISER_VARIANTS
 				set_country_flag = SIC_fast_battleship_committee_mtg
 			}
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}    
+				custom_effect_tooltip = available_mio_tt
+				show_mio_tooltip = SIC_fast_battleship_committee_organization
+				mio:SIC_fast_battleship_committee_organization = {
+					add_mio_size = 1
+					add_mio_funds = 600
+				}
+			}
+			else = {
+				custom_effect_tooltip = available_designer
+				show_ideas_tooltip = fast_battleship_committee
+			}
 		}
 	}
 	focus = {
diff --git a/common/national_focus/SOL.txt b/common/national_focus/SOL.txt
index ebdbc53eefe..8378dfbd36c 100644
--- a/common/national_focus/SOL.txt
+++ b/common/national_focus/SOL.txt
@@ -3514,12 +3514,32 @@ shared_focus = {
 	y = 4
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus SOL_rb_marines"
-		add_tech_bonus = {
-			name = ITA_marines_and_landing_craft
-			bonus = 1
-			uses = 2
-			category = marine_tech
-			category = tp_tech
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_doctrine_cost_reduction = {
+				name = special_forces_bonus
+				cost_reduction = 0.50
+				uses = 2
+				category = cat_marines_doctrine
+			}
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 0.50
+				uses = 2
+				category = marine_tech
+				category = tp_tech
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 1.0
+				uses = 2
+				category = marine_tech
+				category = tp_tech
+			}
 		}
 	}
 	search_filters = { FOCUS_FILTER_RESEARCH }
diff --git a/common/national_focus/SRS.txt b/common/national_focus/SRS.txt
index df0144b1af4..9c9dc4505cb 100644
--- a/common/national_focus/SRS.txt
+++ b/common/national_focus/SRS.txt
@@ -1186,8 +1186,21 @@ shared_focus = {
 			set_country_flag = SRS_debates_3d_flag
 		}
 		custom_effect_tooltip = SRS_internationalist_delegates_hold_a_majority_tt
-		custom_effect_tooltip = available_designer
-        show_ideas_tooltip = internationalist_armaments
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}    
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = SRS_internationalist_armaments_organization
+			mio:SRS_internationalist_armaments_organization = {
+				add_mio_size = 1
+				add_mio_funds = 500
+			}
+		}
+		else = {
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = internationalist_armaments
+		}
 		if = { 
 			limit = { check_variable = { communards_support_var < internationalists_support_var } }
 			set_country_flag = SRS_picked_the_internationalist_armaments
@@ -1476,7 +1489,7 @@ shared_focus = {
 					infantry = { x = 0 y = 1 }
 					infantry = { x = 0 y = 2 }
 					infantry = { x = 0 y = 3 }
-					infantry = { x = 0 y = 4 }
+					infantry = { x = 1 y = 0 }
 				}
 			}
 			random_owned_controlled_state = {
diff --git a/common/national_focus/STG.txt b/common/national_focus/STG.txt
index 08bfbef5521..a12df1b2649 100644
--- a/common/national_focus/STG.txt
+++ b/common/national_focus/STG.txt
@@ -1611,7 +1611,7 @@ focus_tree = {
 							engine_type_slot = engine_3_1x
 							special_type_slot_1 = self_sealing_fuel_tanks_small
 						}
-						icon = "GFX_STG_fighter2_medium"
+						icon = "GFX_stalliongrad_2d_fighter2_medium"
 					}
 					create_equipment_variant = {
 						name = "IL-2" 
@@ -1624,7 +1624,7 @@ focus_tree = {
 							special_type_slot_2 = self_sealing_fuel_tanks_small
 							special_type_slot_3 = armor_plate_small
 						}
-						icon = "GFX_STG_CAS2_medium"
+						icon = "GFX_stalliongrad_2d_CAS2_medium"
 					}
 				}
 				if = {
@@ -1641,7 +1641,7 @@ focus_tree = {
 							engine_type_slot = engine_4_1x
 							special_type_slot_1 = self_sealing_fuel_tanks_small
 							}
-						icon = "GFX_STG_fighter2_medium"
+						icon = "GFX_stalliongrad_2d_fighter2_medium"
 					}
 					create_equipment_variant = {
 						name = "IL-10"
@@ -1655,7 +1655,7 @@ focus_tree = {
 							special_type_slot_2 = self_sealing_fuel_tanks_small
 							special_type_slot_3 = armor_plate_small
 						}
-						icon = "GFX_STG_CAS3_medium"
+						icon = "GFX_stalliongrad_2d_CAS3_medium"
 					}
 				}
 				else = {
@@ -1668,7 +1668,7 @@ focus_tree = {
 							engine_type_slot = engine_2_1x
 							special_type_slot_1 = self_sealing_fuel_tanks_small
 						}
-						icon = "GFX_STG_fighter3_medium"
+						icon = "GFX_stalliongrad_2d_fighter3_medium"
 					}
 					create_equipment_variant = {
 						name = "Su-2" 
@@ -1679,7 +1679,7 @@ focus_tree = {
 							engine_type_slot = engine_2_1x
 							special_type_slot_1 = lmg_defense_turret
 						}
-						icon = "GFX_STG_CAS1_medium"
+						icon = "GFX_stalliongrad_2d_CAS1_medium"
 					}
 				}
 			}
@@ -1982,7 +1982,7 @@ focus_tree = {
 							special_type_slot_2 = self_sealing_fuel_tanks_small
 							special_type_slot_3 = fuel_tanks_small
 						}
-						icon = "GFX_STG_jet_tactical_bomber1_medium"
+						icon = "GFX_stalliongrad_2d_jet_tactical_bomber1_medium"
 					}
 				}
 			}
@@ -2516,7 +2516,7 @@ focus_tree = {
 							engine_type_slot = engine_3_1x
 							special_type_slot_1 = self_sealing_fuel_tanks_small
 						}
-						icon = "GFX_STG_fighter2_medium"
+						icon = "GFX_stalliongrad_2d_fighter2_medium"
 					}
 					create_equipment_variant = {
 						name = "IL-2" 
@@ -2529,7 +2529,7 @@ focus_tree = {
 							special_type_slot_2 = self_sealing_fuel_tanks_small
 							special_type_slot_3 = armor_plate_small
 						}
-						icon = "GFX_STG_CAS2_medium"
+						icon = "GFX_stalliongrad_2d_CAS2_medium"
 					}
 				}
 				if = {
@@ -2546,7 +2546,7 @@ focus_tree = {
 							engine_type_slot = engine_4_1x
 							special_type_slot_1 = self_sealing_fuel_tanks_small
 							}
-						icon = "GFX_STG_fighter2_medium"
+						icon = "GFX_stalliongrad_2d_CAS2_medium"
 					}
 					create_equipment_variant = {
 						name = "IL-10"
@@ -2560,7 +2560,7 @@ focus_tree = {
 							special_type_slot_2 = self_sealing_fuel_tanks_small
 							special_type_slot_3 = armor_plate_small
 						}
-						icon = "GFX_STG_CAS3_medium"
+						icon = "GFX_stalliongrad_2d_CAS3_medium"
 					}
 				}
 				else = {
@@ -2573,7 +2573,7 @@ focus_tree = {
 							engine_type_slot = engine_2_1x
 							special_type_slot_1 = self_sealing_fuel_tanks_small
 						}
-						icon = "GFX_STG_fighter3_medium"
+						icon = "GFX_stalliongrad_2d_fighter3_medium"
 					}
 					create_equipment_variant = {
 						name = "Su-2" 
@@ -2584,7 +2584,7 @@ focus_tree = {
 							engine_type_slot = engine_2_1x
 							special_type_slot_1 = lmg_defense_turret
 						}
-						icon = "GFX_STG_CAS1_medium"
+						icon = "GFX_stalliongrad_2d_CAS1_medium"
 					}
 				}
 			}
diff --git a/common/national_focus/STW.txt b/common/national_focus/STW.txt
index 02ca925a361..d9c776c050b 100644
--- a/common/national_focus/STW.txt
+++ b/common/national_focus/STW.txt
@@ -5611,12 +5611,31 @@ shared_focus = {
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus STW_special_forces"
         add_ideas = STW_spec_ops
-        add_tech_bonus = {
-            name = STW_special_forces
-            bonus = 1.0
-            uses = 2
-            category = special_forces_tech
-        }
+        if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_doctrine_cost_reduction = {
+				name = special_forces_bonus
+				cost_reduction = 0.50
+				uses = 2
+				category = special_forces_doctrine
+			}
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 0.50
+				uses = 2
+				category = special_forces_tech
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 1.0
+				uses = 2
+				category = special_forces_tech
+			}
+		}
     }
     search_filters = { FOCUS_FILTER_ARMY_BONUS FOCUS_FILTER_RESEARCH }
 }
@@ -6264,12 +6283,31 @@ shared_focus = {
 
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus STW_valschermtroepen"
-        add_tech_bonus = {
-            name = STW_valschermtroepen
-            bonus = 1.0
-            uses = 1
-            category = para_tech
-        }
+        if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_doctrine_cost_reduction = {
+				name = special_forces_bonus
+				cost_reduction = 0.75
+				uses = 1
+				category = cat_paratroopers_doctrine
+			}
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 0.75
+				uses = 1
+				category = para_tech
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 1.0
+				uses = 1
+				category = para_tech
+			}
+		}
     }
     search_filters = { FOCUS_FILTER_RESEARCH }
 }
diff --git a/common/national_focus/TAL.txt b/common/national_focus/TAL.txt
index 1e3e1353f77..401813ab718 100644
--- a/common/national_focus/TAL.txt
+++ b/common/national_focus/TAL.txt
@@ -6821,7 +6821,6 @@ shared_focus = {
 		log = "[GetDateText]: [Root.GetName]: Focus TAL_the_first_oil_comp"
 		custom_effect_tooltip = available_designer
 		show_ideas_tooltip = TAL_synthy_co
-
 		random_owned_controlled_state = {
 			add_extra_state_shared_building_slots = 1
 			add_building_construction = {
@@ -6883,8 +6882,21 @@ shared_focus = {
 		    type = arms_factory 
 			level = 1
 		}
-		custom_effect_tooltip = available_designer
-		show_ideas_tooltip = TAL_automobile_industry_idea
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}    
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = TAL_automobile_industry_idea_organization
+			mio:TAL_automobile_industry_idea_organization = {
+				add_mio_size = 1
+				add_mio_funds = 500
+			}
+		}
+		else = {
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = TAL_automobile_industry_idea
+		}
     } 
     search_filters = { FOCUS_FILTER_INDUSTRY }
     
@@ -8099,13 +8111,30 @@ shared_focus = {
 		}
 		completion_reward = {
 			log = "[GetDateText]: [Root.GetName]: Focus TAL_paratrooper_project"
-			add_tech_bonus = {
-				name = paratrooper_bonus
-				bonus = 1
-				uses = 2
-				technology = paratroopers
-				technology = paratroopers2
-				technology = paratroopers3
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_doctrine_cost_reduction = {
+					name = special_forces_bonus
+					cost_reduction = 0.5
+					uses = 2
+					category = cat_paratroopers_doctrine
+				}
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 0.5
+					uses = 2
+					category = para_tech
+				}
+			}
+			else = {
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 1.0
+					uses = 2
+					category = para_tech
+				}
 			}
 		}
 		search_filters = { FOCUS_FILTER_RESEARCH }
@@ -8802,6 +8831,26 @@ shared_focus = {
 		add_equipment_to_stockpile = { type = infantry_equipment amount = 750 producer = WNG }
 		add_equipment_to_stockpile = { type = artillery_equipment amount = 250 producer = WNG }
 		add_equipment_to_stockpile = { type = support_equipment amount = 100 producer = WNG }
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_equipment_subsidy = {
+				cic = 250
+				equipment_type = infantry_equipment
+				seller_tags = { EQC WNG JES ARA FAL SIC MIT CYA FRN }
+			}
+			add_equipment_subsidy = {
+				cic = 250
+				equipment_type = support_equipment
+				seller_tags = { EQC WNG JES ARA FAL SIC MIT CYA FRN }
+			}
+			add_equipment_subsidy = {
+				cic = 250
+				equipment_type = artillery_equipment
+				seller_tags = { EQC WNG JES ARA FAL SIC MIT CYA FRN }
+			}
+		}
 	}
 	
 }
@@ -8945,14 +8994,30 @@ shared_focus = {
 	}
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus TAL_special_forces"
-		add_tech_bonus = {
-			name = special_forces_bonus
-			bonus = 1
-			uses = 2
-			technology = marines
-			technology = marines2
-			technology = tech_mountaineers
-			technology = tech_mountaineers2
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_doctrine_cost_reduction = {
+				name = special_forces_bonus
+				cost_reduction = 0.5
+				uses = 2
+				category = cat_marines_doctrine
+			}
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 0.5
+				uses = 2
+				category = marine_tech
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 1.0
+				uses = 2
+				category = marine_tech
+			}
 		}
 	}
 	search_filters = { FOCUS_FILTER_RESEARCH }
diff --git a/common/national_focus/TBK.txt b/common/national_focus/TBK.txt
index 20a34440c65..21742966250 100644
--- a/common/national_focus/TBK.txt
+++ b/common/national_focus/TBK.txt
@@ -5320,8 +5320,21 @@ shared_focus = {
     }
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus TBK_vasile_gun_industry"
-		custom_effect_tooltip = available_designer
-		show_ideas_tooltip = TBK_criminal_tradat_concern
+		if = {
+            limit = {
+                has_dlc = "Arms Against Tyranny"
+            }    
+            custom_effect_tooltip = available_mio_tt
+            show_mio_tooltip = TBK_criminal_tradat_concern_organization
+			mio:TBK_criminal_tradat_concern_organization = {
+				add_mio_size = 1
+				add_mio_funds = 600
+			}
+        }
+        else = {
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = TBK_criminal_tradat_concern
+        }
 		add_tech_bonus = {
 			name = infantry_weapons_bonus
 			bonus = 1.0
@@ -11952,8 +11965,21 @@ shared_focus = {
     }
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus TBK_vasile_business"
-		custom_effect_tooltip = available_designer
-		show_ideas_tooltip = TBK_criminal_tradat_concern
+		if = {
+            limit = {
+                has_dlc = "Arms Against Tyranny"
+            }    
+            custom_effect_tooltip = available_mio_tt
+            show_mio_tooltip = TBK_criminal_tradat_concern_organization
+			mio:TBK_criminal_tradat_concern_organization = {
+				add_mio_size = 1
+				add_mio_funds = 600
+			}
+        }
+        else = {
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = TBK_criminal_tradat_concern
+        }
 		one_random_arms_factory = yes
 		add_to_variable = {
 			var = TBK_wallnut_focuses
@@ -14592,7 +14618,7 @@ shared_focus = {
 				}
 				set_variable = {
 					var = TBK_hazrumenian_economic_cooperation_consumer_goods_factor_var
-					value = -0.015
+					value = -0.03
 				}
 			}
 			else_if = {
@@ -14606,7 +14632,7 @@ shared_focus = {
 				}
 				set_variable = {
 					var = TBK_hazrumenian_economic_cooperation_consumer_goods_factor_var
-					value = -0.025
+					value = -0.05
 				}
 			}
 			else_if = {
@@ -14620,7 +14646,7 @@ shared_focus = {
 				}
 				set_variable = {
 					var = TBK_hazrumenian_economic_cooperation_consumer_goods_factor_var
-					value = -0.035
+					value = -0.07
 				}
 			}
 			else_if = {
@@ -14631,7 +14657,7 @@ shared_focus = {
 				}
 				set_variable = {
 					var = TBK_hazrumenian_economic_cooperation_consumer_goods_factor_var
-					value = -0.05
+					value = -0.1
 				}
 			}
 			for_each_scope_loop = {
@@ -18764,11 +18790,30 @@ shared_focus = {
     }
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus TBK_special_forces_focus"
-		add_tech_bonus = {
-			name = special_forces_bonus
-			bonus = 1.0
-			uses = 2
-			category = special_forces_tech
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_doctrine_cost_reduction = {
+				name = special_forces_bonus
+				cost_reduction = 0.50
+				uses = 2
+				category = special_forces_doctrine
+			}
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 0.50
+				uses = 2
+				category = special_forces_tech
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 1.0
+				uses = 2
+				category = special_forces_tech
+			}
 		}
 	}
 }
@@ -22670,8 +22715,21 @@ shared_focus = {
     }
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus TBK_steelsingers"
-		custom_effect_tooltip = available_designer
-		show_ideas_tooltip = TBK_zamivgazal_steelsingers
+		if = {
+            limit = {
+                has_dlc = "Arms Against Tyranny"
+            }    
+            custom_effect_tooltip = available_mio_tt
+            show_mio_tooltip = TBK_zamivgazal_steelsingers_organization
+			mio:TBK_zamivgazal_steelsingers_organization = {
+				add_mio_size = 2
+				add_mio_funds = 800
+			}
+        }
+        else = {
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = TBK_zamivgazal_steelsingers
+        }
 		743 = {
 			add_extra_state_shared_building_slots = 2
 			add_building_construction = {
@@ -22793,8 +22851,21 @@ shared_focus = {
     }
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus TBK_vehicle_production"
-		custom_effect_tooltip = available_designer
-		show_ideas_tooltip = TBK_leopard_tires
+		if = {
+            limit = {
+                has_dlc = "Arms Against Tyranny"
+            }    
+            custom_effect_tooltip = available_mio_tt
+            show_mio_tooltip = TBK_leopard_tires_organization
+			mio:TBK_leopard_tires_organization = {
+				add_mio_size = 1
+				add_mio_funds = 600
+			}
+        }
+        else = {
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = TBK_leopard_tires
+        }
 		743 = {
 			add_extra_state_shared_building_slots = 2
 			add_building_construction = {
@@ -23876,8 +23947,21 @@ shared_focus = {
     }
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus TBK_infantry_primacy"
-		custom_effect_tooltip = available_designer
-		show_ideas_tooltip = TBK_moon_rifle_corporation
+		if = {
+            limit = {
+                has_dlc = "Arms Against Tyranny"
+            }    
+            custom_effect_tooltip = available_mio_tt
+            show_mio_tooltip = TBK_moon_rifle_corporation_organization
+			mio:TBK_leopard_tires_organization = {
+				add_mio_size = 1
+				add_mio_funds = 600
+			}
+        }
+        else = {
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = TBK_moon_rifle_corporation
+        }
 		add_tech_bonus = {
 			name = infantry_weapons_bonus
 			bonus = 1.0
@@ -23902,8 +23986,21 @@ shared_focus = {
     }
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus TBK_tank_plane_desigs"
-		custom_effect_tooltip = available_designer
-		show_ideas_tooltip = TBK_royal_severyan_rd
+		if = {
+            limit = {
+                has_dlc = "Arms Against Tyranny"
+            }    
+            custom_effect_tooltip = available_mio_tt
+            show_mio_tooltip = TBK_royal_severyan_rd_organization
+			mio:TBK_leopard_tires_organization = {
+				add_mio_size = 2
+				add_mio_funds = 800
+			}
+        }
+        else = {
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = TBK_royal_severyan_rd
+        }
 		add_tech_bonus = {
 			name = armor_bonus
 			bonus = 1.0
@@ -26469,16 +26566,30 @@ shared_focus = {
 			limit = {
 				has_tech = tech_mountaineers
 			}
-			add_tech_bonus = {
-				name = special_forces_bonus
-				bonus = 1.0
-				uses = 1
-				technology = paratroopers
-				technology = paratroopers2
-				technology = marines
-				technology = marines2
-				technology = tech_mountaineers
-				technology = tech_mountaineers2
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_doctrine_cost_reduction = {
+					name = special_forces_bonus
+					cost_reduction = 0.75
+					uses = 1
+					category = special_forces_doctrine
+				}
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 0.75
+					uses = 1
+					category = special_forces_tech
+				}
+			}
+			else = {
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 1.0
+					uses = 1
+					category = special_forces_tech
+				}
 			}
 		}
 		else = {
diff --git a/common/national_focus/TRD.txt b/common/national_focus/TRD.txt
index 627e9006c4f..6fc5f36ec9a 100644
--- a/common/national_focus/TRD.txt
+++ b/common/national_focus/TRD.txt
@@ -183,12 +183,34 @@ shared_focus = {
 	}
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus TRD_motor_factories"
-		custom_effect_tooltip = available_designer
-		show_ideas_tooltip = orthos
-		custom_effect_tooltip = available_designer
-		show_ideas_tooltip = elsevier
-		custom_effect_tooltip = available_designer
-		show_ideas_tooltip = fugro
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}    
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = TRD_orthos_organization
+			mio:TRD_orthos_organization = {
+				add_mio_funds = 200
+			}
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = TRD_elsevier_organization
+			mio:TRD_elsevier_organization = {
+				add_mio_funds = 200
+			}
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = TRD_fugro_organization
+			mio:TRD_fugro_organization = {
+				add_mio_funds = 200
+			}
+		}
+		else = {
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = orthos
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = elsevier
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = fugro
+		}
 		random_owned_controlled_state = {
 			limit = {
 				free_building_slots = {
@@ -981,8 +1003,21 @@ shared_focus = {
 	}
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus TRD_artillery_construction"
-		custom_effect_tooltip = available_designer
-		show_ideas_tooltip = lionwares
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}    
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = TRD_lionwares_organization
+			mio:TRD_lionwares_organization = {
+				add_mio_size = 1
+				add_mio_funds = 500
+			}
+		}
+		else = {
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = lionwares
+		}
 		random_owned_controlled_state = {
 			limit = {
 				free_building_slots = {
@@ -1085,16 +1120,30 @@ shared_focus = {
 	}
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus TRD_special_forces_initiative"
-		add_tech_bonus = {
-			name = special_forces_bonus
-			bonus = 1.0
-			uses = 2
-			technology = paratroopers
-			technology = paratroopers2
-			technology = marines
-			technology = marines2
-			technology = tech_mountaineers
-			technology = tech_mountaineers2
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_doctrine_cost_reduction = {
+				name = special_forces_bonus
+				cost_reduction = 0.5
+				uses = 2
+				category = special_forces_doctrine
+			}
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 0.5
+				uses = 2
+				category = special_forces_tech
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 1.0
+				uses = 2
+				category = special_forces_tech
+			}
 		}
 	}
 	search_filters = { FOCUS_FILTER_RESEARCH }
@@ -3496,12 +3545,31 @@ shared_focus = {
 		}
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus TRD_expand_marine_corpse"
-			add_tech_bonus = {
-			    name = navy_bonus
-			    bonus = 1.0
-			    uses = 1
-				category = marine_tech
-		    }
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_doctrine_cost_reduction = {
+					name = special_forces_bonus
+					cost_reduction = 0.75
+					uses = 1
+					category = cat_marines_doctrine
+				}
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 0.75
+					uses = 1
+					category = marine_tech
+				}
+			}
+			else = {
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 1.0
+					uses = 1
+					category = marine_tech
+				}
+			}
 		}
 		search_filters = { FOCUS_FILTER_RESEARCH }
 	}
@@ -3948,11 +4016,30 @@ shared_focus = {
 	}
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus TRD_paratroopers_f"
-		add_tech_bonus = {
-			name = special_forces_bonus
-			bonus = 3.0
-			uses = 1
-			category = para_tech
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_doctrine_cost_reduction = {
+				name = special_forces_bonus
+				cost_reduction = 0.80
+				uses = 1
+				category = cat_paratroopers_doctrine
+			}
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 1.0
+				uses = 1
+				category = para_tech
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 3.0
+				uses = 1
+				category = para_tech
+			}
 		}
 	}
 	search_filters = { FOCUS_FILTER_RESEARCH }
@@ -4169,6 +4256,16 @@ shared_focus = {
 				producer = CHN
 			}
 		}
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_equipment_subsidy = {
+				cic = 500
+				equipment_type = small_plane_airframe
+				seller_tags = { CHN CCN OLE PLB }
+			}
+		}
 	}
 }
 
@@ -5357,16 +5454,30 @@ shared_focus = {
 	}
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus TRD_special_forces_f"
-		add_tech_bonus = {
-			name = special_forces_bonus
-			bonus = 1.0
-			uses = 2
-			technology = paratroopers
-			technology = paratroopers2
-			technology = marines
-			technology = marines2
-			technology = tech_mountaineers
-			technology = tech_mountaineers2
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_doctrine_cost_reduction = {
+				name = special_forces_bonus
+				cost_reduction = 0.5
+				uses = 2
+				category = special_forces_doctrine
+			}
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 0.5
+				uses = 2
+				category = special_forces_tech
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 1.0
+				uses = 2
+				category = special_forces_tech
+			}
 		}
 	}
 	search_filters = { FOCUS_FILTER_RESEARCH }
@@ -7762,11 +7873,30 @@ shared_focus = {
 		}
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus TRD_peoples_marines"
-			add_tech_bonus = {
-				name = navy_bonus
-				bonus = 1.0
-				uses = 1
-				category = marine_tech
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_doctrine_cost_reduction = {
+					name = special_forces_bonus
+					cost_reduction = 0.75
+					uses = 1
+					category = cat_marines_doctrine
+				}
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 0.75
+					uses = 1
+					category = marine_tech
+				}
+			}
+			else = {
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 1.0
+					uses = 1
+					category = marine_tech
+				}
 			}
 		}
 		search_filters = { FOCUS_FILTER_RESEARCH }
@@ -8003,8 +8133,21 @@ shared_focus = {
 	}
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus TRD_abbelio_contract"
-		custom_effect_tooltip = available_designer
-		show_ideas_tooltip = abellio
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}    
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = TRD_abellio_organization
+			mio:TRD_abellio_organization = {
+				add_mio_size = 1
+				add_mio_funds = 600
+			}
+		}
+		else = {
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = abellio
+		}
 	}
 }
 
@@ -8024,8 +8167,21 @@ shared_focus = {
 	}
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus TRD_transavia_contract"
-		custom_effect_tooltip = available_designer
-		show_ideas_tooltip = transavia
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}    
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = TRD_transavia_organization
+			mio:TRD_transavia_organization = {
+				add_mio_size = 1
+				add_mio_funds = 600
+			}
+		}
+		else = {
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = transavia
+		}
 	}
 }
 
@@ -8045,8 +8201,21 @@ shared_focus = {
 	}
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus TRD_martinair_contract"
-		custom_effect_tooltip = available_designer
-		show_ideas_tooltip = martinair
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}    
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = TRD_martinair_organization
+			mio:TRD_martinair_organization = {
+				add_mio_size = 1
+				add_mio_funds = 600
+			}
+		}
+		else = {
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = martinair
+		}
 	}
 }
 
@@ -12246,11 +12415,30 @@ shared_focus = {
 		}
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus TRD_peoples_marines_fash"
-			add_tech_bonus = {
-				name = navy_bonus
-				bonus = 1.0
-				uses = 1
-				category = marine_tech
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_doctrine_cost_reduction = {
+					name = special_forces_bonus
+					cost_reduction = 0.75
+					uses = 1
+					category = cat_marines_doctrine
+				}
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 0.75
+					uses = 1
+					category = marine_tech
+				}
+			}
+			else = {
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 1.0
+					uses = 1
+					category = marine_tech
+				}
 			}
 		}
 		search_filters = { FOCUS_FILTER_RESEARCH }
@@ -12486,8 +12674,21 @@ shared_focus = {
 	}
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus TRD_contract_1"
-		custom_effect_tooltip = available_designer
-		show_ideas_tooltip = alpha_TRD
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}    
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = TRD_alpha_TRD_organization
+			mio:TRD_alpha_TRD_organization = {
+				add_mio_size = 1
+				add_mio_funds = 600
+			}
+		}
+		else = {
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = alpha_TRD
+		}
 	}
 }
 
@@ -12507,8 +12708,21 @@ shared_focus = {
 	}
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus TRD_contract_2"
-		custom_effect_tooltip = available_designer
-		show_ideas_tooltip = beta_TRD
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}    
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = TRD_beta_TRD_organization
+			mio:TRD_beta_TRD_organization = {
+				add_mio_size = 1
+				add_mio_funds = 600
+			}
+		}
+		else = {
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = beta_TRD
+		}
 	}
 }
 
@@ -12528,8 +12742,21 @@ shared_focus = {
 	}
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus TRD_contract_3"
-		custom_effect_tooltip = available_designer
-		show_ideas_tooltip = gamma_TRD
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}    
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = TRD_gamma_TRD_organization
+			mio:TRD_gamma_TRD_organization = {
+				add_mio_size = 1
+				add_mio_funds = 600
+			}
+		}
+		else = {
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = gamma_TRD
+		}
 	}
 }
 
diff --git a/common/national_focus/TRO.txt b/common/national_focus/TRO.txt
index 72002113735..2228d17984e 100644
--- a/common/national_focus/TRO.txt
+++ b/common/national_focus/TRO.txt
@@ -363,6 +363,31 @@ shared_focus = {
 				value = 5
 			}
 		}
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_equipment_subsidy = {
+				cic = 250
+				equipment_type = infantry_equipment
+				seller_tags = { EQC WNG JES ARA FAL SIC MIT CYA FRN }
+			}
+			add_equipment_subsidy = {
+				cic = 250
+				equipment_type = support_equipment
+				seller_tags = { EQC WNG JES ARA FAL SIC MIT CYA FRN }
+			}
+			add_equipment_subsidy = {
+				cic = 250
+				equipment_type = motorized_equipment
+				seller_tags = { EQC WNG JES ARA FAL SIC MIT CYA FRN }
+			}
+			add_equipment_subsidy = {
+				cic = 250
+				equipment_type = artillery_equipment
+				seller_tags = { EQC WNG JES ARA FAL SIC MIT CYA FRN }
+			}
+		}
 	}
 	search_filters = { 
 	    FOCUS_FILTER_ARMY_BONUS
@@ -3801,7 +3826,7 @@ shared_focus = {
 						engine_type_slot = engine_4_1x
 						special_type_slot_1 = lmg_defense_turret
 					}
-					icon = "GFX_TRO_CAS3_medium"
+					icon = "GFX_MEX_CAS3_medium"
 				}
 				add_equipment_to_stockpile = {
 					type = small_plane_cas_airframe_3
@@ -3824,7 +3849,7 @@ shared_focus = {
 						engine_type_slot = engine_3_1x
 						special_type_slot_1 = lmg_defense_turret
 					}
-					icon = "GFX_TRO_CAS2_medium"
+					icon = "GFX_MEX_CAS2_medium"
 				}
 				add_equipment_to_stockpile = {
 					type = small_plane_cas_airframe_2
@@ -3842,7 +3867,7 @@ shared_focus = {
 							engine_type_slot = engine_2_1x
 							special_type_slot_1 = lmg_defense_turret
 						}
-						icon = "GFX_TRO_CAS1_medium"
+						icon = "GFX_MEX_CAS1_medium"
 					}
 					add_equipment_to_stockpile = {
 						type = small_plane_cas_airframe_1
@@ -3929,7 +3954,7 @@ shared_focus = {
 						engine_type_slot = engine_4_3x
 						special_type_slot_1 = lmg_defense_turret
 					}
-					icon = "GFX_TRO_tactical_bomber3_medium"
+					icon = "GFX_MEX_tactical_bomber3_medium"
 				}
 				add_equipment_to_stockpile = {
 					type = medium_plane_airframe_3
@@ -3952,7 +3977,7 @@ shared_focus = {
 						engine_type_slot = engine_3_3x
 						special_type_slot_1 = lmg_defense_turret
 					}
-					icon = "GFX_TRO_tactical_bomber2_medium"
+					icon = "GFX_MEX_tactical_bomber2_medium"
 				}
 				add_equipment_to_stockpile = {
 					type = medium_plane_airframe_2
@@ -3974,7 +3999,7 @@ shared_focus = {
 						engine_type_slot = engine_2_3x
 						special_type_slot_1 = lmg_defense_turret
 					}
-					icon = "GFX_TRO_tactical_bomber1_medium"
+					icon = "GFX_MEX_tactical_bomber1_medium"
 				}
 				add_equipment_to_stockpile = {
 					type = medium_plane_airframe_1
@@ -3992,7 +4017,7 @@ shared_focus = {
 							engine_type_slot = engine_1_3x
 							special_type_slot_1 = lmg_defense_turret
 						}
-						icon = "GFX_TRO_early_bomber_medium"
+						icon = "GFX_MEX_early_bomber_medium"
 					}
 					add_equipment_to_stockpile = {
 						type = medium_plane_airframe_0
@@ -4054,11 +4079,30 @@ shared_focus = {
 		set_temp_variable = { temp_sf_attack = 0.10 }
 		set_temp_variable = { temp_conscription = 0.005 }
 		TRO_modify_army_of_the_republic = yes
-		add_tech_bonus = {
-			name = special_forces_bonus
-			bonus = 1.0
-			uses = 1
-			category = special_forces_tech
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_doctrine_cost_reduction = {
+				name = special_forces_bonus
+				cost_reduction = 0.75
+				uses = 1
+				category = special_forces_doctrine
+			}
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 0.75
+				uses = 1
+				category = special_forces_tech
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 1.0
+				uses = 1
+				category = special_forces_tech
+			}
 		}
 		add_tech_bonus = {
 			name = infantry_bonus
@@ -4128,11 +4172,30 @@ shared_focus = {
 		set_temp_variable = { temp_training_time_factor = 0.10 }
 		TRO_modify_army_of_the_republic = yes
 		army_experience = 50
-		add_tech_bonus = {
-			name = special_forces_bonus
-			bonus = 3.0
-			uses = 1
-			category = special_forces_tech
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_doctrine_cost_reduction = {
+				name = special_forces_bonus
+				cost_reduction = 0.80
+				uses = 1
+				category = special_forces_doctrine
+			}
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 1.0
+				uses = 1
+				category = special_forces_tech
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 3.0
+				uses = 1
+				category = special_forces_tech
+			}
 		}
 		hidden_effect = {
 		    add_to_variable = { 
@@ -4324,7 +4387,7 @@ shared_focus = {
 						engine_type_slot = engine_4_1x
 						special_type_slot_1 = lmg_defense_turret
 					}
-					icon = "GFX_TRO_fighter3_medium"
+					icon = "GFX_MEX_fighter3_medium"
 				}
 				add_equipment_to_stockpile = {
 					type = small_plane_airframe_3
@@ -4348,7 +4411,7 @@ shared_focus = {
 						engine_type_slot = engine_3_1x
 						special_type_slot_1 = lmg_defense_turret
 					}
-					icon = "GFX_TRO_fighter2_medium"
+					icon = "GFX_MEX_fighter2_medium"
 				}
 				add_equipment_to_stockpile = {
 					type = small_plane_airframe_2
@@ -4366,7 +4429,7 @@ shared_focus = {
 							engine_type_slot = engine_2_1x
 							special_type_slot_1 = lmg_defense_turret
 						}
-						icon = "GFX_TRO_fighter1_medium"
+						icon = "GFX_MEX_fighter1_medium"
 					}
 					add_equipment_to_stockpile = {
 						type = small_plane_airframe_1
@@ -4812,11 +4875,30 @@ shared_focus = {
 		set_temp_variable = { temp_chargers = 0.10 }
 		set_temp_variable = { temp_conscription_factor = 0.05 }
 		TRO_modify_army_of_the_republic = yes
-		add_tech_bonus = {
-			name = special_forces_bonus
-			bonus = 1.0
-			uses = 2
-			category = special_forces_tech
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_doctrine_cost_reduction = {
+				name = special_forces_bonus
+				cost_reduction = 0.50
+				uses = 2
+				category = special_forces_doctrine
+			}
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 0.50
+				uses = 2
+				category = special_forces_tech
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 1.0
+				uses = 2
+				category = special_forces_tech
+			}
 		}
 		hidden_effect = {
 		    subtract_from_variable = { 
@@ -4871,11 +4953,30 @@ shared_focus = {
 		set_temp_variable = { temp_special_forces_cap = 0.10 }
 		set_temp_variable = { temp_conscription = 0.005 }
 		TRO_modify_army_of_the_republic = yes
-		add_tech_bonus = {
-			name = special_forces_bonus
-			bonus = 1.0
-			uses = 2
-			category = special_forces_tech
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_doctrine_cost_reduction = {
+				name = special_forces_bonus
+				cost_reduction = 0.50
+				uses = 2
+				category = special_forces_doctrine
+			}
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 0.50
+				uses = 2
+				category = special_forces_tech
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 1.0
+				uses = 2
+				category = special_forces_tech
+			}
 		}
 		hidden_effect = {
 		    add_to_variable = { 
diff --git a/common/national_focus/VAN.txt b/common/national_focus/VAN.txt
index 186e982bc93..8f32eb4df97 100644
--- a/common/national_focus/VAN.txt
+++ b/common/national_focus/VAN.txt
@@ -2159,11 +2159,30 @@ shared_focus = {
 
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus VAN_Vanhoover_Constitution"
-		add_tech_bonus = {
-			name = navy_bonus
-			bonus = 1.0
-			uses = 2
-			category = marine_tech
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_doctrine_cost_reduction = {
+				name = special_forces_bonus
+				cost_reduction = 0.50
+				uses = 2
+				category = cat_marines_doctrine
+			}
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 0.50
+				uses = 2
+				category = marine_tech
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 1.0
+				uses = 2
+				category = marine_tech
+			}
 		}
 		add_equipment_to_stockpile = {
 			type = infantry_equipment
@@ -3181,11 +3200,30 @@ shared_focus = {
 
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus VAN_Com_Kommando_Squads"
-		add_tech_bonus = {
-			name = special_forces_bonus
-			bonus = 1.0
-			uses = 2
-			category = special_forces_tech
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_doctrine_cost_reduction = {
+				name = special_forces_bonus
+				cost_reduction = 0.50
+				uses = 2
+				category = special_forces_doctrine
+			}
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 0.50
+				uses = 2
+				category = special_forces_tech
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 1.0
+				uses = 2
+				category = special_forces_tech
+			}
 		}
 	}
 }
diff --git a/common/national_focus/VED.txt b/common/national_focus/VED.txt
index b32bfe74b01..2d913559679 100644
--- a/common/national_focus/VED.txt
+++ b/common/national_focus/VED.txt
@@ -4434,7 +4434,31 @@ shared_focus = {
 	}
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus VED_Spec_Ops"
-		add_tech_bonus = { name = special_bonus bonus = 3 uses = 1 category = special_forces_tech }
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_doctrine_cost_reduction = {
+				name = special_forces_bonus
+				cost_reduction = 0.80
+				uses = 1
+				category = special_forces_doctrine
+			}
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 1.0
+				uses = 1
+				category = special_forces_tech
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 3.0
+				uses = 1
+				category = special_forces_tech
+			}
+		}
 	}
 	search_filters = { FOCUS_FILTER_RESEARCH }
 }
diff --git a/common/national_focus/WIN.txt b/common/national_focus/WIN.txt
index 9a7810d393d..b7003438bf1 100644
--- a/common/national_focus/WIN.txt
+++ b/common/national_focus/WIN.txt
@@ -261,6 +261,16 @@ shared_focus = {
 			amount = 900
 			producer = CTH 
 		}
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_equipment_subsidy = {
+				cic = 500
+				equipment_type = support_equipment
+				seller_tags = { HIP CTH ZUM WAR BAT TBK ZAR CGI MCW }
+			}
+		}
 		hidden_effect = {
 		    subtract_from_variable = { 
 			   var = WIN_WNG_influence 
@@ -326,6 +336,16 @@ shared_focus = {
 			amount = 3000 
 			producer = WNG 
 		}
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_equipment_subsidy = {
+				cic = 500
+				equipment_type = infantry_equipment
+				seller_tags = { EQC WNG TAL JES ARA FAL SIC MIT CYA FRN }
+			}
+		}
 		hidden_effect = {
 		    add_to_variable = { 
 			   var = WIN_WNG_influence 
@@ -398,6 +418,21 @@ shared_focus = {
 			amount = 750 
 			producer = WNG 
 		}
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_equipment_subsidy = {
+				cic = 250
+				equipment_type = artillery_equipment
+				seller_tags = { EQC WNG TAL JES ARA FAL SIC MIT CYA FRN }
+			}
+			add_equipment_subsidy = {
+				cic = 250
+				equipment_type = artillery_equipment
+				seller_tags = { HIP CTH ZUM WAR BAT TBK ZAR CGI MCW }
+			}
+		}
 		hidden_effect = {
 		    add_to_variable = { 
 			   var = WIN_WNG_influence 
@@ -604,11 +639,30 @@ shared_focus = {
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus WIN_special_command"
 		custom_effect_tooltip = WIN_special_command_tp
-		add_tech_bonus = {
-			name = special_forces_bonus
-			bonus = 3.0
-			uses = 1
-			category = special_forces_tech
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_doctrine_cost_reduction = {
+				name = special_forces_bonus
+				cost_reduction = 0.80
+				uses = 1
+				category = special_forces_doctrine
+			}
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 1.0
+				uses = 1
+				category = special_forces_tech
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 3.0
+				uses = 1
+				category = special_forces_tech
+			}
 		}
 		hidden_effect = {
 		    load_oob = "WIN_SWAT"
@@ -871,7 +925,7 @@ shared_focus = {
 						engine_type_slot = engine_4_1x
 						special_type_slot_1 = lmg_defense_turret
 					}
-					icon = "GFX_BAT_fighter3_medium"
+					icon = "GFX_ENG_fighter3_medium"
 				}
 				add_equipment_to_stockpile = {
 					type = small_plane_airframe_3
@@ -895,7 +949,7 @@ shared_focus = {
 						engine_type_slot = engine_3_1x
 						special_type_slot_1 = lmg_defense_turret
 					}
-					icon = "GFX_BAT_fighter2_medium"
+					icon = "GFX_ENG_fighter2_medium"
 				}
 				add_equipment_to_stockpile = {
 					type = small_plane_airframe_2
@@ -913,7 +967,7 @@ shared_focus = {
 							engine_type_slot = engine_2_1x
 							special_type_slot_1 = lmg_defense_turret
 						}
-						icon = "GFX_BAT_fighter1_medium"
+						icon = "GFX_ENG_fighter1_medium"
 					}
 					add_equipment_to_stockpile = {
 						type = small_plane_airframe_1
@@ -931,6 +985,16 @@ shared_focus = {
 				}
 			}
 		}
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_equipment_subsidy = {
+				cic = 500
+				equipment_type = small_plane_airframe
+				seller_tags = { HIP CTH ZUM WAR BAT TBK ZAR CGI MCW }
+			}
+		}
 		hidden_effect = {
 		    subtract_from_variable = { 
 			   var = WIN_WNG_influence 
@@ -996,12 +1060,30 @@ shared_focus = {
 			}
 		}
 		else = {
-		    add_tech_bonus = {
-				name = paratrooper_bonus
-				bonus = 3.0
-				uses = 1
-				technology = paratroopers2
-				technology = paratroopers3
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_doctrine_cost_reduction = {
+					name = special_forces_bonus
+					cost_reduction = 0.80
+					uses = 1
+					category = cat_paratroopers_doctrine
+				}
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 1.0
+					uses = 1
+					category = para_tech
+				}
+			}
+			else = {
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 3.0
+					uses = 1
+					category = para_tech
+				}
 			}
 		}
 		hidden_effect = {
@@ -1146,6 +1228,16 @@ shared_focus = {
 				}
 			}
 		}
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_equipment_subsidy = {
+				cic = 500
+				equipment_type = medium_plane_airframe
+				seller_tags = { EQC WNG TAL JES ARA FAL SIC MIT CYA FRN }
+			}
+		}
 		hidden_effect = {
 		    add_to_variable = { 
 			   var = WIN_WNG_influence 
@@ -1964,10 +2056,30 @@ shared_focus = {
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus WIN_the_joint_marine_force"
 		custom_effect_tooltip = WIN_the_joint_marine_force_tp
-		add_tech_bonus = {
-			bonus = 3.0
-			uses = 1
-			category = marine_tech
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_doctrine_cost_reduction = {
+				name = special_forces_bonus
+				cost_reduction = 0.80
+				uses = 1
+				category = cat_marines_doctrine
+			}
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 1.0
+				uses = 1
+				category = marine_tech
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 3.0
+				uses = 1
+				category = marine_tech
+			}
 		}
 		hidden_effect = {
 		    load_oob = "WIN_joint_marine_force"
@@ -3217,7 +3329,7 @@ shared_focus = {
 						engine_type_slot = engine_4_1x
 						special_type_slot_1 = lmg_defense_turret
 					}
-					icon = "GFX_WIN_CAS3_medium"
+					icon = "GFX_USA_CAS3_medium"
 				}
 				add_equipment_to_stockpile = {
 					type = small_plane_cas_airframe_3
@@ -3240,7 +3352,7 @@ shared_focus = {
 						engine_type_slot = engine_3_1x
 						special_type_slot_1 = lmg_defense_turret
 					}
-					icon = "GFX_WIN_CAS2_medium"
+					icon = "GFX_USA_CAS2_medium"
 				}
 				add_equipment_to_stockpile = {
 					type = small_plane_cas_airframe_2
@@ -3258,7 +3370,7 @@ shared_focus = {
 							engine_type_slot = engine_2_1x
 							special_type_slot_1 = lmg_defense_turret
 						}
-						icon = "GFX_WIN_CAS1_medium"
+						icon = "GFX_USA_CAS1_medium"
 					}
 					add_equipment_to_stockpile = {
 						type = small_plane_cas_airframe_1
@@ -6046,6 +6158,16 @@ shared_focus = {
 				}
 			}
 		}
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_equipment_subsidy = {
+				cic = 500
+				equipment_type = small_plane_cas_airframe
+				seller_tags = { HIP CTH ZUM WAR BAT TBK ZAR CGI MCW }
+			}
+		}
 	}
 	search_filters = { 
 		FOCUS_FILTER_AIRFORCE_BONUS
@@ -8221,7 +8343,7 @@ shared_focus = {
 						engine_type_slot = engine_4_1x
 						special_type_slot_1 = lmg_defense_turret
 					}
-					icon = "GFX_BAT_fighter3_medium"
+					icon = "GFX_ENG_fighter3_medium"
 				}
 				add_equipment_to_stockpile = {
 					type = small_plane_airframe_3
@@ -8245,7 +8367,7 @@ shared_focus = {
 						engine_type_slot = engine_3_1x
 						special_type_slot_1 = lmg_defense_turret
 					}
-					icon = "GFX_BAT_fighter2_medium"
+					icon = "GFX_ENG_fighter2_medium"
 				}
 				add_equipment_to_stockpile = {
 					type = small_plane_airframe_2
@@ -8263,7 +8385,7 @@ shared_focus = {
 							engine_type_slot = engine_2_1x
 							special_type_slot_1 = lmg_defense_turret
 						}
-						icon = "GFX_BAT_fighter1_medium"
+						icon = "GFX_ENG_fighter1_medium"
 					}
 					add_equipment_to_stockpile = {
 						type = small_plane_airframe_1
@@ -8281,6 +8403,16 @@ shared_focus = {
 				}
 			}
 		}
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_equipment_subsidy = {
+				cic = 500
+				equipment_type = small_plane_airframe
+				seller_tags = { HIP CTH ZUM WAR BAT TBK ZAR CGI MCW }
+			}
+		}
 	}
 	search_filters = { 
 		FOCUS_FILTER_RESEARCH
@@ -8437,7 +8569,7 @@ shared_focus = {
 						engine_type_slot = engine_4_1x
 						special_type_slot_1 = lmg_defense_turret
 					}
-					icon = "GFX_BAT_CAS3_medium"
+					icon = "GFX_ENG_CAS3_medium"
 				}
 				add_equipment_to_stockpile = {
 					type = small_plane_cas_airframe_3
@@ -8460,7 +8592,7 @@ shared_focus = {
 						engine_type_slot = engine_3_1x
 						special_type_slot_1 = lmg_defense_turret
 					}
-					icon = "GFX_BAT_CAS2_medium"
+					icon = "GFX_ENG_CAS2_medium"
 				}
 				add_equipment_to_stockpile = {
 					type = small_plane_cas_airframe_2
@@ -8478,7 +8610,7 @@ shared_focus = {
 							engine_type_slot = engine_2_1x
 							special_type_slot_1 = lmg_defense_turret
 						}
-						icon = "GFX_BAT_CAS1_medium"
+						icon = "GFX_ENG_CAS1_medium"
 					}
 					add_equipment_to_stockpile = {
 						type = small_plane_cas_airframe_1
@@ -8514,6 +8646,16 @@ shared_focus = {
 				}
 			}
 		}
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_equipment_subsidy = {
+				cic = 500
+				equipment_type = small_plane_cas_airframe
+				seller_tags = { HIP CTH ZUM WAR BAT TBK ZAR CGI MCW }
+			}
+		}
 	}
 	search_filters = { 
 	    FOCUS_FILTER_AIRFORCE_BONUS 
@@ -9018,6 +9160,39 @@ shared_focus = {
 			    id = legation.75
 			}
 		}
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}    
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = WIN_mustang_2_organization
+			mio:WIN_mustang_2_organization = {
+				add_mio_size = 1
+				add_mio_funds = 300
+			}
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = WIN_dassault_2_organization
+			mio:WIN_dassault_2_organization = {
+				add_mio_size = 1
+				add_mio_funds = 300
+			}
+			1204 = {
+				add_resource = {
+					type = chromium
+					amount = 28
+				}
+				add_resource = {
+					type = tungsten
+					amount = 28
+				}
+			}
+		}
+		else = {
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = WIN_mustang_2
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = WIN_dassault_2
+		}
 	}
 	search_filters = { 
 		FOCUS_FILTER_INDUSTRY
@@ -9756,7 +9931,7 @@ shared_focus = {
 						engine_type_slot = engine_4_1x
 						special_type_slot_1 = lmg_defense_turret
 					}
-					icon = "GFX_WIN_fighter3_medium"
+					icon = "GFX_USA_fighter3_medium"
 				}
 				add_equipment_to_stockpile = {
 					type = small_plane_airframe_3
@@ -9780,7 +9955,7 @@ shared_focus = {
 						engine_type_slot = engine_3_1x
 						special_type_slot_1 = lmg_defense_turret
 					}
-					icon = "GFX_WIN_fighter2_medium"
+					icon = "GFX_USA_fighter2_medium"
 				}
 				add_equipment_to_stockpile = {
 					type = small_plane_airframe_2
@@ -9798,7 +9973,7 @@ shared_focus = {
 							engine_type_slot = engine_2_1x
 							special_type_slot_1 = lmg_defense_turret
 						}
-						icon = "GFX_WIN_fighter1_medium"
+						icon = "GFX_USA_fighter1_medium"
 					}
 					add_equipment_to_stockpile = {
 						type = small_plane_airframe_1
@@ -11078,16 +11253,65 @@ shared_focus = {
 	
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus WIN_recomepnsate_big_bussiness"
-		custom_effect_tooltip = available_designer
-		show_ideas_tooltip = WIN_crystalstar_corporation_2
-		custom_effect_tooltip = available_designer
-		show_ideas_tooltip = WIN_electric_boat_company_2
-		custom_effect_tooltip = available_designer
-		show_ideas_tooltip = WIN_bellbreeze_aircraft_corporation_2
-		custom_effect_tooltip = available_designer
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}    
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = WIN_crystalstar_corporation_2_organization
+			mio:WIN_crystalstar_corporation_2_organization = {
+				add_mio_size = 1
+				add_mio_funds = 150
+			}
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = WIN_electric_boat_company_2_organization
+			mio:WIN_electric_boat_company_2_organization = {
+				add_mio_size = 1
+				add_mio_funds = 150
+			}
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = WIN_bellbreeze_aircraft_corporation_2_organization
+			mio:WIN_bellbreeze_aircraft_corporation_2_organization = {
+				add_mio_size = 1
+				add_mio_funds = 150
+			}
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = WIN_lightstar_motor_company_2_organization
+			mio:WIN_lightstar_motor_company_2_organization = {
+				add_mio_size = 1
+				add_mio_funds = 150
+			}
+			1204 = {
+				add_resource = {
+					type = chromium
+					amount = 28
+				}
+				add_resource = {
+					type = aluminium
+					amount = 28
+				}
+				add_resource = {
+					type = oil
+					amount = 28
+				}
+				add_resource = {
+					type = tungsten
+					amount = 28
+				}
+			}
+		}
+		else = {
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = WIN_crystalstar_corporation_2
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = WIN_electric_boat_company_2
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = WIN_bellbreeze_aircraft_corporation_2
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = WIN_lightstar_motor_company_2
+		}
 		show_ideas_tooltip = WIN_shell_oil_2
 		custom_effect_tooltip = available_designer
-		show_ideas_tooltip = WIN_lightstar_motor_company_2
 	}
 	search_filters = { 
 		FOCUS_FILTER_INDUSTRY
@@ -11839,11 +12063,30 @@ shared_focus = {
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus WIN_special_forces_proliferation"
 		add_ideas = WIN_special_forces_proliferation_idea
-		add_tech_bonus = {
-			name = special_forces_bonus
-			bonus = 3.0
-			uses = 1
-			category = special_forces_tech
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_doctrine_cost_reduction = {
+				name = special_forces_bonus
+				cost_reduction = 0.80
+				uses = 1
+				category = special_forces_doctrine
+			}
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 1.0
+				uses = 1
+				category = special_forces_tech
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 3.0
+				uses = 1
+				category = special_forces_tech
+			}
 		}
 	}
 	search_filters = { 
@@ -11952,11 +12195,30 @@ shared_focus = {
 			}
 		}
 		else = {
-		    add_tech_bonus = {
-				name = paratrooper_bonus
-				bonus = 3.0
-				uses = 1
-				category = para_tech
+		    if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_doctrine_cost_reduction = {
+					name = special_forces_bonus
+					cost_reduction = 0.80
+					uses = 1
+					category = cat_paratroopers_doctrine
+				}
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 1.0
+					uses = 1
+					category = para_tech
+				}
+			}
+			else = {
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 3.0
+					uses = 1
+					category = para_tech
+				}
 			}
 		}
 		hidden_effect = {
diff --git a/common/national_focus/WIT.txt b/common/national_focus/WIT.txt
index 64c98ce5213..af0b522743a 100644
--- a/common/national_focus/WIT.txt
+++ b/common/national_focus/WIT.txt
@@ -4972,8 +4972,20 @@ shared_focus = {
 
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus WIT_lakeish_arms_contract"
-		custom_effect_tooltip = available_designer
-		show_ideas_tooltip = WIT_generic_infantry_equipment_manufacturer
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}    
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = WIT_generic_infantry_equipment_manufacturer_organization
+			mio:WIT_generic_infantry_equipment_manufacturer_organization = {
+				add_mio_funds = 400
+			}
+		}
+		else = {
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = WIT_generic_infantry_equipment_manufacturer
+		}
 		615 = {
 			add_extra_state_shared_building_slots = 2
 			add_building_construction = {
@@ -6182,6 +6194,16 @@ shared_focus = {
 		log = "[GetDateText]: [Root.GetName]: Focus WIT_import_artillery"
 		add_equipment_to_stockpile = { type = artillery_equipment amount = 150 producer = LCT }
 		add_equipment_to_stockpile = { type = artillery_equipment amount = 150 producer = RCT }
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_equipment_subsidy = {
+				cic = 500
+				equipment_type = artillery_equipment
+				seller_tags = { RCT LCT NIM BAK DEP DMT FBK WAT FIR FRE }
+			}
+		}
 		add_tech_bonus = {
 			name = artillery_bonus
 			bonus = 1.0
@@ -6353,6 +6375,16 @@ shared_focus = {
 			amount = 200 
 			producer = WNG 
 		}
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_equipment_subsidy = {
+				cic = 500
+				equipment_type = anti_tank_equipment
+				seller_tags = { EQC WNG TAL JES ARA FAL SIC MIT CYA FRN }
+			}
+		}
 		add_tech_bonus = {
 			name = generic_tech_bonus
 			bonus = 1.0
@@ -6582,11 +6614,30 @@ shared_focus = {
 				WIT_Mountaineer_Tech = 1
 			}
 		}
-		add_tech_bonus = {
-			name = generic_tech_bonus
-			bonus = 1.0
-			uses = 2
-			category = mountaineers_tech
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_doctrine_cost_reduction = {
+				name = special_forces_bonus
+				cost_reduction = 0.50
+				uses = 2
+				category = cat_mountaineers_doctrine
+			}
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 0.50
+				uses = 2
+				category = mountaineers_tech
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 1.0
+				uses = 2
+				category = mountaineers_tech
+			}
 		}
 	}
 	search_filters = { FOCUS_FILTER_RESEARCH }
diff --git a/common/national_focus/WNG.txt b/common/national_focus/WNG.txt
index 216f7e90298..cd1d060b1dd 100644
--- a/common/national_focus/WNG.txt
+++ b/common/national_focus/WNG.txt
@@ -3468,37 +3468,60 @@ focus_tree = {
 		completion_reward = {
 			if = {
 				limit = {
-					has_idea = WNG_fwan
+					has_dlc = "Arms Against Tyranny"
 				}
-				swap_ideas = {
-					remove_idea = WNG_fwan
-					add_idea = WNG_fwan_2
+				mio:WNG_fwan_organization = {
+					add_mio_funds = 400
+					add_mio_research_bonus = 0.05
+					add_mio_design_team_change_cost = -0.5
 				}
-			}
-			custom_effect_tooltip = WNG_upgrade_fwan_tt
-			if = {
-				limit = {
-					has_idea = WNG_fwan
+				mio:WNG_beaketta_organization = {
+					add_mio_funds = 400
+					add_mio_research_bonus = 0.05
+					add_mio_design_team_change_cost = -0.5
 				}
-				swap_ideas = {
-					remove_idea = WNG_beaketta
-					add_idea = WNG_beaketta_2
+				mio:WNG_accipitri_organization = {
+					add_mio_funds = 400
+					add_mio_research_bonus = 0.05
+					add_mio_design_team_change_cost = -0.5
 				}
 			}
-			custom_effect_tooltip = WNG_upgrade_beaketta_tt
-			if = {
-				limit = {
-					has_idea = WNG_fwan
+			else = {
+				if = {
+					limit = {
+						has_idea = WNG_fwan
+					}
+					swap_ideas = {
+						remove_idea = WNG_fwan
+						add_idea = WNG_fwan_2
+					}
 				}
-				swap_ideas = {
-					remove_idea = WNG_accipitri
-					add_idea = WNG_accipitri_2
+				custom_effect_tooltip = WNG_upgrade_fwan_tt
+				if = {
+					limit = {
+						has_idea = WNG_beaketta
+					}
+					swap_ideas = {
+						remove_idea = WNG_beaketta
+						add_idea = WNG_beaketta_2
+					}
+				}
+				custom_effect_tooltip = WNG_upgrade_beaketta_tt
+				if = {
+					limit = {
+						has_idea = WNG_accipitri
+					}
+					swap_ideas = {
+						remove_idea = WNG_accipitri
+						add_idea = WNG_accipitri_2
+					}
 				}
+				custom_effect_tooltip = WNG_upgrade_accipitri_tt
 			}
-			custom_effect_tooltip = WNG_upgrade_accipitri_tt
+
 			if = {
 				limit = {
-					has_idea = WNG_fwan
+					has_idea = WNG_talonieli
 				}
 				swap_ideas = {
 					remove_idea = WNG_talonieli
@@ -5206,7 +5229,7 @@ focus_tree = {
 					FAL = {
 						OR = {
 							is_subject_of = TAL
-							is_subject_of = FRA
+							is_subject_of = FRN
 							is_subject_of = ARA
 						}
 					}
@@ -6434,7 +6457,7 @@ offset = {
 					FAL = {
 						OR = {
 							is_subject_of = TAL
-							is_subject_of = FRA
+							is_subject_of = FRN
 							is_subject_of = ARA
 						}
 					}
@@ -6516,7 +6539,7 @@ offset = {
 			modifier = {
 				factor = 0
 				FRN = { exists = yes }
-				NOT = { 
+				OR = { 
 					is_in_faction_with = FRN 
 					FRN = { is_subject_of = WNG }
 				}
@@ -6816,14 +6839,14 @@ offset = {
 				strength_ratio = { tag = ARA ratio > 1.5 }
 				factor = 2
 			}
-			modifier = {
-				factor = 0
-				ARA = { exists = yes }
-				NOT = { 
-					is_in_faction_with = ARA 
-					ARA = { is_subject_of = WNG }
-				}
-			}
+			#modifier = {
+			#	factor = 0
+			#	ARA = { exists = yes }
+			#	NOT = { 
+			#		is_in_faction_with = ARA 
+			#		ARA = { is_subject_of = WNG }
+			#	}
+			#}
 			modifier = {
 				factor = 0
 				surrender_progress > 0.1
@@ -6885,14 +6908,14 @@ offset = {
 				strength_ratio = { tag = FRN ratio > 1.5 }
 				factor = 2
 			}
-			modifier = {
-				factor = 0
-				FRN = { exists = yes }
-				NOT = { 
-					is_in_faction_with = FRN 
-					FRN = { is_subject_of = WNG }
-				}
-			}
+			#modifier = {
+			#	factor = 0
+			#	FRN = { exists = yes }
+			#	NOT = { 
+			#		is_in_faction_with = FRN 
+			#		FRN = { is_subject_of = WNG }
+			#	}
+			#}
 			modifier = {
 				factor = 0
 				surrender_progress > 0.1
@@ -6954,14 +6977,14 @@ offset = {
 				strength_ratio = { tag = TAL ratio > 1.5 }
 				factor = 2
 			}
-			modifier = {
-				factor = 0
-				TAL = { exists = yes }
-				NOT = { 
-					is_in_faction_with = TAL 
-					TAL = { is_subject_of = WNG }
-				}
-			}
+			#modifier = {
+			#	factor = 0
+			#	TAL = { exists = yes }
+			#	NOT = { 
+			#		is_in_faction_with = TAL 
+			#		TAL = { is_subject_of = WNG }
+			#	}
+			#}
 			modifier = {
 				factor = 0
 				surrender_progress > 0.1
@@ -10084,11 +10107,30 @@ offset = {
 
 		completion_reward = {
 			log = "[GetDateText]: [Root.GetName]: Focus WNG_fanteria_marina"
-			add_tech_bonus = {
-				name = WNG_fanteria_marina_bonus
-				bonus = 1.0
-				uses = 1
-				category = marine_tech
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_doctrine_cost_reduction = {
+					name = special_forces_bonus
+					cost_reduction = 0.75
+					uses = 1
+					category = cat_marines_doctrine
+				}
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 0.75
+					uses = 1
+					category = marine_tech
+				}
+			}
+			else = {
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 1.0
+					uses = 1
+					category = marine_tech
+				}
 			}
 			add_tech_bonus = {
 				name = WNG_fanteria_marina_bonus
@@ -11447,12 +11489,32 @@ offset = {
 
 		completion_reward = {
 			log = "[GetDateText]: [Root.GetName]: Focus WNG_alati"
-			add_tech_bonus = {
-				name = WNG_blackclaw_rangers
-				bonus = 1.0
-				uses = 2
-				category = special_forces_tech
-				category = recon_tech
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_doctrine_cost_reduction = {
+					name = special_forces_bonus
+					cost_reduction = 0.50
+					uses = 1
+					category = special_forces_doctrine
+				}
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 0.75
+					uses = 2
+					category = special_forces_tech
+					category = recon_tech
+				}
+			}
+			else = {
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 1.0
+					uses = 2
+					category = special_forces_tech
+					category = recon_tech
+				}
 			}
 		}
 		search_filters = { FOCUS_FILTER_RESEARCH }
@@ -11486,11 +11548,30 @@ offset = {
 
 		completion_reward = {
 			log = "[GetDateText]: [Root.GetName]: Focus WNG_alpini"
-			add_tech_bonus = {
-				name = WNG_alpini
-				bonus = 1.0
-				uses = 2
-				category = mountaineers_tech
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_doctrine_cost_reduction = {
+					name = special_forces_bonus
+					cost_reduction = 0.50
+					uses = 2
+					category = cat_mountaineers_doctrine
+				}
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 0.50
+					uses = 2
+					category = mountaineers_tech
+				}
+			}
+			else = {
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 1.0
+					uses = 2
+					category = mountaineers_tech
+				}
 			}
 		}
 		search_filters = { FOCUS_FILTER_RESEARCH }
@@ -11524,11 +11605,30 @@ offset = {
 
 		completion_reward = {
 			log = "[GetDateText]: [Root.GetName]: Focus WNG_paracadutisti"
-			add_tech_bonus = {
-				name = WNG_paracadutisti
-				bonus = 1.0
-				uses = 2
-				category = para_tech
+				if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_doctrine_cost_reduction = {
+					name = special_forces_bonus
+					cost_reduction = 0.50
+					uses = 2
+					category = cat_paratroopers_doctrine
+				}
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 0.50
+					uses = 2
+					category = para_tech
+				}
+			}
+			else = {
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 1.0
+					uses = 2
+					category = para_tech
+				}
 			}
 		}
 		search_filters = { FOCUS_FILTER_RESEARCH }
diff --git a/common/national_focus/YAK.txt b/common/national_focus/YAK.txt
index 4680969d3e8..0a5017d9b1f 100644
--- a/common/national_focus/YAK.txt
+++ b/common/national_focus/YAK.txt
@@ -1851,11 +1851,30 @@ shared_focus = {
 				category = electronics
 			}
 			event_target:equestria = {
-				add_tech_bonus = {
-					name = special_bonus
-					bonus = 1.0
-					uses = 2
-					category = mountaineers_tech
+				if = {
+					limit = {
+						has_dlc = "Arms Against Tyranny"
+					}
+					add_doctrine_cost_reduction = {
+						name = special_forces_bonus
+						cost_reduction = 0.50
+						uses = 2
+						category = cat_mountaineers_doctrine
+					}
+					add_tech_bonus = {
+						name = special_forces_bonus
+						bonus = 0.50
+						uses = 2
+						category = mountaineers_tech
+					}
+				}
+				else = {
+					add_tech_bonus = {
+						name = special_forces_bonus
+						bonus = 1.0
+						uses = 2
+						category = mountaineers_tech
+					}
 				}
 			}
 		}
@@ -5964,11 +5983,30 @@ shared_focus = {
 
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus YAK_mountains"
-		add_tech_bonus = {
-			name = special_bonus
-			bonus = 1.0
-			uses = 2
-			category = mountaineers_tech
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_doctrine_cost_reduction = {
+				name = special_forces_bonus
+				cost_reduction = 0.50
+				uses = 2
+				category = cat_mountaineers_doctrine
+			}
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 0.50
+				uses = 2
+				category = mountaineers_tech
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 1.0
+				uses = 2
+				category = mountaineers_tech
+			}
 		}
 	}
 	search_filters = { FOCUS_FILTER_RESEARCH }
@@ -6051,11 +6089,30 @@ shared_focus = {
 
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus YAK_para_troopers"
-		add_tech_bonus = {
-			name = special_bonus
-			bonus = 1.0
-			uses = 1
-			category = para_tech
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_doctrine_cost_reduction = {
+				name = special_forces_bonus
+				cost_reduction = 0.75
+				uses = 1
+				category = cat_paratroopers_doctrine
+			}
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 0.75
+				uses = 1
+				category = para_tech
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 1.0
+				uses = 1
+				category = para_tech
+			}
 		}
 	}
 	search_filters = { FOCUS_FILTER_RESEARCH }
diff --git a/common/national_focus/YAL.txt b/common/national_focus/YAL.txt
index 69048135274..2235a4cd04d 100644
--- a/common/national_focus/YAL.txt
+++ b/common/national_focus/YAL.txt
@@ -13853,11 +13853,30 @@ shared_focus = {
 	}
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus YAL_marine_f"
-		add_tech_bonus = {
-			name = navy_bonus
-			bonus = 1.0
-			uses = 1
-			category = marine_tech
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_doctrine_cost_reduction = {
+				name = special_forces_bonus
+				cost_reduction = 0.75
+				uses = 1
+				category = cat_marines_doctrine
+			}
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 0.75
+				uses = 1
+				category = marine_tech
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 1.0
+				uses = 1
+				category = marine_tech
+			}
 		}
 	}
 	search_filters = { FOCUS_FILTER_RESEARCH }
@@ -14297,11 +14316,30 @@ shared_focus = {
 	}
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus YAL_paratrooper_project"
-		add_tech_bonus = {
-			name = paratrooper_bonus
-			bonus = 1.0
-			uses = 2
-			category = para_tech
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_doctrine_cost_reduction = {
+				name = special_forces_bonus
+				cost_reduction = 0.50
+				uses = 2
+				category = cat_paratroopers_doctrine
+			}
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 0.50
+				uses = 2
+				category = para_tech
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 1.0
+				uses = 2
+				category = para_tech
+			}
 		}
 	}
 	search_filters = { FOCUS_FILTER_RESEARCH }
diff --git a/common/national_focus/ZAR_shared.txt b/common/national_focus/ZAR_shared.txt
index 0ad1897825b..f119d9a5dea 100644
--- a/common/national_focus/ZAR_shared.txt
+++ b/common/national_focus/ZAR_shared.txt
@@ -948,6 +948,20 @@ focus_tree = {
 				type = infantry_equipment
 				amount = 500
 			}			
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}    
+				custom_effect_tooltip = available_mio_tt
+				show_mio_tooltip = ZAR_tribe_armory_organization
+				mio:ZAR_tribe_armory_organization = {
+					add_mio_funds = 250
+				}
+			}
+			else = {
+				custom_effect_tooltip = available_designer
+				show_ideas_tooltip = ZAR_tribe_armory
+			}
 		}
 	}
 	shared_focus = {
@@ -1228,6 +1242,20 @@ focus_tree = {
 				category = artillery
 				name = artillery_bonus
 			}
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}    
+				custom_effect_tooltip = available_mio_tt
+				show_mio_tooltip = ZAR_royal_armory_organization
+				mio:ZAR_tribe_armory_organization = {
+					add_mio_funds = 400
+				}
+			}
+			else = {
+				custom_effect_tooltip = available_designer
+				show_ideas_tooltip = ZAR_royal_armory
+			}
 		}
 	}
 	shared_focus = {
diff --git a/common/national_focus/ZES.txt b/common/national_focus/ZES.txt
index af2d1318992..fa094e96e60 100644
--- a/common/national_focus/ZES.txt
+++ b/common/national_focus/ZES.txt
@@ -4928,8 +4928,21 @@ shared_focus = {
 	}
 	completion_reward = {
 		log = "[Get.Date.Text]: [Root.GetName]: Focus ZES_airline_production"
-		custom_effect_tooltip = available_designer
-		show_ideas_tooltip = ZES_pasarinha_airline
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}    
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = ZES_pasarinha_airline_organization
+			mio:ZES_pasarinha_airline_organization = {
+				add_mio_size = 1
+				add_mio_funds = 600
+			}
+		}
+		else = {
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = ZES_pasarinha_airline
+		}
 		413 = {
 			add_extra_state_shared_building_slots = 1
 			add_building_construction = {
@@ -4982,8 +4995,21 @@ shared_focus = {
 	}
 	completion_reward = {
 		log = "[Get.Date.Text]: [Root.GetName]: Focus ZES_car_production"
-		custom_effect_tooltip = available_designer
-		show_ideas_tooltip = ZES_pasarinha_automobile
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}    
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = ZES_pasarinha_automobile_organization
+			mio:ZES_pasarinha_automobile_organization = {
+				add_mio_size = 1
+				add_mio_funds = 600
+			}
+		}
+		else = {
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = ZES_pasarinha_automobile
+		}
 		413 = {
 			add_extra_state_shared_building_slots = 1
 			add_building_construction = {
@@ -7370,6 +7396,16 @@ shared_focus = {
 			amount = 2500 
 			producer = SIC 
 		}
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_equipment_subsidy = {
+				cic = 500
+				equipment_type = artillery_equipment
+				seller_tags = { EQC WNG TAL JES ARA FAL SIC MIT CYA  }
+			}
+		}
 		hidden_effect = {
 			country_event = { id = altukasa.22 }
 		}
@@ -10749,11 +10785,30 @@ shared_focus = {
 				limit = {
 					has_tech = tech_mountaineers
 				}
-				add_tech_bonus = {
-					name = special_forces_bonus
-					bonus = 1.0
-					uses = 1
-					category = mountaineers_tech
+				if = {
+					limit = {
+						has_dlc = "Arms Against Tyranny"
+					}
+					add_doctrine_cost_reduction = {
+						name = special_forces_bonus
+						cost_reduction = 0.75
+						uses = 1
+						category = cat_mountaineers_doctrine
+					}
+					add_tech_bonus = {
+						name = special_forces_bonus
+						bonus = 0.75
+						uses = 1
+						category = mountaineers_tech
+					}
+				}
+				else = {
+					add_tech_bonus = {
+						name = special_forces_bonus
+						bonus = 1.0
+						uses = 1
+						category = mountaineers_tech
+					}
 				}
 				custom_effect_tooltip = ZES_mobile_def_force_tp
 				hidden_effect = {
@@ -11011,11 +11066,30 @@ shared_focus = {
 			set_technology = { popup = no HLQ_hill_warfare = 1 }
 		}
 		custom_effect_tooltip = HLQ_hill_training_tp
-		add_tech_bonus = {
-			name = special_forces_bonus
-			bonus = 1.0
-			uses = 1
-			category = mountaineers_tech
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_doctrine_cost_reduction = {
+				name = special_forces_bonus
+				cost_reduction = 0.75
+				uses = 1
+				category = cat_mountaineers_doctrine
+			}
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 0.75
+				uses = 1
+				category = mountaineers_tech
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 1.0
+				uses = 1
+				category = mountaineers_tech
+			}
 		}
 	}
 	search_filters = { FOCUS_FILTER_RESEARCH }
@@ -11197,11 +11271,30 @@ shared_focus = {
 				limit = {
 					has_tech = tech_mountaineers
 				}
-				add_tech_bonus = {
-					name = special_forces_bonus
-					bonus = 1.0
-					uses = 1
-					category = mountaineers_tech
+				if = {
+					limit = {
+						has_dlc = "Arms Against Tyranny"
+					}
+					add_doctrine_cost_reduction = {
+						name = special_forces_bonus
+						cost_reduction = 0.75
+						uses = 1
+						category = cat_mountaineers_doctrine
+					}
+					add_tech_bonus = {
+						name = special_forces_bonus
+						bonus = 0.75
+						uses = 1
+						category = mountaineers_tech
+					}
+				}
+				else = {
+					add_tech_bonus = {
+						name = special_forces_bonus
+						bonus = 1.0
+						uses = 1
+						category = mountaineers_tech
+					}
 				}
 				hidden_effect = {
 					load_oob = "ZES_mobile_def_force_2"
@@ -12379,11 +12472,30 @@ shared_focus = {
 		log = "[GetDateText]: [Root.GetName]: Focus ZES_navy_marines_1"
 		if = {
 			limit = { has_tech = marines }
-			add_tech_bonus = {
-				name = marine_bonus
-				bonus = 1.0
-				uses = 1
-				category = marine_tech
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_doctrine_cost_reduction = {
+					name = special_forces_bonus
+					cost_reduction = 0.75
+					uses = 1
+					category = cat_marines_doctrine
+				}
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 0.75
+					uses = 1
+					category = marine_tech
+				}
+			}
+			else = {
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 1.0
+					uses = 1
+					category = marine_tech
+				}
 			}
 			custom_effect_tooltip = ZES_marines_tp
 			hidden_effect = {
@@ -12419,11 +12531,30 @@ shared_focus = {
 
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus ZES_navy_marines_2"
-		add_tech_bonus = {
-			name = marine_bonus
-			bonus = 1.0
-			uses = 1
-			category = marine_tech
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_doctrine_cost_reduction = {
+				name = special_forces_bonus
+				cost_reduction = 0.75
+				uses = 1
+				category = cat_marines_doctrine
+			}
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 0.75
+				uses = 1
+				category = marine_tech
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 1.0
+				uses = 1
+				category = marine_tech
+			}
 		}
 		add_tech_bonus = {
 			name = marine_bonus
@@ -12713,7 +12844,21 @@ shared_focus = {
 				category = ss_tech
 			}
 		}
-		custom_effect_tooltip = ZES_unlock_chief
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}    
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = ZES_ti_doctrin_manuf_organization
+			mio:ZES_ti_doctrin_manuf_organization = {
+				add_mio_size = 1
+				add_mio_funds = 600
+			}
+		}
+		else = {
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = ZES_ti_doctrin_manuf
+		}
 	}
 	search_filters = { FOCUS_FILTER_RESEARCH }
 }
@@ -13110,11 +13255,30 @@ shared_focus = {
 
 	completion_reward = {
 		log = "[GetDateText]: [Root.GetName]: Focus ZES_air_8"
-		add_tech_bonus = {
-			name = special_forces_bonus
-			bonus = 3.0
-			uses = 1
-			category = para_tech
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_doctrine_cost_reduction = {
+				name = special_forces_bonus
+				cost_reduction = 0.80
+				uses = 1
+				category = cat_paratroopers_doctrine
+			}
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 1.0
+				uses = 1
+				category = para_tech
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 3.0
+				uses = 1
+				category = para_tech
+			}
 		}
 	}
 	search_filters = { FOCUS_FILTER_RESEARCH }
@@ -13163,7 +13327,7 @@ shared_focus = {
 					engine_type_slot = engine_1_1x
 					special_type_slot_1 = empty
 				}
-				icon = "GFX_ZES_fighter1_medium"
+				icon = "GFX_kasa_2d_fighter1_medium"
 			}
 			add_equipment_to_stockpile = {
 				type = small_plane_airframe_1
@@ -13183,7 +13347,7 @@ shared_focus = {
 						engine_type_slot = engine_1_1x
 						special_type_slot_1 = empty
 					}
-					icon = "GFX_ZES_CAS1_medium"
+					icon = "GFX_kasa_2d_CAS1_medium"
 				}
 				add_equipment_to_stockpile = {
 					type = small_plane_cas_airframe_1
@@ -13204,7 +13368,7 @@ shared_focus = {
 						engine_type_slot = engine_1_1x
 						special_type_slot_1 = empty
 					}
-					icon = "GFX_ZES_naval_bomber1_medium"
+					icon = "GFX_kasa_2d_naval_bomber1_medium"
 				}
 				add_equipment_to_stockpile = {
 					type = small_plane_naval_bomber_airframe_1
diff --git a/common/national_focus/generic.txt b/common/national_focus/generic.txt
index 83d957f1a82..100ff4bd287 100644
--- a/common/national_focus/generic.txt
+++ b/common/national_focus/generic.txt
@@ -224,11 +224,30 @@ focus_tree = {
 
 		completion_reward = {
 			log = "[GetDateText]: [Root.GetName]: Focus special_forces"
-			add_tech_bonus = {
-				name = special_forces_bonus
-				bonus = 1
-				uses = 1
-				category = special_forces_tech
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_doctrine_cost_reduction = {
+					name = special_forces_bonus
+					cost_reduction = 0.75
+					uses = 1
+					category = special_forces_doctrine
+				}
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 0.75
+					uses = 1
+					category = special_forces_tech
+				}
+			}
+			else = {
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 1.0
+					uses = 1
+					category = special_forces_tech
+				}
 			}
 		}
 		search_filters = { FOCUS_FILTER_RESEARCH }
diff --git a/common/national_focus/generic_griffon.txt b/common/national_focus/generic_griffon.txt
index a0fbe7ea71e..c3860fbc73a 100644
--- a/common/national_focus/generic_griffon.txt
+++ b/common/national_focus/generic_griffon.txt
@@ -2012,11 +2012,30 @@ focus_tree = {
 
 		completion_reward = {
 			log = "[GetDateText]: [Root.GetName]: Focus griffon_special_forces"
-			add_tech_bonus = {
-				name = special_forces_bonus
-				bonus = 1.0
-				uses = 1
-				category = special_forces_tech
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_doctrine_cost_reduction = {
+					name = special_forces_bonus
+					cost_reduction = 0.75
+					uses = 1
+					category = special_forces_doctrine
+				}
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 0.75
+					uses = 1
+					category = special_forces_tech
+				}
+			}
+			else = {
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 1.0
+					uses = 1
+					category = special_forces_tech
+				}
 			}
 		}
 		search_filters = { FOCUS_FILTER_RESEARCH }
diff --git a/common/national_focus/generic_zebrica.txt b/common/national_focus/generic_zebrica.txt
index 94612f24398..ce4f11d766b 100644
--- a/common/national_focus/generic_zebrica.txt
+++ b/common/national_focus/generic_zebrica.txt
@@ -2087,11 +2087,30 @@ focus_tree = {
 
 		completion_reward = {
 			log = "[GetDateText]: [Root.GetName]: Focus zebra_special_forces"
-			add_tech_bonus = {
-				name = special_forces_bonus
-				bonus = 1.0
-				uses = 1
-				category = special_forces_tech
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_doctrine_cost_reduction = {
+					name = special_forces_bonus
+					cost_reduction = 0.75
+					uses = 1
+					category = special_forces_doctrine
+				}
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 0.75
+					uses = 1
+					category = special_forces_tech
+				}
+			}
+			else = {
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 1.0
+					uses = 1
+					category = special_forces_tech
+				}
 			}
 		}
 		search_filters = { FOCUS_FILTER_RESEARCH }
diff --git a/common/occupation_laws/eaw_occupation_laws.txt b/common/occupation_laws/eaw_occupation_laws.txt
index cc152bc140e..cb9ecd76e37 100644
--- a/common/occupation_laws/eaw_occupation_laws.txt
+++ b/common/occupation_laws/eaw_occupation_laws.txt
@@ -204,6 +204,7 @@ extractive_regime = {
 	state_modifier = {
 		required_garrison_factor 		= 0.25
 		local_resources = 0.75
+		local_resources_factor = 0.25
 		custom_modifier_tooltip = "resource_sabotage_decrease_tooltip"
 	}
 	
@@ -250,6 +251,7 @@ extractive_regime = {
 integration_occupation = {
 	icon = 14
 	sound_effect = "Martial_Law_Interface_Autonomous_Occupation_Unique_DEM"
+	tooltip = "integration_occupation_desc"
 	
 	visible = {
 		OR = {
@@ -290,73 +292,6 @@ integration_occupation = {
 	}
 }
 
-KIC_concentration_camps = {
-	icon = 16
-	sound_effect = "Martial_Law_Interface_Brutally_Oppressive_Occupation_Unique_FAS"
-	tooltip = "KIC_concentration_camps_desc"
-	
-	visible = {
-		OR = {
-			AND = {
-				original_tag = KIC
-				has_completed_focus = KIR_republic_postwar_focus_20c
-			}
-			AND = {
-				original_tag = KIR
-				has_country_flag = KIR_unlocked_concentration_camps
-			}
-		}
-	}
-	
-	available = {
-		if = {
-			limit = {
-				original_tag = KIR
-			}
-			FROM = {
-				OR = {
-					custom_trigger_tooltip = {
-						tooltip = KIR_concentration_camps_resistance_threshold
-						check_variable = { core_resistance@FROM.FROM > 50 }
-					}
-					original_tag = IDO
-					original_tag = IST
-					original_tag = DEL
-				}
-			}
-		}
-	}
-	
-	fallback_law = local_police_force_garrison 
-	
-	state_modifier = {
-		resistance_decay = 0.4
-		resistance_growth = -0.4
-		resistance_target = -0.4
-		required_garrison_factor = 0.4
-		resistance_damage_to_garrison = -0.2
-		resistance_garrison_penetration_chance = -0.2
-		local_factories = -0.2
-		local_resources = -0.2
-		local_manpower = -0.2
-		monthly_population = -0.4
-		local_intel_to_enemies = -0.4
-	}
-	
-	suppressed_state_modifier = {
-		local_factories = 0.2
-		local_resources = 0.2
-		local_manpower = 0.2
-	}
-	ai_will_do = {
-		base = 200
-		modifier = {
-			check_variable  = { resistance_target_without_law > 0.29} 						
-			add = 150
-		}
-	}
-}
-
 BAT_dismantle_industry = {
 	tooltip = BAT_industrial_decommission_2_tp
 	
diff --git a/common/occupation_laws/occupation_laws.txt b/common/occupation_laws/occupation_laws.txt
index 707dbe9a0c6..c8c95812f8e 100755
--- a/common/occupation_laws/occupation_laws.txt
+++ b/common/occupation_laws/occupation_laws.txt
@@ -645,6 +645,7 @@ forced_labor_occupation = {
 				}
 				has_completed_focus = GRI_AF_sc_assert_our_control
 			}
+			has_country_flag = unlocked_forced_labor_occupation_improved_EaW
 		}
 	}
 
@@ -746,6 +747,133 @@ forced_labor_occupation = {
 	}
 }
 
+forced_labor_occupation_improved_EaW = {
+	icon = 8
+	sound_effect = "Martial_Law_Interface_Forced_Labor_Occupation"
+	
+	visible = {
+		has_country_flag = unlocked_forced_labor_occupation_improved_EaW
+	}
+
+	available = {
+		NOT = {
+			original_tag = DED
+			hidden_trigger = { original_tag = EWI }
+		}
+		NOT = {
+			FROM = {
+				OR = {
+					original_tag = DED
+					hidden_trigger = { original_tag = EWI }
+				}
+			}
+		}
+		if = {
+			limit = {
+				original_tag = KIR
+			}
+			FROM = {
+				OR = {
+					original_tag = IDO
+					original_tag = IST
+					original_tag = DEL
+				}
+			}
+		}
+	}
+
+	state_modifier = {
+		resistance_target 					= -0.40
+		
+		resistance_decay = 0.4
+		resistance_growth = -0.4
+		
+		compliance_gain = -0.05
+		
+		resistance_damage_to_garrison 		= 0.3
+		required_garrison_factor 			= 0.15
+		
+		local_resources = 0.50
+		local_factories = 0.15
+		
+		attrition_for_controller = -0.25
+		
+		repair_speed_infrastructure_factor 	= 0.25
+
+		custom_modifier_tooltip = "resource_sabotage_improved_EaW_decrease_tooltip"
+	}
+
+	ai_will_do = {
+		# enabled if has damaged infra
+		# gets higher score if more are damaged
+		# even more prio at war
+		base = 0
+
+		modifier = {
+			set_temp_variable = { requirement_limit = 1.5 }
+			if = {
+				limit = { occupation_law = forced_labor_occupation }
+				set_temp_variable = { requirement_limit = 1.3 }
+			}
+			check_variable = { garrison_min_support_ratio < requirement_limit }
+			factor = 0
+		}
+
+		modifier = {
+			set_temp_variable = { num_damaged = damaged_building_level@infrastructure }
+
+			check_variable = { num_damaged > 0 }
+			clamp_temp_variable = { var = num_damaged max = 8 }
+			multiply_temp_variable = { num_damaged = 80 }
+			add_to_temp_variable = { num_damaged = 200 }
+			FROM = {
+				has_war = yes
+				add_to_temp_variable = { num_damaged = 100 }
+			}
+			add = num_damaged
+		}
+
+		modifier = {
+			# if compliance is high enough, we are getting good enough resoruces already
+			compliance < 40
+
+			# if we are desiring a resource produced here
+			set_temp_variable = { releveant_resources = 0 }
+
+			set_temp_variable = { t = resource@oil }
+			multiply_temp_variable = { t = ai_desire_oil }
+			add_to_temp_variable = { releveant_resources = t }
+
+			set_temp_variable = { t = resource@aluminium }
+			multiply_temp_variable = { t = ai_desire_aluminium }
+			add_to_temp_variable = { releveant_resources = t }
+
+			set_temp_variable = { t = resource@rubber }
+			multiply_temp_variable = { t = ai_desire_rubber }
+			add_to_temp_variable = { releveant_resources = t }
+
+			set_temp_variable = { t = resource@tungsten }
+			multiply_temp_variable = { t = ai_desire_tungsten }
+			add_to_temp_variable = { releveant_resources = t }
+
+			set_temp_variable = { t = resource@steel }
+			multiply_temp_variable = { t = ai_desire_steel }
+			add_to_temp_variable = { releveant_resources = t }
+
+			set_temp_variable = { t = resource@chromium }
+			multiply_temp_variable = { t = ai_desire_chromium }
+			add_to_temp_variable = { releveant_resources = t }
+
+			check_variable = { releveant_resources > 0 }
+			clamp_temp_variable = { var = releveant_resources max = 40 }
+			divide_temp_variable = { releveant_resources = 40 }
+			multiply_temp_variable = { releveant_resources = 200 }
+			add_to_temp_variable = { releveant_resources = 100 }
+			add = releveant_resources
+		}
+	}
+}
+
 harsh_quotas_occupation = {
 	icon = 9
 	sound_effect = "Martial_Law_Interface_Harsh_Quotas_Occupation"
@@ -762,6 +890,7 @@ harsh_quotas_occupation = {
 				}
 				has_completed_focus = GRI_AF_sc_assert_our_control
 			}
+			has_country_flag = unlocked_harsh_quotas_occupation_improved_EaW
 		}
 	}
 
@@ -814,6 +943,83 @@ harsh_quotas_occupation = {
 	}
 }
 
+harsh_quotas_occupation_improved_EaW = {
+	icon = 9
+	sound_effect = "Martial_Law_Interface_Harsh_Quotas_Occupation"
+	
+	visible = {
+		has_country_flag = unlocked_harsh_quotas_occupation_improved_EaW
+	}
+
+	available = {
+		NOT = {
+			original_tag = DED
+			hidden_trigger = { original_tag = EWI }
+		}
+		NOT = {
+			FROM = {
+				OR = {
+					original_tag = DED
+					hidden_trigger = { original_tag = EWI }
+				}
+			}
+		}
+		if = {
+			limit = {
+				original_tag = KIR
+			}
+			FROM = {
+				OR = {
+					original_tag = IDO
+					original_tag = IST
+					original_tag = DEL
+				}
+			}
+		}
+	}
+
+	state_modifier = {
+	
+		resistance_decay = 0.4
+		resistance_growth = -0.4
+		resistance_damage_to_garrison = 0.3
+
+		local_factories 				= 0.4
+		local_resources 				= 0.2
+	
+		resistance_target 				= -0.40
+		
+		compliance_gain = -0.05
+		
+		local_supplies_for_controller = 0.25
+		
+		required_garrison_factor 		= 0.15
+
+		repair_speed_arms_factory_factor = 0.25
+		repair_speed_industrial_complex_factor = 0.25
+
+		custom_modifier_tooltip = "factory_sabotage_improved_EaW_decrease_tooltip"
+	}
+
+	ai_will_do = {
+		# enabled if has damaged factories
+		# gets higher score if more are damaged
+		base = 0
+
+		modifier = {
+			set_temp_variable = { num_damaged = damaged_building_level@arms_factory }
+			add_to_temp_variable = { num_damaged = damaged_building_level@industrial_complex }
+
+			check_variable = { num_damaged > 0 }
+			clamp_temp_variable = { var = num_damaged max = 4 }
+			multiply_temp_variable = { num_damaged = 50 }
+			add_to_temp_variable = { num_damaged = 150 }
+
+			add = num_damaged
+		}
+	}
+}
+
 brutally_oppressive_occupation = {
 	icon = 10
 	sound_effect = "Martial_Law_Interface_Brutally_Oppressive_Occupation_Unique_FAS"
diff --git a/common/on_actions/00_on_actions.txt b/common/on_actions/00_on_actions.txt
index 1697fcd355b..bccbddfc604 100644
--- a/common/on_actions/00_on_actions.txt
+++ b/common/on_actions/00_on_actions.txt
@@ -479,12 +479,27 @@ on_actions = {
 	# root country that invades
 	# scope state that is invaded
 	# from scope state that the invasion started
-	# on_naval_invasion = {
-	# 	effect = {
-	# 	}
-	# }
-
-
+	on_naval_invasion = {
+	 	effect = {
+		 	if = {
+				limit = {
+					ROOT = {
+						divisions_in_state = {
+							 unit = marine_commando
+							 size > 0
+							 state = PREV
+						}
+						 has_tech = marines_commandos_demolition 
+					}
+					NOT = { has_state_flag = marines_commando_effect }
+					OWNER = { NOT = { tag = ROOT } }
+				}
+				SF_marine_demoliton_effect = yes # Note that the state flag condition is not preventing it from doing 1 damage per division 
+			}
+	 	}
+	}
+	
+	
 	# root country that paradrops
 	# scope state that is paradroped into
 	# from scope state that the paradrop started
@@ -506,4 +521,49 @@ on_actions = {
 			}
 		}
 	}
+	
+	on_unit_leader_promote_from_ranks_veteran = { #Unit leader scope, FROM is unit
+		effect = {
+			FROM = {
+				add_random_valid_trait_from_unit = {
+					character = ROOT
+				}
+			}
+			set_unit_leader_flag = field_promotion_achievement
+		}
+	}
+
+	on_unit_leader_promote_from_ranks_green = { #Unit leader scope, FROM is unit
+		effect = {
+			set_unit_leader_flag = field_promotion_achievement
+		}
+	}
+
+	on_add_history = { #Unit Scope
+		effect = {
+			#add_unit_medal_to_latest_entry = {
+			#	unit_medals = iron_cross_second_class
+			#} #This would add a unit medal to the history entry you just received
+		}
+	}
+
+	on_units_paradropped_in_state = {
+		effect = {
+			if = {
+				limit = { 
+					FROM = { has_tech = paras_dispersed_drop } 
+					NOT = { has_state_flag = para_drop_effect }
+					CONTROLLER = { NOT = { tag = FROM } }
+				}
+				SF_PARA_sabotage_effect = yes
+			}
+			if = {
+				limit = { 
+					FROM = { has_tech = paras_combat_drop } 
+					NOT = { has_state_flag = para_drop_effect }
+				}
+				SF_PARA_combat_effect = yes
+			}
+		}
+	}
 }
diff --git a/common/on_actions/09_aat_on_actions.txt b/common/on_actions/09_aat_on_actions.txt
new file mode 100644
index 00000000000..213520d1e8a
--- /dev/null
+++ b/common/on_actions/09_aat_on_actions.txt
@@ -0,0 +1,18 @@
+
+on_actions = {
+
+	#### MIO on actions
+	# ROOT is MIO
+	on_mio_size_increased = {}
+	# NB : all the following also exist at MIO level
+	# use on-action here if the purpose is to execute for any MIO
+	# use on-action at MIO level to execute just for one precise MIO
+	# i.e. don't use this here : if = { limit = { is_military_industrial_organisation = ... } } }
+	on_mio_design_team_assigned_to_tech = {}
+	on_mio_design_team_assigned_to_variant = {}
+	on_mio_industrial_manufacturer_assigned = {}
+	on_mio_tech_research_cancelled = {}
+	on_mio_tech_research_completed = {}
+	on_mio_industrial_manufacturer_unassigned = {}
+
+}
\ No newline at end of file
diff --git a/common/on_actions/eaw_on_actions.txt b/common/on_actions/eaw_on_actions.txt
index 741307b9ab2..f9f7ff036c6 100644
--- a/common/on_actions/eaw_on_actions.txt
+++ b/common/on_actions/eaw_on_actions.txt
@@ -9711,6 +9711,7 @@ on_actions = {
 				if = {#Manehattan
 					limit = {
 						FROM.FROM = { state = 75 }
+						NOT = { ROOT = { original_tag = ELF } }
 					}
 					if = {
 						limit = {
diff --git a/common/on_actions/eaw_on_yearly_on_actions.txt b/common/on_actions/eaw_on_yearly_on_actions.txt
index 4b38baf23ef..728308d5c58 100644
--- a/common/on_actions/eaw_on_yearly_on_actions.txt
+++ b/common/on_actions/eaw_on_yearly_on_actions.txt
@@ -1982,41 +1982,25 @@ on_actions = {
 							limit = {
 								check_variable = { KIR_pirate_raid_events_var = 1 }
 							}
-							country_event = { id = kirin_pirate.2 days = 1 random_days = 14 }
+							news_event = { id = kirin_pirate.2 days = 1 random_days = 14 }
 						}
 						if = {
 							limit = {
 								check_variable = { KIR_pirate_raid_events_var = 2 }
 							}
-							country_event = { id = kirin_pirate.3 days = 1 random_days = 14 }
+							news_event = { id = kirin_pirate.3 days = 1 random_days = 14 }
 						}
 						if = {
 							limit = {
 								check_variable = { KIR_pirate_raid_events_var = 3 }
 							}
-							every_country = {
-								limit = {
-									OR = {
-										is_kiria_country = yes
-										is_southeastern_zebrica_country = yes
-									}
-								}
-								news_event = { id = kirin_pirate.4 days = 1 random_days = 14 }
-							}
+							country_event = { id = kirin_pirate.4 days = 1 random_days = 14 }
 						}
 						if = {
 							limit = {
 								check_variable = { KIR_pirate_raid_events_var = 4 }
 							}
-							every_country = {
-								limit = {
-									OR = {
-										is_kiria_country = yes
-										is_southeastern_zebrica_country = yes
-									}
-								}
-								news_event = { id = kirin_pirate.5 days = 1 random_days = 14 }
-							}
+							country_event = { id = kirin_pirate.5 days = 1 random_days = 14 }
 						}
 						if = {
 							limit = {
@@ -2485,6 +2469,7 @@ on_actions = {
 						random_character = {
 							limit = {
 								is_army_leader = yes
+								is_field_marshal = no
 								NOT = {
 									is_character = KIR_firethorn
 									is_character = KIR_bright_burn
@@ -2736,6 +2721,20 @@ on_actions = {
 						}
 					}
 				}
+				if = {
+					limit = {
+						has_political_power > 0
+					}
+					set_variable = { KIR_power_struggle_cost = KIR.political_power }
+					clamp_temp_variable = {
+						var = KIR_power_struggle_cost
+						min = 5
+						max = 75
+					}
+				}
+				else = {
+					set_variable = { KIR_power_struggle_cost = 0 }
+				}
 				activate_mission = KIR_power_struggle_death_spiral_RS_mission
 			}
 			if = {
@@ -2759,6 +2758,20 @@ on_actions = {
 						}
 					}
 				}
+				if = {
+					limit = {
+						has_political_power > 0
+					}
+					set_variable = { KIR_power_struggle_cost = KIR.political_power }
+					clamp_temp_variable = {
+						var = KIR_power_struggle_cost
+						min = 5
+						max = 75
+					}
+				}
+				else = {
+					set_variable = { KIR_power_struggle_cost = 0 }
+				}
 				activate_mission = KIR_power_struggle_death_spiral_WF_mission
 			}
 			KIR_get_factory_ratio = yes
@@ -2832,56 +2845,32 @@ on_actions = {
 						limit = {
 							exists = yes
 							capital_scope = { is_on_continent = africa }
-							any_owned_state = {
-								is_controlled_by = PREV
-								OR = {
-									region = 31
-									region = 79
-									region = 82
-									region = 85
-									region = 94
-									region = 106
-									region = 125
-									region = 128
-									region = 131
-									region = 133
-									region = 134
-									region = 138
-									region = 139
-									region = 140
-									region = 141
-									region = 142
-									region = 143
-									region = 144
-									region = 145
-									region = 146
-									region = 147
-									region = 244
-									region = 246
-									region = 250
-									region = 274
-									region = 277
-									region = 279
-									region = 282
-									region = 283
-									region = 312
-									region = 313
-									region = 314
-									region = 315
-									region = 316
-									region = 317
-									region = 318
-								}
-							}
 							NOT = {
 								original_tag = KIR
 								is_ally_with = KIR
 								has_war_with = KIR
 								has_government = democratic
 							}
+							OR = {
+								is_neighbor_of = KIR
+								check_variable = { closest_distance_to@KIR < 2000 }
+								any_neighbor_country = {
+									OR = {
+										has_government = democratic
+										is_in_array = {
+											array = KIR.allies
+											value = THIS
+										}
+										is_guaranteed_by = KIR
+									}
+								}
+							}
 							count_triggers = {
 								amount = 3 ## KIR.KIR_demand_disarmament_threshold
-								has_added_tension_amount > 4
+								OR = {
+									has_added_tension_amount > 4
+									has_country_flag = I_have_been_very_bad_KIR
+								}
 								strength_ratio = { tag = KIR ratio > 1 }
 								OR = {
 									num_occupied_states > 4
@@ -2913,8 +2902,15 @@ on_actions = {
 										occupation_law = BAT_slave_state
 									}
 								}
-								is_in_array = { KIR.potential_and_current_enemies = THIS }
-								is_in_array = { KIR.enemies_of_allies = THIS }
+								OR = {
+									is_in_array = { KIR.potential_and_current_enemies = THIS }
+									has_country_flag = I_have_been_very_bad_KIR
+								}
+								OR = {
+									is_in_array = { KIR.enemies_of_allies = THIS }
+									has_country_flag = I_have_been_very_bad_KIR
+								}
+								has_offensive_war = yes
 							}
 						}
 						add_to_array = {
@@ -2932,7 +2928,9 @@ on_actions = {
 			}
 			if = {
 				limit = {
+					has_war_with = DEL
 					has_country_flag = KIR_FS_WAR_Flag
+					has_country_flag = KIR_event_3080_flag
 				}
 				clear_variable = KDWLM3A_var
 				clear_variable = KDWLM3B_var
@@ -3191,6 +3189,7 @@ on_actions = {
 			if = {
 				limit = {
 					has_country_flag = KIR_Balance_of_the_Realm_Enabled
+					is_ai = no
 				}
 				KIR_Get_Balance_of_the_Realm = yes
 				KIR_POST_BOU_3A_Get_Ref_Support = yes
@@ -3912,6 +3911,14 @@ on_actions = {
 							factor = 0
 							has_global_flag = KIC_FRV_Radiance_Revolt_Happened
 						}
+						modifier = {
+							factor = 1.25
+							OR = {
+								NOT = { has_tech = tech_kirin_astrology }
+								FRV = { has_tech = tech_kirin_astrology }
+							}
+							NOT = { has_global_flag = KIC_FRV_Radiance_Revolt_Happened }
+						}
 						modifier = {
 							add = 2
 							NOT = { has_global_flag = KIC_FRV_Radiance_Revolt_Happened }
@@ -3996,6 +4003,14 @@ on_actions = {
 							factor = 0
 							has_global_flag = KIC_FRV_Proletarian_Revolt_Happened
 						}
+						modifier = {
+							factor = 1.25
+							OR = {
+								NOT = { has_tech = tech_kirin_astrology }
+								FRV = { has_tech = tech_kirin_astrology }
+							}
+							NOT = { has_global_flag = KIC_FRV_Proletarian_Revolt_Happened }
+						}
 						modifier = {
 							add = 2
 							NOT = { has_global_flag = KIC_FRV_Proletarian_Revolt_Happened }
@@ -4083,6 +4098,14 @@ on_actions = {
 							factor = 0
 							has_global_flag = KIC_FRV_River_Revolt_Happened
 						}
+						modifier = {
+							factor = 1.25
+							OR = {
+								NOT = { has_tech = tech_kirin_astrology }
+								FRV = { has_tech = tech_kirin_astrology }
+							}
+							NOT = { has_global_flag = KIC_FRV_River_Revolt_Happened }
+						}
 						modifier = {
 							add = 2
 							NOT = { has_global_flag = KIC_FRV_River_Revolt_Happened }
@@ -4192,6 +4215,14 @@ on_actions = {
 							factor = 0
 							has_global_flag = KIC_FRV_Verdant_Revolt_Happened
 						}
+						modifier = {
+							factor = 1.25
+							OR = {
+								NOT = { has_tech = tech_kirin_astrology }
+								FRV = { has_tech = tech_kirin_astrology }
+							}
+							NOT = { has_global_flag = KIC_FRV_Verdant_Revolt_Happened }
+						}
 						modifier = {
 							add = 2
 							NOT = { has_global_flag = KIC_FRV_Verdant_Revolt_Happened }
@@ -4275,6 +4306,14 @@ on_actions = {
 							factor = 0
 							has_global_flag = KIC_FRV_Bandit_Revolt_Happened
 						}
+						modifier = {
+							factor = 1.25
+							OR = {
+								NOT = { has_tech = tech_kirin_astrology }
+								FRV = { has_tech = tech_kirin_astrology }
+							}
+							NOT = { has_global_flag = KIC_FRV_Bandit_Revolt_Happened }
+						}
 						modifier = {
 							add = 2
 							NOT = { has_global_flag = KIC_FRV_Bandit_Revolt_Happened }
@@ -4382,6 +4421,14 @@ on_actions = {
 							factor = 0
 							has_global_flag = KIC_FRV_Central_Revolt_Happened
 						}
+						modifier = {
+							factor = 1.25
+							OR = {
+								NOT = { has_tech = tech_kirin_astrology }
+								FRV = { has_tech = tech_kirin_astrology }
+							}
+							NOT = { has_global_flag = KIC_FRV_Central_Revolt_Happened }
+						}
 						modifier = {
 							add = 2
 							NOT = { has_global_flag = KIC_FRV_Central_Revolt_Happened }
@@ -4492,6 +4539,14 @@ on_actions = {
 							factor = 0
 							has_global_flag = KIC_FRV_Maritime_Revolt_Happened
 						}
+						modifier = {
+							factor = 1.25
+							OR = {
+								NOT = { has_tech = tech_kirin_astrology }
+								FRV = { has_tech = tech_kirin_astrology }
+							}
+							NOT = { has_global_flag = KIC_FRV_Maritime_Revolt_Happened }
+						}
 						modifier = {
 							add = 2
 							NOT = { has_global_flag = KIC_FRV_Maritime_Revolt_Happened }
@@ -4578,6 +4633,13 @@ on_actions = {
 						FRV = { country_event = { id = kirin_republic.116 days = 1 } }
 					}
 					15 = {
+						modifier = {
+							factor = 0.75
+							OR = {
+								NOT = { has_tech = tech_kirin_astrology }
+								FRV = { has_tech = tech_kirin_astrology }
+							}
+						}
 						## Nothing
 					}
 				}
@@ -4862,6 +4924,7 @@ on_actions = {
 						random_character = {
 							limit = {
 								is_army_leader = yes
+								is_field_marshal = no
 								NOT = {
 									is_character = KIC_ember_glow
 									is_character = KIR_coral_river
@@ -5032,9 +5095,8 @@ on_actions = {
 			
 			if = { ## CFR
 				limit = {
-					CFR = {
-						exists = yes
-					}
+					country_exists = CFR
+					tag = CFR
 				}
 				CFR = {
 					if = {
@@ -5076,7 +5138,7 @@ on_actions = {
 						limit = {
 							has_country_flag = CFR_weekly_five_infiltrators_flag
 						}
-						add_to_variable = { CFR.infiltrators_var = 5 }
+						add_to_variable = { infiltrators_var = 5 } ## Why does it add 770???
 					}
 				}
 			}
diff --git a/common/operations/00_operations.txt b/common/operations/00_operations.txt
index a3b806a51d4..a0f9dc27a60 100644
--- a/common/operations/00_operations.txt
+++ b/common/operations/00_operations.txt
@@ -3065,15 +3065,33 @@ operation_steal_tech_airforce = { ### 18 3/55
 	cost_modifiers = { operation_cost }
 	outcome_execute = {
 		ROOT = {
-			steal_random_tech_bonus = {
-				folder = air_techs_folder
-				bonus = 3.0
-				dynamic = yes
-				instant = yes
-				name = operation_steal_tech_airforce
-				target = FROM
-				uses = 1
+			if = {
+				limit = {
+					has_dlc = "By Blood Alone"
+				}
+				steal_random_tech_bonus = {
+					folder = bba_air_techs_folder
+					bonus = 3.0
+					dynamic = yes
+					instant = yes
+					name = operation_steal_tech_airforce
+					target = FROM
+					uses = 1
+				}
+				
+			}
+			else = {
+				steal_random_tech_bonus = {
+					folder = air_techs_folder
+					bonus = 3.0
+					dynamic = yes
+					instant = yes
+					name = operation_steal_tech_airforce
+					target = FROM
+					uses = 1
+				}
 			}
+
 			remove_operation_token = {
 				tag = FROM
 				token = token_airforce
@@ -3084,29 +3102,68 @@ operation_steal_tech_airforce = { ### 18 3/55
 		random_list = {
 			33 = {
 				ROOT = {
-					steal_random_tech_bonus = {
-						folder = air_techs_folder
-						bonus = 3.0
-						ahead_reduction = 2
-						dynamic = yes
-						instant = yes
-						name = operation_steal_tech_airforce
-						target = FROM
-						uses = 1
+					if = {
+						limit = {
+							has_dlc = "By Blood Alone"
+						}
+						steal_random_tech_bonus = {
+							folder = bba_air_techs_folder
+							bonus = 3.0
+							ahead_reduction = 2
+							dynamic = yes
+							instant = yes
+							name = operation_steal_tech_airforce
+							target = FROM
+							uses = 1
+						}
 					}
+					else = {
+						steal_random_tech_bonus = {
+							folder = air_techs_folder
+							bonus = 3.0
+							ahead_reduction = 2
+							dynamic = yes
+							instant = yes
+							name = operation_steal_tech_airforce
+							target = FROM
+							uses = 1
+						}
+					}
+
 				}
 			}
 			67 = {
-				ROOT = {
-					steal_random_tech_bonus = {
-						folder = air_techs_folder
-						bonus = 3.0
-						ahead_reduction = 1
-						dynamic = yes
-						instant = yes
-						name = operation_steal_tech_airforce
-						target = FROM
-						uses = 1
+				if = {
+					limit = {
+						has_dlc = "By Blood Alone"
+					}
+
+					ROOT = {
+						steal_random_tech_bonus = {
+							folder = bba_air_techs_folder
+							bonus = 3.0
+							ahead_reduction = 1
+							dynamic = yes
+							instant = yes
+							name = operation_steal_tech_airforce
+							target = FROM
+							uses = 1
+						}
+					}
+
+				}
+				else = {
+					ROOT = {
+						steal_random_tech_bonus = {
+							folder = air_techs_folder
+							bonus = 3.0
+							ahead_reduction = 1
+							dynamic = yes
+							instant = yes
+							name = operation_steal_tech_airforce
+							target = FROM
+							uses = 1
+						}
 					}
 				}
 			}
@@ -3115,14 +3172,30 @@ operation_steal_tech_airforce = { ### 18 3/55
 
 	outcome_potential = {
 		ROOT = {
-			steal_random_tech_bonus = {
-				folder = air_techs_folder
-				bonus = 3.0
-				dynamic = yes
-				instant = yes
-				name = operation_steal_tech_airforce
-				target = FROM
-				uses = 1
+			if = {
+				limit = {
+					has_dlc = "By Blood Alone"
+				}
+				steal_random_tech_bonus = {
+					folder = bba_air_techs_folder
+					bonus = 3.0
+					dynamic = yes
+					instant = yes
+					name = operation_steal_tech_airforce
+					target = FROM
+					uses = 1
+				}
+			}
+			else = {
+				steal_random_tech_bonus = {
+					folder = air_techs_folder
+					bonus = 3.0
+					dynamic = yes
+					instant = yes
+					name = operation_steal_tech_airforce
+					target = FROM
+					uses = 1
+				}
 			}
 		}
 		custom_effect_tooltip = operation_outcome_consumes_token_tt
diff --git a/common/peace_conference/ai_peace/00_misc.txt b/common/peace_conference/ai_peace/00_misc.txt
index c8e84f2faf0..361705185ff 100644
--- a/common/peace_conference/ai_peace/00_misc.txt
+++ b/common/peace_conference/ai_peace/00_misc.txt
@@ -177,9 +177,9 @@ peace_ai_desires = {
                                 pc_is_state_claimed_by = ROOT.FROM
                             }
                         }
+                        is_state_considered_an_island = yes
                     }
                 }
-                is_state_considered_an_island = no
                 is_state_on_the_same_landmass_as_prev = yes
             }
         }
diff --git a/common/peace_conference/cost_modifiers/DEN_peace.txt b/common/peace_conference/cost_modifiers/DEN_peace.txt
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/common/peace_conference/cost_modifiers/FIN_peace.txt b/common/peace_conference/cost_modifiers/FIN_peace.txt
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/common/resistance_activity/resistance_activity.txt b/common/resistance_activity/resistance_activity.txt
index 9903ef5f4fb..f2ec32a0fd4 100644
--- a/common/resistance_activity/resistance_activity.txt
+++ b/common/resistance_activity/resistance_activity.txt
@@ -45,6 +45,14 @@ sabotage_arms_factory = {
 			occupation_law = harsh_quotas_occupation
 			add = -0.25
 		}
+		modifier = {
+			occupation_law = harsh_quotas_occupation_improved_EaW
+			add = -0.3
+		}
+		modifier = {
+			controller = { has_tech = tech_kirin_astrology }
+			factor = 0.75
+		}
 	}
 
 	effect = {
@@ -86,6 +94,10 @@ sabotage_infrastructure = {
 
 			add = 4
 		}
+		modifier = {
+			controller = { has_tech = tech_kirin_astrology }
+			factor = 0.75
+		}
 	}
 
 	effect = {
@@ -131,6 +143,14 @@ sabotage_industrial_complex = {
 			occupation_law = harsh_quotas_occupation
 			add = -0.25
 		}
+		modifier = {
+			occupation_law = harsh_quotas_occupation_improved_EaW
+			add = -0.3
+		}
+		modifier = {
+			controller = { has_tech = tech_kirin_astrology }
+			factor = 0.75
+		}
 	}
 
 	effect = {
@@ -166,6 +186,10 @@ sabotage_air_base = {
 
 	weight = {
 		base = 1
+		modifier = {
+			controller = { has_tech = tech_kirin_astrology }
+			factor = 0.75
+		}
 	}
 
 	effect = {
@@ -188,6 +212,10 @@ sabotage_dockyard = {
 
 	weight = {
 		base = 1
+		modifier = {
+			controller = { has_tech = tech_kirin_astrology }
+			factor = 0.75
+		}
 	}
 
 	effect = {
@@ -210,6 +238,10 @@ sabotage_anti_air_building = {
 
 	weight = {
 		base = 1
+		modifier = {
+			controller = { has_tech = tech_kirin_astrology }
+			factor = 0.75
+		}
 	}
 
 	effect = {
@@ -233,6 +265,10 @@ sabotage_synthetic_refinery = {
 
 	weight = {
 		base = 1
+		modifier = {
+			controller = { has_tech = tech_kirin_astrology }
+			factor = 0.75
+		}
 	}
 
 	effect = {
@@ -256,6 +292,10 @@ sabotage_fuel_silo = {
 
 	weight = {
 		base = 1
+		modifier = {
+			controller = { has_tech = tech_kirin_astrology }
+			factor = 0.75
+		}
 	}
 
 	effect = {
@@ -279,6 +319,10 @@ sabotage_radar_station = {
 
 	weight = {
 		base = 1
+		modifier = {
+			controller = { has_tech = tech_kirin_astrology }
+			factor = 0.75
+		}
 	}
 
 	effect = {
@@ -301,6 +345,10 @@ sabotage_rocket_site = {
 
 	weight = {
 		base = 1
+		modifier = {
+			controller = { has_tech = tech_kirin_astrology }
+			factor = 0.75
+		}
 	}
 
 	effect = {
@@ -323,6 +371,10 @@ sabotage_nuclear_reactor = {
 
 	weight = {
 		base = 1
+		modifier = {
+			controller = { has_tech = tech_kirin_astrology }
+			factor = 0.75
+		}
 	}
 
 	effect = {
@@ -355,10 +407,18 @@ sabotage_oil = {
 			occupation_law = forced_labor_occupation
 			add = -0.25
 		}
+		modifier = {
+			occupation_law = forced_labor_occupation_improved_EaW
+			add = -0.3
+		}
 		modifier = {
 			occupation_law = extractive_regime
 			add = -0.25
 		}
+		modifier = {
+			controller = { has_tech = tech_kirin_astrology }
+			factor = 0.75
+		}
 	}
 
 	effect = {
@@ -374,6 +434,12 @@ sabotage_oil = {
 			}
 			multiply_temp_variable = { duration = 0.75 }
 		}
+		if = {
+			limit = {
+				occupation_law = forced_labor_occupation_improved_EaW
+			}
+			multiply_temp_variable = { duration = 0.6 }
+		}
 		if = {
 			limit = {
 				has_variable = targeted_sabotage_resources
@@ -412,10 +478,18 @@ sabotage_aluminium = {
 			occupation_law = forced_labor_occupation
 			add = -0.25
 		}
+		modifier = {
+			occupation_law = forced_labor_occupation_improved_EaW
+			add = -0.3
+		}
 		modifier = {
 			occupation_law = extractive_regime
 			add = -0.25
 		}
+		modifier = {
+			controller = { has_tech = tech_kirin_astrology }
+			factor = 0.75
+		}
 	}
 
 	effect = {
@@ -431,6 +505,12 @@ sabotage_aluminium = {
 			}
 			multiply_temp_variable = { duration = 0.75 }
 		}
+		if = {
+			limit = {
+				occupation_law = forced_labor_occupation_improved_EaW
+			}
+			multiply_temp_variable = { duration = 0.6 }
+		}
 		if = {
 			limit = {
 				has_variable = targeted_sabotage_resources
@@ -469,10 +549,18 @@ sabotage_rubber = {
 			occupation_law = forced_labor_occupation
 			add = -0.25
 		}
+		modifier = {
+			occupation_law = forced_labor_occupation_improved_EaW
+			add = -0.3
+		}
 		modifier = {
 			occupation_law = extractive_regime
 			add = -0.25
 		}
+		modifier = {
+			controller = { has_tech = tech_kirin_astrology }
+			factor = 0.75
+		}
 	}
 
 	effect = {
@@ -488,6 +576,12 @@ sabotage_rubber = {
 			}
 			multiply_temp_variable = { duration = 0.75 }
 		}
+		if = {
+			limit = {
+				occupation_law = forced_labor_occupation_improved_EaW
+			}
+			multiply_temp_variable = { duration = 0.6 }
+		}
 		if = {
 			limit = {
 				has_variable = targeted_sabotage_resources
@@ -526,10 +620,18 @@ sabotage_tungsten = {
 			occupation_law = forced_labor_occupation
 			add = -0.25
 		}
+		modifier = {
+			occupation_law = forced_labor_occupation_improved_EaW
+			add = -0.3
+		}
 		modifier = {
 			occupation_law = extractive_regime
 			add = -0.25
 		}
+		modifier = {
+			controller = { has_tech = tech_kirin_astrology }
+			factor = 0.75
+		}
 	}
 
 	effect = {
@@ -545,6 +647,12 @@ sabotage_tungsten = {
 			}
 			multiply_temp_variable = { duration = 0.75 }
 		}
+		if = {
+			limit = {
+				occupation_law = forced_labor_occupation_improved_EaW
+			}
+			multiply_temp_variable = { duration = 0.6 }
+		}
 		if = {
 			limit = {
 				has_variable = targeted_sabotage_resources
@@ -584,10 +692,18 @@ sabotage_steel = {
 			occupation_law = forced_labor_occupation
 			add = -0.25
 		}
+		modifier = {
+			occupation_law = forced_labor_occupation_improved_EaW
+			add = -0.3
+		}
 		modifier = {
 			occupation_law = extractive_regime
 			add = -0.25
 		}
+		modifier = {
+			controller = { has_tech = tech_kirin_astrology }
+			factor = 0.75
+		}
 	}
 
 	effect = {
@@ -603,6 +719,12 @@ sabotage_steel = {
 			}
 			multiply_temp_variable = { duration = 0.75 }
 		}
+		if = {
+			limit = {
+				occupation_law = forced_labor_occupation_improved_EaW
+			}
+			multiply_temp_variable = { duration = 0.6 }
+		}
 		if = {
 			limit = {
 				has_variable = targeted_sabotage_resources
@@ -641,10 +763,18 @@ sabotage_chromium = {
 			occupation_law = forced_labor_occupation
 			add = -0.25
 		}
+		modifier = {
+			occupation_law = forced_labor_occupation_improved_EaW
+			add = -0.3
+		}
 		modifier = {
 			occupation_law = extractive_regime
 			add = -0.25
 		}
+		modifier = {
+			controller = { has_tech = tech_kirin_astrology }
+			factor = 0.75
+		}
 	}
 
 	effect = {
@@ -660,6 +790,12 @@ sabotage_chromium = {
 			}
 			multiply_temp_variable = { duration = 0.75 }
 		}
+		if = {
+			limit = {
+				occupation_law = forced_labor_occupation_improved_EaW
+			}
+			multiply_temp_variable = { duration = 0.6 }
+		}
 		if = {
 			limit = {
 				has_variable = targeted_sabotage_resources
diff --git a/common/scorers/country/generic_platonic_scorers.txt b/common/scorers/country/generic_platonic_scorers.txt
new file mode 100644
index 00000000000..63b1122c4e1
--- /dev/null
+++ b/common/scorers/country/generic_platonic_scorers.txt
@@ -0,0 +1,451 @@
+fascist_major_scorer = { #Finds biggest Fascist
+    # Valid example of mission scorer:
+	targets = {
+		# describe the target to consider
+		targets_dynamic = no
+		target_non_existing = no
+		#target_array = global.majors
+		target_array = global.countries
+		# MTTH like score description
+		# THIS is a target
+		# FROM is the initiator
+		score = {
+			base = 1
+			# Add tension added by country
+			modifier = {
+				always = yes 
+				add = has_added_tension_amount
+			}        
+			# Add total number of Divisions 
+			modifier = {
+				always = yes 
+				add = num_armies
+			}
+			# add factories
+			modifier = {
+				always = yes 
+				add = num_of_factories
+			}
+			modifier = {# If Changelings or Griffonian Empire are fascist, they are something to be vary about - always 
+				OR = {
+					tag = GRI
+					tag = CHN 
+				}
+				factor = 1.5
+			}
+			modifier = { # Aquileia, Republic, and Wingbardy should have preference, but not as much as Changelings or Griffons
+				OR = {
+					tag = JER
+					tag = FAW # FAT's civil war for fascism
+					tag = WNG
+				}  
+				factor = 1.3
+			}
+			modifier = {
+				is_major = yes
+				add = 100
+			}
+			modifier = {
+				is_faction_leader = yes 
+				add = 50
+			}
+			modifier = {
+				NOT = { has_government = fascism }
+				factor = 0 
+			}
+			modifier = {
+				exists = no 
+				factor = 0
+			}
+		}
+	}
+}
+democratic_major_scorer = { # Finds biggest Democratic Nation
+	targets = {
+		# describe the target to consider
+		targets_dynamic = no
+		target_non_existing = no
+		#target_array = global.majors
+		target_array = global.countries
+		# MTTH like score description
+		# THIS is a target
+		# FROM is the initiator
+		score = {
+			base = 1
+			# Add tension added by country
+			modifier = {
+				always = yes 
+				add = has_added_tension_amount
+			}        
+			# Add total number of Divisions 
+			modifier = {
+				always = yes 
+				add = num_armies
+			}
+			# add factories
+			modifier = {
+				always = yes 
+				add = num_of_factories
+			}
+			modifier = {
+				tag = EQS # If Equestria is still democratic, they should have preference
+				factor = 1.5
+			}
+			modifier = { # Hippogriffia and River Republic should have preference, but not as much as EQS   
+				OR = {
+					tag = RCT
+					tag = HIP
+				}
+				factor = 1.3
+			}
+			modifier = {
+				is_major = yes
+				add = 100
+			}
+			modifier = {
+				is_faction_leader = yes 
+				add = 50
+			}
+			modifier = {
+				NOT = { has_government = democratic }
+				factor = 0 
+			}
+		}
+	}
+}
+
+communist_major_scorer = { # Finds biggest Communist
+	targets = {
+		# describe the target to consider
+		targets_dynamic = no
+		target_non_existing = no
+		#target_array = global.majors
+		target_array = global.countries
+		# MTTH like score description
+		# THIS is a target
+		# FROM is the initiator
+		score = {
+			base = 1
+			# Add tension added by country
+			modifier = {
+				always = yes 
+				add = has_added_tension_amount
+			}        
+			# Add total number of Divisions 
+			modifier = {
+				always = yes 
+				add = num_armies
+			}
+			# add factories
+			modifier = {
+				always = yes 
+				add = num_of_factories
+			}
+			modifier = {
+				tag = STG # If Stalliongrad is still communist, they are something to be vary about - always 
+				factor = 1.5
+			}
+			modifier = {
+				is_major = yes
+				add = 100
+			}
+			modifier = {
+				is_faction_leader = yes 
+				add = 50
+			}
+			modifier = {
+				NOT = { has_government = communism }
+				factor = 0 
+			}
+		}
+	}
+}
+
+non_aligned_major_scorer = { # Finds biggest Non-Aligned
+	targets = {
+		# describe the target to consider
+		targets_dynamic = no
+		target_non_existing = no
+		#target_array = global.majors
+		target_array = global.countries
+		# MTTH like score description
+		# THIS is a target
+		# FROM is the initiator
+		score = {
+			base = 1
+			# Add tension added by country
+			modifier = {
+				always = yes 
+				add = has_added_tension_amount
+			}        
+			# Add total number of Divisions 
+			modifier = {
+				always = yes 
+				add = num_armies
+			}
+			# add factories
+			modifier = {
+				always = yes 
+				add = num_of_factories
+			}
+			modifier = {
+				tag = GRI # If Griffonian Empire is still non-aligned, they are something to be vary about - always 
+				factor = 1.5
+			}
+			modifier = {
+				is_major = yes
+				add = 100
+			}
+			modifier = {
+				is_faction_leader = yes 
+				add = 50
+			}
+			modifier = {
+				NOT = { has_government = neutrality }
+				factor = 0 
+			}
+		}
+	}
+}
+
+local_fascist_country = {
+	# Valid example of mission scorer:
+	targets = {
+		# describe the target to consider
+		targets_dynamic = no
+		target_non_existing = no
+		#target_array = global.majors
+		target_array = global.countries
+		# MTTH like score description
+		# THIS is a target
+		# FROM is the initiator
+		score = {
+			base = 1
+			
+			modifier = {
+				is_major = yes
+				factor = 10
+			}
+			# Add tension added by country
+			modifier = {
+				always = yes 
+				add = has_added_tension_amount
+			}
+			# Add total number of Divisions 
+			modifier = {
+				always = yes
+				add = num_armies 
+			}
+			modifier = {
+				tag = CHN # If Changelings is still fascist, they are something to be vary about - always 
+				factor = 1.8
+			}
+			# If neighbor, more scary
+			modifier = {
+				is_neighbor_of = FROM
+				factor = 2
+			}
+			# Same continent also more scary
+			modifier = {
+				OR = {
+					AND = {
+						THIS.capital_scope = { is_on_continent = europe }
+						FROM.capital_scope = { is_on_continent = europe }
+					}
+					AND = {
+						THIS.capital_scope = { is_on_continent = asia }
+						FROM.capital_scope = { is_on_continent = asia }
+					}
+					AND = {
+						THIS.capital_scope = { is_on_continent = africa }
+						FROM.capital_scope = { is_on_continent = africa }
+					}
+				}
+				factor = 3
+			}
+			modifier = {
+				add = num_armies
+			}
+			# add factories
+			modifier = {
+				always = yes 
+				add = num_of_factories
+			}
+			modifier = {
+				NOT = { has_government = fascism }
+				factor = 0 
+			}
+		}
+	}
+}
+
+fascist_bully_scorer = { #Finds meanest fascist
+    # Valid example of mission scorer:
+	targets = {
+		# describe the target to consider
+		targets_dynamic = no
+		target_non_existing = no
+		#target_array = global.majors
+		target_array = global.countries
+		# MTTH like score description
+		# THIS is a target
+		# FROM is the initiator
+		score = {
+			base = 1
+			# Add tension added by country
+			# Add total number of Divisions 
+			modifier = {
+				always = yes 
+				add = num_armies
+			}
+			# add factories
+			modifier = {
+				always = yes 
+				add = num_of_factories
+			}
+			modifier = {
+				always = yes 
+				add = has_added_tension_amount
+			}
+			modifier = {# If Changelings or Griffonian Empire are fascist, they are something to be vary about - always 
+				OR = {
+					tag = GRI
+					tag = CHN 
+				}
+				factor = 1.5
+			}
+			modifier = { # Aquileia, Republic, and Wingbardy should have preference, but not as much as Changelings or Griffons
+				OR = {
+					tag = JER
+					tag = FAW # FAT's civil war for fascism
+					tag = WNG
+				}  
+				factor = 1.3
+			}
+			modifier = {
+				is_major = yes
+				add = 100
+			}
+			modifier = {
+				is_faction_leader = yes 
+				add = 100
+			}
+			modifier = {
+				NOT = { has_government = fascism }
+				factor = 0 
+			}
+		}
+	}
+}
+democratic_faction_leader_scorer = { # Finds biggest Democratic Nation
+	targets = {
+		# describe the target to consider
+		targets_dynamic = no
+		target_non_existing = no
+		#target_array = global.majors
+		target_array = global.countries
+		# MTTH like score description
+		# THIS is a target
+		# FROM is the initiator
+		score = {
+			base = 1
+			# Add tension added by country
+			modifier = {
+				always = yes 
+				add = has_added_tension_amount
+			}        
+			# Add total number of Divisions 
+			modifier = {
+				always = yes 
+				add = num_armies
+			}
+			# add factories
+			modifier = {
+				always = yes 
+				add = num_of_factories
+			}
+			modifier = {
+				tag = EQS # If Equestria is still democratic, they should have preference
+				factor = 1.5
+			}
+			modifier = { # Hippogriffia and River Republic should have preference, but not as much as EQS   
+				OR = {
+					tag = RCT
+					tag = HIP
+				}
+				factor = 1.3
+			}
+			modifier = {
+				is_major = yes
+				add = 100
+			}
+			modifier = {
+				is_faction_leader = no 
+				factor = 0.1
+			}
+			modifier = {
+				NOT = { has_government = democratic }
+				factor = 0 
+			}
+		}
+	}
+}
+
+democratic_sleeping_giant_scorer = { #Finds the least armed big democratic country. 
+ 	targets = {
+		# describe the target to consider
+		targets_dynamic = no
+		target_non_existing = no
+		#target_array = global.majors
+		target_array = global.countries
+		# MTTH like score description
+		# THIS is a target
+		# FROM is the initiator
+		score = {
+			base = 1
+			# Add tension added by country
+			# Add total number of Divisions 
+			# add factories
+			modifier = {
+				always = yes 
+				add = num_of_factories
+			}
+			modifier = {
+				always = yes 
+				add = -num_armies
+			}
+			modifier = {
+				always = yes 
+				add = -has_added_tension_amount
+			}        
+			modifier = {
+				tag = EQS # If Equestria is still democratic, they should have preference
+				factor = 1.5
+			}
+			modifier = { # River Republic and Hippogriffia should have preference, but not as much as the UK   
+				OR = {
+					tag = RCT
+					tag = HIP
+				}
+				factor = 1.2
+			}
+			modifier = {
+				is_major = yes
+				add = 30
+			}
+			modifier = {
+				is_faction_leader = yes 
+				factor = 0.5
+			}
+			modifier = {
+				NOT = { has_government = democratic }
+				factor = 0 
+			}
+		}
+	}   
+}
+
+
+###################################################
+###########       BY CONTINTENT     ###############
+###################################################
diff --git a/common/script_enums.txt b/common/script_enums.txt
index 5ed6827a63a..540ffaceb5b 100644
--- a/common/script_enums.txt
+++ b/common/script_enums.txt
@@ -1,102 +1,580 @@
-script_enum_equipment_bonus_type = {
-	## Air
-	fighter_equipment
-	cv_fighter_equipment
-	jet_fighter_equipment
-	cv_CAS_equipment
-	CAS_equipment
-	nav_bomber_equipment
-	cv_nav_bomber_equipment
-	rocket_interceptor_equipment
-	tac_bomber_equipment
-	jet_tac_bomber_equipment
-	heavy_fighter_equipment
-	strat_bomber_equipment
-	jet_strat_bomber_equipment
-	transport_plane_equipment
-	guided_missile_equipment
-	scout_plane_equipment
-	small_plane_airframe
-	cv_small_plane_airframe
-	small_plane_cas_airframe
-	cv_small_plane_cas_airframe
-	small_plane_naval_bomber_airframe
-	cv_small_plane_naval_bomber_airframe
-	medium_plane_airframe
-	medium_plane_fighter_airframe
-	medium_plane_scout_plane_airframe
-	large_plane_airframe
-	large_plane_maritime_patrol_plane_airframe
-	
+script_enum_operative_mission_type = {
+	build_intel_network
+	counter_intelligence
+	quiet_network
+	root_out_resistance
+	control_trade
+}
+
+script_enum_advisor_slot_type = {
+	theorist
+	high_command
+	army_chief
+	navy_chief
+	air_chief
+	political_advisor
+}
+script_enum_equipment_stat = {	
+								#Viktors note for modders and future CDs: If you want to use a stat in the MIOs it has to be in the equipment category itself, not on the battalion level. So stuff like defense works because its contained within the equipment, but stuff like recon will not work because its owned by the battalion. Adding stuff like recon will not throw an error, but it will _not_ work. Moving stats to the equipment level from the bat-level might fix this if you are brave enough, but it is very risk and might break other stuff. Ive commented what is currently on the battalion level below and should not be used with MIOs.
+
+	default_morale 					#Cannot be used with MIOS
+	defense
+	breakthrough
+	hardness
+	soft_attack
+	hard_attack
+	recon 							#Cannot be used with MIOS
+	entrenchment					# ONLY works for tanks with dozer blades, NOT infantry
+	initiative 						#Cannot be used with MIOS
+	casualty_trickleback 			#Cannot be used with MIOS
+	supply_consumption_factor 		#Cannot be used with MIOS
+	supply_consumption 				#Cannot be used with MIOS
+	suppression 					#Cannot be used with MIOS
+	suppression_factor 				#Cannot be used with MIOS
+	experience_loss_factor 			#Cannot be used with MIOS
+	equipment_capture_factor 		#Cannot be used with MIOS
+	fuel_capacity
+	surface_detection
+	sub_detection
+	surface_visibility
+	sub_visibility
+	lg_attack
+	lg_armor_piercing
+	hg_attack
+	hg_armor_piercing
+	torpedo_attack
+	sub_attack
+	anti_air_attack
+	amphibious_defense
+	naval_speed
+	naval_range
+	mines_planting
+	mines_sweeping
+	naval_light_gun_hit_chance_factor
+	naval_heavy_gun_hit_chance_factor
+	naval_torpedo_hit_chance_factor
+	naval_torpedo_damage_reduction_factor
+	naval_torpedo_enemy_critical_chance_factor
+	convoy_raiding_coordination
+	patrol_coordination
+	search_and_destroy_coordination
+	air_range
+	air_defence
+	air_attack
+	air_agility
+	air_bombing
+	air_superiority
+	naval_strike_attack
+	naval_strike_targetting
+	air_ground_attack
+	air_visibility_factor
+	railway_gun_attack 			#Cannot be used with MIOS
+	railway_gun_attack_range 	#I think this needs to be changed in a define, not here since its cached at start
+	max_organisation			#Cannot be used with MIOS
+	max_strength				##Cannot be used with MIOS
+	maximum_speed	
+	armor_value
+	ap_attack
+	reliability
+	reliability_factor
+	weight
+	thrust 						#DLC Only be careful and avoid unless needed
+	fuel_consumption
+	fuel_consumption_factor
+	strategic_attack
+	carrier_size
+	acclimatization_hot_climate_gain_factor			#Cannot be used with MIOS
+	acclimatization_cold_climate_gain_factor		#Cannot be used with MIOS
+	night_penalty				#Cannot be used with MIOS
+	build_cost_ic
+	naval_weather_penalty_factor
+}
+
+script_enum_production_stat = {
+	production_cost_factor
+	production_capacity_factor
+	production_efficiency_cap_factor
+	production_efficiency_gain_factor
+	production_resource_need_factor
+	production_resource_penalty_factor
+	production_conversion_speed_factor
+}
 
+script_enum_equipment_category = {
+	convoy
+	train
+	floating_harbor
+	railway_gun
+	armor
+	motorized
+	mechanized
+	infantry
+	capital_ship
+	submarine
+	screen_ship
 	fighter
+	heavy_fighter
+	interceptor
+	tactical_bomber
+	strategic_bomber
 	cas
+	naval_bomber
+	missile
+	suicide
+	scout_plane
+	maritime_patrol_plane
+	air_transport
+	carrier
+	support
+	amphibious
+	anti_air
+	artillery
+	anti_tank
+	rocket
+	flame
+}
+
+script_enum_equipment_bonus_type = {
+	## This script enum contains all equipment types that can be used in equipment_bonus
+	## or in game/common/military_industrial_organization scripts.
+
+	## This list contains either equipment category (see script_enum_equipment_category above)
+	## or equipment archetypes & types defined in game/common/units/equipments
+
+	## This enum should be updated every time either of those is updated
+	## (there will be a log error at startup as a reminder)
+
+	# Equipment categories
+	convoy
+	train
+	floating_harbor
+	railway_gun
+	armor
+	motorized
+	mechanized
+	infantry
+	capital_ship
+	submarine
+	screen_ship
+	fighter
+	heavy_fighter
+	interceptor
 	tactical_bomber
+	strategic_bomber
+	cas
+	naval_bomber
+	missile
+	suicide
 	scout_plane
+	maritime_patrol_plane
+	air_transport
+	carrier
+	support
+	amphibious
+	anti_air
+	artillery
+	anti_tank
+	rocket
+	flame
 
-	## Land
+	# Equipment archetypes & types
+	destroyer
 	infantry_equipment
-	support_equipment
 	artillery_equipment
-	rocket_artillery_equipment
 	anti_tank_equipment
-	anti_air_equipment
-	artillery
-
 	amphibious_mechanized_equipment
+	amphibious_mechanized_equipment_1
+	amphibious_mechanized_equipment_2
+	anti_air_equipment
+	anti_air_equipment_1
+	anti_air_equipment_2
+	anti_air_equipment_3
+	anti_tank_equipment_1
+	anti_tank_equipment_2
+	anti_tank_equipment_3
 	armored_car_equipment
+	gw_armored_car_equipment
+	armored_car_equipment_1
+	armored_car_equipment_2
+	armored_car_at_equipment
+	artillery_equipment_1
+	artillery_equipment_2
+	artillery_equipment_3
+	rocket_artillery_equipment
+	rocket_artillery_equipment_1
+	rocket_artillery_equipment_2
+	motorized_rocket_equipment
+	motorized_rocket_equipment_1
+	convoy_1
+	floating_harbor_equipment
+	floating_harbor_equipment_1
+	guided_missile_equipment
+	guided_missile_equipment_1
+	guided_missile_equipment_2
+	guided_missile_equipment_3
+	infantry_equipment_0
+	infantry_equipment_1
+	infantry_equipment_2
+	infantry_equipment_3
 	mechanized_equipment
+	mechanized_equipment_1
+	mechanized_equipment_2
+	mechanized_equipment_3
 	motorized_equipment
-	motorized_rocket_equipment
-	train_equipment
+	motorized_equipment_0
+	motorized_equipment_1
+	small_plane_airframe
+	cv_small_plane_airframe
+	small_plane_airframe_0
+	small_plane_airframe_1
+	small_plane_airframe_2
+	small_plane_airframe_3
+	small_plane_airframe_4
+	cv_small_plane_airframe_0
+	cv_small_plane_airframe_1
+	cv_small_plane_airframe_2
+	cv_small_plane_airframe_3
+	cv_small_plane_airframe_4
+	medium_plane_airframe
+	medium_plane_airframe_0
+	medium_plane_airframe_1
+	medium_plane_airframe_2
+	medium_plane_airframe_3
+	medium_plane_airframe_4
+	large_plane_airframe
+	large_plane_airframe_0
+	large_plane_airframe_1
+	large_plane_airframe_2
+	large_plane_airframe_3
+	large_plane_airframe_4
+	transport_plane_equipment
+	transport_plane_equipment_1
 	railway_gun_equipment
-
-	armor
+	railway_gun_equipment_1
+	ship_hull_carrier
+	ship_hull_carrier_1
+	ship_hull_carrier_2
+	ship_hull_carrier_3
+	ship_hull_carrier_conversion_bb
+	ship_hull_carrier_conversion_ca
+	carrier_1
+	carrier_2
+	carrier_3
+	carrier_4
+	ship_hull_cruiser
+	light_cruiser
+	ship_hull_cruiser_1
+	ship_hull_cruiser_2
+	ship_hull_cruiser_3
+	ship_hull_cruiser_4
+	light_cruiser_1
+	light_cruiser_2
+	light_cruiser_3
+	light_cruiser_4
+	heavy_cruiser_1
+	heavy_cruiser_2
+	heavy_cruiser_3
+	heavy_cruiser_4
+	torpedo_cruiser
+	ship_hull_torpedo_cruiser
+	ship_hull_cruiser_panzerschiff
+	ship_hull_cruiser_coastal_defense_ship
+	ship_hull_heavy
+	ship_hull_pre_dreadnought
+	ship_hull_heavy_1
+	ship_hull_heavy_2
+	ship_hull_heavy_3
+	ship_hull_heavy_4
+	ship_hull_super_heavy_1
+	battleship_1
+	battleship_2
+	battleship_3
+	battleship_4
+	SH_battleship_1
+	SH_battleship_2
+	battle_cruiser_1
+	battle_cruiser_2
+	ship_hull_light
+	ship_hull_light_1
+	ship_hull_light_2
+	ship_hull_light_3
+	ship_hull_light_4
+	destroyer_1
+	destroyer_2
+	destroyer_3
+	destroyer_4
+	ship_hull_submarine
+	ship_hull_submarine_1
+	ship_hull_submarine_2
+	ship_hull_submarine_3
+	ship_hull_submarine_4
+	ship_hull_cruiser_submarine
+	ship_hull_midget_submarine
+	submarine_1
+	submarine_2
+	submarine_3
+	submarine_4
+	support_equipment
+	support_equipment_1
 	light_tank_chassis
+	light_tank_chassis_0
+	light_tank_chassis_1
+	light_tank_chassis_2
+	light_tank_chassis_3
 	medium_tank_chassis
+	medium_tank_chassis_0
+	medium_tank_chassis_1
+	medium_tank_chassis_2
+	medium_tank_chassis_3
 	heavy_tank_chassis
-	super_heavy_tank_chassis
+	heavy_tank_chassis_0
+	heavy_tank_chassis_1
+	heavy_tank_chassis_2
+	heavy_tank_chassis_3
 	modern_tank_chassis
+	modern_tank_chassis_1
+	super_heavy_tank_chassis
+	super_heavy_tank_chassis_1
 	amphibious_tank_chassis
-
+	amphibious_tank_chassis_1
+	train_equipment
+	train_equipment_1
+	train_equipment_2
+	train_equipment_3
+	small_plane_cas_airframe
+	cv_small_plane_cas_airframe
+	small_plane_naval_bomber_airframe
+	cv_small_plane_naval_bomber_airframe
+	small_plane_suicide_airframe
+	cv_small_plane_suicide_airframe
+	medium_plane_fighter_airframe
+	medium_plane_scout_plane_airframe
+	large_plane_maritime_patrol_plane_airframe
+	jet_fighter_equipment
+	rocket_interceptor_equipment
+	jet_tac_bomber_equipment
+	jet_strat_bomber_equipment
+	small_plane_cas_airframe_0
+	small_plane_cas_airframe_1
+	small_plane_cas_airframe_2
+	small_plane_cas_airframe_3
+	small_plane_cas_airframe_4
+	cv_small_plane_cas_airframe_0
+	cv_small_plane_cas_airframe_1
+	cv_small_plane_cas_airframe_2
+	cv_small_plane_cas_airframe_3
+	cv_small_plane_cas_airframe_4
+	small_plane_naval_bomber_airframe_0
+	small_plane_naval_bomber_airframe_1
+	small_plane_naval_bomber_airframe_2
+	small_plane_naval_bomber_airframe_3
+	small_plane_naval_bomber_airframe_4
+	cv_small_plane_naval_bomber_airframe_0
+	cv_small_plane_naval_bomber_airframe_1
+	cv_small_plane_naval_bomber_airframe_2
+	cv_small_plane_naval_bomber_airframe_3
+	cv_small_plane_naval_bomber_airframe_4
+	small_plane_suicide_airframe_0
+	small_plane_suicide_airframe_1
+	small_plane_suicide_airframe_2
+	small_plane_suicide_airframe_3
+	small_plane_suicide_airframe_4
+	cv_small_plane_suicide_airframe_0
+	cv_small_plane_suicide_airframe_1
+	cv_small_plane_suicide_airframe_2
+	cv_small_plane_suicide_airframe_3
+	cv_small_plane_suicide_airframe_4
+	medium_plane_fighter_airframe_0
+	medium_plane_fighter_airframe_1
+	medium_plane_fighter_airframe_2
+	medium_plane_fighter_airframe_3
+	medium_plane_fighter_airframe_4
+	medium_plane_scout_plane_airframe_0
+	medium_plane_scout_plane_airframe_1
+	medium_plane_scout_plane_airframe_2
+	medium_plane_scout_plane_airframe_3
+	medium_plane_scout_plane_airframe_4
+	large_plane_maritime_patrol_plane_airframe_0
+	large_plane_maritime_patrol_plane_airframe_1
+	large_plane_maritime_patrol_plane_airframe_2
+	large_plane_maritime_patrol_plane_airframe_3
+	large_plane_maritime_patrol_plane_airframe_4
+	fighter_equipment_0
+	fighter_equipment_1
+	fighter_equipment_2
+	fighter_equipment_3
+	jet_fighter_equipment_1
+	jet_fighter_equipment_2
+	cv_fighter_equipment_0
+	cv_fighter_equipment_1
+	cv_fighter_equipment_2
+	cv_fighter_equipment_3
+	CAS_equipment_1
+	CAS_equipment_2
+	CAS_equipment_3
+	cv_CAS_equipment_1
+	cv_CAS_equipment_2
+	cv_CAS_equipment_3
+	nav_bomber_equipment_1
+	nav_bomber_equipment_2
+	nav_bomber_equipment_3
+	cv_nav_bomber_equipment_1
+	cv_nav_bomber_equipment_2
+	cv_nav_bomber_equipment_3
+	rocket_interceptor_equipment_1
+	rocket_interceptor_equipment_2
+	rocket_interceptor_equipment_3
+	rocket_suicide_equipment_1
+	tac_bomber_equipment_0
+	tac_bomber_equipment_1
+	tac_bomber_equipment_2
+	tac_bomber_equipment_3
+	jet_tac_bomber_equipment_1
+	jet_tac_bomber_equipment_2
+	heavy_fighter_equipment_1
+	heavy_fighter_equipment_2
+	heavy_fighter_equipment_3
+	scout_plane_equipment_1
+	scout_plane_equipment_2
+	strat_bomber_equipment_1
+	strat_bomber_equipment_2
+	strat_bomber_equipment_3
+	jet_strat_bomber_equipment_1
+	light_tank_aa_chassis
 	light_tank_artillery_chassis
-	medium_tank_artillery_chassis
-	heavy_tank_artillery_chassis
-	super_heavy_tank_artillery_chassis
-	modern_tank_artillery_chassis
-
 	light_tank_destroyer_chassis
-	medium_tank_destroyer_chassis
-	heavy_tank_destroyer_chassis
-	super_heavy_tank_destroyer_chassis
-	modern_tank_destroyer_chassis
-
-	light_tank_aa_chassis
+	light_tank_amphibious_chassis
+	light_tank_flame_chassis
 	medium_tank_aa_chassis
+	medium_tank_artillery_chassis
+	medium_tank_destroyer_chassis
+	medium_tank_amphibious_chassis
+	medium_tank_flame_chassis
 	heavy_tank_aa_chassis
+	heavy_tank_artillery_chassis
+	heavy_tank_destroyer_chassis
+	heavy_tank_amphibious_chassis
+	heavy_tank_flame_chassis
 	super_heavy_tank_aa_chassis
+	super_heavy_tank_artillery_chassis
+	super_heavy_tank_destroyer_chassis
 	modern_tank_aa_chassis
+	modern_tank_artillery_chassis
+	modern_tank_destroyer_chassis
+	light_tank_aa_chassis_0
+	light_tank_aa_chassis_1
+	light_tank_aa_chassis_2
+	light_tank_aa_chassis_3
+	light_tank_artillery_chassis_0
+	light_tank_artillery_chassis_1
+	light_tank_artillery_chassis_2
+	light_tank_artillery_chassis_3
+	light_tank_destroyer_chassis_0
+	light_tank_destroyer_chassis_1
+	light_tank_destroyer_chassis_2
+	light_tank_destroyer_chassis_3
+	light_tank_amphibious_chassis_0
+	light_tank_amphibious_chassis_1
+	light_tank_amphibious_chassis_2
+	light_tank_amphibious_chassis_3
+	light_tank_flame_chassis_0
+	light_tank_flame_chassis_1
+	light_tank_flame_chassis_2
+	light_tank_flame_chassis_3
+	medium_tank_aa_chassis_0
+	medium_tank_aa_chassis_1
+	medium_tank_aa_chassis_2
+	medium_tank_aa_chassis_3
+	medium_tank_artillery_chassis_0
+	medium_tank_artillery_chassis_1
+	medium_tank_artillery_chassis_2
+	medium_tank_artillery_chassis_3
+	medium_tank_destroyer_chassis_0
+	medium_tank_destroyer_chassis_1
+	medium_tank_destroyer_chassis_2
+	medium_tank_destroyer_chassis_3
+	medium_tank_amphibious_chassis_0
+	medium_tank_amphibious_chassis_1
+	medium_tank_amphibious_chassis_2
+	medium_tank_amphibious_chassis_3
+	medium_tank_flame_chassis_0
+	medium_tank_flame_chassis_1
+	medium_tank_flame_chassis_2
+	medium_tank_flame_chassis_3
+	heavy_tank_aa_chassis_0
+	heavy_tank_aa_chassis_1
+	heavy_tank_aa_chassis_2
+	heavy_tank_aa_chassis_3
+	heavy_tank_artillery_chassis_0
+	heavy_tank_artillery_chassis_1
+	heavy_tank_artillery_chassis_2
+	heavy_tank_artillery_chassis_3
+	heavy_tank_destroyer_chassis_0
+	heavy_tank_destroyer_chassis_1
+	heavy_tank_destroyer_chassis_2
+	heavy_tank_destroyer_chassis_3
+	heavy_tank_amphibious_chassis_0
+	heavy_tank_amphibious_chassis_1
+	heavy_tank_amphibious_chassis_2
+	heavy_tank_amphibious_chassis_3
+	heavy_tank_flame_chassis_0
+	heavy_tank_flame_chassis_1
+	heavy_tank_flame_chassis_2
+	heavy_tank_flame_chassis_3
+	super_heavy_tank_aa_chassis_1
+	super_heavy_tank_artillery_chassis_1
+	super_heavy_tank_destroyer_chassis_1
+	modern_tank_aa_chassis_1
+	modern_tank_artillery_chassis_1
+	modern_tank_destroyer_chassis_1
+	gw_tank_equipment
+	light_tank_equipment_1
+	light_tank_equipment_2
+	light_tank_equipment_3
+	light_tank_artillery_equipment_1
+	light_tank_artillery_equipment_2
+	light_tank_artillery_equipment_3
+	light_tank_destroyer_equipment_1
+	light_tank_destroyer_equipment_2
+	light_tank_destroyer_equipment_3
+	light_tank_aa_equipment_1
+	light_tank_aa_equipment_2
+	light_tank_aa_equipment_3
+	medium_tank_equipment_1
+	medium_tank_equipment_2
+	medium_tank_equipment_3
+	medium_tank_artillery_equipment_1
+	medium_tank_artillery_equipment_2
+	medium_tank_artillery_equipment_3
+	medium_tank_destroyer_equipment_1
+	medium_tank_destroyer_equipment_2
+	medium_tank_destroyer_equipment_3
+	medium_tank_aa_equipment_1
+	medium_tank_aa_equipment_2
+	medium_tank_aa_equipment_3
+	heavy_tank_equipment_1
+	heavy_tank_equipment_2
+	heavy_tank_equipment_3
+	heavy_tank_artillery_equipment_1
+	heavy_tank_artillery_equipment_2
+	heavy_tank_artillery_equipment_3
+	heavy_tank_destroyer_equipment_1
+	heavy_tank_destroyer_equipment_2
+	heavy_tank_destroyer_equipment_3
+	heavy_tank_aa_equipment_1
+	heavy_tank_aa_equipment_2
+	heavy_tank_aa_equipment_3
+	modern_tank_equipment_1
+	modern_tank_artillery_equipment_1
+	modern_tank_destroyer_equipment_1
+	modern_tank_aa_equipment_1
+	super_heavy_tank_equipment_1
+	super_heavy_tank_artillery_equipment_1
+	super_heavy_tank_destroyer_equipment_1
+	super_heavy_tank_aa_equipment_1
+	amphibious_tank_equipment_1
+	amphibious_tank_equipment_2
 	
-	## Sea
-	ship_hull_light
-	ship_hull_heavy
-	ship_hull_submarine
-	ship_hull_cruiser
-	ship_hull_carrier
-	ship_hull_super_heavy
-	ship_hull_super_heavy_1
-
-	convoy
-	submarine
-	destroyer
-	screen_ship
-	carrier
-	heavy_cruiser
-	capital_ship
-
-	ship_hull_cruiser_coastal_defense_ship
-	floating_harbor_equipment
-
 	## EAW Unique
 	bar_leopold_equipment 
 	magical_equipment
@@ -107,21 +585,249 @@ script_enum_equipment_bonus_type = {
 	heavy_airship_equipment_0 
 	super_griffons_armor
 	super_griffons_weapon
-}
-
-script_enum_operative_mission_type = {
-	build_intel_network
-	counter_intelligence
-	quiet_network
-	root_out_resistance
-	control_trade
-}
-
-script_enum_advisor_slot_type = {
-	theorist
-	high_command
-	army_chief
-	navy_chief
-	air_chief
-	political_advisor
+	bar_leopold_equipment_1
+	CTH_convoy
+	living_factory_equipment
+	living_factory_equipment_0
+	bone_abomination_equipment
+	bone_abomination_equipment_0
+	dark_mage_equipment
+	dark_mage_equipment_0
+	bone_armor_equipment
+	bone_armor_equipment_0
+	fused_pony_equipment
+	fused_pony_equipment_0
+	swarm_equipment
+	swarm_equipment_0
+	dragon_equipment
+	dragon_equipment_0
+	dragon_equipment_1
+	windigo_equipment_0
+	super_griffons_weapon_1
+	super_griffons_armor_1
+	polar_bear_equipment_0
+	polar_bear_equipment_1
+	ship_hull_cloud_carrier
+	carrier_cloud
+	CHN_manehattan_protectorate_railway_gun
+	tatzelwurm_equipment
+	tatzelwurm_equipment_0
+	tatzelwurm_equipment_1
+	tatzelwurm_armor_equipment_0
+	
+	### EAW Extra equipment 
+	
+	amphibious_mechanized_equipment_3 
+	amphibious_mechanized_equipment_4
+	amphibious_mechanized_equipment_5
+	anti_air_equipment_x
+	anti_air_equipment_x_2
+	anti_tank_equipment_x
+	anti_tank_equipment_x_2
+	armored_car_equipment_3
+	armored_car_equipment_4
+	armored_car_at_equipment2
+	artillery_equipment_0
+	artillery_equipment_x
+	artillery_equipment_x_2
+	rocket_artillery_equipment_x
+	rocket_artillery_equipment_x_2
+	motorized_rocket_equipment_2
+	guided_missile_equipment_4
+	guided_missile_equipment_5
+	attack_helicopter_equipment
+	attack_helicopter_equipment_1
+	transport_helicopter_equipment
+	transport_helicopter_equipment_1
+	transport_helicopter_equipment_2
+	scout_helicopter_equipment
+	scout_helicopter_equipment_1
+	scout_helicopter_equipment_2
+	melee_equipment_0
+	melee_equipment_1
+	infantry_equipment_x
+	infantry_equipment_x_2
+	magical_equipment
+	magical_equipment_1
+	magical_equipment_2
+	magical_equipment_3
+	magical_equipment_4
+	magical_tank_equipment
+	magical_tank_equipment_1
+	magical_artillery_equipment
+	magical_artillery_equipment_1
+	mechanized_equipment_x
+	mechanized_equipment_x_2
+	motorized_equipment_2
+	motorized_equipment_3
+	small_plane_airframe_5
+	cv_small_plane_airframe_5
+	medium_airship_airframe_0
+	medium_plane_airframe_5
+	large_airship_airframe_0
+	large_plane_airframe_5
+	super_large_plane_airframe_1
+	transport_plane_equipment_2
+	transport_plane_equipment_3
+	railway_gun_equipment_2
+	train_equipment_4 
+	ship_hull_carrier_4
+	ship_hull_carrier_5
+	ship_hull_supercarrier_1
+	light_carrier_1
+	carrier_5
+	carrier_6
+	ship_hull_cruiser_5
+	ship_hull_cruiser_6
+	light_cruiser_5
+	light_cruiser_6
+	heavy_cruiser_5
+	heavy_cruiser_6
+	coastal_defense_ship_nomtg
+	ship_hull_grand_cruiser
+	panzerschiff_nomtg
+	pre_dreadnought_nomtg
+	ship_hull_heavy_5
+	ship_hull_heavy_6
+	ship_hull_super_heavy_2
+	battleship_5
+	battleship_6
+	SH_battleship_3
+	battle_cruiser_3
+	ship_hull_grand_cruiser2
+	ship_hull_grand_cruiser3
+	ship_hull_light_5
+	ship_hull_light_6
+	destroyer_5
+	destroyer_6
+	ship_hull_destroyer_escort
+	destroyer_escort
+	ship_hull_monitor
+	monitor
+	heavy_monitor
+	light_monitor
+	ship_hull_submarine_5
+	ship_hull_submarine_6
+	ship_hull_cruiser_submarine_2
+	ship_hull_missile_submarine_1
+	submarine_5
+	submarine_6
+	cruiser_submarine_nomtg
+	light_tank_chassis_4
+	light_tank_chassis_5
+	modern_tank_chassis_2
+	modern_tank_chassis_3
+	super_heavy_tank_chassis_2
+	super_heavy_tank_chassis_3
+	small_plane_cas_airframe_5
+	cv_small_plane_cas_airframe_5
+	small_plane_naval_bomber_airframe_5
+	cv_small_plane_naval_bomber_airframe_5
+	small_plane_suicide_airframe_5
+	cv_small_plane_suicide_airframe_5
+	medium_plane_fighter_airframeairship_airframe_0
+	medium_plane_fighter_airframe_5
+	medium_plane_scout_plane_airframeairship_airframe_0
+	medium_plane_scout_plane_airframe_5
+	large_plane_maritime_patrol_plane_airframeairship_airframe_0
+	large_plane_maritime_patrol_plane_airframe_5
+	large_plane_maritime_patrol_plane_airframesuper_large_plane_airframe_1
+	jet_fighter_equipment_x
+	cv_jet_fighter_equipment_1
+	cv_jet_fighter_equipment_2
+	cv_jet_fighter_equipment_x
+	jet_strike_craft_equipment_x
+	jet_strike_craft_equipment_x_2
+	jet_strike_craft_equipment_x_3
+	cv_jet_strike_craft_equipment_x
+	cv_jet_strike_craft_equipment_x_2
+	cv_jet_strike_craft_equipment_x_3
+	rocket_interceptor_equipment_4
+	rocket_interceptor_equipment_5
+	jet_tac_bomber_equipment_x
+	jet_heavy_fighter_equipment_x
+	scout_plane_equipment_x
+	jet_scout_plane_equipment_x
+	jet_strat_bomber_equipment_x
+	jet_heavy_strat_bomber_equipment_x
+	jet_heavy_strat_bomber_equipment_xb
+	modern_tank_amphibious_chassis
+	modern_tank_flame_chassis
+	super_heavy_tank_flame_chassis
+	light_tank_aa_chassis_4
+	light_tank_aa_chassis_5
+	light_tank_artillery_chassis_4
+	light_tank_artillery_chassis_5
+	light_tank_destroyer_chassis_4
+	light_tank_destroyer_chassis_5
+	light_tank_amphibious_chassis_4
+	light_tank_amphibious_chassis_5
+	light_tank_flame_chassis_4
+	light_tank_flame_chassis_5
+	super_heavy_tank_aa_chassis_2
+	super_heavy_tank_aa_chassis_3
+	super_heavy_tank_artillery_chassis_2
+	super_heavy_tank_artillery_chassis_3
+	super_heavy_tank_destroyer_chassis_2
+	super_heavy_tank_destroyer_chassis_3
+	modern_tank_aa_chassis_2
+	modern_tank_aa_chassis_3
+	modern_tank_artillery_chassis_2
+	modern_tank_artillery_chassis_3
+	modern_tank_destroyer_chassis_2
+	modern_tank_destroyer_chassis_3
+	modern_tank_amphibious_chassis_1
+	modern_tank_amphibious_chassis_2
+	modern_tank_amphibious_chassis_3
+	modern_tank_flame_chassis_1
+	modern_tank_flame_chassis_2
+	modern_tank_flame_chassis_3
+	super_heavy_tank_flame_chassis_1
+	super_heavy_tank_flame_chassis_2
+	super_heavy_tank_flame_chassis_3
+	light_tank_equipment_x
+	light_tank_equipment_x_2
+	light_tank_equipment_x_3
+	light_tank_aa_equipment_x
+	light_tank_aa_equipment_x_2
+	light_tank_aa_equipment_x_3
+	light_tank_artillery_equipment_x
+	light_tank_artillery_equipment_x_2
+	light_tank_artillery_equipment_x_3
+	light_tank_destroyer_equipment_x
+	light_tank_destroyer_equipment_x_2
+	light_tank_destroyer_equipment_x_3
+	modern_tank_equipment_x
+	modern_tank_equipment_x_2
+	modern_tank_equipment_x_3
+	modern_tank_equipment_x_4
+	modern_tank_equipment_x_5
+	modern_tank_aa_equipment_x
+	modern_tank_aa_equipment_x_2
+	modern_tank_aa_equipment_x_3
+	modern_tank_aa_equipment_x_4
+	modern_tank_aa_equipment_x_5
+	modern_tank_artillery_equipment_x
+	modern_tank_artillery_equipment_x_2
+	modern_tank_artillery_equipment_x_3
+	modern_tank_artillery_equipment_x_4
+	modern_tank_artillery_equipment_x_5
+	modern_tank_destroyer_equipment_x
+	modern_tank_destroyer_equipment_x_2
+	modern_tank_destroyer_equipment_x_3
+	modern_tank_destroyer_equipment_x_4
+	modern_tank_destroyer_equipment_x_5
+	super_heavy_tank_equipment_x
+	super_heavy_tank_equipment_x_2
+	super_heavy_tank_aa_equipment_x
+	super_heavy_tank_aa_equipment_x_2
+	super_heavy_tank_artillery_equipment_x
+	super_heavy_tank_artillery_equipment_x_2
+	super_heavy_tank_destroyer_equipment_x
+	super_heavy_tank_destroyer_equipment_x_2
+	amphibious_tank_equipment_3
+	amphibious_tank_equipment_4
+	amphibious_tank_equipment_5
+	amphibious_tank_equipment_6
+	
 }
\ No newline at end of file
diff --git a/common/scripted_effects/00_scripted_effects.txt b/common/scripted_effects/00_scripted_effects.txt
index 2b2ea9a633a..dbe383c2708 100644
--- a/common/scripted_effects/00_scripted_effects.txt
+++ b/common/scripted_effects/00_scripted_effects.txt
@@ -318,12 +318,12 @@ civil_war_anti_exploiter_punitive_action = {
 				infantry = { x = 0 y = 0 }
 				infantry = { x = 0 y = 1 }
 				infantry = { x = 0 y = 2 }
-	
+				infantry = { x = 0 y = 3 }
+
 		   	   	infantry = { x = 1 y = 0 }
 				infantry = { x = 1 y = 1 }
 				infantry = { x = 1 y = 2 }
 	
-		   	   	infantry = { x = 2 y = 0 }
 				artillery_brigade = { x = 2 y = 1 }
 				artillery_brigade = { x = 2 y = 2 }
 			}
@@ -1173,10 +1173,310 @@ remove_any_country_role_from_character = { #Expected to be used inside the chara
 	}
 }
 
+
+### Paratroopers
+SF_PARA_sabotage_effect = { #When changing this, update the research tooltip
+	damage_building = {
+		type = infrastructure
+		damage = 2
+	}
+	damage_building = {
+		type = industrial_complex
+		damage = 1
+	}
+	damage_building = {
+		type = arms_factory
+		damage = 1
+	}
+	set_state_flag = {
+		flag = para_drop_effect
+		days = 30
+	}
+}
+
+SF_PARA_combat_effect = { #When changing this, update the research tooltip
+	every_state_division = {
+		limit = { 
+			OWNER = { has_war_with = FROM }
+		}
+		set_unit_organization = 0.50
+	}
+	set_state_flag = {
+		flag = para_drop_effect
+		days = 30
+	}
+}
+
+### Muuuurrrriiinnnnneeeeessssss
+SF_marine_demoliton_effect = { #When changing this, update the research tooltip
+	damage_building = {
+		type = radar_station
+		damage = 1
+	}
+	damage_building = {
+		type = naval_base
+		damage = 1
+	}
+	damage_building = {
+		type = dockyard
+		damage = 1
+	}
+	damage_building = {
+		type = nuclear_reactor
+		damage = 1
+	}
+	damage_building = {
+		type = rocket_site
+		damage = 1
+	}
+	damage_building = {
+		type = fuel_silo
+		damage = 1
+	}
+	set_state_flag = {
+		flag = marines_commando_effect
+		days = 30
+	}
+}
+
 on_daily = {
 
 }
 
 #on_daily_USA = {
 #	# you can specify an on daily action for a specific country
-#}
\ No newline at end of file
+#}
+
+
+###########################################################################################
+###########################################################################################
+###########################################################################################
+
+							########    ###       ###    ######## 
+							   ##      ## ##     ## ##      ##    
+							   ##     ##   ##   ##   ##     ##    
+							   ##    ##     ## ##     ##    ##    
+							   ##    ######### #########    ##    
+							   ##    ##     ## ##     ##    ##    
+							   ##    ##     ## ##     ##    ##    
+
+###########################################################################################
+###########################################################################################
+###########################################################################################
+
+find_global_platonic_countries = { # Look for the countries that meet the best criteria for the different platonic countries we expect in HoI 
+	find_biggest_fascist = yes
+	find_biggest_democrat = yes
+	find_biggest_communist = yes
+	find_biggest_non_aligned = yes
+	find_biggest_fascist_bully = yes
+	find_best_democratic_ally_leader = yes
+	find_democratic_sleeping_giant = yes
+	find_local_dangerous_fascist = yes 
+}
+
+
+find_biggest_fascist_bully = { # Finds the biggest and/or meanest fascist country 
+	get_highest_scored_country = {
+		var = GLOBAL.platonic_fascist_bully
+		scorer = fascist_bully_scorer
+	}
+}
+
+find_best_democratic_ally_leader = { # Finds the most suitable democratic country to lead a faction
+	get_highest_scored_country = {
+		var = GLOBAL.platonic_democratic_ally_leader
+		scorer = democratic_faction_leader_scorer
+	}
+}
+
+find_democratic_sleeping_giant = { # Finds biggest desarmed democratic nation. Expected to be USA 
+	get_highest_scored_country = {
+		var = GLOBAL.platonic_democratic_sleeping_giant
+		scorer = democratic_sleeping_giant_scorer
+	}
+}
+
+find_biggest_fascist = { # Finds Nazi Germany, or the closest to it 
+	get_highest_scored_country = {
+		var = GLOBAL.platonic_big_fascist
+		scorer = fascist_major_scorer
+	}
+}
+
+find_biggest_democrat = { # Finds biggest Democratic Nation
+	get_highest_scored_country = {
+		var = GLOBAL.platonic_big_democratic
+		scorer = democratic_major_scorer
+	}
+}
+
+find_biggest_communist = { # Finds biggest Communist
+	get_highest_scored_country = {
+		var = GLOBAL.platonic_big_communist
+		scorer = communist_major_scorer
+	}
+}
+
+find_biggest_non_aligned = { # Finds biggest... anything else
+	get_highest_scored_country = {
+		var = GLOBAL.platonic_big_non_aligned
+		scorer = non_aligned_major_scorer
+	}
+}
+# There are ideology scorers for each continent. If you need more check the generic_platonic_scorers file and make a new scripted effect 
+
+find_local_dangerous_fascist = {
+	get_highest_scored_country = {
+		var = platonic_local_dangerous_fascist
+		scorer = local_fascist_country
+	}
+}
+
+
+# The idea is that you can use these effects to store the party popularities (and, if desired, the ruling party) when puppeting or possibly when starting civil wars, and then use the "restore" effects to reset it after the puppeting has happened, so that you don't have to use the overlord's ideology if you don't want to. 
+get_current_ideology_popularities = {
+	set_variable = { ROOT.communist_support_before_change = ROOT.party_popularity_100@communism }
+	set_variable = { ROOT.democratic_support_before_change = ROOT.party_popularity_100@democratic }
+	set_variable = { ROOT.fascist_support_before_change = ROOT.party_popularity_100@fascism }
+	set_variable = { ROOT.neutrality_support_before_change = ROOT.party_popularity_100@neutrality }
+}
+get_current_ruling_party = {
+	set_variable = { ROOT.ruling_ideology_before_change = ROOT.current_party_ideology_group }
+}
+restore_ideology_popularities = {
+	hidden_effect = {
+		# Reset popluarities to what they were before puppeting 
+		set_popularities = {
+			communism = ROOT.communist_support_before_change
+			democratic = ROOT.democratic_support_before_change
+			fascism = ROOT.fascist_support_before_change
+			neutrality = ROOT.neutrality_support_before_change
+		}
+		clear_variable = ROOT.communist_support_before_change
+		clear_variable = ROOT.democratic_support_before_change
+		clear_variable = ROOT.fascist_support_before_change
+		clear_variable = ROOT.neutrality_support_before_change
+	}
+}
+restore_ruling_party = {
+	ROOT = {
+		set_politics = {
+			ruling_party = var:ROOT.ruling_ideology_before_change
+		}
+	}
+}
+
+
+#Upgrades state cat to the next valid level. Called from state scope
+increase_state_category = {
+	if = {
+		limit = {
+			has_state_category = tiny_island
+		}
+		set_state_category = small_island
+		effect_tooltip = {
+			add_extra_state_shared_building_slots = 1
+		}
+	}
+
+	if = {
+		limit = {
+			OR = {
+				has_state_category = wasteland
+				has_state_category = enclave
+			}
+		}
+		set_state_category = pastoral
+		effect_tooltip = {
+			add_extra_state_shared_building_slots = 1
+		}
+	}
+	else_if = {
+		limit = {
+			has_state_category = pastoral
+		}
+		set_state_category = rural
+		effect_tooltip = {
+			add_extra_state_shared_building_slots = 1
+		}
+	}
+	else_if = {
+		limit = {
+			has_state_category = rural
+		}
+		set_state_category = town
+		effect_tooltip = {
+			add_extra_state_shared_building_slots = 2
+		}
+	}
+	else_if = {
+		limit = {
+			has_state_category = town
+		}
+		set_state_category = large_town
+		effect_tooltip = {
+			add_extra_state_shared_building_slots = 1
+		}
+	}
+	else_if = {
+		limit = {
+			has_state_category = large_town
+		}
+		set_state_category = city
+		effect_tooltip = {
+			add_extra_state_shared_building_slots = 1
+		}
+	}
+	else_if = {
+		limit = {
+			has_state_category = city
+		}
+		set_state_category = metropolis
+		effect_tooltip = {
+			add_extra_state_shared_building_slots = 4
+		}
+	}
+
+	else_if = {
+		limit = {
+			has_state_category = metropolis
+		} 
+		set_state_category = megalopolis
+		effect_tooltip = {
+			add_extra_state_shared_building_slots = 2
+		}
+	}
+}
+
+add_potential_special_forces_tree = {
+	custom_effect_tooltip = add_potential_special_forces_tree_tt
+	if = {
+		limit = { NOT = { has_variable = sf_trees } }
+		set_variable = { sf_trees = 3 }
+	}
+	else = {
+		add_to_variable = { sf_trees = 1 }
+	}
+}
+
+remove_potential_special_forces_tree = {
+	if = {
+		limit = { NOT = { has_variable = sf_trees } }
+		set_variable = { sf_trees = 1 }
+	}
+	else = {
+		subtract_from_variable = { sf_trees = 1 }
+	}
+}
+
+store_core_states_on_game_start = { #Should be called from history file
+	every_core_state = {
+		ROOT = {
+			add_to_array = {
+				array = core_states_at_game_start
+				value = PREV
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/common/scripted_effects/EAW_CTH_effect.txt b/common/scripted_effects/EAW_CTH_effect.txt
index a72a8b8e7ff..bcb6145359b 100644
--- a/common/scripted_effects/EAW_CTH_effect.txt
+++ b/common/scripted_effects/EAW_CTH_effect.txt
@@ -639,7 +639,7 @@ CTH_add_1_landowners_power = {
 		}
 		subtract_from_variable = {
 			var = CTH_landowner_consumer_goods_factor_var
-			value = 0.02
+			value = 0.04
 		}
 	}
 	else_if = {
@@ -657,7 +657,7 @@ CTH_add_1_landowners_power = {
 		}
 		add_to_variable = {
 			var = CTH_landowner_consumer_goods_factor_var
-			value = 0.02
+			value = 0.04
 		}
 	}
 	add_to_variable = {
@@ -684,7 +684,7 @@ CTH_remove_1_landowners_power = {
 		}
 		add_to_variable = {
 			var = CTH_landowner_consumer_goods_factor_var
-			value = 0.02
+			value = 0.04
 		}
 	}
 	else_if = {
@@ -702,7 +702,7 @@ CTH_remove_1_landowners_power = {
 		}
 		subtract_from_variable = {
 			var = CTH_landowner_consumer_goods_factor_var
-			value = 0.02
+			value = 0.04
 		}
 	}
 	subtract_from_variable = {
diff --git a/common/scripted_effects/EAW_CVA_effect.txt b/common/scripted_effects/EAW_CVA_effect.txt
index 3ba674d75eb..7d1b4e5ebcb 100644
--- a/common/scripted_effects/EAW_CVA_effect.txt
+++ b/common/scripted_effects/EAW_CVA_effect.txt
@@ -2145,7 +2145,7 @@ calculate_CVA_CTH_consumer_goods = {
 		CVA_CTH_consumer_goods_factor_var = CVA_CTH_pragmatist_social_services_var
 	}
 	multiply_variable = {
-		CVA_CTH_consumer_goods_factor_var = -0.01
+		CVA_CTH_consumer_goods_factor_var = -0.04
 	}
 	force_update_dynamic_modifier = yes
 }
@@ -2181,7 +2181,7 @@ calculate_CVA_CTH_consumer_goods_factor_2 = {
 		CVA_CTH_consumer_goods_factor_2_var = CVA_CTH_focuses_taken_2_var
 	}
 	multiply_variable = {
-		CVA_CTH_consumer_goods_factor_2_var = -0.01
+		CVA_CTH_consumer_goods_factor_2_var = -0.08
 	}
 	force_update_dynamic_modifier = yes
 }
diff --git a/common/scripted_effects/EAW_HIP_effect.txt b/common/scripted_effects/EAW_HIP_effect.txt
index 2ea40c11af4..a74935ea846 100644
--- a/common/scripted_effects/EAW_HIP_effect.txt
+++ b/common/scripted_effects/EAW_HIP_effect.txt
@@ -1068,7 +1068,7 @@ HIP_SIR_integrate_colthage = {
 			limit = {
 				is_ai = yes
 			}
-			add_to_variable = { HIP_MAGIC_consumer_goods_factor = -0.025 }
+			add_to_variable = { HIP_MAGIC_consumer_goods_factor = -0.05 }
 			add_to_variable = { HIP_MAGIC_production_speed_buildings_factor = 0.05 }
 			add_to_variable = { HIP_MAGIC_conscription = 0.025 }
 			add_to_variable = { HIP_MAGIC_recruitable_seapony_pop = 0.025 }
@@ -1094,7 +1094,7 @@ HIP_SIR_integrate_colthage = {
 			limit = {
 				is_ai = yes
 			}
-			add_to_variable = { HIP_MAGIC_consumer_goods_factor = -0.015 }
+			add_to_variable = { HIP_MAGIC_consumer_goods_factor = -0.03 }
 			add_to_variable = { HIP_MAGIC_production_speed_buildings_factor = 0.03 }
 			add_to_variable = { HIP_MAGIC_conscription = 0.015 }
 			add_to_variable = { HIP_MAGIC_recruitable_seapony_pop = 0.015 }
diff --git a/common/scripted_effects/EAW_KIR_effect.txt b/common/scripted_effects/EAW_KIR_effect.txt
index 35eec96c343..f714641926e 100644
--- a/common/scripted_effects/EAW_KIR_effect.txt
+++ b/common/scripted_effects/EAW_KIR_effect.txt
@@ -851,7 +851,16 @@ KIR_KI_RES_OUTPUT_COST_ADD = {
 
 KIR_KI_RES_OUTPUT_COST_SUBTRACT = {
 	effect_tooltip = {
-		swap_ideas = { add_idea = KIR_KI_RES remove_idea = KIR_KI_RES_1 }
+		if = {
+			limit = {
+				has_idea = KIR_KI_RES
+			}
+			remove_ideas = KIR_KI_RES
+			custom_effect_tooltip = KIR_line_break
+		}
+		else = {
+			swap_ideas = { add_idea = KIR_KI_RES remove_idea = KIR_KI_RES_1 }
+		}
 	}
 	hidden_effect = {
 		if = {
@@ -969,11 +978,11 @@ KIR_STATE_PALACE_BUTTON_CLICK_EFFECT = {
 				limit = {
 					check_variable = { KIR_STATE_H3_PALACE_NUM < 4 }
 				}
-				subtract_from_variable = { KIR_CONSOCSYS_consumer_goods_factor_var = 0.002 }
+				subtract_from_variable = { KIR_CONSOCSYS_consumer_goods_factor_var = 0.004 }
 			}
 			subtract_from_variable = { KIR_STATE_H3_PALACE_NUM = 1 }
 			subtract_from_variable = { KIR_STATE_H3N1_PALACE_NUM = 1 }
-			clamp_variable = { var = KIR_CONSOCSYS_consumer_goods_factor_var min = 0.002 max = 0.01 }
+			clamp_variable = { var = KIR_CONSOCSYS_consumer_goods_factor_var min = 0.004 max = 0.02 }
 			subtract_from_variable = { KIR_CONSOCSYS_democratic_drift = 0.01 }
 			add_to_variable = { KIR_CONSOCSYS_consumer_goods_factor = KIR_CONSOCSYS_consumer_goods_factor_var }
 			subtract_from_variable = { KIR_CONSOCSYS_KIR_STATE_DIETS_Modifier = 1 }
@@ -3466,8 +3475,8 @@ KIR_STATE_H3_PALACE_BUTTON_click_effect = {
 			add_to_variable = { KIR_STATE_H3_PALACE_NUM = 1 }
 			add_to_variable = { KIR_STATE_H3N1_PALACE_NUM = 1 }
 			subtract_from_variable = { KIR_CONSOCSYS_consumer_goods_factor = KIR_CONSOCSYS_consumer_goods_factor_var }
-			add_to_variable = { KIR_CONSOCSYS_consumer_goods_factor_var = 0.002 }
-			clamp_variable = { var = KIR_CONSOCSYS_consumer_goods_factor_var min = 0.002 max = 0.01 }
+			add_to_variable = { KIR_CONSOCSYS_consumer_goods_factor_var = 0.004 }
+			clamp_variable = { var = KIR_CONSOCSYS_consumer_goods_factor_var min = 0.004 max = 0.02 }
 			add_to_variable = { KIR_CONSOCSYS_democratic_drift = 0.01 }
 			add_to_variable = { KIR_CONSOCSYS_KIR_STATE_DIETS_Modifier = 1 }
 		}
@@ -4415,9 +4424,13 @@ FRV_Capitulate_KIC_Second_Republic = {
 		FRV = { reverse_add_opinion_modifier = { target = PREV modifier = FRV_revisionist_traitors } }
 		add_equipment_to_stockpile = { type = infantry_equipment amount = 2500 }
 	}
+	set_temp_variable = { KIRGetKSRConstituents = 14 }
 	if = {
 		limit = {
-			has_full_control_of_state = 1058
+			OR = {
+				KIC = { controls_state = 1058 }
+				controls_state = 1058
+			}
 		}
 		create_dynamic_country = {
 			original_tag = KIC
@@ -4435,10 +4448,14 @@ FRV_Capitulate_KIC_Second_Republic = {
 			FRV = { add_to_faction = PREV } set_country_flag = FRV_kirin_confederacy_member_flag country_event = { id = kirin_utility.43 days = 1 }
 			add_equipment_to_stockpile = { type = infantry_equipment amount = 2500 }
 		}
+		add_to_temp_variable = { KIRGetKSRConstituents = 1 }
 	}
 	if = {
 		limit = {
-			has_full_control_of_state = 1054
+			OR = {
+				KIC = { controls_state = 1054 }
+				controls_state = 1054
+			}
 		}
 		create_dynamic_country = {
 			original_tag = KIC
@@ -4447,32 +4464,62 @@ FRV_Capitulate_KIC_Second_Republic = {
 			1054 = { add_core_of = PREV }
 			set_capital = { state = 1054 }
 			if = {
-				limit = { PREV = { has_full_control_of_state = 1055 } }
+				limit = { 
+					OR = {
+						KIC = { controls_state = 1055 }
+						PREV = { controls_state = 1055 }
+					}
+				}
 				transfer_state = 1055
 				1055 = { add_core_of = PREV }
 			}
 			if = {
-				limit = { PREV = { has_full_control_of_state = 1056 } }
+				limit = { 
+					OR = {
+						KIC = { controls_state = 1056 }
+						PREV = { controls_state = 1056 }
+					}
+				}
 				transfer_state = 1056
 				1056 = { add_core_of = PREV }
 			}
 			if = {
-				limit = { PREV = { has_full_control_of_state = 1057 } }
+				limit = { 
+					OR = {
+						KIC = { controls_state = 1057 }
+						PREV = { controls_state = 1057 }
+					}
+				}
 				transfer_state = 1057
 				1057 = { add_core_of = PREV }
 			}
 			if = {
-				limit = { PREV = { has_full_control_of_state = 1084 } }
+				limit = { 
+					OR = {
+						KIC = { controls_state = 1084 }
+						PREV = { controls_state = 1084 }
+					}
+				}
 				transfer_state = 1084
 				1084 = { add_core_of = PREV }
 			}
 			if = {
-				limit = { PREV = { has_full_control_of_state = 1085 } }
+				limit = { 
+					OR = {
+						KIC = { controls_state = 1085 }
+						PREV = { controls_state = 1085 }
+					}
+				}
 				transfer_state = 1085
 				1085 = { add_core_of = PREV }
 			}
 			if = {
-				limit = { PREV = { has_full_control_of_state = 1086 } }
+				limit = { 
+					OR = {
+						KIC = { controls_state = 1086 }
+						PREV = { controls_state = 1086 }
+					}
+				}
 				transfer_state = 1086
 				1086 = { add_core_of = PREV }
 			}
@@ -4486,10 +4533,14 @@ FRV_Capitulate_KIC_Second_Republic = {
 			FRV = { add_to_faction = PREV } set_country_flag = FRV_kirin_confederacy_member_flag country_event = { id = kirin_utility.43 days = 1 }
 			add_equipment_to_stockpile = { type = infantry_equipment amount = 2500 }
 		}
+		add_to_temp_variable = { KIRGetKSRConstituents = 1 }
 	}
 	if = {
 		limit = {
-			has_full_control_of_state = 1083
+			OR = {
+				KIC = { controls_state = 1083 }
+				controls_state = 1083
+			}
 		}
 		create_dynamic_country = {
 			original_tag = KIC
@@ -4507,10 +4558,14 @@ FRV_Capitulate_KIC_Second_Republic = {
 			FRV = { add_to_faction = PREV } set_country_flag = FRV_kirin_confederacy_member_flag country_event = { id = kirin_utility.43 days = 1 }
 			add_equipment_to_stockpile = { type = infantry_equipment amount = 2500 }
 		}
+		add_to_temp_variable = { KIRGetKSRConstituents = 1 }
 	}
 	if = {
 		limit = {
-			has_full_control_of_state = 924
+			OR = {
+				KIC = { controls_state = 924 }
+				controls_state = 924
+			}
 		}
 		create_dynamic_country = {
 			original_tag = KIC
@@ -4519,17 +4574,32 @@ FRV_Capitulate_KIC_Second_Republic = {
 			924 = { add_core_of = PREV }
 			set_capital = { state = 924 }
 			if = {
-				limit = { PREV = { has_full_control_of_state = 1072 } }
+				limit = { 
+					OR = {
+						KIC = { controls_state = 1072 }
+						PREV = { controls_state = 1072 }
+					}
+				}
 				transfer_state = 1072
 				1072 = { add_core_of = PREV }
 			}
 			if = {
-				limit = { PREV = { has_full_control_of_state = 925 } }
+				limit = { 
+					OR = {
+						KIC = { controls_state = 925 }
+						PREV = { controls_state = 925 }
+					}
+				}
 				transfer_state = 925
 				925 = { add_core_of = PREV }
 			}
 			if = {
-				limit = { PREV = { has_full_control_of_state = 923 } }
+				limit = { 
+					OR = {
+						KIC = { controls_state = 923 }
+						PREV = { controls_state = 923 }
+					}
+				}
 				transfer_state = 923
 				923 = { add_core_of = PREV }
 			}
@@ -4543,5 +4613,12 @@ FRV_Capitulate_KIC_Second_Republic = {
 			FRV = { add_to_faction = PREV } set_country_flag = FRV_kirin_confederacy_member_flag country_event = { id = kirin_utility.43 days = 1 }
 			add_equipment_to_stockpile = { type = infantry_equipment amount = 2500 }
 		}
+		add_to_temp_variable = { KIRGetKSRConstituents = 1 }
+	}
+	if = {
+		limit = {
+			check_variable = { KIRGetKSRConstituents > 17 }
+		}
+		set_country_flag = FRV_whole_again_broke_again
 	}
 }
\ No newline at end of file
diff --git a/common/scripted_effects/EAW_RIV_effect.txt b/common/scripted_effects/EAW_RIV_effect.txt
index 0e8a2063e0e..33f7279aa6c 100644
--- a/common/scripted_effects/EAW_RIV_effect.txt
+++ b/common/scripted_effects/EAW_RIV_effect.txt
@@ -834,6 +834,7 @@ RIV_add_country_idea_on_annex = {
 }
 
 RIV_set_cosmetic_tag = {
+	mark_focus_tree_layout_dirty = yes
 	if = {
 		limit = { has_country_flag = river_federation_founder }
 		RIV_get_cosmetic_tag = yes
diff --git a/common/scripted_effects/EAW_TBK_effect.txt b/common/scripted_effects/EAW_TBK_effect.txt
index 33867f62409..fe27f5c51eb 100644
--- a/common/scripted_effects/EAW_TBK_effect.txt
+++ b/common/scripted_effects/EAW_TBK_effect.txt
@@ -598,7 +598,7 @@ TBK_apply_hazrumenia_economic_cooperation_modifier_values = {
 			}
 			set_variable = {
 				var = TBK_hazrumenian_economic_cooperation_consumer_goods_factor_var
-				value = -0.015
+				value = -0.03
 			}
 		}
 		if = {
@@ -693,7 +693,7 @@ TBK_apply_hazrumenia_economic_cooperation_modifier_values = {
 			}
 			set_variable = {
 				var = TBK_hazrumenian_economic_cooperation_consumer_goods_factor_var
-				value = -0.025
+				value = -0.05
 			}
 		}
 		if = {
@@ -788,7 +788,7 @@ TBK_apply_hazrumenia_economic_cooperation_modifier_values = {
 			}
 			set_variable = {
 				var = TBK_hazrumenian_economic_cooperation_consumer_goods_factor_var
-				value = -0.035
+				value = -0.07
 			}
 		}
 		if = {
@@ -880,7 +880,7 @@ TBK_apply_hazrumenia_economic_cooperation_modifier_values = {
 			}
 			set_variable = {
 				var = TBK_hazrumenian_economic_cooperation_consumer_goods_factor_var
-				value = -0.05
+				value = -0.1
 			}
 		}
 		if = {
@@ -1055,7 +1055,7 @@ TBK_wallnut_scarlet_scales_niftyn = {
 
 TBK_calculate_commoner_mood_modifier = {
 	set_temp_variable = { TBK_commoner_mood_consumer_goods_factor_TEMP = TBK_commoner_mood_weekly_tick }
-	multiply_temp_variable = { TBK_commoner_mood_consumer_goods_factor_TEMP = 0.001 }
+	multiply_temp_variable = { TBK_commoner_mood_consumer_goods_factor_TEMP = 0.002 }
 	set_variable = { TBK_commoner_mood_consumer_goods_factor_final_var = TBK_commoner_mood_consumer_goods_factor_TEMP }
 	set_temp_variable = { TBK_commoner_mood_fascism_drift_TEMP = TBK_commoner_mood_weekly_tick }
 	multiply_temp_variable = { TBK_commoner_mood_fascism_drift_TEMP = -0.001 }
diff --git a/common/scripted_effects/EAW_paperclip_effect.txt b/common/scripted_effects/EAW_paperclip_effect.txt
index 2f9dd6ee1b0..f60fce4b1e1 100644
--- a/common/scripted_effects/EAW_paperclip_effect.txt
+++ b/common/scripted_effects/EAW_paperclip_effect.txt
@@ -21159,6 +21159,43 @@ paperclip_tech = {
 				}
 			}
 		}
+		if = {
+			limit = {
+				NOT = {
+					has_tech = tech_trucks
+				}
+				PREV = {
+					has_tech = tech_trucks
+				}
+			}
+			set_variable = {
+				rand = random
+			}
+			multiply_variable = {
+				rand = 100
+			}
+			round_variable = rand
+			clamp_variable = {
+				var = rand
+				min = 0
+				max = 100
+			}
+			if = {
+				limit = {
+					check_variable = {
+						var = rand
+						value = PREV.PREV.previous_owner_industry_ratio
+						compare = less_than_or_equals
+					}
+				}
+				add_tech_bonus = {
+					name = paperclip_tech_bonus
+					bonus = 2
+					uses = 1
+					technology = tech_trucks
+				}
+			}
+		}
 		if = {
 			limit = {
 				NOT = {
@@ -21381,6 +21418,80 @@ paperclip_tech = {
 				}
 			}
 		}
+		if = {
+			limit = {
+				NOT = {
+					has_tech = armored_car4
+				}
+				PREV = {
+					has_tech = armored_car4
+				}
+			}
+			set_variable = {
+				rand = random
+			}
+			multiply_variable = {
+				rand = 100
+			}
+			round_variable = rand
+			clamp_variable = {
+				var = rand
+				min = 0
+				max = 100
+			}
+			if = {
+				limit = {
+					check_variable = {
+						var = rand
+						value = PREV.PREV.previous_owner_industry_ratio
+						compare = less_than_or_equals
+					}
+				}
+				add_tech_bonus = {
+					name = paperclip_tech_bonus
+					bonus = 2
+					uses = 1
+					technology = armored_car4
+				}
+			}
+		}
+		if = {
+			limit = {
+				NOT = {
+					has_tech = armored_car5
+				}
+				PREV = {
+					has_tech = armored_car5
+				}
+			}
+			set_variable = {
+				rand = random
+			}
+			multiply_variable = {
+				rand = 100
+			}
+			round_variable = rand
+			clamp_variable = {
+				var = rand
+				min = 0
+				max = 100
+			}
+			if = {
+				limit = {
+					check_variable = {
+						var = rand
+						value = PREV.PREV.previous_owner_industry_ratio
+						compare = less_than_or_equals
+					}
+				}
+				add_tech_bonus = {
+					name = paperclip_tech_bonus
+					bonus = 2
+					uses = 1
+					technology = armored_car5
+				}
+			}
+		}
 		if = {
 			limit = {
 				NOT = {
@@ -33057,6 +33168,231 @@ paperclip_tech = {
 			}
 		}
 
+		if = {
+			limit = {
+				NOT = {
+					has_tech = heavy_bombs
+				}
+				PREV = {
+					has_tech = heavy_bombs
+				}
+			}
+			set_variable = {
+				rand = random
+			}
+			multiply_variable = {
+				rand = 100
+			}
+			round_variable = rand
+			clamp_variable = {
+				var = rand
+				min = 0
+				max = 100
+			}
+			if = {
+				limit = {
+					check_variable = {
+						var = rand
+						value = PREV.PREV.previous_owner_industry_ratio
+						compare = less_than_or_equals
+					}
+				}
+				add_tech_bonus = {
+					name = paperclip_tech_bonus
+					bonus = 2
+					uses = 1
+					technology = heavy_bombs
+				}
+			}
+		}
+
+		if = {
+			limit = {
+				NOT = {
+					has_tech = armor_piercing_bombs 
+				}
+				PREV = {
+					has_tech = armor_piercing_bombs 
+				}
+			}
+			set_variable = {
+				rand = random
+			}
+			multiply_variable = {
+				rand = 100
+			}
+			round_variable = rand
+			clamp_variable = {
+				var = rand
+				min = 0
+				max = 100
+			}
+			if = {
+				limit = {
+					check_variable = {
+						var = rand
+						value = PREV.PREV.previous_owner_industry_ratio
+						compare = less_than_or_equals
+					}
+				}
+				add_tech_bonus = {
+					name = paperclip_tech_bonus
+					bonus = 2
+					uses = 1
+					technology = armor_piercing_bombs 
+				}
+			}
+		}
+
+		if = {
+			limit = {
+				NOT = {
+					has_tech = air_torpedoe_1  
+				}
+				PREV = {
+					has_tech = air_torpedoe_1  
+				}
+			}
+			set_variable = {
+				rand = random
+			}
+			multiply_variable = {
+				rand = 100
+			}
+			round_variable = rand
+			clamp_variable = {
+				var = rand
+				min = 0
+				max = 100
+			}
+			if = {
+				limit = {
+					check_variable = {
+						var = rand
+						value = PREV.PREV.previous_owner_industry_ratio
+						compare = less_than_or_equals
+					}
+				}
+				add_tech_bonus = {
+					name = paperclip_tech_bonus
+					bonus = 2
+					uses = 1
+					technology = air_torpedoe_1  
+				}
+			}
+		}
+
+		if = {
+			limit = {
+				NOT = {
+					has_tech = air_torpedoe_2  
+				}
+				PREV = {
+					has_tech = air_torpedoe_2  
+				}
+			}
+			set_variable = {
+				rand = random
+			}
+			multiply_variable = {
+				rand = 100
+			}
+			round_variable = rand
+			clamp_variable = {
+				var = rand
+				min = 0
+				max = 100
+			}
+			if = {
+				limit = {
+					check_variable = {
+						var = rand
+						value = PREV.PREV.previous_owner_industry_ratio
+						compare = less_than_or_equals
+					}
+				}
+				add_tech_bonus = {
+					name = paperclip_tech_bonus
+					bonus = 2
+					uses = 1
+					technology = air_torpedoe_2
+				}
+			}
+		}
+		if = {
+			limit = {
+				NOT = {
+					has_tech = air_torpedoe_3
+				}
+				PREV = {
+					has_tech = air_torpedoe_3
+				}
+			}
+			set_variable = {
+				rand = random
+			}
+			multiply_variable = {
+				rand = 100
+			}
+			round_variable = rand
+			clamp_variable = {
+				var = rand
+				min = 0
+				max = 100
+			}
+			if = {
+				limit = {
+					check_variable = {
+						var = rand
+						value = PREV.PREV.previous_owner_industry_ratio
+						compare = less_than_or_equals
+					}
+				}
+				add_tech_bonus = {
+					name = paperclip_tech_bonus
+					bonus = 2
+					uses = 1
+					technology = air_torpedoe_3
+				}
+			}
+		}
+		if = {
+			limit = {
+				NOT = {
+					has_tech = air_torpedoe_4
+				}
+				PREV = {
+					has_tech = air_torpedoe_4 
+				}
+			}
+			set_variable = {
+				rand = random
+			}
+			multiply_variable = {
+				rand = 100
+			}
+			round_variable = rand
+			clamp_variable = {
+				var = rand
+				min = 0
+				max = 100
+			}
+			if = {
+				limit = {
+					check_variable = {
+						var = rand
+						value = PREV.PREV.previous_owner_industry_ratio
+						compare = less_than_or_equals
+					}
+				}
+				add_tech_bonus = {
+					name = paperclip_tech_bonus
+					bonus = 2
+					uses = 1
+					technology = air_torpedoe_4  
+				}
+			}
+		}
 		if = {
 			limit = {
 				NOT = {
@@ -33437,6 +33773,44 @@ paperclip_tech = {
 			}
 		}
 
+		if = {
+			limit = {
+				NOT = {
+					has_tech = aa_cannon_5
+				}
+				PREV = {
+					has_tech = aa_cannon_5
+				}
+			}
+			set_variable = {
+				rand = random
+			}
+			multiply_variable = {
+				rand = 100
+			}
+			round_variable = rand
+			clamp_variable = {
+				var = rand
+				min = 0
+				max = 100
+			}
+			if = {
+				limit = {
+					check_variable = {
+						var = rand
+						value = PREV.PREV.previous_owner_industry_ratio
+						compare = less_than_or_equals
+					}
+				}
+				add_tech_bonus = {
+					name = paperclip_tech_bonus
+					bonus = 2
+					uses = 1
+					technology = aa_cannon_5
+				}
+			}
+		}
+
 		if = {
 			limit = {
 				NOT = {
diff --git a/common/scripted_effects/EAW_race_effects.txt b/common/scripted_effects/EAW_race_effects.txt
index 6bf1ef25377..c01460fbe92 100644
--- a/common/scripted_effects/EAW_race_effects.txt
+++ b/common/scripted_effects/EAW_race_effects.txt
@@ -3151,14 +3151,14 @@ set_unit_leader_to_republican_griffon = {
 		}
 		else = {
 			set_temp_variable = {
-				name_idx = 2
+				name_idx = 12
 			}
 			get_random_name_idx = yes
 			meta_effect = {
 				text = {
 					set_portraits = { operative = { large = "[PORTRAIT]" small = "[PORTRAIT]_small" } army = { large = "[PORTRAIT]" small = "[PORTRAIT]_small" }  navy = { large = "[PORTRAIT]" small = "[PORTRAIT]_small" } civilian = { large = "[PORTRAIT]" small = "[PORTRAIT]_small" } }
 				}
-				PORTRAIT = "[?name_idx.Get_griffon_army_female_portrait]"
+				PORTRAIT = "[?name_idx.Get_FAT_army_female_portrait]"
 			}
 		}
 	}
@@ -3195,7 +3195,7 @@ set_unit_leader_to_republican_griffon = {
 		}
 		else = {
 			set_temp_variable = {
-				name_idx = 12
+				name_idx = 20
 			}
 			get_random_name_idx = yes
 			meta_effect = {
diff --git a/common/scripted_effects/EAW_transfer_technology_effect.txt b/common/scripted_effects/EAW_transfer_technology_effect.txt
index e1a224e3826..a511284fd52 100644
--- a/common/scripted_effects/EAW_transfer_technology_effect.txt
+++ b/common/scripted_effects/EAW_transfer_technology_effect.txt
@@ -1526,6 +1526,69 @@ transfer_technology = {
 			}
 		}
 		
+		if = {
+			limit = {
+				PREV = {
+					has_tech = heavy_bombs 
+				}
+			}
+			set_technology = {
+				heavy_bombs = 1
+			}
+		}
+
+		if = {
+			limit = {
+				PREV = {
+					has_tech = armor_piercing_bombs 
+				}
+			}
+			set_technology = {
+				armor_piercing_bombs = 1
+			}
+		}
+		if = {
+			limit = {
+				PREV = {
+					has_tech = armor_piercing_bombs 
+				}
+			}
+			set_technology = {
+				air_torpedoe_1 = 1
+			}
+		}
+		if = {
+			limit = {
+				PREV = {
+					has_tech = armor_piercing_bombs 
+				}
+			}
+			set_technology = {
+				air_torpedoe_2 = 1
+			}
+		}
+		if = {
+			limit = {
+				PREV = {
+					has_tech = armor_piercing_bombs 
+				}
+			}
+			set_technology = {
+				air_torpedoe_3 = 1
+			}
+		}
+		if = {
+			limit = {
+				PREV = {
+					has_tech = armor_piercing_bombs 
+				}
+			}
+			set_technology = {
+				air_torpedoe_4 = 1
+			}
+		}
+
+		
 		if = {
 			limit = {
 				PREV = {
@@ -1635,6 +1698,17 @@ transfer_technology = {
 				aa_cannon_4 = 1
 			}
 		}
+
+		if = {
+			limit = {
+				PREV = {
+					has_tech = aa_cannon_5
+				}
+			}
+			set_technology = {
+				aa_cannon_5 = 1
+			}
+		}
 		
 		if = {
 			limit = {
@@ -3294,6 +3368,17 @@ transfer_technology = {
 				gw_artillery = 1
 			}
 		}
+		if = {
+			limit = {
+				PREV = {
+					has_tech = SWE_bofors_antitank_gun 
+				}
+			}
+			set_technology = {
+				popup = no
+				SWE_bofors_antitank_gun = 1
+			}
+		}
 		if = {
 			limit = {
 				PREV = {
@@ -7462,6 +7547,139 @@ transfer_technology = {
 				jungle_warfare = 1
 			}
 		}
+		if = {
+			limit = {
+				PREV = {
+					has_tech = penal_infantry
+				}
+			}
+			set_technology = {
+				popup = no
+				penal_infantry = 1
+			}
+		}
+		if = {
+			limit = {
+				PREV = {
+					has_tech = bicycle_infantry
+				}
+			}
+			set_technology = {
+				popup = no
+				bicycle_infantry = 1
+			}
+		}
+		if = {
+			limit = {
+				PREV = {
+					has_tech = blackshirt_assault_battalion_tech
+				}
+			}
+			set_technology = {
+				popup = no
+				blackshirt_assault_battalion_tech = 1
+			}
+		}
+		if = {
+			limit = {
+				PREV = {
+					has_tech = mountain_warfare_militias_tech
+				}
+			}
+			set_technology = {
+				popup = no
+				mountain_warfare_militias_tech = 1
+			}
+		}
+		if = {
+			limit = {
+				PREV = {
+					has_tech = ETH_improved_irregular_infantry_tech
+				}
+			}
+			set_technology = {
+				popup = no
+				ETH_improved_irregular_infantry_tech = 1
+			}
+		}
+		if = {
+			limit = {
+				PREV = {
+					has_tech = molotov_cocktails_tech
+				}
+			}
+			set_technology = {
+				popup = no
+				molotov_cocktails_tech = 1
+			}
+		}
+		if = {
+			limit = {
+				PREV = {
+					has_tech = winter_logistics_support_tech
+				}
+			}
+			set_technology = {
+				popup = no
+				winter_logistics_support_tech = 1
+			}
+		}
+		if = {
+			limit = {
+				PREV = {
+					has_tech = long_range_patrol_support_tech
+				}
+			}
+			set_technology = {
+				popup = no
+				long_range_patrol_support_tech = 1
+			}
+		}
+		if = {
+			limit = {
+				PREV = {
+					has_tech = sami_pathfinders_tech
+				}
+			}
+			set_technology = {
+				popup = no
+				sami_pathfinders_tech = 1
+			}
+		}
+		if = {
+			limit = {
+				PREV = {
+					has_tech = lotta_svard_tech
+				}
+			}
+			set_technology = {
+				popup = no
+				lotta_svard_tech = 1
+			}
+		}
+		if = {
+			limit = {
+				PREV = {
+					has_tech = SWE_sami_support_tech
+				}
+			}
+			set_technology = {
+				popup = no
+				SWE_sami_support_tech = 1
+			}
+		}
+		if = {
+			limit = {
+				PREV = {
+					has_tech = NORDIC_supportCollaboration_tech
+				}
+			}
+			set_technology = {
+				popup = no
+				NORDIC_supportCollaboration_tech = 1
+			}
+		}
+		 
 		if = {
 			limit = {
 				PREV = {
@@ -7550,6 +7768,17 @@ transfer_technology = {
 				support_weapons4 = 1
 			}
 		}
+		if = {
+			limit = {
+				PREV = {
+					has_tech = tech_trucks
+				}
+			}
+			set_technology = {
+				popup = no
+				tech_trucks = 1
+			}
+		}
 		if = {
 			limit = {
 				PREV = {
@@ -7616,6 +7845,39 @@ transfer_technology = {
 				armored_car_at_upgrade = 1
 			}
 		}
+		if = {
+			limit = {
+				PREV = {
+					has_tech = SWE_lynx_armored_car 
+				}
+			}
+			set_technology = {
+				popup = no
+				SWE_lynx_armored_car = 1
+			}
+		}
+		if = {
+			limit = {
+				PREV = {
+					has_tech = armored_car4
+				}
+			}
+			set_technology = {
+				popup = no
+				armored_car4 = 1
+			}
+		}
+		if = {
+			limit = {
+				PREV = {
+					has_tech = armored_car5
+				}
+			}
+			set_technology = {
+				popup = no
+				armored_car5 = 1
+			}
+		}
 		if = {
 			limit = {
 				PREV = {
diff --git a/common/scripted_guis/eaw_KIR_scripted_gui.txt b/common/scripted_guis/eaw_KIR_scripted_gui.txt
index 7cfc9b2ac92..03f37f1a857 100644
--- a/common/scripted_guis/eaw_KIR_scripted_gui.txt
+++ b/common/scripted_guis/eaw_KIR_scripted_gui.txt
@@ -2927,7 +2927,7 @@ scripted_gui = {
 
 		window_name = "CHN_FRV_toggle_window"
 
-		dirty = CHN_FRV_toggle_frame_var
+		#dirty = CHN_FRV_toggle_frame_var
 
 		triggers = {
 			CHN_FRV_SG_glowy_shiny_sparkly_glimmery_shimmery_thing_visible = {
diff --git a/common/scripted_guis/eaw_ZAR_scripted_gui.txt b/common/scripted_guis/eaw_ZAR_scripted_gui.txt
index acce9e59da6..1b59f74cd87 100644
--- a/common/scripted_guis/eaw_ZAR_scripted_gui.txt
+++ b/common/scripted_guis/eaw_ZAR_scripted_gui.txt
@@ -229,7 +229,7 @@ scripted_gui = {
 					add_command_power = -30
 					if = {
 						limit = { check_variable = { ZAR_elder_tatzelwurms > 14 } }
-						subtract_from_variable = { check_variable = { ZAR_elder_tatzelwurms = 15 }
+						subtract_from_variable = { ZAR_elder_tatzelwurms = 15 }
 					}
 					else = {
 						add_equipment_to_stockpile = {
@@ -303,6 +303,7 @@ scripted_gui = {
 		}
 		
 	}
+	
 }
 
 
diff --git a/common/scripted_localisation/EAW_KIR_scripted_localisation.txt b/common/scripted_localisation/EAW_KIR_scripted_localisation.txt
index e97a6f2cdbd..286c12b67ef 100644
--- a/common/scripted_localisation/EAW_KIR_scripted_localisation.txt
+++ b/common/scripted_localisation/EAW_KIR_scripted_localisation.txt
@@ -8838,7 +8838,10 @@ defined_text = {
 	name = GetKIRDemandDisarmamentReq
 	text = {
 		trigger = {
-			has_added_tension_amount > 4
+			OR = {
+				has_added_tension_amount > 4
+				has_country_flag = I_have_been_very_bad_KIR
+			}
 		}
 		localization_key = KIR_demand_disarmament_req_Y
 	}
@@ -8921,7 +8924,10 @@ defined_text = {
 	name = GetKIRDemandDisarmamentReqE
 	text = {
 		trigger = {
-			is_in_array = { KIR.potential_and_current_enemies = THIS }
+			OR = {
+				is_in_array = { KIR.potential_and_current_enemies = THIS }
+				has_country_flag = I_have_been_very_bad_KIR
+			}
 		}
 		localization_key = KIR_demand_disarmament_req_E_Y
 	}
@@ -8934,7 +8940,10 @@ defined_text = {
 	name = GetKIRDemandDisarmamentReqF
 	text = {
 		trigger = {
-			is_in_array = { KIR.enemies_of_allies = THIS }
+			OR = {
+				is_in_array = { KIR.enemies_of_allies = THIS }
+				has_country_flag = I_have_been_very_bad_KIR
+			}
 		}
 		localization_key = KIR_demand_disarmament_req_F_Y
 	}
@@ -8976,6 +8985,19 @@ defined_text = {
 	}
 }
 
+defined_text = {
+	name = GetKIRDemandDisarmamentReqI
+	text = {
+		trigger = {
+			has_offensive_war = yes
+		}
+		localization_key = KIR_demand_disarmament_req_I_Y
+	}
+	text = {
+		localization_key = KIR_demand_disarmament_req_I_N
+	}
+}
+
 defined_text = {
 	name = GetBlossomRefOutcome
 	text = {
diff --git a/common/scripted_localisation/EAW_race_scripted_localisation.txt b/common/scripted_localisation/EAW_race_scripted_localisation.txt
index 2b6b08d8922..2dc0fe875d7 100644
--- a/common/scripted_localisation/EAW_race_scripted_localisation.txt
+++ b/common/scripted_localisation/EAW_race_scripted_localisation.txt
@@ -13086,6 +13086,83 @@ defined_text = {
 	}
 }
 
+defined_text = {
+	#max 12
+	name = Get_FAT_army_female_portrait
+	text = {
+		trigger = {
+			state = 1
+		}
+		localization_key = "GFX_portrait_FAT_generic_land_female_1"
+	}
+	text = {
+		trigger = {
+			state = 2
+		}
+		localization_key = "GFX_portrait_FAT_generic_land_female_2"
+	}
+	text = {
+		trigger = {
+			state = 3
+		}
+		localization_key = "GFX_portrait_FAT_generic_land_female_3"
+	}
+	text = {
+		trigger = {
+			state = 4
+		}
+		localization_key = "GFX_portrait_FAT_generic_land_female_4"
+	}
+	text = {
+		trigger = {
+			state = 5
+		}
+		localization_key = "GFX_portrait_FAT_generic_land_female_5"
+	}
+	text = {
+		trigger = {
+			state = 6
+		}
+		localization_key = "GFX_portrait_FAT_generic_land_female_6"
+	}
+	text = {
+		trigger = {
+			state = 7
+		}
+		localization_key = "GFX_portrait_FAT_generic_land_female_7"
+	}
+	text = {
+		trigger = {
+			state = 8
+		}
+		localization_key = "GFX_portrait_FAT_generic_land_female_8"
+	}
+	text = {
+		trigger = {
+			state = 9
+		}
+		localization_key = "GFX_portrait_FAT_generic_land_female_9"
+	}
+	text = {
+		trigger = {
+			state = 10
+		}
+		localization_key = "GFX_portrait_FAT_generic_land_female_10"
+	}
+	text = {
+		trigger = {
+			state = 11
+		}
+		localization_key = "GFX_portrait_FAT_generic_land_female_11"
+	}
+	text = {
+		trigger = {
+			state = 12
+		}
+		localization_key = "GFX_portrait_FAT_generic_land_female_12"
+	}
+}
+
 defined_text = {
 	#max 6
 	name = Get_WNG_army_male_portrait
diff --git a/common/scripted_triggers/00_scripted_triggers.txt b/common/scripted_triggers/00_scripted_triggers.txt
index ed45640acec..81964c134a5 100644
--- a/common/scripted_triggers/00_scripted_triggers.txt
+++ b/common/scripted_triggers/00_scripted_triggers.txt
@@ -587,4 +587,180 @@ is_unlikely_country_tag = {
 	OR = {
 	    tag = DED
 	}
-}
\ No newline at end of file
+}
+
+big_communist_exists = {
+	any_other_country = {
+		is_major = yes 
+		has_government = communism
+		has_capitulated = no 
+		exists = yes 
+	}
+}
+
+big_fascist_exists = {
+	any_other_country = {
+		is_major = yes 
+		has_government = fascism
+		has_capitulated = no 
+		exists = yes 
+	}
+}
+
+
+###########################################################################################
+###########################################################################################
+###########################################################################################
+
+							########    ###       ###    ######## 
+							   ##      ## ##     ## ##      ##    
+							   ##     ##   ##   ##   ##     ##    
+							   ##    ##     ## ##     ##    ##    
+							   ##    ######### #########    ##    
+							   ##    ##     ## ##     ##    ##    
+							   ##    ##     ## ##     ##    ##    
+
+###########################################################################################
+###########################################################################################
+###########################################################################################
+
+has_aat = {
+	has_dlc = "Arms Against Tyranny"
+}
+
+has_any_tank_tech = {
+	OR = {
+		has_tech = basic_light_tank_chassis
+		has_tech = basic_medium_tank_chassis
+		has_tech = basic_heavy_tank_chassis
+	}
+}
+
+has_any_tanks = {
+	OR = {
+		has_equipment = { light_tank_chassis_0 > 0}
+		has_equipment = { medium_tank_chassis > 0 }
+		has_equipment = { light_tank_chassis > 0 }
+		has_equipment = { heavy_tank_chassis > 0 }
+	}
+}
+
+can_unlock_new_special_forces_tree = {
+	if = {
+		limit = { NOT = { has_variable = sf_trees } }
+		custom_trigger_tooltip = {
+			tooltip = can_unlock_new_special_forces_tree_none
+			NOT = { has_variable = sf_trees }
+		}
+	}
+	else_if = {
+		limit = { check_variable = { sf_trees > 0 } }
+		custom_trigger_tooltip = {
+			tooltip = can_unlock_new_special_forces_tree_more_yes
+			check_variable = { sf_trees > 0 }
+		}
+	}
+	else = {
+		custom_trigger_tooltip = {
+			tooltip = can_unlock_new_special_forces_tree_more_no
+			always = no
+		}
+	}
+}
+# These are to make strength comparisons easier 
+
+FROM_is_stronger = {
+	strength_ratio = {
+		tag = FROM 
+		ratio < 1
+	}
+}
+
+FROM_is_twice_as_strong = {
+	strength_ratio = {
+		tag = FROM 
+		ratio < 0.5
+	}
+}
+
+FROM_is_weaker = {
+	strength_ratio = {
+		tag = FROM 
+		ratio > 1
+	}
+}
+
+FROM_is_twice_as_weak = {
+	strength_ratio = {
+		tag = FROM 
+		ratio > 2
+	}
+}
+
+
+ai_has_completed_army_doctrine = {
+	is_ai = yes
+	OR = {
+		has_tech = werwolf_guerillas
+		has_tech = modern_blitzkrieg
+		has_tech = air_land_battle
+		has_tech = shock_and_awe
+		has_tech = c3i_theory
+		has_tech = infiltration_in_depth
+		has_tech = continuous_offensive
+		has_tech = guerilla_warfare
+	}
+}
+
+ai_has_completed_air_doctrine = {
+	is_ai = yes
+	OR = {
+		has_tech = offensive_formations
+		has_tech = mass_destruction
+		has_tech = forward_interception
+		has_tech = high_level_bombing
+	}
+}
+
+ai_has_completed_naval_doctrine = {
+	is_ai = yes
+	OR = {
+		has_tech = grand_battlefleet
+		has_tech = submarine_offensive
+		has_tech = floating_airfield
+		has_tech = combined_operations_raiding
+		has_tech = integrated_convoy_defence
+		has_tech = submarine_offensive_bs
+		has_tech = carrier_battlegroups
+	}
+}
+
+
+#Subsidy Seller Triggers
+is_fascist_seller_trigger = {
+	NOT = { has_war_with = ROOT	}
+	has_government = fascism 
+}
+
+is_democracy_seller_trigger = {
+	NOT = { has_war_with = ROOT	}
+	has_government = democratic 
+}
+
+is_communist_seller_trigger = {
+	NOT = { has_war_with = ROOT	}
+	has_government = communism 
+}
+
+is_neutrality_seller_trigger = {
+	NOT = { has_war_with = ROOT	}
+	has_government = neutrality
+}
+
+is_allied_seller_trigger = {
+	custom_trigger_tooltip = {
+		tooltip = subsidy_allied_nation_tt
+		FROM = { is_in_faction_with = ROOT }
+	}
+}
+
diff --git a/common/scripted_triggers/EAW_MIO_triggers.txt b/common/scripted_triggers/EAW_MIO_triggers.txt
new file mode 100644
index 00000000000..38d058ca7b9
--- /dev/null
+++ b/common/scripted_triggers/EAW_MIO_triggers.txt
@@ -0,0 +1,486 @@
+has_custom_tank_mio = {
+	OR = {
+		original_tag = EQS
+		original_tag = ANG
+		original_tag = BAK
+		original_tag = BAR
+		original_tag = BAT
+		original_tag = BRF
+		original_tag = BRZ
+		original_tag = BUF
+		original_tag = CCN
+		original_tag = CHN
+		original_tag = CRY
+		original_tag = CTH
+		original_tag = CVA
+		original_tag = HIE
+		original_tag = TRO
+		original_tag = CDR
+		original_tag = CTL
+		original_tag = CYA
+		original_tag = LCT
+		original_tag = PYT
+		original_tag = RCT
+		original_tag = STG
+		original_tag = OLE
+		original_tag = NLR
+		original_tag = PCB
+		original_tag = OLV
+		original_tag = LCT
+		original_tag = GRU
+		original_tag = GRW
+		original_tag = SCS
+		original_tag = FLO
+		original_tag = ZAR
+		original_tag = ZES
+		original_tag = LUS
+		original_tag = SIC
+		original_tag = GFF
+		original_tag = GRF
+		original_tag = PLB
+		original_tag = GRI
+		original_tag = KAT
+		original_tag = MAN 
+		original_tag = ELF
+		original_tag = JER
+		original_tag = JES
+		original_tag = LSP
+		original_tag = JAK
+		original_tag = VED
+		original_tag = MQA
+		original_tag = WAR
+		original_tag = WAT
+		original_tag = WIN
+		original_tag = WIT
+		original_tag = NCH
+		original_tag = SRS
+		original_tag = TRD 
+		original_tag = TAL 
+		original_tag = STW
+		original_tag = NCR
+		original_tag = GRY
+		original_tag = HIP
+		original_tag = TBK
+		original_tag = YAK
+		original_tag = YAL
+		original_tag = FIR
+		original_tag = FEZ
+		original_tag = FAT
+		original_tag = FEA
+		original_tag = FBK
+		original_tag = FRN
+		original_tag = FRE
+		original_tag = WNG
+		original_tag = EQC
+		original_tag = KIR
+		original_tag = KIS
+		original_tag = KIC
+		original_tag = MIT
+	}
+}
+
+has_custom_ship_mio = {
+	OR = {
+		original_tag = EQS
+		original_tag = ANG
+		original_tag = BAK
+		original_tag = BAR
+		original_tag = BAT
+		original_tag = BRF
+		original_tag = BRZ
+		original_tag = BUF
+		original_tag = CCN
+		original_tag = CHN
+		original_tag = CRY
+		original_tag = CTH
+		original_tag = CVA
+		original_tag = HIE
+		original_tag = TRO
+		original_tag = CDR
+		original_tag = CTL
+		original_tag = CYA
+		original_tag = LCT
+		original_tag = PYT
+		original_tag = RCT
+		original_tag = STG
+		original_tag = OLE
+		original_tag = NLR
+		original_tag = PCB
+		original_tag = OLV
+		original_tag = LCT
+		original_tag = GRU
+		original_tag = GRW
+		original_tag = SCS
+		original_tag = FLO
+		original_tag = ZAR
+		original_tag = ZES
+		original_tag = LUS
+		original_tag = SIC
+		original_tag = GFF
+		original_tag = GRF
+		original_tag = PLB
+		original_tag = GRI
+		original_tag = KAT
+		original_tag = MAN 
+		original_tag = ELF
+		original_tag = JER
+		original_tag = JES
+		original_tag = LSP
+		original_tag = JAK
+		original_tag = VED
+		original_tag = MQA
+		original_tag = WAR
+		original_tag = WAT
+		original_tag = WIN
+		original_tag = WIT
+		original_tag = NCH
+		original_tag = SRS
+		original_tag = TRD 
+		original_tag = TAL 
+		original_tag = STW
+		original_tag = VAN
+		original_tag = CES
+		original_tag = GRY
+		original_tag = HIP
+		original_tag = TBK
+		original_tag = YAK
+		original_tag = YAL
+		original_tag = FIR
+		original_tag = FEZ
+		original_tag = FAT
+		original_tag = FEA
+		original_tag = FBK
+		original_tag = FRN
+		original_tag = FRE
+		original_tag = WNG
+		original_tag = EQC
+		original_tag = KIR
+		original_tag = KIS
+		original_tag = KIC
+		original_tag = MIT
+	}
+}
+
+has_custom_aircraft_mio = {
+	OR = {
+		original_tag = EQS
+		original_tag = ANG
+		original_tag = BAK
+		original_tag = BAR
+		original_tag = BAT
+		original_tag = BRF
+		original_tag = BRZ
+		original_tag = BUF
+		original_tag = CCN
+		original_tag = CHN
+		original_tag = CRY
+		original_tag = CTH
+		original_tag = CVA
+		original_tag = HIE
+		original_tag = TRO
+		original_tag = CDR
+		original_tag = CTL
+		original_tag = CYA
+		original_tag = LCT
+		original_tag = PYT
+		original_tag = RCT
+		original_tag = STG
+		original_tag = OLE
+		original_tag = NLR
+		original_tag = PCB
+		original_tag = OLV
+		original_tag = LCT
+		original_tag = GRU
+		original_tag = GRW
+		original_tag = SCS
+		original_tag = FLO
+		original_tag = ZAR
+		original_tag = ZES
+		original_tag = LUS
+		original_tag = SIC
+		original_tag = GFF
+		original_tag = GRF
+		original_tag = PLB
+		original_tag = GRI
+		original_tag = KAT
+		original_tag = MAN 
+		original_tag = ELF
+		original_tag = JER
+		original_tag = JES
+		original_tag = LSP
+		original_tag = JAK
+		original_tag = VED
+		original_tag = MQA
+		original_tag = WAR
+		original_tag = WAT
+		original_tag = WIN
+		original_tag = WIT
+		original_tag = MNC
+		original_tag = NCH
+		original_tag = SRS
+		original_tag = TRD 
+		original_tag = TAL 
+		original_tag = STW
+		original_tag = NCR
+		original_tag = GRY
+		original_tag = HIP
+		original_tag = TBK
+		original_tag = YAK
+		original_tag = YAL
+		original_tag = FIR
+		original_tag = FEZ
+		original_tag = FAT
+		original_tag = FEA
+		original_tag = FBK
+		original_tag = FRN
+		original_tag = FRE
+		original_tag = WNG
+		original_tag = EQC
+		original_tag = KIR
+		original_tag = KIS
+		original_tag = KIC
+		original_tag = MIT
+	}
+}
+
+has_custom_artillery_mio = {
+	OR = {
+		original_tag = EQS
+		original_tag = ANG
+		original_tag = BAK
+		original_tag = BAR
+		original_tag = BAT
+		original_tag = BRF
+		original_tag = BRZ
+		original_tag = BUF
+		original_tag = CCN
+		original_tag = CHN
+		original_tag = CRY
+		original_tag = CTH
+		original_tag = CVA
+		original_tag = HIE
+		original_tag = TRO
+		original_tag = CDR
+		original_tag = CTL
+		original_tag = CYA
+		original_tag = LCT
+		original_tag = PYT
+		original_tag = RCT
+		original_tag = STG
+		original_tag = OLE
+		original_tag = NLR
+		original_tag = PCB
+		original_tag = OLV
+		original_tag = LCT
+		original_tag = GRU
+		original_tag = GRW
+		original_tag = SCS
+		original_tag = FLO
+		original_tag = ZAR
+		original_tag = ZES
+		original_tag = LUS
+		original_tag = SIC
+		original_tag = GFF
+		original_tag = GRF
+		original_tag = PLB
+		original_tag = GRI
+		original_tag = KAT
+		original_tag = JER
+		original_tag = JES
+		original_tag = LSP
+		original_tag = JAK
+		original_tag = VED
+		original_tag = MQA
+		original_tag = WAT
+		original_tag = WIN
+		original_tag = WIT
+		original_tag = NCH
+		original_tag = SRS
+		original_tag = TRD 
+		original_tag = STW
+		original_tag = NCR
+		original_tag = GRY
+		original_tag = HIP
+		original_tag = TBK
+		original_tag = YAK
+		original_tag = YAL
+		original_tag = FIR
+		original_tag = FEZ
+		original_tag = FAT
+		original_tag = FEA
+		original_tag = FBK
+		original_tag = FRN
+		original_tag = FRE
+		original_tag = WNG
+		original_tag = EQC
+		original_tag = KIR
+		original_tag = KIS
+		original_tag = KIC
+		original_tag = MIT
+	}
+}
+
+has_custom_infantry_equipment_mio = {
+	OR = {
+		original_tag = EQS
+		original_tag = ANG
+		original_tag = BAK
+		original_tag = BAR
+		original_tag = BAT
+		original_tag = BRF
+		original_tag = BRZ
+		original_tag = BUF
+		original_tag = CCN
+		original_tag = CHN
+		original_tag = CRY
+		original_tag = CTH
+		original_tag = CVA
+		original_tag = HIE
+		original_tag = TRO
+		original_tag = CDR
+		original_tag = CTL
+		original_tag = CYA
+		original_tag = LCT
+		original_tag = PYT
+		original_tag = RCT
+		original_tag = STG
+		original_tag = OLE
+		original_tag = NLR
+		original_tag = PCB
+		original_tag = OLV
+		original_tag = LCT
+		original_tag = GRU
+		original_tag = GRW
+		original_tag = SCS
+		original_tag = FLO
+		original_tag = ZAR
+		original_tag = ZES
+		original_tag = LUS
+		original_tag = SIC
+		original_tag = GFF
+		original_tag = GRF
+		original_tag = PLB
+		original_tag = GRI
+		original_tag = KAT
+		original_tag = MAN 
+		original_tag = JER
+		original_tag = JES
+		original_tag = LSP
+		original_tag = JAK
+		original_tag = VED
+		original_tag = MQA
+		original_tag = WAR
+		original_tag = WAT
+		original_tag = WIN
+		original_tag = WIT
+		original_tag = WAR
+		original_tag = MNC
+		original_tag = NCH
+		original_tag = SRS
+		original_tag = TRD 
+		original_tag = TAL 
+		original_tag = STW
+		original_tag = NCR
+		original_tag = GRY
+		original_tag = HIP
+		original_tag = TBK
+		original_tag = YAK
+		original_tag = YAL
+		original_tag = FIR
+		original_tag = FEZ
+		original_tag = FAT
+		original_tag = FEA
+		original_tag = FBK
+		original_tag = FRN
+		original_tag = FRE
+		original_tag = WNG
+		original_tag = EQC
+		original_tag = KIR
+		original_tag = KIS
+		original_tag = KIC
+		original_tag = MIT
+	}
+}
+
+has_custom_motorized_mechanized_mio = {
+	OR = {
+		original_tag = EQS
+		original_tag = ANG
+		original_tag = BAK
+		original_tag = BAR
+		original_tag = BAT
+		original_tag = BRF
+		original_tag = BRZ
+		original_tag = BUF
+		original_tag = CCN
+		original_tag = CHN
+		original_tag = CRY
+		original_tag = CTH
+		original_tag = CVA
+		original_tag = HIE
+		original_tag = TRO
+		original_tag = CDR
+		original_tag = CTL
+		original_tag = CYA
+		original_tag = LCT
+		original_tag = PYT
+		original_tag = RCT
+		original_tag = STG
+		original_tag = OLE
+		original_tag = NLR
+		original_tag = PCB
+		original_tag = OLV
+		original_tag = LCT
+		original_tag = GRU
+		original_tag = GRW
+		original_tag = SCS
+		original_tag = FLO
+		original_tag = ZAR
+		original_tag = ZES
+		original_tag = LUS
+		original_tag = SIC
+		original_tag = GFF
+		original_tag = GRF
+		original_tag = PLB
+		original_tag = GRI
+		original_tag = KAT
+		original_tag = MAN 
+		original_tag = ELF
+		original_tag = JER
+		original_tag = JES
+		original_tag = LSP
+		original_tag = JAK
+		original_tag = VED
+		original_tag = MQA
+		original_tag = WAT
+		original_tag = WIN
+		original_tag = WIT
+		original_tag = NCH
+		original_tag = SRS
+		original_tag = TRD 
+		original_tag = TAL 
+		original_tag = STW
+		original_tag = NCR
+		original_tag = GRY
+		original_tag = HIP
+		original_tag = TBK
+		original_tag = YAK
+		original_tag = YAL
+		original_tag = FIR
+		original_tag = FEZ
+		original_tag = FAT
+		original_tag = FEA
+		original_tag = FBK
+		original_tag = FRN
+		original_tag = FRE
+		original_tag = WNG
+		original_tag = EQC
+		original_tag = KIR
+		original_tag = KIS
+		original_tag = KIC
+		original_tag = MIT
+	}
+}
+NOR_AAT = {
+	always = no
+}
\ No newline at end of file
diff --git a/common/scripted_triggers/EAW_region_triggers.txt b/common/scripted_triggers/EAW_region_triggers.txt
index a37bca90958..bb36fb6cd2d 100644
--- a/common/scripted_triggers/EAW_region_triggers.txt
+++ b/common/scripted_triggers/EAW_region_triggers.txt
@@ -221,11 +221,11 @@ is_kiria_country = {
 	capital_scope = {
 		OR = {
 			region = 283
-			region = 343
-			region = 344
-			region = 345
-			region = 346
-			region = 347
+			# region = 343
+			# region = 344
+			# region = 345
+			# region = 346
+			# region = 347
 			region = 82
 			region = 283
 			region = 31
diff --git a/common/technologies/EAW_unique_tech.txt b/common/technologies/EAW_unique_tech.txt
index cde53cd577f..b2da0be17ae 100644
--- a/common/technologies/EAW_unique_tech.txt
+++ b/common/technologies/EAW_unique_tech.txt
@@ -704,6 +704,11 @@ tech_vampire_armour = {
 				infantry_equipment = 120
 			}
 		}
+		marine_commando = {
+			need = {
+				infantry_equipment = 120
+			}
+		}
 	}
 
 	magical_weapons_marine = {
@@ -716,6 +721,11 @@ tech_vampire_armour = {
 				magical_equipment = 120
 			}
 		}
+		marine_commando = {
+			need = {
+				magical_equipment = 120
+			}
+		}
 	}
 
 	infantry_weapons_mountaineers = {
@@ -1223,7 +1233,7 @@ tech_vampire_armour = {
 		allow = {
 			always = no
 		}
-		category_engineer = {
+		engineer = {
 			entrenchment  = 2
 			fort = {
 				defence = 0.10
@@ -2094,7 +2104,7 @@ tech_vampire_armour = {
 			casualty_trickleback = 0.05
 			supply_consumption_factor = -0.05
 		}
-		category_engineer = {
+		engineer = {
 			entrenchment = 2
 			casualty_trickleback = 0.05
 			supply_consumption_factor = -0.05
@@ -2184,7 +2194,7 @@ tech_vampire_armour = {
 		allow = {
 			always = no
 		}
-		category_engineer = {
+		engineer = {
 			entrenchment = 3
 			fort = {
 				defence = 0.10
@@ -2426,7 +2436,7 @@ tech_vampire_armour = {
 	    allow = {
 			always = no
 		}
-		consumer_goods_factor = -0.08
+		consumer_goods_factor = -0.16
 		monthly_population = 0.069
 	}
 	
@@ -2602,54 +2612,54 @@ tech_vampire_armour = {
 		
 		super_heavy_armor = {
 			river = {
-				attack = 0.1
-				movement = 0.1
+				attack = 0.05
+				movement = 0.05
 			}
 			marsh = {
-				attack = 0.1
-				movement = 0.1
+				attack = 0.05
+				movement = 0.05
 			}
 			amphibious = {
-				attack = 0.2
+				attack = 0.1
 			}
 		}
 		super_heavy_tank_destroyer_brigade = {
 			river = {
-				attack = 0.1
-				movement = 0.1
+				attack = 0.05
+				movement = 0.05
 			}
 			marsh = {
-				attack = 0.1
-				movement = 0.1
+				attack = 0.05
+				movement = 0.05
 			}
 			amphibious = {
-				attack = 0.2
+				attack = 0.1
 			}
 		}
 		super_heavy_sp_artillery_brigade = {
 			river = {
-				attack = 0.1
-				movement = 0.1
+				attack = 0.05
+				movement = 0.05
 			}
 			marsh = {
-				attack = 0.1
-				movement = 0.1
+				attack = 0.05
+				movement = 0.05
 			}
 			amphibious = {
-				attack = 0.2
+				attack = 0.1
 			}
 		}
 		super_heavy_sp_anti_air_brigade = {
 			river = {
-				attack = 0.1
-				movement = 0.1
+				attack = 0.05
+				movement = 0.05
 			}
 			marsh = {
-				attack = 0.1
-				movement = 0.1
+				attack = 0.05
+				movement = 0.05
 			}
 			amphibious = {
-				attack = 0.2
+				attack = 0.1
 			}
 		}
 	}
@@ -2739,7 +2749,7 @@ tech_vampire_armour = {
 		}
 		
 		dig_in_speed_factor = 0.05
-		category_engineer = {
+		engineer = {
 			urban = {
 				attack = 0.1
 				defence = 0.1
@@ -2824,7 +2834,7 @@ tech_vampire_armour = {
 		allow = {
 			always = no
 		}
-		category_engineer = {
+		engineer = {
 			supply_consumption_factor = -0.05
 		}
 		field_hospital = {
@@ -2838,7 +2848,7 @@ tech_vampire_armour = {
 		allow = {
 			always = no
 		}		
-		category_engineer = {
+		engineer = {
 			entrenchment = 2
 			casualty_trickleback = 0.05
 			fort = {
@@ -2950,7 +2960,7 @@ tech_vampire_armour = {
         research_cost = 1
         start_year = 989
 		dig_in_speed_factor = 0.2
-		category_engineer = {
+		engineer = {
             breakthrough = 0.2
             soft_attack = 0.2
 			hard_attack = 0.2
@@ -3075,6 +3085,27 @@ tech_vampire_armour = {
 			defense = -0.15
 		}
 	}
+	PLB_elite_among_elite_Tech = {
+
+		research_cost = 1
+
+		# only from focus!!! #####
+		allow = {
+			always = no
+		}
+		category_special_forces = {
+			max_strength = 3
+			breakthrough = 0.15
+			soft_attack = 0.15
+			hard_attack = 0.15
+			defense = 0.15
+			training_time = 5
+			need = {
+				infantry_equipment = 30
+				support_equipment = 5
+			}
+		}
+	}
 	
 	finished_land_doctrine = {
 		research_cost = 1
@@ -3135,7 +3166,7 @@ tech_vampire_armour = {
 		}		
 		research_cost = 1
 		
-		category_engineer = {
+		engineer = {
 			soft_attack = 0.05
 			suppression_factor = 0.05
 			fort = {
diff --git a/common/technologies/MTG_naval.txt b/common/technologies/MTG_naval.txt
index e4dc5673aa5..e004b56d568 100644
--- a/common/technologies/MTG_naval.txt
+++ b/common/technologies/MTG_naval.txt
@@ -91,6 +91,8 @@ technologies = {
 		categories = {
 			naval_equipment
 			dd_tech
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_destroyer_and_modules
 		}
 	}
 	
@@ -141,6 +143,8 @@ technologies = {
 		categories = {
 			naval_equipment
 			dd_tech
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_destroyer_and_modules
 		}
 	}
 	
@@ -186,6 +190,8 @@ technologies = {
 		categories = {
 			naval_equipment
 			dd_tech
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_destroyer_and_modules
 		}
 	}
 	
@@ -231,6 +237,8 @@ technologies = {
 		categories = {
 			naval_equipment
 			dd_tech
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_destroyer_and_modules
 		}
 	}
 	
@@ -276,6 +284,8 @@ technologies = {
 		categories = {
 			naval_equipment
 			dd_tech
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_destroyer_and_modules
 		}
 	}
 	
@@ -321,6 +331,8 @@ technologies = {
 		categories = {
 			naval_equipment
 			dd_tech
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_destroyer_and_modules
 		}
 	}
 	
@@ -366,6 +378,9 @@ technologies = {
 			naval_equipment
 			dd_tech
 			nuclear
+			ship_modules_tech
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_destroyer_and_modules
 		}
 	}
 
@@ -395,6 +410,9 @@ technologies = {
 		categories = {
 			naval_equipment
 			dd_tech
+			ship_modules_tech
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_destroyer_and_modules
 		}
 	}
 
@@ -443,6 +461,9 @@ technologies = {
 			naval_weaponry
 			dd_tech
 			asw_tech
+			ship_modules_tech
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_destroyer_and_modules
 		}
 	}
 	improved_depth_charges = {
@@ -483,6 +504,9 @@ technologies = {
 			naval_weaponry
 			dd_tech
 			asw_tech
+			ship_modules_tech
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_destroyer_and_modules
 		}
 	}
 	advanced_depth_charges = {
@@ -519,6 +543,9 @@ technologies = {
 			naval_weaponry
 			dd_tech
 			asw_tech
+			ship_modules_tech
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_destroyer_and_modules
 		}
 	}
 	modern_depth_charges = {
@@ -557,6 +584,9 @@ technologies = {
 			naval_weaponry
 			dd_tech
 			asw_tech
+			ship_modules_tech
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_destroyer_and_modules
 		}
 	}
  ######## Mod Start ########
@@ -594,6 +624,9 @@ technologies = {
 			naval_weaponry
 			dd_tech
 			asw_tech
+			ship_modules_tech
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_destroyer_and_modules
 		}
 	}
 	modern_depth_charges_3 = {
@@ -631,6 +664,9 @@ technologies = {
 			naval_weaponry
 			dd_tech
 			asw_tech
+			ship_modules_tech
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_destroyer_and_modules
 		}
 	}
 	
@@ -670,6 +706,9 @@ technologies = {
 			naval_equipment
 			dd_tech
 			asw_tech
+			ship_modules_tech
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_destroyer_and_modules
 		}
 	}
 
@@ -707,6 +746,9 @@ technologies = {
 			naval_equipment
 			dd_tech
 			asw_tech
+			ship_modules_tech
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_destroyer_and_modules
 		}
 	}
 	
@@ -745,6 +787,9 @@ technologies = {
 			naval_equipment
 			dd_tech
 			asw_tech
+			ship_modules_tech
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_destroyer_and_modules
 		}
 	}
 
@@ -782,6 +827,9 @@ technologies = {
 			naval_equipment
 			dd_tech
 			asw_tech
+			ship_modules_tech
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_destroyer_and_modules
 		}
 	}
 	modern_sonar = {
@@ -818,6 +866,9 @@ technologies = {
 			naval_equipment
 			dd_tech
 			asw_tech
+			ship_modules_tech
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_destroyer_and_modules
 		}
 	}
 	modern_sonar_2 = {
@@ -849,6 +900,9 @@ technologies = {
 			naval_equipment
 			dd_tech
 			asw_tech
+			ship_modules_tech
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_destroyer_and_modules
 		}
 	}
 
@@ -913,6 +967,9 @@ technologies = {
 			naval_equipment
 			cl_tech
 			ca_tech
+			mio_cat_tech_all_capital_ship_and_modules
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_cruiser_and_modules
 		}
 	}
 
@@ -963,6 +1020,9 @@ technologies = {
 			naval_equipment
 			cl_tech
 			ca_tech
+			mio_cat_tech_all_capital_ship_and_modules
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_cruiser_and_modules
 		}
 	}
 
@@ -1008,6 +1068,9 @@ technologies = {
 			naval_equipment
 			cl_tech
 			ca_tech
+			mio_cat_tech_all_capital_ship_and_modules
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_cruiser_and_modules
 		}
 	}
 
@@ -1053,6 +1116,9 @@ technologies = {
 			naval_equipment
 			cl_tech
 			ca_tech
+			mio_cat_tech_all_capital_ship_and_modules
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_cruiser_and_modules
 		}
 	}
 
@@ -1098,6 +1164,9 @@ technologies = {
 			naval_equipment
 			cl_tech
 			ca_tech
+			mio_cat_tech_all_capital_ship_and_modules
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_cruiser_and_modules
 		}
 	}
 	modern_ship_hull_cruiser = {
@@ -1141,6 +1210,9 @@ technologies = {
 			naval_equipment
 			cl_tech
 			ca_tech
+			mio_cat_tech_all_capital_ship_and_modules
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_cruiser_and_modules
 		}
 	}
 	cruiser_nuclear_reactor = {
@@ -1186,6 +1258,10 @@ technologies = {
 			cl_tech
 			ca_tech
 			nuclear
+			ship_modules_tech
+			mio_cat_tech_all_capital_ship_and_modules
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_cruiser_and_modules
 		}
 	}
 ######## Mod End ########
@@ -1236,6 +1312,10 @@ technologies = {
 			naval_equipment
 			cl_tech
 			ca_tech
+			ship_modules_tech
+			mio_cat_tech_all_capital_ship_and_modules
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_cruiser_and_modules
 		}
 	}
 
@@ -1287,6 +1367,10 @@ technologies = {
 			naval_equipment
 			cl_tech
 			ca_tech
+			ship_modules_tech
+			mio_cat_tech_all_capital_ship_and_modules
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_cruiser_and_modules
 		}
 	}
 	modern_airplane_launcher = {
@@ -1339,6 +1423,10 @@ technologies = {
 			naval_equipment
 			cl_tech
 			ca_tech
+			ship_modules_tech
+			mio_cat_tech_all_capital_ship_and_modules
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_cruiser_and_modules
 		}
 	}
 	semi_modern_sensor_suite = {
@@ -1389,6 +1477,10 @@ technologies = {
 			naval_equipment
 			cl_tech
 			ca_tech
+			ship_modules_tech
+			mio_cat_tech_all_capital_ship_and_modules
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_cruiser_and_modules
 		}
 	}
 	modern_sensor_suite = {
@@ -1432,6 +1524,10 @@ technologies = {
 			naval_equipment
 			cl_tech
 			ca_tech
+			ship_modules_tech
+			mio_cat_tech_all_capital_ship_and_modules
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_cruiser_and_modules
 		}
 	}
 	anti_sub_helicopter = {
@@ -1476,8 +1572,12 @@ technologies = {
 		
 		categories = {
 			naval_equipment
-			cl_tech
-			ca_tech
+			dd_tech
+			asw_tech
+			ship_modules_tech
+			mio_cat_tech_all_capital_ship_and_modules
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_cruiser_and_modules
 		}
 	}
 ######### Mod End #########
@@ -1529,6 +1629,10 @@ technologies = {
 			naval_armor
 			cl_tech
 			ca_tech
+			ship_modules_tech
+			mio_cat_tech_all_capital_ship_and_modules
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_cruiser_and_modules
 		}
 	}
 ######### Mod End #########
@@ -1594,6 +1698,7 @@ technologies = {
 			naval_equipment
 			bb_tech
 			bc_tech
+			mio_cat_tech_all_capital_ship_and_modules
 		}
 	}
 
@@ -1650,6 +1755,7 @@ technologies = {
 			naval_equipment
 			bb_tech
 			bc_tech
+			mio_cat_tech_all_capital_ship_and_modules
 		}
 	}
 	ship_hull_super_heavy = {
@@ -1687,6 +1793,7 @@ technologies = {
 			bb_tech
 			bc_tech
 			shbb_tech
+			mio_cat_tech_all_capital_ship_and_modules
 		}
 	}
 
@@ -1736,6 +1843,7 @@ technologies = {
 			naval_equipment
 			bb_tech
 			bc_tech
+			mio_cat_tech_all_capital_ship_and_modules
 		}
 	}
 
@@ -1839,6 +1947,7 @@ technologies = {
 			naval_equipment
 			bb_tech
 			bc_tech
+			mio_cat_tech_all_capital_ship_and_modules
 		}
 	}
 	semi_modern_ship_hull_super_heavy = {
@@ -1875,6 +1984,7 @@ technologies = {
 			bb_tech
 			bc_tech
 			shbb_tech
+			mio_cat_tech_all_capital_ship_and_modules
 		}
 	}
 	modern_ship_hull_heavy = {
@@ -1922,6 +2032,7 @@ technologies = {
 			naval_equipment
 			bb_tech
 			bc_tech
+			mio_cat_tech_all_capital_ship_and_modules
 		}
 	}
 	heavy_nuclear_reactor = {
@@ -1966,6 +2077,8 @@ technologies = {
 			bb_tech
 			bc_tech
 			nuclear
+			ship_modules_tech
+			mio_cat_tech_all_capital_ship_and_modules
 		}
 	}
 	######## Mod end ########	
@@ -2019,6 +2132,8 @@ technologies = {
 			naval_armor
 			bb_tech
 			bc_tech
+			ship_modules_tech
+			mio_cat_tech_all_capital_ship_and_modules
 		}
 	}
 
@@ -2075,6 +2190,8 @@ technologies = {
 			naval_armor
 			bb_tech
 			bc_tech
+			ship_modules_tech
+			mio_cat_tech_all_capital_ship_and_modules
 		}
 	}
 
@@ -2130,6 +2247,8 @@ technologies = {
 			naval_armor
 			bb_tech
 			bc_tech
+			ship_modules_tech
+			mio_cat_tech_all_capital_ship_and_modules
 		}
 	}
 
@@ -2180,6 +2299,8 @@ technologies = {
 			naval_armor
 			bb_tech
 			bc_tech
+			ship_modules_tech
+			mio_cat_tech_all_capital_ship_and_modules
 		}
 	}
 
@@ -2235,6 +2356,7 @@ early_ship_hull_carrier = {
 		categories = {
 			naval_equipment
 			cv_tech
+			mio_cat_tech_all_carrier_and_modules
 		}
 	}
 
@@ -2279,6 +2401,7 @@ early_ship_hull_carrier = {
 		categories = {
 			naval_equipment
 			cv_tech
+			mio_cat_tech_all_carrier_and_modules
 		}
 	}
 
@@ -2323,6 +2446,7 @@ early_ship_hull_carrier = {
 		categories = {
 			naval_equipment
 			cv_tech
+			mio_cat_tech_all_carrier_and_modules
 		}
 	}
 
@@ -2369,6 +2493,7 @@ early_ship_hull_carrier = {
 		categories = {
 			naval_equipment
 			cv_tech
+			mio_cat_tech_all_carrier_and_modules
 		}
 	}
 	######## Mod Start ########	
@@ -2410,6 +2535,7 @@ early_ship_hull_carrier = {
 		categories = {
 			naval_equipment
 			cv_tech
+			mio_cat_tech_all_carrier_and_modules
 		}
 
 	}
@@ -2456,6 +2582,7 @@ early_ship_hull_carrier = {
 		categories = {
 			naval_equipment
 			cv_tech
+			mio_cat_tech_all_carrier_and_modules
 		}
 
 	}
@@ -2488,6 +2615,7 @@ early_ship_hull_carrier = {
 		categories = {
 			naval_equipment
 			cv_tech
+			mio_cat_tech_all_carrier_and_modules
 		}
 	}
 	carrier_nuclear_reactor = {
@@ -2531,6 +2659,8 @@ early_ship_hull_carrier = {
 			naval_equipment
 			cv_tech
 			nuclear
+			ship_modules_tech
+			mio_cat_tech_all_carrier_and_modules
 		}
 	}
 	######## Mod End ########	
@@ -2592,6 +2722,7 @@ early_ship_hull_carrier = {
 		categories = {
 			naval_equipment
 			ss_tech
+			mio_cat_tech_all_submarine_and_modules
 		}
 	}
 
@@ -2641,6 +2772,7 @@ early_ship_hull_carrier = {
 		categories = {
 			naval_equipment
 			ss_tech
+			mio_cat_tech_all_submarine_and_modules
 		}
 	}
 
@@ -2687,6 +2819,7 @@ early_ship_hull_carrier = {
 		categories = {
 			naval_equipment
 			ss_tech
+			mio_cat_tech_all_submarine_and_modules
 		}
 	}
 
@@ -2738,6 +2871,7 @@ early_ship_hull_carrier = {
 		categories = {
 			naval_equipment
 			ss_tech
+			mio_cat_tech_all_submarine_and_modules
 		}
 	}
 
@@ -2784,6 +2918,7 @@ early_ship_hull_carrier = {
 		categories = {
 			naval_equipment
 			ss_tech
+			mio_cat_tech_all_submarine_and_modules
 		}
 	}
 	modern_ship_hull_submarine = {
@@ -2832,6 +2967,7 @@ early_ship_hull_carrier = {
 		categories = {
 			naval_equipment
 			ss_tech
+			mio_cat_tech_all_submarine_and_modules
 		}
 	}
 	ship_hull_missile_submarine = {
@@ -2862,6 +2998,7 @@ early_ship_hull_carrier = {
 		categories = {
 			naval_equipment
 			ss_tech
+			mio_cat_tech_all_submarine_and_modules
 		}
 	}
 
@@ -2907,6 +3044,8 @@ early_ship_hull_carrier = {
 			naval_equipment
 			ss_tech
 			nuclear
+			ship_modules_tech
+			mio_cat_tech_all_submarine_and_modules
 		}
 	}
 
@@ -2953,6 +3092,8 @@ early_ship_hull_carrier = {
 		categories = {
 			naval_equipment
 			ss_tech
+			ship_modules_tech
+			mio_cat_tech_all_submarine_and_modules
 		}
 	}
 
@@ -2989,6 +3130,8 @@ early_ship_hull_carrier = {
 		categories = {
 			naval_equipment
 			ss_tech
+			ship_modules_tech
+			mio_cat_tech_all_submarine_and_modules
 		}
 	}
 
@@ -3024,6 +3167,8 @@ early_ship_hull_carrier = {
 		categories = {
 			naval_equipment
 			ss_tech
+			ship_modules_tech
+			mio_cat_tech_all_submarine_and_modules
 		}
 	}
 	modern_submarine_snorkel = {
@@ -3053,6 +3198,8 @@ early_ship_hull_carrier = {
 		categories = {
 			naval_equipment
 			ss_tech
+			ship_modules_tech
+			mio_cat_tech_all_submarine_and_modules
 		}
 	}
 	######## Mod End ########
diff --git a/common/technologies/MTG_naval_Support.txt b/common/technologies/MTG_naval_Support.txt
index 1d7e634798e..dd70fb0508f 100644
--- a/common/technologies/MTG_naval_Support.txt
+++ b/common/technologies/MTG_naval_Support.txt
@@ -54,7 +54,6 @@ technologies = {
 
 		enable_equipment_modules = { 
 			ship_torpedo_1
-			torpedo_mounting
 		}
 		
 		dependencies = {
@@ -89,6 +88,10 @@ technologies = {
 			naval_equipment
 			ship_modules_tech
 			cat_torpedoes
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_cruiser_and_modules
+			mio_cat_tech_all_destroyer_and_modules
+			mio_cat_tech_all_submarine_and_modules #Not really Sub but unlocks tech improving Subs torpedo stuff later
 		}
 	}
 
@@ -158,6 +161,10 @@ technologies = {
 			naval_equipment
 			ship_modules_tech
 			cat_torpedoes
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_cruiser_and_modules
+			mio_cat_tech_all_destroyer_and_modules
+			mio_cat_tech_all_submarine_and_modules
 		}
 	}
 
@@ -216,6 +223,10 @@ technologies = {
 			naval_equipment
 			ship_modules_tech
 			cat_torpedoes
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_cruiser_and_modules
+			mio_cat_tech_all_destroyer_and_modules
+			mio_cat_tech_all_submarine_and_modules
 		}
 	}
 
@@ -275,6 +286,10 @@ technologies = {
 			naval_equipment
 			ship_modules_tech
 			cat_torpedoes
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_cruiser_and_modules
+			mio_cat_tech_all_destroyer_and_modules
+			mio_cat_tech_all_submarine_and_modules
 		}
 	}
 
@@ -330,6 +345,10 @@ technologies = {
 			naval_equipment
 			ship_modules_tech
 			cat_torpedoes
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_cruiser_and_modules
+			mio_cat_tech_all_destroyer_and_modules
+			mio_cat_tech_all_submarine_and_modules
 		}
 	}
  ######### Mod End #########
@@ -377,6 +396,10 @@ technologies = {
 			naval_equipment
 			ship_modules_tech
 			cat_torpedoes
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_cruiser_and_modules
+			mio_cat_tech_all_destroyer_and_modules
+			mio_cat_tech_all_submarine_and_modules
 		}
 	}
 ######## Mod Start ########
@@ -421,6 +444,10 @@ technologies = {
 			naval_equipment
 			ship_modules_tech
 			cat_torpedoes
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_cruiser_and_modules
+			mio_cat_tech_all_destroyer_and_modules
+			mio_cat_tech_all_submarine_and_modules
 		}
 	}
  ######### Mod End #########
@@ -472,6 +499,9 @@ technologies = {
 			naval_equipment
 			ship_modules_tech
 			cat_torpedoes
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_cruiser_and_modules
+			mio_cat_tech_all_destroyer_and_modules
 		}
 	}
 	advanced_ship_torpedo_launcher = {
@@ -518,6 +548,9 @@ technologies = {
 			naval_equipment
 			ship_modules_tech
 			cat_torpedoes
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_cruiser_and_modules
+			mio_cat_tech_all_destroyer_and_modules
 		}
 	}
 	modern_ship_torpedo_launcher = {
@@ -565,6 +598,9 @@ technologies = {
 			naval_equipment
 			naval_weaponry
 			cat_torpedoes
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_cruiser_and_modules
+			mio_cat_tech_all_destroyer_and_modules
 		}
 	}
  ######### Mod Start #########
@@ -611,6 +647,9 @@ technologies = {
 			naval_equipment
 			ship_modules_tech
 			cat_torpedoes
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_cruiser_and_modules
+			mio_cat_tech_all_destroyer_and_modules
 		}
 	}
 	modern_ship_torpedo_launcher_3 = {
@@ -652,6 +691,9 @@ technologies = {
 			naval_equipment
 			ship_modules_tech
 			cat_torpedoes
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_cruiser_and_modules
+			mio_cat_tech_all_destroyer_and_modules
 		}
 	}
 	
@@ -718,6 +760,11 @@ technologies = {
 			cat_ship_light_battery
 			cat_ship_medium_battery
 			cat_ship_heavy_battery
+			mio_cat_tech_all_capital_ship_and_modules
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_carrier_and_modules
+			mio_cat_tech_all_cruiser_and_modules
+			mio_cat_tech_all_destroyer_and_modules
 		}
 	}
 
@@ -762,6 +809,9 @@ technologies = {
 			naval_equipment
 			ship_modules_tech
 			cat_ship_light_battery
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_cruiser_and_modules
+			mio_cat_tech_all_destroyer_and_modules
 		}
 	}
 
@@ -825,6 +875,9 @@ technologies = {
 		categories = {
 			naval_equipment
 			ship_modules_tech
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_cruiser_and_modules
+			mio_cat_tech_all_destroyer_and_modules
 		}
 	}
 
@@ -873,6 +926,9 @@ technologies = {
 			naval_equipment
 			ship_modules_tech
 			cat_ship_light_battery
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_cruiser_and_modules
+			mio_cat_tech_all_destroyer_and_modules
 		}
 	}
 
@@ -934,6 +990,9 @@ technologies = {
 		categories = {
 			naval_equipment
 			ship_modules_tech
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_cruiser_and_modules
+			mio_cat_tech_all_destroyer_and_modules
 		}
 	}
 
@@ -976,6 +1035,9 @@ technologies = {
 			naval_equipment
 			ship_modules_tech
 			cat_ship_light_battery
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_cruiser_and_modules
+			mio_cat_tech_all_destroyer_and_modules
 		}
 	}
 
@@ -1023,6 +1085,9 @@ technologies = {
 			naval_equipment
 			ship_modules_tech
 			cat_ship_medium_battery
+			mio_cat_tech_all_capital_ship_and_modules
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_cruiser_and_modules
 		}
 	}
 
@@ -1063,6 +1128,9 @@ technologies = {
 
 		categories = {
 			naval_equipment
+			mio_cat_tech_all_capital_ship_and_modules
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_cruiser_and_modules
 		}
 	}
 
@@ -1105,6 +1173,9 @@ technologies = {
 			naval_equipment
 			ship_modules_tech
 			cat_ship_medium_battery
+			mio_cat_tech_all_capital_ship_and_modules
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_cruiser_and_modules
 		}
 	}
 
@@ -1150,6 +1221,9 @@ technologies = {
 
 		categories = {
 			naval_equipment
+			mio_cat_tech_all_capital_ship_and_modules
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_cruiser_and_modules
 		}
 	}
 
@@ -1192,6 +1266,9 @@ technologies = {
 			naval_equipment
 			ship_modules_tech
 			cat_ship_medium_battery
+			mio_cat_tech_all_capital_ship_and_modules
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_cruiser_and_modules
 		}
 	}
 	
@@ -1242,6 +1319,7 @@ technologies = {
 			naval_equipment
 			ship_modules_tech
 			cat_ship_heavy_battery
+			mio_cat_tech_all_capital_ship_and_modules
 		}
 	}
 	improved_heavy_battery = {
@@ -1289,6 +1367,7 @@ technologies = {
 			naval_equipment
 			ship_modules_tech
 			cat_ship_heavy_battery
+			mio_cat_tech_all_capital_ship_and_modules
 		}
 	}
 	advanced_heavy_battery = {
@@ -1337,6 +1416,7 @@ technologies = {
 			naval_equipment
 			ship_modules_tech
 			cat_ship_heavy_battery
+			mio_cat_tech_all_capital_ship_and_modules
 		}
 	}
 	basic_heavy_shell = {
@@ -1382,6 +1462,7 @@ technologies = {
 
 		categories = {
 			naval_equipment
+			mio_cat_tech_all_capital_ship_and_modules
 		}
 	}
 	improved_heavy_shell = {
@@ -1426,6 +1507,7 @@ technologies = {
 
 		categories = {
 			naval_equipment
+			mio_cat_tech_all_capital_ship_and_modules
 		}
 	}
 
@@ -1469,6 +1551,11 @@ technologies = {
 		categories = {
 			naval_equipment
 			ship_modules_tech
+			mio_cat_tech_all_capital_ship_and_modules
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_carrier_and_modules
+			mio_cat_tech_all_cruiser_and_modules
+			mio_cat_tech_all_destroyer_and_modules
 		}
 	}
 
@@ -1510,6 +1597,11 @@ technologies = {
 		categories = {
 			naval_equipment
 			ship_modules_tech
+			mio_cat_tech_all_capital_ship_and_modules
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_carrier_and_modules
+			mio_cat_tech_all_cruiser_and_modules
+			mio_cat_tech_all_destroyer_and_modules
 		}
 	}
 
@@ -1546,6 +1638,11 @@ technologies = {
 		categories = {
 			naval_equipment
 			ship_modules_tech
+			mio_cat_tech_all_capital_ship_and_modules
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_carrier_and_modules
+			mio_cat_tech_all_cruiser_and_modules
+			mio_cat_tech_all_destroyer_and_modules
 		}
 	}
 
@@ -1581,6 +1678,9 @@ technologies = {
 		categories = {
 			naval_equipment
 			ship_modules_tech
+			mio_cat_tech_all_capital_ship_and_modules
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_cruiser_and_modules
 		}
 	}
 
@@ -1632,6 +1732,10 @@ technologies = {
 			cat_ship_light_battery
 			cat_ship_medium_battery
 			rocketry
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_cruiser_and_modules
+			mio_cat_tech_all_destroyer_and_modules
+			mio_cat_tech_all_capital_ship_and_modules
 		}
 	}
 
@@ -1675,6 +1779,10 @@ technologies = {
 			rocketry
 			cat_ship_light_battery
 			cat_ship_medium_battery
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_cruiser_and_modules
+			mio_cat_tech_all_destroyer_and_modules
+			mio_cat_tech_all_capital_ship_and_modules
 		}
 	}
 
@@ -1723,6 +1831,7 @@ technologies = {
 			naval_weaponry
 			rocketry
 			cat_ship_heavy_battery
+			mio_cat_tech_all_capital_ship_and_modules
 		}
 	}
 
@@ -1764,12 +1873,13 @@ technologies = {
 			naval_weaponry
 			rocketry
 			cat_ship_heavy_battery
+			mio_cat_tech_all_capital_ship_and_modules
 		}
 	}
 	
 	mtg_transport = { #WHEN BALANCING - ALSO FIX REGULAR NAVAL TREE
 
-		transport_capacity = -0.5
+		transport_capacity = -0.33
 		naval_invasion_capacity = 10
 		
 		path = {
@@ -1814,9 +1924,9 @@ technologies = {
 	
 	mtg_landing_craft = {
 
-		invasion_preparation = -0.5
+		invasion_preparation = -0.25
 		amphibious_invasion_defence = 0.15
-		naval_invasion_capacity = 40
+		naval_invasion_capacity = 20
 
 		path = {
 			leads_to_tech = mtg_tank_landing_craft 
@@ -1998,6 +2108,12 @@ technologies = {
 		categories = {
 			naval_equipment
 			ship_modules_tech
+			mio_cat_tech_all_capital_ship_and_modules
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_submarine_and_modules
+			mio_cat_tech_all_carrier_and_modules
+			mio_cat_tech_all_cruiser_and_modules
+			mio_cat_tech_all_destroyer_and_modules
 		}
 	}
 
@@ -2040,6 +2156,12 @@ technologies = {
 		categories = {
 			naval_equipment
 			ship_modules_tech
+			mio_cat_tech_all_capital_ship_and_modules
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_submarine_and_modules
+			mio_cat_tech_all_carrier_and_modules
+			mio_cat_tech_all_cruiser_and_modules
+			mio_cat_tech_all_destroyer_and_modules
 		}
 	}
 
@@ -2078,6 +2200,12 @@ technologies = {
 		categories = {
 			naval_equipment
 			ship_modules_tech
+			mio_cat_tech_all_capital_ship_and_modules
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_submarine_and_modules
+			mio_cat_tech_all_carrier_and_modules
+			mio_cat_tech_all_cruiser_and_modules
+			mio_cat_tech_all_destroyer_and_modules
 		}
 	}
 	
@@ -2130,6 +2258,12 @@ technologies = {
 		categories = {
 			naval_equipment
 			ship_modules_tech
+			mio_cat_tech_all_capital_ship_and_modules
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_submarine_and_modules
+			mio_cat_tech_all_carrier_and_modules
+			mio_cat_tech_all_cruiser_and_modules
+			mio_cat_tech_all_destroyer_and_modules
 		}
 	}
 
@@ -2185,6 +2319,12 @@ technologies = {
 		categories = {
 			naval_equipment
 			ship_modules_tech
+			mio_cat_tech_all_capital_ship_and_modules
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_submarine_and_modules
+			mio_cat_tech_all_carrier_and_modules
+			mio_cat_tech_all_cruiser_and_modules
+			mio_cat_tech_all_destroyer_and_modules
 		}
 	}
 
@@ -2249,6 +2389,12 @@ technologies = {
 		categories = {
 			naval_equipment
 			ship_modules_tech
+			mio_cat_tech_all_capital_ship_and_modules
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_submarine_and_modules
+			mio_cat_tech_all_carrier_and_modules
+			mio_cat_tech_all_cruiser_and_modules
+			mio_cat_tech_all_destroyer_and_modules
 		}
 	}
 	
@@ -2301,6 +2447,9 @@ technologies = {
 			naval_mines
 			naval_minelaying
 			naval_equipment
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_cruiser_and_modules
+			mio_cat_tech_all_destroyer_and_modules
 		}
 	}
 
@@ -2333,6 +2482,7 @@ technologies = {
 			naval_minelaying
 			naval_equipment
 			ship_modules_tech
+			mio_cat_tech_all_submarine_and_modules
 		}
 	}
 
@@ -2365,6 +2515,7 @@ technologies = {
 			naval_minelaying
 			naval_equipment
 			ship_modules_tech
+			mio_cat_tech_all_submarine_and_modules
 		}
 	}
 
@@ -2394,6 +2545,7 @@ technologies = {
 			naval_minelaying
 			naval_equipment
 			ship_modules_tech
+			mio_cat_tech_all_submarine_and_modules
 		}
 	}
 
@@ -2438,7 +2590,9 @@ technologies = {
 			naval_mines
 			naval_minelaying
 			naval_equipment
-			ship_modules_tech
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_cruiser_and_modules
+			mio_cat_tech_all_destroyer_and_modules
 		}
 	}
 
@@ -2474,7 +2628,12 @@ technologies = {
 			naval_mines
 			naval_minesweeping
 			naval_equipment
-			ship_modules_tech
+			mio_cat_tech_all_capital_ship_and_modules
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_submarine_and_modules
+			mio_cat_tech_all_carrier_and_modules
+			mio_cat_tech_all_cruiser_and_modules
+			mio_cat_tech_all_destroyer_and_modules
 		}
 	}
 
@@ -2523,7 +2682,9 @@ technologies = {
 			naval_mines
 			naval_minelaying
 			naval_equipment
-			ship_modules_tech
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_cruiser_and_modules
+			mio_cat_tech_all_destroyer_and_modules
 		}
 	}
 
@@ -2657,6 +2818,9 @@ technologies = {
 			naval_mines
 			naval_minelaying
 			naval_equipment
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_cruiser_and_modules
+			mio_cat_tech_all_destroyer_and_modules
 		}
 	}
 
@@ -2764,6 +2928,9 @@ technologies = {
 			naval_mines
 			naval_minelaying
 			naval_equipment
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_cruiser_and_modules
+			mio_cat_tech_all_destroyer_and_modules
 		}
 	}
 
@@ -2799,6 +2966,12 @@ technologies = {
 			naval_mines
 			naval_minesweeping
 			naval_equipment
+			mio_cat_tech_all_capital_ship_and_modules
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_submarine_and_modules
+			mio_cat_tech_all_carrier_and_modules
+			mio_cat_tech_all_cruiser_and_modules
+			mio_cat_tech_all_destroyer_and_modules
 		}
 	}
 
@@ -2839,6 +3012,9 @@ technologies = {
 			naval_mines
 			naval_minelaying
 			naval_equipment
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_cruiser_and_modules
+			mio_cat_tech_all_destroyer_and_modules
 		}
 	}
 
diff --git a/common/technologies/NSB_armor.txt b/common/technologies/NSB_armor.txt
index 80a9f51531a..88c9183c6d2 100644
--- a/common/technologies/NSB_armor.txt
+++ b/common/technologies/NSB_armor.txt
@@ -24,6 +24,8 @@ technologies = {
 	### GERMAN TANK NAMES IN COMMENTS SO YOU CAN FIND STUFF MORE EASILY
 	gwtank_chassis = { #Leichttraktor
 
+		show_equipment_icon = yes
+
 		enable_equipments = {
 			light_tank_chassis_0
 			medium_tank_chassis_0
@@ -166,7 +168,9 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
 			cat_light_armor
+			mio_cat_tech_light_armor_and_modules
 		}
 	}
 
@@ -256,7 +260,9 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
 			cat_light_armor
+			mio_cat_tech_light_armor_and_modules
 		}
 	}
 
@@ -322,7 +328,9 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
 			cat_light_armor
+			mio_cat_tech_light_armor_and_modules
 		}
 	}
 
@@ -407,7 +415,9 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
 			tp_tech
+			mio_cat_tech_light_armor_and_modules
 		}
 	}
 
@@ -474,7 +484,9 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
 			tp_tech
+			mio_cat_tech_light_armor_and_modules
 		}
 	}
 
@@ -530,7 +542,9 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
 			cat_light_armor
+			mio_cat_tech_light_armor_and_modules
 		}
 	}
 
@@ -587,7 +601,9 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
 			cat_light_armor
+			mio_cat_tech_light_armor_and_modules
 		}
 	}
 	
@@ -635,7 +651,9 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
 			cat_light_armor
+			mio_cat_tech_light_armor_and_modules
 		}
 	}
 
@@ -722,7 +740,9 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
 			cat_medium_armor
+			mio_cat_tech_medium_armor_and_modules
 		}
 	}
 
@@ -795,7 +815,9 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
 			cat_medium_armor
+			mio_cat_tech_medium_armor_and_modules
 		}
 	}
 
@@ -856,7 +878,9 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
 			cat_medium_armor
+			mio_cat_tech_medium_armor_and_modules
 		}
 	}
 
@@ -920,7 +944,9 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
 			cat_medium_armor
+			mio_cat_tech_medium_armor_and_modules
 		}
 	}
 
@@ -973,7 +999,9 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
 			cat_medium_armor
+			mio_cat_tech_medium_armor_and_modules
 		}
 	}
 
@@ -1010,7 +1038,9 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
 			cat_medium_armor
+			mio_cat_tech_medium_armor_and_modules
 		}
 	}
 
@@ -1088,7 +1118,9 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
 			cat_heavy_armor
+			mio_cat_tech_heavy_armor_and_modules
 		}
 	}
 
@@ -1140,7 +1172,9 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
 			cat_heavy_armor
+			mio_cat_tech_heavy_armor_and_modules
 		}
 	}
 
@@ -1188,7 +1222,9 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
 			cat_heavy_armor
+			mio_cat_tech_heavy_armor_and_modules
 		}
 	}
 
@@ -1227,7 +1263,9 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
 			cat_heavy_armor
+			mio_cat_tech_heavy_armor_and_modules
 		}
 	}
 	super_heavy_tank_chassis_b = { #M103
@@ -1244,113 +1282,6 @@ technologies = {
 			leads_to_tech = super_heavy_tank_chassis_c
 			research_cost_coeff = 1
 		}
-		super_heavy_armor = {
-			forest = {
-				attack = 0.1
-			}
-			hills = {
-				attack = 0.1
-			}
-			mountain = 	{
-				attack = 0.1
-			}
-			jungle = {
-				attack = 0.1
-			}
-			marsh = {
-				attack = 0.1
-			}
-			urban = {
-				attack = 0.1
-			}
-			river = {
-				attack = 0.1
-				movement = 0.1
-			}
-			amphibious = {
-				attack = 0.1
-			}
-		}
-		super_heavy_tank_destroyer_brigade = {
-			forest = {
-				attack = 0.1
-			}
-			hills = {
-				attack = 0.1
-			}
-			mountain = 	{
-				attack = 0.1
-			}
-			jungle = {
-				attack = 0.1
-			}
-			marsh = {
-				attack = 0.1
-			}
-			urban = {
-				attack = 0.1
-			}
-			river = {
-				attack = 0.1
-				movement = 0.1
-			}
-			amphibious = {
-				attack = 0.2
-			}
-		}
-		super_heavy_sp_artillery_brigade = {
-			forest = {
-				attack = 0.1
-			}
-			hills = {
-				attack = 0.1
-			}
-			mountain = 	{
-				attack = 0.1
-			}
-			jungle = {
-				attack = 0.1
-			}
-			marsh = {
-				attack = 0.1
-			}
-			urban = {
-				attack = 0.1
-			}
-			river = {
-				attack = 0.1
-				movement = 0.1
-			}
-			amphibious = {
-				attack = 0.2
-			}
-		}
-		super_heavy_sp_anti_air_brigade = {
-			forest = {
-				attack = 0.1
-			}
-			hills = {
-				attack = 0.1
-			}
-			mountain = 	{
-				attack = 0.1
-			}
-			jungle = {
-				attack = 0.1
-			}
-			marsh = {
-				attack = 0.1
-			}
-			urban = {
-				attack = 0.1
-			}
-			river = {
-				attack = 0.1
-			}
-			amphibious = {
-				attack = 0.2
-			}
-		}
 
 		research_cost = 2.5
 		start_year = 1020
@@ -1365,7 +1296,9 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
 			cat_heavy_armor
+			mio_cat_tech_heavy_armor_and_modules
 		}
 	}
 	super_heavy_tank_chassis_c = { #Object 279
@@ -1391,7 +1324,9 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
 			cat_heavy_armor
+			mio_cat_tech_heavy_armor_and_modules
 		}
 	}
 
@@ -1454,6 +1389,10 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
+			mio_cat_tech_light_armor_and_modules
+			mio_cat_tech_medium_armor_and_modules
+			mio_cat_tech_heavy_armor_and_modules
 		}
 	}
 
@@ -1513,6 +1452,10 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
+			mio_cat_tech_light_armor_and_modules
+			mio_cat_tech_medium_armor_and_modules
+			mio_cat_tech_heavy_armor_and_modules
 		}
 	}
 
@@ -1566,6 +1509,10 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
+			mio_cat_tech_light_armor_and_modules
+			mio_cat_tech_medium_armor_and_modules
+			mio_cat_tech_heavy_armor_and_modules
 		}
 	}
 
@@ -1617,6 +1564,10 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
+			mio_cat_tech_light_armor_and_modules
+			mio_cat_tech_medium_armor_and_modules
+			mio_cat_tech_heavy_armor_and_modules
 		}
 	}
 	armor_tech_5 = {
@@ -1670,6 +1621,10 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
+			mio_cat_tech_light_armor_and_modules
+			mio_cat_tech_medium_armor_and_modules
+			mio_cat_tech_heavy_armor_and_modules
 		}
 	}
 	armor_tech_6 = {
@@ -1720,6 +1675,10 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
+			mio_cat_tech_light_armor_and_modules
+			mio_cat_tech_medium_armor_and_modules
+			mio_cat_tech_heavy_armor_and_modules
 		}
 	}
 
@@ -1778,6 +1737,10 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
+			mio_cat_tech_light_armor_and_modules
+			mio_cat_tech_medium_armor_and_modules
+			mio_cat_tech_heavy_armor_and_modules
 		}
 	}
 
@@ -1835,6 +1798,10 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
+			mio_cat_tech_light_armor_and_modules
+			mio_cat_tech_medium_armor_and_modules
+			mio_cat_tech_heavy_armor_and_modules
 		}
 	}
 
@@ -1886,6 +1853,10 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
+			mio_cat_tech_light_armor_and_modules
+			mio_cat_tech_medium_armor_and_modules
+			mio_cat_tech_heavy_armor_and_modules
 		}
 	}
 
@@ -1935,6 +1906,10 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
+			mio_cat_tech_light_armor_and_modules
+			mio_cat_tech_medium_armor_and_modules
+			mio_cat_tech_heavy_armor_and_modules
 		}
 	}
 	engine_tech_5= {
@@ -1983,6 +1958,10 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
+			mio_cat_tech_light_armor_and_modules
+			mio_cat_tech_medium_armor_and_modules
+			mio_cat_tech_heavy_armor_and_modules
 		}
 	}
 	engine_tech_6= {
@@ -2027,6 +2006,37 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
+			mio_cat_tech_light_armor_and_modules
+			mio_cat_tech_medium_armor_and_modules
+			mio_cat_tech_heavy_armor_and_modules
 		}
 	}
+	NOR_rikstanken_tech = {
+
+		allow = { always = no } #Only obtained through Rikstanken Event
+
+		enable_equipment_modules = {
+			NOR_rikstanken_turret
+			NOR_tank_rikstanken_armor
+		}
+
+		path = {
+		}
+
+		on_research_complete = {
+		
+		}
+
+		show_effect_as_desc = no
+
+		research_cost = 1
+		start_year = 1007
+
+
+		categories = {
+			armor
+		}
+	}
+
 }
diff --git a/common/technologies/air_techs.txt b/common/technologies/air_techs.txt
index 7227792bf87..664ee5c9986 100644
--- a/common/technologies/air_techs.txt
+++ b/common/technologies/air_techs.txt
@@ -34,6 +34,8 @@ technologies = {
 			light_air
 			light_fighter
 			air_equipment
+			mio_cat_all_light_fighter_and_modules
+			mio_cat_all_light_aircraft_and_modules
 		}
 
 		sub_technologies = {
@@ -63,6 +65,7 @@ technologies = {
 		categories = {
 			naval_air
 			air_equipment
+			mio_cat_all_light_fighter_and_modules
 		}
 
 		ai_will_do = {
@@ -115,6 +118,8 @@ technologies = {
 			light_air
 			light_fighter
 			air_equipment
+			mio_cat_all_light_fighter_and_modules
+			mio_cat_all_light_aircraft_and_modules
 		}
 
 		sub_technologies = {
@@ -167,6 +172,7 @@ technologies = {
 		categories = {
 			naval_air
 			air_equipment
+			mio_cat_all_light_fighter_and_modules
 		}
 
 		ai_will_do = {
@@ -225,6 +231,8 @@ technologies = {
 			light_air
 			light_fighter
 			air_equipment
+			mio_cat_all_light_fighter_and_modules
+			mio_cat_all_light_aircraft_and_modules
 		}
 
 		sub_technologies = {
@@ -273,6 +281,7 @@ technologies = {
 		categories = {
 			naval_air
 			air_equipment
+			mio_cat_all_light_fighter_and_modules
 		}
 
 		ai_will_do = {
@@ -331,6 +340,8 @@ technologies = {
 			light_air
 			light_fighter
 			air_equipment
+			mio_cat_all_light_fighter_and_modules
+			mio_cat_all_light_aircraft_and_modules
 		}
 
 		sub_technologies = {
@@ -379,6 +390,7 @@ technologies = {
 		categories = {
 			naval_air
 			air_equipment
+			mio_cat_all_light_fighter_and_modules
 		}
 
 		ai_will_do = {
@@ -445,6 +457,8 @@ technologies = {
 			jet_technology
 			air_equipment
 			light_fighter
+			mio_cat_all_light_fighter_and_modules
+			mio_cat_all_light_aircraft_and_modules
 		}
 
 		sub_technologies = {
@@ -485,6 +499,8 @@ technologies = {
 			jet_technology
 			air_equipment
 			light_fighter
+			mio_cat_all_light_fighter_and_modules
+			mio_cat_all_light_aircraft_and_modules
 		}
 
 		sub_technologies = {
@@ -530,6 +546,8 @@ technologies = {
 			light_air
 			cas_bomber
 			air_equipment
+			mio_cat_all_cas_and_modules
+			mio_cat_all_light_aircraft_and_modules
 		}
 
 		ai_will_do = {
@@ -567,6 +585,7 @@ technologies = {
 			naval_air
 			air_equipment
 			cas_bomber
+			mio_cat_all_cas_and_modules
 		}
 
 		ai_will_do = {
@@ -626,6 +645,8 @@ technologies = {
 			light_air
 			cas_bomber
 			air_equipment
+			mio_cat_all_cas_and_modules
+			mio_cat_all_light_aircraft_and_modules
 		}
 
 		ai_will_do = {
@@ -655,6 +676,7 @@ technologies = {
 			naval_air
 			air_equipment
 			cas_bomber
+			mio_cat_all_cas_and_modules
 		}
 
 		ai_will_do = {
@@ -713,6 +735,8 @@ technologies = {
 			light_air
 			cas_bomber
 			air_equipment
+			mio_cat_all_cas_and_modules
+			mio_cat_all_light_aircraft_and_modules
 		}
 
 		ai_will_do = {
@@ -742,6 +766,7 @@ technologies = {
 			naval_air
 			air_equipment
 			cas_bomber
+			mio_cat_all_cas_and_modules
 		}
 
 		ai_will_do = {
@@ -796,6 +821,8 @@ technologies = {
 			naval_air
 			naval_bomber
 			air_equipment
+			mio_cat_all_naval_bomber_and_modules
+			mio_cat_all_light_aircraft_and_modules
 		}
 
 		ai_will_do = {
@@ -827,6 +854,7 @@ technologies = {
 		categories = {
 			naval_air
 			air_equipment
+			mio_cat_all_naval_bomber_and_modules
 		}
 
 		ai_will_do = {
@@ -882,6 +910,8 @@ technologies = {
 			naval_air
 			air_equipment
 			naval_bomber
+			mio_cat_all_naval_bomber_and_modules
+			mio_cat_all_light_aircraft_and_modules
 		}
 
 		ai_will_do = {
@@ -913,6 +943,7 @@ technologies = {
 		categories = {
 			naval_air
 			air_equipment
+			mio_cat_all_naval_bomber_and_modules
 		}
 
 		ai_will_do = {
@@ -968,6 +999,8 @@ technologies = {
 			naval_air
 			naval_bomber
 			air_equipment
+			mio_cat_all_naval_bomber_and_modules
+			mio_cat_all_light_aircraft_and_modules
 		}
 
 		ai_will_do = {
@@ -999,6 +1032,7 @@ technologies = {
 		categories = {
 			naval_air
 			air_equipment
+			mio_cat_all_naval_bomber_and_modules
 		}
 
 		ai_will_do = {
@@ -1054,6 +1088,7 @@ technologies = {
 			medium_air
 			tactical_bomber
 			air_equipment
+			mio_cat_all_medium_aircraft_and_modules
 		}
 
 		ai_will_do = {
@@ -1083,6 +1118,7 @@ technologies = {
 			medium_air
 			air_equipment
 			cat_heavy_fighter
+			mio_cat_all_medium_aircraft_and_modules
 		}
 
 		ai_will_do = {
@@ -1116,6 +1152,7 @@ technologies = {
 			medium_air
 			air_equipment
 			cat_heavy_fighter
+			mio_cat_all_medium_aircraft_and_modules
 		}
 
 		ai_will_do = {
@@ -1149,6 +1186,7 @@ technologies = {
 			medium_air
 			air_equipment
 			cat_heavy_fighter
+			mio_cat_all_medium_aircraft_and_modules
 		}
 
 		ai_will_do = {
@@ -1186,6 +1224,7 @@ technologies = {
 			medium_air
 			air_equipment
 			cat_scout_plane
+			mio_cat_all_medium_aircraft_and_modules
 		}
 		
 		ai_will_do = {
@@ -1227,6 +1266,7 @@ technologies = {
 			medium_air
 			air_equipment
 			cat_scout_plane
+			mio_cat_all_medium_aircraft_and_modules
 		}
 		
 		ai_will_do = {
@@ -1268,6 +1308,7 @@ technologies = {
 			medium_air
 			air_equipment
 			cat_scout_plane
+			mio_cat_all_medium_aircraft_and_modules
 		}
 		
 		ai_will_do = {
@@ -1312,6 +1353,7 @@ technologies = {
 			medium_air
 			tactical_bomber
 			air_equipment
+			mio_cat_all_medium_aircraft_and_modules
 		}
 
 		ai_will_do = {
@@ -1359,6 +1401,7 @@ technologies = {
 			medium_air
 			tactical_bomber
 			air_equipment
+			mio_cat_all_medium_aircraft_and_modules
 		}
 
 		ai_will_do = {
@@ -1406,6 +1449,7 @@ technologies = {
 			medium_air
 			tactical_bomber
 			air_equipment
+			mio_cat_all_medium_aircraft_and_modules
 		}
 
 		ai_will_do = {
@@ -1455,6 +1499,7 @@ technologies = {
 			jet_technology
 			tactical_bomber
 			air_equipment
+			mio_cat_all_medium_aircraft_and_modules
 		}
 
 		ai_will_do = {
@@ -1489,6 +1534,7 @@ technologies = {
 			jet_technology
 			tactical_bomber
 			air_equipment
+			mio_cat_all_medium_aircraft_and_modules
 		}
 
 		ai_will_do = {
@@ -1523,6 +1569,7 @@ technologies = {
 			heavy_air
 			air_equipment
 			cat_strategic_bomber
+			mio_cat_all_heavy_aircraft_and_modules
 		}
 
 		ai_will_do = {
@@ -1563,6 +1610,7 @@ technologies = {
 			heavy_air
 			air_equipment
 			cat_strategic_bomber
+			mio_cat_all_heavy_aircraft_and_modules
 		}
 
 		ai_will_do = {
@@ -1598,6 +1646,7 @@ technologies = {
 			heavy_air
 			air_equipment
 			cat_strategic_bomber
+			mio_cat_all_heavy_aircraft_and_modules
 		}
 
 		ai_will_do = {
@@ -1640,6 +1689,7 @@ technologies = {
 			jet_technology
 			cat_strategic_bomber
 			air_equipment
+			mio_cat_all_heavy_aircraft_and_modules
 		}
 
 		ai_will_do = {
@@ -1699,6 +1749,8 @@ technologies = {
 			jet_technology
 			air_equipment
 			light_fighter
+			mio_cat_all_light_fighter_and_modules
+			mio_cat_all_light_aircraft_and_modules
 		}
 
 		sub_technologies = {
@@ -1727,6 +1779,7 @@ technologies = {
 			naval_air
 			air_equipment
 			jet_technology
+			mio_cat_all_light_fighter_and_modules
 		}
 
 		ai_will_do = {
@@ -1761,6 +1814,7 @@ technologies = {
 			naval_air
 			air_equipment
 			jet_technology
+			mio_cat_all_light_fighter_and_modules
 		}
 
 		ai_will_do = {
@@ -1795,6 +1849,7 @@ technologies = {
 			naval_air
 			air_equipment
 			jet_technology
+			mio_cat_all_light_fighter_and_modules
 		}
 
 		ai_will_do = {
@@ -1835,6 +1890,7 @@ technologies = {
 			medium_air
 			air_equipment
 			cat_heavy_fighter
+			mio_cat_all_medium_aircraft_and_modules
 		}
 
 		ai_will_do = {
@@ -1869,6 +1925,8 @@ technologies = {
 			naval_bomber
 			jet_technology
 			air_equipment
+			mio_cat_all_cas_and_modules
+			mio_cat_all_light_aircraft_and_modules
 		}
 		ai_will_do = {
 			factor = 2
@@ -1908,6 +1966,8 @@ technologies = {
 			naval_bomber
 			jet_technology
 			air_equipment
+			mio_cat_all_cas_and_modules
+			mio_cat_all_light_aircraft_and_modules
 		}
 		ai_will_do = {
 			factor = 2
@@ -1943,6 +2003,8 @@ technologies = {
 			naval_bomber
 			jet_technology
 			air_equipment
+			mio_cat_all_cas_and_modules
+			mio_cat_all_light_aircraft_and_modules
 		}
 		ai_will_do = {
 			factor = 2
@@ -1977,6 +2039,7 @@ technologies = {
 			naval_bomber
 			jet_technology
 			air_equipment
+			mio_cat_all_cas_and_modules
 		}
 
 		ai_will_do = {
@@ -2013,6 +2076,7 @@ technologies = {
 			naval_bomber
 			jet_technology
 			air_equipment
+			mio_cat_all_cas_and_modules
 		}
 
 		ai_will_do = {
@@ -2049,6 +2113,7 @@ technologies = {
 			naval_bomber
 			jet_technology
 			air_equipment
+			mio_cat_all_cas_and_modules
 		}
 
 		ai_will_do = {
@@ -2087,6 +2152,7 @@ technologies = {
 			jet_technology
 			tactical_bomber
 			air_equipment
+			mio_cat_all_medium_aircraft_and_modules
 		}
 
 		ai_will_do = {
@@ -2121,6 +2187,7 @@ technologies = {
 			jet_technology
 			cat_strategic_bomber
 			air_equipment
+			mio_cat_all_heavy_aircraft_and_modules
 		}
 
 		ai_will_do = {
@@ -2154,6 +2221,7 @@ technologies = {
 			jet_technology
 			cat_strategic_bomber
 			air_equipment
+			mio_cat_all_heavy_aircraft_and_modules
 		}
 
 		ai_will_do = {
@@ -2190,6 +2258,7 @@ technologies = {
 			cat_scout_plane
 			jet_technology
 			air_equipment
+			mio_cat_all_medium_aircraft_and_modules
 		}
 		
 		ai_will_do = {
@@ -2230,6 +2299,8 @@ technologies = {
 		
 		categories = {
 			airship_tech
+			mio_cat_all_medium_aircraft_and_modules
+			mio_cat_all_heavy_aircraft_and_modules
 		}
 		
 		ai_will_do = {
diff --git a/common/technologies/armor.txt b/common/technologies/armor.txt
index 98187ff064e..fa3de22e820 100644
--- a/common/technologies/armor.txt
+++ b/common/technologies/armor.txt
@@ -88,7 +88,9 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
 			cat_light_armor
+			mio_cat_tech_light_armor_and_modules
 		}
 	}
 
@@ -174,7 +176,9 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
 			cat_light_armor
+			mio_cat_tech_light_armor_and_modules
 		}
 	}
 
@@ -215,6 +219,8 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
+			mio_cat_tech_light_armor_and_modules
 		}
 	}
 
@@ -250,7 +256,9 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
 			armor_art
+			mio_cat_tech_light_armor_and_modules
 		}
 	}
 
@@ -281,6 +289,8 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
+			mio_cat_tech_light_armor_and_modules
 		}
 	}
 
@@ -348,7 +358,9 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
 			cat_light_armor
+			mio_cat_tech_light_armor_and_modules
 		}
 	}
 
@@ -380,6 +392,8 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
+			mio_cat_tech_light_armor_and_modules
 		}
 	}
 
@@ -412,7 +426,9 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
 			armor_art
+			mio_cat_tech_light_armor_and_modules
 		}
 	}
 
@@ -440,6 +456,8 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
+			mio_cat_tech_light_armor_and_modules
 		}
 	}
 
@@ -499,8 +517,10 @@ technologies = {
 		
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
 			tp_tech
 			marine_tech
+			mio_cat_tech_light_armor_and_modules
 		}
 	}
 
@@ -538,8 +558,10 @@ technologies = {
 		
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
 			tp_tech
 			marine_tech
+			mio_cat_tech_light_armor_and_modules
 		}
 	}
 
@@ -595,7 +617,9 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
 			cat_light_armor
+			mio_cat_tech_light_armor_and_modules
 		}
 	}
 
@@ -624,6 +648,8 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
+			mio_cat_tech_light_armor_and_modules
 		}
 	}
 
@@ -650,7 +676,9 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
 			armor_art
+			mio_cat_tech_light_armor_and_modules
 		}
 	}
 
@@ -677,6 +705,8 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
+			mio_cat_tech_light_armor_and_modules
 		}
 	}
 
@@ -750,7 +780,9 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
 			cat_medium_armor
+			mio_cat_tech_medium_armor_and_modules
 		}
 	}
 
@@ -797,6 +829,8 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
+			mio_cat_tech_medium_armor_and_modules
 		}
 	}
 
@@ -843,7 +877,9 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
 			armor_art
+			mio_cat_tech_medium_armor_and_modules
 		}
 	}
 
@@ -875,6 +911,8 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
+			mio_cat_tech_medium_armor_and_modules
 		}
 	}
 
@@ -933,7 +971,9 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
 			cat_medium_armor
+			mio_cat_tech_medium_armor_and_modules
 		}
 	}
 
@@ -981,6 +1021,8 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
+			mio_cat_tech_medium_armor_and_modules
 		}
 	}
 
@@ -1027,7 +1069,9 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
 			armor_art
+			mio_cat_tech_medium_armor_and_modules
 		}
 	}
 
@@ -1055,6 +1099,8 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
+			mio_cat_tech_medium_armor_and_modules
 		}
 	}
 
@@ -1109,7 +1155,9 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
 			cat_medium_armor
+			mio_cat_tech_medium_armor_and_modules
 		}
 	}
 
@@ -1156,6 +1204,8 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
+			mio_cat_tech_medium_armor_and_modules
 		}
 	}
 
@@ -1202,7 +1252,9 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
 			armor_art
+			mio_cat_tech_medium_armor_and_modules
 		}
 	}
 
@@ -1230,6 +1282,8 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
+			mio_cat_tech_medium_armor_and_modules
 		}
 	}
 
@@ -1307,7 +1361,9 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
 			cat_medium_armor
+			mio_cat_tech_medium_armor_and_modules
 		}
 	}
 
@@ -1353,6 +1409,8 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
+			mio_cat_tech_medium_armor_and_modules
 		}
 	}
 
@@ -1397,7 +1455,9 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
 			armor_art
+			mio_cat_tech_medium_armor_and_modules
 		}
 	}
 
@@ -1420,6 +1480,8 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
+			mio_cat_tech_medium_armor_and_modules
 		}
 	}
 
@@ -1512,7 +1574,9 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
 			cat_heavy_armor
+			mio_cat_tech_heavy_armor_and_modules
 		}
 	}
 
@@ -1544,6 +1608,8 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
+			mio_cat_tech_heavy_armor_and_modules
 		}
 	}
 
@@ -1575,7 +1641,9 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
 			armor_art
+			mio_cat_tech_heavy_armor_and_modules
 		}
 	}
 
@@ -1608,6 +1676,8 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
+			mio_cat_tech_heavy_armor_and_modules
 		}
 	}
 
@@ -1675,7 +1745,9 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
 			cat_heavy_armor
+			mio_cat_tech_heavy_armor_and_modules
 		}
 	}
 
@@ -1703,6 +1775,8 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
+			mio_cat_tech_heavy_armor_and_modules
 		}
 	}
 
@@ -1730,7 +1804,9 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
 			armor_art
+			mio_cat_tech_heavy_armor_and_modules
 		}
 	}
 
@@ -1759,6 +1835,8 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
+			mio_cat_tech_heavy_armor_and_modules
 		}
 	}
 
@@ -1821,7 +1899,9 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
 			cat_heavy_armor
+			mio_cat_tech_heavy_armor_and_modules
 		}
 	}
 
@@ -1849,6 +1929,8 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
+			mio_cat_tech_heavy_armor_and_modules
 		}
 	}
 
@@ -1876,7 +1958,9 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
 			armor_art
+			mio_cat_tech_heavy_armor_and_modules
 		}
 	}
 
@@ -1904,6 +1988,8 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
+			mio_cat_tech_heavy_armor_and_modules
 		}
 	}
 
@@ -1943,7 +2029,9 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
 			cat_heavy_armor
+			mio_cat_tech_heavy_armor_and_modules
 		}
 	}
 
@@ -1968,6 +2056,8 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
+			mio_cat_tech_heavy_armor_and_modules
 		}
 	}
 
@@ -1990,7 +2080,9 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
 			armor_art
+			mio_cat_tech_heavy_armor_and_modules
 		}
 	}
 
@@ -2012,6 +2104,8 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
+			mio_cat_tech_heavy_armor_and_modules
 		}
 	}
 
@@ -2032,113 +2126,6 @@ technologies = {
 			leads_to_tech = main_battle_tank_b
 			research_cost_coeff = 0.9
 		}
-		super_heavy_armor = {
-			forest = {
-				attack = 0.1
-			}
-			hills = {
-				attack = 0.1
-			}
-			mountain = 	{
-				attack = 0.1
-			}
-			jungle = {
-				attack = 0.1
-			}
-			marsh = {
-				attack = 0.1
-			}
-			urban = {
-				attack = 0.1
-			}
-			river = {
-				attack = 0.1
-				movement = 0.1
-			}
-			amphibious = {
-				attack = 0.1
-			}
-		}
-		super_heavy_tank_destroyer_brigade = {
-			forest = {
-				attack = 0.1
-			}
-			hills = {
-				attack = 0.1
-			}
-			mountain = 	{
-				attack = 0.1
-			}
-			jungle = {
-				attack = 0.1
-			}
-			marsh = {
-				attack = 0.1
-			}
-			urban = {
-				attack = 0.1
-			}
-			river = {
-				attack = 0.1
-				movement = 0.1
-			}
-			amphibious = {
-				attack = 0.2
-			}
-		}
-		super_heavy_sp_artillery_brigade = {
-			forest = {
-				attack = 0.1
-			}
-			hills = {
-				attack = 0.1
-			}
-			mountain = 	{
-				attack = 0.1
-			}
-			jungle = {
-				attack = 0.1
-			}
-			marsh = {
-				attack = 0.1
-			}
-			urban = {
-				attack = 0.1
-			}
-			river = {
-				attack = 0.1
-				movement = 0.1
-			}
-			amphibious = {
-				attack = 0.2
-			}
-		}
-		super_heavy_sp_anti_air_brigade = {
-			forest = {
-				attack = 0.1
-			}
-			hills = {
-				attack = 0.1
-			}
-			mountain = 	{
-				attack = 0.1
-			}
-			jungle = {
-				attack = 0.1
-			}
-			marsh = {
-				attack = 0.1
-			}
-			urban = {
-				attack = 0.1
-			}
-			river = {
-				attack = 0.1
-			}
-			amphibious = {
-				attack = 0.2
-			}
-		}
 
 		research_cost = 2.5
 		start_year = 1020
@@ -2159,7 +2146,9 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
 			cat_heavy_armor
+			mio_cat_tech_heavy_armor_and_modules
 		}
 	}
 
@@ -2178,6 +2167,8 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
+			mio_cat_tech_heavy_armor_and_modules
 		}
 	}
 
@@ -2196,7 +2187,9 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
 			armor_art
+			mio_cat_tech_heavy_armor_and_modules
 		}
 	}
 
@@ -2215,6 +2208,8 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
+			mio_cat_tech_heavy_armor_and_modules
 		}
 	}
 
@@ -2248,7 +2243,9 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
 			cat_heavy_armor
+			mio_cat_tech_heavy_armor_and_modules
 		}
 	}
 
@@ -2267,6 +2264,8 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
+			mio_cat_tech_heavy_armor_and_modules
 		}
 	}
 
@@ -2285,7 +2284,9 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
 			armor_art
+			mio_cat_tech_heavy_armor_and_modules
 		}
 	}
 
@@ -2304,6 +2305,8 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
+			mio_cat_tech_heavy_armor_and_modules
 		}
 	}
 
@@ -2348,7 +2351,9 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
 			cat_light_armor
+			mio_cat_tech_light_armor_and_modules
 		}
 	}
 
@@ -2367,6 +2372,8 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
+			mio_cat_tech_light_armor_and_modules
 		}
 	}
 
@@ -2385,7 +2392,9 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
 			armor_art
+			mio_cat_tech_light_armor_and_modules
 		}
 	}
 
@@ -2404,6 +2413,8 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
+			mio_cat_tech_light_armor_and_modules
 		}
 	}
 
@@ -2442,7 +2453,9 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
 			cat_light_armor
+			mio_cat_tech_light_armor_and_modules
 		}
 	}
 
@@ -2461,6 +2474,8 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
+			mio_cat_tech_light_armor_and_modules
 		}
 	}
 
@@ -2479,7 +2494,9 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
 			armor_art
+			mio_cat_tech_light_armor_and_modules
 		}
 	}
 
@@ -2498,6 +2515,8 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
+			mio_cat_tech_light_armor_and_modules
 		}
 	}
 
@@ -2533,7 +2552,9 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
 			cat_light_armor
+			mio_cat_tech_light_armor_and_modules
 		}
 	}
 
@@ -2552,6 +2573,8 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
+			mio_cat_tech_light_armor_and_modules
 		}
 	}
 
@@ -2570,7 +2593,9 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
 			armor_art
+			mio_cat_tech_light_armor_and_modules
 		}
 	}
 
@@ -2589,6 +2614,8 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
+			mio_cat_tech_light_armor_and_modules
 		}
 	}
 
@@ -2630,8 +2657,10 @@ technologies = {
 		
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
 			tp_tech
 			marine_tech
+			mio_cat_tech_light_armor_and_modules
 		}
 	}
 
@@ -2669,8 +2698,10 @@ technologies = {
 		
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
 			tp_tech
 			marine_tech
+			mio_cat_tech_light_armor_and_modules
 		}
 	}
 
@@ -2708,8 +2739,10 @@ technologies = {
 		
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
 			tp_tech
 			marine_tech
+			mio_cat_tech_light_armor_and_modules
 		}
 	}
 
@@ -2742,8 +2775,10 @@ technologies = {
 		
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
 			tp_tech
 			marine_tech
+			mio_cat_tech_light_armor_and_modules
 		}
 	}
 
@@ -2781,7 +2816,9 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
 			cat_medium_armor
+			mio_cat_tech_medium_armor_and_modules
 		}
 	}
 
@@ -2800,6 +2837,8 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
+			mio_cat_tech_medium_armor_and_modules
 		}
 	}
 
@@ -2818,7 +2857,9 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
 			armor_art
+			mio_cat_tech_medium_armor_and_modules
 		}
 	}
 
@@ -2837,6 +2878,8 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
+			mio_cat_tech_medium_armor_and_modules
 		}
 	}
 
@@ -2879,7 +2922,9 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
 			cat_medium_armor
+			mio_cat_tech_medium_armor_and_modules
 		}
 	}
 
@@ -2898,6 +2943,8 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
+			mio_cat_tech_medium_armor_and_modules
 		}
 	}
 
@@ -2916,7 +2963,9 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
 			armor_art
+			mio_cat_tech_medium_armor_and_modules
 		}
 	}
 
@@ -2935,6 +2984,8 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
+			mio_cat_tech_medium_armor_and_modules
 		}
 	}
 
@@ -2969,7 +3020,9 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
 			cat_medium_armor
+			mio_cat_tech_medium_armor_and_modules
 		}
 	}
 
@@ -2988,6 +3041,8 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
+			mio_cat_tech_medium_armor_and_modules
 		}
 	}
 
@@ -3006,7 +3061,9 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
 			armor_art
+			mio_cat_tech_medium_armor_and_modules
 		}
 	}
 
@@ -3025,6 +3082,8 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
+			mio_cat_tech_medium_armor_and_modules
 		}
 	}
 
@@ -3059,7 +3118,9 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
 			cat_medium_armor
+			mio_cat_tech_medium_armor_and_modules
 		}
 	}
 
@@ -3078,6 +3139,8 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
+			mio_cat_tech_medium_armor_and_modules
 		}
 	}
 
@@ -3096,7 +3159,9 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
 			armor_art
+			mio_cat_tech_medium_armor_and_modules
 		}
 	}
 
@@ -3115,6 +3180,8 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
+			mio_cat_tech_medium_armor_and_modules
 		}
 	}
 
@@ -3153,7 +3220,9 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
 			cat_medium_armor
+			mio_cat_tech_medium_armor_and_modules
 		}
 	}
 
@@ -3172,6 +3241,8 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
+			mio_cat_tech_medium_armor_and_modules
 		}
 	}
 
@@ -3190,7 +3261,9 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
 			armor_art
+			mio_cat_tech_medium_armor_and_modules
 		}
 	}
 
@@ -3209,6 +3282,8 @@ technologies = {
 
 		categories = {
 			armor
+			mio_cat_tech_all_armor_and_modules
+			mio_cat_tech_medium_armor_and_modules
 		}
 	}
 
diff --git a/common/technologies/artillery.txt b/common/technologies/artillery.txt
index edbdad060cb..d09c9a60137 100644
--- a/common/technologies/artillery.txt
+++ b/common/technologies/artillery.txt
@@ -26,6 +26,7 @@ technologies = {
 
 		categories = {
 			artillery
+			mio_cat_all_artillery_equipment
 		}
 
 		ai_will_do = {
@@ -71,6 +72,7 @@ technologies = {
 
 		categories = {
 			artillery
+			mio_cat_all_artillery_equipment
 		}
 
 		ai_will_do = {
@@ -142,6 +144,7 @@ technologies = {
 
 		categories = {
 			artillery
+			mio_cat_all_artillery_equipment
 		}
 
 		ai_will_do = {
@@ -201,6 +204,7 @@ technologies = {
 
 		categories = {
 			artillery
+			mio_cat_all_artillery_equipment
 		}
 
 		ai_will_do = {
@@ -280,6 +284,7 @@ technologies = {
 
 		categories = {
 			artillery
+			mio_cat_all_artillery_equipment
 		}
 
 		ai_will_do = {
@@ -347,6 +352,7 @@ technologies = {
 
 		categories = {
 			artillery
+			mio_cat_all_artillery_equipment
 		}
 
 		ai_will_do = {
@@ -389,6 +395,7 @@ technologies = {
 
 		categories = {
 			artillery
+			mio_cat_all_artillery_equipment
 		}
 
 		ai_will_do = {
@@ -461,6 +468,7 @@ technologies = {
 
 		categories = {
 			artillery
+			mio_cat_all_artillery_equipment
 		}
 
 		ai_will_do = {
@@ -547,6 +555,7 @@ technologies = {
 
 		categories = {
 			rocketry
+			mio_cat_all_artillery_equipment
 		}
 	}
 
@@ -590,6 +599,7 @@ technologies = {
 
 		categories = {
 			rocketry
+			mio_cat_all_artillery_equipment
 		}
 	}
 
@@ -633,6 +643,7 @@ technologies = {
 
 		categories = {
 			rocketry
+			mio_cat_all_artillery_equipment
 		}
 	}
 
@@ -675,6 +686,7 @@ technologies = {
 
 		categories = {
 			rocketry
+			mio_cat_all_artillery_equipment
 		}
 	}
 	###------> X <><> <><> <><> <><> <><>
@@ -689,6 +701,7 @@ technologies = {
 			ship_anti_air_2
 			tank_auto_cannon
 			tank_anti_air_cannon
+			tank_heavy_anti_air_cannon
 			tank_heavy_cannon
 		}
 
@@ -733,6 +746,7 @@ technologies = {
 		categories = {
 			artillery
 			cat_anti_air
+			mio_cat_all_artillery_equipment
 		}
 	}
 
@@ -750,6 +764,21 @@ technologies = {
 		mot_anti_air_brigade = {
 			air_attack = 0.1
 		}
+		light_sp_anti_air_brigade = {
+			soft_attack = 0.15
+		}
+		medium_sp_anti_air_brigade = {
+			soft_attack = 0.15
+		}
+		heavy_sp_anti_air_brigade = {
+			soft_attack = 0.15
+		}
+		super_heavy_sp_anti_air_brigade = {
+			soft_attack = 0.15
+		}
+		modern_sp_anti_air_brigade= {
+			soft_attack = 0.15
+		}
 
 		tech_air_damage_factor = -0.02
 
@@ -789,6 +818,7 @@ technologies = {
 		categories = {
 			artillery
 			cat_anti_air
+			mio_cat_all_artillery_equipment
 		}
 	}
 
@@ -806,6 +836,7 @@ technologies = {
 			ship_anti_air_3
 			tank_auto_cannon_2
 			tank_anti_air_cannon_2
+			tank_heavy_anti_air_cannon_2
 		}
 
 		path = {
@@ -844,6 +875,7 @@ technologies = {
 		categories = {
 			artillery
 			cat_anti_air
+			mio_cat_all_artillery_equipment
 		}
 	}
 
@@ -861,6 +893,21 @@ technologies = {
 		mot_anti_air_brigade = {
 			air_attack = 0.1
 		}
+		light_sp_anti_air_brigade = {
+			soft_attack = 0.1
+		}
+		medium_sp_anti_air_brigade = {
+			soft_attack = 0.1
+		}
+		heavy_sp_anti_air_brigade = {
+			soft_attack = 0.1
+		}
+		super_heavy_sp_anti_air_brigade = {
+			soft_attack = 0.1
+		}
+		modern_sp_anti_air_brigade= {
+			soft_attack = 0.1
+		}
 		enable_equipment_modules = {
 			tank_heavy_cannon_2
 		}
@@ -898,6 +945,7 @@ technologies = {
 		categories = {
 			artillery
 			cat_anti_air
+			mio_cat_all_artillery_equipment
 		}
 	}
 
@@ -915,6 +963,21 @@ technologies = {
 		mot_anti_air_brigade = {
 			air_attack = 0.1
 		}
+		light_sp_anti_air_brigade = {
+			soft_attack = 0.05
+		}
+		medium_sp_anti_air_brigade = {
+			soft_attack = 0.05
+		}
+		heavy_sp_anti_air_brigade = {
+			soft_attack = 0.05
+		}
+		super_heavy_sp_anti_air_brigade = {
+			soft_attack = 0.05
+		}
+		modern_sp_anti_air_brigade= {
+			soft_attack = 0.05
+		}
 
 		tech_air_damage_factor = -0.02
 
@@ -954,6 +1017,7 @@ technologies = {
 		categories = {
 			artillery
 			cat_anti_air
+			mio_cat_all_artillery_equipment
 		}
 	}
 
@@ -977,6 +1041,7 @@ technologies = {
 			ship_anti_air_4
 			tank_heavy_cannon_3
 			tank_anti_air_cannon_3
+			tank_heavy_anti_air_cannon_3
 			auto_loader
 		}
 
@@ -1011,6 +1076,7 @@ technologies = {
 		categories = {
 			artillery
 			cat_anti_air
+			mio_cat_all_artillery_equipment
 		}
 	}
 
@@ -1083,6 +1149,7 @@ technologies = {
 		categories = {
 			artillery
 			cat_anti_tank
+			mio_cat_all_artillery_equipment
 		}
 	}
 
@@ -1176,6 +1243,7 @@ technologies = {
 		categories = {
 			artillery
 			cat_anti_tank
+			mio_cat_all_artillery_equipment
 		}
 	}
 
@@ -1242,6 +1310,7 @@ technologies = {
 		categories = {
 			artillery
 			cat_anti_tank
+			mio_cat_all_artillery_equipment
 		}
 	}
 
@@ -1331,6 +1400,7 @@ technologies = {
 		categories = {
 			artillery
 			cat_anti_tank
+			mio_cat_all_artillery_equipment
 		}
 	}
 
@@ -1416,6 +1486,7 @@ technologies = {
 		categories = {
 			artillery
 			cat_anti_tank
+			mio_cat_all_artillery_equipment
 		}
 	}
 
@@ -1478,6 +1549,7 @@ technologies = {
 		categories = {
 			artillery
 			cat_anti_tank
+			mio_cat_all_artillery_equipment
 		}
 	}
 
@@ -1551,6 +1623,7 @@ technologies = {
 		categories = {
 			artillery
 			cat_anti_tank
+			mio_cat_all_artillery_equipment
 		}
 	}
 
@@ -1622,6 +1695,7 @@ technologies = {
 		categories = {
 			artillery
 			cat_anti_tank
+			mio_cat_all_artillery_equipment
 		}
 	}
 
@@ -1670,6 +1744,7 @@ technologies = {
 		categories = {
 			artillery
 			cat_anti_tank
+			mio_cat_all_artillery_equipment
 		}
 	}
 
@@ -1741,6 +1816,7 @@ technologies = {
 		categories = {
 			artillery
 			cat_anti_tank
+			mio_cat_all_artillery_equipment
 		}
 	}
 
@@ -1811,6 +1887,7 @@ technologies = {
 		categories = {
 			artillery
 			cat_anti_tank
+			mio_cat_all_artillery_equipment
 		}
 	}
 
@@ -1856,6 +1933,7 @@ technologies = {
 		categories = {
 			artillery
 			cat_anti_tank
+			mio_cat_all_artillery_equipment
 		}
 	}
 
@@ -1911,6 +1989,7 @@ technologies = {
 
 		categories = {
 			artillery
+			mio_cat_all_artillery_equipment
 		}
 
 		ai_will_do = {
@@ -1945,6 +2024,7 @@ technologies = {
 
 		categories = {
 			artillery
+			mio_cat_all_artillery_equipment
 		}
 
 		ai_will_do = {
@@ -1995,6 +2075,7 @@ technologies = {
 
 		categories = {
 			artillery
+			mio_cat_all_artillery_equipment
 		}
 
 		ai_will_do = {
@@ -2048,6 +2129,7 @@ technologies = {
 
 		categories = {
 			artillery
+			mio_cat_all_artillery_equipment
 		}
 
 		ai_will_do = {
@@ -2079,6 +2161,7 @@ technologies = {
 
 		categories = {
 			artillery
+			mio_cat_all_artillery_equipment
 		}
 
 		ai_will_do = {
@@ -2124,6 +2207,7 @@ technologies = {
 
 		categories = {
 			artillery
+			mio_cat_all_artillery_equipment
 		}
 
 		ai_will_do = {
@@ -2170,6 +2254,7 @@ technologies = {
 
 		categories = {
 			rocketry
+			mio_cat_all_artillery_equipment
 		}
 	}
 
@@ -2210,6 +2295,7 @@ technologies = {
 
 		categories = {
 			rocketry
+			mio_cat_all_artillery_equipment
 		}
 	}
 
@@ -2249,6 +2335,7 @@ technologies = {
 
 		categories = {
 			rocketry
+			mio_cat_all_artillery_equipment
 		}
 	}
 
@@ -2288,6 +2375,7 @@ technologies = {
 
 		categories = {
 			rocketry
+			mio_cat_all_artillery_equipment
 		}
 	}
 
@@ -2327,6 +2415,7 @@ technologies = {
 
 		categories = {
 			rocketry
+			mio_cat_all_artillery_equipment
 		}
 	}
 
@@ -2361,6 +2450,7 @@ technologies = {
 
 		categories = {
 			rocketry
+			mio_cat_all_artillery_equipment
 		}
 	}
 
@@ -2385,6 +2475,21 @@ technologies = {
 		mot_anti_air_brigade = {
 			air_attack = 0.1
 		}
+		light_sp_anti_air_brigade = {
+			soft_attack = 0.05
+		}
+		medium_sp_anti_air_brigade = {
+			soft_attack = 0.05
+		}
+		heavy_sp_anti_air_brigade = {
+			soft_attack = 0.05
+		}
+		super_heavy_sp_anti_air_brigade = {
+			soft_attack = 0.05
+		}
+		modern_sp_anti_air_brigade= {
+			soft_attack = 0.05
+		}
 
 		#navy_anti_air_attack_factor = 0.025
 
@@ -2404,6 +2509,7 @@ technologies = {
 		categories = {
 			artillery
 			cat_anti_air
+			mio_cat_all_artillery_equipment
 		}
 	}
 
@@ -2419,6 +2525,21 @@ technologies = {
 		mot_anti_air_brigade = {
 			air_attack = 0.1
 		}
+		light_sp_anti_air_brigade = {
+			soft_attack = 0.05
+		}
+		medium_sp_anti_air_brigade = {
+			soft_attack = 0.05
+		}
+		heavy_sp_anti_air_brigade = {
+			soft_attack = 0.05
+		}
+		super_heavy_sp_anti_air_brigade = {
+			soft_attack = 0.05
+		}
+		modern_sp_anti_air_brigade= {
+			soft_attack = 0.05
+		}
 
 		#navy_anti_air_attack_factor = 0.025
 
@@ -2443,6 +2564,7 @@ technologies = {
 		categories = {
 			artillery
 			cat_anti_air
+			mio_cat_all_artillery_equipment
 		}
 	}
 
@@ -2455,6 +2577,7 @@ technologies = {
 			ship_anti_air_5
 			tank_heavy_cannon_4
 			tank_anti_air_cannon_4
+			tank_heavy_anti_air_cannon_4
 		}
 
 		#navy_anti_air_attack_factor = 0.05
@@ -2482,6 +2605,7 @@ technologies = {
 		categories = {
 			artillery
 			cat_anti_air
+			mio_cat_all_artillery_equipment
 		}
 	}
 
@@ -2497,6 +2621,21 @@ technologies = {
 		mot_anti_air_brigade = {
 			air_attack = 0.1
 		}
+		light_sp_anti_air_brigade = {
+			soft_attack = 0.05
+		}
+		medium_sp_anti_air_brigade = {
+			soft_attack = 0.05
+		}
+		heavy_sp_anti_air_brigade = {
+			soft_attack = 0.05
+		}
+		super_heavy_sp_anti_air_brigade = {
+			soft_attack = 0.05
+		}
+		modern_sp_anti_air_brigade= {
+			soft_attack = 0.05
+		}
 
 		#navy_anti_air_attack_factor = 0.025
 
@@ -2521,6 +2660,7 @@ technologies = {
 		categories = {
 			artillery
 			cat_anti_air
+			mio_cat_all_artillery_equipment
 		}
 	}
 
@@ -2536,6 +2676,21 @@ technologies = {
 		mot_anti_air_brigade = {
 			air_attack = 0.1
 		}
+		light_sp_anti_air_brigade = {
+			soft_attack = 0.05
+		}
+		medium_sp_anti_air_brigade = {
+			soft_attack = 0.05
+		}
+		heavy_sp_anti_air_brigade = {
+			soft_attack = 0.05
+		}
+		super_heavy_sp_anti_air_brigade = {
+			soft_attack = 0.05
+		}
+		modern_sp_anti_air_brigade= {
+			soft_attack = 0.05
+		}
 
 		#navy_anti_air_attack_factor = 0.025
 
@@ -2559,6 +2714,7 @@ technologies = {
 		categories = {
 			artillery
 			cat_anti_air
+			mio_cat_all_artillery_equipment
 		}
 	}
 
@@ -2572,6 +2728,7 @@ technologies = {
 			ship_anti_air_6
 			tank_heavy_cannon_5
 			tank_anti_air_cannon_5
+			tank_heavy_anti_air_cannon_5
 		}
 
 		#navy_anti_air_attack_factor = 0.05
@@ -2595,11 +2752,60 @@ technologies = {
 		categories = {
 			artillery
 			cat_anti_air
+			mio_cat_all_artillery_equipment
 		}
 	}
 
 	###------> X <><> <><> <><> <><> <><>
 
+	SWE_bofors_antitank_gun = {
+
+		research_cost = 1
+
+		# only from focus!!! Bofors anti tank gun ##### 
+		allow = {
+			always = no
+		}
+
+		anti_tank = {
+			hard_attack = 0.1
+			ap_attack = 0.1
+		}
+		anti_tank_brigade = {
+			hard_attack = 0.1
+			ap_attack = 0.1
+		}
+		mot_anti_tank_brigade = {
+			hard_attack = 0.1
+			ap_attack = 0.1
+		}
+		light_tank_destroyer_brigade = {
+			hard_attack = 0.1
+			ap_attack = 0.1
+		}
+		medium_tank_destroyer_brigade = {
+			hard_attack = 0.1
+			ap_attack = 0.1
+		}
+		heavy_tank_destroyer_brigade = {
+			hard_attack = 0.1
+			ap_attack = 0.1
+		}
+		super_heavy_tank_destroyer_brigade = {
+			hard_attack = 0.1
+			ap_attack = 0.1
+		}
+		modern_tank_destroyer_brigade = {
+			hard_attack = 0.1
+			ap_attack = 0.1
+		}
+
+		categories = {
+			cat_anti_tank
+			artillery
+			mio_cat_all_artillery_equipment
+		}
+	}
 }
 
 #####---------------------------------------------------------------------> End
diff --git a/common/technologies/bba_air_techs.txt b/common/technologies/bba_air_techs.txt
index 1645a204546..20c8139108f 100644
--- a/common/technologies/bba_air_techs.txt
+++ b/common/technologies/bba_air_techs.txt
@@ -38,6 +38,10 @@ technologies = {
 			naval_air
 			naval_bomber
 			air_equipment
+			mio_cat_all_light_fighter_and_modules
+			mio_cat_all_cas_and_modules
+			mio_cat_all_naval_bomber_and_modules
+			mio_cat_all_light_aircraft_and_modules
 		}
 
 
@@ -87,6 +91,11 @@ technologies = {
 			naval_air
 			naval_bomber
 			air_equipment
+			
+			mio_cat_all_light_fighter_and_modules
+			mio_cat_all_cas_and_modules
+			mio_cat_all_naval_bomber_and_modules
+			mio_cat_all_light_aircraft_and_modules
 		}
 		
 		on_research_complete = {
@@ -196,6 +205,11 @@ technologies = {
 			naval_air
 			naval_bomber
 			air_equipment
+			
+			mio_cat_all_light_fighter_and_modules
+			mio_cat_all_cas_and_modules
+			mio_cat_all_naval_bomber_and_modules
+			mio_cat_all_light_aircraft_and_modules
 		}
 		
 		ai_will_do = {
@@ -267,6 +281,11 @@ technologies = {
 			naval_air
 			naval_bomber
 			air_equipment
+			
+			mio_cat_all_light_fighter_and_modules
+			mio_cat_all_cas_and_modules
+			mio_cat_all_naval_bomber_and_modules
+			mio_cat_all_light_aircraft_and_modules
 		}
 
 		on_research_complete = {
@@ -377,6 +396,11 @@ technologies = {
 			naval_air
 			naval_bomber
 			jet_technology
+			
+			mio_cat_all_light_fighter_and_modules
+			mio_cat_all_cas_and_modules
+			mio_cat_all_naval_bomber_and_modules
+			mio_cat_all_light_aircraft_and_modules
 		}
 
 		ai_will_do = {
@@ -421,6 +445,11 @@ technologies = {
 			naval_air
 			naval_bomber
 			jet_technology
+			
+			mio_cat_all_light_fighter_and_modules
+			mio_cat_all_cas_and_modules
+			mio_cat_all_naval_bomber_and_modules
+			mio_cat_all_light_aircraft_and_modules
 		}
 
 		ai_will_do = {
@@ -456,6 +485,8 @@ technologies = {
 		
 		categories = {
 			airship_tech
+			mio_cat_all_medium_aircraft_and_modules
+			mio_cat_all_heavy_aircraft_and_modules
 		}
 		
 		ai_will_do = {
@@ -509,6 +540,7 @@ technologies = {
 			tactical_bomber
 			cat_heavy_fighter
 			air_equipment
+			mio_cat_all_medium_aircraft_and_modules
 		}
 		
 		ai_will_do = {
@@ -542,6 +574,7 @@ technologies = {
 			tactical_bomber
 			cat_heavy_fighter
 			air_equipment
+			mio_cat_all_medium_aircraft_and_modules
 		}
 		
 		ai_will_do = {
@@ -598,6 +631,7 @@ technologies = {
 			tactical_bomber
 			cat_heavy_fighter
 			air_equipment
+			mio_cat_all_medium_aircraft_and_modules
 		}
 
 		on_research_complete = {
@@ -667,6 +701,7 @@ technologies = {
 			tactical_bomber
 			cat_heavy_fighter
 			air_equipment
+			mio_cat_all_medium_aircraft_and_modules
 		}
 		
 		ai_will_do = {
@@ -722,6 +757,7 @@ technologies = {
 			jet_technology
 			cat_heavy_fighter
 			tactical_bomber
+			mio_cat_all_medium_aircraft_and_modules
 		}
 		
 		ai_will_do = {
@@ -754,6 +790,7 @@ technologies = {
 			jet_technology
 			cat_heavy_fighter
 			tactical_bomber
+			mio_cat_all_medium_aircraft_and_modules
 		}
 		
 		ai_will_do = {
@@ -794,6 +831,7 @@ technologies = {
 			heavy_air
 			air_equipment
 			cat_strategic_bomber
+			mio_cat_all_heavy_aircraft_and_modules
 		}
 		
 		ai_will_do = {
@@ -849,6 +887,7 @@ technologies = {
 			heavy_air
 			air_equipment
 			cat_strategic_bomber
+			mio_cat_all_heavy_aircraft_and_modules
 		}
 		
 		ai_will_do = {
@@ -900,6 +939,7 @@ technologies = {
 			heavy_air
 			air_equipment
 			cat_strategic_bomber
+			mio_cat_all_heavy_aircraft_and_modules
 		}
 
 		on_research_complete = {
@@ -970,6 +1010,7 @@ technologies = {
 			heavy_air
 			air_equipment
 			cat_strategic_bomber
+			mio_cat_all_heavy_aircraft_and_modules
 		}
 		
 		ai_will_do = {
@@ -1029,6 +1070,7 @@ technologies = {
 			heavy_air
 			jet_technology
 			cat_strategic_bomber
+			mio_cat_all_heavy_aircraft_and_modules
 		}
 		
 		ai_will_do = {
@@ -1071,6 +1113,7 @@ technologies = {
 			heavy_air
 			jet_technology
 			cat_strategic_bomber
+			mio_cat_all_heavy_aircraft_and_modules
 		}
 		
 		ai_will_do = {
@@ -1113,6 +1156,7 @@ technologies = {
 			heavy_air
 			jet_technology
 			cat_strategic_bomber
+			mio_cat_all_heavy_aircraft_and_modules
 		}
 		
 		ai_will_do = {
@@ -1148,7 +1192,6 @@ technologies = {
 			small_bomb_bay
 			medium_bomb_bay
 			large_bomb_bay
-			torpedo_mounting
 			super_large_bomb_bay
 		}
 		
@@ -1161,11 +1204,12 @@ technologies = {
 		}
 
 		path = {
-			leads_to_tech = photo_reconnaisance
+			leads_to_tech = armor_piercing_bombs
 			research_cost_coeff = 1
 		}
+
 		path = {
-			leads_to_tech = hardpoints
+			leads_to_tech = heavy_bombs
 			research_cost_coeff = 1
 		}
 		
@@ -1173,6 +1217,10 @@ technologies = {
 			air_equipment
 			plane_modules_tech
 			cat_air_bombs
+			mio_cat_all_cas_and_modules
+			mio_cat_all_medium_aircraft_and_modules
+			mio_cat_all_heavy_aircraft_and_modules
+			mio_cat_all_light_aircraft_and_modules
 		}
 		
 		ai_will_do = {
@@ -1188,18 +1236,95 @@ technologies = {
 		}
 	}
 
+	heavy_bombs = {
+		enable_equipment_modules = {
+					heavy_bomb_locks
+		}
+			
+		research_cost = 1
+		start_year = 1011
+
+		folder = {
+			name = bba_air_techs_folder
+			position = { x = 0 y = 6 }
+		}
+		path = {
+			leads_to_tech = hardpoints
+			research_cost_coeff = 1
+		}
+		categories = {
+			air_equipment
+			plane_modules_tech
+			cat_air_bombs
+			mio_cat_all_cas_and_modules
+			mio_cat_all_medium_aircraft_and_modules
+			mio_cat_all_light_aircraft_and_modules
+		}
+		
+		ai_will_do = {
+			factor = 1
+			modifier = {
+				OR = {
+					has_tech = iw_small_airframe
+					has_tech = iw_medium_airframe
+					has_tech = iw_large_airframe
+				}
+				factor = 5
+			}
+		}
+	}
+
+
+	armor_piercing_bombs = {
+		enable_equipment_modules = {
+					armor_piercing_bomb_locks
+		}
+			
+		research_cost = 1
+		start_year = 1007
+
+		folder = {
+			name = bba_air_techs_folder
+			position = { x = 2 y = 2 }
+		}
+		
+		categories = {
+			air_equipment
+			plane_modules_tech
+			cat_air_bombs
+			mio_cat_all_cas_and_modules
+			mio_cat_all_medium_aircraft_and_modules
+			mio_cat_all_light_aircraft_and_modules
+		}
+		
+		ai_will_do = {
+			factor = 1
+			modifier = {
+				OR = {
+					has_tech = iw_small_airframe
+					has_tech = iw_medium_airframe
+					has_tech = iw_large_airframe
+				}
+				factor = 5
+			}
+		}
+	}
+
 	photo_reconnaisance = {
 
 		enable_equipment_modules = {
 			recon_camera
 		}
+		dependencies = {
+			infantry_weapons = 1
+		}
 		
 		research_cost = 1
 		start_year = 993
 
 		folder = {
 			name = bba_air_techs_folder
-			position = { x = 2 y = 2 }
+			position = { x = 0 y = 2 }
 		}
 
 		allow_branch = { has_dlc = "La Resistance" }
@@ -1207,6 +1332,7 @@ technologies = {
 		categories = {
 			air_equipment
 			plane_modules_tech
+			mio_cat_all_medium_aircraft_and_modules
 		}
 		
 		ai_will_do = {
@@ -1220,6 +1346,167 @@ technologies = {
 		}
 	}
 
+	air_torpedoe_1 = {
+		enable_equipment_modules = {
+			torpedo_mounting
+		}
+		dependencies = {
+			infantry_weapons = 1
+		}
+			
+		research_cost = 1
+		start_year = 1007
+
+		folder = {
+			name = bba_air_techs_folder
+			position = { x = 0 y = 2 }
+		}
+
+		path = {
+			leads_to_tech = air_torpedoe_2
+			research_cost_coeff = 1
+		}
+		
+		categories = {
+			air_equipment
+			plane_modules_tech
+			cat_air_bombs
+			mio_cat_all_naval_bomber_and_modules
+			mio_cat_all_medium_aircraft_and_modules
+			mio_cat_all_heavy_aircraft_and_modules
+			mio_cat_all_light_aircraft_and_modules
+		}
+		
+		ai_will_do = {
+			factor = 1
+			modifier = {
+				OR = {
+					has_tech = iw_small_airframe
+					has_tech = iw_medium_airframe
+					has_tech = iw_large_airframe
+				}
+				factor = 5
+			}
+		}
+	}
+
+	air_torpedoe_2 = {
+		enable_equipment_modules = {
+			torpedo_mounting_2
+		}
+			
+		research_cost = 1
+		start_year = 1011
+
+		folder = {
+			name = bba_air_techs_folder
+			position = { x = 0 y = 4 }
+		}
+
+		path = {
+			leads_to_tech = air_torpedoe_3
+			research_cost_coeff = 1
+		}
+		
+		categories = {
+			air_equipment
+			plane_modules_tech
+			cat_air_bombs
+			mio_cat_all_naval_bomber_and_modules
+			mio_cat_all_medium_aircraft_and_modules
+			mio_cat_all_heavy_aircraft_and_modules
+			mio_cat_all_light_aircraft_and_modules
+		}
+		
+		ai_will_do = {
+			factor = 1
+			modifier = {
+				OR = {
+					has_tech = iw_small_airframe
+					has_tech = iw_medium_airframe
+					has_tech = iw_large_airframe
+				}
+				factor = 5
+			}
+		}
+	}
+
+	air_torpedoe_3 = {
+		enable_equipment_modules = {
+			torpedo_mounting_3
+		}
+			
+		research_cost = 1
+		start_year = 1015
+
+		folder = {
+			name = bba_air_techs_folder
+			position = { x = 0 y = 8 }
+		}
+		path = {
+			leads_to_tech = air_torpedoe_4
+			research_cost_coeff = 1
+		}
+		
+		categories = {
+			air_equipment
+			plane_modules_tech
+			cat_air_bombs
+			mio_cat_all_naval_bomber_and_modules
+			mio_cat_all_medium_aircraft_and_modules
+			mio_cat_all_heavy_aircraft_and_modules
+			mio_cat_all_light_aircraft_and_modules
+		}
+		
+		ai_will_do = {
+			factor = 1
+			modifier = {
+				OR = {
+					has_tech = iw_small_airframe
+					has_tech = iw_medium_airframe
+					has_tech = iw_large_airframe
+				}
+				factor = 5
+			}
+		}
+	}
+
+	air_torpedoe_4 = {
+		enable_equipment_modules = {
+			torpedo_mounting_4
+		}
+			
+		research_cost = 1
+		start_year = 1021
+
+		folder = {
+			name = bba_air_techs_folder
+			position = { x = 0 y = 14 }
+		}
+		
+		categories = {
+			air_equipment
+			plane_modules_tech
+			cat_air_bombs
+			mio_cat_all_naval_bomber_and_modules
+			mio_cat_all_medium_aircraft_and_modules
+			mio_cat_all_heavy_aircraft_and_modules
+			mio_cat_all_light_aircraft_and_modules
+		}
+		
+		ai_will_do = {
+			factor = 1
+			modifier = {
+				OR = {
+					has_tech = iw_small_airframe
+					has_tech = iw_medium_airframe
+					has_tech = iw_large_airframe
+				}
+				factor = 5
+			}
+		}
+	}
+
 	hardpoints = {
 		enable_equipment_modules = {
 			hardpoint
@@ -1238,6 +1525,9 @@ technologies = {
 			plane_modules_tech
 			cat_air_bombs
 			cat_air_guns
+			mio_cat_all_cas_and_modules
+			mio_cat_all_medium_aircraft_and_modules
+			mio_cat_all_light_aircraft_and_modules
 		}
 		
 		ai_will_do = {
@@ -1292,6 +1582,10 @@ technologies = {
 			air_equipment
 			plane_modules_tech
 			cat_air_guns
+			mio_cat_all_light_fighter_and_modules
+			mio_cat_all_medium_aircraft_and_modules
+			mio_cat_all_heavy_aircraft_and_modules
+			mio_cat_all_light_aircraft_and_modules
 		}
 		
 		ai_will_do = {
@@ -1319,11 +1613,11 @@ technologies = {
 		}
 		
 		research_cost = 1
-		start_year = 1007
+		start_year = 1010
 
 		folder = {
 			name = bba_air_techs_folder
-			position = { x = -2 y = 4 }
+			position = { x = -2 y = 5 }
 		}
 		path = {
 			leads_to_tech = electronic_countermeasures
@@ -1333,6 +1627,10 @@ technologies = {
 		categories = {
 			air_equipment
 			plane_modules_tech
+			mio_cat_all_light_fighter_and_modules
+			mio_cat_all_medium_aircraft_and_modules
+			mio_cat_all_heavy_aircraft_and_modules
+			mio_cat_all_light_aircraft_and_modules
 		}
 		
 		ai_will_do = {
@@ -1416,6 +1714,10 @@ technologies = {
 			air_equipment
 			plane_modules_tech
 			cat_air_guns
+			mio_cat_all_light_fighter_and_modules
+			mio_cat_all_medium_aircraft_and_modules
+			mio_cat_all_heavy_aircraft_and_modules
+			mio_cat_all_light_aircraft_and_modules
 		}
 		
 		ai_will_do = {
@@ -1460,10 +1762,18 @@ technologies = {
 			leads_to_tech = aa_cannon_2
 			research_cost_coeff = 1
 		}
+		path = {
+			leads_to_tech = aa_cannon_3
+			research_cost_coeff = 1
+		}
 		categories = {
 			air_equipment
 			plane_modules_tech
 			cat_air_guns
+			mio_cat_all_light_fighter_and_modules
+			mio_cat_all_medium_aircraft_and_modules
+			mio_cat_all_heavy_aircraft_and_modules
+			mio_cat_all_light_aircraft_and_modules
 		}
 		
 		ai_will_do = {
@@ -1487,11 +1797,12 @@ technologies = {
 		}
 	}
 
+
 	aa_cannon_2 = {
 
 		enable_equipment_modules = {
-			aircraft_cannon_2_1x
-			aircraft_cannon_2_2x
+			large_aircraft_cannon_1x
+			large_aircraft_cannon_2x
 			cannon_defense_turret
 			cannon_defense_turret_2x
 		}
@@ -1501,11 +1812,58 @@ technologies = {
 
 		folder = {
 			name = bba_air_techs_folder
-			position = { x = 2 y = 7 }
+			position = { x = 0 y = 7 }
+		}
+
+		categories = {
+			air_equipment
+			plane_modules_tech
+			cat_air_guns
+			mio_cat_all_light_fighter_and_modules
+			mio_cat_all_medium_aircraft_and_modules
+			mio_cat_all_heavy_aircraft_and_modules
+			mio_cat_all_light_aircraft_and_modules
+		}
+		
+		ai_will_do = {
+			factor = 1
+			modifier = {
+				OR = {
+					has_tech = improved_small_airframe
+					has_tech = improved_medium_airframe
+					has_tech = improved_large_airframe
+				}
+				factor = 5
+			}
+			modifier = {
+				OR = {
+					tag = CHN
+					tag = STG
+					tag = EQS
+				}
+				factor = 3
+			}
 		}
+	}
 
+	aa_cannon_3 = {
+
+		enable_equipment_modules = {
+			aircraft_cannon_2_1x
+			aircraft_cannon_2_2x
+			cannon_defense_turret
+			cannon_defense_turret_2x
+		}
+		
+		research_cost = 2
+		start_year = 1016
+
+		folder = {
+			name = bba_air_techs_folder
+			position = { x = 2 y = 10 }
+		}
 		path = {
-			leads_to_tech = aa_cannon_3
+			leads_to_tech = aa_cannon_4
 			research_cost_coeff = 1
 		}
 
@@ -1513,6 +1871,10 @@ technologies = {
 			air_equipment
 			plane_modules_tech
 			cat_air_guns
+			mio_cat_all_light_fighter_and_modules
+			mio_cat_all_medium_aircraft_and_modules
+			mio_cat_all_heavy_aircraft_and_modules
+			mio_cat_all_light_aircraft_and_modules
 		}
 		
 		ai_will_do = {
@@ -1536,7 +1898,7 @@ technologies = {
 		}
 	}
 
-	aa_cannon_3 = {
+	aa_cannon_4 = {
 
 		enable_equipment_modules = {
 			aircraft_cannon_3_1x
@@ -1544,14 +1906,14 @@ technologies = {
 		}
 		
 		research_cost = 1.5
-		start_year = 1018
+		start_year = 1020
 
 		folder = {
 			name = bba_air_techs_folder
-			position = { x = 2 y = 9 }
+			position = { x = 2 y = 12 }
 		}
 		path = {
-			leads_to_tech = aa_cannon_4
+			leads_to_tech = aa_cannon_5
 			research_cost_coeff = 1
 		}
 
@@ -1559,6 +1921,10 @@ technologies = {
 			air_equipment
 			plane_modules_tech
 			cat_air_guns
+			mio_cat_all_light_fighter_and_modules
+			mio_cat_all_medium_aircraft_and_modules
+			mio_cat_all_heavy_aircraft_and_modules
+			mio_cat_all_light_aircraft_and_modules
 		}
 		
 		ai_will_do = {
@@ -1581,11 +1947,13 @@ technologies = {
 			}
 		}
 	}
-	aa_cannon_4 = {
+	aa_cannon_5 = {
 
 		enable_equipment_modules = {
 			aircraft_cannon_4_1x
 			aircraft_cannon_4_2x
+			cannon_defense_turret_2
+			cannon_defense_turret_2_2x
 		}
 		
 		research_cost = 1.5
@@ -1600,6 +1968,10 @@ technologies = {
 			air_equipment
 			plane_modules_tech
 			cat_air_guns
+			mio_cat_all_light_fighter_and_modules
+			mio_cat_all_medium_aircraft_and_modules
+			mio_cat_all_heavy_aircraft_and_modules
+			mio_cat_all_light_aircraft_and_modules
 		}
 		
 		ai_will_do = {
@@ -1664,6 +2036,12 @@ technologies = {
 			air_equipment
 			plane_modules_tech
 			cat_air_engine
+			mio_cat_all_light_fighter_and_modules
+			mio_cat_all_cas_and_modules
+			mio_cat_all_naval_bomber_and_modules
+			mio_cat_all_medium_aircraft_and_modules
+			mio_cat_all_heavy_aircraft_and_modules
+			mio_cat_all_light_aircraft_and_modules
 		}
 		
 		ai_will_do = {
@@ -1726,6 +2104,12 @@ technologies = {
 			air_equipment
 			plane_modules_tech
 			cat_air_engine
+			mio_cat_all_light_fighter_and_modules
+			mio_cat_all_cas_and_modules
+			mio_cat_all_naval_bomber_and_modules
+			mio_cat_all_medium_aircraft_and_modules
+			mio_cat_all_heavy_aircraft_and_modules
+			mio_cat_all_light_aircraft_and_modules
 		}
 		
 		ai_will_do = {
@@ -1780,6 +2164,12 @@ technologies = {
 			air_equipment
 			plane_modules_tech
 			cat_air_engine
+			mio_cat_all_light_fighter_and_modules
+			mio_cat_all_cas_and_modules
+			mio_cat_all_naval_bomber_and_modules
+			mio_cat_all_medium_aircraft_and_modules
+			mio_cat_all_heavy_aircraft_and_modules
+			mio_cat_all_light_aircraft_and_modules
 		}
 		
 		ai_will_do = {
@@ -1829,6 +2219,12 @@ technologies = {
 			air_equipment
 			plane_modules_tech
 			cat_air_engine
+			mio_cat_all_light_fighter_and_modules
+			mio_cat_all_cas_and_modules
+			mio_cat_all_naval_bomber_and_modules
+			mio_cat_all_medium_aircraft_and_modules
+			mio_cat_all_heavy_aircraft_and_modules
+			mio_cat_all_light_aircraft_and_modules
 		}
 		
 		ai_will_do = {
@@ -1870,12 +2266,23 @@ technologies = {
 
 		folder = {
 			name = bba_air_techs_folder
-			position = { x = 2 y = 4 }
+			position = { x = -2 y = 4 }
+		}
+		
+		path = {
+			leads_to_tech = advanced_aircraft_construction
+			research_cost_coeff = 1
 		}
 
 		categories = {
 			air_equipment
 			plane_modules_tech
+			mio_cat_all_light_fighter_and_modules
+			mio_cat_all_cas_and_modules
+			mio_cat_all_naval_bomber_and_modules
+			mio_cat_all_medium_aircraft_and_modules
+			mio_cat_all_heavy_aircraft_and_modules
+			mio_cat_all_light_aircraft_and_modules
 		}
 		
 		ai_will_do = {
@@ -1926,16 +2333,18 @@ technologies = {
 
 		folder = {
 			name = bba_air_techs_folder
-			position = { x = -2 y = 4 }
-		}
-		path = {
-			leads_to_tech = advanced_aircraft_construction
-			research_cost_coeff = 1
+			position = { x = -2 y = 2 }
 		}
 
 		categories = {
 			air_equipment
 			plane_modules_tech
+			mio_cat_all_light_fighter_and_modules
+			mio_cat_all_cas_and_modules
+			mio_cat_all_naval_bomber_and_modules
+			mio_cat_all_medium_aircraft_and_modules
+			mio_cat_all_heavy_aircraft_and_modules
+			mio_cat_all_light_aircraft_and_modules
 		}
 		
 		ai_will_do = {
@@ -1962,6 +2371,12 @@ technologies = {
 		categories = {
 			air_equipment
 			plane_modules_tech
+			mio_cat_all_light_fighter_and_modules
+			mio_cat_all_cas_and_modules
+			mio_cat_all_naval_bomber_and_modules
+			mio_cat_all_medium_aircraft_and_modules
+			mio_cat_all_heavy_aircraft_and_modules
+			mio_cat_all_light_aircraft_and_modules
 		}
 		
 		ai_will_do = {
diff --git a/common/technologies/changeling_tech.txt b/common/technologies/changeling_tech.txt
index f6545ecc91a..656ac3ea7bf 100644
--- a/common/technologies/changeling_tech.txt
+++ b/common/technologies/changeling_tech.txt
@@ -798,6 +798,10 @@ technologies = {
 		}
 		infiltrator_company = {
 			suppression_factor = 0.15
+			battalion_mult = {
+				category = category_all_infantry
+				default_morale = 0.20
+			}
 		}
 
 		path = {
@@ -1182,6 +1186,10 @@ technologies = {
 		}
 		infiltrator_company = {
 			suppression_factor = 0.15
+			battalion_mult = {
+				category = category_all_infantry
+				default_morale = 0.20
+			}
 		}
 	
 		path = {
diff --git a/common/technologies/deer_tech.txt b/common/technologies/deer_tech.txt
index c6853de61c8..55a0812b1cf 100644
--- a/common/technologies/deer_tech.txt
+++ b/common/technologies/deer_tech.txt
@@ -57,7 +57,7 @@ technologies = {
 	#Modern Economic Theory
 	tech_deer_misc2 = {
 
-		consumer_goods_factor = -0.04
+		consumer_goods_factor = -0.08
 
 		path = {
 			leads_to_tech = tech_deer_misc3
@@ -836,9 +836,9 @@ technologies = {
 		dependencies = {
 			deer_race = 1
 		}
-
-		winter_attrition_factor = -0.15
-
+		enable_subunits = {
+			winter_logistics_support
+		}
 		acclimatization_cold_climate_gain_factor = 0.25
 
 		path = {
@@ -1268,7 +1268,9 @@ technologies = {
 
 		enable_tactic = tactic_banzai_charge
 		attrition = -0.05
-
+		enable_subunits = {
+			long_range_patrol_support
+		}
 		path = {
 			leads_to_tech = tech_deer_army_atk2
 			research_cost_coeff = 1
diff --git a/common/technologies/diamond_dog_tech.txt b/common/technologies/diamond_dog_tech.txt
index 95ac568b4e8..902256c6147 100644
--- a/common/technologies/diamond_dog_tech.txt
+++ b/common/technologies/diamond_dog_tech.txt
@@ -779,6 +779,14 @@ technologies = {
 		dig_in_speed_factor = 0.2
 		cas_damage_reduction = 0.2
 		enemy_army_bonus_air_superiority_factor = -0.2
+		engineer = {
+			entrenchment = 1
+			battalion_mult = {
+				category = category_light_infantry
+				entrenchment = 0.10
+				add = yes
+			}
+		}
 
 		research_cost = 1.5
 		start_year = 1007
diff --git a/common/technologies/griffon_tech.txt b/common/technologies/griffon_tech.txt
index d8fc823f1a4..16f4c158fdd 100644
--- a/common/technologies/griffon_tech.txt
+++ b/common/technologies/griffon_tech.txt
@@ -1051,6 +1051,12 @@ technologies = {
 	tech_griffon_army_atk_a = {
 
 		air_paradrop_attack_factor = 0.15
+		logistics_company = {
+			battalion_mult = {
+				category = category_all_infantry
+				defense = 0.05
+			}
+		}
 
 		path = {
 			leads_to_tech = tech_griffon_army_atk_b
diff --git a/common/technologies/hippogriff_tech.txt b/common/technologies/hippogriff_tech.txt
index 7e5fe6a624d..b6e3ff487b6 100644
--- a/common/technologies/hippogriff_tech.txt
+++ b/common/technologies/hippogriff_tech.txt
@@ -53,6 +53,20 @@ technologies = {
 				movement = 0.1
 			}
 		}
+		marine_commando = {
+			marsh = {
+				defence = 0.1
+				movement = 0.1
+			}
+			river = {
+				defence = 0.1
+				movement = 0.1
+			}
+			amphibious = {
+				defence = 0.1
+				movement = 0.1
+			}
+		}
 		amphibious_mechanized = {
 			marsh = {
 				defence = 0.1
@@ -128,6 +142,9 @@ technologies = {
 		marine = {
 			max_organisation = 5
 		}
+		marine_commando = {
+			max_organisation = 3
+		}
 		amphibious_mechanized = {
 			max_organisation = 5
 		}
@@ -1434,8 +1451,13 @@ technologies = {
 	}
 	tech_hippogriff_endurance5 = {
 		
-		category_engineer = {
-			entrenchment = 2
+		engineer = {
+			entrenchment = 1
+			battalion_mult = {
+				category = category_light_infantry
+				entrenchment = 0.10
+				add = yes
+			}
 		}
 		mines_planting_by_fleets_factor = 0.1
 		research_cost = 1.5
diff --git a/common/technologies/horse_tech.txt b/common/technologies/horse_tech.txt
index 944d5841898..87a5d5365ba 100644
--- a/common/technologies/horse_tech.txt
+++ b/common/technologies/horse_tech.txt
@@ -84,8 +84,13 @@ technologies = {
 	#Earth Pony Sappers
 	tech_earth_horse_a1 = {
 
-		category_engineer = {
-			entrenchment  = 2
+		engineer = {
+			entrenchment = 1
+			battalion_mult = {
+				category = category_light_infantry
+				entrenchment = 0.10
+				add = yes
+			}
 		}
 
 		path = {
diff --git a/common/technologies/infantry.txt b/common/technologies/infantry.txt
index cf492e4f2a0..a4892717ae1 100644
--- a/common/technologies/infantry.txt
+++ b/common/technologies/infantry.txt
@@ -3,6 +3,7 @@
 technologies = {
 
 	@989 = 0
+	@995 = 1
 	@1007 = 2
 	@1008 = 3
 	@1009 = 4
@@ -1252,6 +1253,8 @@ technologies = {
 			acclimatization_cold_climate_gain_factor = 0.05
 		}
 
+		allow_branch = { not = { has_dlc = "Arms Against Tyranny" } }
+		
 		dependencies = {
 			infantry_weapons = 1
 		}
@@ -1327,7 +1330,7 @@ technologies = {
 			advanced_special_forces
 		}
 
-		special_forces_cap = 0.05
+		special_forces_cap = 0.1
 		special_forces_training_time_factor = -0.1
 
 		path = {
@@ -1358,11 +1361,11 @@ technologies = {
 	extreme_environment_training = {
 
 		category_special_forces = {
-			acclimatization_hot_climate_gain_factor = 0.50
-			acclimatization_cold_climate_gain_factor = 0.50
+			acclimatization_hot_climate_gain_factor = 0.20
+			acclimatization_cold_climate_gain_factor = 0.20
 		}
 
-		special_forces_no_supply_grace = 48
+		special_forces_no_supply_grace = 24
 		special_forces_training_time_factor = 0.1
 
 		path = {
@@ -1426,13 +1429,11 @@ technologies = {
 
 	elite_forces = {
 		category_special_forces = {
-			acclimatization_hot_climate_gain_factor = 0.20
-			acclimatization_cold_climate_gain_factor = 0.20
 			max_organisation = 5
 			soft_attack = 0.05
 		}
 
-		special_forces_no_supply_grace = 48
+		special_forces_no_supply_grace = 24
 
 		path = {
 			leads_to_tech = super_elite_forces
@@ -2347,25 +2348,87 @@ technologies = {
 		}
 	}
 
-	motorised_infantry = {
+	tech_trucks = {
 
 		enable_subunits = {
-			motorized
-			magical_motorized
+			mot_anti_tank_brigade
+			mot_artillery_brigade
+			mot_anti_air_brigade
+		}
+
+		dependencies = {
+			infantry_weapons = 1
+		}
+		enable_equipments = {
+			motorized_equipment_0
 		}
 
 		enable_equipment_modules = {
 			tank_wheeled_suspension
 		}
 
-		dependencies = {
-			infantry_weapons = 1
+		
+		path = {
+			leads_to_tech = motorised_infantry
+			research_cost_coeff = 1
+		}
+
+		path = {
+			leads_to_tech = armored_car1
+			research_cost_coeff = 1
+		} 
+
+		research_cost = 1.5
+		start_year = 1007
+		folder = {
+			name = infantry_folder
+			position = { x = 0 y = -1 }
+		}
+		
+		categories = {
+			motorized_equipment
+			mio_cat_tech_all_motorized_mechanized
+			infantry_tech
+		}
+		
+		ai_will_do = {
+			factor = 1
+			
+			modifier = {
+				factor = 2
+				date > "1008.1.1"
+			}
+			
+			modifier = {
+				factor = 2
+				date > "1009.1.1"
+			}
+			
+			modifier = {
+				factor = 2
+				date > "1010.1.1"
+			}
+			modifier = {
+				is_major = no
+				factor = 0.75
+			}
+		}
+	}
+	
+	motorised_infantry = {
+
+		enable_subunits = {
+			motorized
+			magical_motorized
 		}
 
 		enable_equipments = {
 			motorized_equipment_1
 		}
 
+		#enable_equipment_modules = {
+		#	tank_wheeled_suspension
+		#}
 		on_research_complete = {
 			hidden_effect = {
 				if = {
@@ -2417,10 +2480,6 @@ technologies = {
 			leads_to_tech = mechanised_infantry
 			research_cost_coeff = 1
 		}
-		path = {
-			leads_to_tech = armored_car1
-			research_cost_coeff = 1
-		}
 
 		research_cost = 2
 		start_year = 1007
@@ -2440,6 +2499,7 @@ technologies = {
 
 		categories = {
 			motorized_equipment
+			mio_cat_tech_all_motorized_mechanized
 			infantry_tech
 		}
 
@@ -2484,7 +2544,9 @@ technologies = {
 		enable_equipments = {
 			motorized_rocket_equipment_1
 		}
-
+		dependencies = {
+			rocket_artillery = 1
+		}
 		research_cost = 1.5
 		start_year = 1010
 
@@ -2494,6 +2556,7 @@ technologies = {
 
 		categories = {
 			mot_rockets
+			mio_cat_tech_all_motorized_mechanized
 		}
 	}
 
@@ -2513,15 +2576,16 @@ technologies = {
 		}
 
 		research_cost = 2
-		start_year = 1007
+		start_year = 985
 		folder = {
 			name = infantry_folder
-			position = { x = 4 y = @1007 }
+			position = { x = 4 y = @995 }
 		}
 		
 		categories = {
 			motorized_equipment
 			armor
+			cat_armored_cars
 		}
 		
 		ai_will_do = {
@@ -2569,6 +2633,7 @@ technologies = {
 		categories = {
 			motorized_equipment
 			armor
+			cat_armored_cars
 		}
 		
 		ai_will_do = {
@@ -2614,6 +2679,7 @@ technologies = {
 		categories = {
 			motorized_equipment
 			armor
+			cat_armored_cars
 		}
 		
 		sub_technologies = {
@@ -2657,6 +2723,7 @@ technologies = {
 		categories = {
 			motorized_equipment
 			armor
+			cat_armored_cars
 		}
 
 		ai_will_do = {
@@ -2683,6 +2750,64 @@ technologies = {
 		}
 	}
 
+	
+	SWE_lynx_armored_car = {
+		allow = { always = no }
+	   enable_equipments = {
+		   #armored_car_at_equipment
+	   }
+
+	   research_cost = 1
+	   start_year = 1013
+	   sub_tech_index = 1
+	   
+	   categories = {
+		   motorized_equipment
+		   armor
+		   cat_armored_cars
+	   }
+
+	   armored_car = {
+		   max_organisation = 5
+		   ap_attack = 0.1
+		   hard_attack = 0.1
+		   #hardness = 1
+		   forest = {
+			   attack = 0.2
+			   movement = 0.55
+		   }
+		   desert = {
+			   attack = -0.2
+			   movement = -0.55
+		   }
+
+		   snow = {
+			   attack = 0.2
+			   movement = 0.35
+		   }
+	   }
+
+	   armored_car_recon = {
+		   max_organisation = 3
+		   ap_attack = 0.1
+		   hard_attack = 0.1
+		   #hardness = 1
+		   forest = {
+			   attack = 0.05
+			   movement = 0.1
+		   }
+		   desert = {
+			   attack = -0.15
+			   movement = -0.15
+		   }
+
+		   snow = {
+			   attack = 0.2
+			   movement = 0.25
+		   }
+	   }
+   }
+
 	mechanised_infantry = {
 
 		enable_equipments = {
@@ -2757,6 +2882,7 @@ technologies = {
 
 		categories = {
 			motorized_equipment
+			mio_cat_tech_all_motorized_mechanized
 			infantry_tech
 			cat_mechanized_equipment
 		}
@@ -2798,6 +2924,14 @@ technologies = {
 			}
 		}
 	}
+	
+	militia_tech = {
+		allow = { always = no }
+	   enable_subunits = {
+		   militia
+	   }
+   }
+
 
 	amphibious_mechanized_infantry = {
 
@@ -2831,6 +2965,7 @@ technologies = {
 		
 		categories = {
 			motorized_equipment
+			mio_cat_tech_all_motorized_mechanized
 			infantry_tech
 			cat_mechanized_equipment
 			tp_tech
@@ -2897,6 +3032,7 @@ technologies = {
 		
 		categories = {
 			motorized_equipment
+			mio_cat_tech_all_motorized_mechanized
 			infantry_tech
 			cat_mechanized_equipment
 			tp_tech
@@ -2959,6 +3095,7 @@ technologies = {
 
 		categories = {
 			motorized_equipment
+			mio_cat_tech_all_motorized_mechanized
 			infantry_tech
 			cat_mechanized_equipment
 		}
@@ -3031,6 +3168,7 @@ technologies = {
 
 		categories = {
 			motorized_equipment
+			mio_cat_tech_all_motorized_mechanized
 			infantry_tech
 			cat_mechanized_equipment
 		}
@@ -3110,6 +3248,7 @@ technologies = {
 
 		categories = {
 			motorized_equipment
+			mio_cat_tech_all_motorized_mechanized
 			infantry_tech
 			cat_mechanized_equipment
 		}
@@ -3169,6 +3308,7 @@ technologies = {
 
 		categories = {
 			motorized_equipment
+			mio_cat_tech_all_motorized_mechanized
 			infantry_tech
 			cat_mechanized_equipment
 		}
@@ -3392,6 +3532,58 @@ technologies = {
 				attack = -0.3
 			}
 		}
+		super_heavy_armor = {
+			marsh = {
+				attack = -0.1
+				movement = -0.05
+			}
+			river = {
+				attack = -0.1
+				movement = -0.05
+			}
+			amphibious = {
+				attack = -0.3
+			}
+		}
+		super_heavy_tank_destroyer_brigade = {
+			marsh = {
+				attack = -0.1
+				movement = -0.05
+			}
+			river = {
+				attack = -0.1
+				movement = -0.05
+			}
+			amphibious = {
+				attack = -0.3
+			}
+		}
+		super_heavy_sp_artillery_brigade = {
+			marsh = {
+				attack = -0.1
+				movement = -0.05
+			}
+			river = {
+				attack = -0.1
+				movement = -0.05
+			}
+			amphibious = {
+				attack = -0.3
+			}
+		}
+		super_heavy_sp_anti_air_brigade = {
+			marsh = {
+				attack = -0.1
+				movement = -0.05
+			}
+			river = {
+				attack = -0.1
+				movement = -0.05
+			}
+			amphibious = {
+				attack = -0.3
+			}
+		}
 		category_all_armor = {
 			marsh = {
 				attack = 0.1
@@ -3418,6 +3610,7 @@ technologies = {
 
 		categories = {
 			motorized_equipment
+			mio_cat_tech_all_motorized_mechanized
 			infantry_tech
 			cat_mechanized_equipment
 		}
@@ -3464,6 +3657,7 @@ technologies = {
 
 		categories = {
 			mot_rockets
+			mio_cat_tech_all_motorized_mechanized
 		}
 	}
 	motorised_infantry_2 = {
@@ -3488,6 +3682,7 @@ technologies = {
 
 		categories = {
 			motorized_equipment
+			mio_cat_tech_all_motorized_mechanized
 			infantry_tech
 		}
 
@@ -3527,6 +3722,7 @@ technologies = {
 
 		categories = {
 			motorized_equipment
+			mio_cat_tech_all_motorized_mechanized
 			infantry_tech
 		}
 
@@ -3575,6 +3771,7 @@ technologies = {
 
 		categories = {
 			motorized_equipment
+			mio_cat_tech_all_motorized_mechanized
 			infantry_tech
 			cat_mechanized_equipment
 			tp_tech
@@ -3644,6 +3841,7 @@ technologies = {
 		
 		categories = {
 			motorized_equipment
+			mio_cat_tech_all_motorized_mechanized
 			infantry_tech
 			cat_mechanized_equipment
 			tp_tech
@@ -3703,6 +3901,7 @@ technologies = {
 		
 		categories = {
 			motorized_equipment
+			mio_cat_tech_all_motorized_mechanized
 			infantry_tech
 			cat_mechanized_equipment
 			tp_tech
@@ -4781,6 +4980,7 @@ technologies = {
 		categories = {
 			motorized_equipment
 			armor
+			cat_armored_cars
 		}
 
 		ai_will_do = {
@@ -4808,6 +5008,7 @@ technologies = {
 		categories = {
 			motorized_equipment
 			armor
+			cat_armored_cars
 		}
 		
 		sub_technologies = {
@@ -4832,6 +5033,7 @@ technologies = {
 		categories = {
 			motorized_equipment
 			armor
+			cat_armored_cars
 		}
 
 		ai_will_do = {
@@ -4934,6 +5136,130 @@ technologies = {
 			maximum_speed = 1.25 #TODO_TA for testing only, remove
 		}
 	}
+
+	
+	######### FROM FINNISH FOCUS ##########
+	molotov_cocktails_tech = {
+		
+		allow = {
+			always = no
+		}
+
+		research_cost = 1
+		start_year = 1007
+
+		category_all_infantry = {
+			hard_attack = 0.25
+			ap_attack = 1
+		}
+	}
+
+	winter_logistics_support_tech = {
+		
+		allow = {
+			always = no
+		}
+
+		research_cost = 1
+		start_year = 1007
+
+		enable_subunits = {
+			winter_logistics_support
+		}
+	}
+
+	long_range_patrol_support_tech = {
+		
+		allow = {
+			always = no
+		}
+
+		research_cost = 1
+		start_year = 1007
+
+		enable_subunits = {
+			long_range_patrol_support
+		}
+	}
+
+	sami_pathfinders_tech = { #Hidden tech showed as part of FIN_sami_pathfinders national spirit
+		
+		allow = {
+			always = no
+		}
+
+		research_cost = 1
+		start_year = 1007
+
+		category_recon = {
+			recon = 1
+
+			snow = {
+				movement = 0.1
+			}
+			forest = {
+				movement = 0.05
+			}
+			hills = {
+				movement = 0.05
+			}
+			mountain = {
+				movement = 0.05
+			}
+			marsh = {
+				movement = 0.05
+			}
+			plains = {
+				movement = 0.05
+			}
+			river = {
+				movement = 0.05
+			}
+		}
+	}
+
+	lotta_svard_tech = { #Hidden tech showed as part of FIN_lotta_svard national spirit
+		
+		allow = {
+			always = no
+		}
+
+		research_cost = 1
+		start_year = 1007
+
+		category_support_battalions = { #Any changes in the values below need to be applied in FIN_lotta_svard_support_battalions_bonus_tt too
+			max_strength = 5
+			max_organisation = 10
+		}
+	}
+
+	SWE_sami_support_tech = { #Hidden tech for Sami reconcilliation for Sweden
+		
+		allow = {
+			always = no
+		}
+
+		research_cost = 1
+		start_year = 1007
+
+		category_recon = {
+			recon = 1
+
+			snow = {
+				movement = 0.1
+			}
+			forest = {
+				movement = 0.1
+			}
+			hills = {
+				movement = 0.05
+			}
+			mountain = {
+				movement = 0.05
+			}
+		}
+	}
+	
 }
 
 #####-----------------------------------------------------------> End
diff --git a/common/technologies/kirin_tech.txt b/common/technologies/kirin_tech.txt
index 4c7cd36d003..3d51a4fe600 100644
--- a/common/technologies/kirin_tech.txt
+++ b/common/technologies/kirin_tech.txt
@@ -487,6 +487,10 @@ technologies = {
 
 		kirin_braves = {
 			ap_attack = 1
+			battalion_mult = {
+				category = category_all_infantry
+				ap_attack = 0.1
+			}
 		}
 
 		path = {
@@ -1414,7 +1418,7 @@ technologies = {
 			kirin_race = 1
 		}
 
-		consumer_goods_factor = -0.03
+		consumer_goods_factor = -0.06
 		local_resources_factor = 0.1
 		
 		path = {
diff --git a/common/technologies/land_doctrine.txt b/common/technologies/land_doctrine.txt
index dda77c5529f..eba4804e527 100644
--- a/common/technologies/land_doctrine.txt
+++ b/common/technologies/land_doctrine.txt
@@ -319,6 +319,12 @@ technologies = {
 		category_tanks = {
 			max_organisation = 3
 		}
+		armored_car_recon = {
+			battalion_mult = {
+				category = category_all_armor
+				breakthrough = 0.10
+			}
+		}
 	
 
 		enable_tactic = tactic_blitz
@@ -565,6 +571,7 @@ technologies = {
 		}
 		# faster planning
 		planning_speed = 0.2
+		additional_brigade_column_size = 1
 		
 		enable_tactic = tactic_overwhelming_fire
 		
@@ -1217,6 +1224,12 @@ technologies = {
 		category_line_artillery = {
 			default_morale = 0.2
 		}
+		signal_company = {
+			battalion_mult = {
+				category = category_artillery
+				defense = 0.10
+			}
+		}
 		
 		path = {
 			leads_to_tech = overwhelming_firepower 
@@ -1469,6 +1482,7 @@ technologies = {
 		xp_research_type = army
 		xp_unlock_cost = 100
 		land_reinforce_rate = 0.02
+		additional_brigade_column_size = 1
 	
 		enable_tactic = tactic_tactical_withdrawal
 		
@@ -1523,7 +1537,22 @@ technologies = {
 		}
 			
 		#combat advantage when air superior
-		army_bonus_air_superiority_factor = 0.20
+		army_bonus_air_superiority_factor = 0.15
+		
+		recon = {
+			battalion_mult = {
+				category = category_anti_air
+				air_attack = 0.10
+			}
+		}
+		
+		mot_recon = {
+			battalion_mult = {
+				category = category_anti_air
+				air_attack = 0.10
+			}
+		}
+		
 		
 		doctrine = yes	
 		research_cost = 4.5
@@ -1696,6 +1725,7 @@ technologies = {
 		category_all_armor = {
 			default_morale = 0.05
 		}
+		additional_brigade_column_size = 1
 		
 		enable_tactic = tactic_tactical_withdrawal
 		
@@ -2025,6 +2055,7 @@ technologies = {
 		armored_car = {
 			max_organisation = 5
 		}
+		additional_brigade_column_size = 1
 		
 		enable_tactic = tactic_blitz
 		enable_tactic = tactic_elastic_defense
@@ -2241,6 +2272,12 @@ technologies = {
 		xp_unlock_cost = 100
 		max_planning = 0.1
 		max_command_power = 30
+		logistics_company = {
+			battalion_mult = {
+				category = category_all_infantry
+				defense = 0.05
+			}
+		}
 		
 		path = {
 			leads_to_tech = c3i_theory 
@@ -2355,6 +2392,8 @@ technologies = {
 			max_organisation = 5
 			breakthrough = 0.1
 		}
+		additional_brigade_column_size = 1
+		
 		
 		enable_tactic = tactic_infantry_charge
 		
@@ -2469,7 +2508,13 @@ technologies = {
 		xp_unlock_cost = 100
 		supply_consumption_factor = -0.10
 		command_power_gain_mult = 0.15
-		
+		recon = {
+			battalion_mult = {
+				category = category_light_infantry
+				soft_attack = 0.05
+			}
+		}
+
 		path = {
 			leads_to_tech = night_assault_tactics 
 			research_cost_coeff = 1
@@ -2848,6 +2893,7 @@ technologies = {
 
 
 		supply_consumption_factor = -0.10
+		additional_brigade_column_size = 1
 
 		enable_tactic = tactic_relentless_assault
 		
@@ -3004,10 +3050,10 @@ technologies = {
 		supply_consumption_factor = -0.10
 		
 		infantry = {
-			combat_width = -0.4
+			combat_width = -0.3
 		}
 		magical_infantry = {
-			combat_width = -0.4
+			combat_width = -0.3
 		}
 		
 		enable_tactic = tactic_overwhelming_fire
@@ -3130,6 +3176,13 @@ technologies = {
 			max_organisation = 10
 			default_morale = 0.1
 		}	
+		armored_car_recon = {
+			battalion_mult = {
+				category = category_light_infantry
+				max_organisation = 1
+				add = yes
+			}
+		}
 		
 		path = {
 			leads_to_tech = continuous_offensive
@@ -3242,6 +3295,8 @@ technologies = {
 		#Land Units take less attrition
 		attrition = -0.1 #take 10% less attrition losses
 		
+		additional_brigade_column_size = 1
+
 		enable_tactic = tactic_human_wave_tactics
 		
 		
@@ -3258,6 +3313,13 @@ technologies = {
 			cat_mass_assault
 		}
 
+		military_police = {
+			battalion_mult = {
+				category = category_heavy_infantry
+				suppression = 0.50
+				add = yes
+			}
+		}
 		
 		folder = {
 			name = land_doctrine_folder
@@ -3899,6 +3961,12 @@ technologies = {
 		armored_car = {
 			max_organisation = 2
 		}
+		logistics_company = {
+			battalion_mult = {
+				category = category_all_infantry
+				defense = 0.05
+			}
+		}
 		
 		
 		doctrine = yes	
@@ -4269,6 +4337,12 @@ technologies = {
 		}
 		army_bonus_air_superiority_factor = 0.1
 		shore_bombardment_bonus = 0.1
+		signal_company = {
+			battalion_mult = {
+				category = category_all_at
+				hard_attack = 0.05
+			}
+		}
 				
 		doctrine = yes	
 		research_cost = 4.5
@@ -4643,6 +4717,12 @@ technologies = {
 			leads_to_tech = defensive_professional_army 
 			research_cost_coeff = 1
 		}
+		maintenance_company = {
+			battalion_mult = {
+				category = category_all_infantry
+				breakthrough = 0.05
+			}
+		}
 		
 		doctrine = yes	
 		research_cost = 4.5
@@ -4713,6 +4793,12 @@ technologies = {
 			leads_to_tech = concealment_tactics 
 			research_cost_coeff = 1
 		}
+		maintenance_company = {
+			battalion_mult = {
+				category = category_all_infantry
+				defense = 0.05
+			}
+		}
 		
 		doctrine = yes	
 		research_cost = 4.5
@@ -5097,6 +5183,13 @@ technologies = {
 		category_army = {
 			default_morale = 0.2
 		}
+		field_hospital = {
+			battalion_mult = {
+				category = category_all_armor
+				max_organisation = 1
+				add = yes
+			}
+		}
 		
 		doctrine = yes	
 		research_cost = 4.5
diff --git a/common/technologies/naval.txt b/common/technologies/naval.txt
index 8289ffd4c28..4161043e57e 100644
--- a/common/technologies/naval.txt
+++ b/common/technologies/naval.txt
@@ -42,6 +42,8 @@ technologies = {
 		categories = {
 			naval_equipment
 			dd_tech
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_destroyer_and_modules
 		}
 	}
 
@@ -77,6 +79,8 @@ technologies = {
 		categories = {
 			naval_equipment
 			dd_tech
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_destroyer_and_modules
 		}
 	}
 
@@ -108,6 +112,8 @@ technologies = {
 		categories = {
 			naval_equipment
 			dd_tech
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_destroyer_and_modules
 		}
 	}
 
@@ -141,6 +147,8 @@ technologies = {
 		categories = {
 			naval_equipment
 			dd_tech
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_destroyer_and_modules
 		}
 	}
 
@@ -177,6 +185,8 @@ technologies = {
 		categories = {
 			naval_equipment
 			cl_tech
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_cruiser_and_modules
 		}
 	}
 
@@ -213,6 +223,8 @@ technologies = {
 		categories = {
 			naval_equipment
 			cl_tech
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_cruiser_and_modules
 		}
 	}
 
@@ -249,6 +261,8 @@ technologies = {
 		categories = {
 			naval_equipment
 			cl_tech
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_cruiser_and_modules
 		}
 	}
 
@@ -286,6 +300,8 @@ technologies = {
 		categories = {
 			naval_equipment
 			cl_tech
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_cruiser_and_modules
 		}
 	}
 
@@ -322,6 +338,8 @@ technologies = {
 		categories = {
 			naval_equipment
 			ca_tech
+			mio_cat_tech_all_capital_ship_and_modules
+			mio_cat_tech_all_cruiser_and_modules
 		}
 	}
 
@@ -357,6 +375,8 @@ technologies = {
 		categories = {
 			naval_equipment
 			ca_tech
+			mio_cat_tech_all_capital_ship_and_modules
+			mio_cat_tech_all_cruiser_and_modules
 		}
 	}
 
@@ -392,6 +412,8 @@ technologies = {
 		categories = {
 			naval_equipment
 			ca_tech
+			mio_cat_tech_all_capital_ship_and_modules
+			mio_cat_tech_all_cruiser_and_modules
 		}
 	}
 
@@ -428,6 +450,8 @@ technologies = {
 		categories = {
 			naval_equipment
 			ca_tech
+			mio_cat_tech_all_capital_ship_and_modules
+			mio_cat_tech_all_cruiser_and_modules
 		}
 	}
 
@@ -464,6 +488,7 @@ technologies = {
 		categories = {
 			naval_equipment
 			bc_tech
+			mio_cat_tech_all_capital_ship_and_modules
 		}
 	}
 
@@ -500,6 +525,7 @@ technologies = {
 		categories = {
 			naval_equipment
 			bc_tech
+			mio_cat_tech_all_capital_ship_and_modules
 		}
 	}
 
@@ -536,6 +562,7 @@ technologies = {
 		categories = {
 			naval_equipment
 			bb_tech
+			mio_cat_tech_all_capital_ship_and_modules
 		}
 	}
 
@@ -570,6 +597,7 @@ technologies = {
 		categories = {
 			naval_equipment
 			bb_tech
+			mio_cat_tech_all_capital_ship_and_modules
 		}
 	}
 
@@ -603,6 +631,7 @@ technologies = {
 		categories = {
 			naval_equipment
 			bb_tech
+			mio_cat_tech_all_capital_ship_and_modules
 		}
 	}
 
@@ -638,6 +667,7 @@ technologies = {
 		categories = {
 			naval_equipment
 			bb_tech
+			mio_cat_tech_all_capital_ship_and_modules
 		}
 	}
 
@@ -669,6 +699,7 @@ technologies = {
 		categories = {
 			naval_equipment
 			shbb_tech
+			mio_cat_tech_all_capital_ship_and_modules
 		}
 	}
 
@@ -700,6 +731,7 @@ technologies = {
 		categories = {
 			naval_equipment
 			shbb_tech
+			mio_cat_tech_all_capital_ship_and_modules
 		}
 	}
 
@@ -707,7 +739,7 @@ technologies = {
 
 	transport = {
 
-		transport_capacity = -0.5
+		transport_capacity = -0.33
 		naval_invasion_capacity = 10
 
 		path = {
@@ -750,9 +782,9 @@ technologies = {
 
 	landing_craft = {
 
-		invasion_preparation = -0.5
+		invasion_preparation = -0.25
 		amphibious_invasion_defence = 0.15
-		naval_invasion_capacity = 40
+		naval_invasion_capacity = 20
 
 		dependencies = {
 			infantry_weapons = 1
@@ -869,6 +901,7 @@ technologies = {
 		categories = {
 			naval_equipment
 			cv_tech
+			mio_cat_tech_all_carrier_and_modules
 		}
 	}
 
@@ -903,6 +936,7 @@ technologies = {
 		categories = {
 			naval_equipment
 			cv_tech
+			mio_cat_tech_all_carrier_and_modules
 		}
 	}
 
@@ -934,6 +968,7 @@ technologies = {
 		categories = {
 			naval_equipment
 			cv_tech
+			mio_cat_tech_all_carrier_and_modules
 		}
 	}
 
@@ -966,6 +1001,7 @@ technologies = {
 		categories = {
 			naval_equipment
 			cv_tech
+			mio_cat_tech_all_carrier_and_modules
 		}
 	}
 
@@ -998,6 +1034,7 @@ technologies = {
 		categories = {
 			naval_equipment
 			cv_tech
+			mio_cat_tech_all_carrier_and_modules
 		}
 	}
 	###------> X <><> <><> <><> <><> <><>
@@ -1012,9 +1049,6 @@ technologies = {
 			submarine_1
 		}
 
-		enable_equipment_modules = { 
-			torpedo_mounting
-		}
 
 		path = {
 			leads_to_tech = basic_submarine
@@ -1038,6 +1072,7 @@ technologies = {
 		categories = {
 			naval_equipment
 			ss_tech
+			mio_cat_tech_all_submarine_and_modules
 		}
 	}
 
@@ -1068,6 +1103,7 @@ technologies = {
 		categories = {
 			naval_equipment
 			ss_tech
+			mio_cat_tech_all_submarine_and_modules
 		}
 	}
 
@@ -1099,6 +1135,7 @@ technologies = {
 		categories = {
 			naval_equipment
 			ss_tech
+			mio_cat_tech_all_submarine_and_modules
 		}
 	}
 
@@ -1131,6 +1168,7 @@ technologies = {
 		categories = {
 			naval_equipment
 			ss_tech
+			mio_cat_tech_all_submarine_and_modules
 		}
 	}
 	###------> X <><> <><> <><> <><> <><>
@@ -1164,6 +1202,8 @@ technologies = {
 		categories = {
 			naval_equipment
 			dd_tech
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_destroyer_and_modules
 		}
 	}
 
@@ -1190,6 +1230,8 @@ technologies = {
 		categories = {
 			naval_equipment
 			dd_tech
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_destroyer_and_modules
 		}
 	}
 
@@ -1229,6 +1271,8 @@ technologies = {
 		categories = {
 			naval_equipment
 			cl_tech
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_cruiser_and_modules
 		}
 	}
 
@@ -1260,6 +1304,8 @@ technologies = {
 		categories = {
 			naval_equipment
 			cl_tech
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_cruiser_and_modules
 		}
 	}
 	
@@ -1294,6 +1340,8 @@ technologies = {
 		categories = {
 			naval_equipment
 			ca_tech
+			mio_cat_tech_all_capital_ship_and_modules
+			mio_cat_tech_all_cruiser_and_modules
 		}
 	}
 	
@@ -1324,6 +1372,8 @@ technologies = {
 		categories = {
 			naval_equipment
 			ca_tech
+			mio_cat_tech_all_capital_ship_and_modules
+			mio_cat_tech_all_cruiser_and_modules
 		}
 	}
 
@@ -1357,6 +1407,7 @@ technologies = {
 		categories = {
 			naval_equipment
 			bc_tech
+			mio_cat_tech_all_capital_ship_and_modules
 		}
 	}
 
@@ -1391,6 +1442,7 @@ technologies = {
 		categories = {
 			naval_equipment
 			bb_tech
+			mio_cat_tech_all_capital_ship_and_modules
 		}
 	}
 	modern_battleship = {
@@ -1418,6 +1470,7 @@ technologies = {
 		categories = {
 			naval_equipment
 			bb_tech
+			mio_cat_tech_all_capital_ship_and_modules
 		}
 	}
 	heavy_battleship3 = {
@@ -1442,6 +1495,7 @@ technologies = {
 		categories = {
 			naval_equipment
 			shbb_tech
+			mio_cat_tech_all_capital_ship_and_modules
 		}
 	}
 
@@ -1473,6 +1527,7 @@ technologies = {
 		categories = {
 			naval_equipment
 			cv_tech
+			mio_cat_tech_all_carrier_and_modules
 		}
 	}
 
@@ -1499,6 +1554,7 @@ technologies = {
 		categories = {
 			naval_equipment
 			cv_tech
+			mio_cat_tech_all_carrier_and_modules
 		}
 	}
 	
@@ -1528,6 +1584,7 @@ technologies = {
 		categories = {
 			naval_equipment
 			ss_tech
+			mio_cat_tech_all_submarine_and_modules
 		}
 	}
 	modern_submarine = {
@@ -1552,6 +1609,7 @@ technologies = {
 		categories = {
 			naval_equipment
 			ss_tech
+			mio_cat_tech_all_submarine_and_modules
 		}
 	}
 	###------> New Landing Craft (1019) (1023) <><> <><> <><> <><> <><>
diff --git a/common/technologies/polar_tech.txt b/common/technologies/polar_tech.txt
index ee6e80936a8..238f1a35372 100644
--- a/common/technologies/polar_tech.txt
+++ b/common/technologies/polar_tech.txt
@@ -360,7 +360,9 @@ technologies = {
 		
 		no_supply_grace = 48
 		equipment_capture = 0.05
-
+		enable_subunits = {
+			winter_logistics_support
+		}
 		path = {
 			leads_to_tech = tech_modern_berserkers
 			research_cost_coeff = 1
diff --git a/common/technologies/pony_tech.txt b/common/technologies/pony_tech.txt
index 2cbacb5c3f2..23610a9ba69 100644
--- a/common/technologies/pony_tech.txt
+++ b/common/technologies/pony_tech.txt
@@ -88,8 +88,13 @@ technologies = {
 	#Earth Pony Sappers
 	tech_earth_pony_a1 = {
 
-		category_engineer = {
-			entrenchment  = 2
+		engineer = {
+			entrenchment = 1
+			battalion_mult = {
+				category = category_light_infantry
+				entrenchment = 0.10
+				add = yes
+			}
 		}
 
 		path = {
@@ -970,6 +975,10 @@ technologies = {
 
 		unicorn_company = {
 			recon = 0.6
+			battalion_mult = {
+				category = category_all_infantry
+				breakthrough = 0.1
+			}
 		}
 
 		on_research_complete = {
@@ -1227,6 +1236,10 @@ technologies = {
 
 		unicorn_company = {
 			breakthrough = 4
+			battalion_mult = {
+				category = category_all_infantry
+				breakthrough = 0.1
+			}
 		}
 
 		path = {
diff --git a/common/technologies/special_forces_doctrine.txt b/common/technologies/special_forces_doctrine.txt
new file mode 100644
index 00000000000..57dd2373294
--- /dev/null
+++ b/common/technologies/special_forces_doctrine.txt
@@ -0,0 +1,1769 @@
+technologies = {
+	
+	###Mountaineers
+	
+	special_forces_mountaineers = {
+		doctrine_name = "TITLE_SPECIAL_FORCES"
+		
+		# EFFECT ########
+		mountaineers_special_forces_contribution_factor = -0.25
+		category_mountaineers = {
+			supply_consumption = -0.02
+		}
+		category_special_forces = {
+			max_organisation = 5
+			soft_attack = 0.05
+		}
+		enable_subunits = {
+			rangers_support
+		}		
+		###########
+		
+		force_use_small_tech_layout = yes
+		
+		xp_research_type = army
+		xp_unlock_cost = 60
+		
+		#xor = { special_forces_marines special_forces_paratroopers }
+		
+		path = {
+			leads_to_tech = ski_troops
+			research_cost_coeff = 1
+		}	
+
+		path = {
+			leads_to_tech = rangers
+			research_cost_coeff = 1
+		}
+		
+		doctrine = yes	
+		research_cost = 2.25
+		
+		allow = {
+			AND = {
+				has_tech = tech_mountaineers
+				can_unlock_new_special_forces_tree = yes
+			}
+		}
+		
+		on_research_complete = {
+			remove_potential_special_forces_tree = yes
+		}
+		
+		categories = {
+			special_forces_doctrine
+			mountaineers_tech
+			cat_mountaineers_doctrine
+		}
+		
+		folder = {
+			name = special_forces_doctrine_folder
+			position = { x = 0 y = 0 }
+		}
+				
+		ai_will_do = {
+			factor = 10
+			modifier = {
+				factor = 0
+				NOT = { ai_has_completed_army_doctrine = yes }
+			}
+		}
+		
+		ai_research_weights = {
+			#air_doctrine = -1.0
+			#light_air = -2.0
+		}
+	}
+	
+	ski_troops = {
+
+		xp_research_type = army
+		xp_unlock_cost = 60
+		
+		force_use_small_tech_layout = yes
+		
+		path = {
+			leads_to_tech = special_forces_recon
+			research_cost_coeff = 1
+		}
+
+		xor = { rangers }
+		
+		rangers_support = {
+			acclimatization_cold_climate_gain_factor = 0.25
+			snow = {
+				attack = 0.15
+				defence = 0.20
+				movement = 0.15
+			}
+		}
+		
+		doctrine = yes	
+		research_cost = 4.5
+
+		categories = {
+			special_forces_doctrine
+			mountaineers_tech
+			cat_mountaineers_doctrine
+		}
+		
+		folder = {
+			name = special_forces_doctrine_folder
+			position = { x = -1 y = 2 }
+		}
+		
+		ai_will_do = {
+			factor = 20
+		}
+		
+		ai_research_weights = {
+			#armor = 3.0
+		}
+	}
+	
+	rangers = {
+
+		xp_research_type = army
+		xp_unlock_cost = 60
+		
+		force_use_small_tech_layout = yes
+		
+		path = {
+			leads_to_tech = special_forces_recon
+			research_cost_coeff = 1
+		}
+
+		xor = { ski_troops }
+		
+		rangers_support = {
+			mountain = {
+				attack = 0.20
+				defence = 0.10
+				movement = 0.10
+			}
+		}
+		
+		doctrine = yes	
+		research_cost = 4.5
+
+		categories = {
+			special_forces_doctrine
+			mountaineers_tech
+			cat_mountaineers_doctrine
+		}
+		
+		folder = {
+			name = special_forces_doctrine_folder
+			position = { x = 1 y = 2 }
+		}
+		
+		ai_will_do = {
+			factor = 20
+		}
+		
+		ai_research_weights = {
+			#armor = 3.0
+		}
+	}
+	
+	special_forces_recon = {
+
+		xp_research_type = army
+		xp_unlock_cost = 60
+		
+		category_mountaineers = {
+			initiative = 0.01
+		}
+		unit_mountaineers_design_cost_factor = -0.50
+		unit_rangers_support_design_cost_factor = -0.50
+		
+		force_use_small_tech_layout = yes
+		
+		path = {
+			leads_to_tech = mountaineers_combat_1
+			research_cost_coeff = 1
+		}
+		
+		path = {
+			leads_to_tech = mountaineers_combat_2
+			research_cost_coeff = 1
+		}
+		
+		doctrine = yes	
+		research_cost = 4.5
+
+		categories = {
+			special_forces_doctrine
+			mountaineers_tech
+			cat_mountaineers_doctrine
+		}
+		
+		folder = {
+			name = special_forces_doctrine_folder
+			position = { x = 0 y = 4 }
+		}
+		
+		ai_will_do = {
+			factor = 20
+		}
+		
+		ai_research_weights = {
+			#armor = 3.0
+		}
+	}
+	
+	mountaineers_combat_1 = {
+
+		xp_research_type = army
+		xp_unlock_cost = 60
+		
+		force_use_small_tech_layout = yes
+		
+		category_mountaineers = {
+			defense = 0.10
+		}
+		mountaineers = {
+			combat_width = -0.2
+		}
+		
+		path = {
+			leads_to_tech = mountaineers_combat_3
+			research_cost_coeff = 1
+		}
+		
+		xor = { mountaineers_combat_2 }
+		
+		doctrine = yes	
+		research_cost = 4.5
+
+		categories = {
+			special_forces_doctrine
+			mountaineers_tech
+			cat_mountaineers_doctrine
+		}
+		
+		folder = {
+			name = special_forces_doctrine_folder
+			position = { x = -1 y = 6 }
+		}
+		
+		ai_will_do = {
+			factor = 20
+		}
+		
+		ai_research_weights = {
+			#armor = 3.0
+		}
+	}
+	
+	mountaineers_combat_2 = {
+
+		xp_research_type = army
+		xp_unlock_cost = 60
+		
+		force_use_small_tech_layout = yes
+		
+		path = {
+			leads_to_tech = mountaineers_combat_3
+			research_cost_coeff = 1
+		}
+		
+		artillery = {
+			battalion_mult = {
+				category = category_mountaineers
+				breakthrough = 0.15
+			}
+		}
+		
+		rangers_support = {
+			battalion_mult = {
+				category = category_line_artillery
+				soft_attack = 0.20
+			}
+		}
+		
+		xor = { mountaineers_combat_1 }
+		
+		doctrine = yes	
+		research_cost = 4.5
+
+		categories = {
+			special_forces_doctrine
+			mountaineers_tech
+			cat_mountaineers_doctrine
+		}
+		
+		folder = {
+			name = special_forces_doctrine_folder
+			position = { x = 1 y = 6 }
+		}
+		
+		ai_will_do = {
+			factor = 20
+		}
+		
+		ai_research_weights = {
+			#armor = 3.0
+		}
+	}
+	
+	mountaineers_combat_3 = {
+
+		xp_research_type = army
+		xp_unlock_cost = 60
+		
+		category_mountaineers = {
+			max_organisation = 10
+		}
+		
+		force_use_small_tech_layout = yes
+		
+		path = {
+			leads_to_tech = mountaineers_keystone_1
+			research_cost_coeff = 1
+		}
+		
+		path = {
+			leads_to_tech = mountaineers_keystone_2
+			research_cost_coeff = 1
+		}
+		
+		doctrine = yes	
+		research_cost = 4.5
+
+		categories = {
+			special_forces_doctrine
+			mountaineers_tech
+			cat_mountaineers_doctrine
+		}
+		
+		folder = {
+			name = special_forces_doctrine_folder
+			position = { x = 0 y = 8 }
+		}
+		
+		ai_will_do = {
+			factor = 20
+		}
+		
+		ai_research_weights = {
+			#armor = 3.0
+		}
+	}
+	
+	mountaineers_keystone_1 = {
+
+		xp_research_type = army
+		xp_unlock_cost = 60
+		
+		force_use_small_tech_layout = yes
+		
+		category_mountaineers = {
+			soft_attack = 0.10
+		}
+		
+		mountaineers_special_forces_contribution_factor = -0.25
+		special_forces_training_time_factor = -0.20
+		
+		xor = { mountaineers_keystone_2 }
+		
+		doctrine = yes	
+		research_cost = 4.5
+
+		categories = {
+			special_forces_doctrine
+			mountaineers_tech
+			cat_mountaineers_doctrine
+		}
+		
+		folder = {
+			name = special_forces_doctrine_folder
+			position = { x = -1 y = 10 }
+		}
+		
+		ai_will_do = {
+			factor = 20
+		}
+		
+		ai_research_weights = {
+			#armor = 3.0
+		}
+	}
+	
+	mountaineers_keystone_2 = {
+
+		xp_research_type = army
+		xp_unlock_cost = 60
+		
+		special_forces_cap = 0.20
+		special_forces_out_of_supply_factor = -0.1
+		special_forces_attack_factor = 0.10
+		acclimatization_hot_climate_gain_factor = 0.10
+		acclimatization_cold_climate_gain_factor = 0.10
+		
+		force_use_small_tech_layout = yes
+
+		xor = { mountaineers_keystone_1 }
+		
+		doctrine = yes	
+		research_cost = 4.5
+
+		categories = {
+			special_forces_doctrine
+			mountaineers_tech
+			cat_mountaineers_doctrine
+		}
+		
+		folder = {
+			name = special_forces_doctrine_folder
+			position = { x = 1 y = 10 }
+		}
+		
+		ai_will_do = {
+			factor = 20
+		}
+		
+		ai_research_weights = {
+			#armor = 3.0
+		}
+	}
+	
+	###Marines
+	
+	special_forces_marines = {
+		doctrine_name = "MARINES_DOCTRINE"
+		
+		xp_research_type = navy
+		xp_unlock_cost = 60
+		
+		#xor = { special_forces_mountaineers special_forces_paratroopers }
+		
+		force_use_small_tech_layout = yes
+		
+		allow = { 
+			AND = {
+				has_tech = marines
+				can_unlock_new_special_forces_tree = yes
+			}
+		}
+		
+		on_research_complete = {
+			remove_potential_special_forces_tree = yes
+		}
+		
+		path = {
+			leads_to_tech = marines_jungle_troops 
+			research_cost_coeff = 1
+		}
+		
+		path = {
+			leads_to_tech = marines_shore_parties
+			research_cost_coeff = 1
+		}
+		
+		marines_special_forces_contribution_factor = -0.25
+		naval_invasion_capacity = 5
+		category_special_forces = {
+			max_organisation = 5
+			soft_attack = 0.05
+		}
+		
+		enable_subunits = {
+			pioneer_support
+		}
+		
+		doctrine = yes	
+		research_cost = 2.25
+		
+		categories = {
+			special_forces_doctrine
+			marine_tech
+			cat_marines_doctrine
+		}
+
+		
+		folder = {
+			name = special_forces_doctrine_folder
+			position = { x = 0 y = 0 }
+		}
+		
+		ai_will_do = {
+			factor = 20
+			modifier = {
+				factor = 0
+				NOT = { ai_has_completed_naval_doctrine = yes }
+			}
+		}
+		
+		ai_research_weights = {
+			#artillery = 4.0
+		}
+	}
+	
+	marines_jungle_troops = {
+		
+		xp_research_type = navy
+		xp_unlock_cost = 60
+		
+		xor = { marines_shore_parties }
+		
+		force_use_small_tech_layout = yes
+		
+		pioneer_support = {
+			jungle = {
+				attack = 0.15
+				defence = 0.10
+				movement = 0.10
+			}
+		}
+		
+		path = {
+			leads_to_tech = marines_recon 
+			research_cost_coeff = 1
+		}
+			
+		doctrine = yes	
+		research_cost = 2.25
+		
+		categories = {
+			special_forces_doctrine
+			marine_tech
+			cat_marines_doctrine
+		}
+
+		
+		folder = {
+			name = special_forces_doctrine_folder
+			position = { x = -1 y = 2 }
+		}
+		
+		ai_will_do = {
+			factor = 20
+		}
+		
+		ai_research_weights = {
+			#artillery = 4.0
+		}
+	}
+	
+	marines_shore_parties = {
+		
+		xp_research_type = navy
+		xp_unlock_cost = 60
+		
+		xor = { marines_jungle_troops }
+		
+		force_use_small_tech_layout = yes
+		
+		path = {
+			leads_to_tech = marines_recon 
+			research_cost_coeff = 1
+		}
+		
+		pioneer_support = {
+			amphibious = {
+				attack = 0.25
+				defence = 0.15
+				movement = 0.20
+			}
+		}
+		
+		doctrine = yes	
+		research_cost = 2.25
+		
+		categories = {
+			special_forces_doctrine
+			marine_tech
+			cat_marines_doctrine
+		}
+
+		
+		folder = {
+			name = special_forces_doctrine_folder
+			position = { x = 1 y = 2 }
+		}
+		
+		ai_will_do = {
+			factor = 20
+		}
+		
+		ai_research_weights = {
+			#artillery = 4.0
+		}
+	}
+	
+	marines_recon = {
+		
+		xp_research_type = navy
+		xp_unlock_cost = 60
+		
+		force_use_small_tech_layout = yes
+		
+		path = {
+			leads_to_tech = marines_commandoes 
+			research_cost_coeff = 1
+		}
+		
+		path = {
+			leads_to_tech = marines_expeditionary 
+			research_cost_coeff = 1
+		}
+		
+		unit_marine_design_cost_factor = -0.50
+
+		marine = {
+			max_organisation = 5
+		}
+			
+		doctrine = yes	
+		research_cost = 2.25
+		
+		categories = {
+			special_forces_doctrine
+			marine_tech
+			cat_marines_doctrine
+		}
+
+		
+		folder = {
+			name = special_forces_doctrine_folder
+			position = { x = 0 y = 4 }
+		}
+		
+		ai_will_do = {
+			factor = 20
+		}
+		
+		ai_research_weights = {
+			#artillery = 4.0
+		}
+	}
+	
+	marines_commandoes = {
+		
+		xp_research_type = navy
+		xp_unlock_cost = 60
+		
+		force_use_small_tech_layout = yes
+		
+		path = {
+			leads_to_tech = marines_commandos_demolition 
+			research_cost_coeff = 1
+		}
+		
+		xor = { marines_expeditionary }
+		
+		enable_subunits = {
+			marine_commando
+		}
+		
+		on_research_complete = {
+			custom_effect_tooltip = SF_MARINES_exfiltration_effect_tt
+		}
+		
+		acclimatization_cold_climate_gain_factor = 0.1
+		acclimatization_hot_climate_gain_factor = 0.1
+			
+		doctrine = yes	
+		research_cost = 2.25
+		
+		categories = {
+			special_forces_doctrine
+			marine_tech
+			cat_marines_doctrine
+		}
+
+		
+		folder = {
+			name = special_forces_doctrine_folder
+			position = { x = -1 y = 6 }
+		}
+		
+		ai_will_do = {
+			factor = 20
+		}
+		
+		ai_research_weights = {
+			#artillery = 4.0
+		}
+	}
+	
+	marines_expeditionary = {
+		
+		xp_research_type = navy
+		xp_unlock_cost = 60
+		
+		force_use_small_tech_layout = yes
+
+		path = {
+			leads_to_tech = marines_expeditionary_blowtorch 
+			research_cost_coeff = 1
+		}
+		
+		xor = { marines_commandoes }
+
+		special_forces_cap = 0.10
+		naval_invasion_planning_bonus_speed = 0.2
+		
+		army_bonus_air_superiority_factor = 0.10
+		
+		doctrine = yes	
+		research_cost = 2.25
+		
+		categories = {
+			special_forces_doctrine
+			marine_tech
+			cat_marines_doctrine
+		}
+
+		
+		folder = {
+			name = special_forces_doctrine_folder
+			position = { x = 1 y = 6 }
+		}
+		
+		ai_will_do = {
+			factor = 20
+		}
+		
+		ai_research_weights = {
+			#artillery = 4.0
+		}
+	}
+	
+	marines_commandos_demolition = {
+		
+		xp_research_type = navy
+		xp_unlock_cost = 60
+		
+		force_use_small_tech_layout = yes
+
+		path = {
+			leads_to_tech = marines_commandoes_mechanised 
+			research_cost_coeff = 1
+		}
+		
+		path = {
+			leads_to_tech = marines_commandoes_mechanised_non_mtg
+			research_cost_coeff = 1
+		}
+		
+		marine_commando = {
+			breakthrough = 0.15
+		}
+		
+		doctrine = yes	
+		research_cost = 2.25
+		
+		categories = {
+			special_forces_doctrine
+			marine_tech
+			cat_marines_doctrine
+		}
+		
+		on_research_complete = {
+			custom_effect_tooltip = SF_marine_demoliton_effect_TT
+		}
+		
+		folder = {
+			name = special_forces_doctrine_folder
+			position = { x = -1 y = 8 }
+		}
+		
+		ai_will_do = {
+			factor = 20
+		}
+		
+		ai_research_weights = {
+			#artillery = 4.0
+		}
+	}
+	
+	marines_expeditionary_blowtorch = {
+		
+		xp_research_type = navy
+		xp_unlock_cost = 60
+		
+		force_use_small_tech_layout = yes
+		
+		
+		path = {
+			leads_to_tech = marines_expeditionary_support 
+			research_cost_coeff = 1
+		}
+
+		
+		pioneer_support = {
+			battalion_mult = {
+				category = category_line_artillery
+				max_organisation = 2
+				add = yes
+			}
+		}
+		
+		shore_bombardment_bonus = 0.15
+		special_forces_attack_factor = 0.10
+			
+		doctrine = yes	
+		research_cost = 2.25
+		
+		categories = {
+			special_forces_doctrine
+			marine_tech
+			cat_marines_doctrine
+		}
+
+		
+		folder = {
+			name = special_forces_doctrine_folder
+			position = { x = 1 y = 8 }
+		}
+		
+		ai_will_do = {
+			factor = 20
+		}
+		
+		ai_research_weights = {
+			#artillery = 4.0
+		}
+	}
+	
+	marines_commandoes_mechanised = {
+		
+		xp_research_type = navy
+		xp_unlock_cost = 60
+		
+		force_use_small_tech_layout = yes
+		allow_branch = { has_dlc = "Man the Guns" }
+		
+		amphibious_mechanized = {
+			 soft_attack = 0.1
+			 breakthrough = 0.1
+			 max_organisation = 5
+		}
+		
+		pioneer_support = {
+			battalion_mult = {
+				category = category_amphibious_tanks
+				armor = 0.15
+				breakthrough = 0.15
+			}
+		}
+		
+		
+		on_research_complete = {
+			add_ideas = GEN_cheaper_amphib
+		}
+		
+		doctrine = yes	
+		research_cost = 2.25
+		
+		categories = {
+			special_forces_doctrine
+			marine_tech
+			cat_marines_doctrine
+		}
+
+		
+		folder = {
+			name = special_forces_doctrine_folder
+			position = { x = -1 y = 10 }
+		}
+		
+		ai_will_do = {
+			factor = 20
+		}
+		
+		ai_research_weights = {
+			#artillery = 4.0
+		}
+	}
+	
+	marines_commandoes_mechanised_non_mtg = {
+		
+		xp_research_type = navy
+		xp_unlock_cost = 60
+		
+		force_use_small_tech_layout = yes
+		allow_branch = { not = { has_dlc = "Man the Guns" } }
+		
+		special_forces_attack_factor = 0.15
+		
+		doctrine = yes	
+		research_cost = 2.25
+		
+		categories = {
+			special_forces_doctrine
+			marine_tech
+			cat_marines_doctrine
+		}
+
+		
+		folder = {
+			name = special_forces_doctrine_folder
+			position = { x = -1 y = 10 }
+		}
+		
+		ai_will_do = {
+			factor = 20
+		}
+		
+		ai_research_weights = {
+			#artillery = 4.0
+		}
+	}
+	
+	marines_expeditionary_support = {
+		
+		xp_research_type = navy
+		xp_unlock_cost = 60
+		
+		force_use_small_tech_layout = yes
+		
+		artillery = {
+			 battalion_mult = {
+				category = category_marines
+				defense = 0.05
+			}
+		}
+		
+		anti_air = {
+			 battalion_mult = {
+				category = category_marines
+				defense = 0.05
+			}
+		}
+		
+		anti_tank = {
+			 battalion_mult = {
+				category = category_marines
+				defense = 0.05
+			}
+		}
+
+		extra_marine_supply_grace = 24
+		naval_invasion_capacity = 10
+			
+		doctrine = yes	
+		research_cost = 2.25
+		
+		categories = {
+			special_forces_doctrine
+			marine_tech
+			cat_marines_doctrine
+		}
+
+		
+		folder = {
+			name = special_forces_doctrine_folder
+			position = { x = 1 y = 10 }
+		}
+		
+		ai_will_do = {
+			factor = 20
+		}
+		
+		ai_research_weights = {
+			#artillery = 4.0
+		}
+	}
+	
+	###Paratroopers
+	
+	special_forces_paratroopers = {
+		doctrine_name = "PARATROOPERS_DOCTRINE"
+
+		xp_research_type = air
+		xp_unlock_cost = 60
+		
+		force_use_small_tech_layout = yes
+		
+		#xor = { special_forces_mountaineers special_forces_marines } 
+	
+		paratroopers_special_forces_contribution_factor = -0.10
+		transport_plane = {
+			air_defence = 0.20
+		}
+		category_special_forces = {
+			max_organisation = 5
+			soft_attack = 0.05
+		}
+		
+		allow = { 
+			AND = {
+				has_tech = paratroopers 
+				can_unlock_new_special_forces_tree = yes
+			}
+		}
+		
+		on_research_complete = {
+			remove_potential_special_forces_tree = yes
+		}
+		
+		path = {
+			leads_to_tech = paras_dispersed_drop
+			research_cost_coeff = 1
+		}
+		
+		path = {
+			leads_to_tech = paras_combat_drop
+			research_cost_coeff = 1
+		}
+
+		doctrine = yes	
+		research_cost = 2.25
+		
+		categories = {
+			special_forces_doctrine
+			para_tech
+			cat_paratroopers_doctrine
+		}
+
+		
+		folder = {
+			name = special_forces_doctrine_folder
+			position = { x = 0 y = 0 }
+		}
+		
+		ai_will_do = {
+			factor = 20
+			modifier = {
+				factor = 0
+				NOT = { ai_has_completed_air_doctrine = yes }
+			}
+		}
+		
+		ai_research_weights = {
+			#infantry_weapons = 1.5
+			#motorized_equipment = 1.0
+		}
+	}
+	
+	paras_dispersed_drop = {
+
+		xp_research_type = air
+		xp_unlock_cost = 60
+		
+		force_use_small_tech_layout = yes
+		
+		path = {
+			leads_to_tech = paras_airborne_light_armor
+			research_cost_coeff = 1
+		}
+
+		xor = { paras_combat_drop }
+		
+		doctrine = yes	
+		research_cost = 4.5
+		
+		paratroopers_special_forces_contribution_factor = -0.10
+		
+		on_research_complete = {
+			custom_effect_tooltip = SF_PARAS_sabotage_effect_tt
+		}
+		
+		categories = {
+			special_forces_doctrine
+			para_tech
+			cat_paratroopers_doctrine
+		}
+		
+		folder = {
+			name = special_forces_doctrine_folder
+			position = { x = -1 y = 2 }
+		}
+		
+		ai_will_do = {
+			factor = 20
+		}
+		
+		ai_research_weights = {
+			#armor = 3.0
+		}
+	}
+	
+	paras_combat_drop = {
+
+		xp_research_type = air
+		xp_unlock_cost = 60
+		
+		force_use_small_tech_layout = yes
+		
+		xor = { paras_dispersed_drop }
+		
+		path = {
+			leads_to_tech = paras_airborne_light_armor
+			research_cost_coeff = 1
+		}
+		
+		doctrine = yes	
+		research_cost = 4.5
+		
+		paratroopers_special_forces_contribution_factor = -0.10
+		
+		on_research_complete = {
+			custom_effect_tooltip = SF_PARAS_combat_effect_tt
+		}
+		
+		categories = {
+			special_forces_doctrine
+			para_tech
+			cat_paratroopers_doctrine
+		}
+		
+		folder = {
+			name = special_forces_doctrine_folder
+			position = { x = 1 y = 2 }
+		}
+		
+		ai_will_do = {
+			factor = 20
+		}
+		
+		ai_research_weights = {
+			#armor = 3.0
+		}
+	}
+	
+	paras_airborne_light_armor = {
+
+		xp_research_type = air
+		xp_unlock_cost = 60
+		
+		force_use_small_tech_layout = yes
+		
+		#category_all_infantry = {
+		#	max_organisation = 15
+		#}
+		
+		path = {
+			leads_to_tech = paras_combat_1
+			research_cost_coeff = 1
+		}
+		
+		path = {
+			leads_to_tech = paras_combat_2
+			research_cost_coeff = 1
+		}
+		
+		doctrine = yes	
+		research_cost = 4.5
+		
+		enable_subunits = {
+			airborne_light_armor
+		}
+		
+		categories = {
+			special_forces_doctrine
+			para_tech
+			cat_paratroopers_doctrine
+		}
+		
+		folder = {
+			name = special_forces_doctrine_folder
+			position = { x = 0 y = 4 }
+		}
+		
+		ai_will_do = {
+			factor = 20
+		}
+		
+		ai_research_weights = {
+			#armor = 3.0
+		}
+	}
+	
+	paras_combat_1 = {
+		
+		xp_research_type = air
+		xp_unlock_cost = 60
+		
+		force_use_small_tech_layout = yes
+		
+		path = {
+			leads_to_tech = paras_bonus_1 
+			research_cost_coeff = 1
+		}
+		
+		xor = { paras_combat_2 }
+		
+		signal_company = {
+			battalion_mult = {
+				category = category_paratroopers
+				defense = 0.15
+			}
+		}
+			
+		doctrine = yes	
+		research_cost = 2.25
+		
+		categories = {
+			special_forces_doctrine
+			para_tech
+			cat_paratroopers_doctrine
+		}
+
+		
+		folder = {
+			name = special_forces_doctrine_folder
+			position = { x = -1 y = 6 }
+		}
+		
+		ai_will_do = {
+			factor = 20
+		}
+		
+		ai_research_weights = {
+			#artillery = 4.0
+		}
+	}
+	
+	paras_combat_2 = {
+		
+		xp_research_type = air
+		xp_unlock_cost = 60
+		
+		force_use_small_tech_layout = yes
+		
+		path = {
+			leads_to_tech = paras_bonus_2 
+			research_cost_coeff = 1
+		}
+		
+		field_hospital = {
+			battalion_mult = {
+				category = category_paratroopers
+				default_morale = 0.15
+			}
+		}
+		
+		xor = { paras_combat_1 }
+		
+		doctrine = yes	
+		research_cost = 2.25
+		
+		categories = {
+			special_forces_doctrine
+			para_tech
+			cat_paratroopers_doctrine
+		}
+
+		
+		folder = {
+			name = special_forces_doctrine_folder
+			position = { x = 1 y = 6 }
+		}
+		
+		ai_will_do = {
+			factor = 20
+		}
+		
+		ai_research_weights = {
+			#artillery = 4.0
+		}
+	}
+	
+	paras_bonus_1 = {
+		
+		xp_research_type = air
+		xp_unlock_cost = 60
+		
+		force_use_small_tech_layout = yes
+		
+		path = {
+			leads_to_tech = paras_keystone_1 
+			research_cost_coeff = 1
+		}
+		
+		category_paratroopers = {
+			max_organisation = 5
+			supply_consumption = -0.02
+		}
+		
+		acclimatization_hot_climate_gain_factor = 0.10
+		acclimatization_cold_climate_gain_factor = 0.10
+			
+		doctrine = yes	
+		research_cost = 2.25
+		
+		categories = {
+			special_forces_doctrine
+			para_tech
+			cat_paratroopers_doctrine
+		}
+
+		
+		folder = {
+			name = special_forces_doctrine_folder
+			position = { x = -1 y = 8 }
+		}
+		
+		ai_will_do = {
+			factor = 20
+		}
+		
+		ai_research_weights = {
+			#artillery = 4.0
+		}
+	}
+	
+	paras_bonus_2 = {
+		
+		xp_research_type = air
+		xp_unlock_cost = 60
+		
+		force_use_small_tech_layout = yes
+		
+		path = {
+			leads_to_tech = paras_keystone_2 
+			research_cost_coeff = 1
+		}
+		
+		paratrooper_weight_factor = -0.5
+		special_forces_no_supply_grace = 24
+		
+		doctrine = yes	
+		research_cost = 2.25
+		
+		categories = {
+			special_forces_doctrine
+			para_tech
+			cat_paratroopers_doctrine
+		}
+
+		
+		folder = {
+			name = special_forces_doctrine_folder
+			position = { x = 1 y = 8 }
+		}
+		
+		ai_will_do = {
+			factor = 20
+		}
+		
+		ai_research_weights = {
+			#artillery = 4.0
+		}
+	}
+	
+	paras_keystone_1 = {
+		
+		xp_research_type = air
+		xp_unlock_cost = 60
+		
+		force_use_small_tech_layout = yes
+		
+		category_paratroopers = {
+			soft_attack = 0.15
+			breakthrough = 0.15
+		}
+		
+		special_forces_training_time_factor = 0.20
+			
+		doctrine = yes	
+		research_cost = 2.25
+		
+		categories = {
+			special_forces_doctrine
+			para_tech
+			cat_paratroopers_doctrine
+		}
+
+		
+		folder = {
+			name = special_forces_doctrine_folder
+			position = { x = -1 y = 10 }
+		}
+		
+		ai_will_do = {
+			factor = 20
+		}
+		
+		ai_research_weights = {
+			#artillery = 4.0
+		}
+	}
+	
+	paras_keystone_2 = {
+		
+		xp_research_type = air
+		xp_unlock_cost = 60
+		
+		force_use_small_tech_layout = yes
+		
+		paratroopers_special_forces_contribution_factor = -0.20
+		special_forces_training_time_factor = -0.10
+		special_forces_attack_factor = 0.10
+			
+		doctrine = yes	
+		research_cost = 2.25
+		
+		categories = {
+			special_forces_doctrine
+			para_tech
+			cat_paratroopers_doctrine
+		}
+
+		
+		folder = {
+			name = special_forces_doctrine_folder
+			position = { x = 1 y = 10 }
+		}
+		
+		ai_will_do = {
+			factor = 20
+		}
+		
+		ai_research_weights = {
+			#artillery = 4.0
+		}
+	}
+	
+	racial_specforce_start = {
+		doctrine_name = "TITLE_SPECIAL_FORCES"
+		
+		# EFFECT ########
+		category_racial_special_forces = {
+            acclimatization_hot_climate_gain_factor = 0.20
+            acclimatization_cold_climate_gain_factor = 0.20
+        }
+
+        special_forces_out_of_supply_factor = -0.1
+        special_forces_no_supply_grace = 24
+
+		###########
+		
+		force_use_small_tech_layout = yes
+		
+		xp_research_type = army
+		xp_unlock_cost = 60
+		
+		#xor = { special_forces_marines special_forces_paratroopers }
+		
+		path = {
+			leads_to_tech = racial_specforce_left1
+			research_cost_coeff = 1
+		}	
+
+		path = {
+			leads_to_tech = racial_specforce_right1
+			research_cost_coeff = 1
+		}
+		
+		doctrine = yes	
+		research_cost = 2.25
+		
+		allow = {
+			
+			AND = {
+				can_unlock_new_special_forces_tree = yes
+				OR = {
+					has_tech = tech_jager
+					has_tech = tech_ironpaws
+					has_tech = tech_knights
+					has_tech = tech_kirin_vanguard
+					has_tech = tech_pegasi
+					has_tech = tech_spirit_warriors
+					has_tech = dragons_heavy
+					has_tech = tatzlwurms
+				}
+			}
+		}
+		
+		on_research_complete = {
+			remove_potential_special_forces_tree = yes
+		}
+		
+		categories = {
+			special_forces_doctrine
+			cat_racial_specforce_doctrine
+		}
+		
+		folder = {
+			name = special_forces_doctrine_folder
+			position = { x = 0 y = 0 }
+		}
+				
+		ai_will_do = {
+			factor = 10
+			modifier = {
+				factor = 0
+				NOT = { ai_has_completed_army_doctrine = yes }
+			}
+		}
+		
+		ai_research_weights = {
+			#air_doctrine = -1.0
+			#light_air = -2.0
+		}
+	}
+	
+	racial_specforce_left1 = {
+
+		xp_research_type = army
+		xp_unlock_cost = 60
+		
+		force_use_small_tech_layout = yes
+		
+		path = {
+			leads_to_tech = racial_specforce_left2
+			research_cost_coeff = 1
+		}
+
+		special_forces_cap = 0.10
+		logistics_company = {
+			battalion_mult = {
+				category = category_racial_special_forces
+				default_morale = 0.10
+				add = yes
+			}
+		}
+		
+		doctrine = yes	
+		research_cost = 4.5
+
+		categories = {
+			special_forces_doctrine
+			cat_racial_specforce_doctrine
+		}
+		
+		folder = {
+			name = special_forces_doctrine_folder
+			position = { x = -1 y = 2 }
+		}
+		
+		ai_will_do = {
+			factor = 20
+		}
+		
+		ai_research_weights = {
+			#armor = 3.0
+		}
+	}
+
+	racial_specforce_left2 = {
+
+		xp_research_type = army
+		xp_unlock_cost = 60
+		
+		force_use_small_tech_layout = yes
+		
+		path = {
+			leads_to_tech = racial_specforce_final
+			research_cost_coeff = 1
+		}
+
+		category_racial_special_forces = {
+			defense = 0.1
+		}
+		engineer = {
+			battalion_mult = {
+				category = category_racial_special_forces
+				breakthrough = 0.1
+			}
+		}
+		
+		doctrine = yes	
+		research_cost = 4.5
+
+		categories = {
+			special_forces_doctrine
+			cat_racial_specforce_doctrine
+		}
+		
+		folder = {
+			name = special_forces_doctrine_folder
+			position = { x = -1 y = 4 }
+		}
+		
+		ai_will_do = {
+			factor = 20
+		}
+		
+		ai_research_weights = {
+			#armor = 3.0
+		}
+	}
+
+	racial_specforce_right1 = {
+
+		xp_research_type = army
+		xp_unlock_cost = 60
+		
+		force_use_small_tech_layout = yes
+		
+		path = {
+			leads_to_tech = racial_specforce_right2
+			research_cost_coeff = 1
+		}
+
+		category_racial_special_forces = {
+			air_attack = 500
+		}
+		heavy_dragons = {
+			air_attack = -499
+		}
+		tatzlwurm = {
+			air_attack = -499
+		}
+		on_research_complete = {
+			custom_effect_tooltip = percentage_increase_notice
+		}
+		anti_air = {
+			battalion_mult = {
+				category = category_racial_special_forces
+				soft_attack = 0.1
+			}
+		}
+		
+		doctrine = yes	
+		research_cost = 4.5
+
+		categories = {
+			special_forces_doctrine
+			cat_racial_specforce_doctrine
+		}
+		
+		folder = {
+			name = special_forces_doctrine_folder
+			position = { x = 1 y = 2 }
+		}
+		
+		ai_will_do = {
+			factor = 20
+		}
+		
+		ai_research_weights = {
+			#armor = 3.0
+		}
+	}
+
+	racial_specforce_right2 = {
+
+		xp_research_type = army
+		xp_unlock_cost = 60
+		
+		force_use_small_tech_layout = yes
+		
+		path = {
+			leads_to_tech = racial_specforce_final
+			research_cost_coeff = 1
+		}
+
+		category_racial_special_forces = {
+			hardness = 500
+		}
+		heavy_dragons = {
+			hardness = -500
+		}
+		on_research_complete = {
+			custom_effect_tooltip = percentage_increase_notice
+		}
+		recon = {
+			battalion_mult = {
+				category = category_racial_special_forces
+				hard_attack = 0.1
+			}
+		}
+		mot_recon = {
+			battalion_mult = {
+				category = category_racial_special_forces
+				hard_attack = 0.1
+			}
+		}
+		armored_car_recon = {
+			battalion_mult = {
+				category = category_racial_special_forces
+				hard_attack = 0.1
+			}
+		}
+		light_tank_recon = {
+			battalion_mult = {
+				category = category_racial_special_forces
+				hard_attack = 0.1
+			}
+		}
+		scout_helicopter_recon = {
+			battalion_mult = {
+				category = category_racial_special_forces
+				hard_attack = 0.1
+			}
+		}
+		rangers_support = {
+			battalion_mult = {
+				category = category_racial_special_forces
+				hard_attack = 0.1
+			}
+		}
+		long_range_patrol_support = {
+			battalion_mult = {
+				category = category_racial_special_forces
+				hard_attack = 0.1
+			}
+		}
+
+		
+		doctrine = yes	
+		research_cost = 4.5
+
+		categories = {
+			special_forces_doctrine
+			cat_racial_specforce_doctrine
+		}
+		
+		folder = {
+			name = special_forces_doctrine_folder
+			position = { x = 1 y = 4 }
+		}
+		
+		ai_will_do = {
+			factor = 20
+		}
+		
+		ai_research_weights = {
+			#armor = 3.0
+		}
+	}
+
+	racial_specforce_final = {
+
+		xp_research_type = army
+		xp_unlock_cost = 60
+		
+		force_use_small_tech_layout = yes
+		
+
+		category_racial_special_forces = {
+			max_organisation = 5
+            supply_consumption = -0.02
+        }
+		signal_company = {
+			battalion_mult = {
+				category = category_racial_special_forces
+				breakthrough = 0.15
+			}
+		}
+		
+		doctrine = yes	
+		research_cost = 4.5
+
+		categories = {
+			special_forces_doctrine
+			cat_racial_specforce_doctrine
+		}
+		
+		folder = {
+			name = special_forces_doctrine_folder
+			position = { x = 0 y = 6 }
+		}
+		
+		ai_will_do = {
+			factor = 20
+		}
+		
+		ai_research_weights = {
+			#armor = 3.0
+		}
+	}
+	
+}
diff --git a/common/technologies/support.txt b/common/technologies/support.txt
index 13c27da164b..4aab4143592 100644
--- a/common/technologies/support.txt
+++ b/common/technologies/support.txt
@@ -122,7 +122,7 @@ technologies = {
 			research_cost_coeff = 1
 		}
 
-		research_cost = 1
+		research_cost = 1.25
 		start_year = 1007
 		folder = {
 			name = support_folder
@@ -172,8 +172,12 @@ technologies = {
 	tech_engineers2 = {
 
 		engineer = {
-			entrenchment  = 2
-
+			entrenchment = 1
+			battalion_mult = {
+				category = category_light_infantry
+				entrenchment = 0.10
+				add = yes
+			}
 			fort = {
 				defence = 0.10
 				attack = 0.10
@@ -233,7 +237,17 @@ technologies = {
 	tech_engineers3 = {
 
 		engineer = {
-			entrenchment = 2
+			entrenchment = 1
+			battalion_mult = {
+				category = category_light_infantry
+				entrenchment = 0.10
+				add = yes
+			}
+			battalion_mult = {
+				category = category_light_infantry
+				entrenchment = 0.10
+				add = yes
+			}
 			river = {
 				attack = 0.1
 				defence = 0.10
@@ -284,7 +298,7 @@ technologies = {
 			research_cost_coeff = 1
 		}
 
-		research_cost = 1.5
+		research_cost = 2
 		start_year = 1013
 		folder = {
 			name = support_folder
@@ -320,7 +334,12 @@ technologies = {
 	tech_engineers4 = {
 
 		engineer = {
-			entrenchment = 2
+			entrenchment = 1
+			battalion_mult = {
+				category = category_light_infantry
+				entrenchment = 0.10
+				add = yes
+			}
 			urban = {
 				attack = 0.1
 				defence = 0.1
@@ -370,7 +389,7 @@ technologies = {
 				attack = 0.10
 			}
 		}
-		research_cost = 1.5
+		research_cost = 2
 		start_year = 1016
 		folder = {
 			name = support_folder
@@ -418,7 +437,7 @@ technologies = {
 			research_cost_coeff = 1
 		}
 
-		research_cost = 1
+		research_cost = 1.25
 		start_year = 1007
 		folder = {
 			name = support_folder
@@ -517,7 +536,7 @@ technologies = {
 			research_cost_coeff = 1
 		}
 
-		research_cost = 1.5
+		research_cost = 2
 		start_year = 1013
 		folder = {
 			name = support_folder
@@ -564,7 +583,7 @@ technologies = {
 			research_cost_coeff = 1
 		}
 
-		research_cost = 1.5
+		research_cost = 2
 		start_year = 1016
 		folder = {
 			name = support_folder
@@ -610,7 +629,7 @@ technologies = {
 			research_cost_coeff = 1
 		}
 
-		research_cost = 1
+		research_cost = 1.25
 		start_year = 1007
 		folder = {
 			name = support_folder
@@ -704,7 +723,7 @@ technologies = {
 			research_cost_coeff = 1
 		}
 
-		research_cost = 1.5
+		research_cost = 2
 		start_year = 1013
 		folder = {
 			name = support_folder
@@ -744,7 +763,7 @@ technologies = {
 			research_cost_coeff = 1
 		}
 
-		research_cost = 1.5
+		research_cost = 2
 		start_year = 1016
 		folder = {
 			name = support_folder
@@ -799,7 +818,7 @@ technologies = {
 			research_cost_coeff = 1
 		}
 
-		research_cost = 1
+		research_cost = 1.25
 		start_year = 1007
 		folder = {
 			name = support_folder
@@ -894,14 +913,18 @@ technologies = {
 
 		maintenance_company = {
 			reliability_factor = 0.05
-			equipment_capture_factor = 0.05
+			battalion_mult = {
+				category = category_all_armor
+				equipment_capture_factor = 0.01
+				add = yes
+			}
 		}
 		path = {
 			leads_to_tech = tech_maintenance_company4
 			research_cost_coeff = 1
 		}
 
-		research_cost = 1.5
+		research_cost = 2
 		start_year = 1013
 		folder = {
 			name = support_folder
@@ -953,7 +976,7 @@ technologies = {
 			research_cost_coeff = 1
 		}
 
-		research_cost = 1.5
+		research_cost = 2
 		start_year = 1016
 		folder = {
 			name = support_folder
@@ -1012,7 +1035,7 @@ technologies = {
 				has_tech = undead_race
 			}
 		}
-		research_cost = 1
+		research_cost = 1.25
 		start_year = 1007
 		folder = {
 			name = support_folder
@@ -1023,6 +1046,7 @@ technologies = {
 			support_tech
 			hospital_tech
 			motorized_equipment
+			mio_cat_tech_all_motorized_mechanized
 		}
 
 		ai_will_do = {
@@ -1073,6 +1097,7 @@ technologies = {
 			support_tech
 			hospital_tech
 			motorized_equipment
+			mio_cat_tech_all_motorized_mechanized
 		}
 
 		ai_will_do = {
@@ -1105,7 +1130,7 @@ technologies = {
 			research_cost_coeff = 1
 		}
 
-		research_cost = 1.5
+		research_cost = 2
 		start_year = 1013
 		folder = {
 			name = support_folder
@@ -1116,6 +1141,7 @@ technologies = {
 			support_tech
 			hospital_tech
 			motorized_equipment
+			mio_cat_tech_all_motorized_mechanized
 		}
 
 		ai_will_do = {
@@ -1151,7 +1177,7 @@ technologies = {
 			research_cost_coeff = 1
 		}
 
-		research_cost = 1.5
+		research_cost = 2
 		start_year = 1016
 		folder = {
 			name = support_folder
@@ -1162,6 +1188,7 @@ technologies = {
 			support_tech
 			hospital_tech
 			motorized_equipment
+			mio_cat_tech_all_motorized_mechanized
 		}
 
 		ai_will_do = {
@@ -1192,6 +1219,14 @@ technologies = {
 			experience_loss_factor = -0.3
 		}
 	}
+	NORDIC_supportCollaboration_tech = { # For the Army Capston in the Nordic JFT
+		allow = { always = no } #Only obtained through Focus
+		category_support_battalions = {
+			max_organisation = 10
+			soft_attack = 0.25
+			experience_loss_factor = 0.05
+		}
+	}
 
 	###------> X <><> <><> <><> <><> <><>
 
@@ -1210,7 +1245,7 @@ technologies = {
 			motorised_infantry = 1
 		}
 
-		research_cost = 1
+		research_cost = 1.25
 		start_year = 1007
 		folder = {
 			name = support_folder
@@ -1221,6 +1256,7 @@ technologies = {
 			support_tech
 			logistics_tech
 			motorized_equipment
+			mio_cat_tech_all_motorized_mechanized
 		}
 
 		ai_will_do = {
@@ -1274,6 +1310,7 @@ technologies = {
 			support_tech
 			logistics_tech
 			motorized_equipment
+			mio_cat_tech_all_motorized_mechanized
 		}
 
 		ai_will_do = {
@@ -1306,7 +1343,7 @@ technologies = {
 			research_cost_coeff = 1
 		}
 
-		research_cost = 1.5
+		research_cost = 2
 		start_year = 1013
 		folder = {
 			name = support_folder
@@ -1317,6 +1354,7 @@ technologies = {
 			support_tech
 			logistics_tech
 			motorized_equipment
+			mio_cat_tech_all_motorized_mechanized
 		}
 
 		ai_will_do = {
@@ -1355,7 +1393,7 @@ technologies = {
 			research_cost_coeff = 1
 		}
 
-		research_cost = 1.5
+		research_cost = 2
 		start_year = 1016
 		folder = {
 			name = support_folder
@@ -1366,6 +1404,7 @@ technologies = {
 			support_tech
 			logistics_tech
 			motorized_equipment
+			mio_cat_tech_all_motorized_mechanized
 		}
 
 		ai_will_do = {
@@ -1407,7 +1446,7 @@ technologies = {
 			motorised_infantry = 1
 		}
 
-		research_cost = 1.5
+		research_cost = 1.25
 		start_year = 1007
 		folder = {
 			name = support_folder
@@ -1505,7 +1544,7 @@ technologies = {
 			research_cost_coeff = 1
 		}
 
-		research_cost = 1.5
+		research_cost = 2
 		start_year = 1013
 		folder = {
 			name = support_folder
@@ -1556,7 +1595,7 @@ technologies = {
 			research_cost_coeff = 1
 		}
 
-		research_cost = 1.5
+		research_cost = 2
 		start_year = 1016
 		folder = {
 			name = support_folder
@@ -1609,7 +1648,7 @@ technologies = {
 			research_cost_coeff = 1
 		}
 
-		research_cost = 1.5
+		research_cost = 2
 		start_year = 1019
 		folder = {
 			name = support_folder
@@ -1642,7 +1681,7 @@ technologies = {
 			research_cost_coeff = 1
 		}
 
-		research_cost = 1.5
+		research_cost = 2
 		start_year = 1022
 		folder = {
 			name = support_folder
@@ -1670,7 +1709,7 @@ technologies = {
 			initiative = 0.12
 		}
 
-		research_cost = 1.5
+		research_cost = 2
 		start_year = 1025
 		folder = {
 			name = support_folder
@@ -1699,7 +1738,12 @@ technologies = {
 	tech_engineers_a = {
 
 		engineer = {
-			entrenchment = 2
+			entrenchment = 1
+			battalion_mult = {
+				category = category_light_infantry
+				entrenchment = 0.10
+				add = yes
+			}
 			mountain = {
 				attack = 0.1
 				defence = 0.1
@@ -1754,7 +1798,7 @@ technologies = {
 			research_cost_coeff = 1
 		}
 
-		research_cost = 1.5
+		research_cost = 2
 		start_year = 1019
 		folder = {
 			name = support_folder
@@ -1775,7 +1819,12 @@ technologies = {
 	tech_engineers_b = {
 
 		engineer = {
-			entrenchment = 2
+			entrenchment = 1
+			battalion_mult = {
+				category = category_light_infantry
+				entrenchment = 0.10
+				add = yes
+			}
 			marsh = {
 				attack = 0.1
 				defence = 0.1
@@ -1828,7 +1877,7 @@ technologies = {
 			research_cost_coeff = 1
 		}
 
-		research_cost = 1.5
+		research_cost = 2
 		start_year = 1022
 		folder = {
 			name = support_folder
@@ -1848,7 +1897,12 @@ technologies = {
 	tech_engineers_c = {
 
 		engineer = {
-			entrenchment = 2
+			entrenchment = 1
+			battalion_mult = {
+				category = category_light_infantry
+				entrenchment = 0.10
+				add = yes
+			}
 			jungle = {
 				attack = 0.1
 				defence = 0.1
@@ -1895,7 +1949,7 @@ technologies = {
 			}
 		}
 
-		research_cost = 1.5
+		research_cost =2
 		start_year = 1025
 		folder = {
 			name = support_folder
@@ -1927,7 +1981,7 @@ technologies = {
 			research_cost_coeff = 1
 		}
 
-		research_cost = 1.5
+		research_cost = 2
 		start_year = 1019
 		folder = {
 			name = support_folder
@@ -1957,7 +2011,7 @@ technologies = {
 			research_cost_coeff = 1
 		}
 
-		research_cost = 1.5
+		research_cost = 2
 		start_year = 1022
 		folder = {
 			name = support_folder
@@ -1980,7 +2034,7 @@ technologies = {
 			recon = 2
 		}
 
-		research_cost = 1.5
+		research_cost = 2
 		start_year = 1025
 		folder = {
 			name = support_folder
@@ -2014,7 +2068,7 @@ technologies = {
 			research_cost_coeff = 1
 		}
 
-		research_cost = 1.5
+		research_cost = 2
 		start_year = 1019
 		folder = {
 			name = support_folder
@@ -2052,7 +2106,7 @@ technologies = {
 			research_cost_coeff = 1
 		}
 
-		research_cost = 1.5
+		research_cost = 2
 		start_year = 1022
 		folder = {
 			name = support_folder
@@ -2085,7 +2139,7 @@ technologies = {
 			suppression_factor = 0.1
 		}
 
-		research_cost = 1.5
+		research_cost = 2
 		start_year = 1025
 		folder = {
 			name = support_folder
@@ -2122,13 +2176,16 @@ technologies = {
 			reliability_factor = 0.05
 			equipment_capture_factor = 0.05
 		}
+		enable_equipment_modules = {
+			easy_maintenance_2
+		}
 
 		path = {
 			leads_to_tech = tech_maintenance_company_b
 			research_cost_coeff = 1
 		}
 
-		research_cost = 1.5
+		research_cost = 2
 		start_year = 1019
 		folder = {
 			name = support_folder
@@ -2161,7 +2218,7 @@ technologies = {
 			research_cost_coeff = 1
 		}
 
-		research_cost = 1.5
+		research_cost = 2
 		start_year = 1022
 		folder = {
 			name = support_folder
@@ -2189,7 +2246,7 @@ technologies = {
 			equipment_capture_factor = 0.05
 		}
 
-		research_cost = 1.5
+		research_cost = 2
 		start_year = 1025
 		folder = {
 			name = support_folder
@@ -2225,7 +2282,7 @@ technologies = {
 			research_cost_coeff = 1
 		}
 
-		research_cost = 1.5
+		research_cost = 2
 		start_year = 1019
 		folder = {
 			name = support_folder
@@ -2236,6 +2293,7 @@ technologies = {
 			support_tech
 			hospital_tech
 			motorized_equipment
+			mio_cat_tech_all_motorized_mechanized
 		}
 
 		ai_will_do = {
@@ -2256,7 +2314,7 @@ technologies = {
 			research_cost_coeff = 1
 		}
 
-		research_cost = 1.5
+		research_cost = 2
 		start_year = 1022
 		folder = {
 			name = support_folder
@@ -2268,6 +2326,7 @@ technologies = {
 			support_tech
 			hospital_tech
 			motorized_equipment
+			mio_cat_tech_all_motorized_mechanized
 		}
 
 		ai_will_do = {
@@ -2282,7 +2341,7 @@ technologies = {
 			experience_loss_factor = -0.06
 		}
 
-		research_cost = 1.5
+		research_cost = 2
 		start_year = 1025
 		folder = {
 			name = support_folder
@@ -2293,6 +2352,7 @@ technologies = {
 			support_tech
 			hospital_tech
 			motorized_equipment
+			mio_cat_tech_all_motorized_mechanized
 		}
 
 		ai_will_do = {
@@ -2316,7 +2376,7 @@ technologies = {
 			research_cost_coeff = 1
 		}
 
-		research_cost = 1.5
+		research_cost = 2
 		start_year = 1019
 		folder = {
 			name = support_folder
@@ -2327,6 +2387,7 @@ technologies = {
 			support_tech
 			logistics_tech
 			motorized_equipment
+			mio_cat_tech_all_motorized_mechanized
 		}
 
 		ai_will_do = {
@@ -2347,7 +2408,7 @@ technologies = {
 			research_cost_coeff = 1
 		}
 
-		research_cost = 1.5
+		research_cost = 2
 		start_year = 1022
 		folder = {
 			name = support_folder
@@ -2359,6 +2420,7 @@ technologies = {
 			support_tech
 			logistics_tech
 			motorized_equipment
+			mio_cat_tech_all_motorized_mechanized
 		}
 
 		ai_will_do = {
@@ -2373,7 +2435,7 @@ technologies = {
 			fuel_consumption_factor = -0.03
 		}
 
-		research_cost = 1.5
+		research_cost = 2
 		start_year = 1025
 		folder = {
 			name = support_folder
@@ -2384,6 +2446,7 @@ technologies = {
 			support_tech
 			logistics_tech
 			motorized_equipment
+			mio_cat_tech_all_motorized_mechanized
 		}
 
 		ai_will_do = {
diff --git a/common/technology_tags/00_technology.txt b/common/technology_tags/00_technology.txt
index 4fb10f8a596..d52c0236c94 100644
--- a/common/technology_tags/00_technology.txt
+++ b/common/technology_tags/00_technology.txt
@@ -103,6 +103,30 @@ technology_categories = {
 	cat_air_guns
 	cat_air_engine
 	cat_air_bombs
+	special_forces_doctrine
+	cat_maritime_patrol
+	cat_mountaineers_doctrine
+	cat_marines_doctrine
+	cat_paratroopers_doctrine
+	
+	mio_cat_tech_all_armor_and_modules #Includes modules and chassis (DOES NOT INCLUDE ARMORED CARS)
+	mio_cat_tech_light_armor_and_modules #Includes modules and stand-alone Amphibious Chassis
+	mio_cat_tech_medium_armor_and_modules #Includes modules and Modern Tank
+	mio_cat_tech_heavy_armor_and_modules #Includes modules and Super-Heavy Tank
+	mio_cat_all_artillery_equipment #Includes Artillery, AT, AA and Rocket Artillery
+	mio_cat_all_light_fighter_and_modules #Includes fighter-related modules and CV Fighter
+	mio_cat_all_cas_and_modules #Includes CAS-related modules and CV CAS
+	mio_cat_all_naval_bomber_and_modules #Includes naval bomber-related modules and CV Naval Bomber
+	mio_cat_all_light_aircraft_and_modules #Includes all fighter, CAS and naval bomber -related modules. (DOES NOT INCLUDE CV AIRCRAFT)
+	mio_cat_all_medium_aircraft_and_modules #Includes all modules
+	mio_cat_all_heavy_aircraft_and_modules #Includes strategic bomber and maritime patrol -related modules
+	mio_cat_tech_all_capital_ship_and_modules #Includes all BB (+ BC, SHBB, etc.), all CA (+ Coastal etc.) and all related modules
+	mio_cat_tech_all_screen_ship_and_modules #Includes all DD, all CL (Torpedo Cruiser) and all related modules
+	mio_cat_tech_all_submarine_and_modules #Includes all SS (Cruiser Sub and Midget Sub) and all related modules
+	mio_cat_tech_all_carrier_and_modules #Includes CV and all related modules
+	mio_cat_tech_all_cruiser_and_modules #Includes all CA (+ Coastal etc.), CL (Torpedo Cruiser) and all related modules
+	mio_cat_tech_all_destroyer_and_modules #Includes all DD and all related modules
+	mio_cat_tech_all_motorized_mechanized #Includes all Motorized (incl. Motorized Rocket Artillery) and Mechanized Equipment. (DOES NOT INCLUDE ARMORED CARS)
 }
 
 technology_folders = {
@@ -172,6 +196,13 @@ technology_folders = {
 		ledger = air
 		doctrine = yes
 	}
+	special_forces_doctrine_folder = {
+		available = {
+			has_dlc = "Arms Against Tyranny"
+		}
+		ledger = hidden #For now
+		doctrine = yes
+	}
 	electronics_folder = {
 		ledger = civilian
 	}
diff --git a/common/technology_tags/eaw_technology.txt b/common/technology_tags/eaw_technology.txt
index 055914ddf6d..1a2c9eb332a 100644
--- a/common/technology_tags/eaw_technology.txt
+++ b/common/technology_tags/eaw_technology.txt
@@ -31,6 +31,7 @@ technology_categories = {
 	helicopter_tech
 	land_doctrine_gbp_infiltration_branch
 	armor_art
+	cat_racial_specforce_doctrine
 	naval_weaponry
 	torpedo_tech
 	naval_training
diff --git a/common/terrain/00_terrain.txt b/common/terrain/00_terrain.txt
index e9d41cb687f..25f371b90e6 100755
--- a/common/terrain/00_terrain.txt
+++ b/common/terrain/00_terrain.txt
@@ -10,6 +10,7 @@ categories =  {
 	}
 
 	ocean = {
+		naval_terrain = yes
 		color = { 40 83 176 }
 		movement_cost = 1.0
 		is_water = yes
@@ -27,8 +28,8 @@ categories =  {
 		color = { 89 199 85 }
 		movement_cost = 1.5
 		#combat_width = -0.20
-		combat_width = 84
-		combat_support_width = 42
+		combat_width = 60
+		combat_support_width = 30
 		ai_terrain_importance_factor = 5.0
 		match_value = 5
 		sound_type = forest
@@ -49,8 +50,8 @@ categories =  {
 		color = { 248 255 153 }
 		movement_cost = 1.5
 		#combat_width = -0.33
-		combat_width = 80
-		combat_support_width = 40
+		combat_width = 70
+		combat_support_width = 35
 		ai_terrain_importance_factor = 3.0
 		match_value = 2
 		sound_type = desert
@@ -71,7 +72,7 @@ categories =  {
 		movement_cost = 2.0
 		attrition = 0.3
 		#combat_width = -0.66
-		combat_width = 75
+		combat_width = 50
 		combat_support_width = 25
 		ai_terrain_importance_factor = 10.0
 		match_value = 10
@@ -93,8 +94,8 @@ categories =  {
 		color = { 255 129 66 }
 		movement_cost = 1.0
 		ai_terrain_importance_factor = 0.1
-		combat_width = 90
-		combat_support_width = 45
+		combat_width = 70
+		combat_support_width = 35
 		match_value = 0.5
 		sound_type = plains
 	}
@@ -103,8 +104,8 @@ categories =  {
 		color = { 120 120 120 }
 		movement_cost = 1.2
 		ai_terrain_importance_factor = 4.0
-		combat_width = 96
-		combat_support_width = 32
+		combat_width = 80
+		combat_support_width = 40
 		match_value = 4
 		sound_type = plains
 
@@ -123,8 +124,8 @@ categories =  {
 		movement_cost = 1.5
 		attrition = 0.2
 		# combat_width = -0.25
-		combat_width = 84
-		combat_support_width = 42
+		combat_width = 60
+		combat_support_width = 30
 
 		ai_terrain_importance_factor = 6.0
 		match_value = 6
@@ -149,8 +150,8 @@ categories =  {
 		movement_cost = 2.0
 		attrition = 0.35
 		# combat_width = -0.25
-		combat_width = 78
-		combat_support_width = 26
+		combat_width = 50
+		combat_support_width = 25
 		ai_terrain_importance_factor = 8.0
 		match_value = 8
 		sound_type = forest
diff --git a/common/unit_leader/00_traits.txt b/common/unit_leader/00_traits.txt
index e156ead79dd..2b1c7983d6b 100644
--- a/common/unit_leader/00_traits.txt
+++ b/common/unit_leader/00_traits.txt
@@ -20,10 +20,14 @@
 #	custom_prerequisite_tooltip = "" # loc key
 #	custom_gain_xp_trigger_tooltip = "" # loc key
 #	mutually_exclusive = other_trait # trait key
-#	parent = other_trait # trait key
-#	num_parents_needed = -1 # integer, -1 means "all"
-#	gui_row = -1 # integer, starts at 0, -1 means auto
-#	gui_column = -1 # integer, starts at 0, -1 means auto
+#	parent = { # Can be added multiple times
+#	    traits = {XXX YYY ZZZ}  # A list of other traits that
+#       num_parents_needed = 1 # The number of the above traits that must be true
+#   }
+#   any_parent = { XXX YYY ZZZ } # shorthand for parent when num_parents_needed are defaulted to 1
+#   all_parents = { XXX YYY ZZZ } # shorthand for parent when num_parents_needed are the same as the number of parents
+#	gui_row = 0 # integer, starts at 0, unset or -1 means the trait does not appear in unlockable trait tree.
+#	gui_column = 0 # integer, starts at 0, unset or -1 means auto
 #	allowed = trigger # scope is a unit leader
 #	prerequisites = trigger # scope is an unit leader
 #	gain_xp = trigger # scope is a combatant
@@ -52,18 +56,18 @@
 #}
 leader_traits = {
 
-
-	##################################
-	# Common Traits
-	##################################
-	old_guard = {
+	
+##################################
+# Common Traits
+##################################
+	old_guard = { 
 		type = land
 		trait_type = personality_trait
 		
 		modifier = {
 			max_dig_in = 1
 		}
-
+		
 		non_shared_modifier = {
 			experience_gain_factor = -0.25
 		}
@@ -80,16 +84,17 @@ leader_traits = {
 				factor = 0
 			}
 		}
+		
 	}
-
-
-	brilliant_strategist = {
+	
+	
+	brilliant_strategist = { 
 		type = land
 		trait_type = personality_trait
-
+		
 		attack_skill = 1
 		planning_skill = 1
-
+		
 		attack_skill_factor = 1
 		planning_skill_factor = 1
 
@@ -105,16 +110,17 @@ leader_traits = {
 				factor = 0
 			}
 		}
+		
 	}
-
-
-	inflexible_strategist = {
+	
+	
+	inflexible_strategist = { 
 		type = land
 		trait_type = personality_trait
-
+		
 		defense_skill = 1
 		logistics_skill = 1
-
+		
 		defense_skill_factor = 1
 		logistics_skill_factor = 1
 
@@ -132,11 +138,11 @@ leader_traits = {
 			}
 		}
 	}
-
-	politically_connected = {
+	
+	politically_connected = { 
 		type = land
 		trait_type = personality_trait
-
+		
 		non_shared_modifier = {
 			experience_gain_factor = -0.1
 			promote_cost_factor = -0.5
@@ -164,38 +170,37 @@ leader_traits = {
 				factor = 0
 			}
 		}
-
+		
 		planning_skill_factor = 1
 		logistics_skill_factor = 1
 	}
-
-	war_hero = {
+	
+	war_hero = { 
 		type = { land navy }
 		trait_type = personality_trait
-
-		non_shared_modifier = {
+		
+		non_shared_modifier = { # WARNING! Changing the value of these modifiers requires changing them also in the tooltip ITA_heroes_of_the_nation_general_traits_tt
 			promote_cost_factor = -0.5
 			reassignment_duration_factor = 0.5   # +50% cost to replace leader
 		}
-
+		
 		new_commander_weight = {
 			factor = 0  # Scripted starting leaders only
 		}
 		attack_skill_factor = 1
 		planning_skill_factor = 1
 	}
-
-	career_officer = {
+	
+	career_officer = { 
 		type = land
 		trait_type = personality_trait
-
+		
 		non_shared_modifier = {
 			promote_cost_factor = -0.25
 		}
-		
+
 		new_commander_weight = {
 			factor = 1
-
 			modifier = {
 				factor = 3
 				owner = { tag = NIM }
@@ -209,20 +214,21 @@ leader_traits = {
 				factor = 0
 			}
 		}
+		
 		planning_skill_factor = 1
 		logistics_skill_factor = 1
 	}
 
-	trait_cautious = {
+	trait_cautious = { 
 		type = land
 		trait_type = personality_trait
-
+		
 		modifier = {
 			planning_speed = -0.20
 			wounded_chance_factor = -0.5
 		}
-
-
+		
+		
 		new_commander_weight = {
 			factor = 1
 			
@@ -239,21 +245,21 @@ leader_traits = {
 				factor = 0
 			}
 		}
-
-
+		
+		
 		defense_skill_factor = 1
 		logistics_skill_factor = 1
 	}
 
-	trait_reckless = {
+	trait_reckless = { 
 		type = land
 		trait_type = personality_trait
-
+		
 		modifier = {
 			planning_speed = 0.20
 			wounded_chance_factor = 0.5  # +50% chance to get wounded
 		}
-
+		
 		new_commander_weight = {
 			factor = 1
 			
@@ -270,20 +276,20 @@ leader_traits = {
 				factor = 0
 			}
 		}
-
+		
 		attack_skill_factor = 1
 		defense_skill_factor = -1
 		planning_skill_factor = 1
 	}
 
-	media_personality = {
+	media_personality = { 
 		type = land
 		trait_type = personality_trait
-
+		
 		non_shared_modifier = {
 			reassignment_duration_factor = 1   # +100% cost to replace leader
 		}
-
+		
 		attack_skill_factor = 1
 		defense_skill_factor = 1
 
@@ -301,10 +307,10 @@ leader_traits = {
 		}
 	}
 
-	harsh_leader = {
+	harsh_leader = { 
 		type = land
 		trait_type = personality_trait
-
+		
 		attack_skill = 1
 
 		modifier = {
@@ -323,20 +329,20 @@ leader_traits = {
 				factor = 0
 			}
 		}
-
+		
 		attack_skill_factor = 1
 		logistics_skill_factor = 1
 	}
 
-	bearer_of_artillery = {
+	bearer_of_artillery = { # Reserved for Wojtek  
 		type = corps_commander
-
+		
 		trait_type = personality_trait
-
+		
 		modifier = {
 			army_artillery_attack_factor = 0.15
 		}
-
+		
 		new_commander_weight = {
 			factor = 0
 			modifier = {
@@ -345,11 +351,11 @@ leader_traits = {
 			}
 		}
 	}
-
-	infantry_officer = {
+	
+	infantry_officer = { 
 		type = land
-		trait_type = personality_trait
-
+		trait_type = personality_trait 
+		
 		unit_trigger = {
 			OR = {
 				division_has_majority_template = infantry
@@ -383,15 +389,18 @@ leader_traits = {
 				}
 			}
 		}
+		
 		trait_xp_factor = {
 			infantry_leader = 1     #+100%
 		}
-
+		
 		new_commander_weight = {
 			factor = 1
 			
 			modifier = {
-				FROM = { has_idea = mass_assault_academy_spirit }
+				FROM = { 
+					has_idea = mass_assault_academy_spirit
+				}
 				factor = 2
 			}
 			
@@ -403,18 +412,20 @@ leader_traits = {
 				FROM = { has_idea = academy_scholarships_spirit }
 				factor = 0
 			}
+			
 			modifier = {
 				FROM = { 
 					has_dlc = "By Blood Alone"
 				}
 				factor = 0
 			}
-		}		
+			
+		}
 		defense_skill_factor = 1
 		planning_skill_factor = 1
 	}
-
-	cavalry_officer = {
+	
+	cavalry_officer = { 
 		type = land
 		trait_type = personality_trait
 		unit_type = {
@@ -438,13 +449,14 @@ leader_traits = {
 				}
 			}
 		}
+		
 		trait_xp_factor = {
 			cavalry_leader = 1     #+100%
 		}
 
 		new_commander_weight = {
 			factor = 1
-
+			
 			modifier = {
 				FROM = { has_idea = best_of_the_best_spirit }
 				factor = 0
@@ -453,20 +465,28 @@ leader_traits = {
 				FROM = { has_idea = academy_scholarships_spirit }
 				factor = 0
 			}
+			
 			modifier = {
 				FROM = { 
 					has_dlc = "By Blood Alone"
 				}
 				factor = 0
 			}
+			
 		}
+		
 		attack_skill_factor = 1
 		logistics_skill_factor = 1
 	}
-
+	
 	armor_officer = { 
 		type = land
 		trait_type = personality_trait
+		
+		trait_xp_factor = {
+			panzer_leader = 1     #+100%
+		}
+		
 		unit_trigger = {
 			OR = {
 				division_has_majority_template = light_armor
@@ -489,17 +509,17 @@ leader_traits = {
 				}
 			}
 		}
-		trait_xp_factor = {
-			panzer_leader = 1     #+100%
-		}
+		
 		new_commander_weight = {
 			factor = 1
 			
 			modifier = {
-				FROM = { has_idea = mobile_warfare_academy_spirit }
+				FROM = { 
+					has_idea = mobile_warfare_academy_spirit
+				}
 				factor = 2
 			}
-
+			
 			modifier = {
 				FROM = { has_idea = best_of_the_best_spirit }
 				factor = 0
@@ -508,12 +528,14 @@ leader_traits = {
 				FROM = { has_idea = academy_scholarships_spirit }
 				factor = 0
 			}
+
 			modifier = {
 				FROM = { 
 					has_dlc = "By Blood Alone"
 				}
 				factor = 0
 			}
+			
 		}
 		attack_skill_factor = 1
 		planning_skill_factor = 1
@@ -526,6 +548,7 @@ leader_traits = {
 		trait_xp_factor = {
 			trait_engineer = 1     #+100%
 		}
+		
 		unit_trigger = {
 			OR = {
 				division_has_battalion_in_template = engineer
@@ -547,6 +570,7 @@ leader_traits = {
 				}
 			}
 		}
+		
 		new_commander_weight = {
 			factor = 1
 			
@@ -563,12 +587,12 @@ leader_traits = {
 				FROM = { has_idea = academy_scholarships_spirit }
 				factor = 0
 			}
+			
 			modifier = {
-				FROM = { 
-					has_dlc = "By Blood Alone"
-				}
+				FROM = { has_dlc = "By Blood Alone" }
 				factor = 0
 			}
+			
 		}
 		attack_skill_factor = 1
 		planning_skill_factor = 1
@@ -603,12 +627,6 @@ leader_traits = {
 
 		new_commander_weight = {
 			base = 0.5
-			modifier = {
-				FROM = { 
-					has_dlc = "By Blood Alone"
-				}
-				factor = 0
-			}
 		}
 
 		attack_skill_factor = 1
@@ -620,6 +638,12 @@ leader_traits = {
 
 	# 	trait_type = personality_trait
 
+	# 	allowed = {
+	# 		FROM = {
+	# 			original_tag = ITA
+	# 		}
+	# 	}
+
 	# 	unit_type = {
 	# 		type = infantry
 	# 	}
@@ -627,6 +651,7 @@ leader_traits = {
 	# 	unit_trigger = {
 	# 		division_has_majority_template = infantry
 	# 		owner = {
+	# 			original_tag = ITA
 	# 			NOT = {
 	# 				OR = {
 	# 					has_idea = best_of_the_best_spirit
@@ -638,6 +663,8 @@ leader_traits = {
 		
 	# 	modifier = {
 	# 		modifier_army_sub_unit_infantry_defence_factor = 0.05
+	# 		modifier_army_sub_unit_cavalry_defence_factor = 0.05
+	# 		modifier_army_sub_unit_camelry_defence_factor = 0.05
 	# 		desert = {
 	# 			defence = 0.05
 	# 		}
@@ -645,17 +672,36 @@ leader_traits = {
 
 	# 	new_commander_weight = {
 	# 		base = 0
+	# 		modifier = {
+	# 			add = 0.5
+	# 			FROM = { #Looks like the allowed parameter is doing NOTHING :D 
+	# 				original_tag = ITA
+	# 			}
+	# 		}
+	# 		modifier = { #ITALY
+	# 			factor = 2
+	# 			FROM = {
+	# 				has_completed_focus = ITA_strengthen_ascari_corps
+	# 			}
+	# 		}
+	# 		modifier = { #ITALY
+	# 			factor = 2
+	# 			FROM = {
+	# 				has_completed_focus = ITA_novus_ordo
+	# 			}
+	# 		}
 	# 	}
 
 	# 	defense_skill_factor = 1
 	# 	logistics_skill_factor = 1
 	# }
 
-	militias_officer = {
+	militias_officer = { 
 		type = corps_commander
 
 		trait_type = personality_trait
 
+
 		unit_type = {
 			type = militia
 		}
@@ -686,19 +732,55 @@ leader_traits = {
 		planning_skill_factor = 1
 	}
 
-	
+	jaeger = { 
+		type = land
+		trait_type = personality_trait 
 
-	##################################
-	# Field Marshal traits.
-	##################################
-	logistics_wizard = {
-		type = field_marshal
+		allowed = {
+			FROM = { 
+				OR = {
+					original_tag = CHN
+					original_tag = CCN
+					original_tag = MAN
+				}
+			 }
+		}
+				
+		trait_xp_factor = {
+			trickster = 1     #+100%
+			winter_specialist = 1     #+100%
+			commando = 1     #+100%
+			swamp_fox = 1     #+100%
+			ranger = 1     #+100%
+			hill_fighter = 1     #+100%
+			urban_assault_specialist = 1     #+100%
+			naval_invader = 1     #+100%
+		}
+
+		modifier = {
+			equipment_capture = 0.03
+		}
+		
+		new_commander_weight = {
+			factor = 0			
+		}
+
+		attack_skill_factor = 1
+		logistics_skill_factor = 1
+	}
 
+	
+##################################
+# Field Marshal traits.
+##################################
+	logistics_wizard = { 
+		type = field_marshal
+		
 		gain_xp = {
 			always = no # not gainable
 		}
 		cost = 1000
-
+		
 		field_marshal_modifier = {
 			supply_consumption_factor = -0.15
 		}
@@ -708,10 +790,10 @@ leader_traits = {
 		}
 		gui_row = 0
 		trait_type = assignable_trait
-		parent = organizer
+		any_parent = {organizer}
 	}
 
-	offensive_doctrine = {
+	offensive_doctrine = { 
 		type = field_marshal
 		gain_xp = {
 			always = no # not gainable
@@ -722,7 +804,7 @@ leader_traits = {
 		}
 		
 		attack_skill = 1
-
+		
 		slot = army_chief
 		specialist_advisor_trait = army_chief_offensive_1
 		expert_advisor_trait = army_chief_offensive_2
@@ -737,7 +819,7 @@ leader_traits = {
 
 	}
 
-	defensive_doctrine = {
+	defensive_doctrine = { 
 		type = field_marshal
 		gain_xp = {
 			always = no # not gainable
@@ -757,8 +839,8 @@ leader_traits = {
 		mutually_exclusive = offensive_doctrine
 		gui_row = 6
 	}
-
-	fast_planner = {
+	
+	fast_planner = { 
 		type = field_marshal
 		gain_xp = {
 			always = no # not gainable
@@ -767,7 +849,7 @@ leader_traits = {
 		field_marshal_modifier = {
 			planning_speed = 0.25
 		}
-
+		
 		slot = army_chief
 		specialist_advisor_trait = army_chief_reform_1
 		expert_advisor_trait = army_chief_reform_2
@@ -777,13 +859,13 @@ leader_traits = {
 			factor = 1
 		}
 		gui_row = 1
-		parent = organizer
+		any_parent = { organizer }
 		mutually_exclusive = thorough_planner
 		trait_type = assignable_trait
 	}
 
 
-	thorough_planner = {
+	thorough_planner = { 
 		type = field_marshal
 		gain_xp = {
 			always = no # not gainable
@@ -792,7 +874,7 @@ leader_traits = {
 		field_marshal_modifier = {
 			max_planning = 0.1
 		}
-
+		
 		slot = army_chief
 		specialist_advisor_trait = army_chief_planning_1
 		expert_advisor_trait = army_chief_planning_2
@@ -802,13 +884,13 @@ leader_traits = {
 			factor = 1
 		}
 		gui_row = 2
-		parent = organizer
+		any_parent = { organizer }
 		mutually_exclusive = fast_planner
 		trait_type = assignable_trait
 	}
 
 
-	unyielding_defender = {
+	unyielding_defender = { 
 		type = field_marshal
 		gain_xp = {
 			always = no # not gainable
@@ -823,7 +905,7 @@ leader_traits = {
 			defence = 0.10
 		}
 		custom_effect_tooltip = INCREASED_COUNTERATTACK_CHANCE
-
+		
 		slot = army_chief
 		specialist_advisor_trait = army_chief_defensive_1
 		expert_advisor_trait = army_chief_defensive_2
@@ -839,7 +921,7 @@ leader_traits = {
 	}
 
 
-	aggressive_assaulter = {
+	aggressive_assaulter = { 
 		type = field_marshal
 		gain_xp = {
 			always = no # not gainable
@@ -867,7 +949,7 @@ leader_traits = {
 
 	}
 
-	organisational_leader = {
+	organisational_leader = { 
 		type = field_marshal
 		gain_xp = {
 			always = no # not gainable
@@ -876,7 +958,7 @@ leader_traits = {
 		field_marshal_modifier = {
 			land_reinforce_rate = 0.02
 		}
-
+		
 		slot = army_chief
 		specialist_advisor_trait = army_chief_organizational_1
 		expert_advisor_trait = army_chief_organizational_2
@@ -890,7 +972,7 @@ leader_traits = {
 		gui_row = 7
 	}
 
-	inspirational_leader = {
+	inspirational_leader = { 
 		type = field_marshal
 		gain_xp = {
 			always = no # not gainable
@@ -899,7 +981,7 @@ leader_traits = {
 		field_marshal_modifier = {
 			army_morale_factor = 0.10
 		}
-
+		
 		slot = army_chief
 		specialist_advisor_trait = army_chief_morale_1
 		expert_advisor_trait = army_chief_morale_2
@@ -912,17 +994,17 @@ leader_traits = {
 		gui_row = 8
 	}
 
-	expert_delegator = {
+	expert_delegator = { 
 		type = field_marshal
 		gain_xp = {
 			always = no # not gainable
 		}
 		cost = 1000
-
+		
 		field_marshal_modifier = {
 			max_army_group_size = 2
 		}
-
+		
 		slot = army_chief
 		specialist_advisor_trait = army_chief_drill_1
 		expert_advisor_trait = army_chief_drill_2
@@ -932,27 +1014,27 @@ leader_traits = {
 			factor = 1
 		}
 		trait_type = assignable_trait
-		parent = skilled_staffer
+		any_parent = { skilled_staffer }
 		gui_row = 15
 	}
 
 
-	##################################
-	# Corps Commander traits.
-	##################################
+##################################
+# Corps Commander traits.
+##################################
 
-	organizer = {
+	organizer = { 
 		type = corps_commander
 		gain_xp = {
 			check_variable = { num_battle_plans > 0 }
 		}
 		custom_gain_xp_trigger_tooltip = is_using_battle_plans
-
+		
 		cost = 1000
 		modifier = {
 			planning_speed = 0.1
 		}
-
+		
 		slot = high_command
 		specialist_advisor_trait = army_regrouping_1
 		expert_advisor_trait = army_regrouping_2
@@ -961,11 +1043,11 @@ leader_traits = {
 		ai_will_do = {
 			factor = 1
 		}
-
+		
 		gui_row = 0
 	}
-
-	cavalry_leader = {
+	
+	cavalry_leader = { 
 		type = corps_commander
 		gain_xp = {
 			set_temp_variable = { temp = num_units }
@@ -975,26 +1057,26 @@ leader_traits = {
 			check_variable = { cmm > temp }
 		}
 		custom_gain_xp_trigger_tooltip = cavalary_ratio_over_40
-
+		
 		cost = 1000
-		modifier = {			
+		modifier = {
 			motorized_attack_factor = 0.12
 			mechanized_attack_factor = 0.12
 		}
-
+		
 		slot = high_command
 		specialist_advisor_trait = army_cavalry_1
 		expert_advisor_trait = army_cavalry_2
 		genius_advisor_trait = army_cavalry_3
-
+		
 		ai_will_do = {
 			factor = 1
 		}
-
+		
 		gui_row = 3
 	}
-
-	infantry_leader = {
+	
+	infantry_leader = { 
 		type = corps_commander
 		gain_xp = {
 			set_temp_variable = { temp = num_units }
@@ -1002,12 +1084,12 @@ leader_traits = {
 			check_variable = { num_infantry > temp }
 		}
 		custom_gain_xp_trigger_tooltip = infantry_ratio_over_80
-
+		
 		cost = 1000
 		modifier = {
 			army_infantry_defence_factor = 0.13
 		}
-
+		
 		slot = high_command
 		specialist_advisor_trait = army_infantry_1
 		expert_advisor_trait = army_infantry_2
@@ -1016,7 +1098,7 @@ leader_traits = {
 		ai_will_do = {
 			factor = 1
 		}
-
+		
 		gui_row = 6
 	}
 	skilled_staffer = { 
@@ -1050,7 +1132,7 @@ leader_traits = {
 		expert_advisor_trait = army_logistics_2
 		genius_advisor_trait = army_logistics_3
 	}
-	trickster = {
+	trickster = { 
 		type = corps_commander
 		gain_xp = {
 			OR = {
@@ -1059,7 +1141,7 @@ leader_traits = {
 			}
 		}
 		custom_gain_xp_trigger_tooltip = has_flanked
-
+		
 		cost = 500
 		modifier = {
 			recon_factor = 0.25
@@ -1068,12 +1150,12 @@ leader_traits = {
 		ai_will_do = {
 			factor = 1
 		}
-
+		
 		gui_row = 13
 	}
 
 
-	winter_specialist = {
+	winter_specialist = { 
 		type = corps_commander
 		gain_xp = {
 			temperature < -10
@@ -1082,16 +1164,16 @@ leader_traits = {
 		modifier = {
 			winter_attrition_factor = -0.5
 		}
-
+		
 		ai_will_do = {
 			factor = 1
 		}
-
+		
 		trait_type = basic_terrain_trait
 		gui_row = 8
 	}
 
-	adaptable = {
+	adaptable = { 
 		type = corps_commander
 		gain_xp = {
 			always = no # not gainable
@@ -1102,33 +1184,37 @@ leader_traits = {
 			acclimatization_cold_climate_gain_factor = 0.1
 			acclimatization_hot_climate_gain_factor = 0.1
 		}
-
+		
 		ai_will_do = {
 			factor = 1
 		}
-
+		
 		trait_type = assignable_terrain_trait
 		gui_row = 4
-
-		parent = desert_fox
-		parent = swamp_fox
-		parent = trait_mountaineer
-		parent = hill_fighter
-		parent = jungle_rat
-		parent = ranger
-		parent = urban_assault_specialist
-		parent = winter_specialist
-		parent = heat_specialist
-
-		num_parents_needed = 2
-	}
-
-	winter_expert = {
+				
+		parent = {
+			traits = {
+				heat_specialist
+				desert_fox
+				swamp_fox
+				trait_mountaineer
+				hill_fighter
+				jungle_rat
+				ranger
+				urban_assault_specialist
+				winter_specialist
+			}
+			num_parents_needed = 2
+		} 
+	}
+
+	winter_expert = { 
 		type = corps_commander
+
 		gain_xp = {
 			always = no # not gainable
 		}
-		
+
 		modifier = {
 			acclimatization_cold_climate_gain_factor = 0.40
 		}
@@ -1136,15 +1222,15 @@ leader_traits = {
 		ai_will_do = {
 			factor = 1
 		}
-
-		parent = winter_specialist
+		
+		any_parent = { winter_specialist }
 
 		trait_type = assignable_terrain_trait
 		gui_row = 8
 	}
 
-
-	trait_engineer = {
+	
+	trait_engineer = { 
 		type = corps_commander
 		gain_xp = {
 			OR = {
@@ -1158,10 +1244,10 @@ leader_traits = {
 				attack = 0.05
 			}
 			fort = {
-				attack = 0.1
-			}
+                attack = 0.1
+            }
 		}
-
+		
 		slot = high_command
 		specialist_advisor_trait = army_entrenchment_1
 		expert_advisor_trait = army_entrenchment_2
@@ -1170,13 +1256,13 @@ leader_traits = {
 		ai_will_do = {
 			factor = 1
 		}
-
+		
 		gui_row = 4
 	}
 
 
 	panzer_leader = {
-		type = corps_commander
+ 		type = corps_commander
 		gain_xp = {
 			set_temp_variable = { temp = num_units }
 			multiply_temp_variable = { temp = 0.4 }
@@ -1185,25 +1271,25 @@ leader_traits = {
 		custom_gain_xp_trigger_tooltip = armored_ratio_over_40
 		cost = 700
 		modifier = {
-			army_armor_speed_factor = 0.05
-			army_armor_attack_factor = 0.16
+			army_armor_speed_factor = 0.05 
+			army_armor_attack_factor = 0.16 
 		}
 		ai_will_do = {
 			factor = 1
 		}
-
+		
 		attack_skill_factor = 2
-
+		
 		gui_row = 1
-
+		
 		slot = high_command
 		specialist_advisor_trait = army_armored_1
 		expert_advisor_trait = army_armored_2
 		genius_advisor_trait = army_armored_3
 	}
 
-	commando = {
-		type = corps_commander
+	commando = { 
+ 		type = corps_commander
 		gain_xp = {
 			OR = {
 				temperature < -15
@@ -1216,7 +1302,7 @@ leader_traits = {
 		modifier = {
 			out_of_supply_factor = -0.25
 		}
-
+		
 		ai_will_do = {
 			factor = 1
 		}
@@ -1228,8 +1314,8 @@ leader_traits = {
 		genius_advisor_trait = army_commando_3
 	}
 
-	desert_fox = {
-		type = corps_commander
+	desert_fox = { 
+ 		type = corps_commander
 		gain_xp = {
 			is_fighting_in_terrain = desert
 		}
@@ -1248,7 +1334,7 @@ leader_traits = {
 			#	FROM = { NOT = { has_idea = theatre_training_spirit } }
 			#}
 		}
-
+		
 		ai_will_do = {
 			factor = 1
 		}
@@ -1256,7 +1342,7 @@ leader_traits = {
 		gui_row = 1
 	}
 
-	swamp_fox = {
+	swamp_fox = { 
 		type = corps_commander
 		gain_xp = {
 			is_fighting_in_terrain = marsh
@@ -1269,7 +1355,7 @@ leader_traits = {
 				defence = 0.1
 			}
 		}
-
+		
 		ai_will_do = {
 			factor = 1
 		}
@@ -1277,7 +1363,7 @@ leader_traits = {
 		gui_row = 2
 	}
 
-	trait_mountaineer = {
+	trait_mountaineer = { 
 		type = corps_commander
 		gain_xp = {
 			is_fighting_in_terrain = mountain
@@ -1290,7 +1376,7 @@ leader_traits = {
 				defence = 0.1
 			}
 		}
-
+		
 		ai_will_do = {
 			factor = 1
 		}
@@ -1298,7 +1384,7 @@ leader_traits = {
 		gui_row = 4
 	}
 
-	hill_fighter = {
+	hill_fighter = { 
 		type = corps_commander
 		gain_xp = {
 			is_fighting_in_terrain = hills
@@ -1311,7 +1397,7 @@ leader_traits = {
 				defence = 0.1
 			}
 		}
-
+		
 		ai_will_do = {
 			factor = 1
 		}
@@ -1319,7 +1405,7 @@ leader_traits = {
 		gui_row = 3
 	}
 
-	jungle_rat = {
+	jungle_rat = { 
 		type = corps_commander
 		gain_xp = {
 			is_fighting_in_terrain = jungle
@@ -1332,7 +1418,7 @@ leader_traits = {
 				defence = 0.1
 			}
 		}
-
+		
 		ai_will_do = {
 			factor = 1
 		}
@@ -1340,7 +1426,7 @@ leader_traits = {
 		gui_row = 7
 	}
 
-	ranger = {
+	ranger = { 
 		type = corps_commander
 		gain_xp = {
 			is_fighting_in_terrain = forest
@@ -1353,7 +1439,7 @@ leader_traits = {
 				defence = 0.1
 			}
 		}
-
+		
 		ai_will_do = {
 			factor = 1
 		}
@@ -1361,7 +1447,7 @@ leader_traits = {
 		gui_row = 6
 	}
 
-	urban_assault_specialist = {
+	urban_assault_specialist = { 
 		type = corps_commander
 		gain_xp = {
 			is_fighting_in_terrain = urban
@@ -1374,7 +1460,7 @@ leader_traits = {
 				defence = 0.1
 			}
 		}
-
+		
 		ai_will_do = {
 			factor = 1
 		}
@@ -1382,7 +1468,7 @@ leader_traits = {
 		gui_row = 5
 	}
 
-
+	
 	naval_invader = {
 		type = corps_commander
 		gain_xp = {
@@ -1393,7 +1479,7 @@ leader_traits = {
 			amphibious_invasion = 0.3 # 30% faster invasions
 			invasion_preparation = -0.3
 		}
-
+		
 		slot = high_command
 		specialist_advisor_trait = navy_amphibious_assault_1
 		expert_advisor_trait = navy_amphibious_assault_2
@@ -1402,90 +1488,96 @@ leader_traits = {
 		ai_will_do = {
 			factor = 1
 		}
-
+		
 		gui_row = 8
 	}
-
-	##################################
-	# Corps Commander assignable traits.
-	##################################
+	
+##################################
+# Corps Commander assignable traits.
+##################################
 
 
-	panzer_expert = {
+	panzer_expert = { 
 		type = corps_commander
 		gain_xp = {
 			always = no # not gainable
 		}
 		cost = 1000
 		modifier = {
-			army_armor_defence_factor = 0.10
+			army_armor_defence_factor = 0.10 
 		}
-
+		
 		custom_effect_tooltip = INCREASED_BLITZ_AND_ENCIRCLEMENT_CHANCE
-
+		
 		ai_will_do = {
 			factor = 1
 		}
-
+		
 		trait_type = assignable_trait
-		parent = panzer_leader
-
+		any_parent = { panzer_leader }
+		
 		mutually_exclusive = combined_arms_expert
 		mutually_exclusive = cavalry_expert
-
+		
 		gui_row = 1
 	}
-
-	combined_arms_expert = {
+	
+	combined_arms_expert = { 
 		type = corps_commander
 		gain_xp = {
 			always = no # not gainable
 		}
 		cost = 500
 		modifier = {
+			motorized_defence_factor = 0.15
 			mechanized_defence_factor = 0.15
 		}
-
+		
 		custom_effect_tooltip = INCREASED_BLITZ_AND_ENCIRCLEMENT_CHANCE
-
+		
+		slot = high_command
+		specialist_advisor_trait = army_CombinedArms_1
+		expert_advisor_trait = army_CombinedArms_2
+		genius_advisor_trait = army_CombinedArms_3
+		
 		ai_will_do = {
 			factor = 1
 		}
-
+		
 		trait_type = assignable_trait
-		parent = cavalry_leader
-		parent = panzer_leader
-
+		any_parent = { cavalry_leader panzer_leader }
+		
 		mutually_exclusive = panzer_expert
 		mutually_exclusive = cavalry_expert
-
-		num_parents_needed = 1
+		
+		
 		gui_row = 2
 	}
-
-	cavalry_expert = {
+	
+	cavalry_expert = { 
 		type = corps_commander
 		gain_xp = {
 			always = no # not gainable
 		}
 		cost = 500
 		modifier = {
-			motorized_defence_factor = 0.15
+			#cavalry_attack_factor = 0.10
+			cavalry_defence_factor = 0.10
 		}
-
+		
 		ai_will_do = {
 			factor = 1
 		}
-
+		
 		trait_type = assignable_trait
-		parent = cavalry_leader
-
+		any_parent = { cavalry_leader }
+		
 		mutually_exclusive = panzer_expert
 		mutually_exclusive = combined_arms_expert
-
+		
 		gui_row = 3
 	}
-
+	
 	fortress_buster = {
 		type = corps_commander
 		gain_xp = {
@@ -1502,18 +1594,23 @@ leader_traits = {
 		}
 		enable_ability = siege_artillery
 		
+		slot = high_command
+		specialist_advisor_trait = army_artillery_1
+		expert_advisor_trait = army_artillery_2
+		genius_advisor_trait = army_artillery_3
+		
 		ai_will_do = {
 			factor = 1
 		}
-
+		
 		gui_row = 4
-
+		
 		trait_type = assignable_trait
-		parent = trait_engineer
+		any_parent = { trait_engineer }
 		mutually_exclusive = scavenger
 	}
-
-	scavenger = {
+	
+	scavenger = { 
 		type = corps_commander
 		gain_xp = {
 			always = no # not gainable
@@ -1522,19 +1619,19 @@ leader_traits = {
 		modifier = {
 			equipment_capture = 0.03
 		}
-
+		
 		ai_will_do = {
 			factor = 1
 		}
-
+		
 		trait_type = assignable_trait
-
+		
 		gui_row = 5
-		parent = trait_engineer
+		any_parent = { trait_engineer }
 		mutually_exclusive = fortress_buster
 	}
-
-	infantry_expert = {
+	
+	infantry_expert = { 
 		type = corps_commander
 		gain_xp = {
 			always = no # not gainable
@@ -1543,19 +1640,19 @@ leader_traits = {
 		modifier = {
 			army_infantry_attack_factor = 0.10
 		}
-
+		
 		ai_will_do = {
 			factor = 1
 		}
 
 		mutually_exclusive = ambusher
-
+		
 		trait_type = assignable_trait
-		parent = infantry_leader
+		any_parent = { infantry_leader }
 		gui_row = 6
 	}
-
-	ambusher = {
+	
+	ambusher = { 
 		type = corps_commander
 		gain_xp = {
 			always = no # not gainable
@@ -1565,19 +1662,19 @@ leader_traits = {
 			max_dig_in = 5
 			recon_factor_while_entrenched = 0.25
 		}
-
+		
 		ai_will_do = {
 			factor = 1
 		}
-
+		
 		mutually_exclusive = infantry_expert
 
 		trait_type = assignable_trait
-		parent = infantry_leader
-
+		any_parent = { infantry_leader }
+		
 		gui_row = 7
 	}
-	invader_ii = {
+	invader_ii = { 
 		type = corps_commander
 		gain_xp = {
 			always = no # not gainable
@@ -1586,19 +1683,19 @@ leader_traits = {
 		modifier = {
 			extra_marine_supply_grace = 240
 		}
-
+		
 		enable_ability = faster_naval_invasion_planning
-
+		
 		ai_will_do = {
 			factor = 1
 		}
-
+		
 		trait_type = assignable_trait
-		parent = naval_invader
-
+		any_parent = { naval_invader }
+		
 		gui_row = 8
 	}
-	naval_liason = {
+	naval_liason = { 
 		type = corps_commander
 		gain_xp = {
 			always = no # not gainable
@@ -1607,18 +1704,18 @@ leader_traits = {
 		modifier = {
 			shore_bombardment_bonus = 0.25
 		}
-
+		
 		ai_will_do = {
 			factor = 1
 		}
-
+		
 		trait_type = assignable_trait
-		parent = naval_invader
-
+		any_parent = { naval_invader }
+		
 		gui_row = 9
 	}
-
-	skirmisher = {
+	
+	skirmisher = { 
 		type = corps_commander
 		gain_xp = {
 			always = no # not gainable
@@ -1626,20 +1723,20 @@ leader_traits = {
 		cost = 500
 		modifier = {
 		}
-
+		
 		ai_will_do = {
 			factor = 1
 		}
-
+		
 		enable_ability = probing_attack
-
+		
 		trait_type = assignable_trait
-		parent = commando
-
+		any_parent = { commando }
+		
 		gui_row = 10
 	}
-
-	paratrooper = {
+	
+	paratrooper = { 
 		type = corps_commander
 		gain_xp = {
 			always = no # not gainable
@@ -1648,21 +1745,21 @@ leader_traits = {
 		modifier = {
 			extra_paratrooper_supply_grace = 240
 		}
-
+		
 		enable_ability = glider_planes
-
+		
 		ai_will_do = {
 			factor = 1
 		}
-
+		
 		trait_type = assignable_trait
-		parent = commando
-
+		any_parent = { commando }
+		
 		gui_row = 11
 	}
-
-
-	camouflage_expert = {
+	
+	
+	camouflage_expert = { 
 		type = corps_commander
 		gain_xp = {
 			always = no # not gainable
@@ -1672,23 +1769,23 @@ leader_traits = {
 			cas_damage_reduction = 0.5
 			air_superiority_bonus_in_combat = -0.5
 		}
-
+		
 		ai_will_do = {
 			factor = 1
 		}
-
+		
 		slot = high_command
 		specialist_advisor_trait = army_concealment_1
 		expert_advisor_trait = army_concealment_2
 		genius_advisor_trait = army_concealment_3
 		
 		trait_type = assignable_trait
-		parent = commando
-
+		any_parent = { commando }
+		
 		gui_row = 12
 	}
-
-	expert_improviser = {
+	
+	expert_improviser = { 
 		type = corps_commander
 		gain_xp = {
 			always = no # not gainable
@@ -1720,26 +1817,26 @@ leader_traits = {
 				movement = 0.1
 			}
 		}
-
+		
 		override_effect_tooltip = expert_improviser_movement_bonus_on_land
-
+			
 		ai_will_do = {
 			factor = 1
 		}
-
+		
 		enable_ability = makeshift_bridges
-
+		
 		trait_type = assignable_trait
-		parent = trickster
+		any_parent = { trickster }
 		prerequisites = {
 			check_variable = { num_terrain_traits > 0 }
 		}
 		custom_prerequisite_tooltip = needs_at_least_one_terrain
-
+		
 		gui_row = 13
 	}
-
-	guerilla_fighter = {
+	
+	guerilla_fighter = { 
 		type = corps_commander
 		gain_xp = {
 			always = no # not gainable
@@ -1748,18 +1845,18 @@ leader_traits = {
 		modifier = {
 			dig_in_speed_factor = 0.5
 		}
-
+		
 		ai_will_do = {
 			factor = 1
 		}
-
+		
 		trait_type = assignable_trait
-		parent = trickster
-
+		any_parent = { trickster }
+		
 		gui_row = 14
 	}
-
-
+	
+	
 
 
 ##################################
@@ -1825,7 +1922,7 @@ leader_traits = {
 			convoy_retreat_speed = 0.05
 		}
 		custom_gain_xp_trigger_tooltip = BLOCKADE_RUNNER_TRIGGER_TT
-
+		
 		ai_will_do = {
 			factor = 1
 		}
@@ -1867,7 +1964,7 @@ leader_traits = {
 			spotting_chance = 0.1
 		}
 		custom_gain_xp_trigger_tooltip = SPOTTER_TRIGGER_TT
-
+		
 		ai_will_do = {
 			factor = 1
 		}
@@ -1885,7 +1982,7 @@ leader_traits = {
 			navy_anti_air_attack_factor = 0.1
 		}
 		custom_gain_xp_trigger_tooltip = FLY_SWATTER_TRIGGER_TT
-
+		
 		slot = high_command
 		specialist_advisor_trait = navy_naval_air_defense_1
 		expert_advisor_trait = navy_naval_air_defense_2
@@ -1958,7 +2055,7 @@ leader_traits = {
 		}
 
 		trait_type = assignable_trait
-		parent = seawolf
+		any_parent = { seawolf }
 		mutually_exclusive = lancer
 		gui_row = 1
 		gui_column = 1
@@ -1969,7 +2066,7 @@ leader_traits = {
 		modifier = {
 			naval_torpedo_hit_chance_factor = 0.1
 		}
-
+		
 		slot = high_command
 		specialist_advisor_trait = navy_submarine_1
 		expert_advisor_trait = navy_submarine_2
@@ -1980,7 +2077,7 @@ leader_traits = {
 		}
 
 		trait_type = assignable_trait
-		parent = silent_hunter
+		any_parent = { silent_hunter }
 		gui_row = 1
 		gui_column = 2
 	}
@@ -1996,10 +2093,7 @@ leader_traits = {
 		}
 		
 		trait_type = assignable_trait
-		parent = seawolf
-		parent = fleet_protector
-
-		num_parents_needed = 1
+		any_parent = { seawolf fleet_protector }
 		
 		mutually_exclusive = silent_hunter
 		
@@ -2029,7 +2123,7 @@ leader_traits = {
 		}
 		
 		trait_type = assignable_trait
-		parent = fleet_protector
+		any_parent = { fleet_protector }
 		
 		gui_row = 3
 		gui_column = 1
@@ -2045,10 +2139,11 @@ leader_traits = {
 		}
 		
 		trait_type = assignable_trait
-		num_parents_needed = 1
-		parent = silent_hunter
-		parent = lancer
-		parent = destroyer_leader
+		any_parent = {
+			silent_hunter
+			lancer
+			destroyer_leader
+		}
 		
 		gui_row = 2
 		gui_column = 2
@@ -2065,7 +2160,7 @@ leader_traits = {
 		}
 		
 		trait_type = assignable_trait
-		parent = destroyer_leader
+		any_parent = { destroyer_leader }
 		
 		gui_row = 3
 		gui_column = 2
@@ -2091,7 +2186,7 @@ leader_traits = {
 		}
 		
 		trait_type = assignable_trait
-		parent = fly_swatter
+		any_parent = { fly_swatter }
 		
 		gui_row = 4
 		gui_column = 1
@@ -2108,7 +2203,7 @@ leader_traits = {
 		}
 		
 		trait_type = assignable_trait
-		parent = cruiser_captain
+		any_parent = { cruiser_captain }
 		
 		gui_row = 4
 		gui_column = 2
@@ -2125,7 +2220,7 @@ leader_traits = {
 		}
 		
 		trait_type = assignable_trait
-		parent = superior_tactician
+		any_parent = { superior_tactician }
 		mutually_exclusive = concealment_expert
 		gui_row = 5
 		gui_column = 1
@@ -2147,10 +2242,11 @@ leader_traits = {
 		genius_advisor_trait = navy_chief_commerce_raiding_3
 		
 		trait_type = assignable_trait
-		parent = superior_tactician
-		parent = spotter
-		parent = blockade_runner
-		num_parents_needed = 1
+		any_parent = {
+			superior_tactician
+			spotter
+			blockade_runner
+		}
 		mutually_exclusive = lone_wolf
 		gui_row = 6
 		gui_column = 1
@@ -2167,9 +2263,10 @@ leader_traits = {
 		}
 		
 		trait_type = assignable_trait
-		parent = spotter
-		parent = blockade_runner
-		num_parents_needed = 1
+		any_parent = {
+			spotter
+			blockade_runner
+		}
 		mutually_exclusive = mine_layer
 		gui_row = 7
 		gui_column = 1
@@ -2185,9 +2282,10 @@ leader_traits = {
 		}
 		
 		trait_type = assignable_trait
-		parent = spotter
-		parent = blockade_runner
-		num_parents_needed = 1
+		any_parent = {
+			spotter
+			blockade_runner
+		}
 		mutually_exclusive = mine_sweeper
 		gui_row = 8
 		gui_column = 1
@@ -2204,9 +2302,10 @@ leader_traits = {
 		}
 		
 		trait_type = assignable_trait
-		parent = lone_wolf
-		parent = concealment_expert
-		num_parents_needed = 1
+		any_parent = {
+		 	lone_wolf
+			concealment_expert
+		}
 		gui_row = 5
 		gui_column = 2
 	}
@@ -2227,7 +2326,7 @@ leader_traits = {
 		}
 		
 		trait_type = assignable_trait
-		parent = ironside
+		any_parent = { ironside }
 		
 		gui_row = 12
 		gui_column = 1
@@ -2243,7 +2342,7 @@ leader_traits = {
 		}
 		
 		trait_type = assignable_trait
-		parent = ironside
+		any_parent = { ironside }
 		
 		gui_row = 14
 		gui_column = 1
@@ -2253,7 +2352,7 @@ leader_traits = {
 		modifier = {
 			critical_receive_chance = -0.25
 		}
-				
+		
 		slot = navy_chief
 		specialist_advisor_trait = navy_chief_reform_1
 		expert_advisor_trait = navy_chief_reform_2
@@ -2264,7 +2363,7 @@ leader_traits = {
 		}
 		
 		trait_type = assignable_trait
-		parent = ironside
+		any_parent = { ironside }
 		
 		gui_row = 13
 		gui_column = 1
@@ -2274,7 +2373,7 @@ leader_traits = {
 		modifier = {
 			naval_critical_score_chance_factor = 0.1
 		}
-				
+		
 		slot = navy_chief
 		specialist_advisor_trait = navy_chief_decisive_battle_1
 		expert_advisor_trait = navy_chief_decisive_battle_2
@@ -2286,7 +2385,7 @@ leader_traits = {
 		
 		trait_type = assignable_trait
 		mutually_exclusive = crisis_magician
-		parent = big_guns_expert
+		any_parent = { big_guns_expert }
 		
 		gui_row = 12
 		gui_column = 2
@@ -2303,7 +2402,7 @@ leader_traits = {
 		
 		trait_type = assignable_trait
 		mutually_exclusive = marksman
-		parent = safety_first
+		any_parent = { safety_first }
 		
 		gui_row = 13
 		gui_column = 2
@@ -2313,7 +2412,7 @@ leader_traits = {
 		modifier = {
 			 sortie_efficiency = 0.1
 		}
-				
+		
 		slot = high_command
 		specialist_advisor_trait = navy_carrier_1
 		expert_advisor_trait = navy_carrier_2
@@ -2325,7 +2424,7 @@ leader_traits = {
 		
 		trait_type = assignable_trait
 		
-		parent = air_controller
+		any_parent = { air_controller }
 		
 		gui_row = 10
 		gui_column = 1
@@ -2343,7 +2442,7 @@ leader_traits = {
 		trait_type = assignable_trait
 		mutually_exclusive = dive_bomber
 		mutually_exclusive = torpedo_bomber
-		parent = flight_deck_manager
+		any_parent = { flight_deck_manager }
 		
 		gui_row = 9
 		gui_column = 2
@@ -2368,7 +2467,7 @@ leader_traits = {
 		trait_type = assignable_trait
 		mutually_exclusive = fighter_director
 		mutually_exclusive = torpedo_bomber
-		parent = flight_deck_manager
+		any_parent = { flight_deck_manager }
 		
 		gui_row = 10
 		gui_column = 2
@@ -2380,8 +2479,8 @@ leader_traits = {
 				air_attack_factor = 0.1
 				air_mission_efficiency = 0.1
 			}
-		}		
-		
+		}	
+
 		slot = high_command
 		specialist_advisor_trait = air_naval_strike_1
 		expert_advisor_trait = air_naval_strike_2
@@ -2394,7 +2493,7 @@ leader_traits = {
 		trait_type = assignable_trait
 		mutually_exclusive = fighter_director
 		mutually_exclusive = dive_bomber
-		parent = flight_deck_manager
+		any_parent = { flight_deck_manager }
 		
 		gui_row = 11
 		gui_column = 2
@@ -2460,7 +2559,7 @@ leader_traits = {
 				defence = 0.1
 			}
 		}
-
+		
 		slot = high_command
 		specialist_advisor_trait = navy_fleet_logistics_1
 		expert_advisor_trait = navy_fleet_logistics_2
@@ -2511,7 +2610,17 @@ leader_traits = {
 		modifier = {
 			experience_gain_factor = -0.25 
 		}
-		
+		new_commander_weight = {
+			factor = 1  
+			modifier = {
+				FROM = { has_idea = best_of_the_best_naval_academy_spirit }
+				factor = 0
+			}
+			modifier = {
+				FROM = { has_idea = naval_academy_scholarships_spirit }
+				factor = 0
+			}
+		}
 		ai_will_do = {
 			factor = 1
 		}
@@ -2524,7 +2633,17 @@ leader_traits = {
 			naval_enemy_retreat_chance = 0.2
 			navy_org = 5
 		}
-		
+		new_commander_weight = {
+			factor = 1  
+			modifier = {
+				FROM = { has_idea = best_of_the_best_naval_academy_spirit }
+				factor = 0
+			}
+			modifier = {
+				FROM = { has_idea = naval_academy_scholarships_spirit }
+				factor = 0
+			}
+		}
 		ai_will_do = {
 			factor = 1
 		}
@@ -2539,7 +2658,17 @@ leader_traits = {
 		trait_xp_factor = {
 			ironside = 0.5     #+100%
 		}
-		
+		new_commander_weight = {
+			factor = 1  
+			modifier = {
+				FROM = { has_idea = best_of_the_best_naval_academy_spirit }
+				factor = 0
+			}
+			modifier = {
+				FROM = { has_idea = naval_academy_scholarships_spirit }
+				factor = 0
+			}
+		}
 		ai_will_do = {
 			factor = 1
 		}
@@ -2552,7 +2681,17 @@ leader_traits = {
 			naval_damage_factor = 0.2
 			naval_defense_factor = -0.1
 		}
-		
+		new_commander_weight = {
+			factor = 1  
+			modifier = {
+				FROM = { has_idea = best_of_the_best_naval_academy_spirit }
+				factor = 0
+			}
+			modifier = {
+				FROM = { has_idea = naval_academy_scholarships_spirit }
+				factor = 0
+			}
+		}
 		ai_will_do = {
 			factor = 1
 		}
@@ -2564,7 +2703,17 @@ leader_traits = {
 		modifier = {
 			critical_receive_chance = -0.05	
 		}
-		
+		new_commander_weight = {
+			factor = 1  
+			modifier = {
+				FROM = { has_idea = best_of_the_best_naval_academy_spirit }
+				factor = 0
+			}
+			modifier = {
+				FROM = { has_idea = naval_academy_scholarships_spirit }
+				factor = 0
+			}
+		}
 		ai_will_do = {
 			factor = 1
 		}
@@ -2577,7 +2726,17 @@ leader_traits = {
 			naval_has_potf_in_combat_attack = 0.1
 			naval_has_potf_in_combat_defense = 0.1
 		}
-		
+		new_commander_weight = {
+			factor = 1  
+			modifier = {
+				FROM = { has_idea = best_of_the_best_naval_academy_spirit }
+				factor = 0
+			}
+			modifier = {
+				FROM = { has_idea = naval_academy_scholarships_spirit }
+				factor = 0
+			}
+		}
 		ai_will_do = {
 			factor = 1
 		}
@@ -2586,22 +2745,28 @@ leader_traits = {
 		type = navy
 		trait_type = personality_trait
 	
-		modifier = {
+		modifier = { # WARNING! Changing the value of these modifiers requires changing them also in the tooltip ITA_flotta_d_evasione_admiral_traits_tt
 			naval_damage_factor = 0.05
 			naval_speed_factor = 0.1
 		}
-		
-		ai_will_do = {
-			factor = 1
-		}
 		new_commander_weight = {
-			factor = 1
-			
+			factor = 1  
 			modifier = {
 				has_trait = navy_cautious
-				factor = 0 
+				factor = 0
+			}
+			modifier = {
+				FROM = { has_idea = best_of_the_best_naval_academy_spirit }
+				factor = 0
+			}
+			modifier = {
+				FROM = { has_idea = naval_academy_scholarships_spirit }
+				factor = 0
 			}
 		}
+		ai_will_do = {
+			factor = 1
+		}
 	}
 	navy_career_officer = { 
 		type = navy
@@ -2610,7 +2775,17 @@ leader_traits = {
 		modifier = {
 			experience_gain_factor = 0.1	
 		}
-		
+		new_commander_weight = {
+			factor = 1  
+			modifier = {
+				FROM = { has_idea = best_of_the_best_naval_academy_spirit }
+				factor = 0
+			}
+			modifier = {
+				FROM = { has_idea = naval_academy_scholarships_spirit }
+				factor = 0
+			}
+		}
 		ai_will_do = {
 			factor = 1
 		}
@@ -2623,7 +2798,17 @@ leader_traits = {
 			navy_capital_ship_attack_factor = 0.1
 			navy_anti_air_attack_factor = -0.2	
 		}
-		
+		new_commander_weight = {
+			factor = 1  
+			modifier = {
+				FROM = { has_idea = best_of_the_best_naval_academy_spirit }
+				factor = 0
+			}
+			modifier = {
+				FROM = { has_idea = naval_academy_scholarships_spirit }
+				factor = 0
+			}
+		}
 		ai_will_do = {
 			factor = 1
 		}
@@ -2638,6 +2823,17 @@ leader_traits = {
 		trait_xp_factor = {
 			air_controller = 0.5     #+100%
 		}
+		new_commander_weight = {
+			factor = 1  
+			modifier = {
+				FROM = { has_idea = best_of_the_best_naval_academy_spirit }
+				factor = 0
+			}
+			modifier = {
+				FROM = { has_idea = naval_academy_scholarships_spirit }
+				factor = 0
+			}
+		}
 		ai_will_do = {
 			factor = 1
 		}
@@ -2711,24 +2907,24 @@ leader_traits = {
 		}
 	}
 
-	##################################
-	# status traits
-	##################################
+##################################
+# status traits
+##################################
 
-	sick = {
+	sick = { 
 		type = all
 		trait_type = status_trait
-
+		
 		non_shared_modifier = {
 			skill_bonus_factor = -0.5
 			cannot_use_abilities = 1
 		}
 	}
 
-	wounded = {
+	wounded = { 
 		type = all
 		trait_type = status_trait
-
+		
 		non_shared_modifier = {
 			skill_bonus_factor = -0.5
 			cannot_use_abilities = 1
@@ -2744,33 +2940,33 @@ leader_traits = {
 			cannot_use_abilities = 1
 		}
 	}
-
-	disgruntled = {
+	
+	disgruntled = { 
 		type = all
 		trait_type = status_trait
-
+		
 		attack_skill = -2
 		defense_skill = -2
 		logistics_skill = -2
 		planning_skill = -2
 	}
-
-	demoted = {
+	
+	demoted = { 
 		type = all
 		trait_type = status_trait
-
+		
 		attack_skill = -1
 		defense_skill = -1
 		logistics_skill = -1
 		planning_skill = -1
 	}
-
-	substance_abuser = {
+	
+	substance_abuser = { 
 		type = all
 		trait_type = status_trait
 	}
-
-	substance_addict = {
+	
+	substance_addict = { 
 		type = all
 		trait_type = status_trait
 		allowed = {
@@ -2786,11 +2982,11 @@ leader_traits = {
 		type = all
 		trait_type = status_trait
 	}
-
+	
 	recently_promoted = {
 		type = all
 		trait_type = status_trait
-
+		
 		attack_skill = -1
 		defense_skill = -1
 		logistics_skill = -1
@@ -2798,19 +2994,19 @@ leader_traits = {
 	}
 
 	# defective_geneseed = { #needs more code support, remove before launch
-		# 	type = all
-		# 	trait_type = status_trait
-		# 	gain_xp = {
-			# 		OR = {
-				# 			has_division_template_spacemarine = yes
-				# 			has_chaos_corruption = yes
-				# 		}
-			# 	}
-		# 	cost = 400
-		# 	modifier = {
-			# 		geneseed_defect_factor = 1
-			# 	}
-		# }
+	# 	type = all
+	# 	trait_type = status_trait
+	# 	gain_xp = {
+	# 		OR = {
+	# 			has_division_template_spacemarine = yes
+	# 			has_chaos_corruption = yes
+	# 		}
+	# 	}
+	# 	cost = 400
+	# 	modifier = {
+	# 		geneseed_defect_factor = 1
+	# 	}
+	# }
 
 
 	##################################
@@ -2838,8 +3034,154 @@ leader_traits = {
 			factor = 0
 		}
 	}
-	
-	##################################
+
+	trait_SPA_nationalist_sympathies = {
+
+		type = all
+		trait_type = personality_trait
+
+		new_commander_weight = {
+			factor = 0
+		}
+	}
+
+	trait_SPA_falangist_loyalties = {
+
+		type = all
+		trait_type = personality_trait
+
+		new_commander_weight = {
+			factor = 0
+		}
+	}
+
+	trait_SPA_carlist_loyalties = {
+
+		type = all
+		trait_type = personality_trait
+
+		new_commander_weight = {
+			factor = 0
+		}
+	}
+
+	trait_SPR_republican_loyalties = {
+
+		type = all
+		trait_type = personality_trait
+
+		new_commander_weight = {
+			factor = 0
+		}
+	}
+
+	trait_SPR_stalinist_loyalties = {
+
+		type = all
+		trait_type = personality_trait
+
+		new_commander_weight = {
+			factor = 0
+		}
+	}
+
+	trait_SPR_anti_stalinist_loyalties = {
+
+		type = all
+		trait_type = personality_trait
+
+		new_commander_weight = {
+			factor = 0
+		}
+	}
+
+	trait_BUL_zveno_member = {
+
+		type = all
+		trait_type = personality_trait
+
+
+		new_commander_weight = {
+			factor = 0
+		}
+	}
+
+	trait_BUL_tsar_loyalist = {
+
+		type = all
+		trait_type = personality_trait
+
+		new_commander_weight = {
+			factor = 0
+		}
+	}
+
+	trait_BUL_ff_sympathizer = {
+
+		type = all
+		trait_type = personality_trait
+
+
+		new_commander_weight = {
+			factor = 0
+		}
+	}
+
+	trait_TUR_kemalist_champion = {
+
+		type = all
+		trait_type = personality_trait
+
+
+		new_commander_weight = {
+			factor = 0
+		}
+	}
+
+	trait_GRE_stauch_monarchist = {
+
+		type = all
+		trait_type = personality_trait
+
+
+		new_commander_weight = {
+			factor = 0
+		}
+	}
+
+	trait_GRE_venezelist_loyalist = {
+
+		type = all
+		trait_type = personality_trait
+
+
+		new_commander_weight = {
+			factor = 0
+		}
+	}
+
+	trait_GRE_marxist_acolyte = {
+
+		type = all
+		trait_type = personality_trait
+
+		new_commander_weight = {
+			factor = 0
+		}
+	}
+
+	trait_GRE_fascist_sympathizer = {
+
+		type = all
+		trait_type = personality_trait
+
+
+		new_commander_weight = {
+			factor = 0
+		}
+	}
+
+##################################
 # operative traits
 ##################################
 
@@ -3071,7 +3413,7 @@ leader_traits = {
 			boost_resistance_factor = 0.25
 		}
 	}
-
+	
 	promoted_from_the_ranks = {  
 		type = land
 		trait_type = personality_trait
@@ -3081,6 +3423,7 @@ leader_traits = {
 			planning_speed = 0.1
 			recon_factor = 0.05
 		}
+
 		new_commander_weight = {
 			factor = 0
 		}
diff --git a/common/unit_leader/NSB_traits.txt b/common/unit_leader/NSB_traits.txt
index 858cf5551e1..1c64937eb22 100644
--- a/common/unit_leader/NSB_traits.txt
+++ b/common/unit_leader/NSB_traits.txt
@@ -11,9 +11,7 @@ leader_traits = {
 			always = no # not gainable
 		}
 		allowed = {
-			FROM = {
-				tag = LIT
-			}
+			always = no
 		}
 		modifier = {
 			
@@ -34,9 +32,7 @@ leader_traits = {
 			always = no # not gainable
 		}
 		allowed = {
-			FROM = {
-				tag = LIT
-			}
+			always = no
 		}
 		modifier = {
 			
@@ -57,9 +53,7 @@ leader_traits = {
 			always = no # not gainable
 		}
 		allowed = {
-			FROM = {
-				tag = POL
-			}
+			always = no
 		}
 		modifier = {
 			
@@ -80,9 +74,7 @@ leader_traits = {
 			always = no # not gainable
 		}
 		allowed = {
-			FROM = {
-				tag = POL
-			}
+			always = no
 		}
 		modifier = {
 			
@@ -120,7 +112,7 @@ leader_traits = {
 		trait_type = personality_trait
 
 		allowed = {
-			FROM = { original_tag = SOV }
+			always = no
 		}
 
 		new_commander_weight = {
@@ -143,7 +135,7 @@ leader_traits = {
 		trait_type = personality_trait
 
 		allowed = {
-			FROM = { original_tag = SOV }
+			FROM = { always = no }
 		}
 
 		new_commander_weight = {
@@ -173,7 +165,7 @@ leader_traits = {
 		trait_type = personality_trait
 
 		allowed = {
-			FROM = { original_tag = SOV }
+			FROM = { always = no }
 		}
 
 		new_commander_weight = {
@@ -187,7 +179,7 @@ leader_traits = {
 		trait_type = personality_trait
 
 		allowed = {
-			FROM = { original_tag = SOV }
+			FROM = { always = no }
 		}
 
 		new_commander_weight = {
@@ -205,7 +197,7 @@ leader_traits = {
 		trait_type = personality_trait
 
 		allowed = {
-			FROM = { original_tag = SOV }
+			always = no
 		}
 
 		new_commander_weight = {
@@ -219,7 +211,7 @@ leader_traits = {
 		trait_type = personality_trait
 
 		allowed = {
-			FROM = { original_tag = SOV }
+			always = no
 		}
 
 		new_commander_weight = {
diff --git a/common/unit_leader/eaw_traits.txt b/common/unit_leader/eaw_traits.txt
index c111abb5c15..f0399479327 100644
--- a/common/unit_leader/eaw_traits.txt
+++ b/common/unit_leader/eaw_traits.txt
@@ -1071,7 +1071,7 @@ leader_traits = {
 		}
 
 		trait_type = assignable_trait
-		parent = artillery_specialist
+		any_parent = { artillery_specialist }
 		gui_row = 16
 	}
 
@@ -1097,8 +1097,7 @@ leader_traits = {
         type = corps_commander
         trait_type = assignable_terrain_trait
         gui_row = 0
-        
-        parent = heat_specialist
+        any_parent = { heat_specialist }
         
         gain_xp = {
             always = no # not gainable
diff --git a/common/unit_tags/00_categories.txt b/common/unit_tags/00_categories.txt
index 923cfc1465e..ce73ef3677e 100644
--- a/common/unit_tags/00_categories.txt
+++ b/common/unit_tags/00_categories.txt
@@ -5,6 +5,7 @@ sub_unit_categories = {
 	category_heavy_infantry
 	category_all_infantry
 	category_special_forces
+	category_racial_special_forces
 	category_nav_bomber
 	category_tac_bomber
 	category_strat_bomber
@@ -26,9 +27,15 @@ sub_unit_categories = {
 	category_recon
 	category_armored_car
 	category_airship
-	category_engineer
 	category_magical_infantry
 	category_motmech
 	category_militia
 	category_ap_super_griffons
+	category_mountaineers
+	category_paratroopers
+	category_marines
+	category_anti_air
+	category_amphibious_tanks
+	category_support_artillery
+	category_bus
 }
diff --git a/common/units/air.txt b/common/units/air.txt
index ca83eb8898c..442a5f8501a 100644
--- a/common/units/air.txt
+++ b/common/units/air.txt
@@ -95,7 +95,7 @@ sub_units = {
 		sprite = medium_plane
 		priority = 1
 		active = yes
-		type = fighter
+		type = heavy_fighter
 		need = { medium_plane_fighter_airframe = 1 }
 		categories = { category_heavy_fighter }
 		land_air_wing_size = 100
@@ -130,7 +130,7 @@ sub_units = {
 		type = maritime_patrol_plane
 		need = { large_plane_maritime_patrol_plane_airframe = 1 }
 		categories = { category_strat_bomber }
-		land_air_wing_size = 100
+		land_air_wing_size = 10
 	}
 
 	# Non-BBA archetypes
diff --git a/common/units/amphibious_armor.txt b/common/units/amphibious_armor.txt
index 3de905e18c9..61b9d16452b 100644
--- a/common/units/amphibious_armor.txt
+++ b/common/units/amphibious_armor.txt
@@ -21,6 +21,7 @@ sub_units = {
 			category_all_armor
 			category_army
 			category_mechanical
+			category_amphibious_tanks
 		}
 
 
@@ -90,6 +91,7 @@ sub_units = {
 			category_all_armor
 			category_army
 			category_mechanical
+			category_amphibious_tanks
 		}
 
 
@@ -155,6 +157,7 @@ sub_units = {
 			category_all_armor
 			category_army
 			category_mechanical
+			category_amphibious_tanks
 		}
 
 
@@ -223,6 +226,7 @@ sub_units = {
 			category_all_armor
 			category_army
 			category_mechanical
+			category_amphibious_tanks
 		}
 
 
@@ -293,6 +297,7 @@ sub_units = {
 			category_all_armor
 			category_army
 			category_mechanical
+			category_amphibious_tanks
 		}
 
 
diff --git a/common/units/anti-air.txt b/common/units/anti-air.txt
index 884c2bc2c2f..265efedbf20 100644
--- a/common/units/anti-air.txt
+++ b/common/units/anti-air.txt
@@ -24,6 +24,7 @@ sub_units = {
 			category_support_battalions
 			category_army
 			category_all_aa
+			category_anti_air
 		}
 
 
diff --git a/common/units/anti-air_brigade.txt b/common/units/anti-air_brigade.txt
index 8519b3c08f1..a1066813006 100644
--- a/common/units/anti-air_brigade.txt
+++ b/common/units/anti-air_brigade.txt
@@ -17,12 +17,13 @@ sub_units = {
 			anti_air
 		}
 
-		group = infantry
+		group = combat_support
 
 		categories = {
 			category_army
 			category_line_artillery
 			category_all_aa
+			category_anti_air
 		}
 
 		combat_width = 1
@@ -78,7 +79,7 @@ sub_units = {
 			anti_air
 		}
 		
-		group = mobile
+		group = mobile_combat_support
 		
 		categories = {
 			category_army
diff --git a/common/units/anti_tank_brigade.txt b/common/units/anti_tank_brigade.txt
index 7368b86cfaf..30836436945 100644
--- a/common/units/anti_tank_brigade.txt
+++ b/common/units/anti_tank_brigade.txt
@@ -13,7 +13,7 @@ sub_units = {
 			anti_tank
 		}
 
-		group = infantry
+		group = combat_support
 
 		categories = {
 			category_front_line
@@ -85,7 +85,7 @@ sub_units = {
 			anti_tank
 		}
 		
-		group = mobile
+		group = mobile_combat_support
 		
 		categories = {
 			category_front_line
diff --git a/common/units/artillery.txt b/common/units/artillery.txt
index 1ae7c8b01f4..e320c69e51f 100644
--- a/common/units/artillery.txt
+++ b/common/units/artillery.txt
@@ -21,6 +21,7 @@ sub_units = {
 			category_army
 			category_artillery
 			category_all_artillery
+			category_support_artillery
 		}
 
 
@@ -70,6 +71,7 @@ sub_units = {
 			category_army
 			category_artillery
 			category_all_artillery
+			category_support_artillery
 		}
 
 		combat_width = 0
diff --git a/common/units/artillery_brigade.txt b/common/units/artillery_brigade.txt
index 514ffedc669..059d14e2bfc 100644
--- a/common/units/artillery_brigade.txt
+++ b/common/units/artillery_brigade.txt
@@ -13,7 +13,7 @@ sub_units = {
 			artillery
 		}
 
-		group = infantry
+		group = combat_support
 
 		categories = {
 			category_army
@@ -89,7 +89,7 @@ sub_units = {
 			artillery
 		}
 
-		group = mobile
+		group = mobile_combat_support
 		
 		categories = {
 			category_army
@@ -168,7 +168,7 @@ sub_units = {
 			artillery
 		}
 
-		group = infantry
+		group = combat_support
 		
 		categories = {
 			category_army
@@ -242,7 +242,7 @@ sub_units = {
 			artillery
 		}
 
-		group = mobile
+		group = mobile_combat_support
 		
 		categories = {
 			category_army
@@ -318,7 +318,7 @@ sub_units = {
 			rocket
 		}
 
-		group = mobile
+		group = mobile_combat_support
 
 		categories = {
 			category_army
diff --git a/common/units/bus.txt b/common/units/bus.txt
new file mode 100644
index 00000000000..65fc605c602
--- /dev/null
+++ b/common/units/bus.txt
@@ -0,0 +1,76 @@
+sub_units = { #Per ALbin Bus
+	bus = {
+		abbreviation = "BUS"
+		sprite = motorized
+		map_icon_category = infantry
+		priority = 1000
+		ai_priority = 0
+		active = no
+		affects_speed = no
+		can_be_parachuted = yes
+
+		type = {
+			motorized
+		}
+		
+		group = mobile
+		
+		categories = {
+			#category_support_battalions #To prevent Integrated Support doctrines making them extremely good
+			category_bus
+		}
+
+		combat_width = 2
+		maximum_speed = 6
+		#Size Definitions
+		max_strength = 400 #Inf is 25
+		max_organisation = 100 #Inf is 60
+		default_morale = 0.2 #Inf is 30
+		manpower = 10
+		training_time = 120 #Same as other support battalions
+
+		#Misc Abilities
+		suppression = 0
+		weight = 0.4 #Inf is 0.5
+		supply_consumption = 0.04
+		ap_attack = -1
+		soft_attack = -1 
+		hard_attack = -1
+		defense = 8
+		weight = 1
+		reliability = 0.2
+		breakthrough = -1
+				
+		need = {
+			support_equipment = 5
+			motorized_equipment = 1
+			infantry_equipment = 2
+		}
+
+		forest = {
+			attack = -0.1
+			movement = -0.5
+		}
+		mountain = {
+			attack = -0.05
+		}
+		jungle = {
+			attack = -0.2
+			movement = -0.5
+		}
+		marsh = {
+			attack = -0.1
+			movement = -0.3
+		}
+		urban = {
+			attack = -0.1
+		}
+		river = {
+			attack = -0.1
+			movement = -0.1
+		}
+		amphibious = {
+			attack = -0.2
+		}
+	}
+}
diff --git a/common/units/eaw_infantry.txt b/common/units/eaw_infantry.txt
index 4d15cfc6184..91b8700c9bb 100644
--- a/common/units/eaw_infantry.txt
+++ b/common/units/eaw_infantry.txt
@@ -225,6 +225,7 @@ sub_units = {
 			category_light_infantry
 			category_all_infantry
 			category_special_forces
+			category_racial_special_forces
 			category_army
 		}
 
@@ -294,6 +295,7 @@ sub_units = {
 			category_light_infantry
 			category_all_infantry
 			category_special_forces
+			category_racial_special_forces
 			category_army
 		}
 
@@ -361,6 +363,7 @@ sub_units = {
 			category_light_infantry
 			category_all_infantry
 			category_special_forces
+			category_racial_special_forces	
 			category_army
 		}
 
@@ -378,8 +381,6 @@ sub_units = {
 		weight = 0.6
 
 		supply_consumption = 0.08
-		breakthrough = 0.3
-		hardness = 150
 		breakthrough = 0.5
 		hardness = 250
 		armor_value = 3500
@@ -428,6 +429,7 @@ sub_units = {
 			category_light_infantry
 			category_all_infantry
 			category_special_forces
+			category_racial_special_forces
 			category_army
 		}
 
@@ -561,6 +563,7 @@ sub_units = {
 			category_all_infantry
 			category_army
 			category_special_forces
+			category_racial_special_forces
 		}
 		
 		combat_width = 8
@@ -630,6 +633,7 @@ sub_units = {
 			category_light_infantry
 			category_all_infantry
 			category_special_forces
+			category_racial_special_forces
 			category_army
 		}
 
@@ -717,6 +721,7 @@ sub_units = {
 			category_light_infantry
 			category_all_infantry
 			category_special_forces
+			category_racial_special_forces
 			category_army
 		}
 		
@@ -789,6 +794,7 @@ sub_units = {
             category_all_infantry
             category_army
             category_special_forces
+			category_racial_special_forces
         }
 
         combat_width = 8
@@ -837,6 +843,7 @@ sub_units = {
             category_light_infantry
             category_all_infantry
             category_special_forces
+			category_racial_special_forces
             category_army
         }
 
diff --git a/common/units/eaw_support.txt b/common/units/eaw_support.txt
index 07a8333184e..72b79809471 100644
--- a/common/units/eaw_support.txt
+++ b/common/units/eaw_support.txt
@@ -449,6 +449,7 @@ sub_units = {
 			category_magical
 			category_artillery
 			category_all_artillery
+			category_support_artillery
 		}
 
 
@@ -508,6 +509,10 @@ sub_units = {
             support_equipment = 10
             infantry_equipment = 30
         }
+		battalion_mult = {
+			category = category_all_infantry
+			ap_attack = 0.1
+		}
 
         can_be_parachuted = yes
 
diff --git a/common/units/engineer.txt b/common/units/engineer.txt
index 5ec7f9297ce..0ba69e05374 100644
--- a/common/units/engineer.txt
+++ b/common/units/engineer.txt
@@ -20,7 +20,6 @@ sub_units = {
 			category_front_line
 			category_support_battalions
 			category_army
-			category_engineer
 		}
 
 
@@ -37,7 +36,13 @@ sub_units = {
 		weight = 0.1
 		supply_consumption = 0.02
 
-		entrenchment  = 5
+		entrenchment = 2
+		
+		battalion_mult = {
+			category = category_light_infantry
+			entrenchment = 0.20
+			add = yes
+		}
 
 
 		defense = 0.1
@@ -88,6 +93,90 @@ sub_units = {
 		amphibious = {
 			attack = 0.25
 		}
-		same_support_type = engineer
 	}
+	
+	pioneer_support = {
+		abbreviation = "PIO"
+		sprite = infantry
+		map_icon_category = infantry
+		priority = 0
+		ai_priority = 0
+		active = no
+		affects_speed = no
+
+		type = {
+			infantry
+			support
+		}
+		
+		group = support
+		
+		categories = {
+			category_front_line
+			category_support_battalions
+			category_army
+			category_marines
+		}
+
+	
+		combat_width = 0
+	
+		#Size Definitions
+		max_strength = 2
+		max_organisation = 20
+		default_morale = 0.3
+		manpower = 300
+		training_time = 120
+
+		#Misc Abilities
+		weight = 0.1
+		supply_consumption = 0.02
+		
+		entrenchment = 2
+		
+		battalion_mult = {
+			category = category_marines
+			breakthrough = 0.15
+			#add = yes
+		}
+
+		
+		entrenchment = 2.5
+		defense = 0.1
+		breakthrough = 0.5
+
+		# Support nerfs to combat abilities
+		soft_attack = -0.5
+
+		essential = {
+			support_equipment
+		}
+
+		need = {
+			infantry_equipment = 10
+			support_equipment = 40
+		}
+
+		can_be_parachuted = yes
+
+		marsh = {
+			attack = 0.10
+			defence = 0.20
+			movement = 0.2
+		}
+
+		fort = {
+			attack = 0.15
+			defence = 0.20
+		}
+
+		river = {
+			attack = 0.10
+			defence = 0.20
+			movement = 0.25
+		}
+		
+		
+	}
+	
 }
diff --git a/common/units/equipment/modules/00_plane_modules.txt b/common/units/equipment/modules/00_plane_modules.txt
index 5aa87d3ae04..d4d6bdcdea6 100644
--- a/common/units/equipment/modules/00_plane_modules.txt
+++ b/common/units/equipment/modules/00_plane_modules.txt
@@ -10,12 +10,10 @@ equipment_modules = {
 		sfx = sfx_ui_sd_module_engine
 
 		add_stats = {
-			maximum_speed = 350
-			thrust = 15
+			thrust = 11
 			build_cost_ic = 12
 			fuel_consumption = 0.16
 		}
-
 		
 	}
 
@@ -25,8 +23,7 @@ equipment_modules = {
 		sfx = sfx_ui_sd_module_engine
 
 		add_stats = {
-			maximum_speed = 300
-			thrust = 22
+			thrust = 19
 			build_cost_ic = 24
 			fuel_consumption = 0.32
 		}
@@ -38,8 +35,7 @@ equipment_modules = {
 		sfx = sfx_ui_sd_module_engine
 
 		add_stats = {
-			maximum_speed = 300
-			thrust = 30
+			thrust = 23
 			build_cost_ic = 36
 			fuel_consumption = 0.48
 		}
@@ -51,8 +47,7 @@ equipment_modules = {
 		sfx = sfx_ui_sd_module_engine
 
 		add_stats = {
-			maximum_speed = 300
-			thrust = 37
+			thrust = 32
 			build_cost_ic = 48
 			fuel_consumption = 0.64
 		}
@@ -64,8 +59,7 @@ equipment_modules = {
 		sfx = sfx_ui_sd_module_engine
 
 		add_stats = {
-			maximum_speed = 300
-			thrust = 52.5
+			thrust = 41
 			build_cost_ic = 68
 			fuel_consumption = 0.8
 		}
@@ -78,12 +72,15 @@ equipment_modules = {
 		parent = engine_1_1x
 
 		add_stats = {
-			maximum_speed = 480
 			thrust = 16
 			build_cost_ic = 14
 			fuel_consumption = 0.16
 		}
 
+		multiply_stats = {
+			maximum_speed = 0.20
+		}
+
 		can_convert_from = {
 			module = engine_1_1x
 			convert_cost_ic = 1.5
@@ -97,12 +94,15 @@ equipment_modules = {
 		parent = engine_1_2x
 
 		add_stats = {
-			maximum_speed = 450
-			thrust = 24
+			thrust = 25
 			build_cost_ic = 28
 			fuel_consumption = 0.32
 		}
 
+		multiply_stats = {
+			maximum_speed = 0.20
+		}
+
 		can_convert_from = {
 			module = engine_1_2x
 			convert_cost_ic = 3
@@ -116,12 +116,15 @@ equipment_modules = {
 		parent = engine_1_3x
 
 		add_stats = {
-			maximum_speed = 450
 			thrust = 32
 			build_cost_ic = 42
 			fuel_consumption = 0.48
 		}
 
+		multiply_stats = {
+			maximum_speed = 0.20
+		}
+
 		can_convert_from = {
 			module = engine_1_3x
 			convert_cost_ic = 4.5
@@ -135,11 +138,15 @@ equipment_modules = {
 		parent = engine_1_4x
 
 		add_stats = {
-			maximum_speed = 450
 			thrust = 40
 			build_cost_ic = 56
 			fuel_consumption = 0.64
 		}
+
+		multiply_stats = {
+			maximum_speed = 0.20
+		}
+
 		can_convert_from = {
 			module = engine_1_4x
 			convert_cost_ic = 6
@@ -153,12 +160,15 @@ equipment_modules = {
 		parent = engine_1_6x
 
 		add_stats = {
-			maximum_speed = 450
 			thrust = 56
 			build_cost_ic = 80
 			fuel_consumption = 0.8
 		}
 
+		multiply_stats = {
+			maximum_speed = 0.20
+		}
+
 		can_convert_from = {
 			module = engine_1_6x
 			convert_cost_ic = 9
@@ -172,12 +182,15 @@ equipment_modules = {
 		parent = engine_2_1x
 
 		add_stats = {
-			maximum_speed = 550
-			thrust = 30
+			thrust = 25
 			build_cost_ic = 16
 			fuel_consumption = 0.16
 		}
 
+		multiply_stats = {
+			maximum_speed = 0.30
+		}
+
 		can_convert_from = {
 			module = engine_2_1x
 			convert_cost_ic = 2.5
@@ -191,12 +204,15 @@ equipment_modules = {
 		parent = engine_2_2x
 
 		add_stats = {
-			maximum_speed = 500
-			thrust = 45
-			build_cost_ic =32
+			thrust = 38
+			build_cost_ic = 32
 			fuel_consumption = 0.32
 		}
 
+		multiply_stats = {
+			maximum_speed = 0.30
+		}
+
 		can_convert_from = {
 			module = engine_2_2x
 			convert_cost_ic = 5
@@ -210,12 +226,15 @@ equipment_modules = {
 		parent = engine_2_3x
 
 		add_stats = {
-			maximum_speed = 500
-			thrust = 60
+			thrust = 51
 			build_cost_ic = 48
 			fuel_consumption = 0.48
 		}
 
+		multiply_stats = {
+			maximum_speed = 0.30
+		}
+
 		can_convert_from = {
 			module = engine_2_3x
 			convert_cost_ic = 7.5
@@ -229,12 +248,15 @@ equipment_modules = {
 		parent = engine_2_4x
 
 		add_stats = {
-			maximum_speed = 500
-			thrust = 75
+			thrust = 64
 			build_cost_ic = 64
 			fuel_consumption = 0.64
 		}
 
+		multiply_stats = {
+			maximum_speed = 0.30
+		}
+
 		can_convert_from = {
 			module = engine_2_4x
 			convert_cost_ic = 10
@@ -248,11 +270,15 @@ equipment_modules = {
 		parent = engine_2_6x
 
 		add_stats = {
-			maximum_speed = 500
 			thrust = 90
 			build_cost_ic = 92
 			fuel_consumption = 0.8
 		}
+
+		multiply_stats = {
+			maximum_speed = 0.30
+		}
+
 		can_convert_from = {
 			module = engine_2_4x
 			convert_cost_ic = 15
@@ -266,12 +292,15 @@ equipment_modules = {
 		parent = engine_3_1x
 
 		add_stats = {
-			maximum_speed = 750
-			thrust = 36
+			thrust = 30
 			build_cost_ic = 18
 			fuel_consumption = 0.16
 		}
 
+		multiply_stats = {
+			maximum_speed = 0.45
+		}
+
 		can_convert_from = {
 			module = engine_3_1x
 			convert_cost_ic = 3
@@ -285,11 +314,15 @@ equipment_modules = {
 		parent = engine_3_2x
 
 		add_stats = {
-			maximum_speed = 700
-			thrust = 54
+			thrust = 45
 			build_cost_ic = 36
 			fuel_consumption = 0.32
 		}
+
+		multiply_stats = {
+			maximum_speed = 0.45
+		}
+
 		can_convert_from = {
 			module = engine_3_2x
 			convert_cost_ic = 6
@@ -303,12 +336,15 @@ equipment_modules = {
 		parent = engine_3_3x
 
 		add_stats = {
-			maximum_speed = 700
-			thrust = 72
+			thrust = 60
 			build_cost_ic = 54
 			fuel_consumption = 0.48
 		}
 
+		multiply_stats = {
+			maximum_speed = 0.45
+		}
+
 		can_convert_from = {
 			module = engine_3_3x
 			convert_cost_ic = 9
@@ -322,12 +358,15 @@ equipment_modules = {
 		parent = engine_3_4x
 
 		add_stats = {
-			maximum_speed = 700
-			thrust = 90
+			thrust = 75
 			build_cost_ic = 72
 			fuel_consumption = 0.64
 		}
 
+		multiply_stats = {
+			maximum_speed = 0.45
+		}
+
 		can_convert_from = {
 			module = engine_3_4x
 			convert_cost_ic = 12
@@ -341,11 +380,15 @@ equipment_modules = {
 		parent = engine_3_6x
 
 		add_stats = {
-			maximum_speed = 700
-			thrust = 126
+			thrust = 105
 			build_cost_ic = 108
 			fuel_consumption = 0.8
 		}
+
+		multiply_stats = {
+			maximum_speed = 0.45
+		}
+
 		can_convert_from = {
 			module = engine_3_6x
 			convert_cost_ic = 18
@@ -359,12 +402,16 @@ equipment_modules = {
 		parent = engine_4_1x
 
 		add_stats = {
-			maximum_speed = 900
-			thrust = 40
+			thrust = 25
 			build_cost_ic = 19
 			fuel_consumption = 0.3
 		}
 
+		multiply_stats = {
+			air_range = -0.4
+			maximum_speed = 0.65
+		}
+
 		build_cost_resources = {
 			tungsten = 1
 		}
@@ -382,12 +429,16 @@ equipment_modules = {
 		parent = engine_4_2x
 
 		add_stats = {
-			maximum_speed = 850
-			thrust = 60
+			thrust = 38
 			build_cost_ic = 38
 			fuel_consumption = 0.6
 		}
 
+		multiply_stats = {
+			air_range = -0.4
+			maximum_speed = 0.65
+		}
+
 		build_cost_resources = {
 			tungsten = 1
 		}
@@ -405,11 +456,16 @@ equipment_modules = {
 		parent = engine_4_3x
 
 		add_stats = {
-			maximum_speed = 850
-			thrust = 80
+			thrust = 51
 			build_cost_ic = 57
 			fuel_consumption = 0.9
 		}
+
+		multiply_stats = {
+			air_range = -0.4
+			maximum_speed = 0.65
+		}
+
 		build_cost_resources = {
 			tungsten = 2
 		}
@@ -427,11 +483,16 @@ equipment_modules = {
 		parent = engine_4_4x
 
 		add_stats = {
-			maximum_speed = 850
-			thrust = 100
+			thrust = 64
 			build_cost_ic = 76
 			fuel_consumption = 1.2
 		}
+
+		multiply_stats = {
+			air_range = -0.4
+			maximum_speed = 0.65
+		}
+
 		build_cost_resources = {
 			tungsten = 2
 		}
@@ -448,11 +509,16 @@ equipment_modules = {
 		parent = engine_4_6x
 
 		add_stats = {
-			maximum_speed = 850
-			thrust = 120
+			thrust = 90
 			build_cost_ic = 114
 			fuel_consumption = 1.8
 		}
+
+		multiply_stats = {
+			air_range = -0.4
+			maximum_speed = 0.65
+		}
+
 		build_cost_resources = {
 			tungsten = 3
 		}
@@ -468,11 +534,14 @@ equipment_modules = {
 		sfx = sfx_ui_sd_module_engine
 
 		add_stats = {
-			maximum_speed = 850
-			thrust = 140
+			thrust = 105
 			build_cost_ic = 152
 			fuel_consumption = 2.4
 		}
+		multiply_stats = {
+			air_range = -0.4
+			maximum_speed = 0.65
+		}
 		build_cost_resources = {
 			tungsten = 4
 		}
@@ -488,12 +557,14 @@ equipment_modules = {
 		parent = jet_engine_1x
 
 		add_stats = {
-			maximum_speed = 1100
-			thrust = 48
+			thrust = 32
 			build_cost_ic = 20
 			fuel_consumption = 0.3
 		}
-
+		multiply_stats = {
+			air_range = -0.25
+			maximum_speed = 0.8
+		}
 		build_cost_resources = {
 			tungsten = 1
 		}
@@ -511,12 +582,14 @@ equipment_modules = {
 		parent = jet_engine_2x
 
 		add_stats = {
-			maximum_speed = 1050
-			thrust = 72
+			thrust = 48
 			build_cost_ic = 40
 			fuel_consumption = 0.6
 		}
-
+		multiply_stats = {
+			air_range = -0.25
+			maximum_speed = 0.8
+		}
 		build_cost_resources = {
 			tungsten = 1
 		}
@@ -534,11 +607,14 @@ equipment_modules = {
 		parent = jet_engine_3x
 
 		add_stats = {
-			maximum_speed = 1050
-			thrust = 96
+			thrust = 64
 			build_cost_ic = 60
 			fuel_consumption = 0.9
 		}
+		multiply_stats = {
+			air_range = -0.25
+			maximum_speed = 0.8
+		}
 		build_cost_resources = {
 			tungsten = 2
 		}
@@ -556,11 +632,14 @@ equipment_modules = {
 		parent = jet_engine_4x
 
 		add_stats = {
-			maximum_speed = 1050
-			thrust = 120
+			thrust = 95
 			build_cost_ic = 80
 			fuel_consumption = 1.2
 		}
+		multiply_stats = {
+			air_range = -0.25
+			maximum_speed = 0.8
+		}
 		build_cost_resources = {
 			tungsten = 2
 		}
@@ -577,11 +656,14 @@ equipment_modules = {
 		parent = engine_4_6x
 
 		add_stats = {
-			maximum_speed = 1050
-			thrust = 144
+			thrust = 114
 			build_cost_ic = 120
 			fuel_consumption = 1.8
 		}
+		multiply_stats = {
+			air_range = -0.25
+			maximum_speed = 0.8
+		}
 		build_cost_resources = {
 			tungsten = 3
 		}
@@ -598,11 +680,14 @@ equipment_modules = {
 		parent = jet_engine_8x
 
 		add_stats = {
-			maximum_speed = 1050
-			thrust = 168
+			thrust = 135
 			build_cost_ic = 160
 			fuel_consumption = 2.4
 		}
+		multiply_stats = {
+			air_range = -0.25
+			maximum_speed = 0.8
+		}
 		build_cost_resources = {
 			tungsten = 4
 		}
@@ -611,7 +696,7 @@ equipment_modules = {
 			convert_cost_ic = 40
 		}
 	}
-	
+
 	fast_jet_engine_6x = { # special snowflake
 		abbreviation = "fj6"
 		category = super_large_plane_jet_engine_type
@@ -619,13 +704,13 @@ equipment_modules = {
 		parent = jet_engine_8x
 
 		add_stats = {
-			maximum_speed = 2800
-			thrust = 144
+			thrust = 135
 			build_cost_ic = 240
 			fuel_consumption = 4.8
 		}
 		multiply_stats = {
-			air_range = -0.5
+			air_range = -0.7
+			maximum_speed = 2.6
 		}
 		build_cost_resources = {
 			tungsten = 4
@@ -642,13 +727,13 @@ equipment_modules = {
 		sfx = sfx_ui_sd_module_engine
 
 		add_stats = {
-			maximum_speed = 700
 			thrust = 40
 			build_cost_ic = 15
 
 		}
 		multiply_stats = {
-			air_range = -0.9
+			air_range = -0.85
+			maximum_speed = 0.80
 		}
 		build_cost_resources = {
 			tungsten = 3
@@ -662,12 +747,12 @@ equipment_modules = {
 		sfx = sfx_ui_sd_module_engine
 
 		add_stats = {
-			maximum_speed = 800
 			thrust = 45
 			build_cost_ic = 16
 		}
 		multiply_stats = {
-			air_range = -0.85
+			air_range = -0.75
+			maximum_speed = 0.85
 		}
 		build_cost_resources = {
 			tungsten = 3
@@ -681,31 +766,31 @@ equipment_modules = {
 		sfx = sfx_ui_sd_module_engine
 
 		add_stats = {
-			maximum_speed = 1000
+
 			thrust = 50
 			build_cost_ic = 17
 		}
 		multiply_stats = {
-			air_range = -0.8
+			air_range = -0.7
+			maximum_speed = 0.90
 		}
 		build_cost_resources = {
 			tungsten = 3
 		}
 		dismantle_cost_ic = 10
 	}
-
 	rocket_engine_4 = { #rocket engines only come in sets of 1
 		abbreviation = "re4"
 		category = plane_rocket_engine_type
 		sfx = sfx_ui_sd_module_engine
 
 		add_stats = {
-			maximum_speed = 1300
 			thrust = 55
 			build_cost_ic = 18
 		}
 		multiply_stats = {
-			air_range = -0.75
+			air_range = -0.65
+			maximum_speed = 1.00
 		}
 		build_cost_resources = {
 			crystals = 3
@@ -719,12 +804,12 @@ equipment_modules = {
 		sfx = sfx_ui_sd_module_engine
 
 		add_stats = {
-			maximum_speed = 1700
 			thrust = 60
 			build_cost_ic = 19
 		}
 		multiply_stats = {
-			air_range = -0.7
+			air_range = -0.6
+			maximum_speed = 1.20
 		}
 		build_cost_resources = {
 			crystals = 3
@@ -732,6 +817,7 @@ equipment_modules = {
 		dismantle_cost_ic = 19
 	}
 
+
 ##      ## ########    ###    ########   #######  ##    ##  ######  
 ##  ##  ## ##         ## ##   ##     ## ##     ## ###   ## ##    ## 
 ##  ##  ## ##        ##   ##  ##     ## ##     ## ####  ## ##       
@@ -744,7 +830,7 @@ equipment_modules = {
 		abbreviation = "lmg2"
 		category = fighter_weapon
 		sfx = sfx_ui_sd_module_turret
-		add_equipment_type = fighter
+		add_equipment_type = { fighter heavy_fighter }
 
 		add_stats = {
 			air_attack = 4
@@ -762,7 +848,7 @@ equipment_modules = {
 		abbreviation = "lmg4"
 		category = fighter_weapon
 		sfx = sfx_ui_sd_module_turret
-		add_equipment_type = fighter
+		add_equipment_type = { fighter heavy_fighter }
 
 		add_stats = {
 			air_attack = 8
@@ -784,12 +870,12 @@ equipment_modules = {
 		abbreviation = "hmg2"
 		category = fighter_weapon
 		sfx = sfx_ui_sd_module_turret
-		add_equipment_type = fighter
+		add_equipment_type = { fighter heavy_fighter }
 
 		add_stats = {
 			air_attack = 6
 			build_cost_ic = 1.5
-			weight = 1
+			weight = 2
 		}
 		xp_cost = 1
 		allow_mission_type = {
@@ -802,12 +888,12 @@ equipment_modules = {
 		abbreviation = "hmg4"
 		category = fighter_weapon
 		sfx = sfx_ui_sd_module_turret
-		add_equipment_type = fighter
+		add_equipment_type = { fighter heavy_fighter }
 
 		add_stats = {
 			air_attack = 12
 			build_cost_ic = 3
-			weight = 2
+			weight = 4
 		}
 		xp_cost = 2
 		allow_mission_type = {
@@ -832,13 +918,13 @@ equipment_modules = {
 		abbreviation = "ac11"
 		category = fighter_weapon
 		sfx = sfx_ui_sd_module_turret
-		add_equipment_type = fighter
+		add_equipment_type = { fighter heavy_fighter }
 
 		add_stats = {
 			air_attack = 10
-			build_cost_ic = 3
-			air_agility = -3
-			weight = 4
+			build_cost_ic = 2.5
+			air_agility = -2.5
+			weight = 3
 		}
 		xp_cost = 1
 		allow_mission_type = {
@@ -851,13 +937,13 @@ equipment_modules = {
 		abbreviation = "ac12"
 		category = fighter_weapon
 		sfx = sfx_ui_sd_module_turret
-		add_equipment_type = fighter
+		add_equipment_type = { fighter heavy_fighter }
 
 		add_stats = {
 			air_attack = 20
-			build_cost_ic = 6
-			air_agility = -6
-			weight = 8
+			build_cost_ic = 5
+			air_agility = -5
+			weight = 6
 		}
 		xp_cost = 2
 		allow_mission_type = {
@@ -879,16 +965,16 @@ equipment_modules = {
 	}
 
 	aircraft_cannon_2_1x = {
-		abbreviation = "ac21"
+		abbreviation = "ac31"
 		category = fighter_weapon
 		sfx = sfx_ui_sd_module_turret
 		parent = aircraft_cannon_1_1x
-		add_equipment_type = fighter
+		add_equipment_type = { fighter heavy_fighter }
 		add_stats = {
 			air_attack = 12
-			build_cost_ic = 4
-			air_agility = -3
-			weight = 5
+			build_cost_ic = 3
+			air_agility = -2
+			weight = 3
 		}
 		xp_cost = 1
 		allow_mission_type = {
@@ -898,16 +984,16 @@ equipment_modules = {
 	}
 
 	aircraft_cannon_2_2x = {
-		abbreviation = "ac22"
+		abbreviation = "ac32"
 		category = fighter_weapon
 		sfx = sfx_ui_sd_module_turret
 		parent = aircraft_cannon_1_2x
-		add_equipment_type = fighter
+		add_equipment_type = { fighter heavy_fighter }
 		add_stats = {
 			air_attack = 24
-			build_cost_ic = 8
-			air_agility = -6
-			weight = 10
+			build_cost_ic = 6
+			air_agility = -4
+			weight = 6
 		}
 		xp_cost = 2
 		allow_mission_type = {
@@ -929,17 +1015,17 @@ equipment_modules = {
 	}
 
 	aircraft_cannon_3_1x = {
-		abbreviation = "ac31"
+		abbreviation = "ac41"
 		category = fighter_weapon
 		sfx = sfx_ui_sd_module_turret
 		parent = aircraft_cannon_2_1x
-		add_equipment_type = fighter
+		add_equipment_type = { fighter heavy_fighter }
 		add_stats = {
 			air_attack = 14
 			air_ground_attack = 2
-			build_cost_ic = 5
-			air_agility = -3
-			weight = 6
+			build_cost_ic = 3.5
+			air_agility = -1.5
+			weight = 3
 		}
 		xp_cost = 1
 		allow_mission_type = {
@@ -949,17 +1035,17 @@ equipment_modules = {
 	}
 
 	aircraft_cannon_3_2x = {
-		abbreviation = "ac32"
+		abbreviation = "ac42"
 		category = fighter_weapon
 		sfx = sfx_ui_sd_module_turret
 		parent = aircraft_cannon_2_2x
-		add_equipment_type = fighter
+		add_equipment_type = { fighter heavy_fighter }
 		add_stats = {
 			air_attack = 28
 			air_ground_attack = 4
-			build_cost_ic = 10
-			air_agility = -6
-			weight = 12
+			build_cost_ic = 7
+			air_agility = -3
+			weight = 6
 		}
 		xp_cost = 2
 		allow_mission_type = {
@@ -973,17 +1059,17 @@ equipment_modules = {
 	}
 
 	aircraft_cannon_4_1x = {
-		abbreviation = "ac41"
+		abbreviation = "ac51"
 		category = fighter_weapon
 		sfx = sfx_ui_sd_module_turret
 		parent = aircraft_cannon_3_1x
-		add_equipment_type = fighter
+		add_equipment_type = { fighter heavy_fighter }
 		add_stats = {
 			air_attack = 16
 			air_ground_attack = 3
-			build_cost_ic = 6
-			air_agility = -3
-			weight = 7
+			build_cost_ic = 4
+			air_agility = -1
+			weight = 3
 		}
 		xp_cost = 1
 		allow_mission_type = {
@@ -993,17 +1079,17 @@ equipment_modules = {
 	}
 
 	aircraft_cannon_4_2x = {
-		abbreviation = "ac42"
+		abbreviation = "ac52"
 		category = fighter_weapon
 		sfx = sfx_ui_sd_module_turret
 		parent = aircraft_cannon_3_2x
-		add_equipment_type = fighter
+		add_equipment_type = { fighter heavy_fighter }
 		add_stats = {
 			air_attack = 32
 			air_ground_attack = 6
-			build_cost_ic = 12
-			air_agility = -6
-			weight = 14
+			build_cost_ic = 8
+			air_agility = -2
+			weight = 6
 		}
 		xp_cost = 2
 		allow_mission_type = {
@@ -1016,6 +1102,56 @@ equipment_modules = {
 		}
 	}
 
+	large_aircraft_cannon_1x = {
+		abbreviation = "ac21"
+		category = fighter_weapon
+		sfx = sfx_ui_sd_module_turret
+		parent = aircraft_cannon_1_1x
+		add_equipment_type = { fighter heavy_fighter }
+		add_stats = {
+			air_attack = 11
+			build_cost_ic = 3
+			air_agility = -4
+			weight = 5
+		}
+		xp_cost = 1
+		allow_mission_type = {
+			air_superiority
+			interception
+		}
+	}
+
+	large_aircraft_cannon_2x = {
+		abbreviation = "ac22"
+		category = fighter_weapon
+		sfx = sfx_ui_sd_module_turret
+		parent = aircraft_cannon_1_2x
+		add_equipment_type = { fighter heavy_fighter }
+		add_stats = {
+			air_attack = 22
+			build_cost_ic = 6
+			air_agility = -8
+			weight = 10
+		}
+		xp_cost = 2
+		allow_mission_type = {
+			air_superiority
+			interception
+		}
+		mission_type_stats = {
+			limit = {
+				attack_logistics
+			}
+			add_stats = {
+				air_ground_attack = 2
+			}
+		}
+		can_convert_from = {
+			module = aircraft_cannon_2_1x
+			convert_cost_ic = 4
+		}
+	}
+
 	bomb_locks = {
 		abbreviation = "bol"
 		category = cas_weapon
@@ -1037,7 +1173,7 @@ equipment_modules = {
 				attack_logistics
 			}
 			add_stats = {
-				air_agility = -20
+				air_agility = -15
 				weight = 4
 				air_ground_attack = 6
 			}
@@ -1052,7 +1188,91 @@ equipment_modules = {
 				naval_strike_attack = 2
 			}
 			add_average_stats = {
-				naval_strike_targetting = 6
+				naval_strike_targetting = 4
+			}
+		}
+		dismantle_cost_ic = 0.5
+	}
+
+	heavy_bomb_locks = {
+		abbreviation = "bol"
+		category = cas_weapon
+		sfx = sfx_ui_sd_module_turret
+		add_equipment_type = cas
+
+		add_stats = {
+			build_cost_ic = 1
+		}
+		xp_cost = 2
+		allow_mission_type = {
+			cas
+			attack_logistics
+			naval_bomber
+		}
+		mission_type_stats = {
+			limit = {
+				cas
+				attack_logistics
+			}
+			add_stats = {
+				air_agility = -20
+				weight = 6
+				air_ground_attack = 8
+			}
+		}
+		mission_type_stats = {
+			limit = {
+				naval_bomber
+			}
+			add_stats = {
+				air_agility = -20
+				weight = 6
+				naval_strike_attack = 3
+			}
+			add_average_stats = {
+				naval_strike_targetting = 4
+			}
+		}
+		dismantle_cost_ic = 0.5
+	}
+
+	armor_piercing_bomb_locks = {
+		abbreviation = "bol"
+		category = cas_weapon
+		sfx = sfx_ui_sd_module_turret
+		add_equipment_type = cas
+
+		add_stats = {
+			build_cost_ic = 1
+		}
+		xp_cost = 2
+		allow_mission_type = {
+			cas
+			attack_logistics
+			naval_bomber
+		}
+		mission_type_stats = {
+			limit = {
+				cas
+				attack_logistics
+			}
+			add_stats = {
+				air_agility = -20
+				weight = 6
+				air_ground_attack = 2
+			}
+		}
+		mission_type_stats = {
+			limit = {
+				naval_bomber
+			}
+			add_stats = {
+				air_agility = -20
+				weight = 6
+				naval_strike_attack = 6
+			}
+			add_average_stats = {
+				naval_strike_targetting = 4
 			}
 		}
 		dismantle_cost_ic = 0.5
@@ -1091,7 +1311,6 @@ equipment_modules = {
 		sfx = sfx_ui_sd_module_turret
 		add_equipment_type = cas
 		parent = rocket_rails
-
 		add_stats = {
 			build_cost_ic = 3
 		}
@@ -1121,8 +1340,8 @@ equipment_modules = {
 
 		add_stats = {
 			build_cost_ic = 3
-			air_agility = -15
-			weight = 5
+			weight = 2
+			
 		}
 		xp_cost = 2
 		allow_mission_type = {
@@ -1137,7 +1356,8 @@ equipment_modules = {
 			}
 			add_stats = {
 				air_ground_attack = 8
-				weight = 0
+				weight = 4
+				air_agility = -15
 			}
 		}
 		mission_type_stats = {
@@ -1146,7 +1366,8 @@ equipment_modules = {
 			}
 			add_stats = {
 				naval_strike_attack = 2
-				weight = 0
+				weight = 4
+				air_agility = -15
 			}
 			add_average_stats = {
 				naval_strike_targetting = 4
@@ -1163,8 +1384,7 @@ equipment_modules = {
 
 		add_stats = {
 			build_cost_ic = 6
-			air_agility = -5
-			weight = 6
+			weight = 1
 		}
 		xp_cost = 2
 		allow_mission_type = {
@@ -1180,8 +1400,9 @@ equipment_modules = {
 				port_strike
 			}
 			add_stats = {
-				air_ground_attack = 3
-				weight = 0
+				air_ground_attack = 6
+				weight = 5
+				air_agility = -15
 			}
 		}
 		mission_type_stats = {
@@ -1190,7 +1411,8 @@ equipment_modules = {
 			}
 			add_stats = {
 				air_bombing = 6
-				weight = 0
+				weight = 5
+				air_agility = -15
 			}
 		}
 		dismantle_cost_ic = 7
@@ -1204,8 +1426,8 @@ equipment_modules = {
 
 		add_stats = {
 			build_cost_ic = 9
-			air_agility = -10
-			weight = 10
+			air_agility = -15
+			weight = 2
 		}
 		xp_cost = 2
 		allow_mission_type = {
@@ -1218,7 +1440,7 @@ equipment_modules = {
 			}
 			add_stats = {
 				air_bombing = 15
-				weight = 0
+				weight = 8
 			}
 		}
 		mission_type_stats = {
@@ -1227,22 +1449,20 @@ equipment_modules = {
 			}
 			add_stats = {
 				naval_strike_attack = 2
-				weight = 0
+				weight = 8
 			}
 		}
 		dismantle_cost_ic = 12
 	}
-
 	super_large_bomb_bay = {
 		abbreviation = "slbb"
 		category = super_strat_weapon
 		sfx = sfx_ui_sd_module_turret
 		add_equipment_type = strategic_bomber
-
 		add_stats = {
 			build_cost_ic = 18
-			air_agility = -20
-			weight = 20
+			air_agility = -30
+			weight = 4
 		}
 		xp_cost = 2
 		allow_mission_type = {
@@ -1255,7 +1475,7 @@ equipment_modules = {
 			}
 			add_stats = {
 				air_bombing = 30
-				weight = 0
+				weight = 16
 			}
 		}
 		mission_type_stats = {
@@ -1264,14 +1484,12 @@ equipment_modules = {
 			}
 			add_stats = {
 				naval_strike_attack = 4
-				weight = 0
+				weight = 16
 			}
 		}
 		dismantle_cost_ic = 24
 	}
 
-
-
 	tank_buster_1 = {
 		abbreviation = "tb1"
 		category = cas_weapon
@@ -1325,13 +1543,109 @@ equipment_modules = {
 		}
 		xp_cost = 2
 		allow_mission_type = {
-			cas
-			attack_logistics
+			cas
+			attack_logistics
+		}
+		dismantle_cost_ic = 5.5
+	}
+
+	torpedo_mounting = {
+		abbreviation = "tpm"
+		category = nav_bomber_weapon
+		sfx = sfx_ui_sd_module_turret
+		add_equipment_type = { naval_bomber maritime_patrol_plane }
+
+		add_stats = {
+			build_cost_ic = 4
+		}
+		xp_cost = 2
+		allow_mission_type = {
+			naval_bomber
+			port_strike
+			naval_patrol
+		}
+		mission_type_stats = {
+			limit = {
+				naval_bomber
+				port_strike
+			}
+			add_stats = {
+				air_agility = -12
+				weight = 5
+				naval_strike_attack = 12
+			}
+			add_average_stats = {
+				naval_strike_targetting = 4
+			}
+		}
+		dismantle_cost_ic = 1.5
+	}
+
+	torpedo_mounting_2 = {
+		abbreviation = "tpm"
+		category = nav_bomber_weapon
+		sfx = sfx_ui_sd_module_turret
+		add_equipment_type = { naval_bomber maritime_patrol_plane }
+
+		add_stats = {
+			build_cost_ic = 4
+		}
+		xp_cost = 2
+		allow_mission_type = {
+			naval_bomber
+			port_strike
+			naval_patrol
+		}
+		mission_type_stats = {
+			limit = {
+				naval_bomber
+				port_strike
+			}
+			add_stats = {
+				air_agility = -12
+				weight = 8
+				naval_strike_attack = 17
+			}
+			add_average_stats = {
+				naval_strike_targetting = 8
+			}
+		}
+		dismantle_cost_ic = 1.5
+	}
+
+	torpedo_mounting_3 = {
+		abbreviation = "tpm"
+		category = nav_bomber_weapon
+		sfx = sfx_ui_sd_module_turret
+		add_equipment_type = { naval_bomber maritime_patrol_plane }
+
+		add_stats = {
+			build_cost_ic = 4
+		}
+		xp_cost = 2
+		allow_mission_type = {
+			naval_bomber
+			port_strike
+			naval_patrol
 		}
-		dismantle_cost_ic = 5.5
+		mission_type_stats = {
+			limit = {
+				naval_bomber
+				port_strike
+			}
+			add_stats = {
+				air_agility = -12
+				weight = 11
+				naval_strike_attack = 22
+			}
+			add_average_stats = {
+				naval_strike_targetting = 10
+			}
+		}
+		dismantle_cost_ic = 1.5
 	}
 
-	torpedo_mounting = {
+	torpedo_mounting_4 = {
 		abbreviation = "tpm"
 		category = nav_bomber_weapon
 		sfx = sfx_ui_sd_module_turret
@@ -1353,11 +1667,11 @@ equipment_modules = {
 			}
 			add_stats = {
 				air_agility = -12
-				weight = 8
-				naval_strike_attack = 14
+				weight = 14
+				naval_strike_attack = 27
 			}
 			add_average_stats = {
-				naval_strike_targetting = 6
+				naval_strike_targetting = 12
 			}
 		}
 		dismantle_cost_ic = 1.5
@@ -1423,9 +1737,9 @@ equipment_modules = {
 				port_strike
 			}
 			add_stats = {
-				air_agility = -10
-				weight = 15
-				naval_strike_attack = 8
+				air_agility = -20
+				weight = 20
+				naval_strike_attack = 25
 			}
 			add_average_stats = {
 				naval_strike_targetting = 15 # increased from vanilla because we delay it 6 years
@@ -1433,6 +1747,7 @@ equipment_modules = {
 		}
 	}
 
+	
 	guided_air_to_surface_missile = {
 		abbreviation = "atsm"
 		category = cas_weapon
@@ -1464,9 +1779,9 @@ equipment_modules = {
 		abbreviation = "atam"
 		category = fighter_weapon
 		sfx = sfx_ui_sd_module_turret
-		add_equipment_type = fighter
+		add_equipment_type = { fighter heavy_fighter }
 		add_stats = {
-			air_attack = 30
+			air_attack = 35
 			build_cost_ic = 15
 			weight = 15
 		}
@@ -1498,18 +1813,18 @@ equipment_modules = {
 				naval_kamikaze
 			}
 			add_stats = {
-				naval_strike_attack = 5
+				naval_strike_attack = 6
 				naval_strike_targetting = 15
 			}
 		}
 		dismantle_cost_ic = 4
 	}
-
+	
 	hardpoint = {
 		abbreviation = "hard"
 		category = fighter_weapon
 		sfx = sfx_ui_sd_module_turret
-		add_equipment_type = fighter
+		add_equipment_type = { fighter heavy_fighter }
 	
 		add_stats = {
 			build_cost_ic = 12
@@ -1557,15 +1872,13 @@ equipment_modules = {
 		}
 		dismantle_cost_ic = 0.5
 	}
-
 	nuclear_air_to_air_rocket = { # special snowflake
 		abbreviation = "naar"
 		category = fighter_weapon
 		sfx = sfx_ui_sd_module_turret
-		add_equipment_type = fighter
-
+		add_equipment_type = { fighter heavy_fighter }
 		add_stats = {
-			air_attack = 35
+			air_attack = 40
 			build_cost_ic = 20
 			air_agility = -15
 			weight = 15
@@ -1612,10 +1925,10 @@ equipment_modules = {
 		add_stats = {
 			air_defence = -2
 			build_cost_ic = 1
-			weight = 1
+			weight = 2
 		}
 		multiply_stats = {
-			air_range = 0.15
+			air_range = 0.5
 		}
 		xp_cost = 1
 		dismantle_cost_ic = 0.5
@@ -1647,12 +1960,12 @@ equipment_modules = {
 			air_defence = -6
 			build_cost_ic = 0
 		}
-		build_cost_resources = {
-			aluminium = -2
-		}
 		multiply_stats = {
 			build_cost_ic = -0.075
 		}
+		build_cost_resources = {
+			aluminium = -2
+		}
 		dismantle_cost_ic = 7
 		dismantle_cost_resources = {
 			aluminium = 2
@@ -1667,8 +1980,11 @@ equipment_modules = {
 
 		add_stats = {
 			build_cost_ic = 2
-			air_range = 300
-			weight = 2
+			weight = 3
+		}
+
+		multiply_stats = {
+			air_range = 0.25
 		}
 		xp_cost = 1
 	}
@@ -1683,8 +1999,8 @@ equipment_modules = {
 		}
 
 		add_stats = {
-			build_cost_ic = 1
-			weight = 1
+			build_cost_ic = 2
+			weight = 2
 		}
 
 		mission_type_stats = {
@@ -1744,8 +2060,9 @@ equipment_modules = {
 		}
 
 		multiply_stats = {
-			build_cost_ic = 0.2
+			build_cost_ic = 0.3
 			air_agility = 0.15
+			thrust = 0.15
 			maximum_speed = 0.15
 		}
 		build_cost_resources = {
@@ -1788,10 +2105,10 @@ equipment_modules = {
 		add_stats = {
 			air_defence = -6
 			build_cost_ic = 2
-			weight = 4
+			weight = 5
 		}
 		multiply_stats = {
-			air_range = 0.15
+			air_range = 0.5
 		}
 		xp_cost = 1
 		dismantle_cost_ic = 1
@@ -1896,10 +2213,11 @@ equipment_modules = {
 		}
 
 		multiply_stats = {
-			build_cost_ic = 0.2
+			build_cost_ic = 0.3
 			air_defence = 0.075
 			air_agility = 0.075
 			maximum_speed = 0.15
+			thrust = 0.15
 		}
 		build_cost_resources = {
 			aluminium = 1
@@ -1941,10 +2259,10 @@ equipment_modules = {
 		add_stats = {
 			air_defence = -8
 			build_cost_ic = 4
-			weight = 6
+			weight = 8
 		}
 		multiply_stats = {
-			air_range = 0.15
+			air_range = 0.50
 		}
 		xp_cost = 1
 		dismantle_cost_ic = 1.5
@@ -2044,9 +2362,10 @@ equipment_modules = {
 		}
 
 		multiply_stats = {
-			build_cost_ic = 0.2
+			build_cost_ic = 0.3
 			air_defence = 0.15
 			maximum_speed = 0.15
+			thrust = 0.15
 		}
 		build_cost_resources = {
 			aluminium = 1
@@ -2177,7 +2496,7 @@ equipment_modules = {
 
 		add_stats = {
 				build_cost_ic = 2
-				weight = 1
+				weight = 2
 			}
 
 		mission_type_stats = {
@@ -2206,7 +2525,7 @@ equipment_modules = {
 
 		add_stats = {
 				build_cost_ic = 3.5
-				weight = 1
+				weight = 2
 		}
 
 		mission_type_stats = {
@@ -2235,7 +2554,7 @@ equipment_modules = {
 
 		add_stats = {
 				build_cost_ic = 5
-				weight = 1
+				weight = 2
 		}
 
 		mission_type_stats = {
@@ -2274,7 +2593,7 @@ equipment_modules = {
 
 		add_stats = {
 				build_cost_ic = 6.5
-				weight = 1
+				weight = 2
 		}
 
 		mission_type_stats = {
@@ -2334,7 +2653,7 @@ equipment_modules = {
 
 		add_stats = {
 			build_cost_ic = 6
-			weight = 1
+			weight = 2
 		}
 		mission_type_stats = {
 			limit = {
@@ -2356,7 +2675,7 @@ equipment_modules = {
 
 		add_stats = {
 			build_cost_ic = 8
-			weight = 1
+			weight = 3
 		}
 		multiply_stats = {
 			air_attack = 0.05
@@ -2389,7 +2708,7 @@ equipment_modules = {
 
 		add_stats = {
 			build_cost_ic = 10
-			weight = 1
+			weight = 4
 		}
 		multiply_stats = {
 			air_attack = 0.1
@@ -2427,10 +2746,32 @@ equipment_modules = {
 		sfx = sfx_ui_sd_module_turret
 
 		add_stats = {
-			air_attack = 4
-			air_agility = -2
 			build_cost_ic = 1
+			weight = 1
+			air_attack = 1
+			air_defence = 1
+		}
+
+		mission_type_stats = {
+			limit = {
+				naval_bomber
+				port_strike
+				strategic_bomber
+				naval_patrol
+				cas
+				attack_logistics
+				naval_mines_planting
+			}
+
+			add_stats = {
+				air_agility = 0.5
+			}
+		}
+
+		multiply_stats ={
+			maximum_speed = -0.03
 		}
+
 		dismantle_cost_ic = 1
 		can_convert_from = {
 			module_category = plane_special_module_defense_turret
@@ -2449,18 +2790,40 @@ equipment_modules = {
 
 	lmg_defense_turret_2x = {
 		abbreviation = "lmgt2"
-		category = plane_special_module_defense_turret
+		category = plane_special_module_defense_turret_x2
+		gui_category = plane_special_module_defense_turret
 		sfx = sfx_ui_sd_module_turret
 
 		add_stats = {
-			air_attack = 6
-			air_agility = -3
 			build_cost_ic = 2
-			weight = 1
+			weight = 2
+			air_attack = 1.5
+			air_defence = 2
+		}
+
+		mission_type_stats = {
+			limit = {
+				naval_bomber
+				port_strike
+				strategic_bomber
+				naval_patrol
+				cas
+				attack_logistics
+				naval_mines_planting
+			}
+
+			add_stats = {
+				air_agility = 1
+			}
+		}
+
+		multiply_stats ={
+			maximum_speed = -0.06
 		}
+
 		dismantle_cost_ic = 2
 		can_convert_from = {
-			module_category = plane_special_module_defense_turret
+			module_category = plane_special_module_defense_turret_x2
 			convert_cost_ic = 2.5
 		}
 		can_convert_from = {
@@ -2477,14 +2840,35 @@ equipment_modules = {
 	hmg_defense_turret = {
 		abbreviation = "hmgt"
 		category = plane_special_module_defense_turret
+		gui_category = plane_special_module_defense_turret
 		sfx = sfx_ui_sd_module_turret
 
 		add_stats = {
-			air_attack = 6
-			air_agility = -3
 			build_cost_ic = 2
 			weight = 2
+			air_attack = 1.5
+			air_defence = 2
+		}
+
+		mission_type_stats = {
+			limit = {
+				naval_bomber
+				port_strike
+				strategic_bomber
+				naval_patrol
+				cas
+				attack_logistics
+				naval_mines_planting
+			}
+			add_stats = {
+				air_agility = 1
+			}
+		}
+
+		multiply_stats ={
+			maximum_speed = -0.035
 		}
+
 		dismantle_cost_ic = 1
 		can_convert_from = {
 			module_category = plane_special_module_defense_turret
@@ -2503,18 +2887,39 @@ equipment_modules = {
 
 	hmg_defense_turret_2x = {
 		abbreviation = "hmgt2"
-		category = plane_special_module_defense_turret
+		category = plane_special_module_defense_turret_x2
+		gui_category = plane_special_module_defense_turret
 		sfx = sfx_ui_sd_module_turret
 
-		add_stats = {
-			air_attack = 10
-			air_agility = -6
+		add_stats = {	
 			build_cost_ic = 4
 			weight = 4
+			air_attack = 3
+			air_defence = 4
+		}
+
+		mission_type_stats = {
+			limit = {
+				naval_bomber
+				port_strike
+				strategic_bomber
+				naval_patrol
+				cas
+				attack_logistics
+				naval_mines_planting
+			}
+			add_stats = {
+				air_agility = 2
+			}
+		}
+
+		multiply_stats ={
+			maximum_speed = -0.07
 		}
+
 		dismantle_cost_ic = 2
 		can_convert_from = {
-			module_category = plane_special_module_defense_turret
+			module_category = plane_special_module_defense_turret_x2
 			convert_cost_ic = 4
 		}
 		can_convert_from = {
@@ -2531,14 +2936,35 @@ equipment_modules = {
 	cannon_defense_turret = {
 		abbreviation = "cat"
 		category = plane_special_module_defense_turret
+		gui_category = plane_special_module_defense_turret
 		sfx = sfx_ui_sd_module_turret
 
 		add_stats = {
-			air_attack = 8
-			air_agility = -4
 			build_cost_ic = 4
 			weight = 4
+			air_attack = 3
+			air_defence = 4
+		}
+
+		mission_type_stats = {
+			limit = {
+				naval_bomber
+				port_strike
+				strategic_bomber
+				naval_patrol
+				cas
+				attack_logistics
+				naval_mines_planting
+			}
+			add_stats = {
+				air_agility = 2
+			}
+		}
+
+		multiply_stats ={
+			maximum_speed = -0.037
 		}
+
 		dismantle_cost_ic = 1
 		can_convert_from = {
 			module_category = plane_special_module_defense_turret
@@ -2553,18 +2979,39 @@ equipment_modules = {
 
 	cannon_defense_turret_2x = {
 		abbreviation = "cat2"
-		category = plane_special_module_defense_turret
+		category = plane_special_module_defense_turret_x2
+		gui_category = plane_special_module_defense_turret
 		sfx = sfx_ui_sd_module_turret
 
 		add_stats = {
-			air_attack = 14
-			air_agility = -7
 			build_cost_ic = 8
 			weight = 8
+			air_attack = 6
+			air_defence = 8
+		}
+
+		mission_type_stats = {
+			limit = {
+				naval_bomber
+				port_strike
+				strategic_bomber
+				naval_patrol
+				cas
+				attack_logistics
+				naval_mines_planting
+			}
+			add_stats = {
+				air_agility = 4
+			}
+		}
+
+		multiply_stats ={
+			maximum_speed = -0.075
 		}
+
 		dismantle_cost_ic = 2
 		can_convert_from = {
-			module_category = plane_special_module_defense_turret
+			module_category = plane_special_module_defense_turret_x2
 			convert_cost_ic = 6
 		}
 		can_convert_from = {
@@ -2574,4 +3021,92 @@ equipment_modules = {
 		xp_cost = 1
 	}
 
+	cannon_defense_turret_2 = {
+		abbreviation = "cat21"
+		category = plane_special_module_defense_turret
+		gui_category = plane_special_module_defense_turret
+		sfx = sfx_ui_sd_module_turret
+
+		add_stats = {
+			build_cost_ic = 6
+			weight = 6
+			air_attack = 5
+			air_defence = 6
+		}
+
+		mission_type_stats = {
+			limit = {
+				naval_bomber
+				port_strike
+				strategic_bomber
+				naval_patrol
+				cas
+				attack_logistics
+				naval_mines_planting
+			}
+			add_stats = {
+				air_agility = 3
+			}
+		}
+
+		multiply_stats ={
+			maximum_speed = -0.04
+		}
+
+		dismantle_cost_ic = 1
+		can_convert_from = {
+			module_category = plane_special_module_defense_turret
+			convert_cost_ic = 4
+		}
+		can_convert_from = {
+			module = cannon_defense_turret
+			convert_cost_ic = 2.5
+		}
+		xp_cost = 1
+	}
+
+	cannon_defense_turret_2_2x = {
+		abbreviation = "cat22"
+		category = plane_special_module_defense_turret_x2
+		gui_category = plane_special_module_defense_turret
+		sfx = sfx_ui_sd_module_turret
+
+		add_stats = {
+			build_cost_ic = 12
+			weight = 12
+			air_attack = 10
+			air_defence = 12
+		}
+
+		mission_type_stats = {
+			limit = {
+				naval_bomber
+				port_strike
+				strategic_bomber
+				naval_patrol
+				cas
+				attack_logistics
+				naval_mines_planting
+			}
+			add_stats = {
+				air_agility = 6
+			}
+		}
+
+		multiply_stats ={
+			maximum_speed = -0.08
+		}
+
+		dismantle_cost_ic = 2
+		can_convert_from = {
+			module_category = plane_special_module_defense_turret_x2
+			convert_cost_ic = 8
+		}
+		can_convert_from = {
+			module = cannon_defense_turret_2x
+			convert_cost_ic = 5
+		}
+		xp_cost = 1
+	}
+
 }
diff --git a/common/units/equipment/modules/00_ship_modules.txt b/common/units/equipment/modules/00_ship_modules.txt
index 50ffb9cc304..333995e31ed 100644
--- a/common/units/equipment/modules/00_ship_modules.txt
+++ b/common/units/equipment/modules/00_ship_modules.txt
@@ -243,7 +243,7 @@ equipment_modules = {
 		add_equipment_type = capital_ship
 		add_stats = {
 			hg_attack = 14
-			build_cost_ic = 1250
+			build_cost_ic = 1550
 		}
 		multiply_stats = {
 			naval_speed = -0.05
@@ -269,7 +269,7 @@ equipment_modules = {
 		add_equipment_type = capital_ship
 		add_stats = {
 			hg_attack = 18
-			build_cost_ic = 1350
+			build_cost_ic = 1650
 		}
 		multiply_stats = {
 			naval_speed = -0.06
@@ -299,7 +299,7 @@ equipment_modules = {
 		add_equipment_type = capital_ship
 		add_stats = {
 			hg_attack = 22
-			build_cost_ic = 1450
+			build_cost_ic = 1750
 		}
 		multiply_stats = {
 			naval_speed = -0.07
@@ -329,7 +329,7 @@ equipment_modules = {
 		add_equipment_type = capital_ship
 		add_stats = {
 			hg_attack = 26
-			build_cost_ic = 1550
+			build_cost_ic = 1850
 		}
 		multiply_stats = {
 			naval_speed = -0.08
@@ -360,14 +360,14 @@ equipment_modules = {
 		add_equipment_type = capital_ship
 		add_stats = {
 			hg_attack = 27
-			build_cost_ic = 1700
+			build_cost_ic = 2000
 		}
 		build_cost_resources = {
 			steel = 1
 			chromium = 1
 		}
 		multiply_stats = {
-			naval_speed = -0.09
+			naval_speed = -0.08
 		}
 		add_average_stats = {
 			hg_armor_piercing = 45
@@ -392,9 +392,7 @@ equipment_modules = {
 		add_stats = {
 			hg_attack = 4.5
 			lg_attack = 1.5
-			build_cost_ic = 750
-			surface_visibility = 3.5
-		}
+			build_cost_ic = 650		}
 		multiply_stats = {
 			naval_speed = -0.04
 			max_strength = 0.4
@@ -432,8 +430,7 @@ equipment_modules = {
 		add_stats = {
 			hg_attack = 6
 			lg_attack = 2
-			build_cost_ic = 800
-			surface_visibility = 3.5
+			build_cost_ic = 700
 		}
 		multiply_stats = {
 			naval_speed = -0.06
@@ -472,8 +469,7 @@ equipment_modules = {
 		add_stats = {
 			hg_attack = 7.5
 			lg_attack = 2.5
-			build_cost_ic = 825
-			surface_visibility = 3.5
+			build_cost_ic = 725
 		}
 		multiply_stats = {
 			naval_speed = -0.07
@@ -518,8 +514,7 @@ equipment_modules = {
 		add_stats = {
 			hg_attack = 9
 			lg_attack = 3
-			build_cost_ic = 900
-			surface_visibility = 3.5
+			build_cost_ic = 800
 		}
 		multiply_stats = {
 			naval_speed = -0.08
@@ -821,7 +816,7 @@ equipment_modules = {
 		add_stats = {
 			lg_attack = 3
 			anti_air_attack = 2
-			build_cost_ic = 200
+			build_cost_ic = 240
 		}
 
 		multiply_stats = {
@@ -854,7 +849,7 @@ equipment_modules = {
 		add_stats = {
 			lg_attack = 4
 			anti_air_attack = 2.5
-			build_cost_ic = 240
+			build_cost_ic = 300
 		}
 
 		multiply_stats = {
@@ -887,7 +882,7 @@ equipment_modules = {
 		add_stats = {
 			lg_attack = 4.5
 			anti_air_attack = 3
-			build_cost_ic = 290
+			build_cost_ic = 360
 		}
 
 		multiply_stats = {
@@ -1162,403 +1157,558 @@ equipment_modules = {
 	#   #  # #  #  #  #  # #   
 	### #  #  ##  ### #  # ### 
 	light_ship_engine_1 = {
+		abbreviation = "sbn"
 		category = light_ship_engine
 		sfx = sfx_ui_sd_module_engine
+
+		
 		add_stats = {
 			#naval_speed = 5
 			fuel_consumption = 7
-			build_cost_ic = 90
+			#build_cost_ic = 90
 		}
+		
 		multiply_stats = {
-			naval_speed = 0.2
+			naval_speed = 0.10
+			build_cost_ic = 0.125
 		}
+		
 		can_convert_from = {
 			module_category = light_ship_engine
 			convert_cost_ic = 250
 		}
+
 	}
+
 	light_ship_engine_2 = {
+		abbreviation = "sbo"
 		category = light_ship_engine
 		parent = light_ship_engine_1
 		sfx = sfx_ui_sd_module_engine
+
+		
 		add_stats = {
 			#naval_speed = 5
 			fuel_consumption = 8
-			build_cost_ic = 120
+			#build_cost_ic = 120
 		}
+		
 		multiply_stats = {
-			naval_speed = 0.25
+			naval_speed = 0.15
+			build_cost_ic = 0.15
 		}
+		
 		can_convert_from = {
 			module_category = light_ship_engine
 			convert_cost_ic = 250
 		}
+		
 		can_convert_from = {
 			module = light_ship_engine_1
 			convert_cost_ic = 230
 		}
 	}
+
 	light_ship_engine_3 = {
+		abbreviation = "sbp"
 		category = light_ship_engine
 		parent = light_ship_engine_2
 		sfx = sfx_ui_sd_module_engine
+
+		
 		add_stats = {
 			#naval_speed = 5
 			fuel_consumption = 10
-			build_cost_ic = 150
+			#build_cost_ic = 150
 		}
+		
 		multiply_stats = {
-			naval_speed = 0.3
+			naval_speed = 0.20
+			build_cost_ic = 0.175
 		}
+		
 		can_convert_from = {
 			module_category = light_ship_engine
 			convert_cost_ic = 250
 		}
+		
 		can_convert_from = {
 			module = light_ship_engine_2
 			convert_cost_ic = 230
 		}
 	}
 	light_ship_engine_4 = {
+		abbreviation = "sbq"
 		category = light_ship_engine
 		parent = light_ship_engine_3
 		sfx = sfx_ui_sd_module_engine
+
+		
 		add_stats = {
 			#naval_speed = 5
 			fuel_consumption = 10
-			build_cost_ic = 170
+			#build_cost_ic = 170
 		}
+
 		multiply_stats = {
-			naval_speed = 0.35
+			naval_speed = 0.25
+			build_cost_ic = 0.20
 		}
+		
 		can_convert_from = {
 			module_category = light_ship_engine
 			convert_cost_ic = 250
 		}
+		
 		can_convert_from = {
 			module = light_ship_engine_3
 			convert_cost_ic = 230
 		}
 	}
 	sub_ship_engine_1 = {
+		abbreviation = "sbr"
 		category = sub_ship_engine
 		sfx = sfx_ui_sd_module_engine
+		
+		
 		add_stats = {
 			#naval_speed = 5
 			fuel_consumption = 7
-			build_cost_ic = 90
+			#build_cost_ic = 90
 		}
+		
 		multiply_stats = {
-			naval_speed = 0.05
+			naval_speed = 0.1
+			build_cost_ic = 0.1
+
 		}
+
+		
 		can_convert_from = {
 			module_category = sub_ship_engine
 			convert_cost_ic = 250
 		}
 	}
+
 	sub_ship_engine_2 = {
+		abbreviation = "sbs"
 		category = sub_ship_engine
 		parent = sub_ship_engine_1
 		sfx = sfx_ui_sd_module_engine
+
+		
 		add_stats = {
 			#naval_speed = 5
 			fuel_consumption = 8
-			build_cost_ic = 120
+			#build_cost_ic = 120
 		}
+		
 		multiply_stats = {
 			naval_speed = 0.1
+			build_cost_ic = 0.125
 			sub_visibility = -0.05
 		}
+		
 		can_convert_from = {
 			module_category = sub_ship_engine
 			convert_cost_ic = 250
 		}
+		
 		can_convert_from = {
 			module = sub_ship_engine_1
 			convert_cost_ic = 230
 		}
 	}
+
 	sub_ship_engine_3 = {
+		abbreviation = "sbt"
 		category = sub_ship_engine
 		parent = sub_ship_engine_2
 		sfx = sfx_ui_sd_module_engine
+
+		
 		add_stats = {
 			#naval_speed = 5
 			fuel_consumption = 10
-			build_cost_ic = 150
+			#build_cost_ic = 150
 		}
+		
 		multiply_stats = {
 			naval_speed = 0.15
+			build_cost_ic = 0.15
 			sub_visibility = -0.1
 		}
+		
 		can_convert_from = {
 			module_category = sub_ship_engine
 			convert_cost_ic = 250
 		}
+		
 		can_convert_from = {
 			module = sub_ship_engine_2
 			convert_cost_ic = 230
 		}
 	}
 	sub_ship_engine_4 = {
+		abbreviation = "sbu"
 		category = sub_ship_engine
 		parent = sub_ship_engine_3
 		sfx = sfx_ui_sd_module_engine
+
+		
 		add_stats = {
 			#naval_speed = 5
 			fuel_consumption = 10
-			build_cost_ic = 170
+			#build_cost_ic = 170
 		}
+		
 		multiply_stats = {
 			naval_speed = 0.2
+			build_cost_ic = 0.20
 			sub_visibility = -0.15
 		}
+		
 		can_convert_from = {
 			module_category = sub_ship_engine
 			convert_cost_ic = 250
 		}
+		
 		can_convert_from = {
 			module = sub_ship_engine_3
 			convert_cost_ic = 230
 		}
 	}
 	cruiser_ship_engine_1 = {
+		abbreviation = "sbv"
 		category = cruiser_ship_engine
 		sfx = sfx_ui_sd_module_engine
+
+		
 		add_stats = {
 			#naval_speed = 5
 			fuel_consumption = 12
-			build_cost_ic = 400
+			#build_cost_ic = 400
 		}
+		
 		multiply_stats = {
 			naval_speed = 0.2
+			build_cost_ic = 0.15
 		}
+		
 		can_convert_from = {
 			module_category = cruiser_ship_engine
 			convert_cost_ic = 2500
 		}
 	}
+
 	cruiser_ship_engine_2 = {
+		abbreviation = "sbw"
 		category = cruiser_ship_engine
 		parent = cruiser_ship_engine_1
 		sfx = sfx_ui_sd_module_engine
+
+		
 		add_stats = {
 			#naval_speed = 6
 			fuel_consumption = 16
-			build_cost_ic = 480
+			#build_cost_ic = 480
 		}
+		
 		multiply_stats = {
 			naval_speed = 0.3
+			build_cost_ic = 0.175
 		}
+		
 		can_convert_from = {
 			module_category = cruiser_ship_engine
 			convert_cost_ic = 2500
 		}
+		
 		can_convert_from = {
 			module = cruiser_ship_engine_1
 			convert_cost_ic = 2300
 		}
 	}
+
 	cruiser_ship_engine_3 = {
+		abbreviation = "sbx"
 		category = cruiser_ship_engine
 		parent = cruiser_ship_engine_2
 		sfx = sfx_ui_sd_module_engine
+
+		
 		add_stats = {
 			#naval_speed = 7
 			fuel_consumption = 20
-			build_cost_ic = 550
+			#build_cost_ic = 550
 		}
+		
 		multiply_stats = {
 			naval_speed = 0.35
+			build_cost_ic = 0.20
 		}
+		
 		can_convert_from = {
 			module_category = cruiser_ship_engine
 			convert_cost_ic = 2500
 		}
+		
 		can_convert_from = {
 			module = cruiser_ship_engine_2
 			convert_cost_ic = 2300
 		}
 	}
 	cruiser_ship_engine_4 = {
+		abbreviation = "sby"
 		category = cruiser_ship_engine
 		parent = cruiser_ship_engine_3
 		sfx = sfx_ui_sd_module_engine
+
+		
 		add_stats = {
 			#naval_speed = 7
 			fuel_consumption = 24
-			build_cost_ic = 670
+			#build_cost_ic = 670
 		}
+		
 		multiply_stats = {
 			naval_speed = 0.4
+			build_cost_ic = 0.225
 		}
+		
 		can_convert_from = {
 			module_category = cruiser_ship_engine
 			convert_cost_ic = 2500
 		}
+		
 		can_convert_from = {
 			module = cruiser_ship_engine_3
 			convert_cost_ic = 2300
 		}
 	}
 	heavy_ship_engine_1 = {
+		abbreviation = "sbz"
 		category = heavy_ship_engine
 		sfx = sfx_ui_sd_module_engine
+
+		
 		add_stats = {
 			#naval_speed = 7
 			fuel_consumption = 20
-			build_cost_ic = 1800
+			#build_cost_ic = 1800
 		}
+		
 		multiply_stats = {
 			naval_speed = 0.2
+			build_cost_ic = 0.175
 		}
+		
 		can_convert_from = {
 			module_category = heavy_ship_engine
 			convert_cost_ic = 4800
 		}
 	}
+
 	heavy_ship_engine_2 = {
+		abbreviation = "sca"
 		category = heavy_ship_engine
 		parent = heavy_ship_engine_1
 		sfx = sfx_ui_sd_module_engine
+
+		
 		add_stats = {
 			#naval_speed = 10
 			fuel_consumption = 25
-			build_cost_ic = 2200
+			#build_cost_ic = 2200
 		}
+		
 		multiply_stats = {
-			naval_speed = 0.4
+			naval_speed = 0.35
+			build_cost_ic = 0.20
 		}
+		
 		can_convert_from = {
 			module_category = heavy_ship_engine
 			convert_cost_ic = 5000
 		}
+		
 		can_convert_from = {
 			module = heavy_ship_engine_1
 			convert_cost_ic = 4800
 		}
 	}
+
 	heavy_ship_engine_3 = {
+		abbreviation = "scb"
 		category = heavy_ship_engine
 		parent = heavy_ship_engine_2
 		sfx = sfx_ui_sd_module_engine
+
+		
 		add_stats = {
 			#naval_speed = 11
 			fuel_consumption = 30
-			build_cost_ic = 2800
+			#build_cost_ic = 2800
 		}
+		
 		multiply_stats = {
-			naval_speed = 0.5
+			naval_speed = 0.45
+			build_cost_ic = 0.225
+			
 		}
+		
 		can_convert_from = {
 			module_category = heavy_ship_engine
 			convert_cost_ic = 5000
 		}
+		
 		can_convert_from = {
 			module = heavy_ship_engine_2
 			convert_cost_ic = 4800
 		}
 	}
 	heavy_ship_engine_4 = {
+		abbreviation = "scc"
 		category = heavy_ship_engine
 		parent = heavy_ship_engine_3
 		sfx = sfx_ui_sd_module_engine
+
+		
 		add_stats = {
 			#naval_speed = 12
 			fuel_consumption = 35
-			build_cost_ic = 3200
+			#build_cost_ic = 3200
 		}
+		
 		multiply_stats = {
 			naval_speed = 0.55
+			build_cost_ic = 0.25
+			
+			
 		}
+		
 		can_convert_from = {
 			module_category = heavy_ship_engine
 			convert_cost_ic = 5000
 		}
+		
 		can_convert_from = {
 			module = heavy_ship_engine_3
 			convert_cost_ic = 4800
 		}
 	}
 	carrier_ship_engine_1 = {
+		abbreviation = "scd"
 		category = carrier_ship_engine
 		sfx = sfx_ui_sd_module_engine
+		
+		
 		add_stats = {
 			#naval_speed = 5
 			fuel_consumption = 12
-			build_cost_ic = 400
+			#build_cost_ic = 400
 		}
+		
 		multiply_stats = {
 			naval_speed = 0.3
+			build_cost_ic = 0.10
+			
 		}
+		
 		can_convert_from = {
 			module_category = carrier_ship_engine
 			convert_cost_ic = 2500
 		}
 	}
+
 	carrier_ship_engine_2 = {
+		abbreviation = "sce"
 		category = carrier_ship_engine
 		parent = carrier_ship_engine_1
 		sfx = sfx_ui_sd_module_engine
+
+		
 		add_stats = {
 			#naval_speed = 5
 			fuel_consumption = 16
-			build_cost_ic = 480
+			#build_cost_ic = 480
 		}
+		
 		multiply_stats = {
 			naval_speed = 0.4
+			build_cost_ic = 0.125
+			
 		}
+		
 		can_convert_from = {
 			module_category = carrier_ship_engine
 			convert_cost_ic = 2500
 		}
+		
 		can_convert_from = {
 			module = carrier_ship_engine_1
 			convert_cost_ic = 2300
 		}
 	}
+
 	carrier_ship_engine_3 = {
+		abbreviation = "scf"
 		category = carrier_ship_engine
 		parent = carrier_ship_engine_2
 		sfx = sfx_ui_sd_module_engine
+		
+		
 		add_stats = {
 			#naval_speed = 5
 			fuel_consumption = 20
-			build_cost_ic = 550
+			#build_cost_ic = 550
 		}
+		
 		multiply_stats = {
 			naval_speed = 0.5
+			build_cost_ic = 0.15
+			
 		}
+		
 		can_convert_from = {
 			module_category = carrier_ship_engine
 			convert_cost_ic = 2500
 		}
+		
 		can_convert_from = {
 			module = carrier_ship_engine_2
 			convert_cost_ic = 2300
 		}
 	}
 	carrier_ship_engine_4 = {
+		abbreviation = "scg"
 		category = carrier_ship_engine
 		parent = carrier_ship_engine_3
 		sfx = sfx_ui_sd_module_engine
+
+		
 		add_stats = {
 			#naval_speed = 5
 			fuel_consumption = 24
-			build_cost_ic = 670
+			#build_cost_ic = 670
 		}
+		
 		multiply_stats = {
-			naval_speed = 0.55
+			naval_speed = 0.60
+			build_cost_ic = 0.175
 		}
+		
 		can_convert_from = {
 			module_category = carrier_ship_engine
 			convert_cost_ic = 2500
 		}
+		
 		can_convert_from = {
 			module = carrier_ship_engine_3
 			convert_cost_ic = 2300
 		}
 	}
+
 	###  ##  ###  ###  ### ###   ##  
 	#  #  # #  # #  # #   #  # #  # 
 	#  #  # ###  ###  ##  #  # #  # 
@@ -1917,10 +2067,11 @@ equipment_modules = {
 	ship_deck_space = {
 		category = ship_deck_space
 		gfx = ship_deck_space
+		parent = ship_deck_space_bad
 		add_equipment_type = capital_ship
 		add_stats = {
 			carrier_size = 2
-			build_cost_ic = 1750
+			build_cost_ic = 1500
 		}
 		manpower = 500		#outside the add_stats section for code reasons
 		multiply_stats = {
@@ -1982,13 +2133,17 @@ equipment_modules = {
 	#### ###  # # # #  # ###       #  #    #### ##  # # # ##   #  
 	#  # #  # #   # #  # #  #       # #  # #  # #   #   # #     # 
 	#  # #  # #   #  ##  #  #     ##   ##  #  # ### #   # ### ##  
+
 	ship_armor_bb_1 = {
+		abbreviation = "sde"
 		category = ship_heavy_armor
 		gfx = ship_armor_thick_1
+		
 		multiply_stats = {
 			build_cost_ic = 0.125
-			naval_speed = -0.3
+			naval_speed = -0
 			max_strength = 0.05
+
 		}
 		build_cost_resources = {
 			steel = 1
@@ -1998,14 +2153,20 @@ equipment_modules = {
 			naval_torpedo_enemy_critical_chance_factor = -0.1
 			naval_torpedo_damage_reduction_factor = 0.1
 		}
-		dismantle_cost_ic = 5500
+		dismantle_cost_ic = 2500
+		can_convert_from = {
+			module_category = ship_heavy_armor
+			convert_cost_ic = 5500
+		}
 	}
 	ship_armor_bc_1 = {
+		abbreviation = "sdf"
 		category = ship_heavy_armor
 		gfx = ship_armor_1
+		
 		multiply_stats = {
 			build_cost_ic = 0.1
-			naval_speed = -0.15
+			naval_speed = 0.05
 			max_strength = 0.05
 		}
 
@@ -2013,15 +2174,20 @@ equipment_modules = {
 			armor_value = 22
 			naval_torpedo_damage_reduction_factor = 0.1
 		}
-		dismantle_cost_ic = 4500
+		can_convert_from = {
+			module_category = ship_heavy_armor
+			convert_cost_ic = 4500
+		}
+		
 	}
 	ship_armor_bb_2 = {
+		abbreviation = "sdg"
 		category = ship_heavy_armor
 		gfx = ship_armor_thick_2
 		parent = ship_armor_bb_1
 		multiply_stats = {
 			build_cost_ic = 0.15
-			naval_speed = -0.3
+			naval_speed = -0.05
 			max_strength = 0.1
 		}
 		build_cost_resources = {
@@ -2032,15 +2198,20 @@ equipment_modules = {
 			naval_torpedo_enemy_critical_chance_factor = -0.15
 			naval_torpedo_damage_reduction_factor = 0.15
 		}
-		dismantle_cost_ic = 6000
+		can_convert_from = {
+			module_category = ship_heavy_armor
+			convert_cost_ic = 6000
+		}
+		
 	}
 	ship_armor_bc_2 = {
+		abbreviation = "sdh"
 		category = ship_heavy_armor
 		gfx = ship_armor_2
 		parent = ship_armor_bc_1
 		multiply_stats = {
 			build_cost_ic = 0.125
-			naval_speed = -0.2
+			naval_speed = -0
 			max_strength = 0.1
 		}
 		build_cost_resources = {
@@ -2051,15 +2222,19 @@ equipment_modules = {
 			naval_torpedo_enemy_critical_chance_factor = -0.1
 			naval_torpedo_damage_reduction_factor = 0.15
 		}
-		dismantle_cost_ic = 5500
+		can_convert_from = {
+			module_category = ship_heavy_armor
+			convert_cost_ic = 5500
+		}
 	}
 	ship_armor_bb_3 = {
+		abbreviation = "sdi"
 		category = ship_heavy_armor
 		gfx = ship_armor_thick_3
 		parent = ship_armor_bb_2
 		multiply_stats = {
 			build_cost_ic = 0.175
-			naval_speed = -0.3
+			naval_speed = -0.10
 			max_strength = 0.15
 		}
 		build_cost_resources = {
@@ -2072,14 +2247,20 @@ equipment_modules = {
 			naval_torpedo_damage_reduction_factor = 0.2
 		}
 		dismantle_cost_ic = 7500
+		can_convert_from = {
+			module_category = ship_heavy_armor
+			convert_cost_ic = 7500
+		}
+		
 	}
 	ship_armor_bc_3 = {
+		abbreviation = "sdj"
 		category = ship_heavy_armor
 		gfx = ship_armor_3
 		parent = ship_armor_bc_2
 		multiply_stats = {
 			build_cost_ic = 0.125
-			naval_speed = -0.25
+			naval_speed = -0.10
 			max_strength = 0.15
 		}
 		build_cost_resources = {
@@ -2092,13 +2273,20 @@ equipment_modules = {
 			naval_torpedo_damage_reduction_factor = 0.2
 		}
 		dismantle_cost_ic = 6200
+		can_convert_from = {
+			module_category = ship_heavy_armor
+			convert_cost_ic = 6200
+		}
+		
 	}
 	ship_armor_shbb = {
-		category = ship_super_heavy_armor
+		abbreviation = "sk"
+		category = ship_heavy_armor
 		gfx = ship_armor_thick_3
+		
 		multiply_stats = {
 			build_cost_ic = 0.25
-			naval_speed = -0.35
+			naval_speed = -0.12
 			max_strength = 0.1
 		}
 		build_cost_resources = {
@@ -2107,11 +2295,15 @@ equipment_modules = {
 		}
 		add_stats = {
 			armor_value = 55
-			surface_visibility = 10
 			naval_torpedo_enemy_critical_chance_factor = -0.25
 			naval_torpedo_damage_reduction_factor = 0.25
 		}
 		dismantle_cost_ic = 8200
+		can_convert_from = {
+			module_category = ship_heavy_armor
+			convert_cost_ic = 8200
+		}
+		
 	}
 	ship_armor_cruiser_1 = {
 		category = ship_cruiser_armor
@@ -2216,14 +2408,14 @@ equipment_modules = {
 		add_equipment_type = capital_ship
 		add_stats = {
 			hg_attack = 35
-			build_cost_ic = 1850
+			build_cost_ic = 2150
 		}
 		build_cost_resources = {
 			steel = 1
 			chromium = 1
 		}
 		multiply_stats = {
-			naval_speed = -0.1
+			naval_speed = -0.09
 		}
 		add_average_stats = {
 			hg_armor_piercing = 52
@@ -2367,8 +2559,7 @@ equipment_modules = {
 		add_stats = {
 			lg_attack = 5.5
 			hg_attack = 5.5
-			build_cost_ic = 1000
-			surface_visibility = 3.5
+			build_cost_ic = 900
 		}
 		build_cost_resources = {
 			chromium = 1
@@ -2401,8 +2592,7 @@ equipment_modules = {
 		add_stats = {
 			lg_attack = 6.5
 			hg_attack = 6.5
-			build_cost_ic = 1100
-			surface_visibility = 3.5
+			build_cost_ic = 1000
 		}
 		build_cost_resources = {
 			chromium = 1
@@ -2437,7 +2627,7 @@ equipment_modules = {
 		add_stats = {
 			lg_attack = 6
 			hg_attack = 16
-			build_cost_ic = 2000
+			build_cost_ic = 2300
 		}
 		build_cost_resources = {
 			chromium = 1
@@ -2462,7 +2652,7 @@ equipment_modules = {
 		add_stats = {
 			lg_attack = 6
 			hg_attack = 20
-			build_cost_ic = 2300
+			build_cost_ic = 2600
 		}
 		build_cost_resources = {
 			chromium = 1
@@ -2744,10 +2934,11 @@ equipment_modules = {
 		add_stats = {
 			#naval_speed = 5
 			fuel_consumption = 10
-			build_cost_ic = 190
+			#build_cost_ic = 190
 		}
 		multiply_stats = {
-			naval_speed = 0.4
+			naval_speed = 0.3
+			build_cost_ic = 0.25
 		}
 		can_convert_from = {
 			module_category = light_ship_engine
@@ -2765,10 +2956,11 @@ equipment_modules = {
 		add_stats = {
 			#naval_speed = 5
 			fuel_consumption = 10
-			build_cost_ic = 225
+			#build_cost_ic = 225
 		}
 		multiply_stats = {
-			naval_speed = 0.45
+			naval_speed = 0.35
+			build_cost_ic = 0.3
 		}
 		can_convert_from = {
 			module_category = light_ship_engine
@@ -2786,11 +2978,12 @@ equipment_modules = {
 		add_stats = {
 			#naval_speed = 5
 			fuel_consumption = 2
-			build_cost_ic = 400
+			#build_cost_ic = 400
 			naval_range = 50000
 		}
 		multiply_stats = {
-			naval_speed = 0.45
+			naval_speed = 0.35
+			build_cost_ic = 0.35
 		}
 		build_cost_resources = {
 			crystals = 2
@@ -2811,10 +3004,11 @@ equipment_modules = {
 		add_stats = {
 			#naval_speed = 5
 			fuel_consumption = 11
-			build_cost_ic = 200
+			#build_cost_ic = 200
 		}
 		multiply_stats = {
 			naval_speed = 0.25
+			build_cost_ic = 0.25
 			sub_visibility = -0.2
 		}
 		can_convert_from = {
@@ -2833,10 +3027,11 @@ equipment_modules = {
 		add_stats = {
 			#naval_speed = 5
 			fuel_consumption = 12
-			build_cost_ic = 220
+			#build_cost_ic = 220
 		}
 		multiply_stats = {
 			naval_speed = 0.3
+			build_cost_ic = 0.3
 			sub_visibility = -0.25
 		}
 		can_convert_from = {
@@ -2855,12 +3050,13 @@ equipment_modules = {
 		add_stats = {
 			#naval_speed = 5
 			fuel_consumption = 3
-			build_cost_ic = 400
+			#build_cost_ic = 400
 			naval_range = 50000
 			surface_visibility = -1
 		}
 		multiply_stats = {
 			naval_speed = 0.3
+			build_cost_ic = 0.35
 			sub_visibility = -0.2
 		}
 		build_cost_resources = {
@@ -2878,10 +3074,11 @@ equipment_modules = {
 		add_stats = {
 			#naval_speed = 8
 			fuel_consumption = 28
-			build_cost_ic = 770
+			#build_cost_ic = 770
 		}
 		multiply_stats = {
 			naval_speed = 0.45
+			build_cost_ic = 0.25
 		}
 		can_convert_from = {
 			module_category = cruiser_ship_engine
@@ -2899,10 +3096,11 @@ equipment_modules = {
 		add_stats = {
 			#naval_speed = 8
 			fuel_consumption = 32
-			build_cost_ic = 870
+			#build_cost_ic = 870
 		}
 		multiply_stats = {
 			naval_speed = 0.5
+			build_cost_ic = 0.275
 		}
 		can_convert_from = {
 			module_category = cruiser_ship_engine
@@ -2919,11 +3117,12 @@ equipment_modules = {
 		sfx = sfx_ui_sd_module_engine
 		add_stats = {
 			#naval_speed = 8
-			build_cost_ic = 1550
+			#build_cost_ic = 1550
 			naval_range = 50000
 		}
 		multiply_stats = {
 			naval_speed = 0.5
+			build_cost_ic = 0.3
 		}
 		build_cost_resources = {
 			crystals = 2
@@ -2940,10 +3139,11 @@ equipment_modules = {
 		add_stats = {
 			#naval_speed = 13
 			fuel_consumption = 40
-			build_cost_ic = 3400
+			#build_cost_ic = 3400
 		}
 		multiply_stats = {
-			naval_speed = 0.6
+			naval_speed = 0.65
+			build_cost_ic = 0.275
 		}
 		can_convert_from = {
 			module_category = heavy_ship_engine
@@ -2961,10 +3161,11 @@ equipment_modules = {
 		add_stats = {
 			#naval_speed = 14
 			fuel_consumption = 45
-			build_cost_ic = 3800
+			#build_cost_ic = 3800
 		}
 		multiply_stats = {
-			naval_speed = 0.65
+			naval_speed = 0.75
+			build_cost_ic = 0.3
 		}
 		can_convert_from = {
 			module_category = heavy_ship_engine
@@ -2985,7 +3186,8 @@ equipment_modules = {
 			naval_range = 50000
 		}
 		multiply_stats = {
-			naval_speed = 0.65
+			naval_speed = 0.75
+			build_cost_ic = 0.325
 		}
 		build_cost_resources = {
 			crystals = 3
@@ -3002,10 +3204,11 @@ equipment_modules = {
 		add_stats = {
 			#naval_speed = 5
 			fuel_consumption = 28
-			build_cost_ic = 790
+			#build_cost_ic = 790
 		}
 		multiply_stats = {
-			naval_speed = 0.6
+			naval_speed = 0.7
+			build_cost_ic = 0.2
 		}
 		can_convert_from = {
 			module_category = carrier_ship_engine
@@ -3023,10 +3226,11 @@ equipment_modules = {
 		add_stats = {
 			#naval_speed = 5
 			fuel_consumption = 32
-			build_cost_ic = 910
+			#build_cost_ic = 910
 		}
 		multiply_stats = {
-			naval_speed = 0.65
+			naval_speed = 0.8
+			build_cost_ic = 0.225
 		}
 		can_convert_from = {
 			module_category = carrier_ship_engine
@@ -3048,6 +3252,7 @@ equipment_modules = {
 		}
 		multiply_stats = {
 			naval_speed = 0.65
+			build_cost_ic = 0.25
 		}
 		build_cost_resources = {
 			crystals = 3
@@ -3353,7 +3558,7 @@ equipment_modules = {
 		add_equipment_type = capital_ship
 		add_stats = {
 			carrier_size = 1.5
-			build_cost_ic = 1750
+			build_cost_ic = 1500
 		}
 		manpower = 375		#outside the add_stats section for code reasons
 		multiply_stats = {
@@ -3372,7 +3577,7 @@ equipment_modules = {
 			carrier_size = 1
 			surface_detection = 13
 			sub_detection = 4.5
-			build_cost_ic = 1750
+			build_cost_ic = 1500
 		}
 		manpower = 500		#outside the add_stats section for code reasons
 		multiply_stats = {
@@ -3396,7 +3601,7 @@ equipment_modules = {
 			carrier_size = 1
 			surface_detection = 16
 			sub_detection = 5.5
-			build_cost_ic = 1750
+			build_cost_ic = 1500
 		}
 		manpower = 500		#outside the add_stats section for code reasons
 		multiply_stats = {
@@ -3420,7 +3625,7 @@ equipment_modules = {
 			carrier_size = 2
 			armor_value = 1
 			max_strength = 5
-			build_cost_ic = 1750
+			build_cost_ic = 1500
 		}
 		manpower = 500		#outside the add_stats section for code reasons
 		multiply_stats = {
@@ -3540,7 +3745,7 @@ equipment_modules = {
 		parent = ship_armor_bb_3
 		multiply_stats = {
 			build_cost_ic = 0.2
-			naval_speed = -0.3
+			naval_speed = -0.15
 			max_strength = 0.2
 		}
 		build_cost_resources = {
@@ -3553,6 +3758,10 @@ equipment_modules = {
 			naval_torpedo_damage_reduction_factor = 0.25
 		}
 		dismantle_cost_ic = 8500
+		can_convert_from = {
+			module_category = ship_heavy_armor
+			convert_cost_ic = 8500
+		}
 	}
 	ship_armor_bc_4 = {
 		category = ship_heavy_armor
@@ -3560,7 +3769,7 @@ equipment_modules = {
 		parent = ship_armor_bc_3
 		multiply_stats = {
 			build_cost_ic = 0.15
-			naval_speed = -0.1
+			naval_speed = -0.15
 			max_strength = 0.2
 		}
 		build_cost_resources = {
@@ -3569,11 +3778,14 @@ equipment_modules = {
 		}
 		add_stats = {
 			armor_value = 40
-			surface_visibility = 8
 			naval_torpedo_enemy_critical_chance_factor = -0.2
 			naval_torpedo_damage_reduction_factor = 0.25
 		}
 		dismantle_cost_ic = 6900
+		can_convert_from = {
+			module_category = ship_heavy_armor
+			convert_cost_ic = 6900
+		}
 	}
 	ship_armor_bb_5 = {
 		category = ship_heavy_armor
@@ -3590,11 +3802,14 @@ equipment_modules = {
 		}
 		add_stats = {
 			armor_value = 50
-			surface_visibility = 10
 			naval_torpedo_enemy_critical_chance_factor = -0.3
 			naval_torpedo_damage_reduction_factor = 0.3
 		}
 		dismantle_cost_ic = 9500
+		can_convert_from = {
+			module_category = ship_heavy_armor
+			convert_cost_ic = 9500
+		}
 	}
 	ship_armor_bc_5 = {
 		category = ship_heavy_armor
@@ -3602,7 +3817,7 @@ equipment_modules = {
 		parent = ship_armor_bc_4
 		multiply_stats = {
 			build_cost_ic = 0.175
-			naval_speed = -0.1
+			naval_speed = -0.2
 			max_strength = 0.25
 		}
 		build_cost_resources = {
@@ -3611,11 +3826,14 @@ equipment_modules = {
 		}
 		add_stats = {
 			armor_value = 46
-			surface_visibility = 8
 			naval_torpedo_enemy_critical_chance_factor = -0.25
 			naval_torpedo_damage_reduction_factor = 0.3
 		}
 		dismantle_cost_ic = 7700
+		can_convert_from = {
+			module_category = ship_heavy_armor
+			convert_cost_ic = 7700
+		}
 	}
 	ship_armor_cruiser_5 = {
 		category = ship_cruiser_armor
@@ -3654,12 +3872,12 @@ equipment_modules = {
 		}
 	}
 	ship_armor_shbb_2 = {
-		category = ship_super_heavy_armor
+		category = ship_heavy_armor
 		gfx = ship_armor_thick_4
 		parent = ship_armor_shbb
 		multiply_stats = {
 			build_cost_ic = 0.25
-			naval_speed = -0.25
+			naval_speed = -0.17
 			max_strength = 0.15
 		}
 		build_cost_resources = {
@@ -3668,19 +3886,22 @@ equipment_modules = {
 		}
 		add_stats = {
 			armor_value = 65
-			surface_visibility = 10
 			naval_torpedo_enemy_critical_chance_factor = -0.35
 			naval_torpedo_damage_reduction_factor = 0.35
 		}
 		dismantle_cost_ic = 9700
+		can_convert_from = {
+			module_category = ship_heavy_armor
+			convert_cost_ic = 9700
+		}
 	}
 	ship_armor_shbc = {
 		# Changeling exclusive
-		category = ship_super_heavy_armor
+		category = ship_heavy_armor
 		gfx = ship_armor_3
 		multiply_stats = {
 			build_cost_ic = 0.125
-			naval_speed = -0.125
+			naval_speed = -0.1
 			max_strength = 0.1
 		}
 		build_cost_resources = {
@@ -3689,11 +3910,14 @@ equipment_modules = {
 		}
 		add_stats = {
 			armor_value = 50
-			surface_visibility = 8
 			naval_torpedo_enemy_critical_chance_factor = -0.2
 			naval_torpedo_damage_reduction_factor = 0.25
 		}
 		dismantle_cost_ic = 7200
+		can_convert_from = {
+			module_category = ship_heavy_armor
+			convert_cost_ic = 7200
+		}
 	}
 	ship_armor_carrier_deck_2 = {
 		category = ship_carrier_armor
@@ -3731,7 +3955,6 @@ equipment_modules = {
 		}
 		add_stats = {
 			armor_value = 17
-			surface_visibility = 2
 		}
 		dismantle_cost_ic = 2500
 	}
@@ -3751,7 +3974,6 @@ equipment_modules = {
 		}
 		add_stats = {
 			armor_value = 22
-			surface_visibility = 4
 			naval_torpedo_damage_reduction_factor = 0.1
 		}
 		dismantle_cost_ic = 3000
@@ -3773,7 +3995,6 @@ equipment_modules = {
 		}
 		add_stats = {
 			armor_value = 27
-			surface_visibility = 6
 			naval_torpedo_enemy_critical_chance_factor = -0.1
 			naval_torpedo_damage_reduction_factor = 0.15
 		}
diff --git a/common/units/equipment/modules/00_tank_modules.txt b/common/units/equipment/modules/00_tank_modules.txt
index 367389a7ee9..8650302e2ad 100644
--- a/common/units/equipment/modules/00_tank_modules.txt
+++ b/common/units/equipment/modules/00_tank_modules.txt
@@ -96,14 +96,15 @@ equipment_modules = {
 		sfx = sfx_ui_sd_module_sonar
 
 		add_stats = {
-			defense = 4
-			breakthrough = 4
+			defense = 3
+			breakthrough = 3
+			hardness = 0.02	
 		}
 		dismantle_cost_ic = 1
 		xp_cost = 8
 		multiply_stats = {
 			build_cost_ic = 0.2
-			armor_value = 0.5
+			armor_value = 0.3
 		}
 	}
 
@@ -113,13 +114,15 @@ equipment_modules = {
 		sfx = sfx_ui_sd_module_sonar
 		xp_cost = 8
 		add_stats = {
-			defense = 2
-			breakthrough = 2
+			defense = 4
+			breakthrough = 4
 		}
 		dismantle_cost_ic = 1
 		multiply_stats = {
 			armor_value = 0.3
-
+		}
+		build_cost_resources = {
+			chromium = 1
 		}
 	}
 
@@ -132,15 +135,33 @@ equipment_modules = {
 			defense = 6
 			breakthrough = 6
 			reliability = -0.1
+			hardness = 0.04
 		}
 		dismantle_cost_ic = 1
 		multiply_stats = {
 			build_cost_ic = 0.4
-			armor_value = 0.7
+			armor_value = 0.6
 
 		}
 		build_cost_resources = {
-			chromium = 1
+			chromium = 2
+		}
+	}
+
+	NOR_tank_rikstanken_armor = { # Rikstanken Armor
+		abbreviation = "msa"
+		category = tank_armor_type
+		sfx = sfx_ui_sd_module_sonar
+
+		add_stats = {
+			
+			defense = 1
+			breakthrough = 0
+			hardness = -0.3
+		}
+		xp_cost = 8
+		multiply_stats = {
+			build_cost_ic = -0.3
 		}
 	}
 
@@ -232,7 +253,7 @@ equipment_modules = {
 
 		multiply_stats =  {
 			build_cost_ic = -0.1
-			hardness = -0.3
+			hardness = -0.4
 		}
 	}
 
@@ -248,7 +269,7 @@ equipment_modules = {
 
 		multiply_stats =  {
 			build_cost_ic = -0.05
-			hardness = -0.2
+			hardness = -0.3
 		}
 	}
 
@@ -296,7 +317,7 @@ equipment_modules = {
 
 		add_stats = {
 			build_cost_ic = 1
-			maximum_speed = -0.25
+			maximum_speed = -0.1
 			breakthrough = 14
 		}
 		dismantle_cost_ic = 0.5
@@ -336,7 +357,7 @@ equipment_modules = {
 			breakthrough = -0.25
 		}
 		can_convert_from = {
-			module = tank_light_turret_type
+			module_category = tank_light_turret_type
 			convert_cost_ic = 0.75
 		}
 
@@ -545,7 +566,6 @@ equipment_modules = {
 		}
 		add_stats = {
 			build_cost_ic = 10
-			reliability = -0.1
 			maximum_speed = -0.2
 			breakthrough = 24
 		}
@@ -571,7 +591,6 @@ equipment_modules = {
 		}
 		add_stats = {
 			build_cost_ic = 12
-			reliability = -0.25
 			maximum_speed = -0.5
 			breakthrough = 35
 		}
@@ -747,7 +766,7 @@ equipment_modules = {
 
 	tank_magic_auto_cannon = {
 		abbreviation = "mac1"
-		category = tank_magic_cannon
+		category = tank_magic_cannon_light
 		gui_category = tank_small_main_armament
 		sfx = sfx_ui_sd_module_turret
 		add_stats = {
@@ -761,7 +780,7 @@ equipment_modules = {
 		dismantle_cost_ic = 1
 		xp_cost = 1
 		can_convert_from = {
-			module_category = tank_magic_cannon
+			module_category = tank_magic_cannon_light
 			convert_cost_ic = 1.5
 		}
 		build_cost_resources = {
@@ -771,7 +790,7 @@ equipment_modules = {
 
 	tank_magic_auto_cannon_2 = {
 		abbreviation = "mac2"
-		category = tank_magic_cannon
+		category = tank_magic_cannon_light
 		gui_category = tank_small_main_armament
 		sfx = sfx_ui_sd_module_turret
 		parent = tank_magic_auto_cannon
@@ -785,7 +804,7 @@ equipment_modules = {
 		}
 		xp_cost = 1
 		can_convert_from = {
-			module_category = tank_magic_cannon
+			module_category = tank_magic_cannon_light
 			convert_cost_ic = 2
 		}
 		build_cost_resources = {
@@ -795,7 +814,7 @@ equipment_modules = {
 
 	tank_magic_auto_cannon_3 = {
 		abbreviation = "mac3"
-		category = tank_magic_cannon
+		category = tank_magic_cannon_light
 		gui_category = tank_small_main_armament
 		sfx = sfx_ui_sd_module_turret
 		parent = tank_magic_auto_cannon_2
@@ -810,7 +829,7 @@ equipment_modules = {
 		dismantle_cost_ic = 1
 		xp_cost = 1
 		can_convert_from = {
-			module_category = tank_magic_cannon
+			module_category = tank_magic_cannon_light
 			convert_cost_ic = 2.5
 		}
 		build_cost_resources = {
@@ -820,7 +839,7 @@ equipment_modules = {
 
 	tank_magic_auto_cannon_4 = {
 		abbreviation = "mac4"
-		category = tank_magic_cannon
+		category = tank_magic_cannon_light
 		gui_category = tank_small_main_armament
 		sfx = sfx_ui_sd_module_turret
 		parent = tank_magic_auto_cannon_3
@@ -835,7 +854,7 @@ equipment_modules = {
 		dismantle_cost_ic = 1
 		xp_cost = 1
 		can_convert_from = {
-			module_category = tank_magic_cannon
+			module_category = tank_magic_cannon_light
 			convert_cost_ic = 3
 		}
 		build_cost_resources = {
@@ -845,7 +864,7 @@ equipment_modules = {
 
 	tank_magic_medium_cannon = {
 		abbreviation = "mmc1"
-		category = tank_magic_cannon
+		category = tank_magic_cannon_medium
 		gui_category = tank_medium_main_armament
 		sfx = sfx_ui_sd_module_turret
 		add_stats = {
@@ -860,7 +879,7 @@ equipment_modules = {
 		dismantle_cost_ic = 1
 		xp_cost = 1
 		can_convert_from = {
-			module_category = tank_magic_cannon
+			module_category = tank_magic_cannon_medium
 			convert_cost_ic = 4
 		}
 		build_cost_resources = {
@@ -871,7 +890,7 @@ equipment_modules = {
 
 	tank_magic_medium_cannon_2 = {
 		abbreviation = "mmc2"
-		category = tank_magic_cannon
+		category = tank_magic_cannon_medium
 		gui_category = tank_medium_main_armament
 		sfx = sfx_ui_sd_module_turret
 		parent = tank_magic_medium_cannon
@@ -887,7 +906,7 @@ equipment_modules = {
 		dismantle_cost_ic = 1
 		xp_cost = 1
 		can_convert_from = {
-			module_category = tank_magic_cannon
+			module_category = tank_magic_cannon_medium
 			convert_cost_ic = 5
 		}
 		build_cost_resources = {
@@ -899,7 +918,7 @@ equipment_modules = {
 
 	tank_magic_medium_cannon_3 = {
 		abbreviation = "mmc3"
-		category = tank_magic_cannon
+		category = tank_magic_cannon_medium
 		gui_category = tank_medium_main_armament
 		sfx = sfx_ui_sd_module_turret
 		parent = tank_magic_medium_cannon_2
@@ -915,7 +934,7 @@ equipment_modules = {
 		dismantle_cost_ic = 1
 		xp_cost = 1
 		can_convert_from = {
-			module_category = tank_magic_cannon
+			module_category = tank_magic_cannon_medium
 			convert_cost_ic = 6
 		}
 		build_cost_resources = {
@@ -927,7 +946,7 @@ equipment_modules = {
 
 	tank_magic_medium_cannon_4 = {
 		abbreviation = "mmc4"
-		category = tank_magic_cannon
+		category = tank_magic_cannon_medium
 		gui_category = tank_medium_main_armament
 		sfx = sfx_ui_sd_module_turret
 		parent = tank_magic_medium_cannon_3
@@ -943,7 +962,7 @@ equipment_modules = {
 		dismantle_cost_ic = 1
 		xp_cost = 1
 		can_convert_from = {
-			module_category = tank_magic_cannon
+			module_category = tank_magic_cannon_medium
 			convert_cost_ic = 8
 		}
 		build_cost_resources = {
@@ -955,7 +974,7 @@ equipment_modules = {
 
 	tank_magic_high_velocity_cannon = {
 		abbreviation = "mhvc1"
-		category = tank_magic_cannon
+		category = tank_magic_cannon_heavy
 		gui_category = tank_heavy_main_armament
 		sfx = sfx_ui_sd_module_turret
 		add_stats = {
@@ -969,7 +988,7 @@ equipment_modules = {
 		dismantle_cost_ic = 1
 		xp_cost = 1
 		can_convert_from = {
-			module_category = tank_magic_cannon
+			module_category = tank_magic_cannon_heavy
 			convert_cost_ic = 7
 		}
 		build_cost_resources = {
@@ -980,7 +999,7 @@ equipment_modules = {
 
 	tank_magic_high_velocity_cannon_2 = {
 		abbreviation = "mhvc2"
-		category = tank_magic_cannon
+		category = tank_magic_cannon_heavy
 		gui_category = tank_heavy_main_armament
 		sfx = sfx_ui_sd_module_turret
 		add_stats = {
@@ -994,7 +1013,7 @@ equipment_modules = {
 		dismantle_cost_ic = 1
 		xp_cost = 1
 		can_convert_from = {
-			module_category = tank_magic_cannon
+			module_category = tank_magic_cannon_heavy
 			convert_cost_ic = 8
 		}
 		build_cost_resources = {
@@ -1006,7 +1025,7 @@ equipment_modules = {
 
 	tank_magic_high_velocity_cannon_3 = {
 		abbreviation = "mhvc3"
-		category = tank_magic_cannon
+		category = tank_magic_cannon_heavy
 		gui_category = tank_heavy_main_armament
 		sfx = sfx_ui_sd_module_turret
 		add_stats = {
@@ -1020,7 +1039,7 @@ equipment_modules = {
 		dismantle_cost_ic = 1
 		xp_cost = 1
 		can_convert_from = {
-			module_category = tank_magic_cannon
+			module_category = tank_magic_cannon_heavy
 			convert_cost_ic = 10
 		}
 		build_cost_resources = {
@@ -1032,7 +1051,7 @@ equipment_modules = {
 
 	tank_magic_high_velocity_cannon_4 = {
 		abbreviation = "mhvc4"
-		category = tank_magic_cannon
+		category = tank_magic_cannon_heavy
 		gui_category = tank_heavy_main_armament
 		sfx = sfx_ui_sd_module_turret
 		add_stats = {
@@ -1046,7 +1065,7 @@ equipment_modules = {
 		dismantle_cost_ic = 1
 		xp_cost = 1
 		can_convert_from = {
-			module_category = tank_magic_cannon
+			module_category = tank_magic_cannon_heavy
 			convert_cost_ic = 12
 		}
 		build_cost_resources ={
@@ -1067,7 +1086,7 @@ equipment_modules = {
 			soft_attack = 6
 			hard_attack = 2
 			ap_attack = 10
-			air_attack = 16
+			air_attack = 18
 			build_cost_ic = 2
 			reliability = -0.1
 		}
@@ -1090,7 +1109,7 @@ equipment_modules = {
 			soft_attack = 8
 			hard_attack = 5
 			ap_attack = 20
-			air_attack = 32
+			air_attack = 36
 			build_cost_ic = 3
 			reliability = -0.1
 		}
@@ -1117,7 +1136,7 @@ equipment_modules = {
 			soft_attack = 10
 			hard_attack = 5
 			ap_attack = 30
-			air_attack = 43
+			air_attack = 46
 			build_cost_ic = 4
 			reliability = -0.1
 		}
@@ -1144,7 +1163,7 @@ equipment_modules = {
 			soft_attack = 12
 			hard_attack = 5
 			ap_attack = 40
-			air_attack = 62
+			air_attack = 64
 			build_cost_ic = 5
 			reliability = -0.1
 		}
@@ -1171,7 +1190,7 @@ equipment_modules = {
 			soft_attack = 14
 			hard_attack = 5
 			ap_attack = 50
-			air_attack = 85
+			air_attack = 87
 			build_cost_ic = 6
 			reliability = -0.1
 		}
@@ -1187,6 +1206,138 @@ equipment_modules = {
 		}
 	}
 
+	
+	tank_heavy_anti_air_cannon = {
+		abbreviation = "haa1"
+		category = tank_medium_main_armament
+		sfx = sfx_ui_sd_module_turret
+		allow_equipment_type = anti_air
+		forbid_equipment_type_exact_match = armor
+
+		add_stats = {
+			soft_attack = 6
+			hard_attack = 2
+			ap_attack = 10
+			air_attack = 36
+			build_cost_ic = 4
+			reliability = -0.2
+		}
+		dismantle_cost_ic = 1
+		xp_cost = 1
+		can_convert_from = {
+			module_category = tank_medium_main_armament
+			convert_cost_ic = 4
+		}
+	}
+
+	tank_heavy_anti_air_cannon_2 = {
+		abbreviation = "haa2"
+		category = tank_medium_main_armament
+		sfx = sfx_ui_sd_module_turret
+		allow_equipment_type = anti_air
+		forbid_equipment_type_exact_match = armor
+		parent = tank_heavy_anti_air_cannon
+		add_stats = {
+			soft_attack = 16
+			hard_attack = 5
+			ap_attack = 20
+			air_attack = 72
+			build_cost_ic = 6
+			reliability = -0.2
+		}
+		dismantle_cost_ic = 1
+		xp_cost = 1
+		can_convert_from = {
+			module_category = tank_medium_main_armament
+			convert_cost_ic = 6
+		}
+		build_cost_resources = {
+			steel = 4
+			tungsten = 2
+		}
+	}
+
+	tank_heavy_anti_air_cannon_3 = {
+		abbreviation = "haa3"
+		category = tank_heavy_main_armament
+		sfx = sfx_ui_sd_module_turret
+		allow_equipment_type = anti_air
+		forbid_equipment_type_exact_match = armor
+		parent = tank_heavy_anti_air_cannon_2
+		add_stats = {
+			soft_attack = 20
+			hard_attack = 5
+			ap_attack = 30
+			air_attack = 92
+			build_cost_ic = 8
+			reliability = -0.2
+		}
+		dismantle_cost_ic = 1
+		xp_cost = 1
+		can_convert_from = {
+			module_category = tank_heavy_main_armament
+			convert_cost_ic = 8
+		}
+		build_cost_resources = {
+			steel = 6
+			tungsten = 2
+		}
+	}
+
+	tank_heavy_anti_air_cannon_4 = {
+		abbreviation = "haa4"
+		category = tank_heavy_main_armament
+		sfx = sfx_ui_sd_module_turret
+		allow_equipment_type = anti_air
+		forbid_equipment_type_exact_match = armor
+		parent = tank_heavy_anti_air_cannon_3
+		add_stats = {
+			soft_attack = 24
+			hard_attack = 5
+			ap_attack = 40
+			air_attack = 128
+			build_cost_ic = 10
+			reliability = -0.2
+		}
+		dismantle_cost_ic = 1
+		xp_cost = 1
+		can_convert_from = {
+			module_category = tank_heavy_main_armament
+			convert_cost_ic = 10
+		}
+		build_cost_resources = {
+			steel = 8
+			tungsten = 2
+		}
+	}
+
+	tank_heavy_anti_air_cannon_5 = {
+		abbreviation = "haa5"
+		category = tank_super_heavy_main_armament
+		sfx = sfx_ui_sd_module_turret
+		allow_equipment_type = anti_air
+		forbid_equipment_type_exact_match = armor
+		parent = tank_heavy_anti_air_cannon_4
+		add_stats = {
+			soft_attack = 28
+			hard_attack = 5
+			ap_attack = 50
+			air_attack = 174
+			build_cost_ic = 12
+			reliability = -0.2
+		}
+		dismantle_cost_ic = 1
+		xp_cost = 1
+		can_convert_from = {
+			module_category = tank_super_heavy_main_armament
+			convert_cost_ic = 12
+		}
+		build_cost_resources = {
+			steel = 8
+			tungsten = 4
+		}
+	}
+
 	tank_small_cannon = {
 		abbreviation = "sc1"
 		category = tank_small_main_armament
@@ -1197,7 +1348,7 @@ equipment_modules = {
 			hard_attack = 6
 			ap_attack = 25
 			build_cost_ic = 1.5
-			maximum_speed = -0.15
+			maximum_speed = -0.1
 			reliability = -0.1
 		}
 		dismantle_cost_ic = 1
@@ -1218,7 +1369,7 @@ equipment_modules = {
 			hard_attack = 15
 			ap_attack = 50
 			build_cost_ic = 3
-			maximum_speed = -0.2
+			maximum_speed = -0.1
 			reliability = -0.1
 		}
 		dismantle_cost_ic = 1
@@ -1238,7 +1389,7 @@ equipment_modules = {
 			hard_attack = 20
 			ap_attack = 75
 			build_cost_ic = 4
-			maximum_speed = -0.25
+			maximum_speed = -0.1
 			reliability = -0.1
 		}
 		dismantle_cost_ic = 1
@@ -1258,7 +1409,7 @@ equipment_modules = {
 			hard_attack = 25
 			ap_attack = 100
 			build_cost_ic = 5
-			maximum_speed = -0.3
+			maximum_speed = -0.1
 			reliability = -0.1
 		}
 		dismantle_cost_ic = 1
@@ -2078,6 +2229,24 @@ equipment_modules = {
 		}
 	}
 
+	NOR_rikstanken_turret = {
+		abbreviation = "mst"
+		category = tank_light_turret_type
+		sfx = sfx_ui_sd_module_turret
+
+		add_stats = {
+			build_cost_ic = 0.1
+			breakthrough = 1	
+			reliability = -0.25
+		}
+		dismantle_cost_ic = 0.5
+		xp_cost = 2
+		multiply_stats = {
+			
+		}
+
+	}
+
 
 	###Special Modules
 
@@ -2215,6 +2384,26 @@ equipment_modules = {
 		}
 	}
 
+	secondary_turret_close_support_gun = {
+		abbreviation = "tcsg"
+		category = tank_secondary_turret
+		sfx = sfx_ui_sd_module_turret
+		add_stats = {
+			soft_attack = 8
+			hard_attack = 1
+			build_cost_ic = 3
+			reliability = -0.1
+			breakthrough = 1
+		}
+		dismantle_cost_ic = 1
+		build_cost_resources = {
+			steel = 1
+		}
+		xp_cost = 1
+		multiply_stats = {
+		}
+	}
+
 	sloped_armor = {
 		abbreviation = "slop"
 		category = tank_special_module
@@ -2324,7 +2513,9 @@ equipment_modules = {
 		sfx = sfx_ui_sd_module_turret
 
 		forbid_module_categories = {
-			tank_magic_cannon
+			tank_magic_cannon_light
+			tank_magic_cannon_medium
+			tank_magic_cannon_heavy
 		}
 
 		add_stats = {
@@ -2347,7 +2538,7 @@ equipment_modules = {
 		sfx = sfx_ui_sd_module_turret
 
 		add_stats = {
-			armor_value = 2
+			armor_value = 3
 			breakthrough = 3
 			build_cost_ic = 0.5
 		}
@@ -2364,7 +2555,7 @@ equipment_modules = {
 		sfx = sfx_ui_sd_module_turret
 
 		add_stats = {
-			armor_value = 6
+			armor_value = 9
 			breakthrough = 9
 			build_cost_ic = 1.5
 		}
@@ -2454,7 +2645,8 @@ equipment_modules = {
 
 	easy_maintenance = {
 		abbreviation = "easy"
-		category = tank_special_module
+		category = tank_special_module_maintenance
+		gui_category = tank_special_module
 		sfx = sfx_ui_sd_module_turret
 
 		add_stats = {
@@ -2467,6 +2659,23 @@ equipment_modules = {
 		}
 	}
 
+	easy_maintenance_2 = {
+		abbreviation = "easy2"
+		category = tank_special_module_maintenance
+		gui_category = tank_special_module
+		sfx = sfx_ui_sd_module_turret
+		parent = easy_maintenance
+
+		add_stats = {
+			reliability = 0.2
+		}
+		dismantle_cost_ic = 1
+		xp_cost = 30
+		multiply_stats = {
+			build_cost_ic = -0.1
+		}
+	}
+
 	additional_machine_guns = {
 		abbreviation = "mg"
 		category = tank_special_module
diff --git a/common/units/equipment/motorized.txt b/common/units/equipment/motorized.txt
index 0878361d060..67cf9fb4fd3 100644
--- a/common/units/equipment/motorized.txt
+++ b/common/units/equipment/motorized.txt
@@ -35,13 +35,23 @@ equipments = {
 		fuel_consumption = 1.2
 		supply_truck = yes
 	}
+	motorized_equipment_0 = { # Introducing WW1 style trucks
+		year = 1936
 
+		archetype = motorized_equipment
+		priority = 30
+		maximum_speed = 10
+		hardness = 0.075
+		reliability = 0.65
+		breakthrough = 2			
+	}
+	
 	motorized_equipment_1 = {
 		year = 1007
 
 		archetype = motorized_equipment
 		priority = 30
-
+		parent = motorized_equipment_0
 		is_convertable = yes
 	}
 
diff --git a/common/units/equipment/plane_airframes.txt b/common/units/equipment/plane_airframes.txt
index b98a4a8a711..66e4579a390 100644
--- a/common/units/equipment/plane_airframes.txt
+++ b/common/units/equipment/plane_airframes.txt
@@ -34,11 +34,12 @@ equipments = {
 		lend_lease_cost = 8
 		manpower = 20
 		fuel_consumption = 0.05
-		build_cost_ic = 6
+		build_cost_ic = 4
 		resources = {
 			aluminium = 2
 			rubber = 1
 		}
+		lend_lease_cost = 8
 
 		module_slots = {
 			fixed_main_weapon_slot = {
@@ -232,9 +233,9 @@ equipments = {
 		module_slots = inherit
 		priority = 5
 
-		air_range = 500
-		maximum_speed = 0
-		air_agility = 45
+		air_range = 400
+		maximum_speed = 400
+		air_agility = 35
 		air_defence = 7
 		weight = 3
 		naval_strike_attack = 1
@@ -249,14 +250,14 @@ equipments = {
 		parent = small_plane_airframe_0
 		priority = 5
 
-		air_range = 650
-		maximum_speed = 0
-		air_agility = 50
+		air_range = 550
+		maximum_speed = 425
+		air_agility = 40
 		air_defence = 9
 		weight = 4
 		naval_strike_attack = 1
 		naval_strike_targetting = 1
-		build_cost_ic = 7
+		build_cost_ic = 5
 		resources = {
 			aluminium = 3
 			rubber = 1
@@ -325,14 +326,14 @@ equipments = {
 		parent = small_plane_airframe_1
 		priority = 5
 
-		air_range = 900
-		maximum_speed = 0
-		air_agility = 65
+		air_range = 650
+		maximum_speed = 450
+		air_agility = 45
 		air_defence = 11
-		weight = 5
+		weight = 4
 		naval_strike_attack = 1
 		naval_strike_targetting = 1
-		build_cost_ic = 8
+		build_cost_ic = 6
 		resources = {
 			aluminium = 3
 			rubber = 1
@@ -428,14 +429,14 @@ equipments = {
 		parent = small_plane_airframe_2
 		priority = 5
 
-		air_range = 1100
-		maximum_speed = 0
-		air_agility = 80
+		air_range = 750
+		maximum_speed = 475
+		air_agility = 50
 		air_defence = 12
-		weight = 6
+		weight = 4
 		naval_strike_attack = 1
 		naval_strike_targetting = 1
-		build_cost_ic = 9
+		build_cost_ic = 7
 		resources = {
 			aluminium = 4
 			rubber = 1
@@ -527,6 +528,17 @@ equipments = {
 					plane_special_module_defense_turret
 				}
 			}
+			special_type_slot_4 = {
+				required = no
+				allowed_module_categories = {
+					plane_special_module_small
+					plane_special_module_bomb_sights
+					plane_special_module_radio_navigation
+					plane_special_module_air_ground_radar
+					plane_special_module_air_air_radar
+					plane_special_module_defense_turret
+				}
+			}
 		}
 	}
 
@@ -538,14 +550,14 @@ equipments = {
 		parent = small_plane_airframe_3
 		priority = 5
 
-		air_range = 2000
-		maximum_speed = 0
-		air_agility = 85
+		air_range = 900
+		maximum_speed = 500
+		air_agility = 55
 		air_defence = 18
-		weight = 7
+		weight = 4
 		naval_strike_attack = 1
 		naval_strike_targetting = 1
-		build_cost_ic = 12
+		build_cost_ic = 10
 		resources = {
 			aluminium = 4
 			rubber = 1
@@ -640,6 +652,17 @@ equipments = {
 					plane_special_module_defense_turret
 				}
 			}
+			special_type_slot_4 = {
+				required = no
+				allowed_module_categories = {
+					plane_special_module_small
+					plane_special_module_bomb_sights
+					plane_special_module_radio_navigation
+					plane_special_module_air_ground_radar
+					plane_special_module_air_air_radar
+					plane_special_module_defense_turret
+				}
+			}
 		}
 	}
 
@@ -651,14 +674,14 @@ equipments = {
 		parent = small_plane_airframe_4
 		priority = 5
 
-		air_range = 2500
-		maximum_speed = 0
-		air_agility = 100
+		air_range = 1050
+		maximum_speed = 625
+		air_agility = 70
 		air_defence = 21
-		weight = 8
+		weight = 4
 		naval_strike_attack = 1
 		naval_strike_targetting = 1
-		build_cost_ic = 13
+		build_cost_ic = 11
 		resources = {
 			aluminium = 5
 			rubber = 1
@@ -803,7 +826,7 @@ equipments = {
 		lend_lease_cost = 8
 		manpower = 20
 		fuel_consumption = 0.05
-		build_cost_ic = 8
+		build_cost_ic = 6
 		resources = {
 			aluminium = 2
 			rubber = 1
@@ -1002,13 +1025,15 @@ equipments = {
 		module_slots = inherit
 		priority = 5
 
-		air_range = 450
-		maximum_speed = 0
-		air_agility = 40
+		air_range = 400
+		maximum_speed = 400
+		air_agility = 30
 		air_defence = 7
-		weight = 5
+		weight = 4
 		naval_strike_attack = 1
 		naval_strike_targetting = 1
+
+		lend_lease_cost = 8
 	}
 
 	cv_small_plane_airframe_1 = { #Basic
@@ -1020,14 +1045,14 @@ equipments = {
 		parent = cv_small_plane_airframe_0
 		priority = 5
 
-		air_range = 570
-		maximum_speed = 0
-		air_agility = 45
+		air_range = 550
+		maximum_speed = 425
+		air_agility = 35
 		air_defence = 9
-		weight = 6
+		weight = 5
 		naval_strike_attack = 1
 		naval_strike_targetting = 1
-		build_cost_ic = 10.5
+		build_cost_ic = 8.5
 		resources = {
 			aluminium = 3
 			rubber = 1
@@ -1095,14 +1120,14 @@ equipments = {
 		parent = cv_small_plane_airframe_1
 		priority = 5
 
-		air_range = 750
-		maximum_speed = 0
-		air_agility = 60
+		air_range = 650
+		maximum_speed = 450
+		air_agility = 40
 		air_defence = 11
-		weight = 7
+		weight = 5
 		naval_strike_attack = 1
 		naval_strike_targetting = 1
-		build_cost_ic = 11.5
+		build_cost_ic = 9.5
 		resources = {
 			aluminium = 3
 			rubber = 1
@@ -1197,14 +1222,14 @@ equipments = {
 		parent = cv_small_plane_airframe_2
 		priority = 5
 
-		air_range = 900
-		maximum_speed = 0
-		air_agility = 75
+		air_range = 750
+		maximum_speed = 475
+		air_agility = 45
 		air_defence = 12
-		weight = 8
+		weight = 5
 		naval_strike_attack = 1
 		naval_strike_targetting = 1
-		build_cost_ic = 13
+		build_cost_ic = 11
 		resources = {
 			aluminium = 4
 			rubber = 1
@@ -1306,14 +1331,14 @@ equipments = {
 		parent = cv_small_plane_airframe_3
 		priority = 5
 
-		air_range = 1700
-		maximum_speed = 0
-		air_agility = 80
+		air_range = 900
+		maximum_speed = 500
+		air_agility = 50
 		air_defence = 18
-		weight = 9
+		weight = 5
 		naval_strike_attack = 1
 		naval_strike_targetting = 1
-		build_cost_ic = 16.5
+		build_cost_ic = 14.5
 		resources = {
 			aluminium = 4
 			rubber = 1
@@ -1418,14 +1443,14 @@ equipments = {
 		parent = cv_small_plane_airframe_4
 		priority = 5
 
-		air_range = 2125
-		maximum_speed = 0
-		air_agility = 85
+		air_range = 1050
+		maximum_speed = 525
+		air_agility = 65
 		air_defence = 21
-		weight = 10
+		weight = 5
 		naval_strike_attack = 1
 		naval_strike_targetting = 1
-		build_cost_ic = 17.5
+		build_cost_ic = 15.5
 		resources = {
 			aluminium = 5
 			rubber = 1
@@ -1547,7 +1572,7 @@ equipments = {
 		type_override = fixed_main_weapon_slot
 		allowed_types = {
 			tactical_bomber
-			fighter
+			heavy_fighter
 			scout_plane
 		}
 		allow_mission_type = training
@@ -1564,7 +1589,7 @@ equipments = {
 		lend_lease_cost = 10
 		manpower = 40
 		fuel_consumption = 0
-		build_cost_ic = 8
+		build_cost_ic = 6
 		resources = {
 			aluminium = 2
 			rubber = 1
@@ -1633,6 +1658,7 @@ equipments = {
 					plane_special_module_air_air_radar
 					plane_special_module_medium
 					plane_special_module_defense_turret
+					plane_special_module_defense_turret_x2
 				}
 			}
 
@@ -1641,6 +1667,7 @@ equipments = {
 				allowed_module_categories = {
 					mine_warfare_defense
 					plane_special_module_defense_turret
+					plane_special_module_defense_turret_x2
 					plane_special_module_bomb_sights
 					plane_special_module_radio_navigation
 					plane_special_module_air_ground_radar
@@ -1654,6 +1681,7 @@ equipments = {
 				allowed_module_categories = {
 					mine_warfare_defense
 					plane_special_module_defense_turret
+					plane_special_module_defense_turret_x2
 					plane_special_module_bomb_sights
 					plane_special_module_radio_navigation
 					plane_special_module_air_ground_radar
@@ -1667,6 +1695,7 @@ equipments = {
 				allowed_module_categories = {
 					mine_warfare_defense
 					plane_special_module_defense_turret
+					plane_special_module_defense_turret_x2
 					plane_special_module_bomb_sights
 					plane_special_module_radio_navigation
 					plane_special_module_air_ground_radar
@@ -1805,8 +1834,8 @@ equipments = {
 		module_slots = inherit
 		priority = 5
 
-		air_range = 2000
-		maximum_speed = 0
+		air_range = 900
+		maximum_speed = 200
 		air_agility = 5
 		air_defence = 15
 		weight = 8
@@ -1828,19 +1857,20 @@ equipments = {
 		module_slots = inherit
 		priority = 5
 
-		air_range = 1200
-		maximum_speed = 0
-		air_agility = 15
+		air_range = 750
+		maximum_speed = 200
+		air_agility = 25
 		air_defence = 15
 		weight = 8
+		naval_strike_attack = 1
+		naval_strike_targetting = 1
+
+		lend_lease_cost = 10
 
 		resources = {
 			aluminium = 2
 			rubber = 1
 		}
-
-		naval_strike_attack = 1
-		naval_strike_targetting = 1
 	}
 
 	medium_plane_airframe_1 = { #Basic
@@ -1851,14 +1881,14 @@ equipments = {
 		parent = medium_plane_airframe_0
 		priority = 5
 
-		air_range = 2200
-		maximum_speed = 0
+		air_range = 900
+		maximum_speed = 325
 		air_agility = 30
 		air_defence = 18
-		weight = 10
+		weight = 8
 		naval_strike_attack = 1
 		naval_strike_targetting = 1
-		build_cost_ic = 10
+		build_cost_ic = 8
 		resources = {
 			aluminium = 3
 			rubber = 1
@@ -1921,6 +1951,7 @@ equipments = {
 				allowed_module_categories = {
 					plane_special_module_medium
 					plane_special_module_defense_turret
+					plane_special_module_defense_turret_x2
 					plane_special_module_bomb_sights
 					plane_special_module_radio_navigation
 					plane_special_module_air_ground_radar
@@ -1934,6 +1965,7 @@ equipments = {
 				allowed_module_categories = {
 					plane_special_module_medium
 					plane_special_module_defense_turret
+					plane_special_module_defense_turret_x2
 					plane_special_module_bomb_sights
 					plane_special_module_radio_navigation
 					plane_special_module_air_ground_radar
@@ -1946,6 +1978,7 @@ equipments = {
 				allowed_module_categories = {
 					plane_special_module_medium
 					plane_special_module_defense_turret
+					plane_special_module_defense_turret_x2
 					plane_special_module_bomb_sights
 					plane_special_module_radio_navigation
 					plane_special_module_air_ground_radar
@@ -1959,6 +1992,7 @@ equipments = {
 				allowed_module_categories = {
 					plane_special_module_medium
 					plane_special_module_defense_turret
+					plane_special_module_defense_turret_x2
 					plane_special_module_bomb_sights
 					plane_special_module_radio_navigation
 					plane_special_module_air_ground_radar
@@ -1977,14 +2011,14 @@ equipments = {
 		parent = medium_plane_airframe_1
 		priority = 5
 
-		air_range = 2400
-		maximum_speed = 0
+		air_range = 1100
+		maximum_speed = 375
 		air_agility = 35
 		air_defence = 20
-		weight = 12
+		weight = 8
 		naval_strike_attack = 1
 		naval_strike_targetting = 1
-		build_cost_ic = 12
+		build_cost_ic = 10
 		resources = {
 			aluminium = 4
 			rubber = 1
@@ -2049,6 +2083,7 @@ equipments = {
 				required = no
 				allowed_module_categories = {
 					plane_special_module_defense_turret
+					plane_special_module_defense_turret_x2
 					plane_special_module_bomb_sights
 					plane_special_module_radio_navigation
 					plane_special_module_air_ground_radar
@@ -2062,6 +2097,7 @@ equipments = {
 				required = no
 				allowed_module_categories = {
 					plane_special_module_defense_turret
+					plane_special_module_defense_turret_x2
 					plane_special_module_bomb_sights
 					plane_special_module_radio_navigation
 					plane_special_module_air_ground_radar
@@ -2074,6 +2110,7 @@ equipments = {
 				required = no
 				allowed_module_categories = {
 					plane_special_module_defense_turret
+					plane_special_module_defense_turret_x2
 					plane_special_module_bomb_sights
 					plane_special_module_radio_navigation
 					plane_special_module_air_ground_radar
@@ -2087,6 +2124,7 @@ equipments = {
 				required = no
 				allowed_module_categories = {
 					plane_special_module_defense_turret
+					plane_special_module_defense_turret_x2
 					plane_special_module_bomb_sights
 					plane_special_module_radio_navigation
 					plane_special_module_air_ground_radar
@@ -2100,6 +2138,7 @@ equipments = {
 				required = no
 				allowed_module_categories = {
 					plane_special_module_defense_turret
+					plane_special_module_defense_turret_x2
 					plane_special_module_bomb_sights
 					plane_special_module_radio_navigation
 					plane_special_module_air_ground_radar
@@ -2119,14 +2158,14 @@ equipments = {
 		parent = medium_plane_airframe_2
 		priority = 5
 
-		air_range = 2800
-		maximum_speed = 0
+		air_range = 1300
+		maximum_speed = 425
 		air_agility = 40
 		air_defence = 24
-		weight = 14
+		weight = 8
 		naval_strike_attack = 1
 		naval_strike_targetting = 1
-		build_cost_ic = 15
+		build_cost_ic = 13
 		resources = {
 			aluminium = 5
 			rubber = 1
@@ -2203,6 +2242,7 @@ equipments = {
 				required = no
 				allowed_module_categories = {
 					plane_special_module_defense_turret
+					plane_special_module_defense_turret_x2
 					plane_special_module_bomb_sights
 					plane_special_module_radio_navigation
 					plane_special_module_air_ground_radar
@@ -2216,6 +2256,7 @@ equipments = {
 				required = no
 				allowed_module_categories = {
 					plane_special_module_defense_turret
+					plane_special_module_defense_turret_x2
 					plane_special_module_bomb_sights
 					plane_special_module_radio_navigation
 					plane_special_module_air_ground_radar
@@ -2228,6 +2269,7 @@ equipments = {
 				required = no
 				allowed_module_categories = {
 					plane_special_module_defense_turret
+					plane_special_module_defense_turret_x2
 					plane_special_module_bomb_sights
 					plane_special_module_radio_navigation
 					plane_special_module_air_ground_radar
@@ -2241,6 +2283,7 @@ equipments = {
 				required = no
 				allowed_module_categories = {
 					plane_special_module_defense_turret
+					plane_special_module_defense_turret_x2
 					plane_special_module_bomb_sights
 					plane_special_module_radio_navigation
 					plane_special_module_air_ground_radar
@@ -2254,6 +2297,7 @@ equipments = {
 				required = no
 				allowed_module_categories = {
 					plane_special_module_defense_turret
+					plane_special_module_defense_turret_x2
 					plane_special_module_bomb_sights
 					plane_special_module_radio_navigation
 					plane_special_module_air_ground_radar
@@ -2273,14 +2317,14 @@ equipments = {
 		parent = medium_plane_airframe_3
 		priority = 5
 
-		air_range = 3000
-		maximum_speed = 0
-		air_agility = 50
+		air_range = 1500
+		maximum_speed = 500
+		air_agility = 45
 		air_defence = 24
-		weight = 16
+		weight = 8
 		naval_strike_attack = 1
 		naval_strike_targetting = 1
-		build_cost_ic = 16
+		build_cost_ic = 14
 		resources = {
 			aluminium = 5
 			rubber = 1
@@ -2361,6 +2405,7 @@ equipments = {
 					plane_special_module_air_ground_radar
 					plane_special_module_air_air_radar
 					plane_special_module_defense_turret
+					plane_special_module_defense_turret_x2
 					plane_special_module_medium
 					mine_warfare_defense
 				}
@@ -2374,6 +2419,7 @@ equipments = {
 					plane_special_module_air_ground_radar
 					plane_special_module_air_air_radar
 					plane_special_module_defense_turret
+					plane_special_module_defense_turret_x2
 					plane_special_module_medium
 					mine_warfare_defense
 				}
@@ -2386,6 +2432,7 @@ equipments = {
 					plane_special_module_air_ground_radar
 					plane_special_module_air_air_radar
 					plane_special_module_defense_turret
+					plane_special_module_defense_turret_x2
 					plane_special_module_medium
 					mine_warfare_defense
 				}
@@ -2399,6 +2446,7 @@ equipments = {
 					plane_special_module_air_ground_radar
 					plane_special_module_air_air_radar
 					plane_special_module_defense_turret
+					plane_special_module_defense_turret_x2
 					plane_special_module_medium
 					mine_warfare_defense
 				}
@@ -2412,6 +2460,7 @@ equipments = {
 					plane_special_module_air_ground_radar
 					plane_special_module_air_air_radar
 					plane_special_module_defense_turret
+					plane_special_module_defense_turret_x2
 					plane_special_module_medium
 					mine_warfare_defense
 				}
@@ -2426,14 +2475,14 @@ equipments = {
 		parent = medium_plane_airframe_4
 		priority = 5
 
-		air_range = 3500
-		maximum_speed = 0
-		air_agility = 55
+		air_range = 17600
+		maximum_speed = 575
+		air_agility = 50
 		air_defence = 30
-		weight = 18
+		weight = 8
 		naval_strike_attack = 1
 		naval_strike_targetting = 1
-		build_cost_ic = 18
+		build_cost_ic = 16
 		resources = {
 			aluminium = 5
 			rubber = 1
@@ -2514,6 +2563,7 @@ equipments = {
 					plane_special_module_air_ground_radar
 					plane_special_module_air_air_radar
 					plane_special_module_defense_turret
+					plane_special_module_defense_turret_x2
 					plane_special_module_medium
 					mine_warfare_defense
 				}
@@ -2527,6 +2577,7 @@ equipments = {
 					plane_special_module_air_ground_radar
 					plane_special_module_air_air_radar
 					plane_special_module_defense_turret
+					plane_special_module_defense_turret_x2
 					plane_special_module_medium
 					mine_warfare_defense
 				}
@@ -2539,6 +2590,7 @@ equipments = {
 					plane_special_module_air_ground_radar
 					plane_special_module_air_air_radar
 					plane_special_module_defense_turret
+					plane_special_module_defense_turret_x2
 					plane_special_module_medium
 					mine_warfare_defense
 				}
@@ -2552,6 +2604,7 @@ equipments = {
 					plane_special_module_air_ground_radar
 					plane_special_module_air_air_radar
 					plane_special_module_defense_turret
+					plane_special_module_defense_turret_x2
 					plane_special_module_medium
 					mine_warfare_defense
 				}
@@ -2565,6 +2618,7 @@ equipments = {
 					plane_special_module_air_ground_radar
 					plane_special_module_air_air_radar
 					plane_special_module_defense_turret
+					plane_special_module_defense_turret_x2
 					plane_special_module_medium
 					mine_warfare_defense
 				}
@@ -2602,7 +2656,8 @@ equipments = {
 		lend_lease_cost = 10
 		manpower = 80
 		fuel_consumption = 0.16
-		build_cost_ic = 18
+		build_cost_ic = 16
+		lend_lease_cost = 12
 		resources = {
 		}
 
@@ -2656,6 +2711,7 @@ equipments = {
 				required = no
 				allowed_module_categories = {
 					plane_special_module_defense_turret
+					plane_special_module_defense_turret_x2
 					plane_special_module_bomb_sights
 					plane_special_module_radio_navigation
 					plane_special_module_air_ground_radar
@@ -2669,6 +2725,7 @@ equipments = {
 				required = no
 				allowed_module_categories = {
 					plane_special_module_defense_turret
+					plane_special_module_defense_turret_x2
 					plane_special_module_bomb_sights
 					plane_special_module_radio_navigation
 					plane_special_module_air_ground_radar
@@ -2682,6 +2739,7 @@ equipments = {
 				required = no
 				allowed_module_categories = {
 					plane_special_module_defense_turret
+					plane_special_module_defense_turret_x2
 					plane_special_module_bomb_sights
 					plane_special_module_radio_navigation
 					plane_special_module_air_ground_radar
@@ -2695,6 +2753,7 @@ equipments = {
 				required = no
 				allowed_module_categories = {
 					plane_special_module_defense_turret
+					plane_special_module_defense_turret_x2
 					plane_special_module_bomb_sights
 					plane_special_module_radio_navigation
 					plane_special_module_air_ground_radar
@@ -2708,6 +2767,7 @@ equipments = {
 				required = no
 				allowed_module_categories = {
 					plane_special_module_defense_turret
+					plane_special_module_defense_turret_x2
 					plane_special_module_bomb_sights
 					plane_special_module_radio_navigation
 					plane_special_module_air_ground_radar
@@ -2806,6 +2866,10 @@ equipments = {
 			category = plane_special_module_air_air_radar
 			count < 2
 		}
+		module_count_limit = {
+			category = plane_special_module_defense_turret
+			count < 7
+		}
 
 		default_modules = {
 			fixed_main_weapon_slot = empty
@@ -2836,8 +2900,8 @@ equipments = {
 		module_slots = inherit
 		priority = 5
 
-		air_range = 5000
-		maximum_speed = 0
+		air_range = 2100
+		maximum_speed = 200
 		air_agility = 2
 		air_defence = 25
 		weight = 20
@@ -2858,9 +2922,9 @@ equipments = {
 		module_slots = inherit
 		priority = 5
 
-		air_range = 2000
-		maximum_speed = 0
-		air_agility = 25
+		air_range = 1000
+		maximum_speed = 200
+		air_agility = 20
 		air_defence = 20
 		weight = 20
 
@@ -2881,14 +2945,14 @@ equipments = {
 		parent = large_plane_airframe_0
 		priority = 5
 
-		air_range = 2500
-		maximum_speed = 0
-		air_agility = 30
+		air_range = 1400
+		maximum_speed = 225
+		air_agility = 25
 		air_defence = 25
-		weight = 25
+		weight = 20
 		naval_strike_attack = 1
 		naval_strike_targetting = 1
-		build_cost_ic = 20
+		build_cost_ic = 18
 		resources = {
 			aluminium = 3
 			rubber = 2
@@ -2946,6 +3010,7 @@ equipments = {
 				allowed_module_categories = {
 					plane_special_module_large
 					plane_special_module_defense_turret
+					plane_special_module_defense_turret_x2
 					plane_special_module_bomb_sights
 					plane_special_module_radio_navigation
 					plane_special_module_air_ground_radar
@@ -2959,6 +3024,7 @@ equipments = {
 				allowed_module_categories = {
 					plane_special_module_large
 					plane_special_module_defense_turret
+					plane_special_module_defense_turret_x2
 					plane_special_module_bomb_sights
 					plane_special_module_radio_navigation
 					plane_special_module_air_ground_radar
@@ -2971,6 +3037,7 @@ equipments = {
 				allowed_module_categories = {
 					plane_special_module_large
 					plane_special_module_defense_turret
+					plane_special_module_defense_turret_x2
 					plane_special_module_bomb_sights
 					plane_special_module_radio_navigation
 					plane_special_module_air_ground_radar
@@ -2984,6 +3051,7 @@ equipments = {
 				allowed_module_categories = {
 					plane_special_module_large
 					plane_special_module_defense_turret
+					plane_special_module_defense_turret_x2
 					plane_special_module_bomb_sights
 					plane_special_module_radio_navigation
 					plane_special_module_air_ground_radar
@@ -2997,6 +3065,7 @@ equipments = {
 				allowed_module_categories = {
 					plane_special_module_large
 					plane_special_module_defense_turret
+					plane_special_module_defense_turret_x2
 					plane_special_module_bomb_sights
 					plane_special_module_radio_navigation
 					plane_special_module_air_ground_radar
@@ -3015,14 +3084,14 @@ equipments = {
 		parent = large_plane_airframe_1
 		priority = 5
 
-		air_range = 3500
-		maximum_speed = 0
-		air_agility = 35
+		air_range = 1700
+		maximum_speed = 300
+		air_agility = 30
 		air_defence = 35
-		weight = 30
+		weight = 20
 		naval_strike_attack = 1
 		naval_strike_targetting = 1
-		build_cost_ic = 22
+		build_cost_ic = 20
 		resources = {
 			aluminium = 4
 			rubber = 2
@@ -3092,6 +3161,7 @@ equipments = {
 				allowed_module_categories = {
 					plane_special_module_large
 					plane_special_module_defense_turret
+					plane_special_module_defense_turret_x2
 					plane_special_module_bomb_sights
 					plane_special_module_radio_navigation
 					plane_special_module_air_ground_radar
@@ -3105,6 +3175,7 @@ equipments = {
 				allowed_module_categories = {
 					plane_special_module_large
 					plane_special_module_defense_turret
+					plane_special_module_defense_turret_x2
 					plane_special_module_bomb_sights
 					plane_special_module_radio_navigation
 					plane_special_module_air_ground_radar
@@ -3117,6 +3188,7 @@ equipments = {
 				allowed_module_categories = {
 					plane_special_module_large
 					plane_special_module_defense_turret
+					plane_special_module_defense_turret_x2
 					plane_special_module_bomb_sights
 					plane_special_module_radio_navigation
 					plane_special_module_air_ground_radar
@@ -3130,6 +3202,7 @@ equipments = {
 				allowed_module_categories = {
 					plane_special_module_large
 					plane_special_module_defense_turret
+					plane_special_module_defense_turret_x2
 					plane_special_module_bomb_sights
 					plane_special_module_radio_navigation
 					plane_special_module_air_ground_radar
@@ -3143,6 +3216,7 @@ equipments = {
 				allowed_module_categories = {
 					plane_special_module_large
 					plane_special_module_defense_turret
+					plane_special_module_defense_turret_x2
 					plane_special_module_bomb_sights
 					plane_special_module_radio_navigation
 					plane_special_module_air_ground_radar
@@ -3156,6 +3230,7 @@ equipments = {
 				allowed_module_categories = {
 					plane_special_module_large
 					plane_special_module_defense_turret
+					plane_special_module_defense_turret_x2
 					plane_special_module_bomb_sights
 					plane_special_module_radio_navigation
 					plane_special_module_air_ground_radar
@@ -3174,14 +3249,14 @@ equipments = {
 		parent = large_plane_airframe_2
 		priority = 5
 
-		air_range = 5000
-		maximum_speed = 0
-		air_agility = 45
+		air_range = 2000
+		maximum_speed = 350
+		air_agility = 35
 		air_defence = 50
-		weight = 35
+		weight = 20
 		naval_strike_attack = 1
 		naval_strike_targetting = 1
-		build_cost_ic = 24
+		build_cost_ic = 22
 		resources = {
 			aluminium = 5
 			rubber = 2
@@ -3250,6 +3325,7 @@ equipments = {
 				required = no
 				allowed_module_categories = {
 					plane_special_module_defense_turret
+					plane_special_module_defense_turret_x2
 					plane_special_module_large
 					plane_special_module_bomb_sights
 					plane_special_module_radio_navigation
@@ -3263,6 +3339,7 @@ equipments = {
 				required = no
 				allowed_module_categories = {
 					plane_special_module_defense_turret
+					plane_special_module_defense_turret_x2
 					plane_special_module_large
 					plane_special_module_bomb_sights
 					plane_special_module_radio_navigation
@@ -3275,6 +3352,7 @@ equipments = {
 				required = no
 				allowed_module_categories = {
 					plane_special_module_defense_turret
+					plane_special_module_defense_turret_x2
 					plane_special_module_large
 					plane_special_module_bomb_sights
 					plane_special_module_radio_navigation
@@ -3288,6 +3366,7 @@ equipments = {
 				required = no
 				allowed_module_categories = {
 					plane_special_module_defense_turret
+					plane_special_module_defense_turret_x2
 					plane_special_module_large
 					plane_special_module_bomb_sights
 					plane_special_module_radio_navigation
@@ -3301,6 +3380,7 @@ equipments = {
 				required = no
 				allowed_module_categories = {
 					plane_special_module_defense_turret
+					plane_special_module_defense_turret_x2
 					plane_special_module_large
 					plane_special_module_bomb_sights
 					plane_special_module_radio_navigation
@@ -3314,6 +3394,7 @@ equipments = {
 				required = no
 				allowed_module_categories = {
 					plane_special_module_defense_turret
+					plane_special_module_defense_turret_x2
 					plane_special_module_large
 					plane_special_module_bomb_sights
 					plane_special_module_radio_navigation
@@ -3333,14 +3414,14 @@ equipments = {
 		parent = large_plane_airframe_3
 		priority = 5
 
-		air_range = 7000
-		maximum_speed = 0
-		air_agility = 55
+		air_range = 2600
+		maximum_speed = 400
+		air_agility = 40
 		air_defence = 54
-		weight = 42
+		weight = 20
 		naval_strike_attack = 1
 		naval_strike_targetting = 1
-		build_cost_ic = 25
+		build_cost_ic = 23
 		resources = {
 			aluminium = 6
 			rubber = 2
@@ -3409,6 +3490,7 @@ equipments = {
 				required = no
 				allowed_module_categories = {
 					plane_special_module_defense_turret
+					plane_special_module_defense_turret_x2
 					plane_special_module_large
 					plane_special_module_bomb_sights
 					plane_special_module_radio_navigation
@@ -3422,6 +3504,7 @@ equipments = {
 				required = no
 				allowed_module_categories = {
 					plane_special_module_defense_turret
+					plane_special_module_defense_turret_x2
 					plane_special_module_large
 					plane_special_module_bomb_sights
 					plane_special_module_radio_navigation
@@ -3434,6 +3517,7 @@ equipments = {
 				required = no
 				allowed_module_categories = {
 					plane_special_module_defense_turret
+					plane_special_module_defense_turret_x2
 					plane_special_module_large
 					plane_special_module_bomb_sights
 					plane_special_module_radio_navigation
@@ -3447,6 +3531,7 @@ equipments = {
 				required = no
 				allowed_module_categories = {
 					plane_special_module_defense_turret
+					plane_special_module_defense_turret_x2
 					plane_special_module_large
 					plane_special_module_bomb_sights
 					plane_special_module_radio_navigation
@@ -3460,6 +3545,7 @@ equipments = {
 				required = no
 				allowed_module_categories = {
 					plane_special_module_defense_turret
+					plane_special_module_defense_turret_x2
 					plane_special_module_large
 					plane_special_module_bomb_sights
 					plane_special_module_radio_navigation
@@ -3473,6 +3559,7 @@ equipments = {
 				required = no
 				allowed_module_categories = {
 					plane_special_module_defense_turret
+					plane_special_module_defense_turret_x2
 					plane_special_module_large
 					plane_special_module_bomb_sights
 					plane_special_module_radio_navigation
@@ -3491,14 +3578,14 @@ equipments = {
 		parent = large_plane_airframe_4
 		priority = 5
 
-		air_range = 8500
-		maximum_speed = 0
-		air_agility = 65
+		air_range = 3200
+		maximum_speed = 450
+		air_agility = 50
 		air_defence = 70
-		weight = 49
+		weight = 20
 		naval_strike_attack = 1
 		naval_strike_targetting = 1
-		build_cost_ic = 27
+		build_cost_ic = 25
 		resources = {
 			aluminium = 6
 			rubber = 2
@@ -3567,6 +3654,7 @@ equipments = {
 				required = no
 				allowed_module_categories = {
 					plane_special_module_defense_turret
+					plane_special_module_defense_turret_x2
 					plane_special_module_large
 					plane_special_module_bomb_sights
 					plane_special_module_radio_navigation
@@ -3580,6 +3668,7 @@ equipments = {
 				required = no
 				allowed_module_categories = {
 					plane_special_module_defense_turret
+					plane_special_module_defense_turret_x2
 					plane_special_module_large
 					plane_special_module_bomb_sights
 					plane_special_module_radio_navigation
@@ -3592,6 +3681,7 @@ equipments = {
 				required = no
 				allowed_module_categories = {
 					plane_special_module_defense_turret
+					plane_special_module_defense_turret_x2
 					plane_special_module_large
 					plane_special_module_bomb_sights
 					plane_special_module_radio_navigation
@@ -3605,6 +3695,7 @@ equipments = {
 				required = no
 				allowed_module_categories = {
 					plane_special_module_defense_turret
+					plane_special_module_defense_turret_x2
 					plane_special_module_large
 					plane_special_module_bomb_sights
 					plane_special_module_radio_navigation
@@ -3618,6 +3709,7 @@ equipments = {
 				required = no
 				allowed_module_categories = {
 					plane_special_module_defense_turret
+					plane_special_module_defense_turret_x2
 					plane_special_module_large
 					plane_special_module_bomb_sights
 					plane_special_module_radio_navigation
@@ -3631,6 +3723,7 @@ equipments = {
 				required = no
 				allowed_module_categories = {
 					plane_special_module_defense_turret
+					plane_special_module_defense_turret_x2
 					plane_special_module_large
 					plane_special_module_bomb_sights
 					plane_special_module_radio_navigation
@@ -3650,14 +3743,14 @@ equipments = {
 		parent = large_plane_airframe_4
 		priority = 5
 
-		air_range = 13000
-		maximum_speed = 0
-		air_agility = 95
+		air_range = 5100
+		maximum_speed = 450
+		air_agility = 60
 		air_defence = 200
-		weight = 63
+		weight = 40
 		naval_strike_attack = 1
 		naval_strike_targetting = 1
-		build_cost_ic = 40
+		build_cost_ic = 36
 		resources = {
 			aluminium = 9
 			rubber = 2
@@ -3728,6 +3821,7 @@ equipments = {
 				required = no
 				allowed_module_categories = {
 					plane_special_module_defense_turret
+					plane_special_module_defense_turret_x2
 					plane_special_module_large
 					plane_special_module_bomb_sights
 					plane_special_module_radio_navigation
@@ -3741,6 +3835,7 @@ equipments = {
 				required = no
 				allowed_module_categories = {
 					plane_special_module_defense_turret
+					plane_special_module_defense_turret_x2
 					plane_special_module_large
 					plane_special_module_bomb_sights
 					plane_special_module_radio_navigation
@@ -3753,6 +3848,7 @@ equipments = {
 				required = no
 				allowed_module_categories = {
 					plane_special_module_defense_turret
+					plane_special_module_defense_turret_x2
 					plane_special_module_large
 					plane_special_module_bomb_sights
 					plane_special_module_radio_navigation
@@ -3766,6 +3862,7 @@ equipments = {
 				required = no
 				allowed_module_categories = {
 					plane_special_module_defense_turret
+					plane_special_module_defense_turret_x2
 					plane_special_module_large
 					plane_special_module_bomb_sights
 					plane_special_module_radio_navigation
@@ -3779,6 +3876,7 @@ equipments = {
 				required = no
 				allowed_module_categories = {
 					plane_special_module_defense_turret
+					plane_special_module_defense_turret_x2
 					plane_special_module_large
 					plane_special_module_bomb_sights
 					plane_special_module_radio_navigation
@@ -3792,6 +3890,7 @@ equipments = {
 				required = no
 				allowed_module_categories = {
 					plane_special_module_defense_turret
+					plane_special_module_defense_turret_x2
 					plane_special_module_large
 					plane_special_module_bomb_sights
 					plane_special_module_radio_navigation
diff --git a/common/units/equipment/plane_filters.txt b/common/units/equipment/plane_filters.txt
new file mode 100644
index 00000000000..8da43d99984
--- /dev/null
+++ b/common/units/equipment/plane_filters.txt
@@ -0,0 +1,19 @@
+search_filters = {
+	name = small_planes
+	values = {small_plane_airframe cv_small_plane_airframe small_plane_cas_airframe cv_small_plane_cas_airframe small_plane_naval_bomber_airframe cv_small_plane_naval_bomber_airframe small_plane_suicide_airframe cv_small_plane_suicide_airframe jet_fighter_equipment rocket_interceptor_equipment}
+}
+
+search_filters = {	
+	name = medium_planes
+	values = {medium_plane_airframe medium_plane_fighter_airframe medium_plane_scout_plane_airframe jet_tac_bomber_equipment}
+}
+
+search_filters = {	
+	name = large_planes
+	values = {large_plane_airframe large_plane_maritime_patrol_plane_airframe jet_strat_bomber_equipment}
+}
+
+search_filters = {	
+	name = transport_planes
+	values = {transport_plane_equipment}
+}
diff --git a/common/units/equipment/quad_engine_airframe.txt b/common/units/equipment/quad_engine_airframe.txt
index 9a98d8cfdd1..f6a71e4b9a7 100644
--- a/common/units/equipment/quad_engine_airframe.txt
+++ b/common/units/equipment/quad_engine_airframe.txt
@@ -202,7 +202,7 @@ equipments = {
  		# Air vs Navy - high damage / low hit chance / hard to hurt
  		naval_strike_attack = 0.0
  		naval_strike_targetting = 0.0
- 		build_cost_ic = 20
+ 		build_cost_ic = 38
  		resources = {
  			#oil = 1
  			aluminium = 3
@@ -237,7 +237,7 @@ equipments = {
  		maximum_speed = 320
  		air_agility = 10
  		air_defence = 30
- 		build_cost_ic = 21
+ 		build_cost_ic = 40
  		resources = {
  			aluminium = 4
  			rubber = 2
@@ -256,7 +256,7 @@ equipments = {
  		maximum_speed = 350
  		air_agility = 10
  		air_defence = 40
- 		build_cost_ic = 22
+ 		build_cost_ic = 42
  		resources = {
  			aluminium = 5
  			rubber = 2
diff --git a/common/units/equipment/railway_gun.txt b/common/units/equipment/railway_gun.txt
index b42f8243a82..9126f719031 100644
--- a/common/units/equipment/railway_gun.txt
+++ b/common/units/equipment/railway_gun.txt
@@ -20,6 +20,7 @@ equipments = {
 		railway_gun_attack = 25
 		
 		manpower = 1000
+		lend_lease_cost = 30
 	}
 
 	railway_gun_equipment_1 = {
diff --git a/common/units/equipment/ship_hull_carrier.txt b/common/units/equipment/ship_hull_carrier.txt
index 7de7e38d4fe..66e2b57d2f3 100644
--- a/common/units/equipment/ship_hull_carrier.txt
+++ b/common/units/equipment/ship_hull_carrier.txt
@@ -45,6 +45,10 @@ equipments = {
 				required = yes
 				allowed_module_categories = { carrier_ship_engine }
 			}
+			fixed_ship_armor_slot = {
+				required = no
+				allowed_module_categories = { ship_cruiser_armor }	
+			}
 			fixed_ship_secondaries_slot = {
 				required = no
 				allowed_module_categories = { ship_secondaries ship_dp_secondaries }
@@ -53,20 +57,31 @@ equipments = {
 			front_1_custom_slot = {
 				required = no
 				allowed_module_categories = {
+					ship_anti_air
 					ship_deck_space
 					ship_carrier_armor
+				}
+			}
+			mid_1_custom_slot = {
+				required = no
+				allowed_module_categories = {
 					ship_secondaries
-					ship_advanced_sensors
 					ship_dp_secondaries
+					ship_deck_space
+					ship_carrier_armor
 				}
 			}
 		}
-		
+
 		module_count_limit = {
 			category = ship_radar
 			count < 2
 		}
-		
+
+		module_count_limit = {
+			category = ship_carrier_armor
+			count < 2
+		}
 		default_modules = {
 			fixed_ship_deck_slot_1 = empty
 			fixed_ship_deck_slot_2 = empty
@@ -107,7 +122,7 @@ equipments = {
 		# (Describes combat behaviour - hidden stat)
 		offensive_weapons = no
 		
-		build_cost_ic = 2450
+		build_cost_ic = 2094
 		resources = {
 			steel = 3
 			chromium = 1
@@ -116,6 +131,9 @@ equipments = {
 		manpower = 4500
 
 		naval_supremacy_factor = 2.4
+		naval_weather_penalty_factor = 1 #this value gets -1 before its used so 1.5 will increase the effects of weather penalties by 0.5. this is base value is required for MIO stat modifiers
+		#MIO stat modifers will factory by the unmodified stat value so here a 0.5 mio stat modifier would make this ships naval_weather_penalty_factor stat 1.5.
+		# change this from 1 at your own risk
 	}
 
 	ship_hull_carrier_1 = {
@@ -147,6 +165,7 @@ equipments = {
 			fixed_ship_radar_slot = inherit
 			fixed_ship_engine_slot = inherit
 			fixed_ship_secondaries_slot = inherit
+			fixed_ship_armor_slot = inherit
 			front_1_custom_slot = {
 				required = no
 				allowed_module_categories = {
@@ -165,6 +184,15 @@ equipments = {
 					ship_advanced_sensors
 				}
 			}
+			mid_2_custom_slot = {
+				required = no
+				allowed_module_categories = {
+					ship_secondaries
+					ship_dp_secondaries
+					ship_deck_space
+					ship_carrier_armor
+				}
+			}
 		}
 
 		default_modules = {
@@ -200,6 +228,7 @@ equipments = {
 			fixed_ship_radar_slot = inherit
 			fixed_ship_engine_slot = inherit
 			fixed_ship_secondaries_slot = inherit
+			fixed_ship_armor_slot = inherit
 			front_1_custom_slot = {
 				required = no
 				allowed_module_categories = {
@@ -228,6 +257,15 @@ equipments = {
 					ship_advanced_sensors
 				}
 			}
+			rear_1_custom_slot = {
+				required = no
+				allowed_module_categories = {
+					ship_secondaries
+					ship_dp_secondaries
+					ship_deck_space
+					ship_carrier_armor
+				}
+			}
 		}
 		default_modules = {
 			front_1_custom_slot = empty
@@ -264,6 +302,7 @@ equipments = {
 			fixed_ship_radar_slot = inherit
 			fixed_ship_engine_slot = inherit
 			fixed_ship_secondaries_slot = inherit
+			fixed_ship_armor_slot = inherit
 			front_1_custom_slot = {
 				required = no
 				allowed_module_categories = {
@@ -302,6 +341,15 @@ equipments = {
 					ship_advanced_sensors
 				}
 			}
+			rear_1_custom_slot = {
+				required = no
+				allowed_module_categories = {
+					ship_secondaries
+					ship_dp_secondaries
+					ship_deck_space
+					ship_carrier_armor
+				}
+			}
 		}
 		default_modules = {
 			front_1_custom_slot = empty
@@ -337,6 +385,7 @@ equipments = {
 			fixed_ship_radar_slot = inherit
 			fixed_ship_engine_slot = inherit
 			fixed_ship_secondaries_slot = inherit
+			fixed_ship_armor_slot = inherit
 			front_1_custom_slot = {
 				required = no
 				allowed_module_categories = {
@@ -369,7 +418,7 @@ equipments = {
 				required = no
 				allowed_module_categories = {
 					ship_secondaries
-					ship_dp_secondariess
+					ship_dp_secondaries
 					ship_deck_space
 					ship_carrier_armor
 					ship_advanced_sensors
@@ -385,6 +434,15 @@ equipments = {
 					ship_advanced_sensors
 				}
 			}
+			rear_2_custom_slot = {
+				required = no
+				allowed_module_categories = {
+					ship_secondaries
+					ship_dp_secondaries
+					ship_deck_space
+					ship_carrier_armor
+				}
+			}
 		}
 		default_modules = {
 			front_1_custom_slot = empty
@@ -432,7 +490,7 @@ equipments = {
 			fixed_ship_anti_air_slot = inherit
 			fixed_ship_radar_slot = inherit
 			fixed_ship_engine_slot = inherit
-			fixed_ship_secondaries_slot = inherit
+			fixed_ship_armor_slot = inherit
 			front_1_custom_slot = {
 				required = no
 				allowed_module_categories = {
@@ -526,6 +584,7 @@ equipments = {
 			fixed_ship_deck_slot_2 = inherit
 			fixed_ship_anti_air_slot = inherit
 			fixed_ship_radar_slot = inherit
+			fixed_ship_armor_slot = inherit
 			fixed_ship_engine_slot = {
 				required = yes
 				allowed_module_categories = { heavy_ship_engine carrier_ship_engine }
@@ -550,7 +609,7 @@ equipments = {
 		naval_range = 4000
 		reliability = 0.65
 		max_strength = 325
-		naval_speed = 24
+		naval_speed = 25
 
 
 		build_cost_ic = 2700
@@ -573,6 +632,7 @@ equipments = {
 			fixed_ship_deck_slot_2 = inherit
 			fixed_ship_anti_air_slot = inherit
 			fixed_ship_radar_slot = inherit
+			fixed_ship_armor_slot = inherit
 			fixed_ship_engine_slot = {
 				required = yes
 				allowed_module_categories = { cruiser_ship_engine carrier_ship_engine }
@@ -593,7 +653,7 @@ equipments = {
 		max_strength = 125
 		
 		reliability = 0.65
-		naval_speed = 22
+		naval_speed = 22.5
 		build_cost_ic = 2700
 		resources = {
 			steel = 3
@@ -635,6 +695,10 @@ equipments = {
 				required = no
 				allowed_module_categories = { ship_secondaries ship_dp_secondaries }
 			}
+			fixed_ship_armor_slot = {
+				required = no
+				allowed_module_categories = { ship_cruiser_armor }	
+			}
 			
 			front_1_custom_slot = {
 				required = no
@@ -670,7 +734,7 @@ equipments = {
 		surface_detection = 26
 		sub_detection = 5
 		surface_visibility = 30
-		naval_speed = 22
+		naval_speed = 25.5
 		reliability = 0.65
 		
 		naval_range = 3000
@@ -726,6 +790,10 @@ equipments = {
 				required = no
 				allowed_module_categories = { ship_secondaries ship_dp_secondaries }
 			}
+			fixed_ship_armor_slot = {
+				required = no
+				allowed_module_categories = { ship_cruiser_armor }	
+			}
 		}
 		default_modules = {
 			fixed_ship_deck_slot_1 = ship_deck_space
@@ -749,7 +817,7 @@ equipments = {
 		surface_detection = 26
 		sub_detection = 5
 		surface_visibility = 30
-		naval_speed = 20
+		naval_speed = 25.5
 		reliability = 0.65
 		
 		naval_range = 4000
@@ -840,7 +908,7 @@ equipments = {
 		surface_detection = 26
 		sub_detection = 5
 		surface_visibility = 30
-		naval_speed = 26
+		naval_speed = 25.5
 		reliability = 0.70
 
 		naval_range = 3000
@@ -878,6 +946,10 @@ equipments = {
 			fixed_ship_radar_slot = inherit
 			fixed_ship_engine_slot = inherit
 			fixed_ship_secondaries_slot = inherit
+			fixed_ship_armor_slot = {
+				required = no
+				allowed_module_categories = { ship_cruiser_armor }	
+			}
 			front_1_custom_slot = {
 				required = no
 				allowed_module_categories = {
@@ -919,7 +991,7 @@ equipments = {
 		surface_detection = 26
 		sub_detection = 5
 		surface_visibility = 30
-		naval_speed = 26
+		naval_speed = 27
 		reliability = 0.75
 
 		naval_range = 4000
@@ -1009,7 +1081,7 @@ equipments = {
 		surface_detection = 26
 		sub_detection = 5
 		surface_visibility = 30
-		naval_speed = 26
+		naval_speed = 28.5
 		reliability = 0.80
 
 		naval_range = 5000
@@ -1112,7 +1184,7 @@ equipments = {
 		surface_detection = 26
 		sub_detection = 5
 		surface_visibility = 30
-		naval_speed = 26
+		naval_speed = 30
 		reliability = 0.85
 
 		naval_range = 6000
@@ -1225,7 +1297,7 @@ equipments = {
 		surface_detection = 26
 		sub_detection = 5
 		surface_visibility = 30
-		naval_speed = 26
+		naval_speed = 31.5
 		reliability = 0.9
 
 		naval_range = 7000
diff --git a/common/units/equipment/ship_hull_cruiser.txt b/common/units/equipment/ship_hull_cruiser.txt
index 587596dd653..dc8198da7f7 100644
--- a/common/units/equipment/ship_hull_cruiser.txt
+++ b/common/units/equipment/ship_hull_cruiser.txt
@@ -132,6 +132,9 @@ equipments = {
 		
 		manpower = 600
 		naval_supremacy_factor = 2.3
+		naval_weather_penalty_factor = 1 #this value gets -1 before its used so 1.5 will increase the effects of weather penalties by 0.5. this is base value is required for MIO stat modifiers
+		#MIO stat modifers will factory by the unmodified stat value so here a 0.5 mio stat modifier would make this ships naval_weather_penalty_factor stat 1.5.
+		# change this from 1 at your own risk
 	}
 
 	ship_hull_cruiser_1 = {
@@ -569,7 +572,6 @@ equipments = {
 			ship_gun_upgrade
 			ship_anti_air_upgrade
 		}
-		module_slots = inherit
 		default_modules = {
 			fixed_ship_battery_slot = ship_light_medium_battery_1
 			fixed_ship_anti_air_slot = ship_anti_air_1
@@ -595,7 +597,7 @@ equipments = {
 		surface_detection = 20
 		sub_detection = 1
 		surface_visibility = 15
-		naval_speed = 27
+		naval_speed = 29
 		reliability = 0.8
 		resources = {
 			#oil = 1
@@ -805,7 +807,7 @@ equipments = {
 		
 		surface_detection = 20
 		sub_detection = 1
-		naval_speed = 30
+		naval_speed = 29
 		reliability = 0.90
 
 		naval_range = 4000
@@ -912,7 +914,7 @@ equipments = {
 		
 		surface_detection = 20
 		sub_detection = 1
-		naval_speed = 33
+		naval_speed = 30
 		reliability = 0.95
 
 		naval_range = 4500
@@ -1019,7 +1021,7 @@ equipments = {
 		
 		surface_detection = 20
 		sub_detection = 1
-		naval_speed = 29
+		naval_speed = 30
 		reliability = 1.0
 
 		naval_range = 4500
diff --git a/common/units/equipment/ship_hull_heavy.txt b/common/units/equipment/ship_hull_heavy.txt
index d3c229ee2f8..fd178865d85 100644
--- a/common/units/equipment/ship_hull_heavy.txt
+++ b/common/units/equipment/ship_hull_heavy.txt
@@ -114,7 +114,7 @@ equipments = {
 		surface_detection = 20
 		sub_detection = 1
 		surface_visibility = 20
-		naval_speed = 30
+		naval_speed = 20
 		reliability = 0.80
 		
 		naval_range = 3000
@@ -130,6 +130,10 @@ equipments = {
 		}
 
 		manpower = 4000
+		naval_supremacy_factor = 2.6
+		naval_weather_penalty_factor = 1 #this value gets -1 before its used so 1.5 will increase the effects of weather penalties by 0.5. this is base value is required for MIO stat modifiers
+		#MIO stat modifers will factory by the unmodified stat value so here a 0.5 mio stat modifier would make this ships naval_weather_penalty_factor stat 1.5.
+		# change this from 1 at your own risk
 	}
 
 	### No-MTG special snowflake hull
@@ -415,7 +419,7 @@ equipments = {
 		max_strength = 370
 		reliability = 0.85
 		fuel_consumption = 67
-		naval_speed = 30
+		naval_speed = 24
 		build_cost_ic = 3000
 		resources = {
 			#oil = 1
@@ -480,7 +484,7 @@ equipments = {
 			
 		}
 		naval_range = 4000
-		naval_speed = 30
+		naval_speed = 25
 		max_strength = 400
 		reliability = 0.9
 		fuel_consumption = 67
@@ -552,7 +556,7 @@ equipments = {
 		naval_range = 4500
 		
 		max_strength = 450
-		naval_speed = 30
+		naval_speed = 26
 		fuel_consumption = 67
 		reliability = 0.95
 		build_cost_ic = 3600
@@ -622,7 +626,7 @@ equipments = {
 		naval_range = 5000
 		
 		max_strength = 500
-		naval_speed = 28
+		naval_speed = 27
 		fuel_consumption = 67
 		reliability = 1.0
 		build_cost_ic = 3700
@@ -691,7 +695,7 @@ equipments = {
 		naval_range = 5500
 		
 		max_strength = 550
-		naval_speed = 30
+		naval_speed = 28
 		fuel_consumption = 67
 		reliability = 1.05
 		build_cost_ic = 3800
@@ -737,7 +741,7 @@ equipments = {
 			}
 			fixed_ship_armor_slot = {
 				required = yes
-				allowed_module_categories = { ship_super_heavy_armor }	
+				allowed_module_categories = { ship_heavy_armor }	
 			}
 			front_1_custom_slot = {
 				required = no
@@ -790,7 +794,7 @@ equipments = {
 			rear_1_custom_slot = empty
 		}
 		naval_range = 4500
-		naval_speed = 32
+		naval_speed = 24
 		max_strength = 700
 		fuel_consumption = 75
 		reliability = 0.80
@@ -838,7 +842,7 @@ equipments = {
 			}
 			fixed_ship_armor_slot = {
 				required = yes
-				allowed_module_categories = { ship_super_heavy_armor }	
+				allowed_module_categories = { ship_heavy_armor }	
 			}
 			front_1_custom_slot = {
 				required = no
@@ -1007,7 +1011,7 @@ equipments = {
 		surface_detection = 20
 		sub_detection = 1
 		surface_visibility = 20
-		naval_speed = 30
+		naval_speed = 21
 		reliability = 0.80
 
 		naval_range = 3000
@@ -1101,7 +1105,7 @@ equipments = {
 		surface_detection = 20
 		sub_detection = 1
 		surface_visibility = 20
-		naval_speed = 30
+		naval_speed = 24
 		reliability = 0.85
 
 		naval_range = 3500
@@ -1156,7 +1160,7 @@ equipments = {
 		surface_detection = 20
 		sub_detection = 1
 		surface_visibility = 20
-		naval_speed = 30
+		naval_speed = 25
 		reliability = 0.90
 
 		naval_range = 4000
@@ -1212,7 +1216,7 @@ equipments = {
 		surface_detection = 20
 		sub_detection = 1
 		surface_visibility = 20
-		naval_speed = 30
+		naval_speed = 26
 		reliability = 0.95
 
 		naval_range = 4500
@@ -1267,7 +1271,7 @@ equipments = {
 		surface_detection = 20
 		sub_detection = 1
 		surface_visibility = 20
-		naval_speed = 28
+		naval_speed = 27
 		reliability = 1.0
 
 		naval_range = 5000
@@ -1322,7 +1326,7 @@ equipments = {
 		surface_detection = 20
 		sub_detection = 1
 		surface_visibility = 20
-		naval_speed = 30
+		naval_speed = 28
 		reliability = 1.05
 
 		naval_range = 5500
@@ -1339,7 +1343,6 @@ equipments = {
 		}
 		manpower = 6000
 		
-		naval_supremacy_factor = 2.6
 	}
 
 
@@ -1376,7 +1379,7 @@ equipments = {
 			}
 			fixed_ship_armor_slot = {
 				required = yes
-				allowed_module_categories = { ship_super_heavy_armor }	
+				allowed_module_categories = { ship_heavy_armor }	
 			}
 			front_1_custom_slot = {
 				required = no
@@ -1448,7 +1451,7 @@ equipments = {
 		surface_detection = 20
 		sub_detection = 1
 		surface_visibility = 20
-		naval_speed = 32
+		naval_speed = 24
 		reliability = 0.8
 		
 		naval_range = 4500
@@ -1502,7 +1505,7 @@ equipments = {
 			}
 			fixed_ship_armor_slot = {
 				required = yes
-				allowed_module_categories = { ship_super_heavy_armor }	
+				allowed_module_categories = { ship_heavy_armor }	
 			}
 			front_1_custom_slot = {
 				required = no
@@ -1573,7 +1576,7 @@ equipments = {
 		surface_detection = 20
 		sub_detection = 1
 		surface_visibility = 20
-		naval_speed = 28
+		naval_speed = 24
 		reliability = 0.90
 		
 		naval_range = 4500
@@ -1627,7 +1630,7 @@ equipments = {
 			}
 			fixed_ship_armor_slot = {
 				required = yes
-				allowed_module_categories = { ship_super_heavy_armor }	
+				allowed_module_categories = { ship_heavy_armor }	
 			}
 			front_1_custom_slot = {
 				required = no
@@ -1703,7 +1706,7 @@ equipments = {
 		surface_detection = 20
 		sub_detection = 1
 		surface_visibility = 20
-		naval_speed = 28
+		naval_speed = 24
 		reliability = 1
 		
 		naval_range = 6000
@@ -1820,7 +1823,7 @@ equipments = {
 		surface_detection = 20
 		sub_detection = 1
 		surface_visibility = 20
-		naval_speed = 30
+		naval_speed = 27.5
 		reliability = 0.80
 
 		naval_range = 3000
@@ -1877,7 +1880,7 @@ equipments = {
 		surface_detection = 20
 		sub_detection = 5
 		surface_visibility = 20
-		naval_speed = 30
+		naval_speed = 31
 		reliability = 0.90
 
 		naval_range = 4000
@@ -1931,7 +1934,7 @@ equipments = {
 		surface_detection = 20
 		sub_detection = 1
 		surface_visibility = 20
-		naval_speed = 30
+		naval_speed = 34.5
 		reliability = 1.0
 
 		naval_range = 5000
diff --git a/common/units/equipment/ship_hull_light.txt b/common/units/equipment/ship_hull_light.txt
index f01976113b0..b646472ea52 100644
--- a/common/units/equipment/ship_hull_light.txt
+++ b/common/units/equipment/ship_hull_light.txt
@@ -97,7 +97,7 @@ equipments = {
 		surface_detection = 20
 		sub_detection = 1
 		surface_visibility = 10
-		naval_speed = 30
+		naval_speed = 32
 		reliability = 0.80
 		
 		naval_range = 1500
diff --git a/common/units/equipment/ship_hull_submarine.txt b/common/units/equipment/ship_hull_submarine.txt
index 9e59f3cae0e..27580244332 100644
--- a/common/units/equipment/ship_hull_submarine.txt
+++ b/common/units/equipment/ship_hull_submarine.txt
@@ -83,7 +83,7 @@ equipments = {
 
 		fuel_consumption = 1
 		
-		build_cost_ic = 220
+		build_cost_ic = 320
 		resources = {
 			#oil = 1
 			steel = 1
@@ -91,6 +91,9 @@ equipments = {
 		
 		manpower = 200
 		naval_supremacy_factor = 0.8
+		naval_weather_penalty_factor = 1 #this value gets -1 before its used so 1.5 will increase the effects of weather penalties by 0.5. this is base value is required for MIO stat modifiers
+		#MIO stat modifers will factory by the unmodified stat value so here a 0.5 mio stat modifier would make this ships naval_weather_penalty_factor stat 1.5.
+		# change this from 1 at your own risk
 	}
 
 	ship_hull_submarine_1 = {
@@ -136,7 +139,7 @@ equipments = {
 		
 
 		
-		build_cost_ic = 250
+		build_cost_ic = 350
 		resources = {
 			#oil = 1
 			steel = 2
@@ -187,7 +190,7 @@ equipments = {
 
 
 		
-		build_cost_ic = 320
+		build_cost_ic = 420
 		resources = {
 			steel = 2
 		}
@@ -239,7 +242,7 @@ equipments = {
 		
 
 		
-		build_cost_ic = 450
+		build_cost_ic = 550
 		resources = {
 			steel = 3
 			chromium = 1
@@ -289,7 +292,7 @@ equipments = {
 		
 
 		
-		build_cost_ic = 580
+		build_cost_ic = 680
 		resources = {
 			steel = 4
 			chromium = 1
@@ -342,7 +345,7 @@ equipments = {
 		
 
 		
-		build_cost_ic = 710
+		build_cost_ic = 810
 		resources = {
 			steel = 4
 			chromium = 2
@@ -404,7 +407,7 @@ equipments = {
 
 
 		
-		build_cost_ic = 390
+		build_cost_ic = 490
 		resources = {
 			steel = 2
 		}
@@ -484,7 +487,7 @@ equipments = {
 		
 		max_strength = 75
 		
-		build_cost_ic = 600
+		build_cost_ic = 700
 		resources = {
 			steel = 4
 			chromium = 1
@@ -569,7 +572,7 @@ equipments = {
 		
 		max_strength = 200
 		
-		build_cost_ic = 1000
+		build_cost_ic = 1200
 		resources = {
 			steel = 4
 			chromium = 2
@@ -616,7 +619,7 @@ equipments = {
 		manpower = 100
 
 		
-		build_cost_ic = 100
+		build_cost_ic = 150
 		resources = {
 			steel = 1
 		}
diff --git a/common/units/equipment/support.txt b/common/units/equipment/support.txt
index 882bba8c8db..4e50a75fce7 100644
--- a/common/units/equipment/support.txt
+++ b/common/units/equipment/support.txt
@@ -8,6 +8,7 @@ equipments = {
 		type = {
 			infantry
 			motorized
+			support
 		}
 		group_by = archetype
 
diff --git a/common/units/equipment/tank_chassis.txt b/common/units/equipment/tank_chassis.txt
index 73a81db4a16..399a57afa00 100644
--- a/common/units/equipment/tank_chassis.txt
+++ b/common/units/equipment/tank_chassis.txt
@@ -1,5 +1,10 @@
 equipments = {
 
+	### Helpful handy information: modules that depend on other modules (ie, big guns require fixed turrets)
+	### require that the module slots for their equipment archetype are defined in operational order for AI + historical templates.
+	### tldr; If your gun requires a specific turret: define the turret slot first.
+	
+
 	light_tank_chassis = {
 		year = 985
 		is_archetype = yes
@@ -13,19 +18,19 @@ equipments = {
 		
 
 		module_slots = {
-			main_armament_slot = {
+			turret_type_slot = { #Turrets must go at the top
 				required = yes
 				allowed_module_categories = {
-					tank_small_main_armament
-					tank_magic_cannon
-					tank_flamethrower
+					tank_light_turret_type
 				}
 			}
-
-			turret_type_slot = {
+		
+			main_armament_slot = {
 				required = yes
 				allowed_module_categories = {
-					tank_light_turret_type
+					tank_small_main_armament
+					tank_magic_cannon_light
+					tank_flamethrower
 				}
 			}
 			suspension_type_slot = {
@@ -55,6 +60,7 @@ equipments = {
 				allowed_module_categories = {
 					tank_special_module
 					tank_special_module_stabilizer
+					tank_special_module_maintenance
 					tank_special_module_skirts
 					tank_radio_module
 					tank_secondary_turret
@@ -66,6 +72,7 @@ equipments = {
 				allowed_module_categories = {
 					tank_special_module
 					tank_special_module_stabilizer
+					tank_special_module_maintenance
 					tank_special_module_skirts
 					tank_radio_module
 					tank_secondary_turret
@@ -77,6 +84,7 @@ equipments = {
 				allowed_module_categories = {
 					tank_special_module
 					tank_special_module_stabilizer
+					tank_special_module_maintenance
 					tank_special_module_skirts
 					tank_radio_module
 					tank_secondary_turret
@@ -87,6 +95,7 @@ equipments = {
 				required = no
 				allowed_module_categories = {
 					tank_special_module
+					tank_special_module_maintenance
 					tank_special_module_stabilizer
 					tank_special_module_skirts
 					tank_radio_module
@@ -133,7 +142,7 @@ equipments = {
 		}
 
 		module_count_limit = {
-			module = easy_maintenance
+			category = tank_special_module_maintenance
 			count < 2
 		}
 		module_count_limit = {
@@ -178,6 +187,8 @@ equipments = {
 			steel = 1
 		}
 
+		lend_lease_cost = 10
+
 		manpower = 2
 
 	}
@@ -224,7 +235,7 @@ equipments = {
 		build_cost_ic = 1.6
 		maximum_speed = 4.5
 		reliability = 1.1
-		armor_value = 15
+		armor_value = 16
 		resources = {
 			steel = 1
 		}
@@ -296,20 +307,21 @@ equipments = {
 		priority = 2000
 
 		module_slots = {
-			main_armament_slot = {
+			turret_type_slot = {
 				required = yes
 				allowed_module_categories = {
-					tank_small_main_armament
-					tank_magic_cannon
-					tank_flamethrower
+					tank_light_turret_type
+					tank_medium_turret_type
 				}
 			}
-
-			turret_type_slot = {
+			
+			main_armament_slot = {
 				required = yes
 				allowed_module_categories = {
-					tank_light_turret_type
-					tank_medium_turret_type
+					tank_small_main_armament
+					tank_magic_cannon_light
+					tank_magic_cannon_medium
+					tank_flamethrower
 				}
 			}
 
@@ -340,6 +352,7 @@ equipments = {
 					tank_radio_module
 					tank_special_module
 					tank_special_module_stabilizer
+					tank_special_module_maintenance
 					tank_special_module_skirts
 					tank_secondary_turret
 				}
@@ -350,6 +363,7 @@ equipments = {
 				allowed_module_categories = {
 					tank_special_module
 					tank_special_module_stabilizer
+					tank_special_module_maintenance
 					tank_special_module_skirts
 					tank_secondary_turret
 					tank_radio_module
@@ -361,6 +375,7 @@ equipments = {
 				allowed_module_categories = {
 					tank_special_module
 					tank_special_module_stabilizer
+					tank_special_module_maintenance
 					tank_special_module_skirts
 					tank_secondary_turret
 					tank_radio_module
@@ -372,6 +387,7 @@ equipments = {
 				allowed_module_categories = {
 					tank_special_module
 					tank_special_module_stabilizer
+					tank_special_module_maintenance
 					tank_special_module_skirts
 					tank_secondary_turret
 					tank_radio_module
@@ -416,7 +432,7 @@ equipments = {
 		}
 
 		module_count_limit = {
-			module = easy_maintenance
+			category = tank_special_module_maintenance
 			count < 2
 		}
 		module_count_limit = {
@@ -455,12 +471,12 @@ equipments = {
 		maximum_speed = 4
 		build_cost_ic = 2
 		reliability = 1
-		armor_value = 15
+		armor_value = 16
 		hardness = 0.85
 		resources = {
 			steel = 1
 		}
-
+		lend_lease_cost = 12
 		manpower = 2
 
 	}
@@ -479,7 +495,7 @@ equipments = {
 		maximum_speed = 4
 		build_cost_ic = 2.5
 		reliability = 0.75
-		armor_value = 25
+		armor_value = 24
 		resources = {
 			steel = 1
 		}
@@ -494,7 +510,7 @@ equipments = {
 		parent = medium_tank_chassis_0
 		priority = 2000
 		module_slots = inherit
-		armor_value = 35
+		armor_value = 38
 		build_cost_ic = 2.5
 	}
 	medium_tank_chassis_2 = {
@@ -509,7 +525,7 @@ equipments = {
 		maximum_speed = 4
 		build_cost_ic = 3.2
 		reliability = 1.3
-		armor_value = 45
+		armor_value = 46
 		resources = {
 			steel = 1
 		}
@@ -526,7 +542,7 @@ equipments = {
 		maximum_speed = 4.5
 		build_cost_ic = 4
 		reliability = 1.6
-		armor_value = 50
+		armor_value = 54
 		resources = {
 			steel = 2
 		}
@@ -543,15 +559,6 @@ equipments = {
 		priority = 2000
 
 		module_slots = {
-			main_armament_slot = {
-				required = yes
-				allowed_module_categories = {
-					tank_small_main_armament
-					tank_magic_cannon
-					tank_flamethrower
-				}
-			}
-
 			turret_type_slot = {
 				required = yes
 				allowed_module_categories = {
@@ -560,6 +567,17 @@ equipments = {
 					tank_heavy_turret_type
 				}
 			}
+			
+			main_armament_slot = {
+				required = yes
+				allowed_module_categories = {
+					tank_small_main_armament
+					tank_magic_cannon_light
+					tank_magic_cannon_medium
+					tank_magic_cannon_heavy
+					tank_flamethrower
+				}
+			}
 
 			suspension_type_slot = {
 				required = yes
@@ -587,6 +605,7 @@ equipments = {
 				allowed_module_categories = {
 					tank_special_module
 					tank_special_module_stabilizer
+					tank_special_module_maintenance
 					tank_special_module_skirts
 					tank_radio_module
 					tank_secondary_turret
@@ -598,6 +617,7 @@ equipments = {
 				allowed_module_categories = {
 					tank_special_module
 					tank_special_module_stabilizer
+					tank_special_module_maintenance
 					tank_special_module_skirts
 					tank_secondary_turret
 					tank_radio_module
@@ -609,6 +629,7 @@ equipments = {
 				allowed_module_categories = {
 					tank_special_module
 					tank_special_module_stabilizer
+					tank_special_module_maintenance
 					tank_special_module_skirts
 					tank_secondary_turret
 					tank_radio_module
@@ -620,6 +641,7 @@ equipments = {
 				allowed_module_categories = {
 					tank_special_module
 					tank_special_module_stabilizer
+					tank_special_module_maintenance
 					tank_special_module_skirts
 					tank_secondary_turret
 					tank_radio_module
@@ -661,7 +683,7 @@ equipments = {
 		}
 
 		module_count_limit = {
-			module = easy_maintenance
+			category = tank_special_module_maintenance
 			count < 2
 		}
 		module_count_limit = {
@@ -700,12 +722,12 @@ equipments = {
 		maximum_speed = 3.5
 		build_cost_ic = 9 # was 10
 		reliability = 1
-		armor_value = 25
+		armor_value = 28
 		hardness = 0.95
 		resources = {
 			steel = 1
 		}
-
+		lend_lease_cost = 14
 		manpower = 2
 
 	}
@@ -722,22 +744,23 @@ equipments = {
 			tank_nsb_engine_upgrade
 			tank_nsb_armor_upgrade
 		}
+		maximum_speed = 3.5
 		build_cost_ic = 9 # was 10
 		reliability = 1
-		armor_value = 30
+		armor_value = 28
 	}
 
 	heavy_tank_chassis_1 = {
 		abbreviation = "hv1"
 		derived_variant_name = heavy_tank_equipment_1
 		visual_level = 0
-		year = 1007
+		year = 1005
 		archetype = heavy_tank_chassis
 		parent = heavy_tank_chassis_0
 		priority = 2000
 		module_slots = inherit
-		armor_value = 35
-		maximum_speed = 4 # PDX made GW heavies faster than basic heavies lul
+		armor_value = 42
+		maximum_speed = 4
 	}
 
 	heavy_tank_chassis_2 = {
@@ -752,7 +775,7 @@ equipments = {
 		build_cost_ic = 9 # was 10
 		maximum_speed = 4
 		reliability = 1.15
-		armor_value = 55
+		armor_value = 54
 		resources = {
 			steel = 1
 			chromium = 1
@@ -771,7 +794,7 @@ equipments = {
 		build_cost_ic = 10.8 # was 12
 		maximum_speed = 4
 		reliability = 1.3
-		armor_value = 75
+		armor_value = 76
 		resources = {
 			steel = 2
 			chromium = 1
@@ -789,15 +812,6 @@ equipments = {
 		priority = 2000
 
 		module_slots = {
-			main_armament_slot = {
-				required = yes
-				allowed_module_categories = {
-					tank_small_main_armament
-					tank_magic_cannon
-					tank_flamethrower
-				}
-			}
-
 			turret_type_slot = {
 				required = yes
 				allowed_module_categories = {
@@ -807,6 +821,18 @@ equipments = {
 					tank_modern_turret_type
 				}
 			}
+			
+			main_armament_slot = {
+				required = yes
+				allowed_module_categories = {
+					tank_small_main_armament
+					tank_magic_cannon_light
+					tank_magic_cannon_medium
+					tank_magic_cannon_heavy
+					tank_flamethrower
+				}
+			}
+
 
 			suspension_type_slot = {
 				required = yes
@@ -834,6 +860,7 @@ equipments = {
 				allowed_module_categories = {
 					tank_special_module
 					tank_special_module_stabilizer
+					tank_special_module_maintenance
 					tank_special_module_skirts
 					tank_radio_module
 				}
@@ -844,6 +871,7 @@ equipments = {
 				allowed_module_categories = {
 					tank_special_module
 					tank_special_module_stabilizer
+					tank_special_module_maintenance
 					tank_special_module_skirts
 					tank_radio_module
 				}
@@ -854,6 +882,7 @@ equipments = {
 				allowed_module_categories = {
 					tank_special_module
 					tank_special_module_stabilizer
+					tank_special_module_maintenance
 					tank_special_module_skirts
 					tank_radio_module
 				}
@@ -864,6 +893,7 @@ equipments = {
 				allowed_module_categories = {
 					tank_special_module
 					tank_special_module_stabilizer
+					tank_special_module_maintenance
 					tank_special_module_skirts
 					tank_radio_module
 				}
@@ -904,7 +934,7 @@ equipments = {
 		}
 
 		module_count_limit = {
-			module = easy_maintenance
+			category = tank_special_module_maintenance
 			count < 2
 		}
 		module_count_limit = {
@@ -944,13 +974,13 @@ equipments = {
 		maximum_speed = 4.5
 		build_cost_ic = 6
 		reliability = 1.6
-		armor_value = 75
+		armor_value = 76
 		hardness = 0.95
 		resources = {
 			steel = 2
 			chromium = 1
 		}
-
+		lend_lease_cost = 13
 		manpower = 2
 
 	}
@@ -983,7 +1013,7 @@ equipments = {
 		build_cost_ic = 8
 		maximum_speed = 5
 		reliability = 1.9
-		armor_value = 95
+		armor_value = 96
 		resources = {
 			steel = 3
 			chromium = 1
@@ -1002,7 +1032,7 @@ equipments = {
 
 		build_cost_ic = 10
 		reliability = 2.2
-		armor_value = 115
+		armor_value = 116
 		maximum_speed = 5.5
 		resources = {
 			steel = 3
@@ -1021,22 +1051,21 @@ equipments = {
 		priority = 2000
 
 		module_slots = {
-			main_armament_slot = {
+			turret_type_slot = {
 				required = yes
 				allowed_module_categories = {
-					tank_small_main_armament
-					tank_magic_cannon
-					tank_flamethrower
+					tank_super_heavy_turret_type
 				}
 			}
-
-			turret_type_slot = {
+		
+			main_armament_slot = {
 				required = yes
 				allowed_module_categories = {
-					tank_light_turret_type
-					tank_medium_turret_type
-					tank_heavy_turret_type
-					tank_super_heavy_turret_type
+					tank_small_main_armament
+					tank_magic_cannon_light
+					tank_magic_cannon_medium
+					tank_magic_cannon_heavy
+					tank_flamethrower
 				}
 			}
 
@@ -1066,6 +1095,7 @@ equipments = {
 				allowed_module_categories = {
 					tank_special_module
 					tank_special_module_stabilizer
+					tank_special_module_maintenance
 					tank_special_module_skirts
 					tank_radio_module
 					tank_secondary_turret
@@ -1077,6 +1107,7 @@ equipments = {
 				allowed_module_categories = {
 					tank_special_module
 					tank_special_module_stabilizer
+					tank_special_module_maintenance
 					tank_special_module_skirts
 					tank_secondary_turret
 					tank_radio_module
@@ -1088,6 +1119,7 @@ equipments = {
 				allowed_module_categories = {
 					tank_special_module
 					tank_special_module_stabilizer
+					tank_special_module_maintenance
 					tank_special_module_skirts
 					tank_secondary_turret
 					tank_radio_module
@@ -1099,6 +1131,7 @@ equipments = {
 				allowed_module_categories = {
 					tank_special_module
 					tank_special_module_stabilizer
+					tank_special_module_maintenance
 					tank_special_module_skirts
 					tank_secondary_turret
 					tank_radio_module
@@ -1139,7 +1172,7 @@ equipments = {
 		}
 
 		module_count_limit = {
-			module = easy_maintenance
+			category = tank_special_module_maintenance
 			count < 2
 		}
 		module_count_limit = {
@@ -1175,16 +1208,19 @@ equipments = {
 		}
 
 		fuel_consumption = 0
-		maximum_speed = 2.5
-		build_cost_ic = 17
-		reliability = 1.3
-		armor_value = 85
+		maximum_speed = 4
+		build_cost_ic = 20
+		reliability = 1.2
+		armor_value = 90
 		hardness = 1
+		
 		resources = {
 			steel = 3
 			chromium = 2
 		}
 
+		lend_lease_cost = 20
+
 		manpower = 2
 
 	}
@@ -1213,10 +1249,10 @@ equipments = {
 		module_slots = inherit
 		parent = super_heavy_tank_chassis_1
 
-		maximum_speed = 3
-		build_cost_ic = 19
-		reliability = 1.6
-		armor_value = 115
+		maximum_speed = 4.5
+		build_cost_ic = 22
+		reliability = 1.5
+		armor_value = 120
 		resources = {
 			steel = 4
 			chromium = 2
@@ -1232,10 +1268,10 @@ equipments = {
 		module_slots = inherit
 		parent = super_heavy_tank_chassis_2
 
-		maximum_speed = 3.5
-		build_cost_ic = 21
-		reliability = 1.9
-		armor_value = 145
+		maximum_speed = 5
+		build_cost_ic = 24
+		reliability = 1.8
+		armor_value = 150
 		resources = {
 			steel = 4
 			chromium = 3
@@ -1253,18 +1289,18 @@ equipments = {
 		priority = 2000
 
 		module_slots = {
-			main_armament_slot = {
+			turret_type_slot = {
 				required = yes
 				allowed_module_categories = {
-					tank_small_main_armament
-					tank_magic_cannon
+					tank_light_turret_type
 				}
 			}
-
-			turret_type_slot = {
+			
+			main_armament_slot = {
 				required = yes
 				allowed_module_categories = {
-					tank_light_turret_type
+					tank_small_main_armament
+					tank_magic_cannon_light
 				}
 			}
 
@@ -1294,6 +1330,7 @@ equipments = {
 				allowed_module_categories = {
 					tank_special_module
 					tank_special_module_stabilizer
+					tank_special_module_maintenance
 					tank_special_module_skirts
 					tank_radio_module
 				}
@@ -1304,6 +1341,7 @@ equipments = {
 				allowed_module_categories = {
 					tank_special_module
 					tank_special_module_stabilizer
+					tank_special_module_maintenance
 					tank_special_module_skirts
 					tank_radio_module
 				}
@@ -1314,6 +1352,7 @@ equipments = {
 				allowed_module_categories = {
 					tank_special_module
 					tank_special_module_stabilizer
+					tank_special_module_maintenance
 					tank_special_module_skirts
 					tank_radio_module
 				}
@@ -1324,6 +1363,7 @@ equipments = {
 				allowed_module_categories = {
 					tank_special_module
 					tank_special_module_stabilizer
+					tank_special_module_maintenance
 					tank_special_module_skirts
 					tank_radio_module
 				}
@@ -1364,7 +1404,7 @@ equipments = {
 		}
 
 		module_count_limit = {
-			module = easy_maintenance
+			category = tank_special_module_maintenance
 			count < 2
 		}
 		module_count_limit = {
@@ -1404,12 +1444,13 @@ equipments = {
 		maximum_speed = 4
 		build_cost_ic = 4.5
 		reliability = 1.1
-		armor_value = 15
+		armor_value = 16
 		hardness = 0.85
 		resources = {
 			steel = 1
 		}
 
+		lend_lease_cost = 10
 		manpower = 2
 
 	}
diff --git a/common/units/equipment/tank_filters.txt b/common/units/equipment/tank_filters.txt
new file mode 100644
index 00000000000..f64bd4f4ee7
--- /dev/null
+++ b/common/units/equipment/tank_filters.txt
@@ -0,0 +1,24 @@
+search_filters = {
+	name = light_tanks
+	values = {light_tank_chassis light_tank_aa_chassis light_tank_artillery_chassis light_tank_destroyer_chassis light_tank_amphibious_chassis light_tank_flame_chassis}
+}
+
+search_filters = {
+	name = medium_tanks
+	values = {medium_tank_chassis medium_tank_aa_chassis medium_tank_artillery_chassis medium_tank_destroyer_chassis medium_tank_amphibious_chassis medium_tank_flame_chassis}
+}
+	
+search_filters = {
+	name = heavy_tanks
+	values = {heavy_tank_chassis super_heavy_tank_chassis heavy_tank_aa_chassis heavy_tank_artillery_chassis heavy_tank_destroyer_chassis heavy_tank_amphibious_chassis heavy_tank_flame_chassis super_heavy_tank_aa_chassis super_heavy_tank_artillery_chassis super_heavy_tank_destroyer_chassis super_heavy_tank_flame_chassis}
+}
+	
+search_filters = {
+	name = modern_tanks
+	values = {modern_tank_chassis modern_tank_aa_chassis modern_tank_artillery_chassis modern_tank_destroyer_chassis modern_tank_flame_chassis modern_tank_amphibious_chassis}
+}
+
+search_filters = {
+	name = amphibious_tanks
+	values = {amphibious_tank_chassis}
+}
diff --git a/common/units/equipment/trains.txt b/common/units/equipment/trains.txt
index 11d51e56365..d1fbe982d07 100644
--- a/common/units/equipment/trains.txt
+++ b/common/units/equipment/trains.txt
@@ -15,6 +15,8 @@ equipments = {
 
 		armor_value = 0 # HP = BASE_TRAIN_HP + armor_value
 
+		lend_lease_cost = 20
+
 		build_cost_ic = 70
 		resources = {
 			steel = 1
diff --git a/common/units/equipment/upgrades/land_upgrades.txt b/common/units/equipment/upgrades/land_upgrades.txt
index 803719a5f4c..74134e7597f 100644
--- a/common/units/equipment/upgrades/land_upgrades.txt
+++ b/common/units/equipment/upgrades/land_upgrades.txt
@@ -96,7 +96,6 @@ upgrades = {
 		add_stats = {
 			breakthrough = 1.25
 			build_cost_ic = 0.2
-
 		}
 	}
 
diff --git a/common/units/equipment/x_plane_airframes.txt b/common/units/equipment/x_plane_airframes.txt
index ffa22a785fc..9048a0cff86 100644
--- a/common/units/equipment/x_plane_airframes.txt
+++ b/common/units/equipment/x_plane_airframes.txt
@@ -63,7 +63,7 @@ duplicate_archetypes = {
 
 	medium_plane_fighter_airframe = {
 		archetype = medium_plane_airframe
-		type = fighter
+		type = heavy_fighter
 		ai_type = heavy_fighter
 		for_each = {
 			air_superiority = { set = 1.25 }
diff --git a/common/units/field_hospital.txt b/common/units/field_hospital.txt
index 04a0ed87f90..576b341e070 100644
--- a/common/units/field_hospital.txt
+++ b/common/units/field_hospital.txt
@@ -37,9 +37,14 @@ sub_units = {
 
 		# Important Ability
 		casualty_trickleback = 0.20
-		experience_loss_factor = -0.10
+		experience_loss_factor = -0.15
 
 		own_equipment_fuel_consumption_mult = 0.0 # no fuel use
+		battalion_mult = {
+			category = category_all_infantry
+			max_strength = 0.10
+		}
+		
 		essential = {
 			support_equipment
 			motorized_equipment
diff --git a/common/units/flame_tank.txt b/common/units/flame_tank.txt
index e0aaf71711c..a77247dcfea 100644
--- a/common/units/flame_tank.txt
+++ b/common/units/flame_tank.txt
@@ -14,7 +14,11 @@ sub_units = {
 		}
 
 		group = support
-
+		battalion_mult = {
+			category = category_all_infantry
+			breakthrough = 0.05
+		}
+		
 		categories = {
 			category_front_line
 			category_support_battalions
@@ -97,7 +101,11 @@ sub_units = {
 		}
 
 		group = support
-
+		battalion_mult = {
+			category = category_all_infantry
+			breakthrough = 0.05
+		}
+		
 		categories = {
 			category_front_line
 			category_support_battalions
@@ -180,7 +188,11 @@ sub_units = {
 		}
 
 		group = support
-
+		battalion_mult = {
+			category = category_all_infantry
+			breakthrough = 0.05
+		}
+		
 		categories = {
 			category_front_line
 			category_support_battalions
@@ -262,7 +274,11 @@ sub_units = {
 		}
 
 		group = support
-
+		battalion_mult = {
+			category = category_all_infantry
+			breakthrough = 0.05
+		}
+		
 		categories = {
 			category_front_line
 			category_support_battalions
@@ -345,7 +361,11 @@ sub_units = {
 		}
 
 		group = support
-
+		battalion_mult = {
+			category = category_all_infantry
+			breakthrough = 0.05
+		}
+		
 		categories = {
 			category_front_line
 			category_support_battalions
diff --git a/common/units/infantry.txt b/common/units/infantry.txt
index 3fc031fdb98..519535a828c 100644
--- a/common/units/infantry.txt
+++ b/common/units/infantry.txt
@@ -16,7 +16,9 @@ sub_units = {
 		type = {
 			infantry
 		}
-
+		#can_exfiltrate_from_coast = yes #Can this subunit board convoys from a non-port location. 
+		#Intended for use with special forces marine templates; all non-support subunits in the division must have this flag set to yes
+		
 		group = infantry
 
 		categories = {
@@ -125,7 +127,7 @@ sub_units = {
 		map_icon_category = infantry
 		special_forces = yes
 		marines = yes
-
+		
 		priority = 601
 		ai_priority = 200
 		active = no
@@ -133,19 +135,20 @@ sub_units = {
 		type = {
 			infantry
 		}
-
+		
 		group = infantry
-
+		
 		categories = {
 			category_front_line
 			category_light_infantry
 			category_all_infantry
-			category_special_forces
 			category_army
+			category_special_forces
+			category_marines
 		}
-
+		
 		combat_width = 2
-
+		
 		#Size Definitions
 		max_strength = 20
 		max_organisation = 70
@@ -154,10 +157,14 @@ sub_units = {
 
 		#Misc Abilities
 		training_time = 120
-		suppression = 0.01
+		suppression = 1
 		weight = 0.5
-		supply_consumption = 0.06
+		supply_consumption = 0.05
 		breakthrough = 0.3
+	
+		need = {
+			support_equipment = 5
+		}
 
 		marsh = {
 			attack = 0.3
@@ -168,10 +175,63 @@ sub_units = {
 		amphibious = {
 			attack = 0.5
 		}
+	}
+
+	marine_commando  = {
+		abbreviation = "MRC"
+		sprite = infantry
+		map_icon_category = infantry
+		special_forces = yes
+		marines = yes
+		can_exfiltrate_from_coast = yes
+		
+		priority = 601
+		ai_priority = 200
+		active = no
 
+		type = {
+			infantry
+		}
+		
+		group = infantry
+		
+		categories = {
+			category_front_line
+			category_light_infantry
+			category_all_infantry
+			category_army
+			category_special_forces
+			category_marines
+		}
+		
+		combat_width = 2
+		
+		#Size Definitions
+		max_strength = 20
+		max_organisation = 70
+		default_morale = 0.4
+		manpower = 1000
+
+		#Misc Abilities
+		training_time = 120
+		suppression = 1
+		weight = 0.5
+		supply_consumption = 0.05
+		breakthrough = 0.3
+	
 		need = {
 			support_equipment = 5
 		}
+
+		marsh = {
+			attack = 0.3
+		}
+		river = {
+			attack = 0.3
+		}
+		amphibious = {
+			attack = 0.5
+		}
 	}
 
 	mountaineers = {
@@ -197,6 +257,7 @@ sub_units = {
 			category_all_infantry
 			category_special_forces
 			category_army
+			category_mountaineers
 		}
 
 		combat_width = 2
@@ -252,6 +313,7 @@ sub_units = {
 			category_all_infantry
 			category_special_forces
 			category_army
+			category_paratroopers
 		}
 
 		combat_width = 2
diff --git a/common/units/military_police.txt b/common/units/military_police.txt
index bd1e34a7fb6..fcfbf890fac 100644
--- a/common/units/military_police.txt
+++ b/common/units/military_police.txt
@@ -18,7 +18,11 @@ sub_units = {
 			category_support_battalions
 			category_army
 		}
-
+		
+		battalion_mult = {
+			category = category_all_infantry
+			default_morale = 0.20
+		}
 
 		combat_width = 0
 
diff --git a/common/units/recon.txt b/common/units/recon.txt
index 654465ac6c7..74a112822b3 100644
--- a/common/units/recon.txt
+++ b/common/units/recon.txt
@@ -54,6 +54,10 @@ sub_units = {
 			infantry_equipment = 40
 			support_equipment = 10
 		}
+		battalion_mult = {
+			category = category_artillery
+			soft_attack = 0.10
+		}
 
 		forest = {
 			movement = 0.1
@@ -143,7 +147,11 @@ sub_units = {
 			support_equipment = 10
 			motorized_equipment = 20
 		}
-
+		battalion_mult = {
+			category = category_artillery
+			soft_attack = 0.10
+		}
+		
 		forest = {
 			movement = 0.05
 		}
@@ -224,7 +232,11 @@ sub_units = {
 		need = {
 			armored_car_equipment = 24
 		}
-
+		battalion_mult = {
+			category = category_artillery
+			soft_attack = 0.10
+		}
+		
 		forest = {
 			movement = 0.05
 		}
@@ -265,6 +277,10 @@ sub_units = {
 			infantry
 			support
 		}
+		battalion_mult = {
+			category = category_all_armor
+			hard_attack = 0.10
+		}
 		
 		group = support
 		
@@ -291,7 +307,7 @@ sub_units = {
 		weight = 0.1
 		supply_consumption = 0.02
 		recon = 1
-		can_be_parachuted = yes
+		can_be_parachuted = no
 
 		# Support nerfs to combat abilities
 		defense = -0.6
@@ -378,6 +394,14 @@ sub_units = {
 		essential = {
 			scout_helicopter_equipment
 		}
+		battalion_mult = {
+			category = category_all_armor
+			hard_attack = 0.075
+		}
+		battalion_mult = {
+			category = category_artillery
+			soft_attack = 0.075
+		}
 
 		need = {
 			scout_helicopter_equipment = 24
@@ -409,4 +433,330 @@ sub_units = {
 		}
 		same_support_type = recon # blocks adding other recon types to template
 	}
+	
+	airborne_light_armor = { #light tanks
+		abbreviation = "LTA"
+		sprite = light_armor
+		map_icon_category = infantry
+		priority = 0
+		ai_priority = 0
+		active = no
+
+		type = {
+			infantry
+			support
+		}
+		
+		group = support
+		
+		categories = {
+			category_front_line
+			category_support_battalions
+			category_army
+			category_all_armor
+			category_paratroopers
+		}
+
+	
+		combat_width = 0
+	
+		#Size Definitions
+		max_strength = 2
+		max_organisation = 20
+		default_morale = 0.3
+		manpower = 500
+		training_time = 120
+
+		#Misc Abilities
+		weight = 0.1
+		supply_consumption = 0.02
+		recon = 1
+		can_be_parachuted = yes
+
+		# Support nerfs to combat abilities
+		defense = -0.5
+		breakthrough = -0.25
+		soft_attack = -0.25
+		hard_attack = -0.25
+		armor_value = -0.5
+		can_be_parachuted = yes
+		
+		essential = {
+			light_tank_chassis
+		}
+
+		need = {
+			light_tank_chassis = 24
+		}
+
+		forest = {
+			movement = 0.1
+		}
+		hills = {
+			movement = 0.1
+		}
+		mountain = {
+			movement = 0.1
+		}
+		jungle = {
+			movement = 0.1
+		}
+		marsh = {
+			movement = 0.1
+		}
+		plains = {
+			movement = 0.1
+		}
+		desert = {
+			movement = 0.1
+		}
+		river = {
+			movement = 0.1
+		}
+		same_support_type = recon
+	}
+	
+	rangers_support = { #independent recon
+		abbreviation = "RAN"
+		sprite = infantry
+		map_icon_category = infantry
+		priority = 0
+		ai_priority = 0
+		active = no
+
+		type = {
+			infantry
+			support
+		}
+		
+		group = support
+		
+		categories = {
+			category_front_line
+			category_support_battalions
+			category_army
+			category_recon
+			category_mountaineers
+		}
+
+	
+		combat_width = 0
+	
+		#Size Definitions
+		max_strength = 2
+		max_organisation = 30
+		default_morale = 0.3
+		manpower = 500
+		training_time = 120
+
+		#Misc Abilities
+		weight = 0.1
+		supply_consumption = 0.06
+		recon = 1
+		can_be_parachuted = yes
+
+		# Support nerfs to combat abilities
+
+		maximum_speed = 0.6 # move at horsie speeds
+		
+		essential = {
+			infantry_equipment
+			support_equipment
+		}
+
+		need = {
+			infantry_equipment = 40
+			support_equipment = 15
+		}
+		
+		forest = {
+			movement = 0.15
+			attack = 0.05
+		}
+		hills = {
+			movement = 0.15
+			attack = 0.05
+		}
+		mountain = {
+			movement = 0.10
+			defence = 0.05
+		}
+		jungle = {
+			movement = 0.10
+		}
+		plains = {
+			movement = 0.1
+			attack = 0.05
+		}
+		
+		same_support_type = recon # blocks adding other recon types to template
+	}
+
+	winter_logistics_support = { #Ski Troop Support for Finland. Not really considered recon
+		abbreviation = "WIN"
+		sprite = infantry
+		map_icon_category = infantry
+		priority = 0
+		ai_priority = 0
+		active = no
+
+		type = {
+			infantry
+			support
+		}
+		
+		group = support
+		
+		categories = {
+			category_front_line
+			category_support_battalions
+			category_army
+		}
+
+	
+		combat_width = 0
+	
+		#Size Definitions
+		max_strength = 2
+		max_organisation = 45
+		default_morale = 0.3
+		manpower = 500
+		training_time = 120
+		acclimatization_cold_climate_gain_factor = 3
+
+		#Misc Abilities
+		weight = 0.1
+		supply_consumption = 0.05
+		#recon = 1 #TODO_Manu: Removed for now, more appropriate for actual rangers
+		can_be_parachuted = yes
+
+		#battalion_mult = { #TODO_Manu: Potentially undesirable, jut removing the negative defense below should be good
+		#	category = category_light_infantry
+		#	defense = 0.25
+		#	add = yes
+		#}
+
+		# Support nerfs to combat abilities
+		
+		#defense = -0.5 #TODO_Manu: Don't reduce Defense (remove if okay)
+		breakthrough = -0.5
+		soft_attack = -0.5
+		hard_attack = -0.5
+		armor_value = -0.5
+		
+		essential = {
+			infantry_equipment
+			support_equipment
+		}
+
+		need = {
+			infantry_equipment = 40
+			support_equipment = 10
+		}
+		
+		snow = { #This can end up stacking with terrain benefits
+			attack = 0.25
+			defence = 0.25
+			movement = 0.3
+		}
+	}
+	
+	long_range_patrol_support = { # Long-range patrols for Finland
+		abbreviation = "LRP"
+		sprite = infantry
+		map_icon_category = infantry
+		priority = 0
+		ai_priority = 0
+		active = no
+
+		type = {
+			infantry
+			support
+		}
+		
+		group = support
+		
+		categories = {
+			category_front_line
+			category_support_battalions
+			category_army
+			category_recon
+		}
+
+	
+		combat_width = 0
+
+		battalion_mult = {
+			category = category_light_infantry
+			initiative = 0.25
+			add = yes
+		}
+	
+		# Important Ability
+		soft_attack = 0.1 #Same as Mechanized
+		breakthrough = 0.3 #Same as Marines/Mountaineers
+			
+		#Size Definitions
+		max_strength = 10 #Inf is 25
+		max_organisation = 60 #Inf is 60
+		default_morale = 0.3 #Inf is 0.3
+		manpower = 500
+		training_time = 120
+		equipment_capture_factor = 0.05
+
+		#Misc Abilities
+		weight = 0.3 #Inf is 0.5
+		supply_consumption = 0.04 #Inf is 0.06
+		recon = 2 #Recon is 1
+		can_be_parachuted = yes
+
+		maximum_speed = 0.6 # move at horsie speeds
+		
+		essential = {
+			infantry_equipment
+			support_equipment
+		}
+
+		need = {
+			infantry_equipment = 40
+			support_equipment = 10
+		}
+		
+		forest = {
+			movement = 0.15
+			attack = 0.05
+		}
+		hills = {
+			movement = 0.15
+			attack = 0.05
+		}
+		marsh = {
+			movement = 0.10
+			attack = 0.05
+		}
+		plains = {
+			movement = 0.1
+			attack = 0.05
+		}
+
+		mountain = {
+			movement = 0.15
+		}
+		jungle = {
+			movement = 0.10
+		}
+		desert = {
+			movement = 0.1
+		}
+		river = {
+			movement = 0.1
+		}
+		
+		same_support_type = recon # blocks adding other recon types to template
+
+		snow = { #This can end up stacking with terrain benefits
+			attack = 0.1
+			defence = 0.1
+		}
+	}
 }
diff --git a/common/units/signal.txt b/common/units/signal.txt
index 27bebc5542c..d234a90448e 100644
--- a/common/units/signal.txt
+++ b/common/units/signal.txt
@@ -36,7 +36,7 @@ sub_units = {
 		can_be_parachuted = yes
 
 		# Important Ability
-		initiative = 0.20
+		initiative = 0.2
 
 		own_equipment_fuel_consumption_mult = 0.0 # no fuel use
 		
diff --git a/common/units/sp_anti-air_brigade.txt b/common/units/sp_anti-air_brigade.txt
index df07f9b1b71..cf415f9e9dc 100644
--- a/common/units/sp_anti-air_brigade.txt
+++ b/common/units/sp_anti-air_brigade.txt
@@ -13,7 +13,7 @@ sub_units = {
 			anti_air
 		}
 		
-		group = armor
+		group = armor_combat_support
 		
 		categories = {
 			category_all_armor
@@ -80,7 +80,7 @@ sub_units = {
 			anti_air
 		}
 		
-		group = armor
+		group = armor_combat_support
 		
 		categories = {
 			category_all_armor
@@ -151,7 +151,7 @@ sub_units = {
 			anti_air
 		}
 		
-		group = armor
+		group = armor_combat_support
 		
 		categories = {
 			category_all_armor
@@ -221,12 +221,16 @@ sub_units = {
 			category_mechanical
 		}
 		
-		group = armor
+		group = support
 		
 		type = {
 			armor
 			anti_air
 		}
+		battalion_mult = {
+			category = category_all_aa
+			air_attack = 0.15
+		}
 
 		combat_width = 2
 
@@ -245,34 +249,11 @@ sub_units = {
 
 		suppression = 0.75
 
-		forest = {
-		    attack = -0.5
-			movement = -0.4
-		}
 		hills = {
-		    attack = -0.3
+		    movement = -0.10
 		}
 		mountain = 	{
-		    attack = -0.4
-		}
-		jungle = {
-		    attack = -0.7
-			movement = -0.4
-		}
-		marsh = {
-		    attack = -0.5 
-			movement = -0.2
-		}
-		urban = {
-			attack = -0.6
-			defence = -0.2
-		}
-		river = { 
-			attack = -0.5
-			movement = -0.4
-		}
-		amphibious = { 
-			attack = -1.0
+		    movement = -0.20
 		}
 	}
 	
@@ -289,7 +270,7 @@ sub_units = {
 			anti_air
 		}
 		
-		group = armor
+		group = armor_combat_support
 		
 		categories = {
 			category_all_armor
diff --git a/common/units/sp_artillery_brigade.txt b/common/units/sp_artillery_brigade.txt
index 5a49decc135..d77d30e6b3d 100644
--- a/common/units/sp_artillery_brigade.txt
+++ b/common/units/sp_artillery_brigade.txt
@@ -13,7 +13,7 @@ sub_units = {
 			artillery
 		}
 		
-		group = armor
+		group = armor_combat_support
 
 		categories = {
 			category_all_armor
@@ -80,7 +80,7 @@ sub_units = {
 			artillery
 		}
 		
-		group = armor
+		group = armor_combat_support
 
 		categories = {
 			category_all_armor
@@ -150,7 +150,7 @@ sub_units = {
 			artillery
 		}
 		
-		group = armor
+		group = armor_combat_support
 		
 		categories = {
 			category_all_armor
@@ -215,11 +215,12 @@ sub_units = {
 		active = yes
 		
 		type = {
+			support
 			armor
 			artillery
 		}
 		
-		group = armor
+		group = support
 		
 		categories = {
 			category_all_armor
@@ -227,6 +228,10 @@ sub_units = {
 			category_all_artillery
 			category_mechanical
 		}
+		battalion_mult = {
+			category = category_all_artillery
+			soft_attack = 0.1
+		}
 		
 
 		combat_width = 3
@@ -246,34 +251,11 @@ sub_units = {
 
 		suppression = 1.25
 
-		forest = {
-		    attack = -0.5
-			movement = -0.4
-		}
 		hills = {
-		    attack = -0.3
+		    movement = -0.10
 		}
 		mountain = 	{
-		    attack = -0.4
-		}
-		jungle = {
-		    attack = -0.7
-			movement = -0.4
-		}
-		marsh = {
-		    attack = -0.5 
-			movement = -0.2
-		}
-		urban = {
-			attack = -0.6
-			defence = -0.2
-		}
-		river = { 
-			attack = -0.5
-			movement = -0.5
-		}
-		amphibious = { 
-			attack = -1.0
+		    movement = -0.20
 		}
 	}
 	
@@ -290,7 +272,7 @@ sub_units = {
 			artillery
 		}
 		
-		group = armor
+		group = armor_combat_support
 		
 		categories = {
 			category_all_armor
diff --git a/common/units/super_heavy_armor.txt b/common/units/super_heavy_armor.txt
index 31e832dcabc..c96aadd91b0 100644
--- a/common/units/super_heavy_armor.txt
+++ b/common/units/super_heavy_armor.txt
@@ -9,23 +9,25 @@ sub_units = {
 		active = yes
 
 		type = {
+			support
 			armor
 		}
-
-		group = armor
+		
+		group = support
 
 		categories = {
 			category_tanks
+			category_support_battalions
 			category_front_line
 			category_all_armor
 			category_army
 			category_mechanical
 		}
 
-		combat_width = 2
+		combat_width = 0
 
 		need = {
-			super_heavy_tank_chassis = 40
+			super_heavy_tank_chassis = 20
 		}
 
 		manpower = 500
@@ -33,46 +35,32 @@ sub_units = {
 		default_morale = 0.3
 		max_strength = 2
 		training_time = 180
-		weight = 1.75
-
+		weight = 1.0
+		battalion_mult = {
+			category = category_all_armor
+			armor_value = 0.15
+		}
 		supply_consumption = 0.4
 
-		#Tanks are awesome
-		# soft_attack = 0.5
+		#Support nerfs to combat abilities
+		#soft_attack = -0.30
+		#hard_attack = -0.30
+		#defense = -0.50
+		#breakthrough = -0.30
+		#armor_value = -0.50
+		#ap_attack = -0.50
 
-		suppression = 2.5
+		breakthrough = 0.15
 
-		forest = {
-			attack = -0.5
-			movement = -0.4
-		}
+		suppression = 2.5
 		hills = {
-			attack = -0.3
+		    movement = -0.10
 		}
 		mountain = 	{
-			attack = -0.4
-		}
-		jungle = {
-			attack = -0.7
-			movement = -0.4
-		}
-		marsh = {
-			attack = -0.5
-			movement = -0.2
-		}
-		urban = {
-			attack = -0.6
-			defence = -0.2
-		}
-		river = {
-			attack = -0.5
-			movement = -0.5
-		}
-		amphibious = {
-			attack = -1.0
+		    movement = -0.20
 		}
 		fort = {
-			attack = 0.5
+			attack = 0.10
 		}
 	}
 }
diff --git a/common/units/tank_destroyer_brigade.txt b/common/units/tank_destroyer_brigade.txt
index 271fb9a56bb..9b3bc621cc9 100644
--- a/common/units/tank_destroyer_brigade.txt
+++ b/common/units/tank_destroyer_brigade.txt
@@ -13,7 +13,7 @@ sub_units = {
 			anti_tank
 		}
 		
-		group = armor
+		group = armor_combat_support
 		
 		categories = {
 			category_front_line
@@ -81,7 +81,7 @@ sub_units = {
 			anti_tank
 		}
 		
-		group = armor
+		group = armor_combat_support
 		
 		categories = {
 			category_front_line
@@ -154,7 +154,7 @@ sub_units = {
 			anti_tank
 		}
 		
-		group = armor
+		group = armor_combat_support
 		
 		categories = {
 			category_front_line
@@ -224,11 +224,12 @@ sub_units = {
 		active = yes
 		
 		type = {
+			support
 			armor
 			anti_tank
 		}
 
-		group = armor
+		group = support
 		
 		categories = {
 			category_front_line
@@ -243,6 +244,10 @@ sub_units = {
 		need = {
 			super_heavy_tank_destroyer_chassis = 40
 		}
+		battalion_mult = {
+			category = category_all_at
+			ap_attack = 0.15
+		}
 		manpower = 500
 		max_organisation = 0
 		default_morale = 0.3
@@ -255,37 +260,11 @@ sub_units = {
 
 		suppression = 1.25
 
-		forest = {
-		    attack = -0.5
-			movement = -0.4
-		}
 		hills = {
-		    attack = -0.3
+		    movement = -0.10
 		}
 		mountain = 	{
-		    attack = -0.4
-		}
-		jungle = {
-		    attack = -0.7
-			movement = -0.4
-		}
-		marsh = {
-		    attack = -0.5 
-			movement = -0.2
-		}
-		urban = {
-			attack = -0.6
-			defence = -0.2
-		}
-		river = { 
-			attack = -0.5
-			movement = -0.5
-		}
-		amphibious = { 
-			attack = -1.0
-		}
-		fort = {
-			attack = 0.3
+		    movement = -0.20
 		}
 	}
 	
@@ -302,7 +281,7 @@ sub_units = {
 			anti_tank
 		}
 		
-		group = armor
+		group = armor_combat_support
 		
 		categories = {
 			category_front_line
diff --git a/common/units/unit_modifiers/00_unit_modifiers.txt b/common/units/unit_modifiers/00_unit_modifiers.txt
index 93f34e6bc0a..59838283f95 100644
--- a/common/units/unit_modifiers/00_unit_modifiers.txt
+++ b/common/units/unit_modifiers/00_unit_modifiers.txt
@@ -3,6 +3,8 @@
 # modifier_army_sub_unit_[sub_unit or sub_unit_category]_attack_factor
 # modifier_army_sub_unit_[sub_unit or sub_unit_category]_defence_factor
 # modifier_army_sub_unit_[sub_unit or sub_unit_category]_speed_factor
+# modifier_army_sub_unit_[sub_unit or sub_unit_category]_max_org_factor
+# modifier_army_sub_unit_[sub_unit or sub_unit_category]_org_recovery_cap_factor
 # will be being used by armies if they are included here
 
 #example
@@ -18,5 +20,67 @@
 #}
 
 sub_unit_modifiers = {
+	modifier_army_sub_unit_infantry_attack_factor 
+	modifier_army_sub_unit_infantry_defence_factor
+	modifier_army_sub_unit_infantry_speed_factor
+	#modifier_army_sub_unit_infantry_idle_org_factor
+	#modifier_experience_gain_infantry_training_factor
+	#modifier_experience_gain_infantry_combat_factor
+
+	modifier_army_sub_unit_marines_attack_factor
+	modifier_army_sub_unit_marines_defence_factor
+	modifier_army_sub_unit_marines_speed_factor
+	modifier_army_sub_unit_marines_max_org_factor
+
+	modifier_army_sub_unit_mountaineers_attack_factor
+	modifier_army_sub_unit_mountaineers_defence_factor
+	modifier_army_sub_unit_mountaineers_speed_factor
+	modifier_army_sub_unit_mountaineers_max_org_factor
+
+	modifier_army_sub_unit_paratrooper_attack_factor
+	modifier_army_sub_unit_paratrooper_defence_factor
+	modifier_army_sub_unit_paratrooper_speed_factor
+	modifier_army_sub_unit_paratrooper_max_org_factor
+	
+	modifier_army_sub_unit_armored_car_attack_factor
+	modifier_army_sub_unit_armored_car_defence_factor
+	modifier_army_sub_unit_armored_car_speed_factor
+	modifier_army_sub_unit_armored_car_max_org_factor
+
+	modifier_army_sub_unit_armored_car_recon_attack_factor
+	modifier_army_sub_unit_armored_car_recon_defence_factor
+	modifier_army_sub_unit_armored_car_recon_speed_factor #Cannot be applied to support battalions
+	modifier_army_sub_unit_armored_car_recon_max_org_factor #Cannot be applied to support battalions
+
+	modifier_army_sub_unit_light_tank_recon_attack_factor
+	modifier_army_sub_unit_light_tank_recon_defence_factor
+	modifier_army_sub_unit_light_tank_recon_speed_factor #Cannot be applied to support battalions
+	modifier_army_sub_unit_light_tank_recon_max_org_factor #Cannot be applied to support battalions
+
+	modifier_army_sub_unit_irregular_infantry_attack_factor 
+	modifier_army_sub_unit_irregular_infantry_defence_factor
+	modifier_army_sub_unit_irregular_infantry_speed_factor
+	modifier_army_sub_unit_irregular_infantry_max_org_factor
+
+	modifier_army_sub_unit_militia_attack_factor 
+	modifier_army_sub_unit_militia_defence_factor
+	modifier_army_sub_unit_militia_speed_factor
+	modifier_army_sub_unit_militia_max_org_factor
+	modifier_army_sub_unit_militia_org_recovery_cap_factor
+
+	modifier_army_sub_unit_blackshirt_assault_battalion_attack_factor
+	modifier_army_sub_unit_blackshirt_assault_battalion_defence_factor
+	modifier_army_sub_unit_blackshirt_assault_battalion_speed_factor #Cannot be applied to support battalions
+	modifier_army_sub_unit_blackshirt_assault_battalion_max_org_factor #Cannot be applied to support battalions
+
+	modifier_army_sub_unit_military_police_attack_factor 
+	modifier_army_sub_unit_military_police_defence_factor
+	modifier_army_sub_unit_military_police_speed_factor
+	modifier_army_sub_unit_military_police_max_org_factor
+
+	modifier_army_sub_unit_long_range_patrol_support_attack_factor
+	modifier_army_sub_unit_long_range_patrol_support_defence_factor
+
+	modifier_army_sub_unit_category_special_forces_max_org_factor 
 
 }
\ No newline at end of file
diff --git a/common/weather.txt b/common/weather.txt
index 6776d0dcd5c..debb717985d 100644
--- a/common/weather.txt
+++ b/common/weather.txt
@@ -50,10 +50,18 @@ settings = {
     temperature_change_neighbor_smoothing = 0.5  # [0-1] make temperature change be like province neighbors
 
     # Temperature range when should apply static modifiers
-    weather_extreme_cold = { -100.0 -25.0 }
-    weather_very_cold = { -25.0 -15.0 }
-    weather_very_hot = { 27.0 32.0 }
-    weather_extreme_hot = { 32.0 100.0 }
+    weather_extreme_cold = { -100.0 -12.0 }
+    weather_very_cold = { -12.0 -4.0 }
+    weather_very_hot = { 20.0 28.0 }
+    weather_extreme_hot = { 28.0 100.0 }
+	
+	###
+	# Old thresholds - if adjusting extremes, these should probably go back
+	###
+	#weather_extreme_cold = { -100.0 -25.0 } 
+    #weather_very_cold = { -25.0 -15.0 }
+    #weather_very_hot = { 27.0 32.0 }
+    #weather_extreme_hot = { 32.0 100.0 }
   }
   mud = {
     # Amount of water collected by rain increases probability of mud
diff --git a/descriptor.mod b/descriptor.mod
index 3d85d141534..991d8554e6a 100644
--- a/descriptor.mod
+++ b/descriptor.mod
@@ -6,6 +6,7 @@ replace_path="common/ai_strategy"
 replace_path="common/ai_strategy_plans"
 replace_path="common/ai_templates"
 replace_path="common/autonomous_states"
+replace_path="common/bop"
 replace_path="common/characters"
 replace_path="common/countries"
 replace_path="common/country_tags"
@@ -23,6 +24,7 @@ replace_path="common/units/names_ships"
 replace_path="common/units/names_railway_guns"
 replace_path="common/decisions"
 replace_path="common/decisions/categories"
+replace_path="common/military_industrial_organization/organizations"
 replace_path="events"
 replace_path="localisation/events_l_english.yml"
 replace_path="history/countries"
@@ -37,6 +39,4 @@ tags={
 	"Map"
 }
 picture="equestria.jpg"
-remote_file_id="1826643372"
-supported_version="1.12.*"
-path="mod/equestria"
+supported_version="1.13.*"
diff --git a/equestria.mod b/equestria.mod
index 519f55dfeaa..d9460253c36 100644
--- a/equestria.mod
+++ b/equestria.mod
@@ -1,5 +1,4 @@
 name="Equestria at War"
-path="mod/equestria/"
 replace_path="common/ai_equipment"
 replace_path="common/ai_focuses"
 replace_path="common/ai_peace"
@@ -41,4 +40,4 @@ tags={
 }
 picture="equestria.jpg"
 remote_file_id="1826643372"
-supported_version="1.12.*"
+supported_version="1.13.*"
diff --git a/equestria_dev.mod b/equestria_dev.mod
index f0b5f08f041..ca72afa411d 100644
--- a/equestria_dev.mod
+++ b/equestria_dev.mod
@@ -1,5 +1,4 @@
-name="Equestria at War Dev"
-path="mod/equestria_dev/"
+name="Equestria at War - Dev"
 replace_path="common/ai_equipment"
 replace_path="common/ai_focuses"
 replace_path="common/ai_peace"
@@ -14,9 +13,6 @@ replace_path="common/country_tags"
 replace_path="common/ideas"
 replace_path="common/names"
 replace_path="common/national_focus"
-replace_path="common/peace_conference/ai_peace"
-replace_path="common/peace_conference/categories"
-replace_path="common/peace_conference/cost_modifiers"
 replace_path="common/scripted_effects"
 replace_path="common/scripted_localisation"
 replace_path="common/scripted_triggers"
@@ -43,4 +39,4 @@ tags={
 }
 picture="equestria.jpg"
 remote_file_id="1826643372"
-supported_version="1.12.*"
\ No newline at end of file
+supported_version="1.13.*"
\ No newline at end of file
diff --git a/events/Aquileia Events.txt b/events/Aquileia Events.txt
index 483ad0f5af4..19e9d5301b0 100644
--- a/events/Aquileia Events.txt	
+++ b/events/Aquileia Events.txt	
@@ -8767,7 +8767,7 @@ country_event = { #Vivienne Crowned Empress Of Aquileia
 		}
 		set_country_leader_description = {
 			ideology = neutrality
-			name = JER_POLITICS_VIVIENNE_2_DESC
+			desc = JER_POLITICS_VIVIENNE_2_DESC
 		}
 		add_country_leader_trait = JER_empress_of_aquileia_trait
 		add_ideas = JER_integration_woes_worse
@@ -8850,11 +8850,8 @@ country_event = { #Vivienne making a deal with Erion in which the Archonate of E
 	
 	option = {
 		name = aquileia.216.a
-		event_target:GRI_archon_erion_target = {
-			set_nationality = ROOT
-		}
 		custom_effect_tooltip = available_political_advisor
-		show_ideas_tooltip = JER_erion
+		show_ideas_tooltip = archon_erion
 		674 = {
 		    add_core_of = JER
 			set_state_name = JER_state_Rhome
diff --git a/events/Arantiga Events.txt b/events/Arantiga Events.txt
index 9f4295fb340..1c104f911b1 100644
--- a/events/Arantiga Events.txt	
+++ b/events/Arantiga Events.txt	
@@ -410,7 +410,7 @@ country_event = { #The Vision from Boreas
 		}
 		set_country_leader_description = {
 			ideology = fascism
-			name = alexander_but_woke_desc
+			desc = alexander_but_woke_desc
 		}
 		add_political_power = 100
 		add_popularity = { ideology = fascism popularity = 0.10 }
diff --git a/events/Avian Events.txt b/events/Avian Events.txt
index a0f0d035ca9..082788a1e2d 100644
--- a/events/Avian Events.txt	
+++ b/events/Avian Events.txt	
@@ -791,7 +791,7 @@ country_event = {
 		}
 		set_country_leader_description = {
 			ideology = fascism
-			name = TRU_desc
+			desc = TRU_desc
 		}
 		set_cosmetic_tag = AVI_dynasty
 		set_capital = { 
diff --git a/events/Barrad Events.txt b/events/Barrad Events.txt
index 5118ea5a5e8..4c2c08e9f7d 100644
--- a/events/Barrad Events.txt	
+++ b/events/Barrad Events.txt	
@@ -2336,6 +2336,29 @@ country_event = { #car companies
 				set_variable = { BAR_nuclear_research = 100 } #wolololo
 			}
 		}
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}    
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = bar_tank_organization
+			mio:bar_tank_organization = {
+				add_mio_size = 1
+				add_mio_funds = 200
+			}
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = bar_tank2_organization
+			mio:bar_tank2_organization = {
+				add_mio_size = 1
+				add_mio_funds = 200
+			}
+		}
+		else = {
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = bar_tank
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = bar_tank2
+		}
 	}
 }
 country_event = { #mutant plants ravage mountain villages
@@ -7452,7 +7475,7 @@ country_event = {
 			defense_skill = 2
 			planning_skill = 2
 			logistics_skill = 4
-			id = 997002
+			legacy_id = 997002
 		} custom_effect_tooltip = bar_wigberht_general
 		add_corps_commander_role = {
 			character = BAR_gebleod
@@ -7463,7 +7486,7 @@ country_event = {
 			defense_skill = 2
 			planning_skill = 2
 			logistics_skill = 2
-			id = 997001
+			legacy_id = 997001
 		} custom_effect_tooltip = bar_gebleod_general
 		hidden_effect = {
 			if = {
diff --git a/events/Bronzehill.txt b/events/Bronzehill.txt
index b5198bfee98..1f4628c9d3c 100644
--- a/events/Bronzehill.txt
+++ b/events/Bronzehill.txt
@@ -441,8 +441,21 @@ country_event = {
 				category = naval_bomber
 			}
 			country_event = bronzehill.13
-			custom_effect_tooltip = available_designer
-			show_ideas_tooltip  = BRZ_beakker
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}    
+				custom_effect_tooltip = available_mio_tt
+				show_mio_tooltip = BRZ_beakker_organization
+				mio:BRZ_beakker_organization = {
+					add_mio_size = 1
+					add_mio_funds = 500
+				}
+			}
+			else = {
+				custom_effect_tooltip = available_designer
+				show_ideas_tooltip = BRZ_beakker
+			}
 		}
 	}
 
@@ -486,8 +499,21 @@ country_event = {
 				category = cas_bomber
 				category = naval_bomber
 			}
-			custom_effect_tooltip = available_designer
-			show_ideas_tooltip  = BRZ_beakker
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}    
+				custom_effect_tooltip = available_mio_tt
+				show_mio_tooltip = BRZ_beakker_organization
+				mio:BRZ_beakker_organization = {
+					add_mio_size = 1
+					add_mio_funds = 500
+				}
+			}
+			else = {
+				custom_effect_tooltip = available_designer
+				show_ideas_tooltip = BRZ_beakker
+			}
 			FROM = {
 				air_experience = 25
 				add_tech_bonus = {
diff --git a/events/Changeling.txt b/events/Changeling.txt
index 1677b6d8023..beefac4c21a 100644
--- a/events/Changeling.txt
+++ b/events/Changeling.txt
@@ -6090,12 +6090,12 @@ country_event = {
 						light_dragons = { x = 0 y = 1 }
 						light_dragons = { x = 0 y = 2 }
 						light_dragons = { x = 0 y = 3 }
-						light_dragons = { x = 0 y = 4 }
 						light_dragons = { x = 1 y = 0 }
 						light_dragons = { x = 1 y = 1 }
 						light_dragons = { x = 1 y = 2 }
 						light_dragons = { x = 1 y = 3 }
-						light_dragons = { x = 1 y = 4 }
+						light_dragons = { x = 2 y = 0 }
+						light_dragons = { x = 2 y = 1 }
 					}
 					support = {
 					}
@@ -6107,7 +6107,7 @@ country_event = {
 						heavy_dragons = { x = 0 y = 1 }
 						heavy_dragons = { x = 0 y = 2 }
 						heavy_dragons = { x = 0 y = 3 }
-						heavy_dragons = { x = 0 y = 4 }
+						heavy_dragons = { x = 1 y = 0 }
 					}
 					support = {
 					}
diff --git a/events/ChangelingHarmony.txt b/events/ChangelingHarmony.txt
index ec547abc453..dd7edc4eefb 100644
--- a/events/ChangelingHarmony.txt
+++ b/events/ChangelingHarmony.txt
@@ -1025,7 +1025,7 @@ country_event = {   ######### Gott Erhalte Velvet die Kaiserin ######
 		}
 		set_country_leader_description = {
 			ideology = democratic
-			name = politics_king_thorax_desc
+			desc = politics_king_thorax_desc
 		}
 		add_ideas = CCN_velvet
 		ai_chance = {
diff --git a/events/Chital Events.txt b/events/Chital Events.txt
index 09e59d1ba66..09f5bdacd61 100644
--- a/events/Chital Events.txt	
+++ b/events/Chital Events.txt	
@@ -1841,7 +1841,7 @@ country_event = {
 		}
 		set_country_leader_description = {
 			ideology = democratic
-			desc = "CTL_BENJEN_HARMONY_DESC"
+			desc = CTL_BENJEN_HARMONY_DESC
 		}
 	}	
 }
diff --git a/events/Colthage Events.txt b/events/Colthage Events.txt
index 928dfdcc558..316ecb269fa 100644
--- a/events/Colthage Events.txt	
+++ b/events/Colthage Events.txt	
@@ -4266,13 +4266,13 @@ country_event = { #Interim government formed
 			set_variable = { CTH_landowners_power = 3 } #out of 5
 			set_variable = { CTH_landowners_loyalty = 40 } #out of 100
 			set_variable = { CTH_landowner_political_power_factor_var = -0.3 }
-			set_variable = { CTH_landowner_consumer_goods_factor_var = 0.06 }
+			set_variable = { CTH_landowner_consumer_goods_factor_var = 0.12 }
 		}
 		else = {
 			set_variable = { CTH_landowners_power = 3 } #out of 5
 			set_variable = { CTH_landowners_loyalty = 50 } #out of 100
 			set_variable = { CTH_landowner_political_power_factor_var = 0.3 }
-			set_variable = { CTH_landowner_consumer_goods_factor_var = -0.06 }
+			set_variable = { CTH_landowner_consumer_goods_factor_var = -0.12 }
 		}
 		set_variable = { CTH_constitutionalist_power = 5 } #out of 5
 		set_variable = { CTH_constitutionalist_loyalty = 100 } #out of 100
@@ -4302,11 +4302,6 @@ country_event = { #Constitutionalists ask Zeirutid to disband his army
 
 	option = { #Ask for concessions first
 		name = colthage_other.50.a
-		trigger = {
-			CTC = {
-				has_country_flag = CTH_CVA_cooperation
-			}
-		}
 		FROM = {
 			country_event = { 
 				days = 1
@@ -4314,7 +4309,7 @@ country_event = { #Constitutionalists ask Zeirutid to disband his army
 			}
 		}
 		ai_chance = {
-			factor = 10
+			factor = 2
 		}
 	}
 	option = { #Tell them to fuck off
@@ -4387,11 +4382,19 @@ country_event = { #Zeirutid agrees on certain conditions
 			}
 		}
 		ai_chance = {
-			factor = 2
+			factor = 1
 			modifier = {
 				has_country_flag = CTH_CVA_unfriendly
 				factor = 0
 			}
+			modifier = {
+				CVA = {
+					exists = yes
+					is_ai = no
+				}
+				factor = 0
+			}
+			
 		}
 	}
 	option = { #Arrange a meeting
@@ -4410,27 +4413,13 @@ country_event = { #Zeirutid agrees on certain conditions
 			}
 		}
 		else = {
-			if = {
-				limit = {
-					OR = {
-						has_country_flag = CTH_CVA_cooperation
-						has_country_flag = CTH_coltva_revolted
-					}
-				}
-				country_event = { 
-					days = 6
-					id = colthage_other.54
-				}
-			}
-			else = {
-				country_event = { 
-					days = 1
-					id = colthage_other.55
-				}
+			country_event = { 
+				days = 6
+				id = colthage_other.54
 			}
 		}
 		ai_chance = {
-			factor = 1
+			factor = 2
 		}
 	}
 }
@@ -4460,25 +4449,14 @@ country_event = { #Zeirutid tells us to fuck off, how rude
 		}
 		else = {
 			hidden_effect = {
-				if = {
-					limit = {
-						has_country_flag = CTH_CVA_unfriendly
-					}
-					country_event = { 
-						days = 1
-						id = colthage_other.55
-					}
-				}
-				else = {
-					country_event = { 
-						days = 1
-						id = colthage_other.54
-					}
+				country_event = { 
+					days = 1
+					id = colthage_other.54
 				}
 			}
 		}
 		ai_chance = {
-			factor = 10
+			factor = 2
 		}
 	}
 	option = { #Vibe check them
@@ -4507,6 +4485,17 @@ country_event = { #Zeirutid tells us to fuck off, how rude
 		
 		ai_chance = {
 			factor = 1
+			modifier = {
+				has_country_flag = CTH_CVA_cooperation
+				factor = 0
+			}
+			modifier = {
+				CVA = {
+					exists = yes
+					is_ai = no
+				}
+				factor = 0
+			}
 		}
 	}
 }
@@ -4528,7 +4517,7 @@ country_event = { #Constitutionalists invite Zeirutid to a meeting to discuss th
 			}
 		}
 		ai_chance = {
-			factor = 4
+			factor = 2
 		}
 	}
 	option = { #This seems kinda sus...
@@ -4541,6 +4530,12 @@ country_event = { #Constitutionalists invite Zeirutid to a meeting to discuss th
 		}
 		ai_chance = {
 			factor = 1
+			modifier = {
+				FROM = {
+					has_country_flag = CTC_accepted_the_fateful_offer
+				}
+				factor = 0
+			}
 		}
 	}
 }
@@ -5913,11 +5908,30 @@ country_event = { #victoria 2 reference
 		add_manpower = 1562
 		add_political_power = 100
 		army_experience = 15
-		add_tech_bonus = {
-			name = special_forces_bonus
-			bonus = 1.0
-			uses = 1
-			category = mountaineers_tech
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_doctrine_cost_reduction = {
+				name = special_forces_bonus
+				cost_reduction = 0.75
+				uses = 1
+				category = cat_mountaineers_doctrine
+			}
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 0.75
+				uses = 1
+				category = mountaineers_tech
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 1.0
+				uses = 1
+				category = mountaineers_tech
+			}
 		}
 	}
 	option = { #
@@ -8532,7 +8546,7 @@ country_event = { #Bandolier's job is done
 		set_variable = { CTH_landowners_power = 2 } #out of 5
 		set_variable = { CTH_landowners_loyalty = 40 } #out of 100
 		set_variable = { CTH_landowner_political_power_factor_var = -0.2 }
-		set_variable = { CTH_landowner_consumer_goods_factor_var = 0.04 }
+		set_variable = { CTH_landowner_consumer_goods_factor_var = 0.08 }
 		set_variable = { CTH_constitutionalist_economy_cost_factor_var = 0.2 }
 		set_variable = { CTH_constitutionalist_mobilization_laws_cost_factor_var = 0.2 }
 		set_variable = { CTH_constitutionalist_power = 2 } #out of 5
@@ -8612,13 +8626,13 @@ country_event = { #Interim government formed again
 			set_variable = { CTH_landowners_power = 2 } #out of 5
 			set_variable = { CTH_landowners_loyalty = 40 } #out of 100
 			set_variable = { CTH_landowner_political_power_factor_var = -0.2 }
-			set_variable = { CTH_landowner_consumer_goods_factor_var = 0.04 }
+			set_variable = { CTH_landowner_consumer_goods_factor_var = 0.08 }
 		}
 		else = {
 			set_variable = { CTH_landowners_power = 3 } #out of 5
 			set_variable = { CTH_landowners_loyalty = 50 } #out of 100
 			set_variable = { CTH_landowner_political_power_factor_var = 0.3 }
-			set_variable = { CTH_landowner_consumer_goods_factor_var = -0.06 }
+			set_variable = { CTH_landowner_consumer_goods_factor_var = -0.12 }
 		}
 		set_variable = { CTH_constitutionalist_power = 5 } #out of 5
 		set_variable = { CTH_constitutionalist_loyalty = 100 } #out of 100
@@ -9508,7 +9522,7 @@ country_event = { #Jezabzella meets with Bodazthart
 		}
 		custom_effect_tooltip = CTH_popular_power_tt_3
 		add_to_variable = { CTH_popular_monthly_population_factor = 0.1 }
-		subtract_from_variable = { CTH_popular_consumer_goods_factor = 0.025 }
+		subtract_from_variable = { CTH_popular_consumer_goods_factor = 0.05 }
 		add_to_variable = { CTH_popular_option_choices = 1 }
 		force_update_dynamic_modifier = yes
 	}
@@ -9733,7 +9747,7 @@ country_event = { #Jezabzella thonks about plantations
 		CTH_remove_10_landowners_loyalty = yes
 		custom_effect_tooltip = CTH_popular_power_tt_5
 		add_to_variable = { CTH_popular_monthly_population_factor = 0.1 }
-		subtract_from_variable = { CTH_popular_consumer_goods_factor = 0.025 }
+		subtract_from_variable = { CTH_popular_consumer_goods_factor = 0.05 }
 		add_to_variable = { CTH_popular_option_choices = 1 }
 		force_update_dynamic_modifier = yes
 	}
diff --git a/events/CrystalEmpire.txt b/events/CrystalEmpire.txt
index dfb9562adee..3d7884024d6 100644
--- a/events/CrystalEmpire.txt
+++ b/events/CrystalEmpire.txt
@@ -3128,7 +3128,7 @@ country_event = { ## Bringing Back Cadence
 		}
 		add_country_leader_role = {
 			character = EQS_twilight_sparkle
-			promote_character = yes
+			promote_leader = yes
 
 			country_leader = {
 				desc = "TWILIGHT_DESC"
diff --git a/events/Cyanolisia Events.txt b/events/Cyanolisia Events.txt
index b4b09ba2a04..14753421b8c 100644
--- a/events/Cyanolisia Events.txt	
+++ b/events/Cyanolisia Events.txt	
@@ -1210,16 +1210,16 @@ country_event = {
 			}
 			set_country_leader_description = {
 				ideology = neutrality
-				name = thatcher_bird_in_direct_control_desc
+				desc = thatcher_bird_in_direct_control_desc
 			}
 			hidden_effect = {
 				set_country_leader_description = {
 					ideology = fascism
-					name = thatcher_bird_in_direct_control_desc
+					desc = thatcher_bird_in_direct_control_desc
 				}
 				set_country_leader_description = {
 					ideology = democratic
-					name = thatcher_bird_in_direct_control_desc
+					desc = thatcher_bird_in_direct_control_desc
 				}
 			}
 		}
diff --git a/events/DreadLeague_Events.txt b/events/DreadLeague_Events.txt
index e8945ccc668..e05a8117611 100644
--- a/events/DreadLeague_Events.txt
+++ b/events/DreadLeague_Events.txt
@@ -85,7 +85,7 @@ country_event = {
 		}
 		set_country_leader_description = {
 			ideology = fascism
-			name = POLITICS_ROSAVAMPIRE_DESC
+			desc = POLITICS_ROSAVAMPIRE_DESC
 		}
 	}
 }
@@ -224,7 +224,7 @@ country_event = {
 		}
 		set_country_leader_description = {
 			ideology = fascism
-			name = POLITICS_ROSALICH_DESC
+			desc = POLITICS_ROSALICH_DESC
 		}
 	}
 }
diff --git a/events/DreadLeague_aprilfool_Events.txt b/events/DreadLeague_aprilfool_Events.txt
index 5f70bf804e4..7717dacf66c 100644
--- a/events/DreadLeague_aprilfool_Events.txt
+++ b/events/DreadLeague_aprilfool_Events.txt
@@ -187,7 +187,7 @@ country_event = {
 		}
 		set_country_leader_description = {
 			ideology = fascism
-			name = POLITICS_APNROSALICH_DESC
+			desc = POLITICS_APNROSALICH_DESC
 		}
 		hidden_effect = {
 			add_manpower = 400000
@@ -301,7 +301,7 @@ country_event = {
 		}
 		set_country_leader_description = {
 			ideology = fascism
-			name = POLITICS_APNROSAHIVEMISTRESS_DESC
+			desc = POLITICS_APNROSAHIVEMISTRESS_DESC
 		}
 		hidden_effect = {
 			set_cosmetic_tag = DED_APN_consciousness
diff --git a/events/Equestria.txt b/events/Equestria.txt
index 6c7e34ce3ad..c7d86f354ab 100644
--- a/events/Equestria.txt
+++ b/events/Equestria.txt
@@ -3461,7 +3461,7 @@ country_event = { ##Happy Ending
 			}
 			set_country_leader_description = {
 				ideology = democratic
-				name = POLITICS_CELESTIA_LUNA_DESC
+				desc = POLITICS_CELESTIA_LUNA_DESC
 			}
 			set_global_flag = celestia_and_luna_fused
 			BAT = {
diff --git a/events/FBK_events.txt b/events/FBK_events.txt
index 76b008c0b92..e3b002aaf7d 100644
--- a/events/FBK_events.txt
+++ b/events/FBK_events.txt
@@ -215,6 +215,16 @@ country_event = {
 	option = {
 		name = FBK.6.a
 		add_equipment_to_stockpile = { type = infantry_equipment amount = 500 producer = GRI }
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_equipment_subsidy = {
+				cic = 500
+				equipment_type = infantry_equipment
+				seller_tags = { GRI STW ANG FEA BRZ PYT YAL KAT ROU }
+			}
+		}
 		division_template = {
 			name = "Imperial Eastern Expeditionary Force"
 			priority = 2
@@ -292,6 +302,16 @@ country_event = {
 		clr_country_flag = FBK_waiting
 		set_country_flag = FBK_prince_agreed
 		add_equipment_to_stockpile = { type = infantry_equipment amount = 1000 producer = LCT}
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_equipment_subsidy = {
+				cic = 500
+				equipment_type = infantry_equipment
+				seller_tags = { RCT LCT NIM WIT BAK DEP DMT WAT FIR FRE }
+			}
+		}
 	}
 
 }
diff --git a/events/FRE_events.txt b/events/FRE_events.txt
index fa6867b499f..43f3843db63 100644
--- a/events/FRE_events.txt
+++ b/events/FRE_events.txt
@@ -91,6 +91,16 @@ country_event = {
 						producer = NIM
 					}
 				}
+				if = {
+					limit = {
+						has_dlc = "Arms Against Tyranny"
+					}
+					add_equipment_subsidy = {
+						cic = 500
+						equipment_type = small_plane_airframe
+						seller_tags = { RCT LCT NIM WIT BAK DEP DMT FBK WAT FIR }
+					}
+				}
 			}
 		}
 	}
@@ -177,6 +187,16 @@ country_event = {
 				producer = NIM
 			}
 		}
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_equipment_subsidy = {
+				cic = 500
+				equipment_type = small_plane_airframe
+				seller_tags = { RCT LCT NIM WIT BAK DEP DMT FBK WAT FIR }
+			}
+		}
 	}
 }
 
@@ -273,6 +293,16 @@ country_event = {
 						producer = LCT
 					}
 				}
+				if = {
+					limit = {
+						has_dlc = "Arms Against Tyranny"
+					}
+					add_equipment_subsidy = {
+						cic = 500
+						equipment_type = medium_plane_airframe
+						seller_tags = { RCT LCT NIM WIT BAK DEP DMT FBK WAT FIR }
+					}
+				}
 			}
 		}
 	}
@@ -359,6 +389,16 @@ country_event = {
 				producer = LCT
 			}
 		}
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_equipment_subsidy = {
+				cic = 500
+				equipment_type = medium_plane_airframe
+				seller_tags = { RCT LCT NIM WIT BAK DEP DMT FBK WAT FIR }
+			}
+		}
 	}
 }
 
diff --git a/events/FRN_events.txt b/events/FRN_events.txt
index 91b40addd20..31782d2a9da 100644
--- a/events/FRN_events.txt
+++ b/events/FRN_events.txt
@@ -5162,7 +5162,7 @@ country_event = { #Meeting with nobles
 		show_ideas_tooltip = FRN_ippolita
 		custom_effect_tooltip = FRN_increase_order_thrift
 		add_to_variable = { FRN_industrial_capacity_variable = 0.05 }
-		subtract_from_variable = { FRN_consumer_goods_variable = 0.025 }
+		subtract_from_variable = { FRN_consumer_goods_variable = 0.05 }
 		add_to_variable = { FRN_production_speed_buildings_variable = 0.05 }
 		add_to_variable = { FRN_local_resources_variable = 0.05 }
 	}
@@ -5199,7 +5199,7 @@ country_event = { #Form of the army
 		add_ideas = FRN_peoples_army
 		custom_effect_tooltip = FRN_increase_order_thrift
 		add_to_variable = { FRN_industrial_capacity_variable = 0.05 }
-		subtract_from_variable = { FRN_consumer_goods_variable = 0.025 }
+		subtract_from_variable = { FRN_consumer_goods_variable = 0.05 }
 		add_to_variable = { FRN_production_speed_buildings_variable = 0.05 }
 		add_to_variable = { FRN_local_resources_variable = 0.05 }
 	}
@@ -5225,7 +5225,7 @@ country_event = { #Cultural identity
 		add_ideas = FRN_wingbardian_identity
 		custom_effect_tooltip = FRN_increase_order_thrift
 		add_to_variable = { FRN_industrial_capacity_variable = 0.05 }
-		subtract_from_variable = { FRN_consumer_goods_variable = 0.025 }
+		subtract_from_variable = { FRN_consumer_goods_variable = 0.05 }
 		add_to_variable = { FRN_production_speed_buildings_variable = 0.05 }
 		add_to_variable = { FRN_local_resources_variable = 0.05 }
 	}
@@ -5257,7 +5257,7 @@ country_event = { #Relationship of religion and government
 		}
 		custom_effect_tooltip = FRN_increase_order_thrift
 		add_to_variable = { FRN_industrial_capacity_variable = 0.05 }
-		subtract_from_variable = { FRN_consumer_goods_variable = 0.025 }
+		subtract_from_variable = { FRN_consumer_goods_variable = 0.05 }
 		add_to_variable = { FRN_production_speed_buildings_variable = 0.05 }
 		add_to_variable = { FRN_local_resources_variable = 0.05 }
 	}
diff --git a/events/Feathisia Events.txt b/events/Feathisia Events.txt
index 2d23fad09b4..c75b0d5a55e 100644
--- a/events/Feathisia Events.txt	
+++ b/events/Feathisia Events.txt	
@@ -1027,6 +1027,16 @@ country_event = { #Interesting Proposal
 		name = feat.39.b
 		add_political_power = -75
 		add_equipment_to_stockpile = { type = infantry_equipment amount = 1500 producer = GRF }
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_equipment_subsidy = {
+				cic = 500
+				equipment_type = infantry_equipment
+				seller_tags = { YAK JAK GRF GFF PNG STG STL }
+			}
+		}
 	}
 }
 
diff --git a/events/Greifenmarschen Events.txt b/events/Greifenmarschen Events.txt
index c9252edc57a..166f251dd2d 100644
--- a/events/Greifenmarschen Events.txt	
+++ b/events/Greifenmarschen Events.txt	
@@ -2118,7 +2118,7 @@ country_event = { #The Party Line
 		}
 		set_country_leader_description = {
 			ideology = communism
-			name = "PYT_literally_stalin_desc"
+			desc = PYT_literally_stalin_desc
 		}
 		add_country_leader_trait = stalin_heart_of_steel
 	}
diff --git a/events/GriffonRepublic Events.txt b/events/GriffonRepublic Events.txt
index aabe5956198..fa97148ebe9 100644
--- a/events/GriffonRepublic Events.txt	
+++ b/events/GriffonRepublic Events.txt	
@@ -954,7 +954,7 @@ country_event = {
 					is_character = FAT_alexander_kemerskai_jr
 				}
 			}
-			set_unit_leader_flag = should_stay_in_FAT
+			set_character_flag = should_stay_in_FAT
 		}
 		transfer_units_fraction = {
 			target = FAW
@@ -962,7 +962,7 @@ country_event = {
 			source_organization = 1
 			size = 0.6
 			keep_unit_leaders_trigger = {
-				has_unit_leader_flag = should_stay_in_FAT
+				has_character_flag = should_stay_in_FAT
 			}
 		}
 		every_character = {
diff --git a/events/GriffonRepublic aprilfools Events.txt b/events/GriffonRepublic aprilfools Events.txt
index f0f8c9e82ef..2638f100db1 100644
--- a/events/GriffonRepublic aprilfools Events.txt	
+++ b/events/GriffonRepublic aprilfools Events.txt	
@@ -555,7 +555,7 @@ country_event = {
 		name = chaos.29.a
 		add_corps_commander_role = {
 			character = FAT_chaos_maxwell
-			traits={ cat_race_trait promising_general trait_skilled_staffer }
+			traits={ cat_race_trait promising_general skilled_staffer }
 			skill=2
 			attack_skill=1
 			defense_skill=3
diff --git a/events/GriffonianEmpire Events.txt b/events/GriffonianEmpire Events.txt
index 22f051f83d3..a52d5c30eb0 100644
--- a/events/GriffonianEmpire Events.txt	
+++ b/events/GriffonianEmpire Events.txt	
@@ -3404,8 +3404,17 @@ country_event = { #Empire Proposes Joint-Industrial Development Scheme
 			factor = 90
 		}
 	    name = imperial.111.a
-		custom_effect_tooltip = available_designer
-		show_ideas_tooltip = GRI_chn_imperial_arms_co
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}    
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = GRI_chn_imperial_arms_co_organization
+		}
+		else = {
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = GRI_chn_imperial_arms_co
+		}
 		random_owned_controlled_state = {
 			limit = {
 				free_building_slots = {
@@ -3474,8 +3483,17 @@ country_event = { #Changelings Accept Joint-Industrial Development Scheme
 
 	option = {
 	    name = imperial.112.a
-		custom_effect_tooltip = available_designer
-		show_ideas_tooltip = GRI_chntank1
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}    
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = GRI_chntank1_organization
+		}
+		else = {
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = GRI_chntank1
+		}
 		random_owned_controlled_state = {
 			limit = {
 				free_building_slots = {
diff --git a/events/Gryphian_Host_events.txt b/events/Gryphian_Host_events.txt
index 02bd7833e07..930f29ba979 100644
--- a/events/Gryphian_Host_events.txt
+++ b/events/Gryphian_Host_events.txt
@@ -541,6 +541,16 @@ country_event = {#GRY informed of WNG's acceptance
 		add_opinion_modifier = { target = FROM modifier = common_cause }
 		army_experience = 25
 		add_equipment_to_stockpile = { type = infantry_equipment amount = 2500 producer = WNG }
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_equipment_subsidy = {
+				cic = 500
+				equipment_type = infantry_equipment
+				seller_tags = { EQC WNG TAL JES ARA FAL SIC MIT CYA }
+			}
+		}
 		#if = {
 		#	limit = {
 		#		is_in_faction_with = WNG
diff --git a/events/Hellquill Events.txt b/events/Hellquill Events.txt
index 57d1426eb1d..4ef4ca50275 100644
--- a/events/Hellquill Events.txt	
+++ b/events/Hellquill Events.txt	
@@ -2071,7 +2071,7 @@ country_event = { #Prince Elias
 		}
 		set_country_leader_description = {
 			ideology = democratic
-			name = smug_elias_desc
+			desc = smug_elias_desc
 		}
 		set_party_name = {
 		    ideology = democratic 
@@ -2136,7 +2136,7 @@ country_event = { #Prince Gerar
 		}
 		set_country_leader_description = {
 			ideology = fascism
-			name = gerar_the_great_desc
+			desc = gerar_the_great_desc
 		}
 		set_party_name = {
 		    ideology = fascism 
@@ -2722,7 +2722,7 @@ country_event = { #The KPH Congress
 		}
 		set_country_leader_description = {
 			ideology = communism
-			name = bat_tito_returns_desc
+			desc = bat_tito_returns_desc
 		}
 		remove_ideas = HLQ_anarchy_2
 		hidden_effect = {
diff --git a/events/Hippogriff Events.txt b/events/Hippogriff Events.txt
index 73abff9ba42..d3d796a4b0f 100644
--- a/events/Hippogriff Events.txt	
+++ b/events/Hippogriff Events.txt	
@@ -794,7 +794,7 @@ country_event = {
 	option = { # Ok!
 		name = hippogriff.17.a
 		add_to_variable = {
-			HIP_AHAC_consumer_goods_factor = -0.02
+			HIP_AHAC_consumer_goods_factor = -0.04
 		}
 		add_to_variable = {
 			HIP_AHAC_war_support_factor = 0.05
@@ -1652,7 +1652,7 @@ country_event = {
 				AND = {
 					has_country_leader = {
 						ruling_only = yes
-						character=HIP_af_duumvirate
+						character=HIP_raft_wood
 					}
 					HIP_raft_wood = {
 						has_character_flag = HIP_duumvirate_active
@@ -1702,7 +1702,7 @@ country_event = {
 				AND = {
 					has_country_leader = {
 						ruling_only = yes
-						character=HIP_af_duumvirate
+						character=HIP_raft_wood
 					}
 					HIP_raft_wood = {
 						has_character_flag = HIP_duumvirate_active
@@ -1728,7 +1728,7 @@ country_event = {
 					AND = {
 						has_country_leader = {
 							ruling_only = yes
-							character=HIP_af_duumvirate
+							character=HIP_raft_wood
 						}
 						HIP_raft_wood = {
 							has_character_flag = HIP_duumvirate_active
@@ -11684,7 +11684,17 @@ country_event = { # The new rifle actually works!
 		}
 		custom_effect_tooltip = HIP_flechette_rifles_effect
 		set_country_flag = HIP_making_flechette_rifles
-		add_ideas = HIP_exotic_weapons_division
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			unlock_mio_policy_tooltip = {
+				policy = mio_policy_HIP_land_flechette_rifles
+			}
+		}
+		else = {
+			add_ideas = HIP_exotic_weapons_division
+		}
 		set_country_flag = HIP_project_salvo_succeeded
 	}
 	option = { # Finally!
@@ -11698,7 +11708,17 @@ country_event = { # The new rifle actually works!
 		}
 		custom_effect_tooltip = HIP_caseless_rifles_effect
 		set_country_flag = HIP_making_caseless_rifles
-		add_ideas = HIP_exotic_weapons_division_0
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			unlock_mio_policy_tooltip = {
+				policy = mio_policy_HIP_land_caseless_rifles
+			}
+		}
+		else = {
+			add_ideas = HIP_exotic_weapons_division_0
+		}
 		set_country_flag = HIP_project_salvo_succeeded
 	}
 }
@@ -14161,7 +14181,7 @@ country_event = { # begin reconstruction
 	is_triggered_only = yes
 	option = { #ok
 		name = hippocommie.113.a
-		set_variable = { HIP_coalition_consumer_goods_factor = 0.1 }
+		set_variable = { HIP_coalition_consumer_goods_factor = 0.2 }
 		set_variable = { HIP_coalition_war_support_factor = 0 }
 		set_variable = { HIP_coalition_min_export = 0 }
 		set_variable = { HIP_coalition_production_factory_max_efficiency_factor = 0 }
@@ -15987,7 +16007,7 @@ country_event = { # Aria does something, idk, use your imagination
 			limit = {
 				is_ai = yes
 			}
-			add_to_variable = { HIP_MAGIC_consumer_goods_factor = -0.005 }
+			add_to_variable = { HIP_MAGIC_consumer_goods_factor = -0.01 }
 			add_to_variable = { HIP_MAGIC_production_speed_buildings_factor = 0.01 }
 			add_to_variable = { HIP_MAGIC_conscription = 0.005 }
 			add_to_variable = { HIP_MAGIC_recruitable_seapony_pop = 0.005 }
@@ -16025,7 +16045,7 @@ country_event = { # Magic the Gathering, or something
 			limit = {
 				is_ai = yes
 			}
-			add_to_variable = { HIP_MAGIC_consumer_goods_factor = -0.005 }
+			add_to_variable = { HIP_MAGIC_consumer_goods_factor = -0.01 }
 			add_to_variable = { HIP_MAGIC_production_speed_buildings_factor = 0.01 }
 			add_to_variable = { HIP_MAGIC_conscription = 0.005 }
 			add_to_variable = { HIP_MAGIC_recruitable_seapony_pop = 0.005 }
@@ -16233,7 +16253,7 @@ country_event = { # The siren healthcare system
 			limit = {
 				is_ai = yes
 			}
-			add_to_variable = { HIP_MAGIC_consumer_goods_factor = 0.005 }
+			add_to_variable = { HIP_MAGIC_consumer_goods_factor = 0.01 }
 			add_to_variable = { HIP_MAGIC_production_speed_buildings_factor = -0.01 }
 			add_to_variable = { HIP_MAGIC_conscription = -0.005 }
 			add_to_variable = { HIP_MAGIC_recruitable_seapony_pop = -0.005 }
@@ -16338,7 +16358,7 @@ country_event = { # you know maybe racism is a bit of a problem
 			limit = {
 				is_ai = yes
 			}
-			add_to_variable = { HIP_MAGIC_consumer_goods_factor = -0.01 }
+			add_to_variable = { HIP_MAGIC_consumer_goods_factor = -0.02 }
 			add_to_variable = { HIP_MAGIC_production_speed_buildings_factor = 0.02 }
 			add_to_variable = { HIP_MAGIC_conscription = 0.01 }
 			add_to_variable = { HIP_MAGIC_recruitable_seapony_pop = 0.01 }
@@ -19357,7 +19377,7 @@ country_event = { # What is the future for the ponies?
 			limit = {
 				is_ai = yes
 			}
-			add_to_variable = { HIP_MAGIC_consumer_goods_factor = -0.015 }
+			add_to_variable = { HIP_MAGIC_consumer_goods_factor = -0.03 }
 			add_to_variable = { HIP_MAGIC_production_speed_buildings_factor = 0.03 }
 			add_to_variable = { HIP_MAGIC_conscription = 0.015 }
 			add_to_variable = { HIP_MAGIC_recruitable_seapony_pop = 0.015 }
@@ -19379,7 +19399,7 @@ country_event = { # What is the future for the ponies?
 			limit = {
 				is_ai = yes
 			}
-			add_to_variable = { HIP_MAGIC_consumer_goods_factor = 0.015 }
+			add_to_variable = { HIP_MAGIC_consumer_goods_factor = 0.03 }
 			add_to_variable = { HIP_MAGIC_production_speed_buildings_factor = -0.03 }
 			add_to_variable = { HIP_MAGIC_conscription = -0.015 }
 			add_to_variable = { HIP_MAGIC_recruitable_seapony_pop = -0.015 }
diff --git a/events/Hippone Events.txt b/events/Hippone Events.txt
index e5c0daa9528..7a407876e46 100644
--- a/events/Hippone Events.txt	
+++ b/events/Hippone Events.txt	
@@ -1684,6 +1684,7 @@ country_event = { #Hiram's Ascension Event but from the perspective of the peopl
 			}
 			promote_leader = yes
 		}
+		custom_effect_tooltip = HIE_CTH_post_apotheosis_tp
 		hidden_effect = {
 			country_event = {
 				id = hippone_sekrit.41
diff --git a/events/Kirin Events.txt b/events/Kirin Events.txt
index 3b4a505b6c7..0d61414628c 100644
--- a/events/Kirin Events.txt	
+++ b/events/Kirin Events.txt	
@@ -1035,7 +1035,7 @@ country_event = {
 				load_oob = "KIR_pre_dreadnaughts"
 			}
 			else = {
-				set_technology = { early_heavy_cruiser = 1 }
+				set_technology = { pre_dreadnoughts_nomtg = 1 }
 				load_oob = "KIR_pre_dreadnaughts_legacy"
 			}
 		}
@@ -1071,7 +1071,7 @@ country_event = {
 				load_oob = "KIR_pre_dreadnaughts"
 			}
 			else = {
-				set_technology = { early_heavy_cruiser = 1 }
+				set_technology = { pre_dreadnoughts_nomtg = 1 }
 				load_oob = "KIR_pre_dreadnaughts_legacy"
 			}
 		}
@@ -1766,7 +1766,7 @@ country_event = {
 			subtract_from_variable = { KIR_STATE_PALACE_COST_EXCLUDED_VAR_NEGATIVE = 150 }
 			set_variable = { KIR_CONSOCSYS_political_power_gain_var = 0.2 }
 			set_variable = { KIR_CONSOCSYS_command_power_gain_var = 0.2 }
-			set_variable = { KIR_CONSOCSYS_consumer_goods_factor_var = 0.004 }
+			set_variable = { KIR_CONSOCSYS_consumer_goods_factor_var = 0.008 }
 			set_variable = { KIR_CONSOCSYS_research_speed_factor_var = 0.02 }
 			set_variable = { KIR_CONSOCSYS_war_support_factor_var = 0.02 }
 			set_variable = { KIR_CONSOCSYS_local_resources_factor_var = 0.02 }
@@ -2597,25 +2597,25 @@ country_event = {
 	option = {
 		name = kirin.80.b
 		ai_chance = {
-			base = 1
+			base = 2
 			modifier = {
-				add = 0.25
+				add = 0.5
 				strength_ratio = { tag = KIR ratio > 1 }
 			}
 			modifier = {
-				add = 0.25
+				add = 0.5
 				strength_ratio = { tag = KIR ratio > 1.5 }
 			}
 			modifier = {
-				add = 0.25
+				add = 0.75
 				strength_ratio = { tag = KIR ratio > 2 }
 			}
 			modifier = {
-				add = 0.25
+				add = 1
 				strength_ratio = { tag = KIR ratio > 2.5 }
 			}
 			modifier = {
-				add = 0.25
+				add = 1
 				strength_ratio = { tag = KIR ratio > 3 }
 			}
 			modifier = {
@@ -2629,7 +2629,19 @@ country_event = {
 		}
 		FROM = {
 			country_event = { id = kirin.82 days = 2 }
-			effect_tooltip = { create_wargoal = { type = puppet_wargoal_focus target = ROOT } }
+			effect_tooltip = {
+				if = {
+					limit = {
+						has_non_aggression_pact_with = ROOT
+					}
+					diplomatic_relation = {
+						country = ROOT
+						relation = non_aggression_pact
+						active = no
+					}
+				}
+				create_wargoal = { type = puppet_wargoal_focus target = ROOT } 
+			}
 		}
 		hidden_effect = {
 			add_ai_strategy = {
@@ -2653,7 +2665,7 @@ country_event = {
 	
 	option = {
 		name = kirin.81.a
-		add_political_power = 5
+		add_political_power = 15
 		FROM = {
 			effect_tooltip = {
 				activate_mission = reduce_army_size_KIR
@@ -2674,6 +2686,18 @@ country_event = {
 	
 	option = {
 		name = kirin.82.a
+		if = {
+			limit = {
+				has_non_aggression_pact_with = FROM
+			}
+			ROOT = {
+				diplomatic_relation = {
+					country = FROM
+					relation = non_aggression_pact
+					active = no
+				}
+			}
+		}
 		create_wargoal = { type = puppet_wargoal_focus target = FROM }
 	}
 }
@@ -2690,6 +2714,8 @@ country_event = {
 	
 	option = {
 		name = kirin.83.a
+		add_political_power = 50
+		add_war_support = -0.025
 		ROOT = {
 			diplomatic_relation = {
 				country = FROM
@@ -2720,6 +2746,18 @@ country_event = {
 	
 	option = {
 		name = kirin.84.a
+		if = {
+			limit = {
+				has_non_aggression_pact_with = FROM
+			}
+			ROOT = {
+				diplomatic_relation = {
+					country = FROM
+					relation = non_aggression_pact
+					active = no
+				}
+			}
+		}
 		create_wargoal = { type = puppet_wargoal_focus target = FROM }
 	}
 }
@@ -2758,6 +2796,7 @@ country_event = {
 	picture = GFX_event_KIR_raining
 	is_triggered_only = yes
 	trigger = {
+		is_ai = no
 		original_tag = KIR
 		any_owned_state = {
 			is_controlled_by = KIR
@@ -2775,6 +2814,8 @@ country_event = {
 			}
 		}
 		custom_effect_tooltip = KIR_event_200_tt
+		custom_effect_tooltip = KIR_line_break
+		custom_effect_tooltip = KIR_toggle_diet_auto_renew_turn_on
 	}
 }
 
@@ -2919,12 +2960,7 @@ country_event = {
 		}
 		1158 = {
 			owner = {
-				PREV = { is_core_of = THIS }
 				NOT = { has_war_with = KIR }
-				OR = {
-					has_opinion_modifier = KIR_incandescent_embassy
-					has_opinion = { target = KIR value > 40 }
-				}
 			}
 		}
 	}
@@ -2940,6 +2976,46 @@ country_event = {
 	}
 }
 
+country_event = {
+	id = kirin.206
+	immediate = {log = "[GetDateText]: [Root.GetName]: event kirin.206"}
+	title = kirin.206.t
+	desc = kirin.206.d
+	
+	picture = GFX_event_KIR_festival
+	
+	is_triggered_only = yes
+	
+	option = {
+		name = kirin.206.a
+		add_political_power = 25
+		add_popularity = {
+			ideology = democratic
+			popularity = 0.03
+		}
+	}
+}
+
+country_event = {
+	id = kirin.207
+	immediate = {log = "[GetDateText]: [Root.GetName]: event kirin.207"}
+	title = kirin.207.t
+	desc = kirin.207.d
+	
+	picture = GFX_event_KIR_street
+	
+	is_triggered_only = yes
+	
+	option = {
+		name = kirin.207.a
+		add_stability = 0.03
+		add_popularity = {
+			ideology = communism
+			popularity = 0.03
+		}
+	}
+}
+
 country_event = {
 	id = kirin.300
 	immediate = {log = "[GetDateText]: [Root.GetName]: event kirin.300"}
@@ -3059,7 +3135,7 @@ country_event = {
 	title = kirin.305.t
 	desc = kirin.305.d
 	
-	picture = GFX_event_KIR_acolyte
+	picture = GFX_event_billabong
 	
 	is_triggered_only = yes
 	trigger = {
@@ -3247,6 +3323,7 @@ country_event = {
 		hidden_effect = {
 			add_dynamic_modifier = { modifier = KIR_DEL_War_Limit_Real }
 			add_dynamic_modifier = { modifier = KIR_DEL_War_Limit }
+			set_country_flag = KIR_event_3080_flag
 			set_variable = { KDWLM1_var = 50 }
 		}
 	}
@@ -3322,6 +3399,7 @@ country_event = {
 	
 	option = {
 		name = kirin.310.a
+		custom_effect_tooltip = KIR_event_310_tt
 		add_days_mission_timeout = {
 			mission = KIR_FS_Timer
 			days = 30
@@ -3559,7 +3637,7 @@ country_event = {
 			}
 			if = {
 				limit = {
-					has_country_flag = KIR_unlocked_concentration_camps
+					has_country_flag = KIR_FSW_Internment_Camps
 				}
 				country_event = { id = kirin.334 days = 100 random_days = 265 }
 			}
@@ -3652,7 +3730,7 @@ country_event = {
 			}
 			if = {
 				limit = {
-					has_country_flag = KIR_unlocked_concentration_camps
+					has_country_flag = KIR_FSW_Internment_Camps
 				}
 				country_event = { id = kirin.334 days = 100 random_days = 265 }
 			}
@@ -4487,7 +4565,7 @@ country_event = {
 			country_event = { id = kirin_utility.44 days = 1 }
 			if = {
 				limit = {
-					has_country_flag = KIR_unlocked_concentration_camps
+					has_country_flag = KIR_FSW_Internment_Camps
 				}
 				country_event = { id = kirin.334 days = 100 random_days = 265 }
 			}
@@ -5233,6 +5311,11 @@ country_event = { ##things fall apart
 				has_country_flag = KIR_PATH_GGO_SUCCESS
 			}
 		}
+		NOT = {
+			has_war_with = KXN
+			has_war_with = ROA
+			has_war_with = TSV
+		}
 		OR = {
 			has_stability < 0.099
 			has_country_flag = KIR_PATH_CIVIL_WAR_MANUAL_TRIGGER
@@ -5621,6 +5704,7 @@ country_event = {
 					marines = 1
 					infantry_weapons = 1
 					gw_artillery = 1
+					tech_trucks = 1
 					motorised_infantry = 1
 				}
 				set_cosmetic_tag = KIR_auto1
@@ -6156,6 +6240,7 @@ country_event = {
 					marines = 1
 					infantry_weapons = 1
 					gw_artillery = 1
+					tech_trucks = 1
 					motorised_infantry = 1
 				}
 				set_cosmetic_tag = KIS_salvation_front
@@ -6929,7 +7014,11 @@ country_event = {
 				promote_leader = yes
 				remove_unit_leader_trait = old_guard
 				add_unit_leader_trait = organisational_leader
-				set_leader_portrait = "GFX_portrait_KIR_firethorn_new_uniform"
+				set_portraits = {
+					army = {
+						large = "GFX_portrait_KIR_firethorn_new_uniform"
+					}
+				}
 			}
 		}
 	}
@@ -8561,8 +8650,21 @@ news_event = {
 			}
 			custom_effect_tooltip = KIR_line_break
 			set_country_flag = KIS_guild_artificer_available
-			custom_effect_tooltip = available_designer_individual
-			show_ideas_tooltip = KIS_guild_artificer
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}    
+				custom_effect_tooltip = available_mio_tt
+				show_mio_tooltip = KIS_guild_artificer_organization
+				mio:KIS_guild_artificer_organization = {
+					add_mio_size = 1
+					add_mio_funds = 400
+				}
+			}
+			else = {
+				custom_effect_tooltip = available_designer_individual
+				show_ideas_tooltip = KIS_guild_artificer
+			}
 		}
 	}
 }
@@ -8704,6 +8806,12 @@ news_event = {
 			type = topple_government
 		}
 		set_country_flag = KIC_FRV_crisis_happened_flag
+		hidden_effect = {
+			add_timed_idea = {
+				idea = KIC_Crisis_FRV
+				days = 730
+			}
+		}
 	}
 	option = {
 		name = kirin_news.33.b
@@ -8881,7 +8989,7 @@ country_event = {
 	
 	option = {
 		name = kirin_pirate.4.a
-		add_political_power = -100
+		add_political_power = -70
 		add_stability = -0.05
 	}
 }
@@ -8899,7 +9007,7 @@ country_event = {
 	
 	option = {
 		name = kirin_pirate.5.a
-		add_political_power = -120
+		add_political_power = -70
 		add_stability = -0.05
 	}
 }
@@ -8914,11 +9022,10 @@ news_event = {
 	
 	major = no
 	is_triggered_only = yes
-	fire_only_once = yes
 	
 	option = {
 		name = kirin_pirate.6.a
-		add_political_power = -150
+		add_political_power = -70
 		add_stability = -0.05
 	}
 }
@@ -8936,7 +9043,7 @@ country_event = {
 	
 	option = {
 		name = kirin_pirate.7.a
-		add_political_power = -150
+		add_political_power = -100
 		add_stability = -0.05
 	}
 }
@@ -9024,6 +9131,11 @@ country_event = {
 	picture = GFX_event_KIR_village
 	
 	is_triggered_only = yes
+	trigger = {
+		NOT = {
+			has_country_flag = KIR_bipartite_war_started_flag
+		}
+	}
 	fire_only_once = yes
 	
 	option = {
@@ -9955,6 +10067,16 @@ country_event = {
 					producer = EQS
 				}
 			}
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_equipment_subsidy = {
+					cic = 250
+					equipment_type = small_plane_airframe
+					seller_tags = { EQS CRY NLR VAN SCS LSP NMS CES JUN BAL TEM BUF }
+				}
+			}
 			if = {
 				limit = {
 					has_dlc = "By Blood Alone"
@@ -10004,6 +10126,16 @@ country_event = {
 					producer = EQS
 				}
 			}
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_equipment_subsidy = {
+					cic = 250
+					equipment_type = medium_plane_airframe
+					seller_tags = { EQS CRY NLR VAN SCS LSP NMS CES JUN BAL TEM BUF }
+				}
+			}
 			add_manpower = 2500
 		}
 	}
@@ -10501,7 +10633,7 @@ country_event = {
 		}
 		hidden_effect = {
 			add_to_variable = { KCRF_CD = 0.1 }
-			add_to_variable = { KCRF_CGF = 0.03 }
+			add_to_variable = { KCRF_CGF = 0.06 }
 			add_to_variable = { KCRF_IFRF = 0.05 }
 			subtract_from_variable = { KCRF_CCCTMF = 0.15 }
 			subtract_from_variable = { KCRF_CCMTCF = 0.15 }
@@ -11791,6 +11923,7 @@ country_event = {
 	trigger = {
 		original_tag = KIR
 		exists = yes
+		is_subject = no
 		has_country_flag = KIR_bipartite_war_started_flag
 		NOT = { has_country_flag = KIS_council_salvation_front_civil_war_scenario }
 		KIS = {
@@ -11860,6 +11993,7 @@ country_event = {
 	trigger = {
 		original_tag = KIR
 		exists = yes
+		is_subject = no
 		has_country_flag = KIR_bipartite_war_started_flag
 		NOT = { has_country_flag = KIS_council_salvation_front_civil_war_scenario }
 		KIS = {
@@ -13063,10 +13197,6 @@ country_event = {
 		}
 		hidden_effect = {
 			add_ideas = KIR_To_NSA_Defections
-			add_timed_idea = {
-				idea = KIR_Crisis_NSA
-				days = 730
-			}
 			create_dynamic_country = {
 				original_tag = KIR
 				save_event_target_as = KIR_NSA_target
@@ -13175,7 +13305,7 @@ country_event = {
 				add_country_leader_role = { 
 					character = KIR_bright_burn 
 					promote_leader = yes 
-					country_leader = { ideology = harmonic_libertarianism expire = "1965.1.1.1" traits = { } } 
+					country_leader = { ideology = harmonic_libertarianism expire = "1965.1.1.1" desc = "NSA_bright_burn_desc" traits = { } } 
 				}
 				every_possible_country = {
 					limit = {
@@ -13386,6 +13516,10 @@ country_event = {
 				mark_focus_tree_layout_dirty = yes
 				country_event = { id = kirin_utility.43 days = 1 }
 			}
+			add_timed_idea = {
+				idea = KIR_Crisis_NSA
+				days = 730
+			}
 			set_country_flag = KIR_TRAD_new_standard_army_revolt
 			mark_focus_tree_layout_dirty = yes
 			add_popularity = {
@@ -13679,7 +13813,7 @@ country_event = {
 				add_country_leader_role = { 
 					character = KIR_firethorn 
 					promote_leader = yes 
-					country_leader = { ideology = harmonic_constitutionalism expire = "1965.1.1.1" desc = "NSA_bright_burn_desc" traits = { } } 
+					country_leader = { ideology = harmonic_constitutionalism expire = "1965.1.1.1" desc = "HOC_firethorn_desc" traits = { } } 
 				}
 				set_country_leader_portrait = {
 					ideology = democratic
@@ -16454,20 +16588,59 @@ country_event = {
 	option = {
 		name = kirin_council.61.a
 		set_country_flag = KIR_enterprise_TANK_available
-		custom_effect_tooltip = available_designer
-        show_ideas_tooltip = KIR_enterprise_TANK
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}    
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = KIR_enterprise_TANK_organization
+			mio:KIR_enterprise_TANK_organization = {
+				add_mio_size = 1
+				add_mio_funds = 800
+			}
+		}
+		else = {
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = KIR_enterprise_TANK
+		}
 	}
 	option = {
 		name = kirin_council.61.b
 		set_country_flag = KIR_enterprise_EQUIPMENT_available
-		custom_effect_tooltip = available_designer
-        show_ideas_tooltip = KIR_enterprise_EQUIPMENT
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}    
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = KIR_enterprise_EQUIPMENT_organization
+			mio:KIR_enterprise_EQUIPMENT_organization = {
+				add_mio_size = 1
+				add_mio_funds = 800
+			}
+		}
+		else = {
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = KIR_enterprise_EQUIPMENT
+		}
 	}
 	option = {
 		name = kirin_council.61.c
 		set_country_flag = KIR_enterprise_AIR_available
-		custom_effect_tooltip = available_designer
-        show_ideas_tooltip = KIR_enterprise_AIR
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}    
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = KIR_enterprise_AIR_organization
+			mio:KIR_enterprise_AIR_organization = {
+				add_mio_size = 1
+				add_mio_funds = 800
+			}
+		}
+		else = {
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = KIR_enterprise_AIR
+		}
 	}
 }
 
@@ -16551,6 +16724,17 @@ country_event = {
 				}
 				swap_ideas = { add_idea = KIR_rhapsody_arsenal_rebranded remove_idea = KIR_rhapsody_arsenal }
 			}
+			else_if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				mio:KIR_rhapsody_arsenal_organization = {
+					set_mio_icon = GFX_idea_KIR_rhapsody_arsenal_original
+					set_mio_name_key = KIR_rhapsody_arsenal_rebranded
+					add_mio_funds = 450
+					add_mio_size = 1
+				}
+			}
 		}
 	}
 }
@@ -18981,6 +19165,7 @@ country_event = {
 	picture = GFX_event_KIR_hamlet
 	
 	is_triggered_only = yes
+	fire_only_once = yes
 	
 	option = {
 		name = kirin_council.116.a
@@ -19034,19 +19219,41 @@ country_event = {
 		tag = CFR
 		has_capitulated = no
 		has_full_control_of_state = 1071
-		is_subject_of = CHN
+		OR = {
+			is_subject_of = CHN
+			is_in_faction_with = CHN
+			has_war_together_with = CHN
+		}
 		CHN = {
-			surrender_progress > 0.5
+			OR = {
+				surrender_progress > 0.5
+				any_enemy_country = {
+					OR = {
+						controls_state = 251
+						controls_state = 259
+						controls_state = 309
+						controls_state = 252
+						controls_state = 262
+					}
+				}
+			}
 		}
 	}
 	mean_time_to_happen = {
-		days = 60
+		days = 20
 	}
 	
 	option = {
 		name = kirin_council.119.a
-		CHN = {
-			end_puppet = CFR
+		if = {
+			limit = {
+				CFR = {
+					is_subject_of = CHN
+				}
+			}
+			CHN = {
+				end_puppet = CFR
+			}
 		}
 		if = {
 			limit = {
@@ -19057,7 +19264,12 @@ country_event = {
 		every_enemy_country = {
 			limit = {
 				has_war_with = CHN
-				capital_scope = { is_on_continent = africa }
+				capital_scope = { NOT = { is_on_continent = africa } }
+				NOT = {
+					has_country_flag = CFR_roaring_fire_breakaway_flag
+					has_country_flag = CFR_RRA_breakaway_flag
+					has_country_flag = CFR_civil_war_incited_here
+				}
 			}
 			set_country_flag = { flag = bypass_on_peaceconference_ended days = 1 value = 1 }
 			white_peace = CFR
@@ -19241,10 +19453,6 @@ country_event = {
 	immediate = {
 		hidden_effect = {
 			add_manpower = -80000
-			add_timed_idea = {
-				idea = KIS_Crisis_CorWar
-				days = 730
-			}
 			create_dynamic_country = {
 				original_tag = KIS
 				save_event_target_as = KIS_KAG_target
@@ -19470,8 +19678,18 @@ country_event = {
 				}
 				add_equipment_to_stockpile = { type = convoy amount = 100 }
 				set_technology = { mechanised_infantry = 1 popup = no }
+				set_technology = { tech_trucks = 1 popup = no }
 				set_technology = { motorised_infantry = 1 popup = no }
-				set_technology = { gwtank = 1 popup = no }
+				if = {
+					limit = {
+						has_dlc = "No Step Back"
+					}
+					set_technology = { gwtank_chassis = 1 popup = no }
+
+				}
+				else = {
+					set_technology = { gwtank = 1 popup = no }
+				}
 				add_manpower = 80000
 				set_capital = {
 					state = 1064
@@ -19659,8 +19877,18 @@ country_event = {
 					units_deployed_to_overlord = no
 				}
 				set_technology = { mechanised_infantry = 1 popup = no }
+				set_technology = { tech_trucks = 1 popup = no }
 				set_technology = { motorised_infantry = 1 popup = no }
-				set_technology = { gwtank = 1 popup = no }
+				if = {
+					limit = {
+						has_dlc = "No Step Back"
+					}
+					set_technology = { gwtank_chassis = 1 popup = no }
+
+				}
+				else = {
+					set_technology = { gwtank = 1 popup = no }
+				}
 				division_template = {
 					name = "Corporate Para-Militia"
 					is_locked = yes
@@ -20031,8 +20259,17 @@ country_event = {
 					can_use_kamikaze_pilots = yes
 					units_deployed_to_overlord = no
 				}
+				if = {
+					limit = {
+						has_dlc = "No Step Back"
+					}
+					set_technology = { gwtank_chassis = 1 popup = no }
+
+				}
+				else = {
+					set_technology = { gwtank = 1 popup = no }
+				}
 				set_technology = {
-					gwtank = 1
 					tech_logistics_company = 1
 					tech_maintenance_company = 1
 				}
@@ -20336,6 +20573,10 @@ country_event = {
 				set_AI_strategies_on_every_possible_country_delayed = yes
 				country_event = { id = kirin_utility.43 days = 1 }
 			}
+			add_timed_idea = {
+				idea = KIS_Crisis_CorWar
+				days = 730
+			}
 		}
 	}
 	title = kirin_council.507.t
@@ -20916,10 +21157,6 @@ country_event = {
 			}
 		}
 		hidden_effect = {
-			add_timed_idea = {
-				idea = KIS_Crisis_COC
-				days = 730
-			}
 			create_dynamic_country = {
 				original_tag = KIC
 				save_event_target_as = KIC_children_of_concord_target
@@ -21336,9 +21573,22 @@ country_event = {
 				set_AI_strategies_on_every_possible_country_delayed = yes
 				country_event = { id = kirin_utility.43 days = 1 }
 			}
+			add_timed_idea = {
+				idea = KIS_Crisis_COC
+				days = 730
+			}
 			set_country_flag = KIC_children_of_concord_happened_flag
 			mark_focus_tree_layout_dirty = yes
-			set_technology = { gwtank = 1 popup = no }
+			if = {
+				limit = {
+					has_dlc = "No Step Back"
+				}
+				set_technology = { gwtank_chassis = 1 popup = no }
+
+			}
+			else = {
+				set_technology = { gwtank = 1 popup = no }
+			}
 			division_template = {
 				name = "Civil Defence Battlegroup"
 				division_names_group = KIR_BANNER 
@@ -21865,6 +22115,16 @@ country_event = {
 		add_equipment_to_stockpile = { type = infantry_equipment amount = 2000 producer = SRS }
 		add_equipment_to_stockpile = { type = infantry_equipment amount = 2000 producer = STG }
 		add_equipment_to_stockpile = { type = infantry_equipment amount = 2000 producer = GRW }
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_equipment_subsidy = {
+				cic = 500
+				equipment_type = infantry_equipment
+				seller_trigger = is_communist_seller_trigger
+			}
+		}
 		add_manpower = 2000
 		set_country_flag = COC_PS_KF_event_fired_flag
 	}
@@ -22197,6 +22457,15 @@ country_event = {
 	
 	option = {
 		name = kirin_council.352.a
+		save_current_manpower = yes
+		every_controlled_state = {
+			limit = {
+				is_core_of = COC
+			}
+			add_resistance = -5
+			add_manpower = -5000
+		}
+		restore_previous_manpower = yes
 		news_event = { id = kirin_council.353 hours = 1 }
 	}
 }
@@ -23159,6 +23428,33 @@ country_event = {
 		name = kirin_republic.31.a
 		custom_effect_tooltip = KIR_republic_31_tt
 		set_country_flag = KIC_unlock_postwar_focus_tree
+		if = {
+			limit = {
+				has_country_flag = KIC_fled_to_taungpau
+			}
+			drop_cosmetic_tag = yes
+			add_popularity = {
+				ideology = communism
+				popularity = 0.25
+			}
+			add_country_leader_role = {
+				character = "KIR_rising_sun"
+				promote_leader = yes
+				country_leader = {
+					desc = "KIR_rising_sun_desc"
+					ideology = religious_socialism
+					expire = "1965.1.1.1"
+					traits = { KIR_spiritual_communalist }
+				}
+			}
+			if = {
+				limit = {
+					has_completed_focus = KIR_republic_focus_shared_3
+				}
+				add_country_leader_trait = KIR_matriarch_protector
+				hidden_effect = { country_event = { id = kirin_utility.53 hours = 8 } }
+			}
+		}
 		if = {
 			limit = {
 				NOT = {
@@ -23809,7 +24105,10 @@ country_event = {
 	option = {
 		name = kirin_republic.46.a
 		add_to_variable = { KIC_authoritarian_var = 1 }
-		add_political_power = -75
+		add_popularity = {
+			ideology = communism
+			popularity = -0.03
+		}
 		every_controlled_state = {
 			limit = {
 				NOT = {
@@ -24181,9 +24480,22 @@ country_event = {
 	
 	option = {
 		name = kirin_republic.55.a
-		custom_effect_tooltip = available_designer_individual
-		show_ideas_tooltip = KIC_deer_comrade
 		set_country_flag = KIC_deer_comrade_available
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}    
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = KIC_deer_comrade_organization
+			mio:KIC_deer_comrade_organization = {
+				add_mio_size = 1
+				add_mio_funds = 600
+			}
+		}
+		else = {
+			custom_effect_tooltip = available_designer_individual
+			show_ideas_tooltip = KIC_deer_comrade
+		}
 	}
 }
 
@@ -24225,7 +24537,7 @@ country_event = {
 		check_variable = { KIC.KIC_Dayspring_Rose_Missions > 3 }
 	}
 	mean_time_to_happen = {
-		days = 60
+		days = 20
 	}
 	fire_only_once = yes
 	
@@ -24334,10 +24646,6 @@ country_event = {
 	immediate = {log = "[GetDateText]: [Root.GetName]: event kirin_republic.70"}
 	immediate = {
 		hidden_effect = {
-			add_timed_idea = {
-				idea = KIC_Crisis_Nirik
-				days = 730
-			}
 			create_dynamic_country = {
 				original_tag = KIC
 				save_event_target_as = KIC_UMC
@@ -24690,6 +24998,10 @@ country_event = {
 				country_event = { id = kirin_utility.43 days = 1 }
 				set_global_flag = KIC_contumacy_revolt_happened_flag
 			}
+			add_timed_idea = {
+				idea = KIC_Crisis_Nirik
+				days = 730
+			}
 		}
 	}
 	title = kirin_republic.70.t
@@ -25478,10 +25790,6 @@ country_event = {
 		hidden_effect = {
 			news_event = { id = kirin_news.33 hours = 36 }
 			news_event = { id = kirin_news.34 hours = 72 }
-			add_timed_idea = {
-				idea = KIC_Crisis_FRV
-				days = 730
-			}
 			create_dynamic_country = {
 				original_tag = KIS
 				save_event_target_as = KIS_FRV_flag_target
@@ -26219,30 +26527,77 @@ country_event = {
 	
 	option = {
 		name = kirin_republic.94.a
-		custom_effect_tooltip = available_designer
-		show_ideas_tooltip = KIR_cog_plow_bull_co
 		set_country_flag = KIR_cog_plow_bull_co_available
-		custom_effect_tooltip = available_designer
-		show_ideas_tooltip = KIR_rhapsody_arsenal
 		set_country_flag = KIR_rhapsody_arsenal_available
-		custom_effect_tooltip = available_designer
-		show_ideas_tooltip = KIR_sycee_trading_house
 		set_country_flag = KIR_sycee_trading_house_available
-		custom_effect_tooltip = available_designer
-		show_ideas_tooltip = KIR_artificer_guild
 		set_country_flag = KIR_artificer_guild_available
-		custom_effect_tooltip = available_designer
-		show_ideas_tooltip = KIR_crane_heavy_industries
 		set_country_flag = KIR_crane_heavy_industries_available
-		custom_effect_tooltip = available_designer
-		show_ideas_tooltip = KIR_wingluck_consortium
 		set_country_flag = KIR_wingluck_consortium_available
-		custom_effect_tooltip = available_designer
-		show_ideas_tooltip = KIR_dreamboat
 		set_country_flag = KIR_dreamboat_available
-		custom_effect_tooltip = available_designer
-		show_ideas_tooltip = KIR_scarlet_sails_shipyards
 		set_country_flag = KIR_scarlet_sails_shipyards_available
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = KIR_cog_plow_bull_co_organization
+			mio:KIR_cog_plow_bull_co_organization = {
+				add_mio_size = 1
+				add_mio_funds = 300
+			}
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = KIR_rhapsody_arsenal_organization
+			mio:KIR_rhapsody_arsenal_organization = {
+				add_mio_size = 1
+				add_mio_funds = 300
+			}
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = KIR_sycee_trading_house
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = KIR_artificer_guild
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = KIR_crane_heavy_industries_organization
+			mio:KIR_crane_heavy_industries_organization = {
+				add_mio_size = 1
+				add_mio_funds = 300
+			}
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = KIR_wingluck_consortium_organization
+			mio:KIR_wingluck_consortium_organization = {
+				add_mio_size = 1
+				add_mio_funds = 300
+			}
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = KIR_dreamboat_organization
+			mio:KIR_dreamboat_organization = {
+				add_mio_size = 1
+				add_mio_funds = 300
+			}
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = KIR_scarlet_sails_shipyards_organization
+			mio:KIR_scarlet_sails_shipyards_organization = {
+				add_mio_size = 1
+				add_mio_funds = 300
+			}
+		}
+		else = {
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = KIR_cog_plow_bull_co
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = KIR_rhapsody_arsenal
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = KIR_sycee_trading_house
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = KIR_artificer_guild
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = KIR_crane_heavy_industries
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = KIR_wingluck_consortium
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = KIR_dreamboat
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = KIR_scarlet_sails_shipyards
+		}
 	}
 	option = {
 		name = kirin_republic.94.b
@@ -28211,13 +28566,14 @@ country_event = {
 	
 	option = {
 		name = kirin_republic.312.a
+		set_cosmetic_tag = KIC_realm
 		set_politics = {
 			ruling_party = fascism
 			elections_allowed = no
 		}
 		add_popularity = {
 			ideology = fascism
-			popularity = 0.25
+			popularity = KIC.party_popularity@communism
 		}
 		custom_effect_tooltip = KIC_event_312_tt
 		set_variable = { KIC_fire_rising_FD = KIC_fire_rising_CD }
@@ -28236,18 +28592,24 @@ country_event = {
 			}
 		}
 		hidden_effect = {
-			set_cosmetic_tag = KIC_realm
+			remove_ideas = KIR_rising_fire
+			remove_ideas = KIR_rising_fire_1
+			remove_ideas = KIR_rising_fire_2
 			if = {
 				limit = {
-					has_idea = KIR_rising_fire_def1
+					OR = {
+						has_idea = KIR_rising_fire_def
+						has_idea = KIR_rising_fire_def1
+					}
 				}
-				swap_ideas = { add_idea = KIR_rising_fire_def2 remove_idea = KIR_rising_fire_def1 }
+				remove_ideas = KIR_rising_fire_def
+				remove_ideas = KIR_rising_fire_def1
+				add_ideas = KIR_rising_fire_def2
 			}
-			else_if = {
-				limit = {
-					has_idea = KIR_rising_fire_ofs1
-				}
-				swap_ideas = { add_idea = KIR_rising_fire_ofs2 remove_idea = KIR_rising_fire_ofs1 }
+			else = {
+				remove_ideas = KIR_rising_fire_ofs
+				remove_ideas = KIR_rising_fire_ofs1
+				add_ideas = KIR_rising_fire_ofs2
 			}
 		}
 	}
@@ -30043,6 +30405,23 @@ country_event = {
 	}
 }
 
+country_event = {
+	id = kirin_utility.53 ## This is required because the effect in kirin_republic.31 does not work for some reason.
+	immediate = {log = "[GetDateText]: [Root.GetName]: event kirin_utility.53"}
+	is_triggered_only = yes
+	fire_only_once = yes
+	hidden = yes
+	
+	option = {
+		if = {
+			limit = {
+				has_completed_focus = KIR_republic_focus_shared_3
+			}
+			add_country_leader_trait = KIR_matriarch_protector
+		}
+	}
+}
+
 country_event = {
 	id = kirin_test.1
 	immediate = {log = "[GetDateText]: [Root.GetName]: event kirin_test.1"}
@@ -32181,7 +32560,7 @@ country_event = {
 				load_oob = "KIR_pre_dreadnaughts"
 			}
 			else = {
-				set_technology = { early_heavy_cruiser = 1 }
+				set_technology = { pre_dreadnoughts_nomtg = 1 }
 				load_oob = "KIR_pre_dreadnaughts_legacy"
 			}
 		}
diff --git a/events/Lan Kir Placeholder Events.txt b/events/Lan Kir Placeholder Events.txt
index adac39c92aa..2ef75ec489c 100644
--- a/events/Lan Kir Placeholder Events.txt	
+++ b/events/Lan Kir Placeholder Events.txt	
@@ -29,6 +29,7 @@ country_event = {
 	
 	option = {
 		name = lan_kir_placeholder.1.a
+		set_country_flag = I_have_been_very_bad_KIR
 		effect_tooltip = {
 			create_wargoal = { type = annex_everything target = NVA }
 			create_wargoal = { type = annex_everything target = KHM }
@@ -52,7 +53,19 @@ country_event = {
 			}
 		}
 		capital_scope = {
-			create_unit = { division = "division_template = \"Lan Kir War-Banner\" start_equipment_factor = 1.2 start_experience_factor = 0.25" owner = ROOT count = 6 }
+			create_unit = { division = "division_template = \"Lan Kir War-Banner\" start_equipment_factor = 1.2 start_experience_factor = 0.25" owner = ROOT count = 3 }
+			random_list = {
+				1 = { create_unit = { division = "division_template = \"Lan Kir War-Banner\" start_equipment_factor = 1.2 start_experience_factor = 0.25" owner = ROOT count = 1 } }
+				1 = { }
+			}
+			random_list = {
+				1 = { create_unit = { division = "division_template = \"Lan Kir War-Banner\" start_equipment_factor = 1.2 start_experience_factor = 0.25" owner = ROOT count = 1 } }
+				1 = { }
+			}
+			random_list = {
+				1 = { create_unit = { division = "division_template = \"Lan Kir War-Banner\" start_equipment_factor = 1.2 start_experience_factor = 0.25" owner = ROOT count = 1 } }
+				1 = { }
+			}
 			random_list = {
 				1 = { create_unit = { division = "division_template = \"Lan Kir War-Banner\" start_equipment_factor = 1.2 start_experience_factor = 0.25" owner = ROOT count = 1 } }
 				1 = { }
@@ -119,6 +132,7 @@ country_event = {
 						id = PREV
 						value = 1000
 					}
+					country_event = { id = lan_kir_placeholder.100 }
 				}
 			}
 		}
@@ -148,48 +162,76 @@ country_event = {
 				}
 			}
 		}
+		if = {
+			limit = {
+				OR = {
+					KIR = { has_country_flag = KIR_bipartite_war_started_flag }
+					KIS = { has_country_flag = KIR_bipartite_war_started_flag }
+					KIC = { has_country_flag = KIR_bipartite_war_started_flag }
+				}
+			}
+			OR = {
+				KIR = { KIR_controls_all_kiria_proper = yes }
+				KIS = { KIR_controls_all_kiria_proper = yes }
+				KIC = { KIR_controls_all_kiria_proper = yes }
+			}
+		}
 	}
 	mean_time_to_happen = {
 		days = 365
 	}
 	
 	option = {
+		name = lan_kir_placeholder.2.a
 		effect_tooltip = {
 			create_wargoal = { type = annex_everything target = KIR }
 		}
 		capital_scope = {
-			create_unit = { division = "division_template = \"Lan Kir War-Banner\" start_equipment_factor = 1.2 start_experience_factor = 0.25" owner = ROOT count = 12 }
-			random_list = {
-				1 = { create_unit = { division = "division_template = \"Lan Kir War-Banner\" start_equipment_factor = 1.2 start_experience_factor = 0.25" owner = ROOT count = 2 } }
-				1 = { }
-			}
+			create_unit = { division = "division_template = \"Lan Kir War-Banner\" start_equipment_factor = 1.2 start_experience_factor = 0.25" owner = ROOT count = 6 }
 			random_list = {
-				1 = { create_unit = { division = "division_template = \"Lan Kir War-Banner\" start_equipment_factor = 1.2 start_experience_factor = 0.25" owner = ROOT count = 2 } }
+				1 = { create_unit = { division = "division_template = \"Lan Kir War-Banner\" start_equipment_factor = 1.2 start_experience_factor = 0.25" owner = ROOT count = 3 } }
 				1 = { }
 			}
 			random_list = {
-				1 = { create_unit = { division = "division_template = \"Lan Kir War-Banner\" start_equipment_factor = 1.2 start_experience_factor = 0.25" owner = ROOT count = 2 } }
+				1 = { create_unit = { division = "division_template = \"Lan Kir War-Banner\" start_equipment_factor = 1.2 start_experience_factor = 0.25" owner = ROOT count = 3 } }
 				1 = { }
 			}
 			random_list = {
-				1 = { create_unit = { division = "division_template = \"Lan Kir War-Banner\" start_equipment_factor = 1.2 start_experience_factor = 0.25" owner = ROOT count = 2 } }
+				1 = { create_unit = { division = "division_template = \"Lan Kir War-Banner\" start_equipment_factor = 1.2 start_experience_factor = 0.25" owner = ROOT count = 3 } }
 				1 = { }
 			}
 			random_list = {
-				1 = { create_unit = { division = "division_template = \"Lan Kir War-Banner\" start_equipment_factor = 1.2 start_experience_factor = 0.25" owner = ROOT count = 2 } }
+				1 = { create_unit = { division = "division_template = \"Lan Kir War-Banner\" start_equipment_factor = 1.2 start_experience_factor = 0.25" owner = ROOT count = 3 } }
 				1 = { }
 			}
 			random_list = {
-				1 = { create_unit = { division = "division_template = \"Lan Kir War-Banner\" start_equipment_factor = 1.2 start_experience_factor = 0.25" owner = ROOT count = 2 } }
+				1 = { create_unit = { division = "division_template = \"Lan Kir War-Banner\" start_equipment_factor = 1.2 start_experience_factor = 0.25" owner = ROOT count = 3 } }
 				1 = { }
 			}
 			random_list = {
-				1 = { create_unit = { division = "division_template = \"Lan Kir War-Banner\" start_equipment_factor = 1.2 start_experience_factor = 0.25" owner = ROOT count = 2 } }
+				1 = { create_unit = { division = "division_template = \"Lan Kir War-Banner\" start_equipment_factor = 1.2 start_experience_factor = 0.25" owner = ROOT count = 3 } }
 				1 = { }
 			}
-			random_list = {
-				1 = { create_unit = { division = "division_template = \"Lan Kir War-Banner\" start_equipment_factor = 1.2 start_experience_factor = 0.25" owner = ROOT count = 2 } }
-				1 = { }
+			if = {
+				limit = {
+					OR = {
+						KIR = { is_ai = no }
+						KIS = { is_ai = no }
+						KIC = { is_ai = no }
+					}
+				}
+				random_list = {
+					1 = { create_unit = { division = "division_template = \"Lan Kir War-Banner\" start_equipment_factor = 1.2 start_experience_factor = 0.25" owner = ROOT count = 3 } }
+					1 = { }
+				}
+				random_list = {
+					1 = { create_unit = { division = "division_template = \"Lan Kir War-Banner\" start_equipment_factor = 1.2 start_experience_factor = 0.25" owner = ROOT count = 3 } }
+					1 = { }
+				}
+				random_list = {
+					1 = { create_unit = { division = "division_template = \"Lan Kir War-Banner\" start_equipment_factor = 1.2 start_experience_factor = 0.25" owner = ROOT count = 3 } }
+					1 = { }
+				}
 			}
 		}
 		set_division_template_lock = {
@@ -231,8 +273,26 @@ country_event = {
 						id = PREV
 						value = 1000
 					}
+					country_event = { id = lan_kir_placeholder.100 }
 				}
 			}
 		}
 	}
+}
+
+country_event = {
+	id = lan_kir_placeholder.100 ## Warning event
+	immediate = {log = "[GetDateText]: [Root.GetName]: event lan_kir_placeholder.100"}
+	title = lan_kir_placeholder.100.t
+	desc = lan_kir_placeholder.100.d
+	picture = GFX_event_KIR_trench
+	is_triggered_only = yes
+	
+	option = {
+		name = lan_kir_placeholder.100.a
+		add_war_support = 0.01
+		FROM = {
+			custom_effect_tooltip = lan_kir_placeholder_100_tt
+		}
+	}
 }
\ No newline at end of file
diff --git a/events/Longsword Events.txt b/events/Longsword Events.txt
index 93f1f20172e..aac74ba499b 100644
--- a/events/Longsword Events.txt	
+++ b/events/Longsword Events.txt	
@@ -5010,22 +5010,22 @@ country_event = { # Test event II: electric boogaloo
 				bar_leopold_clockwerk = { x = 0 y = 1 }
 				bar_leopold_clockwerk = { x = 0 y = 2 }
 				bar_leopold_clockwerk = { x = 0 y = 3 }
-				bar_leopold_clockwerk = { x = 0 y = 4 }
 				bar_leopold_clockwerk = { x = 1 y = 0 }
 				bar_leopold_clockwerk = { x = 1 y = 1 }
 				bar_leopold_clockwerk = { x = 1 y = 2 }
 				bar_leopold_clockwerk = { x = 1 y = 3 }
-				bar_leopold_clockwerk = { x = 1 y = 4 }
 				bar_leopold_clockwerk = { x = 2 y = 0 }
 				bar_leopold_clockwerk = { x = 2 y = 1 }
 				bar_leopold_clockwerk = { x = 2 y = 2 }
 				bar_leopold_clockwerk = { x = 2 y = 3 }
-				bar_leopold_clockwerk = { x = 2 y = 4 }
 				bar_leopold_clockwerk = { x = 3 y = 0 }
 				bar_leopold_clockwerk = { x = 3 y = 1 }
 				bar_leopold_clockwerk = { x = 3 y = 2 }
 				bar_leopold_clockwerk = { x = 3 y = 3 }
-				bar_leopold_clockwerk = { x = 3 y = 4 }
+				bar_leopold_clockwerk = { x = 4 y = 0 }
+				bar_leopold_clockwerk = { x = 4 y = 1 }
+				bar_leopold_clockwerk = { x = 4 y = 2 }
+				bar_leopold_clockwerk = { x = 4 y = 3 }
 			}
 			support = { 
 			} 
diff --git a/events/LosPegasusEvents.txt b/events/LosPegasusEvents.txt
index c6412304f5f..d066996cc50 100644
--- a/events/LosPegasusEvents.txt
+++ b/events/LosPegasusEvents.txt
@@ -2833,9 +2833,9 @@ country_event = {#LSP gets Jaegers
 					jager = { x = 0 y = 1 }
 					jager = { x = 0 y = 2 }
 					jager = { x = 0 y = 3 }
-					jager = { x = 0 y = 4 }
 					jager = { x = 1 y = 0 }
 					jager = { x = 1 y = 1 }
+					jager = { x = 1 y = 2 }
 				}
 				support = {
 					artillery = { x = 0 y = 0 }
diff --git a/events/MAN&ELF_1 Events.txt b/events/MAN&ELF_1 Events.txt
index b28347ddc74..3986f5d4ece 100644
--- a/events/MAN&ELF_1 Events.txt	
+++ b/events/MAN&ELF_1 Events.txt	
@@ -1710,11 +1710,37 @@ country_event = {
 		ai_chance = { factor = 0 }
 		add_political_power = -50
 		set_country_flag = MAN_unlocked_nidhogg_industries
-		custom_effect_tooltip = available_designer
-        show_ideas_tooltip = MAN_nidhogg_industries
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}    
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = MAN_nidhogg_industries_organization
+			mio:MAN_nidhogg_industries_organization = {
+				add_mio_size = 1
+				add_mio_funds = 400
+			}
+		}
+		else = {
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = MAN_nidhogg_industries
+		}
 		set_country_flag = MAN_unlocked_fillydelphia_motors
-		custom_effect_tooltip = available_designer
-        show_ideas_tooltip = MAN_fillydelphia_motors
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}    
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = MAN_fillydelphia_motors_organization
+			mio:MAN_fillydelphia_motors_organization = {
+				add_mio_size = 1
+				add_mio_funds = 400
+			}
+		}
+		else = {
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = MAN_fillydelphia_motors
+		}
 		hidden_effect = { 
 			news_event = { id = MAN_ELF.34 days = 50 }
 		}
diff --git a/events/MAN&ELF_2 Events.txt b/events/MAN&ELF_2 Events.txt
index 0e24c2fd1ea..489ddb6efe6 100644
--- a/events/MAN&ELF_2 Events.txt	
+++ b/events/MAN&ELF_2 Events.txt	
@@ -2503,7 +2503,7 @@ country_event = {
 					motorized = { x = 0 y = 1 }
 					motorized = { x = 0 y = 2 }
 					motorized = { x = 0 y = 3 }
-					motorized = { x = 0 y = 4 }
+					motorized = { x = 1 y = 0 }
 				}
 				support = {
 					engineer = { x = 0 y = 0 }
diff --git a/events/NCH_events.txt b/events/NCH_events.txt
index 8f3b5b623b3..9de07b246d6 100644
--- a/events/NCH_events.txt
+++ b/events/NCH_events.txt
@@ -2063,8 +2063,21 @@ country_event = { #Rifles accepted
 
 	option = {
 		name = greneclyf.83.a
-		custom_effect_tooltip = available_designer
-		show_ideas_tooltip = NCH_reichswaffen
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}    
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = NCH_reichswaffen_organization
+			mio:NCH_reichswaffen_organization = {
+				add_mio_size = 1
+				add_mio_funds = 200
+			}
+		}
+		else = {
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = NCH_reichswaffen
+		}
 		set_country_flag = NCH_griffon_rifles_flag
 	}
 }
@@ -2096,8 +2109,21 @@ country_event = { #Guns accepted
 
 	option = {
 		name = greneclyf.85.a
-		custom_effect_tooltip = available_designer
-		show_ideas_tooltip = NCH_greda
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}    
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = NCH_greda_organization
+			mio:NCH_greda_organization = {
+				add_mio_size = 1
+				add_mio_funds = 200
+			}
+		}
+		else = {
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = NCH_greda
+		}
 		set_country_flag = NCH_greda_flag
 	}
 }
diff --git a/events/NewLunarEmpire Events.txt b/events/NewLunarEmpire Events.txt
index eb89f296284..916bac2fc98 100644
--- a/events/NewLunarEmpire Events.txt	
+++ b/events/NewLunarEmpire Events.txt	
@@ -2290,14 +2290,41 @@ country_event = { #Fate Of The Industrialists
 		name = lunas.56.a
 		add_stability = -0.10
 		add_political_power = 50
-		custom_effect_tooltip = available_designer
-        show_ideas_tooltip = NLR_shoof
-		custom_effect_tooltip = available_designer
-        show_ideas_tooltip = NLR_northern
-		custom_effect_tooltip = available_designer
-        show_ideas_tooltip = NLR_ultramarine
-		custom_effect_tooltip = available_designer
-        show_ideas_tooltip = NLR_stratus
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}    
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = NLR_shoof_organization
+			mio:NLR_shoof_organization = {
+				add_mio_funds = 400
+			}
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = NLR_northern_organization
+			mio:NLR_northern_organization = {
+				add_mio_funds = 400
+			}
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = NLR_ultramarine_organization
+			mio:NLR_ultramarine_organization = {
+				add_mio_funds = 400
+			}
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = NLR_stratus_organization
+			mio:NLR_stratus_organization = {
+				add_mio_funds = 400
+			}
+		}
+		else = {
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = NLR_shoof
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = NLR_northern
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = NLR_ultramarine
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = NLR_stratus
+		}
 		hidden_effect = {
 		    set_country_flag = NLR_equestrian_companies
 		}
diff --git a/events/Olenia.txt b/events/Olenia.txt
index bcc47f1096b..885423b48a1 100644
--- a/events/Olenia.txt
+++ b/events/Olenia.txt
@@ -431,6 +431,16 @@ country_event = {
 				add_equipment_to_stockpile = {
 					type = infantry_equipment amount = 1000 producer = EQS
 				}
+				if = {
+					limit = {
+						has_dlc = "Arms Against Tyranny"
+					}
+					add_equipment_subsidy = {
+						cic = 500
+						equipment_type = infantry_equipment
+						seller_tags = { EQS CRY NLR VAN SCS LSP NMS CES JUN BAL TEM BUF }
+					}
+				}
 				division_template = {
 					name = "Olenian Volunteers"
 					division_names_group = OLE_INF_01
diff --git a/events/PolarBear.txt b/events/PolarBear.txt
index a5e302c8dab..f29e8d65137 100644
--- a/events/PolarBear.txt
+++ b/events/PolarBear.txt
@@ -1776,6 +1776,16 @@ country_event = { #sell the wastes to pengus
 		decrease_poverty = yes
 		add_manpower = 50000
 		add_equipment_to_stockpile = { type = infantry_equipment_0 amount = 500 producer = PNG }
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_equipment_subsidy = {
+				cic = 500
+				equipment_type = infantry_equipment
+				seller_tags = { YAK JAK GRF GFF PNG STG STL }
+			}
+		}
 		hidden_effect = { set_country_flag = PLB_lands_sold_flag 
 		PNG = {
 			unlock_national_focus = PNG_decolonize_the_east
diff --git a/events/PolarBear2.txt b/events/PolarBear2.txt
index c4d3dd3bb76..c96be0281e6 100644
--- a/events/PolarBear2.txt
+++ b/events/PolarBear2.txt
@@ -173,8 +173,21 @@ country_event = { ###The Owlbear project
 	is_triggered_only = yes
 	option = { #
 		name = northern_protectorate.2.a
-		custom_effect_tooltip = available_designer
-		show_ideas_tooltip = PLB_owlbear_drug_research
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}    
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = PLB_owlbear_drug_research_organization
+			mio:PLB_owlbear_drug_research_organization = {
+				add_mio_size = 1
+				add_mio_funds = 600
+			}
+		}
+		else = {
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = PLB_owlbear_drug_research
+		}
 	}
 }
 
@@ -305,8 +318,21 @@ country_event = { ### duplication research
 	is_triggered_only = yes
 	option = { #
 		name = northern_protectorate.10.a
-		custom_effect_tooltip = available_designer
-		show_ideas_tooltip = PLB_cloning_vats
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}    
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = PLB_cloning_vats_organization
+			mio:PLB_cloning_vats_organization = {
+				add_mio_size = 1
+				add_mio_funds = 800
+			}
+		}
+		else = {
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = PLB_cloning_vats
+		}
 	}
 }
 
diff --git a/events/Prywhen_Postwar_events.txt b/events/Prywhen_Postwar_events.txt
index f74fdb1adb0..98957375425 100644
--- a/events/Prywhen_Postwar_events.txt
+++ b/events/Prywhen_Postwar_events.txt
@@ -654,6 +654,16 @@ country_event = {
 			amount = 1000 
 			producer = STG
 		}
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_equipment_subsidy = {
+				cic = 500
+				equipment_type = infantry_equipment
+				seller_tags = { YAK JAK GRF GFF PNG STG STL }
+			}
+		}
 		if = { limit = { STG = { has_tech = advanced_infantry_weapons } }
 			STG = { create_production_license = { target = GRW cost_factor = 0 equipment = { type = infantry_equipment_3 } } }
 		}
diff --git a/events/RCT_events.txt b/events/RCT_events.txt
index c12bb1ab81d..879d6ebe3c0 100644
--- a/events/RCT_events.txt
+++ b/events/RCT_events.txt
@@ -2977,20 +2977,60 @@ country_event = {  #################### Asking Bak for marines
 
 	option = { #################### Yes
 		name = rivercity.35.a
-		add_tech_bonus = {
-			name = marine_bonus
-			bonus = 0.5
-			uses = 1
-			category = marine_tech
-			ahead_reduction = 2
-		}
-		FROM = {
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_doctrine_cost_reduction = {
+				name = special_forces_bonus
+				cost_reduction = 0.35
+				uses = 1
+				category = cat_marines_doctrine
+			}
 			add_tech_bonus = {
-				name = marine_bonus
-				bonus = 1.0
+				name = special_forces_bonus
+				bonus = 0.50
 				uses = 1
+				ahead_reduction = 2
 				category = marine_tech
+			}
+		}
+		else = {
+			add_tech_bonus = {
+				name = special_forces_bonus
+				bonus = 0.5
+				uses = 1
 				ahead_reduction = 2
+				category = marine_tech
+			}
+		}
+		FROM = {
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_doctrine_cost_reduction = {
+					name = special_forces_bonus
+					cost_reduction = 0.35
+					uses = 1
+					category = cat_marines_doctrine
+				}
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 0.50
+					uses = 1
+					ahead_reduction = 2
+					category = marine_tech
+				}
+			}
+			else = {
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 0.5
+					uses = 1
+					ahead_reduction = 2
+					category = marine_tech
+				}
 			}
 		}
 	}
diff --git a/events/Roam Placeholder Events.txt b/events/Roam Placeholder Events.txt
index a0c7542b625..39fff06ca7f 100644
--- a/events/Roam Placeholder Events.txt	
+++ b/events/Roam Placeholder Events.txt	
@@ -170,6 +170,7 @@ country_event = {
 						id = PREV
 						value = 1000
 					}
+					country_event = { id = roam_placeholder.100 }
 				}
 			}
 		}
@@ -233,6 +234,7 @@ country_event = {
 						id = PREV
 						value = 1000
 					}
+					country_event = { id = roam_placeholder.100 }
 				}
 			}
 		}
@@ -268,6 +270,7 @@ country_event = {
 	
 	option = {
 		name = roam_placeholder.3.a
+		set_country_flag = I_have_been_very_bad_KIR
 		effect_tooltip = {
 			create_wargoal = { type = annex_everything target = ZOO }
 		}
@@ -296,6 +299,7 @@ country_event = {
 						id = PREV
 						value = 1000
 					}
+					country_event = { id = roam_placeholder.100 }
 				}
 			}
 		}
@@ -334,6 +338,7 @@ country_event = {
 	
 	option = {
 		name = roam_placeholder.4.a
+		set_country_flag = I_have_been_very_bad_KIR
 		effect_tooltip = {
 			create_wargoal = { type = annex_everything target = TAI }
 			create_wargoal = { type = annex_everything target = MEL }
@@ -367,6 +372,7 @@ country_event = {
 						id = PREV
 						value = 1000
 					}
+					country_event = { id = roam_placeholder.100 }
 				}
 			}
 		}
@@ -405,6 +411,7 @@ country_event = {
 	
 	option = {
 		name = roam_placeholder.5.a
+		set_country_flag = I_have_been_very_bad_KIR
 		effect_tooltip = {
 			create_wargoal = { type = annex_everything target = IST }
 			create_wargoal = { type = annex_everything target = IDO }
@@ -438,12 +445,16 @@ country_event = {
 						id = PREV
 						value = 1000
 					}
+					country_event = { id = roam_placeholder.100 }
 				}
 			}
 			add_timed_idea = {
 				idea = temporary_supply_bonus
 				days = 365
 			}
+			hidden_effect = {
+				country_event = { id = roam_placeholder.200 days = 545 }
+			}
 		}
 	}
 }
@@ -476,8 +487,8 @@ country_event = {
 	}
 	
 	trigger = {
-		KIR = {
-			NOT = {
+		NOT = {
+			KIR = {
 				has_government = democratic
 				is_ai = no
 			} ## Only available if Kiria is NOT player-led. This is to avoid blocking off Kiria's "Far South Intervention" content in Talarayi for the player.
@@ -486,6 +497,7 @@ country_event = {
 	
 	option = {
 		name = roam_placeholder.6.a
+		set_country_flag = I_have_been_very_bad_KIR
 		effect_tooltip = {
 			create_wargoal = { type = annex_everything target = DEL }
 		}
@@ -514,8 +526,12 @@ country_event = {
 						id = PREV
 						value = 1000
 					}
+					country_event = { id = roam_placeholder.100 }
 				}
 			}
+			hidden_effect = {
+				country_event = { id = roam_placeholder.200 days = 545 }
+			}
 		}
 	}
 }
@@ -537,17 +553,6 @@ country_event = {
 		has_war = no
 		is_subject = no
 		date > 1012.01.01
-		OR = { ## Check that Kiria has not successfully completed the Grand Gallop Onwards
-			KIR = {
-				has_country_flag = KIR_bipartite_war_started_flag
-			}
-			KIS = {
-				has_country_flag = KIR_bipartite_war_started_flag
-			}
-			KIC = {
-				has_country_flag = KIR_bipartite_war_started_flag
-			}
-		}
 		any_controlled_state = {
 			any_neighbor_state = {
 				OR = {
@@ -602,8 +607,86 @@ country_event = {
 						id = PREV
 						value = 1000
 					}
+					country_event = { id = roam_placeholder.100 }
+				}
+			}
+		}
+	}
+}
+
+country_event = {
+	id = roam_placeholder.100 ## Warning event
+	immediate = {log = "[GetDateText]: [Root.GetName]: event roam_placeholder.100"}
+	title = roam_placeholder.100.t
+	desc = roam_placeholder.100.d
+	picture = GFX_event_KIR_trench
+	is_triggered_only = yes
+	
+	option = {
+		name = roam_placeholder.100.a
+		add_war_support = 0.01
+		FROM = {
+			custom_effect_tooltip = roam_placeholder_100_tt
+		}
+	}
+}
+
+country_event = {
+	id = roam_placeholder.200
+	immediate = {log = "[GetDateText]: [Root.GetName]: event roam_placeholder.200"}
+	is_triggered_only = yes
+	hidden = yes
+	trigger = {
+		is_ai = yes
+		OR = {
+			has_war_with = IST
+			has_war_with = IDO
+			has_war_with = DEL
+		}
+	}
+	
+	option = {
+		if = {
+			limit = {
+				has_war_with = IST
+			}
+			every_controlled_state = {
+				limit = {
+					is_core_of = IST
+					is_owned_by = IST
+				}
+				transfer_state_to = ROOT
+			}
+			set_country_flag = { flag = bypass_on_peaceconference_ended days = 1 value = 1 }
+			white_peace = IST
+		}
+		if = {
+			limit = {
+				has_war_with = IDO
+			}
+			every_controlled_state = {
+				limit = {
+					is_core_of = IDO
+					is_owned_by = IDO
+				}
+				transfer_state_to = ROOT
+			}
+			set_country_flag = { flag = bypass_on_peaceconference_ended days = 1 value = 1 }
+			white_peace = IDO
+		}
+		if = {
+			limit = {
+				has_war_with = DEL
+			}
+			every_controlled_state = {
+				limit = {
+					is_core_of = DEL
+					is_owned_by = DEL
 				}
+				transfer_state_to = ROOT
 			}
+			set_country_flag = { flag = bypass_on_peaceconference_ended days = 1 value = 1 }
+			white_peace = DEL
 		}
 	}
 }
\ No newline at end of file
diff --git a/events/SCS.txt b/events/SCS.txt
index 385dfdc1a71..abe8897f7a4 100644
--- a/events/SCS.txt
+++ b/events/SCS.txt
@@ -692,7 +692,7 @@ country_event = {
 			set_cosmetic_tag = SCS_royalist
 		}
 		add_country_leader_role = {
-			character = SCS_braeburn
+			character = EQS_braeburn
 			promote_leader = yes
 
 			country_leader = {
diff --git a/events/Sicameon.txt b/events/Sicameon.txt
index ce0c9b3961a..33ff622c2fe 100644
--- a/events/Sicameon.txt
+++ b/events/Sicameon.txt
@@ -2870,24 +2870,14 @@ country_event = { ##MIT investment made Eritonaval grow
 	
 	is_triggered_only = yes
 	
-	fire_only_once = yes
 	option = {
 		name = sicameon.77.a
-			if = {
-				limit = { 
-					OR = {
-						has_country_flag = SIC_MIT_eritonaval_lvl4
-						has_country_flag = SIC_MIT_eritonaval_lvl8
-						has_country_flag = SIC_MIT_eritonaval_lvl10
-						}
-					}
-					add_offsite_building = {
-						type = dockyard
-						level = 1
-					}
-				}
-			}
-		}
+		add_offsite_building = {
+			type = dockyard
+			level = 1
+		}	
+	}
+}
 country_event = { ##MIT investment made the Nacional de Electricidad grow
 	id = sicameon.78
 	immediate = {log = "[GetDateText]: [Root.GetName]: event sicameon.78"}
diff --git a/events/Socialist Republic of Skynavia.txt b/events/Socialist Republic of Skynavia.txt
index c130e2badf8..1a99fab9392 100644
--- a/events/Socialist Republic of Skynavia.txt	
+++ b/events/Socialist Republic of Skynavia.txt	
@@ -1623,6 +1623,7 @@ country_event = {
 			attack_skill = 2
 			defense_skill = 3
 			planning_skill = 3
+			logistics_skill = 2
 		} custom_effect_tooltip = mikhail_beakunin_stats_tp
 	}
 }
diff --git a/events/Strawberry.txt b/events/Strawberry.txt
index eaedd8a9e50..79600f8ef52 100644
--- a/events/Strawberry.txt
+++ b/events/Strawberry.txt
@@ -983,6 +983,16 @@ country_event = { # Gather arms by any means neccesary
 			amount = 1000
 			producer = GRI
 		}
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_equipment_subsidy = {
+				cic = 500
+				equipment_type = infantry_equipment
+				seller_tags = { GRI ANG FEA BRZ PYT YAL KAT ROU }
+			}
+		}
 	}
 	option = { # Well organise some raids on GRI stockpiles
 		name = strawberry.22.b
diff --git a/events/Tobuck Events.txt b/events/Tobuck Events.txt
index 010f4280af1..2f804e58beb 100644
--- a/events/Tobuck Events.txt	
+++ b/events/Tobuck Events.txt	
@@ -3237,7 +3237,7 @@ country_event = { ### Wallnut victory event
 			}
 			set_country_leader_description = {
 				ideology = fascism
-				name = wallnut_post_desc
+				desc = wallnut_post_desc
 			}
 			load_focus_tree = {
 				tree = tobuck_wallnut
@@ -6336,7 +6336,7 @@ country_event = { ### event All Hail To the King
 		}
 		set_country_leader_description = {
 			ideology = fascism
-			name = baragzen_post_desc
+			desc = baragzen_post_desc
 		}
 		set_country_leader_ideology = rexism
 		set_party_name = {
@@ -8388,11 +8388,30 @@ country_event = { ### Matanzal - first bonus event
 	option = { ## Matanzal is facinated about the Oath Wardens as a kid
 		name = tobuck_baragzen_heir.10.b
 		effect_tooltip = {
-			add_tech_bonus = {
-				name = special_forces_bonus
-				bonus = 1.5
-				uses = 2
-				category = special_forces_tech
+			if = {
+				limit = {
+					has_dlc = "Arms Against Tyranny"
+				}
+				add_doctrine_cost_reduction = {
+					name = special_forces_bonus
+					cost_reduction = 0.50
+					uses = 2
+					category = special_forces_doctrine
+				}
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 0.75
+					uses = 2
+					category = special_forces_tech
+				}
+			}
+			else = {
+				add_tech_bonus = {
+					name = special_forces_bonus
+					bonus = 1.5
+					uses = 2
+					category = special_forces_tech
+				}
 			}
 		}
 		set_country_flag = TBK_matanzal_first_bonus_two
@@ -9143,7 +9162,7 @@ country_event = { ### focus Nightmare Save the Tsaritsa!
 			set_country_leader_ideology = nazism
 			set_country_leader_description = {
 				ideology = fascism
-				name = alesia_post_desc
+				desc = alesia_post_desc
 			}
 		}
 		remove_country_leader_trait = TBK_exiled_officer
diff --git a/events/Trotkart Events.txt b/events/Trotkart Events.txt
index 484153d1507..ad7d4e9504a 100644
--- a/events/Trotkart Events.txt	
+++ b/events/Trotkart Events.txt	
@@ -232,7 +232,7 @@ country_event = { #TODO - Zarza has won the war... Congrats I guess
 			}
 			set_country_leader_description = {
 				ideology = neutrality
-				desc = "TRO_CTH_BATNOAM_ZARZA_2_DESC"
+				desc = TRO_CTH_BATNOAM_ZARZA_2_DESC
 			}
 			remove_country_leader_trait = TRO_CTH_horrible_general
 			CTH_batnoam_zarza = {
diff --git a/events/Wingbardy.txt b/events/Wingbardy.txt
index 2c5f9814d4b..43943aa0c63 100644
--- a/events/Wingbardy.txt
+++ b/events/Wingbardy.txt
@@ -3520,6 +3520,26 @@ country_event = { # Weapons Arrive
 			amount = 25
 			producer = STG
 		}
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}
+			add_equipment_subsidy = {
+				cic = 250
+				equipment_type = infantry_equipment
+				seller_trigger = is_communist_seller_trigger
+			}
+			add_equipment_subsidy = {
+				cic = 250
+				equipment_type = support_equipment
+				seller_trigger = is_communist_seller_trigger
+			}
+			add_equipment_subsidy = {
+				cic = 250
+				equipment_type = artillery_equipment_1
+				seller_trigger = is_communist_seller_trigger
+			}
+		}
 	}
 }
 country_event = { # Which Alliance Shall we choose?
diff --git a/events/Winggarden Events.txt b/events/Winggarden Events.txt
index 59f27704779..a71c2825cec 100644
--- a/events/Winggarden Events.txt	
+++ b/events/Winggarden Events.txt	
@@ -2052,10 +2052,39 @@ country_event = { #Coffee Bean Meets With The Representatives of Vespidae, Krahe
 
 	option = {
 		name = legation.71.a
-		custom_effect_tooltip = available_designer
-		show_ideas_tooltip = WIN_cockatoo_2
-		custom_effect_tooltip = available_designer
-		show_ideas_tooltip = WIN_vespidae_2
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}    
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = WIN_cockatoo_2_organization
+			mio:WIN_cockatoo_2_organization = {
+				add_mio_size = 1
+				add_mio_funds = 200
+			}
+			1204 = {
+				add_resource = {
+					type = aluminium
+					amount = 28
+				}
+				add_resource = {
+					type = oil
+					amount = 28
+				}
+			}
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = WIN_vespidae_2_organization
+			mio:WIN_vespidae_2_organization = {
+				add_mio_size = 1
+				add_mio_funds = 200
+			}
+		}
+		else = {
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = WIN_cockatoo_2
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = WIN_vespidae_2
+		}
 		custom_effect_tooltip = available_designer
 		show_ideas_tooltip = WIN_crow_2
 	}
@@ -2120,10 +2149,29 @@ country_event = { #Coffee Bean Meets With The Representatives of Mustang and Das
 
 	option = {
 		name = legation.75.a
-		custom_effect_tooltip = available_designer
-		show_ideas_tooltip = WIN_mustang_2
-		custom_effect_tooltip = available_designer
-		show_ideas_tooltip = WIN_dassault_2
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}    
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = WIN_mustang_2_organization
+			mio:WIN_mustang_2_organization = {
+				add_mio_size = 1
+				add_mio_funds = 400
+			}
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = WIN_dassault_2_organization
+			mio:WIN_dassault_2_organization = {
+				add_mio_size = 1
+				add_mio_funds = 400
+			}
+		}
+		else = {
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = WIN_mustang_2
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = WIN_dassault_2
+		}
 	}
 }
 
diff --git a/events/Wittenland.txt b/events/Wittenland.txt
index dcc082b4e70..896410b857a 100644
--- a/events/Wittenland.txt
+++ b/events/Wittenland.txt
@@ -358,8 +358,21 @@ country_event = { #Magic Tank
 				tech_griffon_army_def_a = 1
 			}
 		}
-		custom_effect_tooltip = available_designer
-		show_ideas_tooltip = WIT_Magic_Tank_Concern
+		if = {
+			limit = {
+				has_dlc = "Arms Against Tyranny"
+			}    
+			custom_effect_tooltip = available_mio_tt
+			show_mio_tooltip = WIT_Magic_Tank_Concern_organization
+			mio:WIT_Magic_Tank_Concern_organization = {
+				add_mio_size = 1
+				add_mio_funds = 600
+			}
+		}
+		else = {
+			custom_effect_tooltip = available_designer
+			show_ideas_tooltip = WIT_Magic_Tank_Concern
+		}
 		set_country_flag = WIT_Tank_Concern_Unlocked_Flag
 	}
 }
diff --git a/events/Zarantia.txt b/events/Zarantia.txt
index d22076bc362..4a17ef81c5e 100644
--- a/events/Zarantia.txt
+++ b/events/Zarantia.txt
@@ -3379,7 +3379,7 @@ country_event = {  #
 					original_tag = ZAR
 					has_government = communism
 				}
-				add_ideas = low_economic_mobilization
+				add_ideas = low_economic_mobilisation
 				load_focus_tree = { tree = ZAR_socialist keep_completed = yes } 
 				set_politics = {
 					ruling_party = communism
@@ -3413,7 +3413,7 @@ country_event = {  #
 					original_tag = ZAR
 					has_government = communism
 				}
-				add_ideas = low_economic_mobilization
+				add_ideas = low_economic_mobilisation
 				load_focus_tree = { tree = ZAR_socialist keep_completed = yes } 
 				set_politics = {
 					ruling_party = communism
diff --git a/gfx/flags/DEL.tga b/gfx/flags/DEL.tga
index 6127456e00e..acc3abbd4ae 100644
Binary files a/gfx/flags/DEL.tga and b/gfx/flags/DEL.tga differ
diff --git a/gfx/flags/medium/DEL.tga b/gfx/flags/medium/DEL.tga
index 3afc8023fe0..84022df5040 100644
Binary files a/gfx/flags/medium/DEL.tga and b/gfx/flags/medium/DEL.tga differ
diff --git a/gfx/flags/small/DEL.tga b/gfx/flags/small/DEL.tga
index 50d1a2f0097..751731b027b 100644
Binary files a/gfx/flags/small/DEL.tga and b/gfx/flags/small/DEL.tga differ
diff --git a/gfx/interface/alerts/global_alert_icons.dds b/gfx/interface/alerts/global_alert_icons.dds
index 26d695980ec..0bdbb662b24 100644
Binary files a/gfx/interface/alerts/global_alert_icons.dds and b/gfx/interface/alerts/global_alert_icons.dds differ
diff --git a/gfx/interface/alerts/global_alert_icons_no_backgrounds.dds b/gfx/interface/alerts/global_alert_icons_no_backgrounds.dds
index 2d19a4e9b3d..54d0f69d0a2 100644
Binary files a/gfx/interface/alerts/global_alert_icons_no_backgrounds.dds and b/gfx/interface/alerts/global_alert_icons_no_backgrounds.dds differ
diff --git a/gfx/interface/alerts/global_diplorequest_icons.dds b/gfx/interface/alerts/global_diplorequest_icons.dds
index e89e93de6c5..8e76cecaf7b 100644
Binary files a/gfx/interface/alerts/global_diplorequest_icons.dds and b/gfx/interface/alerts/global_diplorequest_icons.dds differ
diff --git a/gfx/interface/equipmentdesigner/planes/modules/airplane_cannon_turret_1_icon.dds b/gfx/interface/equipmentdesigner/planes/modules/airplane_cannon_turret_1_icon.dds
new file mode 100644
index 00000000000..b3a395646a5
Binary files /dev/null and b/gfx/interface/equipmentdesigner/planes/modules/airplane_cannon_turret_1_icon.dds differ
diff --git a/gfx/interface/equipmentdesigner/planes/modules/airplane_cannon_turret_2_icon.dds b/gfx/interface/equipmentdesigner/planes/modules/airplane_cannon_turret_2_icon.dds
new file mode 100644
index 00000000000..f01be8f8361
Binary files /dev/null and b/gfx/interface/equipmentdesigner/planes/modules/airplane_cannon_turret_2_icon.dds differ
diff --git a/gfx/interface/equipmentdesigner/planes/modules/airplane_modern_cannon_turret_1_icon.dds b/gfx/interface/equipmentdesigner/planes/modules/airplane_modern_cannon_turret_1_icon.dds
new file mode 100644
index 00000000000..9fcc6d04e72
Binary files /dev/null and b/gfx/interface/equipmentdesigner/planes/modules/airplane_modern_cannon_turret_1_icon.dds differ
diff --git a/gfx/interface/equipmentdesigner/planes/modules/airplane_modern_cannon_turret_2_icon.dds b/gfx/interface/equipmentdesigner/planes/modules/airplane_modern_cannon_turret_2_icon.dds
new file mode 100644
index 00000000000..d5dcdb91180
Binary files /dev/null and b/gfx/interface/equipmentdesigner/planes/modules/airplane_modern_cannon_turret_2_icon.dds differ
diff --git a/gfx/interface/equipmentdesigner/planes/modules/airplane_torpedo_4_icon.dds b/gfx/interface/equipmentdesigner/planes/modules/airplane_torpedo_4_icon.dds
new file mode 100644
index 00000000000..942a2a1e0fc
Binary files /dev/null and b/gfx/interface/equipmentdesigner/planes/modules/airplane_torpedo_4_icon.dds differ
diff --git a/gfx/interface/equipmentdesigner/tanks/modules/tank_module_heavy_aa_gun.dds b/gfx/interface/equipmentdesigner/tanks/modules/tank_module_heavy_aa_gun.dds
new file mode 100644
index 00000000000..9493ec16e55
Binary files /dev/null and b/gfx/interface/equipmentdesigner/tanks/modules/tank_module_heavy_aa_gun.dds differ
diff --git a/gfx/interface/equipmentdesigner/tanks/modules/tank_module_heavy_aa_gun_2.dds b/gfx/interface/equipmentdesigner/tanks/modules/tank_module_heavy_aa_gun_2.dds
new file mode 100644
index 00000000000..2980da9c9ff
Binary files /dev/null and b/gfx/interface/equipmentdesigner/tanks/modules/tank_module_heavy_aa_gun_2.dds differ
diff --git a/gfx/interface/equipmentdesigner/tanks/modules/tank_module_heavy_aa_gun_3.dds b/gfx/interface/equipmentdesigner/tanks/modules/tank_module_heavy_aa_gun_3.dds
new file mode 100644
index 00000000000..29151443af8
Binary files /dev/null and b/gfx/interface/equipmentdesigner/tanks/modules/tank_module_heavy_aa_gun_3.dds differ
diff --git a/gfx/interface/equipmentdesigner/tanks/modules/tank_module_heavy_aa_gun_4.dds b/gfx/interface/equipmentdesigner/tanks/modules/tank_module_heavy_aa_gun_4.dds
new file mode 100644
index 00000000000..fa20b687b9e
Binary files /dev/null and b/gfx/interface/equipmentdesigner/tanks/modules/tank_module_heavy_aa_gun_4.dds differ
diff --git a/gfx/interface/equipmentdesigner/tanks/modules/tank_module_heavy_aa_gun_5.dds b/gfx/interface/equipmentdesigner/tanks/modules/tank_module_heavy_aa_gun_5.dds
new file mode 100644
index 00000000000..6e49c426f5d
Binary files /dev/null and b/gfx/interface/equipmentdesigner/tanks/modules/tank_module_heavy_aa_gun_5.dds differ
diff --git a/gfx/interface/event_report_bottom_win.dds b/gfx/interface/event_report_bottom_win.dds
index 305bb8e0fae..eb7c6753ead 100644
Binary files a/gfx/interface/event_report_bottom_win.dds and b/gfx/interface/event_report_bottom_win.dds differ
diff --git a/gfx/interface/event_report_tileable_midsection.dds b/gfx/interface/event_report_tileable_midsection.dds
index 8d62df6101b..418279e6d3d 100644
Binary files a/gfx/interface/event_report_tileable_midsection.dds and b/gfx/interface/event_report_tileable_midsection.dds differ
diff --git a/gfx/interface/event_report_top_win.dds b/gfx/interface/event_report_top_win.dds
index 86dc7360a41..c07034a88a4 100644
Binary files a/gfx/interface/event_report_top_win.dds and b/gfx/interface/event_report_top_win.dds differ
diff --git a/gfx/interface/goals/KIR/KIR_bannerkirin.tga b/gfx/interface/goals/KIR/KIR_bannerkirin.tga
new file mode 100644
index 00000000000..b7c320d1ea2
Binary files /dev/null and b/gfx/interface/goals/KIR/KIR_bannerkirin.tga differ
diff --git a/gfx/interface/ideas/Advisors/HIP/HIP_arcus_flamefeather.tga b/gfx/interface/ideas/Advisors/HIP/HIP_arcus_flamefeather.tga
index 5109c084947..3b5cb5cdfae 100644
Binary files a/gfx/interface/ideas/Advisors/HIP/HIP_arcus_flamefeather.tga and b/gfx/interface/ideas/Advisors/HIP/HIP_arcus_flamefeather.tga differ
diff --git a/gfx/interface/ideas/Advisors/HIP/HIP_arden_ironquill.tga b/gfx/interface/ideas/Advisors/HIP/HIP_arden_ironquill.tga
new file mode 100644
index 00000000000..e7e1769dde3
Binary files /dev/null and b/gfx/interface/ideas/Advisors/HIP/HIP_arden_ironquill.tga differ
diff --git a/gfx/interface/ideas/Advisors/HIP/HIP_ulyssess.tga b/gfx/interface/ideas/Advisors/HIP/HIP_ulyssess.tga
new file mode 100644
index 00000000000..95c6117d714
Binary files /dev/null and b/gfx/interface/ideas/Advisors/HIP/HIP_ulyssess.tga differ
diff --git a/gfx/interface/ideas/Advisors/MGY/MGY_annu.tga b/gfx/interface/ideas/Advisors/MGY/MGY_annu.tga
new file mode 100644
index 00000000000..035e610c065
Binary files /dev/null and b/gfx/interface/ideas/Advisors/MGY/MGY_annu.tga differ
diff --git a/gfx/interface/ideas/Advisors/MGY/MGY_violetta_locifer.tga b/gfx/interface/ideas/Advisors/MGY/MGY_violetta_locifer.tga
new file mode 100644
index 00000000000..4d0ecac6f37
Binary files /dev/null and b/gfx/interface/ideas/Advisors/MGY/MGY_violetta_locifer.tga differ
diff --git a/gfx/interface/ideas/KIR/KIR_idea_fiery_azalea.tga b/gfx/interface/ideas/KIR/KIR_idea_fiery_azalea.tga
index 3d2e081c0f6..f5fc4a9ba33 100644
Binary files a/gfx/interface/ideas/KIR/KIR_idea_fiery_azalea.tga and b/gfx/interface/ideas/KIR/KIR_idea_fiery_azalea.tga differ
diff --git a/gfx/interface/ideas/generic_generals_small/idea_FAT_generic_land_female_1.tga b/gfx/interface/ideas/generic_generals_small/idea_FAT_generic_land_female_1.tga
new file mode 100644
index 00000000000..fc8373960e0
Binary files /dev/null and b/gfx/interface/ideas/generic_generals_small/idea_FAT_generic_land_female_1.tga differ
diff --git a/gfx/interface/ideas/generic_generals_small/idea_FAT_generic_land_female_10.tga b/gfx/interface/ideas/generic_generals_small/idea_FAT_generic_land_female_10.tga
new file mode 100644
index 00000000000..0949aa6818a
Binary files /dev/null and b/gfx/interface/ideas/generic_generals_small/idea_FAT_generic_land_female_10.tga differ
diff --git a/gfx/interface/ideas/generic_generals_small/idea_FAT_generic_land_female_11.tga b/gfx/interface/ideas/generic_generals_small/idea_FAT_generic_land_female_11.tga
new file mode 100644
index 00000000000..4bcae3aa739
Binary files /dev/null and b/gfx/interface/ideas/generic_generals_small/idea_FAT_generic_land_female_11.tga differ
diff --git a/gfx/interface/ideas/generic_generals_small/idea_FAT_generic_land_female_12.tga b/gfx/interface/ideas/generic_generals_small/idea_FAT_generic_land_female_12.tga
new file mode 100644
index 00000000000..ded68225cfd
Binary files /dev/null and b/gfx/interface/ideas/generic_generals_small/idea_FAT_generic_land_female_12.tga differ
diff --git a/gfx/interface/ideas/generic_generals_small/idea_FAT_generic_land_female_2.tga b/gfx/interface/ideas/generic_generals_small/idea_FAT_generic_land_female_2.tga
new file mode 100644
index 00000000000..51bee07aa28
Binary files /dev/null and b/gfx/interface/ideas/generic_generals_small/idea_FAT_generic_land_female_2.tga differ
diff --git a/gfx/interface/ideas/generic_generals_small/idea_FAT_generic_land_female_3.tga b/gfx/interface/ideas/generic_generals_small/idea_FAT_generic_land_female_3.tga
new file mode 100644
index 00000000000..fe588a2afa2
Binary files /dev/null and b/gfx/interface/ideas/generic_generals_small/idea_FAT_generic_land_female_3.tga differ
diff --git a/gfx/interface/ideas/generic_generals_small/idea_FAT_generic_land_female_4.tga b/gfx/interface/ideas/generic_generals_small/idea_FAT_generic_land_female_4.tga
new file mode 100644
index 00000000000..b7ce7e9b8fc
Binary files /dev/null and b/gfx/interface/ideas/generic_generals_small/idea_FAT_generic_land_female_4.tga differ
diff --git a/gfx/interface/ideas/generic_generals_small/idea_FAT_generic_land_female_5.tga b/gfx/interface/ideas/generic_generals_small/idea_FAT_generic_land_female_5.tga
new file mode 100644
index 00000000000..5b09f04c911
Binary files /dev/null and b/gfx/interface/ideas/generic_generals_small/idea_FAT_generic_land_female_5.tga differ
diff --git a/gfx/interface/ideas/generic_generals_small/idea_FAT_generic_land_female_6.tga b/gfx/interface/ideas/generic_generals_small/idea_FAT_generic_land_female_6.tga
new file mode 100644
index 00000000000..687de852759
Binary files /dev/null and b/gfx/interface/ideas/generic_generals_small/idea_FAT_generic_land_female_6.tga differ
diff --git a/gfx/interface/ideas/generic_generals_small/idea_FAT_generic_land_female_7.tga b/gfx/interface/ideas/generic_generals_small/idea_FAT_generic_land_female_7.tga
new file mode 100644
index 00000000000..f3ac9292b45
Binary files /dev/null and b/gfx/interface/ideas/generic_generals_small/idea_FAT_generic_land_female_7.tga differ
diff --git a/gfx/interface/ideas/generic_generals_small/idea_FAT_generic_land_female_8.tga b/gfx/interface/ideas/generic_generals_small/idea_FAT_generic_land_female_8.tga
new file mode 100644
index 00000000000..3f972a0de92
Binary files /dev/null and b/gfx/interface/ideas/generic_generals_small/idea_FAT_generic_land_female_8.tga differ
diff --git a/gfx/interface/ideas/generic_generals_small/idea_FAT_generic_land_female_9.tga b/gfx/interface/ideas/generic_generals_small/idea_FAT_generic_land_female_9.tga
new file mode 100644
index 00000000000..1a1f2785321
Binary files /dev/null and b/gfx/interface/ideas/generic_generals_small/idea_FAT_generic_land_female_9.tga differ
diff --git a/gfx/interface/international_market/equipment_on_market.dds b/gfx/interface/international_market/equipment_on_market.dds
new file mode 100644
index 00000000000..1b2b8c5cf79
Binary files /dev/null and b/gfx/interface/international_market/equipment_on_market.dds differ
diff --git a/gfx/interface/international_market/sort_amount.dds b/gfx/interface/international_market/sort_amount.dds
new file mode 100644
index 00000000000..30805cf7402
Binary files /dev/null and b/gfx/interface/international_market/sort_amount.dds differ
diff --git a/gfx/interface/logo_game_version.dds b/gfx/interface/logo_game_version.dds
index 12e55ea98be..5fe8b53f8a3 100644
Binary files a/gfx/interface/logo_game_version.dds and b/gfx/interface/logo_game_version.dds differ
diff --git a/gfx/interface/military_industrial_organization/department_icons/generic_mio_department_icon_amphibious_tank.dds b/gfx/interface/military_industrial_organization/department_icons/generic_mio_department_icon_amphibious_tank.dds
new file mode 100644
index 00000000000..449f20b1dea
Binary files /dev/null and b/gfx/interface/military_industrial_organization/department_icons/generic_mio_department_icon_amphibious_tank.dds differ
diff --git a/gfx/interface/military_industrial_organization/department_icons/generic_mio_department_icon_infantry_magical.dds b/gfx/interface/military_industrial_organization/department_icons/generic_mio_department_icon_infantry_magical.dds
new file mode 100644
index 00000000000..ca92c4fcb87
Binary files /dev/null and b/gfx/interface/military_industrial_organization/department_icons/generic_mio_department_icon_infantry_magical.dds differ
diff --git a/gfx/interface/military_industrial_organization/department_icons/generic_mio_department_icon_modern_tank.dds b/gfx/interface/military_industrial_organization/department_icons/generic_mio_department_icon_modern_tank.dds
new file mode 100644
index 00000000000..b9c547bb4e5
Binary files /dev/null and b/gfx/interface/military_industrial_organization/department_icons/generic_mio_department_icon_modern_tank.dds differ
diff --git a/gfx/interface/military_industrial_organization/department_icons/generic_mio_department_icon_super_heavy_tank.dds b/gfx/interface/military_industrial_organization/department_icons/generic_mio_department_icon_super_heavy_tank.dds
new file mode 100644
index 00000000000..0ba37e803b4
Binary files /dev/null and b/gfx/interface/military_industrial_organization/department_icons/generic_mio_department_icon_super_heavy_tank.dds differ
diff --git a/gfx/interface/military_industrial_organization/material_mio_roster.dds b/gfx/interface/military_industrial_organization/material_mio_roster.dds
new file mode 100644
index 00000000000..d9ad86bb361
Binary files /dev/null and b/gfx/interface/military_industrial_organization/material_mio_roster.dds differ
diff --git a/gfx/interface/military_industrial_organization/mio_details_background.dds b/gfx/interface/military_industrial_organization/mio_details_background.dds
new file mode 100644
index 00000000000..423d42a441d
Binary files /dev/null and b/gfx/interface/military_industrial_organization/mio_details_background.dds differ
diff --git a/gfx/interface/military_industrial_organization/policy_icons/mio_policy_experimental_development_teams.dds b/gfx/interface/military_industrial_organization/policy_icons/mio_policy_experimental_development_teams.dds
new file mode 100644
index 00000000000..cef4a7bdef1
Binary files /dev/null and b/gfx/interface/military_industrial_organization/policy_icons/mio_policy_experimental_development_teams.dds differ
diff --git a/gfx/interface/military_industrial_organization/policy_icons/mio_policy_mechanical_genius.dds b/gfx/interface/military_industrial_organization/policy_icons/mio_policy_mechanical_genius.dds
new file mode 100644
index 00000000000..b9cd557804a
Binary files /dev/null and b/gfx/interface/military_industrial_organization/policy_icons/mio_policy_mechanical_genius.dds differ
diff --git a/gfx/interface/military_industrial_organization/policy_icons/mio_policy_welding_specialists.dds b/gfx/interface/military_industrial_organization/policy_icons/mio_policy_welding_specialists.dds
new file mode 100644
index 00000000000..39d9fcd8c5c
Binary files /dev/null and b/gfx/interface/military_industrial_organization/policy_icons/mio_policy_welding_specialists.dds differ
diff --git a/gfx/interface/officer_corp/special_forces/doctrine_special_forces_marine_bg.dds b/gfx/interface/officer_corp/special_forces/doctrine_special_forces_marine_bg.dds
new file mode 100644
index 00000000000..db60101ccd2
Binary files /dev/null and b/gfx/interface/officer_corp/special_forces/doctrine_special_forces_marine_bg.dds differ
diff --git a/gfx/interface/officer_corp/special_forces/doctrine_special_forces_mountaineers_bg.dds b/gfx/interface/officer_corp/special_forces/doctrine_special_forces_mountaineers_bg.dds
new file mode 100644
index 00000000000..fb28d0fa5e7
Binary files /dev/null and b/gfx/interface/officer_corp/special_forces/doctrine_special_forces_mountaineers_bg.dds differ
diff --git a/gfx/interface/officer_corp/special_forces/doctrine_special_forces_paratroopers_bg.dds b/gfx/interface/officer_corp/special_forces/doctrine_special_forces_paratroopers_bg.dds
new file mode 100644
index 00000000000..fc2479e130a
Binary files /dev/null and b/gfx/interface/officer_corp/special_forces/doctrine_special_forces_paratroopers_bg.dds differ
diff --git a/gfx/interface/officer_corp/special_forces/doctrine_special_forces_racial_bg.dds b/gfx/interface/officer_corp/special_forces/doctrine_special_forces_racial_bg.dds
new file mode 100644
index 00000000000..3411c81e0c7
Binary files /dev/null and b/gfx/interface/officer_corp/special_forces/doctrine_special_forces_racial_bg.dds differ
diff --git a/gfx/interface/relations/market_access_rights_relation.dds b/gfx/interface/relations/market_access_rights_relation.dds
new file mode 100644
index 00000000000..c240f3ec1ca
Binary files /dev/null and b/gfx/interface/relations/market_access_rights_relation.dds differ
diff --git a/gfx/interface/technologies/bba_tech_air_torpedoe_2.dds b/gfx/interface/technologies/bba_tech_air_torpedoe_2.dds
new file mode 100644
index 00000000000..ef5aa5455a9
Binary files /dev/null and b/gfx/interface/technologies/bba_tech_air_torpedoe_2.dds differ
diff --git a/gfx/interface/technologies/marines_commandoes_mechanised_medium.dds b/gfx/interface/technologies/marines_commandoes_mechanised_medium.dds
new file mode 100644
index 00000000000..2c04085aecd
Binary files /dev/null and b/gfx/interface/technologies/marines_commandoes_mechanised_medium.dds differ
diff --git a/gfx/interface/technologies/marines_commandoes_medium.dds b/gfx/interface/technologies/marines_commandoes_medium.dds
new file mode 100644
index 00000000000..fdd72eb8067
Binary files /dev/null and b/gfx/interface/technologies/marines_commandoes_medium.dds differ
diff --git a/gfx/interface/technologies/marines_commandos_demolition_medium.dds b/gfx/interface/technologies/marines_commandos_demolition_medium.dds
new file mode 100644
index 00000000000..fb5d34a1d51
Binary files /dev/null and b/gfx/interface/technologies/marines_commandos_demolition_medium.dds differ
diff --git a/gfx/interface/technologies/marines_expeditionary_blowtorch_medium.dds b/gfx/interface/technologies/marines_expeditionary_blowtorch_medium.dds
new file mode 100644
index 00000000000..5a248ab0c0e
Binary files /dev/null and b/gfx/interface/technologies/marines_expeditionary_blowtorch_medium.dds differ
diff --git a/gfx/interface/technologies/marines_expeditionary_medium.dds b/gfx/interface/technologies/marines_expeditionary_medium.dds
new file mode 100644
index 00000000000..a2437807136
Binary files /dev/null and b/gfx/interface/technologies/marines_expeditionary_medium.dds differ
diff --git a/gfx/interface/technologies/marines_expeditionary_support_medium.dds b/gfx/interface/technologies/marines_expeditionary_support_medium.dds
new file mode 100644
index 00000000000..a66d831ff77
Binary files /dev/null and b/gfx/interface/technologies/marines_expeditionary_support_medium.dds differ
diff --git a/gfx/interface/technologies/marines_jungle_troops_medium.dds b/gfx/interface/technologies/marines_jungle_troops_medium.dds
new file mode 100644
index 00000000000..2e5bb73956f
Binary files /dev/null and b/gfx/interface/technologies/marines_jungle_troops_medium.dds differ
diff --git a/gfx/interface/technologies/marines_recon_medium.dds b/gfx/interface/technologies/marines_recon_medium.dds
new file mode 100644
index 00000000000..7c307af9231
Binary files /dev/null and b/gfx/interface/technologies/marines_recon_medium.dds differ
diff --git a/gfx/interface/technologies/marines_shore_parties_medium.dds b/gfx/interface/technologies/marines_shore_parties_medium.dds
new file mode 100644
index 00000000000..05c1bfc6602
Binary files /dev/null and b/gfx/interface/technologies/marines_shore_parties_medium.dds differ
diff --git a/gfx/interface/technologies/mountaineers_combat_1_medium.dds b/gfx/interface/technologies/mountaineers_combat_1_medium.dds
new file mode 100644
index 00000000000..5e942afccf0
Binary files /dev/null and b/gfx/interface/technologies/mountaineers_combat_1_medium.dds differ
diff --git a/gfx/interface/technologies/mountaineers_combat_3_medium.dds b/gfx/interface/technologies/mountaineers_combat_3_medium.dds
new file mode 100644
index 00000000000..15923618e0e
Binary files /dev/null and b/gfx/interface/technologies/mountaineers_combat_3_medium.dds differ
diff --git a/gfx/interface/technologies/mountaineers_keystone_1_medium.dds b/gfx/interface/technologies/mountaineers_keystone_1_medium.dds
new file mode 100644
index 00000000000..057155c813c
Binary files /dev/null and b/gfx/interface/technologies/mountaineers_keystone_1_medium.dds differ
diff --git a/gfx/interface/technologies/mountaineers_keystone_2_medium.dds b/gfx/interface/technologies/mountaineers_keystone_2_medium.dds
new file mode 100644
index 00000000000..f2ae8565df6
Binary files /dev/null and b/gfx/interface/technologies/mountaineers_keystone_2_medium.dds differ
diff --git a/gfx/interface/technologies/paras_combat_drop_medium.dds b/gfx/interface/technologies/paras_combat_drop_medium.dds
new file mode 100644
index 00000000000..5418c9b468f
Binary files /dev/null and b/gfx/interface/technologies/paras_combat_drop_medium.dds differ
diff --git a/gfx/interface/technologies/paras_dispersed_drop_medium.dds b/gfx/interface/technologies/paras_dispersed_drop_medium.dds
new file mode 100644
index 00000000000..f7c002348c8
Binary files /dev/null and b/gfx/interface/technologies/paras_dispersed_drop_medium.dds differ
diff --git a/gfx/interface/technologies/paras_keystone_1_medium.dds b/gfx/interface/technologies/paras_keystone_1_medium.dds
new file mode 100644
index 00000000000..d99a052b01e
Binary files /dev/null and b/gfx/interface/technologies/paras_keystone_1_medium.dds differ
diff --git a/gfx/interface/technologies/paras_keystone_2_medium.dds b/gfx/interface/technologies/paras_keystone_2_medium.dds
new file mode 100644
index 00000000000..8ea83841179
Binary files /dev/null and b/gfx/interface/technologies/paras_keystone_2_medium.dds differ
diff --git a/gfx/interface/technologies/racial_specforce_final.dds b/gfx/interface/technologies/racial_specforce_final.dds
new file mode 100644
index 00000000000..70223742c50
Binary files /dev/null and b/gfx/interface/technologies/racial_specforce_final.dds differ
diff --git a/gfx/interface/technologies/racial_specforce_left1.dds b/gfx/interface/technologies/racial_specforce_left1.dds
new file mode 100644
index 00000000000..840338cfbe8
Binary files /dev/null and b/gfx/interface/technologies/racial_specforce_left1.dds differ
diff --git a/gfx/interface/technologies/racial_specforce_left2.dds b/gfx/interface/technologies/racial_specforce_left2.dds
new file mode 100644
index 00000000000..1cc64cb4bbc
Binary files /dev/null and b/gfx/interface/technologies/racial_specforce_left2.dds differ
diff --git a/gfx/interface/technologies/racial_specforce_right1.dds b/gfx/interface/technologies/racial_specforce_right1.dds
new file mode 100644
index 00000000000..721720c740e
Binary files /dev/null and b/gfx/interface/technologies/racial_specforce_right1.dds differ
diff --git a/gfx/interface/technologies/racial_specforce_right2.dds b/gfx/interface/technologies/racial_specforce_right2.dds
new file mode 100644
index 00000000000..138cea65ffa
Binary files /dev/null and b/gfx/interface/technologies/racial_specforce_right2.dds differ
diff --git a/gfx/interface/technologies/racial_specforce_start.dds b/gfx/interface/technologies/racial_specforce_start.dds
new file mode 100644
index 00000000000..3e5d987b83f
Binary files /dev/null and b/gfx/interface/technologies/racial_specforce_start.dds differ
diff --git a/gfx/interface/technologies/rangers_medium.dds b/gfx/interface/technologies/rangers_medium.dds
new file mode 100644
index 00000000000..9330e278764
Binary files /dev/null and b/gfx/interface/technologies/rangers_medium.dds differ
diff --git a/gfx/interface/technologies/ski_troops_medium.dds b/gfx/interface/technologies/ski_troops_medium.dds
new file mode 100644
index 00000000000..618328b8ab2
Binary files /dev/null and b/gfx/interface/technologies/ski_troops_medium.dds differ
diff --git a/gfx/interface/technologies/special_forces_marines_medium.dds b/gfx/interface/technologies/special_forces_marines_medium.dds
new file mode 100644
index 00000000000..9e7c2c65679
Binary files /dev/null and b/gfx/interface/technologies/special_forces_marines_medium.dds differ
diff --git a/gfx/interface/technologies/special_forces_mountaineers_medium.dds b/gfx/interface/technologies/special_forces_mountaineers_medium.dds
new file mode 100644
index 00000000000..681f960fa90
Binary files /dev/null and b/gfx/interface/technologies/special_forces_mountaineers_medium.dds differ
diff --git a/gfx/interface/technologies/special_forces_paratroopers_medium.dds b/gfx/interface/technologies/special_forces_paratroopers_medium.dds
new file mode 100644
index 00000000000..8c8789e5865
Binary files /dev/null and b/gfx/interface/technologies/special_forces_paratroopers_medium.dds differ
diff --git a/gfx/interface/technologies/special_forces_recon_medium.dds b/gfx/interface/technologies/special_forces_recon_medium.dds
new file mode 100644
index 00000000000..637186c826c
Binary files /dev/null and b/gfx/interface/technologies/special_forces_recon_medium.dds differ
diff --git a/gfx/interface/techtree/kirin_techtree_bg.dds b/gfx/interface/techtree/kirin_techtree_bg.dds
index 350cad49f38..cb6279193e3 100644
Binary files a/gfx/interface/techtree/kirin_techtree_bg.dds and b/gfx/interface/techtree/kirin_techtree_bg.dds differ
diff --git a/gfx/leaders/HIP/arcus_flamefeather.tga b/gfx/leaders/HIP/arcus_flamefeather.tga
index e2dd74d6355..bccb9da3ecd 100644
Binary files a/gfx/leaders/HIP/arcus_flamefeather.tga and b/gfx/leaders/HIP/arcus_flamefeather.tga differ
diff --git a/gfx/leaders/HIP/arden_ironquill.tga b/gfx/leaders/HIP/arden_ironquill.tga
new file mode 100644
index 00000000000..6042f075862
Binary files /dev/null and b/gfx/leaders/HIP/arden_ironquill.tga differ
diff --git a/gfx/leaders/HIP/ulyssess.tga b/gfx/leaders/HIP/ulyssess.tga
new file mode 100644
index 00000000000..2544133fc9a
Binary files /dev/null and b/gfx/leaders/HIP/ulyssess.tga differ
diff --git a/gfx/leaders/KIR/fiery_azalea.tga b/gfx/leaders/KIR/fiery_azalea.tga
index cacb6dc044d..91c85e70e3d 100644
Binary files a/gfx/leaders/KIR/fiery_azalea.tga and b/gfx/leaders/KIR/fiery_azalea.tga differ
diff --git a/gfx/leaders/MGY/annu.tga b/gfx/leaders/MGY/annu.tga
new file mode 100644
index 00000000000..f400b234bab
Binary files /dev/null and b/gfx/leaders/MGY/annu.tga differ
diff --git a/gfx/leaders/MGY/violetta_locifer.tga b/gfx/leaders/MGY/violetta_locifer.tga
new file mode 100644
index 00000000000..190abb908c4
Binary files /dev/null and b/gfx/leaders/MGY/violetta_locifer.tga differ
diff --git a/gfx/loadingscreens/load_polarbear.dds b/gfx/loadingscreens/load_aat.dds
similarity index 100%
rename from gfx/loadingscreens/load_polarbear.dds
rename to gfx/loadingscreens/load_aat.dds
diff --git a/gfx/loadingscreens/load_14.dds b/gfx/loadingscreens/load_aat2.dds
similarity index 100%
rename from gfx/loadingscreens/load_14.dds
rename to gfx/loadingscreens/load_aat2.dds
diff --git a/gfx/loadingscreens/load_kirin.dds b/gfx/loadingscreens/load_kirin.dds
index 1291021778f..fbe4cd792a1 100644
Binary files a/gfx/loadingscreens/load_kirin.dds and b/gfx/loadingscreens/load_kirin.dds differ
diff --git a/history/countries/AET - Aetiea.txt b/history/countries/AET - Aetiea.txt
index b64d77c7aeb..1a8efd01f68 100644
--- a/history/countries/AET - Aetiea.txt	
+++ b/history/countries/AET - Aetiea.txt	
@@ -14,7 +14,7 @@ set_technology = {
 	pre_gw_artillery = 1
 	gw_artillery = 1
 	tech_mountaineers = 1
-	motorised_infantry = 1
+	tech_trucks = 1
 	basic_train = 1
 }
 actually_fix_weapon_techs = yes #THIS HAS TO BE CALLED IN EVERY HISTORY FILE RIGHT AFTER MAIN set_technology!
diff --git a/history/countries/BAK - Baka.txt b/history/countries/BAK - Baka.txt
index 0f0ae8af2bf..053dee4b4ac 100644
--- a/history/countries/BAK - Baka.txt	
+++ b/history/countries/BAK - Baka.txt	
@@ -18,7 +18,7 @@ set_technology = {
 	marines = 1
 	fleet_in_being = 1
 	fuel_silos = 1
-	motorised_infantry = 1
+	tech_trucks = 1
 	basic_train = 1
 }
 actually_fix_weapon_techs = yes #THIS HAS TO BE CALLED IN EVERY HISTORY FILE RIGHT AFTER MAIN set_technology!
diff --git a/history/countries/BAT - BatColony.txt b/history/countries/BAT - BatColony.txt
index 1be148120b1..6aea2fc0da9 100644
--- a/history/countries/BAT - BatColony.txt	
+++ b/history/countries/BAT - BatColony.txt	
@@ -22,6 +22,7 @@ set_technology = {
 	bat_troopers = 1
 	basic_train = 1
 	marines = 1
+	tech_trucks = 1
 	motorised_infantry = 1
 	trade_interdiction = 1
 }
@@ -36,6 +37,7 @@ if = {
 		iw_small_airframe = 1
 		iw_medium_airframe = 1
 		basic_small_airframe = 1
+		air_torpedoe_1 = 1
 	}
 
 	create_equipment_variant = {
diff --git a/history/countries/BLT - Boltria.txt b/history/countries/BLT - Boltria.txt
index 80fc7120799..618e6004402 100644
--- a/history/countries/BLT - Boltria.txt	
+++ b/history/countries/BLT - Boltria.txt	
@@ -27,7 +27,7 @@ if = {
 			fixed_main_weapon_slot = medium_bomb_bay
 			fixed_auxiliary_weapon_slot_1 = bomb_locks
 			fixed_auxiliary_weapon_slot_2 = light_mg_4x
-			engine_type_slot = engine_1_2x
+			engine_type_slot = engine_1_3x
 			special_type_slot_1 = empty
 		}
 		icon = "GFX_medium_airship_equipment_0_medium"
diff --git a/history/countries/BRZ - Bronzehill.txt b/history/countries/BRZ - Bronzehill.txt
index f4cd7cc051c..26de77c5bf2 100644
--- a/history/countries/BRZ - Bronzehill.txt	
+++ b/history/countries/BRZ - Bronzehill.txt	
@@ -14,7 +14,7 @@ set_technology = {
 	tech_support = 1
 	tech_mountaineers = 1
 	basic_train = 1
-	motorised_infantry = 1
+	tech_trucks = 1
 }
 if = {
 	limit = { has_dlc = "By Blood Alone" }
diff --git a/history/countries/CCN - ChangelingHarmony.txt b/history/countries/CCN - ChangelingHarmony.txt
index e93483f5e9f..8f696dab9e4 100644
--- a/history/countries/CCN - ChangelingHarmony.txt	
+++ b/history/countries/CCN - ChangelingHarmony.txt	
@@ -14,6 +14,7 @@ set_technology = {
 	interwar_antitank = 1
 	gw_artillery = 1
 	tech_support = 1
+	tech_trucks = 1
 	motorised_infantry = 1
 	tech_jager = 1
 	tech_recon = 1
diff --git a/history/countries/CDR - Coltdar.txt b/history/countries/CDR - Coltdar.txt
index dfb319d9693..e44121097d2 100644
--- a/history/countries/CDR - Coltdar.txt	
+++ b/history/countries/CDR - Coltdar.txt	
@@ -66,6 +66,7 @@ if = {
 		iw_small_airframe = 1
 		iw_medium_airframe = 1
 		basic_small_airframe = 1
+		air_torpedoe_1 = 1
 	}
 
 	create_equipment_variant = {
diff --git a/history/countries/CHN - Changeling.txt b/history/countries/CHN - Changeling.txt
index 0cefb61e9f2..93b5e09a89d 100644
--- a/history/countries/CHN - Changeling.txt	
+++ b/history/countries/CHN - Changeling.txt	
@@ -13,6 +13,7 @@ set_technology = {
 	interwar_antitank = 1
 	gw_artillery = 1
 	tech_support = 1
+	tech_trucks = 1
 	motorised_infantry = 1
 	tech_jager = 1
 	tech_recon = 1
diff --git a/history/countries/CRY - CrystalEmpire.txt b/history/countries/CRY - CrystalEmpire.txt
index 31b84977bbe..5fd052196a9 100644
--- a/history/countries/CRY - CrystalEmpire.txt	
+++ b/history/countries/CRY - CrystalEmpire.txt	
@@ -19,7 +19,7 @@ set_technology = {
 	tech_military_police = 1
 	tech_engineers = 1
 	basic_train = 1
-	motorised_infantry = 1
+	tech_trucks = 1
 }
 if = {
 	limit = { has_dlc = "By Blood Alone" }
diff --git a/history/countries/CTH - Colthage.txt b/history/countries/CTH - Colthage.txt
index e45847320e4..a661632c523 100644
--- a/history/countries/CTH - Colthage.txt	
+++ b/history/countries/CTH - Colthage.txt	
@@ -66,6 +66,7 @@ if = {
 		iw_small_airframe = 1
 		iw_medium_airframe = 1
 		basic_small_airframe = 1
+		air_torpedoe_1 = 1
 	}
 
 	create_equipment_variant = {
@@ -179,7 +180,7 @@ set_variable = { CTH_science_eureka_factor_var = 0.08 }
 set_variable = { CTH_military_army_organisation_factor_var = 0.08 }
 set_variable = { CTH_military_surrender_limit_factor_var = 0.08 }
 set_variable = { CTH_landowner_political_power_factor_var = 0.3 }
-set_variable = { CTH_landowner_consumer_goods_factor_var = -0.06 }
+set_variable = { CTH_landowner_consumer_goods_factor_var = -0.12 }
 set_variable = { CTH_constitutionalist_economy_cost_factor_var = 0.2 }
 set_variable = { CTH_constitutionalist_mobilization_laws_cost_factor_var = 0.2 }
 set_variable = { CTH_harmonite_stability_factor_var = -0.025 }
diff --git a/history/countries/CVA - Coltva.txt b/history/countries/CVA - Coltva.txt
index 8f256ffbed1..44f8b9d291c 100644
--- a/history/countries/CVA - Coltva.txt	
+++ b/history/countries/CVA - Coltva.txt	
@@ -67,6 +67,7 @@ if = {
 		iw_small_airframe = 1
 		iw_medium_airframe = 1
 		basic_small_airframe = 1
+		air_torpedoe_1 = 1
 	}
 
 	create_equipment_variant = {
diff --git a/history/countries/CYA - Cyanolisia.txt b/history/countries/CYA - Cyanolisia.txt
index 9f9200f9557..6672a46a50a 100644
--- a/history/countries/CYA - Cyanolisia.txt	
+++ b/history/countries/CYA - Cyanolisia.txt	
@@ -16,6 +16,7 @@ set_technology = {
 	tech_support = 1
 	marines = 1
 	tech_mountaineers = 1
+	tech_trucks = 1
 	motorised_infantry = 1
 	basic_train = 1
 }
diff --git a/history/countries/CZR - CentralZebricanRepublic.txt b/history/countries/CZR - CentralZebricanRepublic.txt
index 53ee3b27cab..b43bb3343ef 100644
--- a/history/countries/CZR - CentralZebricanRepublic.txt	
+++ b/history/countries/CZR - CentralZebricanRepublic.txt	
@@ -27,7 +27,7 @@ if = {
 			fixed_main_weapon_slot = medium_bomb_bay
 			fixed_auxiliary_weapon_slot_1 = bomb_locks
 			fixed_auxiliary_weapon_slot_2 = light_mg_4x
-			engine_type_slot = engine_1_2x
+			engine_type_slot = engine_1_3x
 			special_type_slot_1 = empty
 		}
 		icon = "GFX_medium_airship_equipment_0_medium"
diff --git a/history/countries/ELF - EquestriaLiberationFront.txt b/history/countries/ELF - EquestriaLiberationFront.txt
index 4e9a42ae328..fa5622dce17 100644
--- a/history/countries/ELF - EquestriaLiberationFront.txt	
+++ b/history/countries/ELF - EquestriaLiberationFront.txt	
@@ -18,6 +18,7 @@ set_technology = {
 	tech_military_police = 1
 	tech_engineers = 1
 	trench_warfare = 1
+	tech_trucks = 1
 	motorised_infantry = 1
 	guerrila_warfare_enable = 1
 	basic_train = 1
@@ -51,6 +52,7 @@ if = {
 		iw_small_airframe = 1
 		iw_medium_airframe = 1
 		iw_large_airframe = 1
+		air_torpedoe_1 = 1
 	}
 
 	create_equipment_variant = {
diff --git a/history/countries/EMR - League Of Four Emirs.txt b/history/countries/EMR - League Of Four Emirs.txt
index 87c469e70fb..fa7879d998a 100644
--- a/history/countries/EMR - League Of Four Emirs.txt	
+++ b/history/countries/EMR - League Of Four Emirs.txt	
@@ -14,7 +14,7 @@ set_technology = {
 	tech_recon = 1
 	tech_engineers = 1
 	basic_train = 1
-	motorised_infantry = 1
+	tech_trucks = 1
 }
 if = {
 	limit = { has_dlc = "By Blood Alone" }
@@ -27,6 +27,7 @@ if = {
 		iw_small_airframe = 1
 		iw_medium_airframe = 1
 		basic_small_airframe = 1
+		air_torpedoe_1 = 1
 	}
 
 	create_equipment_variant = {
diff --git a/history/countries/EQC - EquestrianColony.txt b/history/countries/EQC - EquestrianColony.txt
index 6ba430132d4..80093da10ab 100644
--- a/history/countries/EQC - EquestrianColony.txt	
+++ b/history/countries/EQC - EquestrianColony.txt	
@@ -20,7 +20,7 @@ set_technology = {
 	fuel_silos = 1
 	interwar_antiair = 1
 	basic_train = 1
-	motorised_infantry = 1
+	tech_trucks = 1
 }
 if = {
 	limit = {
@@ -303,6 +303,7 @@ if = {
 		iw_small_airframe = 1
 		iw_medium_airframe = 1
 		iw_large_airframe = 1
+		air_torpedoe_1 = 1
 	}
 
 	create_equipment_variant = {
@@ -517,6 +518,7 @@ recruit_character = EQC_rain_rider
 recruit_character = EQC_grey_shore
 recruit_character = EQC_ryan_celer
 recruit_character = EQC_lazy_saturday
+recruit_character = EQC_Togfort_Beacon
 
 ### Advisors ###
 recruit_character = EQC_fascist_pony
diff --git a/history/countries/EQS - Equestria.txt b/history/countries/EQS - Equestria.txt
index eefc83e1d1a..09445d6ca54 100644
--- a/history/countries/EQS - Equestria.txt	
+++ b/history/countries/EQS - Equestria.txt	
@@ -35,6 +35,7 @@ if = {
 		iw_small_airframe = 1
 		iw_medium_airframe = 1
 		iw_large_airframe = 1
+		air_torpedoe_1 = 1
 	}
 
 	create_equipment_variant = {
@@ -210,6 +211,7 @@ set_technology = {
 	tech_military_police = 1
 	tech_engineers = 1
 	trench_warfare = 1
+	tech_trucks = 1
 	motorised_infantry = 1
 	interwar_antiair = 1
 	fleet_in_being = 1
diff --git a/history/countries/FAL - Falcor.txt b/history/countries/FAL - Falcor.txt
index a5c46458907..d511a052c15 100644
--- a/history/countries/FAL - Falcor.txt	
+++ b/history/countries/FAL - Falcor.txt	
@@ -16,7 +16,7 @@ set_technology = {
 	tech_support = 1
 	tech_mountaineers = 1
 	basic_train = 1
-	motorised_infantry = 1
+	tech_trucks = 1
 }
 if = {
 	limit = { has_dlc = "By Blood Alone" }
diff --git a/history/countries/FAT - Fatass.txt b/history/countries/FAT - Fatass.txt
index 282b4484b04..9017c215b60 100644
--- a/history/countries/FAT - Fatass.txt	
+++ b/history/countries/FAT - Fatass.txt	
@@ -11,7 +11,7 @@ set_technology = {
 	pre_gw_artillery = 1
 	infantry_weapons = 1
 	gw_artillery = 1
-	motorised_infantry = 1
+	tech_trucks = 1
 	tech_recon = 1
 	tech_support = 1
 	tech_mountaineers = 1
diff --git a/history/countries/FAW - FatassWarlord.txt b/history/countries/FAW - FatassWarlord.txt
index 22aacf14fbf..e5c11cb3e1d 100644
--- a/history/countries/FAW - FatassWarlord.txt	
+++ b/history/countries/FAW - FatassWarlord.txt	
@@ -12,7 +12,7 @@ set_technology = {
 	pre_gw_artillery = 1
 	infantry_weapons = 1
 	gw_artillery = 1
-	motorised_infantry = 1
+	tech_trucks = 1
 	tech_recon = 1
 	tech_support = 1
 	tech_mountaineers = 1
diff --git a/history/countries/FEA - Feathisia.txt b/history/countries/FEA - Feathisia.txt
index 6625c3e25cd..e56c406e6e6 100644
--- a/history/countries/FEA - Feathisia.txt	
+++ b/history/countries/FEA - Feathisia.txt	
@@ -16,7 +16,7 @@ set_technology = {
 	tech_support = 1
 	tech_mountaineers = 1
 	fuel_silos = 1
-	motorised_infantry = 1
+	tech_trucks = 1
 	basic_train = 1
 }
 actually_fix_weapon_techs = yes #THIS HAS TO BE CALLED IN EVERY HISTORY FILE RIGHT AFTER MAIN set_technology!
@@ -324,6 +324,7 @@ if = {
 		iw_small_airframe = 1
 		iw_medium_airframe = 1
 		basic_small_airframe = 1
+		air_torpedoe_1 = 1
 	}
 
 	create_equipment_variant = {
diff --git a/history/countries/FLO - Flowena.txt b/history/countries/FLO - Flowena.txt
index 2739479587e..dd40ffaf699 100644
--- a/history/countries/FLO - Flowena.txt	
+++ b/history/countries/FLO - Flowena.txt	
@@ -15,7 +15,7 @@ set_technology = {
 	tech_support = 1
 	tech_recon = 1
 	tech_mountaineers = 1
-	motorised_infantry = 1
+	tech_trucks = 1
 	basic_train = 1
 }
 actually_fix_weapon_techs = yes #THIS HAS TO BE CALLED IN EVERY HISTORY FILE RIGHT AFTER MAIN set_technology!
diff --git a/history/countries/GFS - Griffon Free State.txt b/history/countries/GFS - Griffon Free State.txt
index 4fa55c0d3bc..f316d0c7cbe 100644
--- a/history/countries/GFS - Griffon Free State.txt	
+++ b/history/countries/GFS - Griffon Free State.txt	
@@ -17,7 +17,7 @@ set_technology = {
 	tech_mountaineers = 1
 	fuel_silos = 1
 	basic_train = 1
-	motorised_infantry = 1
+	tech_trucks = 1
 }
 if = {
 	limit = { has_dlc = "By Blood Alone" }
diff --git a/history/countries/GRF - Griffon.txt b/history/countries/GRF - Griffon.txt
index 9581e26ec25..393fcb7ef90 100644
--- a/history/countries/GRF - Griffon.txt	
+++ b/history/countries/GRF - Griffon.txt	
@@ -20,7 +20,7 @@ set_technology = {
 	tech_mountaineers = 1
 	fuel_silos = 1
 	basic_train = 1
-	motorised_infantry = 1
+	tech_trucks = 1
 }
 if = {
 	limit = { has_dlc = "By Blood Alone" }
diff --git a/history/countries/GRI - GriffonEmpire.txt b/history/countries/GRI - GriffonEmpire.txt
index c6215fabfe8..7e932768948 100644
--- a/history/countries/GRI - GriffonEmpire.txt	
+++ b/history/countries/GRI - GriffonEmpire.txt	
@@ -16,6 +16,7 @@ set_technology = {
 	tech_support = 1
 	tech_mountaineers = 1
 	fuel_silos = 1
+	tech_trucks = 1
 	motorised_infantry = 1
 	basic_train = 1
 }
diff --git a/history/countries/GRU - Gryphus.txt b/history/countries/GRU - Gryphus.txt
index 461e03e3ce9..a2d9160c924 100644
--- a/history/countries/GRU - Gryphus.txt	
+++ b/history/countries/GRU - Gryphus.txt	
@@ -13,6 +13,7 @@ set_technology = {
 	tech_support = 1
 	tech_knights = 1
 	basic_train = 1
+	tech_trucks = 1
 }
 actually_fix_weapon_techs = yes #THIS HAS TO BE CALLED IN EVERY HISTORY FILE RIGHT AFTER MAIN set_technology!
 if = {
diff --git a/history/countries/GYZ - Gyzwindid.txt b/history/countries/GYZ - Gyzwindid.txt
index 39fb9cf7905..1467cff1009 100644
--- a/history/countries/GYZ - Gyzwindid.txt	
+++ b/history/countries/GYZ - Gyzwindid.txt	
@@ -16,7 +16,7 @@ set_technology = {
 	tech_mountaineers = 1
 	yeti_race = 1
 	basic_train = 1
-	motorised_infantry = 1
+	tech_trucks = 1
 }
 if = {
 	limit = {
@@ -76,7 +76,7 @@ if = {
 			fixed_main_weapon_slot = medium_bomb_bay
 			fixed_auxiliary_weapon_slot_1 = bomb_locks
 			fixed_auxiliary_weapon_slot_2 = light_mg_4x
-			engine_type_slot = engine_1_2x
+			engine_type_slot = engine_1_3x
 			special_type_slot_1 = empty
 		}
 		icon = "GFX_medium_airship_equipment_0_medium"
diff --git a/history/countries/HAU - Haukland.txt b/history/countries/HAU - Haukland.txt
index f7d91b2d277..3817752b285 100644
--- a/history/countries/HAU - Haukland.txt	
+++ b/history/countries/HAU - Haukland.txt	
@@ -13,7 +13,7 @@ set_technology = {
 	marines = 1
 	infantry_weapons = 1
 	gw_artillery = 1
-	motorised_infantry = 1
+	tech_trucks = 1
 	basic_train = 1
 }
 if = {
diff --git a/history/countries/HIE - Hippone.txt b/history/countries/HIE - Hippone.txt
index c121204f0ff..a9c4105fee2 100644
--- a/history/countries/HIE - Hippone.txt	
+++ b/history/countries/HIE - Hippone.txt	
@@ -66,6 +66,7 @@ if = {
 		iw_small_airframe = 1
 		iw_medium_airframe = 1
 		basic_small_airframe = 1
+		air_torpedoe_1 = 1
 	}
 
 	create_equipment_variant = {
diff --git a/history/countries/HIP - Hippogriff.txt b/history/countries/HIP - Hippogriff.txt
index 77b16303524..e0d349a1d25 100644
--- a/history/countries/HIP - Hippogriff.txt	
+++ b/history/countries/HIP - Hippogriff.txt	
@@ -17,6 +17,7 @@ set_technology = {
 	interwar_antiair = 1
 	superior_firepower = 1
 	base_strike = 1
+	tech_trucks = 1
 	motorised_infantry = 1
 	fuel_silos = 1
 	fuel_refining = 1
@@ -579,6 +580,7 @@ if = {
 		aa_lmg = 1
 		early_bombs = 1
 		aircraft_construction = 1
+		air_torpedoe_1 = 1
 	}
 	create_equipment_variant = {
 		name = "P-6" #export models only
@@ -995,6 +997,8 @@ recruit_character = HIP_zephyr_gust
 recruit_character = HIP_screaming_eagle
 recruit_character = HIP_the_ghost_of_aris
 recruit_character = HIP_high_priests
+recruit_character = HIP_arden_ironquill
+recruit_character = HIP_ulyssess
 
 set_rule = {
 	can_generate_female_aces = yes
diff --git a/history/countries/HLQ - HellquillCountry.txt b/history/countries/HLQ - HellquillCountry.txt
index 1d86f7815d0..c0bda12c534 100644
--- a/history/countries/HLQ - HellquillCountry.txt	
+++ b/history/countries/HLQ - HellquillCountry.txt	
@@ -16,7 +16,7 @@ set_technology = {
 	tech_engineers = 1
 	tech_support = 1
 	tech_mountaineers = 1
-	motorised_infantry = 1
+	tech_trucks = 1
 	basic_train = 1
 }
 if = {
diff --git a/history/countries/JEB - Jerkbro.txt b/history/countries/JEB - Jerkbro.txt
index 5de4bc38126..d768bd2bc11 100644
--- a/history/countries/JEB - Jerkbro.txt	
+++ b/history/countries/JEB - Jerkbro.txt	
@@ -15,7 +15,7 @@ set_technology = {
 	gw_artillery = 1
 	tech_support = 1
 	tech_mountaineers = 1
-	motorised_infantry = 1
+	tech_trucks = 1
 	basic_train = 1
 }
 if = {
diff --git a/history/countries/JER - Jerklord.txt b/history/countries/JER - Jerklord.txt
index b4eb04ae9b0..a24f940e1c3 100644
--- a/history/countries/JER - Jerklord.txt	
+++ b/history/countries/JER - Jerklord.txt	
@@ -18,6 +18,7 @@ set_technology = {
 	tech_mountaineers = 1
 	gw_artillery = 1
 	fuel_silos = 1
+	tech_trucks = 1
 	motorised_infantry = 1
 	interwar_antiair = 1
 	basic_train = 1
diff --git a/history/countries/JFT - Jerkfather.txt b/history/countries/JFT - Jerkfather.txt
index 0249a36f9a3..ee42b6c2cf8 100644
--- a/history/countries/JFT - Jerkfather.txt	
+++ b/history/countries/JFT - Jerkfather.txt	
@@ -16,7 +16,7 @@ set_technology = {
 	gw_artillery = 1
 	tech_support = 1
 	marines = 1
-	motorised_infantry = 1
+	tech_trucks = 1
 	basic_train = 1
 }
 actually_fix_weapon_techs = yes #THIS HAS TO BE CALLED IN EVERY HISTORY FILE RIGHT AFTER MAIN set_technology!
diff --git a/history/countries/JHZ - Herzland Republic.txt b/history/countries/JHZ - Herzland Republic.txt
index d1e7d4557f7..22c8fe61bb5 100644
--- a/history/countries/JHZ - Herzland Republic.txt	
+++ b/history/countries/JHZ - Herzland Republic.txt	
@@ -17,6 +17,7 @@ set_technology = {
 	tech_support = 1
 	tech_mountaineers = 1
 	fuel_silos = 1
+	tech_trucks = 1
 	motorised_infantry = 1
 	basic_train = 1
 }
diff --git a/history/countries/JKR - Karthinian Federation.txt b/history/countries/JKR - Karthinian Federation.txt
index 99731ec8a43..e714b588b83 100644
--- a/history/countries/JKR - Karthinian Federation.txt	
+++ b/history/countries/JKR - Karthinian Federation.txt	
@@ -18,6 +18,7 @@ set_technology = {
 	gw_artillery = 1
 	fuel_silos = 1
 	fleet_in_being = 1
+	tech_trucks = 1
 	motorised_infantry = 1
 	interwar_antiair = 1
 	fuel_refining = 1
@@ -52,6 +53,7 @@ if = {
 		iw_medium_airframe = 1
 		basic_small_airframe = 1
 		basic_medium_airframe = 1
+		air_torpedoe_1 = 1
 	}
 
 	create_equipment_variant = {
diff --git a/history/countries/JNG - North Griffonian Republic.txt b/history/countries/JNG - North Griffonian Republic.txt
index b9623476dcd..47931857d0c 100644
--- a/history/countries/JNG - North Griffonian Republic.txt	
+++ b/history/countries/JNG - North Griffonian Republic.txt	
@@ -17,6 +17,7 @@ set_technology = {
 	tech_support = 1
 	tech_mountaineers = 1
 	fuel_silos = 1
+	tech_trucks = 1
 	motorised_infantry = 1
 	basic_train = 1
 }
diff --git a/history/countries/KIR - Kirin.txt b/history/countries/KIR - Kirin.txt
index 8926b70f5ac..aa428ef82e2 100644
--- a/history/countries/KIR - Kirin.txt	
+++ b/history/countries/KIR - Kirin.txt	
@@ -68,7 +68,7 @@ set_variable = { var = KIR_the_silence_experience_gain_var value = -0.5 } ##done
 set_variable = { var = KIR_the_silence_minimum_training_level_var value = 0.2 } ##done
 set_variable = { var = KIR_the_silence_attrition_var value = 0.2 } ##done
 set_variable = { var = KIR_the_silence_building_slots_var value = -0.4 } ##done
-set_variable = { var = KIR_the_silence_consumer_goods_var value = 0.1 } ##done
+set_variable = { var = KIR_the_silence_consumer_goods_var value = 0.2 } ##done
 set_variable = { var = KIR_the_silence_construction_speed_var value = -0.2 } ##done
 set_variable = { var = KIR_the_silence_monthly_pop_var value = -0.2 } ##done
 set_variable = { var = KIR_the_silence_factory_output_var value = -0.2 } ##done
diff --git a/history/countries/LAK - Lakelord.txt b/history/countries/LAK - Lakelord.txt
index 9301d51603c..bfaa8eb314f 100644
--- a/history/countries/LAK - Lakelord.txt	
+++ b/history/countries/LAK - Lakelord.txt	
@@ -15,7 +15,7 @@ set_technology = {
 	gw_artillery = 1
 	tech_support = 1
 	tech_mountaineers = 1
-	motorised_infantry = 1
+	tech_trucks = 1
 	basic_train = 1
 }
 if = {
diff --git a/history/countries/LCT - LakeCity.txt b/history/countries/LCT - LakeCity.txt
index fdc4c9fa535..108d82780bc 100644
--- a/history/countries/LCT - LakeCity.txt	
+++ b/history/countries/LCT - LakeCity.txt	
@@ -15,6 +15,7 @@ set_technology = {
 	tech_support = 1
 	tech_pegasi = 1
 	basic_train = 1
+	tech_trucks = 1
 	motorised_infantry = 1
 }
 if = {
diff --git a/history/countries/LNS - Longsword.txt b/history/countries/LNS - Longsword.txt
index 70f303aed67..dbf598e7fc9 100644
--- a/history/countries/LNS - Longsword.txt	
+++ b/history/countries/LNS - Longsword.txt	
@@ -18,7 +18,7 @@ set_technology = {
 	tech_engineers = 1
 	tech_support = 1
 	tech_mountaineers = 1
-	motorised_infantry = 1
+	tech_trucks = 1
 	basic_train = 1
 }
 if = {
diff --git a/history/countries/LSM - Longsword Military.txt b/history/countries/LSM - Longsword Military.txt
index d4d7875e517..bf352d89444 100644
--- a/history/countries/LSM - Longsword Military.txt	
+++ b/history/countries/LSM - Longsword Military.txt	
@@ -15,7 +15,7 @@ set_technology = {
 	tech_engineers = 1
 	tech_support = 1
 	tech_mountaineers = 1
-	motorised_infantry = 1
+	tech_trucks = 1
 	basic_train = 1
 }
 if = {
diff --git a/history/countries/MAN - Manehattan.txt b/history/countries/MAN - Manehattan.txt
index d858c2806f5..687b65e77f9 100644
--- a/history/countries/MAN - Manehattan.txt	
+++ b/history/countries/MAN - Manehattan.txt	
@@ -13,6 +13,7 @@ set_technology = {
 	interwar_antitank = 1
 	gw_artillery = 1
 	tech_support = 1
+	tech_trucks = 1
 	motorised_infantry = 1
 	tech_jager = 1
 	tech_recon = 1
diff --git a/history/countries/MCW - Macawia.txt b/history/countries/MCW - Macawia.txt
index 61a2011e356..1420dbdd81e 100644
--- a/history/countries/MCW - Macawia.txt	
+++ b/history/countries/MCW - Macawia.txt	
@@ -14,7 +14,7 @@ set_technology = {
 	marines = 1
 	harpy_race = 1
 	basic_train = 1
-	motorised_infantry = 1
+	tech_trucks = 1
 }
 if = {
 	limit = { has_dlc = "By Blood Alone" }
@@ -27,6 +27,7 @@ if = {
 		airship_airframes = 1
 		iw_small_airframe = 1
 		basic_small_airframe = 1
+		air_torpedoe_1 = 1
 	}
 
 	create_equipment_variant = {
@@ -36,7 +37,7 @@ if = {
 			fixed_main_weapon_slot = medium_bomb_bay
 			fixed_auxiliary_weapon_slot_1 = bomb_locks
 			fixed_auxiliary_weapon_slot_2 = light_mg_4x
-			engine_type_slot = engine_1_2x
+			engine_type_slot = engine_1_3x
 			special_type_slot_1 = empty
 		}
 		icon = "GFX_medium_airship_equipment_0_medium"
diff --git a/history/countries/MER - Les Meridiennes.txt b/history/countries/MER - Les Meridiennes.txt
index 5742bed4eeb..e4e9b216223 100644
--- a/history/countries/MER - Les Meridiennes.txt	
+++ b/history/countries/MER - Les Meridiennes.txt	
@@ -15,7 +15,7 @@ set_technology = {
 	griffon_race = 1
 	tech_griffon_army = 1
 	basic_train = 1
-	motorised_infantry = 1
+	tech_trucks = 1
 }
 actually_fix_weapon_techs = yes
 
diff --git a/history/countries/MGY - Maregypt.txt b/history/countries/MGY - Maregypt.txt
index 9f1605aab7e..09fbad0c285 100644
--- a/history/countries/MGY - Maregypt.txt	
+++ b/history/countries/MGY - Maregypt.txt	
@@ -15,7 +15,7 @@ set_technology = {
 	infantry_weapons = 1
 	tech_pegasi = 1
 	basic_train = 1
-	motorised_infantry = 1
+	tech_trucks = 1
 	tech_support = 1
 }
 actually_fix_weapon_techs = yes
diff --git a/history/countries/MIT - Minotauria.txt b/history/countries/MIT - Minotauria.txt
index 1d34ee25fde..1624912f633 100644
--- a/history/countries/MIT - Minotauria.txt	
+++ b/history/countries/MIT - Minotauria.txt	
@@ -218,6 +218,16 @@ recruit_character = MIT_georgios_sakoulotos
 recruit_character = MIT_eirini_kondyli
 recruit_character = MIT_giannis_tauros
 
+if = {
+	limit = {
+		has_dlc = "Man the Guns"
+	}
+	set_variable = { global.amphibious_tank_designer_lvl = 0 }
+}
+set_variable = { global.industrial_concern_lvl = 0 }
+set_variable = { global.air_designer_lvl = 0 }
+
+
 if = {
 	limit = { has_dlc = "Man the Guns" }
 	# Destroyers #
diff --git a/history/countries/MTA - Maretania.txt b/history/countries/MTA - Maretania.txt
index cf26f19f1bc..0a9d37122f1 100644
--- a/history/countries/MTA - Maretania.txt	
+++ b/history/countries/MTA - Maretania.txt	
@@ -15,7 +15,7 @@ set_technology = {
 	tech_engineers = 1
 	horse_race = 1
 	basic_train = 1
-	motorised_infantry = 1
+	tech_trucks = 1
 }
 if = {
 	limit = { has_dlc = "By Blood Alone" }
diff --git a/history/countries/MTO - Maretonia.txt b/history/countries/MTO - Maretonia.txt
index 1315386a98e..12d6d514970 100644
--- a/history/countries/MTO - Maretonia.txt	
+++ b/history/countries/MTO - Maretonia.txt	
@@ -15,7 +15,7 @@ set_technology = {
 		pony_race = 1
 		tech_pegasi = 1
 		basic_train = 1
-		motorised_infantry = 1
+		tech_trucks = 1
 }
 actually_fix_weapon_techs = yes
 
diff --git a/history/countries/NCR - New California Republic.txt b/history/countries/NCR - New California Republic.txt
index 1ba7ecf1bb7..b274c690d46 100644
--- a/history/countries/NCR - New California Republic.txt	
+++ b/history/countries/NCR - New California Republic.txt	
@@ -10,6 +10,7 @@ set_technology = {
 	tech_mountaineers = 1
 	infantry_weapons = 1
 	basic_train = 1
+	tech_trucks = 1
 }
 
 set_stability = 0.5
diff --git a/history/countries/NIM - Nimbusia.txt b/history/countries/NIM - Nimbusia.txt
index 82b1c55c728..16a76f3a4c5 100644
--- a/history/countries/NIM - Nimbusia.txt	
+++ b/history/countries/NIM - Nimbusia.txt	
@@ -145,6 +145,7 @@ if = {
 		engines_2 = 1
 		iw_small_airframe = 1
 		basic_small_airframe = 1
+		air_torpedoe_1 = 1
 	}
 
 	create_equipment_variant = {
diff --git a/history/countries/NLR - Lunar Country.txt b/history/countries/NLR - Lunar Country.txt
index 547a10dcd78..eaa53c556b4 100644
--- a/history/countries/NLR - Lunar Country.txt	
+++ b/history/countries/NLR - Lunar Country.txt	
@@ -156,6 +156,7 @@ if = {
 		iw_small_airframe = 1
 		iw_medium_airframe = 1
 		iw_large_airframe = 1
+		air_torpedoe_1 = 1
 	}
 
 	create_equipment_variant = {
diff --git a/history/countries/OLE - Olenia.txt b/history/countries/OLE - Olenia.txt
index a2fe0ded55a..1ff858a3270 100644
--- a/history/countries/OLE - Olenia.txt	
+++ b/history/countries/OLE - Olenia.txt	
@@ -17,7 +17,7 @@ set_technology = {
 	tech_recon = 1
 	fuel_silos = 1
 	basic_train = 1
-	motorised_infantry = 1
+	tech_trucks = 1
 }
 if = {
 	limit = { has_dlc = "By Blood Alone" }
diff --git a/history/countries/OSQ - Osqat.txt b/history/countries/OSQ - Osqat.txt
index 9b94fd2879f..2014dfe9514 100644
--- a/history/countries/OSQ - Osqat.txt	
+++ b/history/countries/OSQ - Osqat.txt	
@@ -15,7 +15,7 @@ set_technology = {
 	tech_engineers = 1
 	horse_race = 1
 	basic_train = 1
-	motorised_infantry = 1
+	tech_trucks = 1
 }
 actually_fix_weapon_techs = yes
 if = {
diff --git a/history/countries/PCB - PuertoCaballo.txt b/history/countries/PCB - PuertoCaballo.txt
index 415ff3ba45c..aca3a998c53 100644
--- a/history/countries/PCB - PuertoCaballo.txt	
+++ b/history/countries/PCB - PuertoCaballo.txt	
@@ -284,6 +284,7 @@ if = {
 		iw_small_airframe = 1
 		iw_medium_airframe = 1
 		iw_large_airframe = 1
+		air_torpedoe_1 = 1
 	}
 
 	create_equipment_variant = {
diff --git a/history/countries/RCT - RiverCity.txt b/history/countries/RCT - RiverCity.txt
index c691c641933..34d2af38af7 100644
--- a/history/countries/RCT - RiverCity.txt	
+++ b/history/countries/RCT - RiverCity.txt	
@@ -15,7 +15,7 @@ set_technology = {
 	tech_support = 1
 	tech_mountaineers = 1
 	tech_pegasi = 1
-	motorised_infantry = 1
+	tech_trucks = 1
 	basic_train = 1
 }
 if = {
diff --git a/history/countries/REE - Reem.txt b/history/countries/REE - Reem.txt
index b77c6480639..27f38055098 100644
--- a/history/countries/REE - Reem.txt	
+++ b/history/countries/REE - Reem.txt	
@@ -14,7 +14,7 @@ set_technology = {
 	tech_engineers = 1
 	horse_race = 1
 	basic_train = 1
-	motorised_infantry = 1
+	tech_trucks = 1
 }
 if = {
 	limit = {
diff --git a/history/countries/ROU - Romau.txt b/history/countries/ROU - Romau.txt
index 89bbf23a9f0..15f67bc2fdc 100644
--- a/history/countries/ROU - Romau.txt	
+++ b/history/countries/ROU - Romau.txt	
@@ -15,7 +15,7 @@ set_technology = {
 	gw_artillery = 1
 	tech_support = 1
 	tech_mountaineers = 1
-	motorised_infantry = 1
+	tech_trucks = 1
 	basic_train = 1
 }
 if = {
diff --git a/history/countries/SDC - Arabian Popular Front.txt b/history/countries/SDC - Arabian Popular Front.txt
index 45b62d18ec6..8625c4898d8 100644
--- a/history/countries/SDC - Arabian Popular Front.txt	
+++ b/history/countries/SDC - Arabian Popular Front.txt	
@@ -16,7 +16,7 @@ set_technology = {
 	tech_recon = 1
 	tech_engineers = 1
 	basic_train = 1
-	motorised_infantry = 1
+	tech_trucks = 1
 }
 if = {
 	limit = { has_dlc = "By Blood Alone" }
@@ -29,6 +29,7 @@ if = {
 		iw_small_airframe = 1
 		iw_medium_airframe = 1
 		basic_small_airframe = 1
+		air_torpedoe_1 = 1
 	}
 
 	create_equipment_variant = {
diff --git a/history/countries/SDF - National Salvation Movement.txt b/history/countries/SDF - National Salvation Movement.txt
index fbafdb161a4..ca9bd3952d7 100644
--- a/history/countries/SDF - National Salvation Movement.txt	
+++ b/history/countries/SDF - National Salvation Movement.txt	
@@ -16,7 +16,7 @@ set_technology = {
 	tech_recon = 1
 	tech_engineers = 1
 	basic_train = 1
-	motorised_infantry = 1
+	tech_trucks = 1
 }
 if = {
 	limit = { has_dlc = "By Blood Alone" }
@@ -29,6 +29,7 @@ if = {
 		iw_small_airframe = 1
 		iw_medium_airframe = 1
 		basic_small_airframe = 1
+		air_torpedoe_1 = 1
 	}
 
 	create_equipment_variant = {
diff --git a/history/countries/SDL - Saddle Arabia.txt b/history/countries/SDL - Saddle Arabia.txt
index e6eec47e5d6..e1439127e47 100644
--- a/history/countries/SDL - Saddle Arabia.txt	
+++ b/history/countries/SDL - Saddle Arabia.txt	
@@ -16,7 +16,7 @@ set_technology = {
 	tech_recon = 1
 	tech_engineers = 1
 	basic_train = 1
-	motorised_infantry = 1
+	tech_trucks = 1
 }
 if = {
 	limit = {
@@ -215,6 +215,7 @@ if = {
 		iw_small_airframe = 1
 		iw_medium_airframe = 1
 		basic_small_airframe = 1
+		air_torpedoe_1 = 1
 	}
 
 	create_equipment_variant = {
diff --git a/history/countries/SDS - Arabian Republic.txt b/history/countries/SDS - Arabian Republic.txt
index ff31c18bc9e..8003a0655c8 100644
--- a/history/countries/SDS - Arabian Republic.txt	
+++ b/history/countries/SDS - Arabian Republic.txt	
@@ -16,7 +16,7 @@ set_technology = {
 	tech_recon = 1
 	tech_engineers = 1
 	basic_train = 1
-	motorised_infantry = 1
+	tech_trucks = 1
 }
 if = {
 	limit = { has_dlc = "By Blood Alone" }
@@ -29,6 +29,7 @@ if = {
 		iw_small_airframe = 1
 		iw_medium_airframe = 1
 		basic_small_airframe = 1
+		air_torpedoe_1 = 1
 	}
 
 	create_equipment_variant = {
diff --git a/history/countries/SIC - Sicameon.txt b/history/countries/SIC - Sicameon.txt
index 8a7e574f06e..6361595edf3 100644
--- a/history/countries/SIC - Sicameon.txt	
+++ b/history/countries/SIC - Sicameon.txt	
@@ -18,7 +18,7 @@ set_technology = {
 	tech_knights = 1
 	SIC_rediarios_notknights = 1
 	basic_train = 1
-	motorised_infantry = 1
+	tech_trucks = 1
 	basic_train = 1
 }
 actually_fix_weapon_techs = yes #THIS HAS TO BE CALLED IN EVERY HISTORY FILE RIGHT AFTER MAIN set_technology!
@@ -135,6 +135,10 @@ recruit_character = SIC_lucia_pico_de_fuego
 recruit_character = SIC_jose_plumarroja
 recruit_character = SIC_viscount_trubach
 
+set_variable = { global.nacional_de_electricidad_lvl = 0 }
+set_variable = { global.estrella_lvl = 0 }
+set_variable = { global.eritonaval_lvl = 0 }
+
 set_rule = {
 	can_generate_female_aces = yes
 	can_generate_female_unit_leaders  = yes
diff --git a/history/countries/SLC - Stormleucids.txt b/history/countries/SLC - Stormleucids.txt
index 2cd83cd7690..c6f62d133f9 100644
--- a/history/countries/SLC - Stormleucids.txt	
+++ b/history/countries/SLC - Stormleucids.txt	
@@ -18,7 +18,7 @@ set_technology = {
 	tech_mountaineers = 1
 	yeti_race = 1
 	basic_train = 1
-	motorised_infantry = 1
+	tech_trucks = 1
 }
 if = {
 	limit = {
@@ -78,7 +78,7 @@ if = {
 			fixed_main_weapon_slot = medium_bomb_bay
 			fixed_auxiliary_weapon_slot_1 = bomb_locks
 			fixed_auxiliary_weapon_slot_2 = light_mg_4x
-			engine_type_slot = engine_1_2x
+			engine_type_slot = engine_1_3x
 			special_type_slot_1 = empty
 		}
 		icon = "GFX_medium_airship_equipment_0_medium"
diff --git a/history/countries/SOL - Solar Empire.txt b/history/countries/SOL - Solar Empire.txt
index 57b1ffd938a..892d6afd620 100644
--- a/history/countries/SOL - Solar Empire.txt	
+++ b/history/countries/SOL - Solar Empire.txt	
@@ -45,6 +45,7 @@ if = {
 		iw_small_airframe = 1
 		iw_medium_airframe = 1
 		iw_large_airframe = 1
+		air_torpedoe_1 = 1
 	}
 
 	create_equipment_variant = {
diff --git a/history/countries/SRS - SocialistRepublicofSocialists.txt b/history/countries/SRS - SocialistRepublicofSocialists.txt
index fda6133e2aa..93ec97eae14 100644
--- a/history/countries/SRS - SocialistRepublicofSocialists.txt	
+++ b/history/countries/SRS - SocialistRepublicofSocialists.txt	
@@ -20,6 +20,7 @@ set_technology = {
 	tech_recon = 1
 	tech_mountaineers = 1
 	basic_train = 1
+	tech_trucks = 1 
 }
 actually_fix_weapon_techs = yes #THIS HAS TO BE CALLED IN EVERY HISTORY FILE RIGHT AFTER MAIN set_technology!
 
diff --git a/history/countries/STG - Stalliongrad.txt b/history/countries/STG - Stalliongrad.txt
index 7abf921ca7f..99eb68a3793 100644
--- a/history/countries/STG - Stalliongrad.txt	
+++ b/history/countries/STG - Stalliongrad.txt	
@@ -25,6 +25,7 @@ set_technology = {
 	interwar_antitank = 1
 	gw_artillery = 1
 	basic_machine_tools = 1
+	tech_trucks = 1
 	motorised_infantry = 1
 	tech_support = 1
 	fuel_silos = 1
diff --git a/history/countries/STL - StarlightVillage.txt b/history/countries/STL - StarlightVillage.txt
index e7995d36056..bf743a3ffae 100644
--- a/history/countries/STL - StarlightVillage.txt	
+++ b/history/countries/STL - StarlightVillage.txt	
@@ -18,7 +18,7 @@ set_technology = {
 	tech_recon = 1
 	tech_military_police = 1
 	tech_engineers = 1
-	motorised_infantry = 1
+	tech_trucks = 1
 	interwar_antiair = 1
 	basic_train = 1
 }
diff --git a/history/countries/STM - Stormlands.txt b/history/countries/STM - Stormlands.txt
index fe03f2e1273..78fa8c31775 100644
--- a/history/countries/STM - Stormlands.txt	
+++ b/history/countries/STM - Stormlands.txt	
@@ -18,7 +18,7 @@ set_technology = {
 	tech_mountaineers = 1
 	yeti_race = 1
 	basic_train = 1
-	motorised_infantry = 1
+	tech_trucks = 1
 }
 if = {
 	limit = {
@@ -78,7 +78,7 @@ if = {
 			fixed_main_weapon_slot = medium_bomb_bay
 			fixed_auxiliary_weapon_slot_1 = bomb_locks
 			fixed_auxiliary_weapon_slot_2 = light_mg_4x
-			engine_type_slot = engine_1_2x
+			engine_type_slot = engine_1_3x
 			special_type_slot_1 = empty
 		}
 		icon = "GFX_medium_airship_equipment_0_medium"
diff --git a/history/countries/STW - Strawberry.txt b/history/countries/STW - Strawberry.txt
index a1cd1a899a0..e8126fbebd4 100644
--- a/history/countries/STW - Strawberry.txt	
+++ b/history/countries/STW - Strawberry.txt	
@@ -16,7 +16,7 @@ set_technology = {
 	tech_support = 1
 	tech_mountaineers = 1
 	basic_train = 1
-	motorised_infantry = 1
+	tech_trucks = 1
 }
 actually_fix_weapon_techs = yes #THIS HAS TO BE CALLED IN EVERY HISTORY FILE RIGHT AFTER MAIN set_technology!
 if = {
diff --git a/history/countries/TAL - Talouse.txt b/history/countries/TAL - Talouse.txt
index f0ec244d776..a79a3bd4873 100644
--- a/history/countries/TAL - Talouse.txt	
+++ b/history/countries/TAL - Talouse.txt	
@@ -16,7 +16,7 @@ set_technology = {
 	tech_mountaineers = 1
 	gw_artillery = 1
 	basic_train = 1
-	motorised_infantry = 1
+	tech_trucks = 1
 }
 if = {
 	limit = { has_dlc = "By Blood Alone" }
@@ -29,6 +29,7 @@ if = {
 		iw_small_airframe = 1
 		iw_medium_airframe = 1
 		basic_small_airframe = 1
+		air_torpedoe_1 = 1
 	}
 
 	create_equipment_variant = {
diff --git a/history/countries/TBK - Tobuck.txt b/history/countries/TBK - Tobuck.txt
index 10b5b28f0de..610d1198b08 100644
--- a/history/countries/TBK - Tobuck.txt	
+++ b/history/countries/TBK - Tobuck.txt	
@@ -14,7 +14,7 @@ set_technology = {
 	tech_support = 1
 	tech_pegasi = 1
 	basic_train = 1
-	motorised_infantry = 1
+	tech_trucks = 1
 }
 if = {
 	limit = { has_dlc = "By Blood Alone" }
@@ -32,7 +32,7 @@ if = {
 			fixed_main_weapon_slot = medium_bomb_bay
 			fixed_auxiliary_weapon_slot_1 = bomb_locks
 			fixed_auxiliary_weapon_slot_2 = light_mg_4x
-			engine_type_slot = engine_1_2x
+			engine_type_slot = engine_1_3x
 			special_type_slot_1 = empty
 		}
 		icon = "GFX_medium_airship_equipment_0_medium"
diff --git a/history/countries/THU - Thundaria.txt b/history/countries/THU - Thundaria.txt
index d35cc9019cb..83b2ca7bad3 100644
--- a/history/countries/THU - Thundaria.txt	
+++ b/history/countries/THU - Thundaria.txt	
@@ -21,7 +21,7 @@ set_technology = {
 	tech_mountaineers = 1
 	yeti_race = 1
 	basic_train = 1
-	motorised_infantry = 1
+	tech_trucks = 1
 }
 if = {
 	limit = {
@@ -81,7 +81,7 @@ if = {
 			fixed_main_weapon_slot = medium_bomb_bay
 			fixed_auxiliary_weapon_slot_1 = bomb_locks
 			fixed_auxiliary_weapon_slot_2 = light_mg_4x
-			engine_type_slot = engine_1_2x
+			engine_type_slot = engine_1_3x
 			special_type_slot_1 = empty
 		}
 		icon = "GFX_medium_airship_equipment_0_medium"
diff --git a/history/countries/TRO - Trotkart.txt b/history/countries/TRO - Trotkart.txt
index dfe878a7681..ed8e63b2fbf 100644
--- a/history/countries/TRO - Trotkart.txt	
+++ b/history/countries/TRO - Trotkart.txt	
@@ -66,6 +66,7 @@ if = {
 		iw_small_airframe = 1
 		iw_medium_airframe = 1
 		basic_small_airframe = 1
+		air_torpedoe_1 = 1
 	}
 
 	create_equipment_variant = {
diff --git a/history/countries/TSV - Talonsvaal.txt b/history/countries/TSV - Talonsvaal.txt
index b4643747538..8bc1b5706f6 100644
--- a/history/countries/TSV - Talonsvaal.txt	
+++ b/history/countries/TSV - Talonsvaal.txt	
@@ -17,7 +17,7 @@ set_technology = {
 	tech_mountaineers = 1
 	fuel_silos = 1
 	basic_train = 1
-	motorised_infantry = 1
+	tech_trucks = 1
 }
 if = {
 	limit = { has_dlc = "By Blood Alone" }
diff --git a/history/countries/VIN - Vinovia.txt b/history/countries/VIN - Vinovia.txt
index 7437f3fabeb..f7ab158d1df 100644
--- a/history/countries/VIN - Vinovia.txt	
+++ b/history/countries/VIN - Vinovia.txt	
@@ -15,7 +15,7 @@ set_technology = {
 	gw_artillery = 1
 	tech_support = 1
 	tech_mountaineers = 1
-	motorised_infantry = 1
+	tech_trucks = 1
 	basic_train = 1
 }
 if = {
diff --git a/history/countries/WIN - Winggarden.txt b/history/countries/WIN - Winggarden.txt
index a6065f48a33..14febdcbe2a 100644
--- a/history/countries/WIN - Winggarden.txt	
+++ b/history/countries/WIN - Winggarden.txt	
@@ -19,6 +19,7 @@ set_technology = {
 	gw_artillery = 1
 	fuel_silos = 1
 	fleet_in_being = 1
+	tech_trucks = 1
 	motorised_infantry = 1
 	interwar_antiair = 1
 	fuel_refining = 1
@@ -105,6 +106,7 @@ if = {
 		iw_small_airframe = 1
 		iw_medium_airframe = 1
 		basic_small_airframe = 1
+		air_torpedoe_1 = 1
 	}
 
 	create_equipment_variant = {
diff --git a/history/countries/WNG - Wingbardy.txt b/history/countries/WNG - Wingbardy.txt
index 522931e356e..6790b29f73b 100644
--- a/history/countries/WNG - Wingbardy.txt	
+++ b/history/countries/WNG - Wingbardy.txt	
@@ -33,6 +33,7 @@ set_technology = {
 	gw_artillery = 1
 	fuel_silos = 1
 	fleet_in_being = 1
+	tech_trucks = 1
 	motorised_infantry = 1
 	interwar_antiair = 1
 	fuel_refining = 1
@@ -50,6 +51,7 @@ if = {
 		iw_medium_airframe = 1
 		basic_small_airframe = 1
 		basic_medium_airframe = 1
+		air_torpedoe_1 = 1
 	}
 	set_air_oob = "WNG_1007_air_bba"
 	else = {
diff --git a/history/countries/YAL - Yaledom.txt b/history/countries/YAL - Yaledom.txt
index 4a93ea19a13..925773f3aa0 100644
--- a/history/countries/YAL - Yaledom.txt	
+++ b/history/countries/YAL - Yaledom.txt	
@@ -16,7 +16,7 @@ set_technology = {
 	tech_support = 1
 	tech_mountaineers = 1
 	tech_engineers = 1
-	motorised_infantry = 1
+	tech_trucks = 1
 	basic_train = 1
 }
 actually_fix_weapon_techs = yes #THIS HAS TO BE CALLED IN EVERY HISTORY FILE RIGHT AFTER MAIN set_technology!
diff --git a/history/countries/YAN - Yaneo.txt b/history/countries/YAN - Yaneo.txt
index 34909106fa5..058691e236d 100644
--- a/history/countries/YAN - Yaneo.txt	
+++ b/history/countries/YAN - Yaneo.txt	
@@ -16,7 +16,7 @@ set_technology = {
 	tech_griffon_army = 1
 	tech_knights = 1
 	basic_train = 1
-	motorised_infantry = 1
+	tech_trucks = 1
 }
 actually_fix_weapon_techs = yes
 
diff --git a/history/countries/YMN - Yermane.txt b/history/countries/YMN - Yermane.txt
index c277cb0de36..d734328798f 100644
--- a/history/countries/YMN - Yermane.txt	
+++ b/history/countries/YMN - Yermane.txt	
@@ -15,7 +15,7 @@ set_technology = {
 	tech_engineers = 1
 	horse_race = 1
 	basic_train = 1
-	motorised_infantry = 1
+	tech_trucks = 1
 }
 if = {
 	limit = { has_dlc = "By Blood Alone" }
diff --git a/history/countries/ZUM - Neighmidia.txt b/history/countries/ZUM - Neighmidia.txt
index a2ada4f812e..fb4545b28b9 100644
--- a/history/countries/ZUM - Neighmidia.txt	
+++ b/history/countries/ZUM - Neighmidia.txt	
@@ -17,7 +17,7 @@ set_technology = {
 	tech_support = 1
 	tech_engineers = 1
 	basic_train = 1
-	motorised_infantry = 1
+	tech_trucks = 1
 }
 if = {
 	limit = { has_dlc = "By Blood Alone" }
diff --git a/history/states/572-Ochme.txt b/history/states/572-Ochme.txt
index 212fce38065..874cb0d7c34 100644
--- a/history/states/572-Ochme.txt
+++ b/history/states/572-Ochme.txt
@@ -13,6 +13,7 @@ state={
 	history = {
 		owner = FBK
 		add_core_of = FBK
+		victory_points = { 4188 1 }
 	}
 
 	resources={
diff --git a/history/states/604-Skull Groves.txt b/history/states/604-Skull Groves.txt
index 3c30f463c17..d58c550fb63 100644
--- a/history/states/604-Skull Groves.txt	
+++ b/history/states/604-Skull Groves.txt	
@@ -13,5 +13,6 @@ state={
 	history = {
 		owner = FIR
 		add_core_of = FIR
+		victory_points = { 1117 1 }
 	}
 }
diff --git a/history/states/639-Aforestnoonecaresabout.txt b/history/states/639-Aforestnoonecaresabout.txt
index 29e639fce9c..5450c399ada 100644
--- a/history/states/639-Aforestnoonecaresabout.txt
+++ b/history/states/639-Aforestnoonecaresabout.txt
@@ -13,5 +13,6 @@ state={
 	history = {
 		owner = FBK
 		add_core_of = FBK
+		victory_points = { 12609 1 }
 	}
 }
diff --git a/history/states/640-Superimportanthills.txt b/history/states/640-Superimportanthills.txt
index a48e9fc2cf6..3506e5f96df 100644
--- a/history/states/640-Superimportanthills.txt
+++ b/history/states/640-Superimportanthills.txt
@@ -14,7 +14,7 @@ state={
 		owner = WAT
 		add_core_of = WAT
 
-		victory_points = { 12903 2 }
+		victory_points = { 11002 2 }
 	}
 
 	resources = {
diff --git a/history/states/641-Nadle.txt b/history/states/641-Nadle.txt
index 2a4adb4cddd..9b411780e05 100644
--- a/history/states/641-Nadle.txt
+++ b/history/states/641-Nadle.txt
@@ -13,6 +13,8 @@ state={
 	history = {
 		owner = WAT
 		add_core_of = WAT
+		
+		victory_points = { 12626 2 }
 
 		buildings = {
 			infrastructure = 1
diff --git a/history/states/643-Hort.txt b/history/states/643-Hort.txt
index 2ee3337dc65..0920dc439b6 100644
--- a/history/states/643-Hort.txt
+++ b/history/states/643-Hort.txt
@@ -13,6 +13,7 @@ state={
 	history = {
 		owner = WAT
 		add_core_of = WAT
+		victory_points = { 2175 1 }
 	}
 
 	resources = {
diff --git a/history/states/644-Eyehill.txt b/history/states/644-Eyehill.txt
index d350382b97b..a7e015fc1ea 100644
--- a/history/states/644-Eyehill.txt
+++ b/history/states/644-Eyehill.txt
@@ -13,5 +13,6 @@ state={
 	history = {
 		owner = FIR
 		add_core_of = FIR
+		victory_points = { 1446 1 }
 	}
 }
diff --git a/history/units/ANG_1007.txt b/history/units/ANG_1007.txt
index e096f96054b..52eddd6c966 100644
--- a/history/units/ANG_1007.txt
+++ b/history/units/ANG_1007.txt
@@ -162,6 +162,7 @@ instant_effect = {
 		requested_factories = 2
 		progress = 0.1
 		efficiency = 50
+		industrial_manufacturer = mio:ANG_small_arms_company_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -171,5 +172,6 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.2
 		efficiency = 40
+		industrial_manufacturer = mio:ANG_artillery_company_organization
 	}
 }
diff --git a/history/units/ANG_good_boys.txt b/history/units/ANG_good_boys.txt
index 1854959f976..43b678e7d61 100644
--- a/history/units/ANG_good_boys.txt
+++ b/history/units/ANG_good_boys.txt
@@ -7,12 +7,12 @@ division_template = {
 		ironpaws = { x = 0 y = 1 }
 		ironpaws = { x = 0 y = 2 }
 		ironpaws = { x = 0 y = 3 }
-		ironpaws = { x = 0 y = 4 }
 		ironpaws = { x = 1 y = 0 }
 		ironpaws = { x = 1 y = 1 }
 		ironpaws = { x = 1 y = 2 }
 		ironpaws = { x = 1 y = 3 }
-		ironpaws = { x = 1 y = 4 }
+		ironpaws = { x = 2 y = 0 }
+		ironpaws = { x = 2 y = 1 }	
 	}
 	
 	support = {
diff --git a/history/units/ANG_mercs.txt b/history/units/ANG_mercs.txt
index 187747cd090..be53aaa99fd 100644
--- a/history/units/ANG_mercs.txt
+++ b/history/units/ANG_mercs.txt
@@ -7,12 +7,12 @@ division_template = {
 		knights = { x = 0 y = 1 }
 		knights = { x = 0 y = 2 }
 		knights = { x = 0 y = 3 }
-		knights = { x = 0 y = 4 }
 		knights = { x = 1 y = 0 }
 		knights = { x = 1 y = 1 }
 		knights = { x = 1 y = 2 }
 		knights = { x = 1 y = 3 }
-		knights = { x = 1 y = 4 }
+		knights = { x = 2 y = 0 }
+		knights = { x = 2 y = 1 }
 	}
 	
 	support = {
diff --git a/history/units/ANS_1007.txt b/history/units/ANS_1007.txt
index fddedab3249..44d242e8b8c 100644
--- a/history/units/ANS_1007.txt
+++ b/history/units/ANS_1007.txt
@@ -14,7 +14,7 @@ division_template = {
 		infantry = { x = 0 y = 1 }
 		infantry = { x = 0 y = 2 }	
 		infantry = { x = 0 y = 3 }	
-		infantry = { x = 0 y = 4 }	
+		infantry = { x = 1 y = 0 }	
 	}
 	support = {
 		artillery = { x = 0 y = 0 }
diff --git a/history/units/ASS_1007.txt b/history/units/ASS_1007.txt
index 6f94744f89c..9a1960f18de 100644
--- a/history/units/ASS_1007.txt
+++ b/history/units/ASS_1007.txt
@@ -14,7 +14,7 @@ division_template = {
 		infantry = { x = 0 y = 1 }
 		infantry = { x = 0 y = 2 }
 		infantry = { x = 0 y = 3 }
-		artillery_brigade = { x = 0 y = 4 }
+		artillery_brigade = { x = 1 y = 0 }
 	}
 }
 
diff --git a/history/units/BAR_1007.txt b/history/units/BAR_1007.txt
index d835b4888aa..58cbe187653 100644
--- a/history/units/BAR_1007.txt
+++ b/history/units/BAR_1007.txt
@@ -103,6 +103,7 @@ instant_effect = {
 		requested_factories = 2
 		progress = 0.64
 		efficiency = 40
+		industrial_manufacturer = mio:BAR_pen_guns_organization
 	}
 	add_equipment_to_stockpile = {
 		type = melee_equipment_1
diff --git a/history/units/BAT_1007.txt b/history/units/BAT_1007.txt
index ddcd119a5a4..7d52cc8a3ab 100644
--- a/history/units/BAT_1007.txt
+++ b/history/units/BAT_1007.txt
@@ -161,6 +161,7 @@ instant_effect = {
 	    requested_factories = 2
 	    progress = 0.50
 	    efficiency = 60
+		industrial_manufacturer = mio:BAT_designer_8_organization
     }
 	add_equipment_production = {
 	    equipment = {
@@ -179,6 +180,7 @@ instant_effect = {
 	    requested_factories = 2
 	    progress = 0.50
 	    efficiency = 60
+		industrial_manufacturer = mio:BAT_designer_7_organization
     }
 }
 
diff --git a/history/units/BAT_1007_air_bba.txt b/history/units/BAT_1007_air_bba.txt
index a812b170c57..77c88fcaee5 100644
--- a/history/units/BAT_1007_air_bba.txt
+++ b/history/units/BAT_1007_air_bba.txt
@@ -25,5 +25,6 @@ instant_effect = {
 	    requested_factories = 1
 	    progress = 0.80
 	    efficiency = 60
+		industrial_manufacturer = mio:BAT_designer_13_organization
     }
 }
diff --git a/history/units/BAT_1007_air_legacy.txt b/history/units/BAT_1007_air_legacy.txt
index 7dfdfeea076..8e6effab345 100644
--- a/history/units/BAT_1007_air_legacy.txt
+++ b/history/units/BAT_1007_air_legacy.txt
@@ -22,5 +22,6 @@ instant_effect = {
 	    requested_factories = 1
 	    progress = 0.80
 	    efficiency = 60
+		industrial_manufacturer = mio:BAT_designer_13_organization
     }
 }
\ No newline at end of file
diff --git a/history/units/BAT_1007_naval.txt b/history/units/BAT_1007_naval.txt
index ca8b40ba1e8..07a27862467 100644
--- a/history/units/BAT_1007_naval.txt
+++ b/history/units/BAT_1007_naval.txt
@@ -57,6 +57,7 @@ instant_effect = {
 		requested_factories = 2
 		progress = 0.40
 		amount = 1
+		industrial_manufacturer = mio:BAT_designer_12_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -68,6 +69,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.70
 		amount = 1
+		industrial_manufacturer = mio:BAT_designer_10_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -78,6 +80,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.70
 		amount = 1
+		industrial_manufacturer = mio:BAT_designer_10_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -88,5 +91,6 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.70
 		amount = 1
+		industrial_manufacturer = mio:BAT_designer_10_organization
 	}
 }
\ No newline at end of file
diff --git a/history/units/BAT_1007_naval_legacy.txt b/history/units/BAT_1007_naval_legacy.txt
index 68906c3d656..8a10d0bfe5a 100644
--- a/history/units/BAT_1007_naval_legacy.txt
+++ b/history/units/BAT_1007_naval_legacy.txt
@@ -5,39 +5,88 @@
 		task_force = {
 			name = "Firstport Naval Garrison"
 			location = 18601
-			ship = { name = "HIMS Harfruen" definition = light_cruiser equipment = { light_cruiser_2 = { amount = 1 owner = BAT } } }
-	        ship = { name = "HIMS Ambleside" definition = light_cruiser equipment = { light_cruiser_2 = { amount = 1 owner = BAT } } }
-	        ship = { name = "HIMS Pathfinder" definition = light_cruiser equipment = { light_cruiser_2 = { amount = 1 owner = BAT } } }
-			
-			ship = { name = "HIMS Vengeance" definition = destroyer equipment = { destroyer_2 = { amount = 1 owner = BAT } } }
-			ship = { name = "HIMS Capricorn" definition = destroyer equipment = { destroyer_2 = { amount = 1 owner = BAT } } }
-			ship = { name = "HIMS Sequana" definition = destroyer equipment = { destroyer_2 = { amount = 1 owner = BAT } } }
-			ship = { name = "HIMS Tithonus" definition = destroyer equipment = { destroyer_2 = { amount = 1 owner = BAT } } }
-			ship = { name = "HIMS Harp" definition = destroyer equipment = { destroyer_2 = { amount = 1 owner = BAT } } }
-			ship = { name = "HIMS Padstow" definition = destroyer equipment = { destroyer_2 = { amount = 1 owner = BAT } } }
-			ship = { name = "HIMS Auricula" definition = destroyer equipment = { destroyer_2 = { amount = 1 owner = BAT } } }
+			ship = { name = "HIMS Starspire" pride_of_the_fleet = yes definition = heavy_cruiser start_experience_factor = 0.3 equipment = { heavy_cruiser_2 = { amount = 1 owner = BAT } } }
+
+			ship = { name = "HIMS Harfruen" definition = light_cruiser start_experience_factor = 0.3 equipment = { light_cruiser_2 = { amount = 1 owner = BAT } } }
+	        ship = { name = "HIMS Ambleside" definition = light_cruiser start_experience_factor = 0.3 equipment = { light_cruiser_2 = { amount = 1 owner = BAT } } }
+	        ship = { name = "HIMS Pathfinder" definition = light_cruiser start_experience_factor = 0.3 equipment = { light_cruiser_2 = { amount = 1 owner = BAT } } }
+			ship = { name = "HIMS Cinder" definition = light_cruiser start_experience_factor = 0.3 equipment = { light_cruiser_2 = { amount = 1 owner = BAT } } }
+	        ship = { name = "HIMS Ash" definition = light_cruiser start_experience_factor = 0.3 equipment = { light_cruiser_2 = { amount = 1 owner = BAT  } } }
+
+			ship = { name = "HIMS Vengeance" definition = destroyer start_experience_factor = 0.3 equipment = { destroyer_2 = { amount = 1 owner = BAT } } }
+			ship = { name = "HIMS Capricorn" definition = destroyer start_experience_factor = 0.3 equipment = { destroyer_2 = { amount = 1 owner = BAT } } }
+			ship = { name = "HIMS Sequana" definition = destroyer start_experience_factor = 0.3 equipment = { destroyer_2 = { amount = 1 owner = BAT } } }
+			ship = { name = "HIMS Tithonus" definition = destroyer start_experience_factor = 0.3 equipment = { destroyer_2 = { amount = 1 owner = BAT } } }
+			ship = { name = "HIMS Harp" definition = destroyer start_experience_factor = 0.3 equipment = { destroyer_2 = { amount = 1 owner = BAT } } }
+			ship = { name = "HIMS Padstow" definition = destroyer start_experience_factor = 0.3 equipment = { destroyer_2 = { amount = 1 owner = BAT } } }
+			ship = { name = "HIMS Auricula" definition = destroyer start_experience_factor = 0.3 equipment = { destroyer_2 = { amount = 1 owner = BAT } } }
 	
-			ship = { name = "HIMS Shrimp" definition = submarine equipment = { submarine_2 = { amount = 1 owner = BAT } } }
-			ship = { name = "HIMS Leviathan" definition = submarine equipment = { submarine_2 = { amount = 1 owner = BAT } } }
-			ship = { name = "HIMS Mackerel" definition = submarine equipment = { submarine_2 = { amount = 1 owner = BAT } } }
-			ship = { name = "HIMS Nautilus" definition = submarine equipment = { submarine_2 = { amount = 1 owner = BAT } } }
-			ship = { name = "HIMS Barnacle" definition = submarine equipment = { submarine_2 = { amount = 1 owner = BAT } } }
-			ship = { name = "HIMS Perseverance" definition = submarine equipment = { submarine_2 = { amount = 1 owner = BAT } } }
-			ship = { name = "HIMS Swordfish" definition = submarine equipment = { submarine_2 = { amount = 1 owner = BAT } } }
-			ship = { name = "HIMS Thrill" definition = submarine equipment = { submarine_2 = { amount = 1 owner = BAT } } }
-			ship = { name = "HIMS Adventure" definition = submarine equipment = { submarine_2 = { amount = 1 owner = BAT } } }
+			ship = { name = "HIMS Shrimp" definition = submarine start_experience_factor = 0.3 equipment = { submarine_2 = { amount = 1 owner = BAT } } }
+			ship = { name = "HIMS Leviathan" definition = submarine start_experience_factor = 0.3 equipment = { submarine_2 = { amount = 1 owner = BAT } } }
+			ship = { name = "HIMS Mackerel" definition = submarine start_experience_factor = 0.3 equipment = { submarine_2 = { amount = 1 owner = BAT } } }
+			ship = { name = "HIMS Nautilus" definition = submarine start_experience_factor = 0.3 equipment = { submarine_2 = { amount = 1 owner = BAT } } }
+			ship = { name = "HIMS Barnacle" definition = submarine start_experience_factor = 0.3 equipment = { submarine_2 = { amount = 1 owner = BAT } } }
+			ship = { name = "HIMS Perseverance" definition = submarine start_experience_factor = 0.3 equipment = { submarine_2 = { amount = 1 owner = BAT } } }
+			ship = { name = "HIMS Swordfish" definition = submarine start_experience_factor = 0.3 equipment = { submarine_2 = { amount = 1 owner = BAT } } }
+			ship = { name = "HIMS Thrill" definition = submarine start_experience_factor = 0.3 equipment = { submarine_2 = { amount = 1 owner = BAT } } }
 		}
 		task_force = {
 		    name = "Ursagrad Naval Garrison"
 			location = 18517
-			ship = { name = "HIMS Protector" definition = destroyer equipment = { destroyer_2 = { amount = 1 owner = BAT } } }
-			ship = { name = "HIMS Alaric" definition = destroyer equipment = { destroyer_2 = { amount = 1 owner = BAT } } }
-			
-			ship = { name = "HIMS Oyster" definition = submarine equipment = { submarine_2 = { amount = 1 owner = BAT } } }
-			ship = { name = "HIMS Principle" definition = submarine equipment = { submarine_2 = { amount = 1 owner = BAT } } }
-			ship = { name = "HIMS Nereides" definition = submarine equipment = { submarine_2 = { amount = 1 owner = BAT } } }
-			ship = { name = "HIMS Sea Lion" definition = submarine equipment = { submarine_2 = { amount = 1 owner = BAT } } }
-			ship = { name = "HIMS Analyst" definition = submarine equipment = { submarine_2 = { amount = 1 owner = BAT } } }
+			ship = { name = "HIMS Protector" definition = destroyer start_experience_factor = 0.3 equipment = { destroyer_2 = { amount = 1 owner = BAT } } }
+			ship = { name = "HIMS Alaric" definition = destroyer start_experience_factor = 0.3 equipment = { destroyer_2 = { amount = 1 owner = BAT } } }
+			ship = { name = "HIMS Adventure" definition = destroyer start_experience_factor = 0.3 equipment = { destroyer_2 = { amount = 1 owner = BAT } } }
+
+			ship = { name = "HIMS Oyster" definition = submarine start_experience_factor = 0.3 equipment = { submarine_2 = { amount = 1 owner = BAT } } }
+			ship = { name = "HIMS Principle" definition = submarine start_experience_factor = 0.3 equipment = { submarine_2 = { amount = 1 owner = BAT } } }
+			ship = { name = "HIMS Nereides" definition = submarine start_experience_factor = 0.3 equipment = { submarine_2 = { amount = 1 owner = BAT } } }
+			ship = { name = "HIMS Sea Lion" definition = submarine start_experience_factor = 0.3 equipment = { submarine_2 = { amount = 1 owner = BAT } } }
+			ship = { name = "HIMS Analyst" definition = submarine start_experience_factor = 0.3 equipment = { submarine_2 = { amount = 1 owner = BAT } } }
 		}
 	}
+}
+
+instant_effect = {
+	add_equipment_production = {
+		equipment = {
+			type = destroyer_2
+			creator = "BAT"
+		}
+		name = "HIMS Lanton" 
+		requested_factories = 2
+		progress = 0.40
+		amount = 1
+		industrial_manufacturer = mio:BAT_designer_12_organization
+	}
+	add_equipment_production = {
+		equipment = {
+			type = submarine_2
+			creator = "BAT"
+		}
+		name = "HIMS Venomous" 
+		requested_factories = 1
+		progress = 0.70
+		amount = 1
+		industrial_manufacturer = mio:BAT_designer_10_organization
+	}
+	add_equipment_production = {
+		equipment = {
+			type = submarine_2
+			creator = "BAT"
+		}
+		requested_factories = 1
+		progress = 0.70
+		amount = 1
+		industrial_manufacturer = mio:BAT_designer_10_organization
+	}
+	add_equipment_production = {
+		equipment = {
+			type = submarine_2
+			creator = "BAT"
+		}
+		requested_factories = 1
+		progress = 0.70
+		amount = 1
+		industrial_manufacturer = mio:BAT_designer_10_organization
+	}
 }
\ No newline at end of file
diff --git a/history/units/BAT_jungle_corps.txt b/history/units/BAT_jungle_corps.txt
index 107f553753a..f53520052d1 100644
--- a/history/units/BAT_jungle_corps.txt
+++ b/history/units/BAT_jungle_corps.txt
@@ -11,8 +11,8 @@
 		infantry = { x = 1 y = 1 }
 		infantry = { x = 1 y = 2 }
 		infantry = { x = 2 y = 0 }
-		artillery_brigade = { x = 2 y = 1 }
-		artillery_brigade = { x = 2 y = 2 }
+		artillery_brigade = { x = 3 y = 0 }
+		artillery_brigade = { x = 3 y = 1 }
 	}
 	support = {
 		artillery = { x = 0 y = 0 }
diff --git a/history/units/BAT_ram_ranch.txt b/history/units/BAT_ram_ranch.txt
index 3fe4ec710f3..fcf0d74abd6 100644
--- a/history/units/BAT_ram_ranch.txt
+++ b/history/units/BAT_ram_ranch.txt
@@ -10,8 +10,8 @@
 		marine = { x = 1 y = 1 }
 		marine = { x = 1 y = 2 }
 		marine = { x = 2 y = 0 }
-		artillery_brigade = { x = 2 y = 1 }
-		artillery_brigade = { x = 2 y = 2 }
+		artillery_brigade = { x = 3 y = 0 }
+		artillery_brigade = { x = 3 y = 1 }
 	}
 	support = {
 	    recon = { x = 0 y = 0 }
diff --git a/history/units/BAT_republic.txt b/history/units/BAT_republic.txt
index 82ff5d855c7..aa327fa0638 100644
--- a/history/units/BAT_republic.txt
+++ b/history/units/BAT_republic.txt
@@ -47,8 +47,8 @@ division_template = {
 		infantry = { x = 1 y = 1 }
 		infantry = { x = 1 y = 2 }
 		infantry = { x = 2 y = 0 }
-		artillery_brigade = { x = 2 y = 1 }
-		artillery_brigade = { x = 2 y = 2 }
+		artillery_brigade = { x = 3 y = 0 }
+		artillery_brigade = { x = 3 y = 1 }
 	}
 	support = {
 		artillery = { x = 0 y = 0 }
diff --git a/history/units/BAT_true_moon_society.txt b/history/units/BAT_true_moon_society.txt
index 68afe61dff9..bd36ff79394 100644
--- a/history/units/BAT_true_moon_society.txt
+++ b/history/units/BAT_true_moon_society.txt
@@ -10,8 +10,8 @@
 		infantry = { x = 1 y = 1 }
 		infantry = { x = 1 y = 2 }
 		infantry = { x = 2 y = 0 }
-		artillery_brigade = { x = 2 y = 1 }
-		artillery_brigade = { x = 2 y = 2 }
+		artillery_brigade = { x = 3 y = 0 }
+		artillery_brigade = { x = 3 y = 1 }
 	}
 	support = {
 		artillery = { x = 0 y = 0 }
diff --git a/history/units/BKH_1007.txt b/history/units/BKH_1007.txt
index 2863f6a9ff5..072404ac267 100644
--- a/history/units/BKH_1007.txt
+++ b/history/units/BKH_1007.txt
@@ -14,6 +14,6 @@ division_template = {
 		infantry = { x = 0 y = 1 }
 		infantry = { x = 0 y = 2 }
 		infantry = { x = 0 y = 3 }	
-		infantry = { x = 0 y = 4 }	
+		infantry = { x = 1 y = 0 }	
 	}
 }
diff --git a/history/units/BLT_1007.txt b/history/units/BLT_1007.txt
index 153b1365bcb..ee949462c66 100644
--- a/history/units/BLT_1007.txt
+++ b/history/units/BLT_1007.txt
@@ -14,7 +14,7 @@ division_template = {
 		infantry = { x = 0 y = 1 }
 		infantry = { x = 0 y = 2 }
 		infantry = { x = 0 y = 3 }	
-		infantry = { x = 0 y = 4 }	
+		infantry = { x = 1 y = 0 }	
 	}
 	support = {
 		artillery = { x = 0 y = 0 }
diff --git a/history/units/BRF_1007.txt b/history/units/BRF_1007.txt
index a1623c5491f..adbaf35f1b7 100644
--- a/history/units/BRF_1007.txt
+++ b/history/units/BRF_1007.txt
@@ -175,5 +175,6 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.45
 		efficiency = 10
+		industrial_manufacturer = mio:BRF_arty_manufacturer_organization
 	}
 }
diff --git a/history/units/BRS_1007_naval_legacy.txt b/history/units/BRS_1007_naval_legacy.txt
index 408f719e713..79bd7037e0a 100644
--- a/history/units/BRS_1007_naval_legacy.txt
+++ b/history/units/BRS_1007_naval_legacy.txt
@@ -5,7 +5,7 @@ units = {
 		task_force = {
 			name = "Barasinghan Navy"
 			location = 2696 # Ungulanam
-			ship = { name = "Destroyer-1" definition = destroyer start_experience_factor = 0.4 equipment = { destroyer_1 = { amount = 1 owner = BRS  } } }
+			ship = { name = "Destroyer-1" definition = destroyer start_experience_factor = 0.3 equipment = { destroyer_1 = { amount = 1 owner = BRS  } } }
 			ship = { name = "Destroyer-2" definition = destroyer start_experience_factor = 0.3 equipment = { destroyer_1 = { amount = 1 owner = BRS  } } }
 			ship = { name = "Destroyer-3" definition = destroyer start_experience_factor = 0.3 equipment = { destroyer_1 = { amount = 1 owner = BRS  } } }
 		}
diff --git a/history/units/BRZ_1007.txt b/history/units/BRZ_1007.txt
index 3fa3c4a4d29..b4c7990ce6c 100644
--- a/history/units/BRZ_1007.txt
+++ b/history/units/BRZ_1007.txt
@@ -101,6 +101,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.1
 		efficiency = 40
+		industrial_manufacturer = mio:BRZ_bronzekreuz_arsenal_organization
 	}
 
 	add_equipment_production = {
@@ -121,5 +122,6 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.15
 		efficiency = 40
+		industrial_manufacturer = mio:BRZ_isaf_hundfeld_organization
 	}
 }
diff --git a/history/units/CHN_1007.txt b/history/units/CHN_1007.txt
index e0f06bb2f03..ea8dbf137a5 100644
--- a/history/units/CHN_1007.txt
+++ b/history/units/CHN_1007.txt
@@ -45,9 +45,10 @@ division_template = {
 		jager = { x = 0 y = 1 }
 		jager = { x = 0 y = 2 }
 		jager = { x = 0 y = 3 }
-		jager = { x = 0 y = 4 }
 		jager = { x = 1 y = 0 }
 		jager = { x = 1 y = 1 }
+		jager = { x = 1 y = 2 }
+
 	}
 	support = {
 		artillery = { x = 0 y = 0 }
@@ -346,6 +347,7 @@ instant_effect = {
 		requested_factories = 4
 		progress = 0.50
 		efficiency = 85
+		industrial_manufacturer = mio:CHN_chnequip2_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -363,6 +365,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.90
 		efficiency = 50
+		industrial_manufacturer = mio:CHN_chnequip1_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -372,6 +375,7 @@ instant_effect = {
 		requested_factories = 2
 		progress = 0.30
 		efficiency = 50
+		industrial_manufacturer = mio:CHN_chntank2_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -381,5 +385,6 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.70
 		efficiency = 30
+		industrial_manufacturer = mio:CHN_chnequip3_organization
 	}
 }
diff --git a/history/units/CHN_1007_air_bba.txt b/history/units/CHN_1007_air_bba.txt
index f690ec67612..aae96a32eb5 100644
--- a/history/units/CHN_1007_air_bba.txt
+++ b/history/units/CHN_1007_air_bba.txt
@@ -91,6 +91,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.30
 		efficiency = 50
+		industrial_manufacturer = mio:CHN_chnairm5_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -101,5 +102,6 @@ instant_effect = {
 		requested_factories = 2
 		progress = 0.70
 		efficiency = 20
+		industrial_manufacturer = mio:CHN_chnairm3_organization
 	}
 }
diff --git a/history/units/CHN_1007_air_legacy.txt b/history/units/CHN_1007_air_legacy.txt
index 022cfe74b83..f282c746f20 100644
--- a/history/units/CHN_1007_air_legacy.txt
+++ b/history/units/CHN_1007_air_legacy.txt
@@ -80,6 +80,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.30
 		efficiency = 50
+		industrial_manufacturer = mio:CHN_chnairm5_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -89,5 +90,6 @@ instant_effect = {
 		requested_factories = 2
 		progress = 0.70
 		efficiency = 20
+		industrial_manufacturer = mio:CHN_chnairm3_organization
 	}
 }
diff --git a/history/units/CHN_1007_naval.txt b/history/units/CHN_1007_naval.txt
index bdcceec5a0f..b678375827f 100644
--- a/history/units/CHN_1007_naval.txt
+++ b/history/units/CHN_1007_naval.txt
@@ -149,6 +149,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.25
 		amount = 2
+		industrial_manufacturer = mio:CHN_chnnavy2_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -159,6 +160,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.75
 		amount = 1
+		industrial_manufacturer = mio:CHN_chnnavy2_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -169,6 +171,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.55
 		amount = 1
+		industrial_manufacturer = mio:CHN_chnnavy2_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -179,6 +182,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.75
 		amount = 2
+		industrial_manufacturer = mio:CHN_chnnavy1_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -189,6 +193,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.65
 		amount = 2
+		industrial_manufacturer = mio:CHN_chnnavy1_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -199,6 +204,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.55
 		amount = 2
+		industrial_manufacturer = mio:CHN_chnnavy1_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -209,5 +215,6 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.45
 		amount = 2
+		industrial_manufacturer = mio:CHN_chnnavy1_organization
 	}
 }
diff --git a/history/units/CHN_1007_naval_legacy.txt b/history/units/CHN_1007_naval_legacy.txt
index 0b3be2a0800..bbb0b48f28b 100644
--- a/history/units/CHN_1007_naval_legacy.txt
+++ b/history/units/CHN_1007_naval_legacy.txt
@@ -148,6 +148,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.25
 		amount = 2
+		industrial_manufacturer = mio:CHN_chnnavy2_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -157,6 +158,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.75
 		amount = 1
+		industrial_manufacturer = mio:CHN_chnnavy2_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -166,6 +168,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.55
 		amount = 1
+		industrial_manufacturer = mio:CHN_chnnavy2_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -175,6 +178,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.75
 		amount = 2
+		industrial_manufacturer = mio:CHN_chnnavy1_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -184,6 +188,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.65
 		amount = 2
+		industrial_manufacturer = mio:CHN_chnnavy1_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -193,6 +198,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.55
 		amount = 2
+		industrial_manufacturer = mio:CHN_chnnavy1_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -202,5 +208,6 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.45
 		amount = 2
+		industrial_manufacturer = mio:CHN_chnnavy1_organization
 	}
 }
\ No newline at end of file
diff --git a/history/units/CHN_1007_nsb.txt b/history/units/CHN_1007_nsb.txt
index d471952492b..d3a8321f16e 100644
--- a/history/units/CHN_1007_nsb.txt
+++ b/history/units/CHN_1007_nsb.txt
@@ -45,9 +45,9 @@ division_template = {
 		jager = { x = 0 y = 1 }
 		jager = { x = 0 y = 2 }
 		jager = { x = 0 y = 3 }
-		jager = { x = 0 y = 4 }
 		jager = { x = 1 y = 0 }
 		jager = { x = 1 y = 1 }
+		jager = { x = 1 y = 2 }
 	}
 	support = {
 		artillery = { x = 0 y = 0 }
@@ -353,6 +353,7 @@ instant_effect = {
 		requested_factories = 4
 		progress = 0.50
 		efficiency = 85
+		industrial_manufacturer = mio:CHN_chnequip2_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -370,6 +371,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.90
 		efficiency = 50
+		industrial_manufacturer = mio:CHN_chnequip1_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -380,6 +382,7 @@ instant_effect = {
 		requested_factories = 2
 		progress = 0.30
 		efficiency = 50
+		industrial_manufacturer = mio:CHN_chntank2_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -389,5 +392,6 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.70
 		efficiency = 30
+		industrial_manufacturer = mio:CHN_chnequip3_organization
 	}
 }
diff --git a/history/units/CNT_1007.txt b/history/units/CNT_1007.txt
index cbfbe65f9d9..b213d4e22fc 100644
--- a/history/units/CNT_1007.txt
+++ b/history/units/CNT_1007.txt
@@ -29,7 +29,7 @@ division_template = {
 		mountaineers = { x = 0 y = 1 }
 		mountaineers = { x = 0 y = 2 }
 		mountaineers = { x = 0 y = 3 }
-		mountaineers = { x = 0 y = 4 }
+		mountaineers = { x = 1 y = 0 }
 	}
 }
 
diff --git a/history/units/CTH_1007.txt b/history/units/CTH_1007.txt
index 03303cfec68..2c88d3051b0 100644
--- a/history/units/CTH_1007.txt
+++ b/history/units/CTH_1007.txt
@@ -269,6 +269,7 @@ instant_effect = {
 		requested_factories = 2
 		progress = 0.5
 		efficiency = 90
+		industrial_manufacturer = mio:CTH_infantry_equipment_manufacturer_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -278,6 +279,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.5
 		efficiency = 80
+		industrial_manufacturer = mio:CTH_support_equipment_manufacturer_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -287,6 +289,7 @@ instant_effect = {
 		requested_factories = 2
 		progress = 0.5
 		efficiency = 80
+		industrial_manufacturer = mio:CTH_artillery_manufacturer_organization
 	}
 	add_equipment_to_stockpile = { type = melee_equipment_1 amount = 800 producer = STM }
 }
\ No newline at end of file
diff --git a/history/units/CTH_1007_naval.txt b/history/units/CTH_1007_naval.txt
index ce92b8df3f7..665ff534046 100644
--- a/history/units/CTH_1007_naval.txt
+++ b/history/units/CTH_1007_naval.txt
@@ -92,6 +92,7 @@ instant_effect = {
 		requested_factories = 2
 		progress = 0.70
 		amount = 1
+		industrial_manufacturer = mio:CTH_naval_manufacturer_2_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -102,6 +103,7 @@ instant_effect = {
 		requested_factories = 2
 		progress = 0.50
 		amount = 1
+		industrial_manufacturer = mio:CTH_naval_manufacturer_2_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -112,6 +114,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.55
 		amount = 1
+		industrial_manufacturer = mio:CTH_naval_manufacturer_1_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -122,6 +125,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.45
 		amount = 1
+		industrial_manufacturer = mio:CTH_naval_manufacturer_1_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -132,6 +136,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.35
 		amount = 1
+		industrial_manufacturer = mio:CTH_naval_manufacturer_1_organization
 	}
 	add_equipment_production = {
 		equipment = {
diff --git a/history/units/CTH_1007_naval_legacy.txt b/history/units/CTH_1007_naval_legacy.txt
index 041aff4d774..db7bd435f9c 100644
--- a/history/units/CTH_1007_naval_legacy.txt
+++ b/history/units/CTH_1007_naval_legacy.txt
@@ -6,40 +6,48 @@ units = {
 		task_force = {
 			name = "Home Fleet"
 			location = 18351 # COLTHAGE
-			ship = { name = "Colthage" definition = battle_cruiser equipment = { battle_cruiser_1 = { amount = 1 owner = CTH } } }
-			ship = { name = "Vequid" definition = battle_cruiser equipment = { battle_cruiser_1 = { amount = 1 owner = CTH } } }
-			ship = { name = "Laqatha" definition = battle_cruiser equipment = { battle_cruiser_1 = { amount = 1 owner = CTH  } } }
-			ship = { name = "Raqtha" definition = light_cruiser equipment = { light_cruiser_1 = { amount = 1 owner = CTH } } }
-			ship = { name = "Qatharda" definition = light_cruiser equipment = { light_cruiser_1 = { amount = 1 owner = CTH  } } }
+			ship = { name = "Colthage" definition = battle_cruiser pride_of_the_fleet = yes start_experience_factor = 0.3 equipment = { battle_cruiser_1 = { amount = 1 owner = CTH } } }
+			ship = { name = "Coltva" definition = battle_cruiser start_experience_factor = 0.3 equipment = { battle_cruiser_1 = { amount = 1 owner = CTH } } }
 
-			ship = { name = "Zino" definition = destroyer equipment = { destroyer_1 = { amount = 1 owner = CTH  } } }
-			ship = { name = "Zadara" definition = destroyer equipment = { destroyer_1 = { amount = 1 owner = CTH  } } }
-			ship = { name = "Zaquiop" definition = destroyer equipment = { destroyer_1 = { amount = 1 owner = CTH  } } }
-			ship = { name = "Zathar" definition = destroyer equipment = { destroyer_1 = { amount = 1 owner = CTH  } } }
-			ship = { name = "Zariabal" definition = destroyer equipment = { destroyer_1 = { amount = 1 owner = CTH  } } }
-			ship = { name = "Zinno" definition = destroyer equipment = { destroyer_1 = { amount = 1 owner = CTH  } } }
+			ship = { name = "Vequid" definition = battleship start_experience_factor = 0.3 equipment = { battleship_1 = { amount = 1 owner = CTH  } } }
+			ship = { name = "Laqatha" definition = battleship start_experience_factor = 0.3 equipment = { battleship_1 = { amount = 1 owner = CTH  } } }
+
+			ship = { name = "Eler" definition = light_cruiser start_experience_factor = 0.3 equipment = { light_cruiser_1 = { amount = 1 owner = CTH } } }
+			ship = { name = "Charger" definition = light_cruiser start_experience_factor = 0.3 equipment = { light_cruiser_1 = { amount = 1 owner = CTH } } }
+			ship = { name = "Raider" definition = light_cruiser start_experience_factor = 0.3 equipment = { light_cruiser_1 = { amount = 1 owner = CTH } } }
+			ship = { name = "Raqtha" definition = light_cruiser start_experience_factor = 0.3 equipment = { light_cruiser_1 = { amount = 1 owner = CTH } } }
+			ship = { name = "Qatharda" definition = light_cruiser start_experience_factor = 0.3 equipment = { light_cruiser_1 = { amount = 1 owner = CTH  } } }
+
+			ship = { name = "Zino" definition = destroyer start_experience_factor = 0.3 equipment = { destroyer_1 = { amount = 1 owner = CTH  } } }
+			ship = { name = "Zadara" definition = destroyer start_experience_factor = 0.3 equipment = { destroyer_1 = { amount = 1 owner = CTH  } } }
+			ship = { name = "Zaquiop" definition = destroyer start_experience_factor = 0.3 equipment = { destroyer_1 = { amount = 1 owner = CTH  } } }
+			ship = { name = "Zathar" definition = destroyer start_experience_factor = 0.3 equipment = { destroyer_1 = { amount = 1 owner = CTH  } } }
+			ship = { name = "Zariabal" definition = destroyer start_experience_factor = 0.3 equipment = { destroyer_1 = { amount = 1 owner = CTH  } } }
+			ship = { name = "Zinno" definition = destroyer start_experience_factor = 0.3 equipment = { destroyer_1 = { amount = 1 owner = CTH  } } }
+			ship = { name = "Trident" definition = destroyer start_experience_factor = 0.3 equipment = { destroyer_1 = { amount = 1 owner = CTH  } } }
+			ship = { name = "Katana" definition = destroyer start_experience_factor = 0.3 equipment = { destroyer_1 = { amount = 1 owner = CTH  } } }
 		}
 		task_force = {
 			name = "East Fleet"
 			location = 18450
-			ship = { name = "Syqatha" definition = light_cruiser equipment = { light_cruiser_1 = { amount = 1 owner = CTH } } }
-			ship = { name = "Orathaos" definition = light_cruiser equipment = { light_cruiser_1 = { amount = 1 owner = CTH  } } }
+			ship = { name = "Syqatha" definition = light_cruiser start_experience_factor = 0.3 equipment = { light_cruiser_1 = { amount = 1 owner = CTH } } }
+			ship = { name = "Orathaos" definition = light_cruiser start_experience_factor = 0.3 equipment = { light_cruiser_1 = { amount = 1 owner = CTH  } } }
 
-			ship = { name = "Tariq" definition = destroyer equipment = { destroyer_1 = { amount = 1 owner = CTH  } } }
-			ship = { name = "Tathaq" definition = destroyer equipment = { destroyer_1 = { amount = 1 owner = CTH  } } }
-			ship = { name = "Zarqid" definition = destroyer equipment = { destroyer_1 = { amount = 1 owner = CTH  } } }
-			ship = { name = "Synoth" definition = destroyer equipment = { destroyer_1 = { amount = 1 owner = CTH  } } }
+			ship = { name = "Tariq" definition = destroyer start_experience_factor = 0.3 equipment = { destroyer_1 = { amount = 1 owner = CTH  } } }
+			ship = { name = "Tathaq" definition = destroyer start_experience_factor = 0.3 equipment = { destroyer_1 = { amount = 1 owner = CTH  } } }
+			ship = { name = "Zarqid" definition = destroyer start_experience_factor = 0.3 equipment = { destroyer_1 = { amount = 1 owner = CTH  } } }
+			ship = { name = "Synoth" definition = destroyer start_experience_factor = 0.3 equipment = { destroyer_1 = { amount = 1 owner = CTH  } } }
 
 		}
 		task_force = {
 			name = "West Fleet"
 			location = 18416
-			ship = { name = "Iqazal" definition = light_cruiser equipment = { light_cruiser_1 = { amount = 1 owner = CTH  } } }
-			ship = { name = "Yaiq" definition = destroyer equipment = { destroyer_1 = { amount = 1 owner = CTH  } } }
-			ship = { name = "Quatha" definition = destroyer equipment = { destroyer_1 = { amount = 1 owner = CTH  } } }
+			ship = { name = "Iqazal" definition = light_cruiser start_experience_factor = 0.3 equipment = { light_cruiser_1 = { amount = 1 owner = CTH  } } }
+			ship = { name = "Yaiq" definition = destroyer start_experience_factor = 0.3 equipment = { destroyer_1 = { amount = 1 owner = CTH  } } }
+			ship = { name = "Quatha" definition = destroyer start_experience_factor = 0.3 equipment = { destroyer_1 = { amount = 1 owner = CTH  } } }
 
-			ship = { name = "Zal" definition = destroyer equipment = { destroyer_1 = { amount = 1 owner = CTH } } }
-			ship = { name = "Taqimata" definition = destroyer equipment = { destroyer_1 = { amount = 1 owner = CTH } } }
+			ship = { name = "Zal" definition = destroyer start_experience_factor = 0.3 equipment = { destroyer_1 = { amount = 1 owner = CTH } } }
+			ship = { name = "Taqimata" definition = destroyer start_experience_factor = 0.3 equipment = { destroyer_1 = { amount = 1 owner = CTH } } }
 
 		}
 	}
@@ -50,10 +58,10 @@ units = {
 		task_force = {
 			name = "Pirates of Zeordu"
 			location = 18470
-			ship = { name = "Amqim" definition = destroyer equipment = { destroyer_1 = { amount = 1 owner = CTH  } } }
-			ship = { name = "Hakkid" definition = destroyer equipment = { destroyer_1 = { amount = 1 owner = CTH  } } }
-			ship = { name = "Zariq" definition = destroyer equipment = { destroyer_1 = { amount = 1 owner = CTH  } } }
-			ship = { name = "Zarabal" definition = destroyer equipment = { destroyer_1 = { amount = 1 owner = CTH } } }
+			ship = { name = "Amqim" definition = destroyer start_experience_factor = 0.3 equipment = { destroyer_1 = { amount = 1 owner = CTH  } } }
+			ship = { name = "Hakkid" definition = destroyer start_experience_factor = 0.3 equipment = { destroyer_1 = { amount = 1 owner = CTH  } } }
+			ship = { name = "Zariq" definition = destroyer start_experience_factor = 0.3 equipment = { destroyer_1 = { amount = 1 owner = CTH  } } }
+			ship = { name = "Zarabal" definition = destroyer start_experience_factor = 0.3 equipment = { destroyer_1 = { amount = 1 owner = CTH } } }
 		}
 	}
 
@@ -63,58 +71,85 @@ units = {
 		task_force = {
 			name = "Pirates of the Deep"
 			location = 18454
-			ship = { name = "Raiq" definition = submarine equipment = { submarine_1 = { amount = 1 owner = CTH } } }
-			ship = { name = "Raqadic" definition = submarine equipment = { submarine_2 = { amount = 1 owner = CTH } } }
+			ship = { name = "Raiq" definition = submarine start_experience_factor = 0.3 equipment = { submarine_1 = { amount = 1 owner = CTH } } }
+			ship = { name = "Raqadic" definition = submarine start_experience_factor = 0.3 equipment = { submarine_2 = { amount = 1 owner = CTH } } }
+			ship = { name = "Zala" definition = submarine start_experience_factor = 0.3 equipment = { submarine_2 = { amount = 1 owner = CTH } } }
+			ship = { name = "Lancer" definition = submarine start_experience_factor = 0.3 equipment = { submarine_2 = { amount = 1 owner = CTH } } }
+			ship = { name = "Scotch Tape" definition = submarine start_experience_factor = 0.3 equipment = { submarine_2 = { amount = 1 owner = CTH } } }
 		}
 	}
 }
 
 
 instant_effect = {
+
 	### Ships Under Contruction ###
 	add_equipment_production = {
 		equipment = {
-			type = submarine_2
-			creator = "CTH"
+			type = battle_cruiser_2
+			creator = "CTH" 
 		}
 		requested_factories = 2
-		progress = 0.75
-		amount = 2
+		progress = 0.70
+		amount = 1
+		industrial_manufacturer = mio:CTH_naval_manufacturer_2_organization
 	}
 	add_equipment_production = {
 		equipment = {
-			type = submarine_2
-			creator = "CTH"
+			type = battle_cruiser_2
+			creator = "CTH" 
 		}
 		requested_factories = 2
-		progress = 0.65
-		amount = 2
+		progress = 0.50
+		amount = 1
+		industrial_manufacturer = mio:CTH_naval_manufacturer_2_organization
 	}
 	add_equipment_production = {
 		equipment = {
-			type = submarine_2
-			creator = "CTH"
+			type = destroyer_2
+			creator = "CTH" 
 		}
-		requested_factories = 2
+		requested_factories = 1
 		progress = 0.55
-		amount = 2
+		amount = 1
+		industrial_manufacturer = mio:CTH_naval_manufacturer_1_organization
+	}
+	add_equipment_production = {
+		equipment = {
+			type = destroyer_2
+			creator = "CTH" 
+		}
+		requested_factories = 1
+		progress = 0.45
+		amount = 1
+		industrial_manufacturer = mio:CTH_naval_manufacturer_1_organization
+	}
+	add_equipment_production = {
+		equipment = {
+			type = destroyer_2
+			creator = "CTH" 
+		}
+		requested_factories = 1
+		progress = 0.35
+		amount = 1
+		industrial_manufacturer = mio:CTH_naval_manufacturer_1_organization
 	}
 	add_equipment_production = {
 		equipment = {
 			type = submarine_2
 			creator = "CTH"
 		}
-		requested_factories = 2
-		progress = 0.45
-		amount = 2
+		requested_factories = 1
+		progress = 0.60
+		amount = 1
 	}
 	add_equipment_production = {
 		equipment = {
 			type = submarine_2
 			creator = "CTH"
 		}
-		requested_factories = 2
-		progress = 0.35
-		amount = 2
+		requested_factories = 1
+		progress = 0.50
+		amount = 1
 	}
 }
\ No newline at end of file
diff --git a/history/units/CTH_Monzano_naval_legacy.txt b/history/units/CTH_Monzano_naval_legacy.txt
index 998b967eb1e..86ac153ba92 100644
--- a/history/units/CTH_Monzano_naval_legacy.txt
+++ b/history/units/CTH_Monzano_naval_legacy.txt
@@ -6,18 +6,26 @@ units = {
 		task_force = {
 			name = "Home Fleet"
 			location = 18351 # COLTHAGE
-			ship = { name = "Colthage" definition = battle_cruiser equipment = { battle_cruiser_1 = { amount = 1 owner = CTH } } }
-			ship = { name = "Vequid" definition = battle_cruiser equipment = { battle_cruiser_1 = { amount = 1 owner = CTH } } }
-			ship = { name = "Laqatha" definition = battle_cruiser equipment = { battle_cruiser_1 = { amount = 1 owner = CTH  } } }
-			ship = { name = "Raqtha" definition = light_cruiser equipment = { light_cruiser_1 = { amount = 1 owner = CTH } } }
-			ship = { name = "Qatharda" definition = light_cruiser equipment = { light_cruiser_1 = { amount = 1 owner = CTH  } } }
+			ship = { name = "Colthage" definition = battle_cruiser pride_of_the_fleet = yes start_experience_factor = 0.3 equipment = { battle_cruiser_1 = { amount = 1 owner = CTH } } }
+			ship = { name = "Coltva" definition = battle_cruiser start_experience_factor = 0.3 equipment = { battle_cruiser_1 = { amount = 1 owner = CTH } } }
 
-			ship = { name = "Zino" definition = destroyer equipment = { destroyer_1 = { amount = 1 owner = CTH  } } }
-			ship = { name = "Zadara" definition = destroyer equipment = { destroyer_1 = { amount = 1 owner = CTH  } } }
-			ship = { name = "Zaquiop" definition = destroyer equipment = { destroyer_1 = { amount = 1 owner = CTH  } } }
-			ship = { name = "Zathar" definition = destroyer equipment = { destroyer_1 = { amount = 1 owner = CTH  } } }
-			ship = { name = "Zariabal" definition = destroyer equipment = { destroyer_1 = { amount = 1 owner = CTH  } } }
-			ship = { name = "Zinno" definition = destroyer equipment = { destroyer_1 = { amount = 1 owner = CTH  } } }
+			ship = { name = "Vequid" definition = battleship start_experience_factor = 0.3 equipment = { battleship_1 = { amount = 1 owner = CTH  } } }
+			ship = { name = "Laqatha" definition = battleship start_experience_factor = 0.3 equipment = { battleship_1 = { amount = 1 owner = CTH  } } }
+
+			ship = { name = "Eler" definition = light_cruiser start_experience_factor = 0.3 equipment = { light_cruiser_1 = { amount = 1 owner = CTH } } }
+			ship = { name = "Charger" definition = light_cruiser start_experience_factor = 0.3 equipment = { light_cruiser_1 = { amount = 1 owner = CTH } } }
+			ship = { name = "Raider" definition = light_cruiser start_experience_factor = 0.3 equipment = { light_cruiser_1 = { amount = 1 owner = CTH } } }
+			ship = { name = "Raqtha" definition = light_cruiser start_experience_factor = 0.3 equipment = { light_cruiser_1 = { amount = 1 owner = CTH } } }
+			ship = { name = "Qatharda" definition = light_cruiser start_experience_factor = 0.3 equipment = { light_cruiser_1 = { amount = 1 owner = CTH  } } }
+
+			ship = { name = "Zino" definition = destroyer start_experience_factor = 0.3 equipment = { destroyer_1 = { amount = 1 owner = CTH  } } }
+			ship = { name = "Zadara" definition = destroyer start_experience_factor = 0.3 equipment = { destroyer_1 = { amount = 1 owner = CTH  } } }
+			ship = { name = "Zaquiop" definition = destroyer start_experience_factor = 0.3 equipment = { destroyer_1 = { amount = 1 owner = CTH  } } }
+			ship = { name = "Zathar" definition = destroyer start_experience_factor = 0.3 equipment = { destroyer_1 = { amount = 1 owner = CTH  } } }
+			ship = { name = "Zariabal" definition = destroyer start_experience_factor = 0.3 equipment = { destroyer_1 = { amount = 1 owner = CTH  } } }
+			ship = { name = "Zinno" definition = destroyer start_experience_factor = 0.3 equipment = { destroyer_1 = { amount = 1 owner = CTH  } } }
+			ship = { name = "Trident" definition = destroyer start_experience_factor = 0.3 equipment = { destroyer_1 = { amount = 1 owner = CTH  } } }
+			ship = { name = "Katana" definition = destroyer start_experience_factor = 0.3 equipment = { destroyer_1 = { amount = 1 owner = CTH  } } }
 		}
 	}
 }
\ No newline at end of file
diff --git a/history/units/CTH_Monzano_naval_p2_legacy.txt b/history/units/CTH_Monzano_naval_p2_legacy.txt
index 921fe86c912..08547e1b591 100644
--- a/history/units/CTH_Monzano_naval_p2_legacy.txt
+++ b/history/units/CTH_Monzano_naval_p2_legacy.txt
@@ -6,24 +6,24 @@ units = {
 		task_force = {
 			name = "East Fleet"
 			location = 18351
-			ship = { name = "Syqatha" definition = light_cruiser equipment = { light_cruiser_1 = { amount = 1 owner = CTH } } }
-			ship = { name = "Orathaos" definition = light_cruiser equipment = { light_cruiser_1 = { amount = 1 owner = CTH  } } }
+			ship = { name = "Syqatha" definition = light_cruiser start_experience_factor = 0.3 equipment = { light_cruiser_1 = { amount = 1 owner = CTH } } }
+			ship = { name = "Orathaos" definition = light_cruiser start_experience_factor = 0.3 equipment = { light_cruiser_1 = { amount = 1 owner = CTH  } } }
 
-			ship = { name = "Tariq" definition = destroyer equipment = { destroyer_1 = { amount = 1 owner = CTH  } } }
-			ship = { name = "Tathaq" definition = destroyer equipment = { destroyer_1 = { amount = 1 owner = CTH  } } }
-			ship = { name = "Zarqid" definition = destroyer equipment = { destroyer_1 = { amount = 1 owner = CTH  } } }
-			ship = { name = "Synoth" definition = destroyer equipment = { destroyer_1 = { amount = 1 owner = CTH  } } }
+			ship = { name = "Tariq" definition = destroyer start_experience_factor = 0.3 equipment = { destroyer_1 = { amount = 1 owner = CTH  } } }
+			ship = { name = "Tathaq" definition = destroyer start_experience_factor = 0.3 equipment = { destroyer_1 = { amount = 1 owner = CTH  } } }
+			ship = { name = "Zarqid" definition = destroyer start_experience_factor = 0.3 equipment = { destroyer_1 = { amount = 1 owner = CTH  } } }
+			ship = { name = "Synoth" definition = destroyer start_experience_factor = 0.3 equipment = { destroyer_1 = { amount = 1 owner = CTH  } } }
 
 		}
 		task_force = {
 			name = "West Fleet"
 			location = 18351
-			ship = { name = "Iqazal" definition = light_cruiser equipment = { light_cruiser_1 = { amount = 1 owner = CTH  } } }
-			ship = { name = "Yaiq" definition = destroyer equipment = { destroyer_1 = { amount = 1 owner = CTH  } } }
-			ship = { name = "Quatha" definition = destroyer equipment = { destroyer_1 = { amount = 1 owner = CTH  } } }
+			ship = { name = "Iqazal" definition = light_cruiser start_experience_factor = 0.3 equipment = { light_cruiser_1 = { amount = 1 owner = CTH  } } }
+			ship = { name = "Yaiq" definition = destroyer start_experience_factor = 0.3 equipment = { destroyer_1 = { amount = 1 owner = CTH  } } }
+			ship = { name = "Quatha" definition = destroyer start_experience_factor = 0.3 equipment = { destroyer_1 = { amount = 1 owner = CTH  } } }
 
-			ship = { name = "Zal" definition = destroyer equipment = { destroyer_1 = { amount = 1 owner = CTH } } }
-			ship = { name = "Taqimata" definition = destroyer equipment = { destroyer_1 = { amount = 1 owner = CTH } } }
+			ship = { name = "Zal" definition = destroyer start_experience_factor = 0.3 equipment = { destroyer_1 = { amount = 1 owner = CTH } } }
+			ship = { name = "Taqimata" definition = destroyer start_experience_factor = 0.3 equipment = { destroyer_1 = { amount = 1 owner = CTH } } }
 
 		}
 	}
@@ -34,10 +34,10 @@ units = {
 		task_force = {
 			name = "Pirates of Zeordu"
 			location = 18351
-			ship = { name = "Amqim" definition = destroyer equipment = { destroyer_1 = { amount = 1 owner = CTH  } } }
-			ship = { name = "Hakkid" definition = destroyer equipment = { destroyer_1 = { amount = 1 owner = CTH  } } }
-			ship = { name = "Zariq" definition = destroyer equipment = { destroyer_1 = { amount = 1 owner = CTH  } } }
-			ship = { name = "Zarabal" definition = destroyer equipment = { destroyer_1 = { amount = 1 owner = CTH } } }
+			ship = { name = "Amqim" definition = destroyer start_experience_factor = 0.3 equipment = { destroyer_1 = { amount = 1 owner = CTH  } } }
+			ship = { name = "Hakkid" definition = destroyer start_experience_factor = 0.3 equipment = { destroyer_1 = { amount = 1 owner = CTH  } } }
+			ship = { name = "Zariq" definition = destroyer start_experience_factor = 0.3 equipment = { destroyer_1 = { amount = 1 owner = CTH  } } }
+			ship = { name = "Zarabal" definition = destroyer start_experience_factor = 0.3 equipment = { destroyer_1 = { amount = 1 owner = CTH } } }
 		}
 	}
 
@@ -47,8 +47,11 @@ units = {
 		task_force = {
 			name = "Pirates of the Deep"
 			location = 18351
-			ship = { name = "Raiq" definition = submarine equipment = { submarine_1 = { amount = 1 owner = CTH } } }
-			ship = { name = "Raqadic" definition = submarine equipment = { submarine_2 = { amount = 1 owner = CTH } } }
+			ship = { name = "Raiq" definition = submarine start_experience_factor = 0.3 equipment = { submarine_1 = { amount = 1 owner = CTH } } }
+			ship = { name = "Raqadic" definition = submarine start_experience_factor = 0.3 equipment = { submarine_2 = { amount = 1 owner = CTH } } }
+			ship = { name = "Zala" definition = submarine start_experience_factor = 0.3 equipment = { submarine_2 = { amount = 1 owner = CTH } } }
+			ship = { name = "Lancer" definition = submarine start_experience_factor = 0.3 equipment = { submarine_2 = { amount = 1 owner = CTH } } }
+			ship = { name = "Scotch Tape" definition = submarine start_experience_factor = 0.3 equipment = { submarine_2 = { amount = 1 owner = CTH } } }
 		}
 	}
 }
\ No newline at end of file
diff --git a/history/units/CTH_merc_chargers.txt b/history/units/CTH_merc_chargers.txt
index 925edf114eb..8010b7c4323 100644
--- a/history/units/CTH_merc_chargers.txt
+++ b/history/units/CTH_merc_chargers.txt
@@ -6,12 +6,12 @@
 		spirit_warriors = { x = 0 y = 1 }
 		spirit_warriors = { x = 0 y = 2 }
 		spirit_warriors = { x = 0 y = 3 }
-		spirit_warriors = { x = 0 y = 4 }
 		spirit_warriors = { x = 1 y = 0 }
 		spirit_warriors = { x = 1 y = 1 }
 		spirit_warriors = { x = 1 y = 2 }
 		spirit_warriors = { x = 1 y = 3 }
-		spirit_warriors = { x = 1 y = 4 }
+		spirit_warriors = { x = 2 y = 0 }
+		spirit_warriors = { x = 2 y = 1 }
 	}
 	support = {
 		recon = { x = 0 y = 0 }
diff --git a/history/units/CTH_merc_dragons.txt b/history/units/CTH_merc_dragons.txt
index 2aa9eab2881..4f7e9e5c012 100644
--- a/history/units/CTH_merc_dragons.txt
+++ b/history/units/CTH_merc_dragons.txt
@@ -6,12 +6,12 @@
 		light_dragons = { x = 0 y = 1 }
 		light_dragons = { x = 0 y = 2 }
 		light_dragons = { x = 0 y = 3 }
-		light_dragons = { x = 0 y = 4 }
 		light_dragons = { x = 1 y = 0 }
 		light_dragons = { x = 1 y = 1 }
 		light_dragons = { x = 1 y = 2 }
 		light_dragons = { x = 1 y = 3 }
-		light_dragons = { x = 1 y = 4 }
+		light_dragons = { x = 2 y = 0 }
+		light_dragons = { x = 2 y = 1 }
 	}
 	support = {
 		
diff --git a/history/units/CTH_merc_knights.txt b/history/units/CTH_merc_knights.txt
index b47e6a4dc40..f8c93b12736 100644
--- a/history/units/CTH_merc_knights.txt
+++ b/history/units/CTH_merc_knights.txt
@@ -6,12 +6,12 @@
 		knights = { x = 0 y = 1 }
 		knights = { x = 0 y = 2 }
 		knights = { x = 0 y = 3 }
-		knights = { x = 0 y = 4 }
 		knights = { x = 1 y = 0 }
 		knights = { x = 1 y = 1 }
 		knights = { x = 1 y = 2 }
 		knights = { x = 1 y = 3 }
-		knights = { x = 1 y = 4 }
+		knights = { x = 2 y = 0 }
+		knights = { x = 2 y = 1 }
 	}
 	support = {
 		recon = { x = 0 y = 0 }
diff --git a/history/units/CTH_merc_pegasi.txt b/history/units/CTH_merc_pegasi.txt
index c04fe2830bd..d580aa55eff 100644
--- a/history/units/CTH_merc_pegasi.txt
+++ b/history/units/CTH_merc_pegasi.txt
@@ -6,12 +6,12 @@
 		pegasi = { x = 0 y = 1 }
 		pegasi = { x = 0 y = 2 }
 		pegasi = { x = 0 y = 3 }
-		pegasi = { x = 0 y = 4 }
 		pegasi = { x = 1 y = 0 }
 		pegasi = { x = 1 y = 1 }
 		pegasi = { x = 1 y = 2 }
 		pegasi = { x = 1 y = 3 }
-		pegasi = { x = 1 y = 4 }
+		pegasi = { x = 2 y = 0 }
+		pegasi = { x = 2 y = 1 }
 	}
 	support = {
 		recon = { x = 0 y = 0 }
diff --git a/history/units/CTH_non_feudal_levies.txt b/history/units/CTH_non_feudal_levies.txt
index df2685f5c4b..2eba8be3c68 100644
--- a/history/units/CTH_non_feudal_levies.txt
+++ b/history/units/CTH_non_feudal_levies.txt
@@ -6,9 +6,9 @@
 		irregular_infantry = { x = 0 y = 1 }
 		irregular_infantry = { x = 0 y = 2 }
 		irregular_infantry = { x = 0 y = 3 }
-		irregular_infantry = { x = 0 y = 4 }
 		irregular_infantry = { x = 1 y = 0 }
 		irregular_infantry = { x = 1 y = 1 }
+		irregular_infantry = { x = 1 y = 2 }
 	}
 
 	support = {
diff --git a/history/units/CTH_north_division.txt b/history/units/CTH_north_division.txt
index de84410bd0a..80507192184 100644
--- a/history/units/CTH_north_division.txt
+++ b/history/units/CTH_north_division.txt
@@ -6,12 +6,12 @@
 		spirit_warriors = { x = 0 y = 1 }
 		spirit_warriors = { x = 0 y = 2 }
 		spirit_warriors = { x = 0 y = 3 }
-		spirit_warriors = { x = 0 y = 4 }
 		spirit_warriors = { x = 1 y = 0 }
 		spirit_warriors = { x = 1 y = 1 }
 		spirit_warriors = { x = 1 y = 2 }
 		spirit_warriors = { x = 1 y = 3 }
-		spirit_warriors = { x = 1 y = 4 }
+		spirit_warriors = { x = 2 y = 0 }
+		spirit_warriors = { x = 2 y = 1 }
 	}
 	support = {
 		artillery = { x = 0 y = 0 }
diff --git a/history/units/CTH_volunteer_peasant_oob.txt b/history/units/CTH_volunteer_peasant_oob.txt
index fa119034146..c13f39ece68 100644
--- a/history/units/CTH_volunteer_peasant_oob.txt
+++ b/history/units/CTH_volunteer_peasant_oob.txt
@@ -6,7 +6,7 @@
 		irregular_infantry = { x = 0 y = 1 }
 		irregular_infantry = { x = 0 y = 2 }
 		irregular_infantry = { x = 0 y = 3 }
-		irregular_infantry = { x = 0 y = 4 }
+		irregular_infantry = { x = 1 y = 0 }
 	}
 
 	support = {
diff --git a/history/units/CTL_marines.txt b/history/units/CTL_marines.txt
index 905c33ddba2..44729c79ffb 100644
--- a/history/units/CTL_marines.txt
+++ b/history/units/CTL_marines.txt
@@ -10,8 +10,8 @@
 		marine = { x = 1 y = 1 }
 		marine = { x = 1 y = 2 }
 		marine = { x = 2 y = 0 }
-		artillery_brigade = { x = 2 y = 1 }
-		artillery_brigade = { x = 2 y = 2 }
+		artillery_brigade = { x = 3 y = 0 }
+		artillery_brigade = { x = 3 y = 1 }
 	}
 	support = {
 	}
diff --git a/history/units/CVA_foreign_volunteers_oob.txt b/history/units/CVA_foreign_volunteers_oob.txt
index 467c3b379f9..9cf1fbb0cad 100644
--- a/history/units/CVA_foreign_volunteers_oob.txt
+++ b/history/units/CVA_foreign_volunteers_oob.txt
@@ -9,8 +9,8 @@
 		infantry = { x = 1 y = 1 }
 		infantry = { x = 1 y = 2 }
 		infantry = { x = 2 y = 0 }
-		artillery_brigade = { x = 2 y = 1 }
-		artillery_brigade = { x = 2 y = 2 }
+		artillery_brigade = { x = 3 y = 0 }
+		artillery_brigade = { x = 3 y = 1 }
 	}
 	support = {
 		artillery = { x = 0 y = 0 }
diff --git a/history/units/CYA_1007.txt b/history/units/CYA_1007.txt
index d60b3134a38..b3542d2a920 100644
--- a/history/units/CYA_1007.txt
+++ b/history/units/CYA_1007.txt
@@ -171,5 +171,6 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.15
 		efficiency = 25
+		industrial_manufacturer = mio:CYA_sumpfkiel_organization
 	}
 }
diff --git a/history/units/CZR_1007.txt b/history/units/CZR_1007.txt
index e793f85a3c5..cf2e223c596 100644
--- a/history/units/CZR_1007.txt
+++ b/history/units/CZR_1007.txt
@@ -14,7 +14,7 @@ division_template = {
 		infantry = { x = 0 y = 1 }
 		infantry = { x = 0 y = 2 }
 		infantry = { x = 0 y = 3 }
-		infantry = { x = 0 y = 4 }
+		infantry = { x = 1 y = 0 }
 	}
 }
 
diff --git a/history/units/DED_APN_1.txt b/history/units/DED_APN_1.txt
index 023769150a9..e8d7a9e2fcb 100644
--- a/history/units/DED_APN_1.txt
+++ b/history/units/DED_APN_1.txt
@@ -10,12 +10,13 @@ division_template = {
         infantry = { x = 0 y = 1 }
         infantry = { x = 0 y = 2 }
         infantry = { x = 0 y = 3 }
-        infantry = { x = 0 y = 4 }
         infantry = { x = 1 y = 0 }
         infantry = { x = 1 y = 1 }
         infantry = { x = 1 y = 2 }
         infantry = { x = 1 y = 3 }
-        infantry = { x = 1 y = 4 }
+		infantry = { x = 2 y = 0 }
+        infantry = { x = 2 y = 1 }
+
     }
 }
 
diff --git a/history/units/DMT_1007.txt b/history/units/DMT_1007.txt
index beefa1b5617..aa98d6eae2d 100644
--- a/history/units/DMT_1007.txt
+++ b/history/units/DMT_1007.txt
@@ -217,6 +217,7 @@ instant_effect = {
 		requested_factories = 2
 		progress = 0.86
 		efficiency = 25
+		industrial_manufacturer = mio:DMT_Kal_Spankaz_Forge_organization
 	}
 	add_equipment_production = {
 		equipment = {
diff --git a/history/units/EQC_1007.txt b/history/units/EQC_1007.txt
index c8a40c524c6..9191b105411 100644
--- a/history/units/EQC_1007.txt
+++ b/history/units/EQC_1007.txt
@@ -167,6 +167,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.75
 		efficiency = 100
+		industrial_manufacturer = mio:EQC_lsaf_organization
 	}
 }
 
diff --git a/history/units/EQC_1007_air_legacy.txt b/history/units/EQC_1007_air_legacy.txt
index 8c64e6e8301..2566ee03cd2 100644
--- a/history/units/EQC_1007_air_legacy.txt
+++ b/history/units/EQC_1007_air_legacy.txt
@@ -3,7 +3,7 @@
 	356 = {
 		fighter_equipment_0 =  {
 			owner = "EQC"
-			amount = 24
+			amount = 72
 		}
 	}
 	"NMRNS Princess of New Mareland" = {
@@ -13,7 +13,3 @@
 		cv_nav_bomber_equipment_1 = { owner = "EQS" amount = 10 }
 	}
 }
-
-instant_effect = {
-	add_equipment_to_stockpile = { type = nav_bomber_equipment_1 amount = 2 producer = EQC }
-}
\ No newline at end of file
diff --git a/history/units/EQC_1007_naval.txt b/history/units/EQC_1007_naval.txt
index 8d9ebcf6397..f2954d39f6b 100644
--- a/history/units/EQC_1007_naval.txt
+++ b/history/units/EQC_1007_naval.txt
@@ -44,6 +44,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.25
 		amount = 1
+		industrial_manufacturer = mio:EQC_mareland_and_timberwolff_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -54,6 +55,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.30
 		amount = 1
+		industrial_manufacturer = mio:EQC_cockatoo_ship_yards_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -64,5 +66,6 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.20
 		amount = 1
+		industrial_manufacturer = mio:EQC_cockatoo_ship_yards_organization
 	}
 }
\ No newline at end of file
diff --git a/history/units/EQC_1007_naval_legacy.txt b/history/units/EQC_1007_naval_legacy.txt
index eec8368529e..95fa345355d 100644
--- a/history/units/EQC_1007_naval_legacy.txt
+++ b/history/units/EQC_1007_naval_legacy.txt
@@ -30,4 +30,39 @@ units = {
 			ship = { name = "NMRNS Pike" definition = destroyer start_experience_factor = 0.3 equipment = { destroyer_1 = { amount = 1 owner = EQC } } }
 		}
 	}
+}
+
+instant_effect = {
+
+	### Ships Under Contruction ###
+	add_equipment_production = {
+		equipment = {
+			type = light_carrier_1
+			creator = "EQC" 
+		}
+		requested_factories = 1
+		progress = 0.25
+		amount = 1
+		industrial_manufacturer = mio:EQC_mareland_and_timberwolff_organization
+	}
+	add_equipment_production = {
+		equipment = {
+			type = destroyer_1
+			creator = "EQC" 
+		}
+		requested_factories = 1
+		progress = 0.30
+		amount = 1
+		industrial_manufacturer = mio:EQC_cockatoo_ship_yards_organization
+	}
+	add_equipment_production = {
+		equipment = {
+			type = destroyer_1
+			creator = "EQC" 
+		}
+		requested_factories = 1
+		progress = 0.20
+		amount = 1
+		industrial_manufacturer = mio:EQC_cockatoo_ship_yards_organization
+	}
 }
\ No newline at end of file
diff --git a/history/units/EQS_1007.txt b/history/units/EQS_1007.txt
index ebde54381db..e733326de22 100644
--- a/history/units/EQS_1007.txt
+++ b/history/units/EQS_1007.txt
@@ -56,10 +56,10 @@ division_template = {
 		pegasi = { x = 0 y = 1 }
 		pegasi = { x = 0 y = 2 }
 		pegasi = { x = 0 y = 3 }
-		pegasi = { x = 0 y = 4 }
 		pegasi = { x = 1 y = 0 }
 		pegasi = { x = 1 y = 1 }
 		pegasi = { x = 1 y = 2 }
+		pegasi = { x = 1 y = 3 }
 	}
 
 	support = {
@@ -294,6 +294,7 @@ instant_effect = {
 		requested_factories = 10
 		progress = 0.86
 		efficiency = 90
+		industrial_manufacturer = mio:EQS_macintosh_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -311,5 +312,6 @@ instant_effect = {
 		requested_factories = 3
 		progress = 0.90
 		efficiency = 80
+		industrial_manufacturer = mio:EQS_star_energy_organization
 	}
 }
diff --git a/history/units/EQS_1007_air_bba.txt b/history/units/EQS_1007_air_bba.txt
index e58ae8e7b5d..853c3ce1f50 100644
--- a/history/units/EQS_1007_air_bba.txt
+++ b/history/units/EQS_1007_air_bba.txt
@@ -133,5 +133,6 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.15
 		efficiency = 50
+		industrial_manufacturer = mio:EQS_wonderbolt_concern_organization
 	}
 }
diff --git a/history/units/EQS_1007_air_legacy.txt b/history/units/EQS_1007_air_legacy.txt
index 8f067fed0bf..e8d78f66865 100644
--- a/history/units/EQS_1007_air_legacy.txt
+++ b/history/units/EQS_1007_air_legacy.txt
@@ -90,7 +90,7 @@
 	75 = {
 		tac_bomber_equipment_0 = {
 			owner = "EQS"
-			amount = 20
+			amount = 40
 		}
 	}
 	167 = {
@@ -116,7 +116,8 @@ instant_effect = {
 			creator = "EQS"
 		}
 		requested_factories = 1
-		progress = 0.30
+		progress = 0.15
 		efficiency = 50
+		industrial_manufacturer = mio:EQS_wonderbolt_concern_organization
 	}
 }
diff --git a/history/units/EQS_1007_naval.txt b/history/units/EQS_1007_naval.txt
index 88712acb31d..7f7c183b7ea 100644
--- a/history/units/EQS_1007_naval.txt
+++ b/history/units/EQS_1007_naval.txt
@@ -194,6 +194,7 @@ instant_effect = {
 		requested_factories = 3
 		progress = 0.5
 		amount = 1
+		industrial_manufacturer = mio:EQS_seaward_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -204,6 +205,7 @@ instant_effect = {
 		requested_factories = 3
 		progress = 0.5
 		amount = 1
+		industrial_manufacturer = mio:EQS_baltimare_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -214,6 +216,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.30
 		amount = 1
+		industrial_manufacturer = mio:EQS_ichthys_docyard_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -224,6 +227,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.12
 		amount = 1
+		industrial_manufacturer = mio:EQS_ichthys_docyard_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -234,5 +238,6 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.18
 		amount = 1
+		industrial_manufacturer = mio:EQS_mustangia_shipyards_organization
 	}
 }
diff --git a/history/units/EQS_1007_naval_legacy.txt b/history/units/EQS_1007_naval_legacy.txt
index adf68f6f436..1286d946d82 100644
--- a/history/units/EQS_1007_naval_legacy.txt
+++ b/history/units/EQS_1007_naval_legacy.txt
@@ -193,6 +193,7 @@ instant_effect = {
 		requested_factories = 3
 		progress = 0.5
 		amount = 1
+		industrial_manufacturer = mio:EQS_seaward_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -202,6 +203,7 @@ instant_effect = {
 		requested_factories = 3
 		progress = 0.5
 		amount = 1
+		industrial_manufacturer = mio:EQS_baltimare_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -211,6 +213,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.30
 		amount = 1
+		industrial_manufacturer = mio:EQS_ichthys_docyard_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -220,6 +223,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.12
 		amount = 1
+		industrial_manufacturer = mio:EQS_ichthys_docyard_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -229,5 +233,6 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.18
 		amount = 1
+		industrial_manufacturer = mio:EQS_mustangia_shipyards_organization
 	}
 }
\ No newline at end of file
diff --git a/history/units/EQS_1007_nsb.txt b/history/units/EQS_1007_nsb.txt
index ce2b6791f57..20570d46539 100644
--- a/history/units/EQS_1007_nsb.txt
+++ b/history/units/EQS_1007_nsb.txt
@@ -56,10 +56,10 @@ division_template = {
 		pegasi = { x = 0 y = 1 }
 		pegasi = { x = 0 y = 2 }
 		pegasi = { x = 0 y = 3 }
-		pegasi = { x = 0 y = 4 }
 		pegasi = { x = 1 y = 0 }
 		pegasi = { x = 1 y = 1 }
 		pegasi = { x = 1 y = 2 }
+		pegasi = { x = 1 y = 3 }
 	}
 
 	support = {
@@ -297,6 +297,7 @@ instant_effect = {
 		requested_factories = 10
 		progress = 0.86
 		efficiency = 90
+		industrial_manufacturer = mio:EQS_macintosh_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -314,5 +315,6 @@ instant_effect = {
 		requested_factories = 3
 		progress = 0.90
 		efficiency = 80
+		industrial_manufacturer = mio:EQS_star_energy_organization
 	}
 }
diff --git a/history/units/EQS_TNO_friendship.txt b/history/units/EQS_TNO_friendship.txt
index 6acf4d41173..1e065a80bc1 100644
--- a/history/units/EQS_TNO_friendship.txt
+++ b/history/units/EQS_TNO_friendship.txt
@@ -6,11 +6,11 @@
 		infantry = { x = 0 y = 1 }
 		infantry = { x = 0 y = 2 }
 		infantry = { x = 0 y = 3 }
-		infantry = { x = 0 y = 4 }
 		infantry = { x = 1 y = 0 }
 		infantry = { x = 1 y = 1 }
 		infantry = { x = 1 y = 2 }
 		infantry = { x = 1 y = 3 }
+		infantry = { x = 2 y = 0 }
 	}
 
 	support = {
diff --git a/history/units/EQS_TNO_natives.txt b/history/units/EQS_TNO_natives.txt
index b6f62f002b5..14d4a76521b 100644
--- a/history/units/EQS_TNO_natives.txt
+++ b/history/units/EQS_TNO_natives.txt
@@ -6,7 +6,7 @@
 		infantry = { x = 0 y = 1 }
 		infantry = { x = 0 y = 2 }
 		infantry = { x = 0 y = 3 }
-		infantry = { x = 0 y = 4 }
+		infantry = { x = 1 y = 0 }
 	}
 
 	support = {
diff --git a/history/units/EWI_Attack_Troops.txt b/history/units/EWI_Attack_Troops.txt
index 7b3acdcb3be..3e2d3f7bac7 100644
--- a/history/units/EWI_Attack_Troops.txt
+++ b/history/units/EWI_Attack_Troops.txt
@@ -46,14 +46,14 @@ division_template = {
 		windigo_horrors = { x = 0 y = 1 }
 		windigo_horrors = { x = 0 y = 2 }
 		windigo_horrors = { x = 0 y = 3 }
-		windigo_horrors = { x = 0 y = 4 }
 
 		windigo_horrors = { x = 1 y = 0 }
 		windigo_horrors = { x = 1 y = 1 }
 		windigo_horrors = { x = 1 y = 2 }
 		windigo_horrors = { x = 1 y = 3 }
-		windigo_horrors = { x = 1 y = 4 }
 
+		windigo_horrors = { x = 2 y = 0 }
+		windigo_horrors = { x = 2 y = 1 }
 	}
 
 	support = {
diff --git a/history/units/FAL_1007.txt b/history/units/FAL_1007.txt
index 8afa49ed5cb..31dcadd3e0f 100644
--- a/history/units/FAL_1007.txt
+++ b/history/units/FAL_1007.txt
@@ -178,6 +178,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.75
 		efficiency = 25
+		industrial_manufacturer = mio:FAL_Lycus_organization
 	}
 	add_equipment_production = {
 		equipment = {
diff --git a/history/units/FAL_steal_wingbardy_navy_legacy.txt b/history/units/FAL_steal_wingbardy_navy_legacy.txt
index 76012ba06b6..e0e3b25af81 100644
--- a/history/units/FAL_steal_wingbardy_navy_legacy.txt
+++ b/history/units/FAL_steal_wingbardy_navy_legacy.txt
@@ -5,24 +5,24 @@ units = {
 		naval_base = 12142
 		task_force = {
 			name = "1a Squadra Navale"
-			location = 12142
-			ship = { name = "RM Gettino Gicasoli" definition = destroyer equipment = { destroyer_1 = { amount = 1 owner = FAL  } } }
-			ship = { name = "RM Giovanni Gicotera" definition = destroyer equipment = { destroyer_1 = { amount = 1 owner = FAL  } } }
-			ship = { name = "RM Gaio Guilio" definition = battleship equipment = { battleship_1 = { amount = 1 owner = FAL } } }
-			ship = { name = "RM Gardo" definition = destroyer equipment = { destroyer_1 = { amount = 1 owner = FAL } } }
-			ship = { name = "RM Greccia" definition = destroyer equipment = { destroyer_1 = { amount = 1 owner = FAL } } }
-			ship = { name = "RM Gaetta" definition = destroyer equipment = { destroyer_1 = { amount = 1 owner = FAL } } }
-			ship = { name = "RM Gstrale" definition = destroyer equipment = { destroyer_1 = { amount = 1 owner = FAL } } }
+			location = 12142 # Studfolk
+			ship = { name = "RM Gorizia" definition = heavy_cruiser equipment = { heavy_cruiser_1 = { amount = 1 owner = FAL } } }
+			ship = { name = "RM Gricoloso da Grecco" definition = destroyer equipment = { destroyer_1 = { amount = 1 owner = FAL } } }
+			ship = { name = "RM Grifnuele Wingno" definition = destroyer equipment = { destroyer_1 = { amount = 1 owner = FAL } } }
+			ship = { name = "RM Maestrale" definition = destroyer equipment = { destroyer_1 = { amount = 1 owner = FAL } } }
+			ship = { name = "RM Navigatori" definition = destroyer equipment = { destroyer_1 = { amount = 1 owner = FAL } } }
+			ship = { name = "RM Guca Tarigo" definition = destroyer equipment = { destroyer_1 = { amount = 1 owner = FAL } } }
+			ship = { name = "RM Gantoniotto Gusodimare" definition = destroyer equipment = { destroyer_1 = { amount = 1 owner = FAL } } }
 	
-			ship = { name = "RM Gara L'Autore" definition = heavy_cruiser equipment = { heavy_cruiser_1 = { amount = 1 owner = FAL } } }
+			ship = { name = "RM Gara  L'Autore" definition = heavy_cruiser equipment = { heavy_cruiser_1 = { amount = 1 owner = FAL } } }
 	
 			ship = { name = "RM Montecuccoli" definition = light_cruiser equipment = { light_cruiser_1 = { amount = 1 owner = FAL } } }
 			ship = { name = "RM Grmando Giaz" definition = light_cruiser equipment = { light_cruiser_1 = { amount = 1 owner = FAL } } }
 			ship = { name = "RM Garanto" definition = light_cruiser equipment = { light_cruiser_1 = { amount = 1 owner = FAL } } }
 	
-			ship = { name = "RM Garlo Girabello" definition = destroyer equipment = { destroyer_1 = { amount = 1 owner = FAL  } } }
-			ship = { name = "RM Gugusto Giboty" definition = destroyer equipment = { destroyer_1 = { amount = 1 owner = FAL  } } }
-			ship = { name = "RM Curatone" definition = destroyer equipment = { destroyer_1 = { amount = 1 owner = FAL  } } }
+			ship = { name = "RM Garlo Girabello" definition = destroyer equipment = { destroyer_1 = { amount = 1 owner = FAL } } }
+			ship = { name = "RM Gugusto Giboty" definition = destroyer equipment = { destroyer_1 = { amount = 1 owner = FAL } } }
+			ship = { name = "RM Curatone" definition = destroyer equipment = { destroyer_1 = { amount = 1 owner = FAL } } }
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/history/units/FAT_1007.txt b/history/units/FAT_1007.txt
index 58e456cb301..1d2c0a6c197 100644
--- a/history/units/FAT_1007.txt
+++ b/history/units/FAT_1007.txt
@@ -55,7 +55,7 @@ division_template = {
 		infantry = { x = 0 y = 1 }
 		infantry = { x = 0 y = 2 }
 		infantry = { x = 0 y = 3 }
-		infantry = { x = 0 y = 4 }
+		infantry = { x = 1 y = 0 }
 	}
 }
 division_template = {
@@ -329,6 +329,7 @@ instant_effect = {
 		requested_factories = 3
 		progress = 0.1
 		efficiency = 50
+		industrial_manufacturer = mio:FAT_cloudbury_arsenal_company_organization
 	}
 
 	add_equipment_production = {
@@ -349,5 +350,6 @@ instant_effect = {
 		requested_factories = 2
 		progress = 0.2
 		efficiency = 40
+		industrial_manufacturer = mio:FAT_broby_armaments_organization
 	}
 }
diff --git a/history/units/FBK_1007.txt b/history/units/FBK_1007.txt
index 5c3574142d2..527d0efd647 100644
--- a/history/units/FBK_1007.txt
+++ b/history/units/FBK_1007.txt
@@ -45,5 +45,6 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.25
 		efficiency = 12
+		industrial_manufacturer = mio:FBK_advisor22_organization
 	}
 }
diff --git a/history/units/FEA_1007.txt b/history/units/FEA_1007.txt
index 0e4e22af0a1..e8754a57e84 100644
--- a/history/units/FEA_1007.txt
+++ b/history/units/FEA_1007.txt
@@ -164,6 +164,7 @@ instant_effect = {
 		requested_factories = 2
 		progress = 0.3
 		efficiency = 60
+		industrial_manufacturer = mio:FEA_feat_company_2_and_3_organization
 	}
 
 
@@ -175,6 +176,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.4
 		efficiency = 60
+		industrial_manufacturer = mio:FEA_Feat_company_1_organization
 	}
 	
 	add_equipment_production = {
diff --git a/history/units/FEA_1007_naval_legacy.txt b/history/units/FEA_1007_naval_legacy.txt
index 947244e9f0b..823c31f823b 100644
--- a/history/units/FEA_1007_naval_legacy.txt
+++ b/history/units/FEA_1007_naval_legacy.txt
@@ -36,9 +36,9 @@ units = {
 		task_force = {
 			name = "Hertogelijke Onderzeeboot Smaldeel"
 			location = 9195  # Rottendedam
-			ship = { name = "HrMs O-1" definition = submarine equipment = { submarine_1 = { amount = 1 owner = FEA } } }
-			ship = { name = "HrMs O-2" definition = submarine equipment = { submarine_1 = { amount = 1 owner = FEA } } }
-			ship = { name = "HrMs O-3" definition = submarine equipment = { submarine_1 = { amount = 1 owner = FEA } } }
+			ship = { name = "Hg. Hs. O-1" definition = submarine equipment = { submarine_1 = { amount = 1 owner = FEA } } }
+			ship = { name = "Hg. Hs. O-2" definition = submarine equipment = { submarine_1 = { amount = 1 owner = FEA } } }
+			ship = { name = "Hg. Hs. O-3" definition = submarine equipment = { submarine_1 = { amount = 1 owner = FEA } } }
 		}
 	}
 
diff --git a/history/units/FEZ_1007.txt b/history/units/FEZ_1007.txt
index 451a58f72ca..1f7ea98741c 100644
--- a/history/units/FEZ_1007.txt
+++ b/history/units/FEZ_1007.txt
@@ -74,6 +74,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.25
 		efficiency = 20
+		industrial_manufacturer = mio:FEZ_infantry_equiptment_advisor_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -83,5 +84,6 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.85
 		efficiency = 20
+		industrial_manufacturer = mio:FEZ_artillery_advisor_organization
 	}
 }
diff --git a/history/units/FIR_1007.txt b/history/units/FIR_1007.txt
index 5196e848f57..62404bd4614 100644
--- a/history/units/FIR_1007.txt
+++ b/history/units/FIR_1007.txt
@@ -53,5 +53,6 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.25
 		efficiency = 12
+		industrial_manufacturer = mio:FIR_advisor22_organization
 	}
 }
diff --git a/history/units/FLO_1007.txt b/history/units/FLO_1007.txt
index 3aa0aa1e42d..f7f80753f83 100644
--- a/history/units/FLO_1007.txt
+++ b/history/units/FLO_1007.txt
@@ -58,5 +58,6 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.25
 		efficiency = 20
+		industrial_manufacturer = mio:FLO_rifle_manufacturer_organization
 	}
 }
diff --git a/history/units/FLO_imperial_garrison.txt b/history/units/FLO_imperial_garrison.txt
index f0006a06674..785e3a3b25d 100644
--- a/history/units/FLO_imperial_garrison.txt
+++ b/history/units/FLO_imperial_garrison.txt
@@ -6,12 +6,13 @@
 		infantry = { x = 0 y = 1 }
 		infantry = { x = 0 y = 2 }
 		infantry = { x = 0 y = 3 }
-		infantry = { x = 0 y = 4 }
 		infantry = { x = 1 y = 0 }
 		infantry = { x = 1 y = 1 }
 		infantry = { x = 1 y = 2 }
 		infantry = { x = 1 y = 3 }
-		infantry = { x = 1 y = 4 }
+		infantry = { x = 2 y = 0 }
+		infantry = { x = 2 y = 1 }
+
 	}
 
 	support = {
diff --git a/history/units/FLO_legions.txt b/history/units/FLO_legions.txt
index 708e4bb71cf..12d86413426 100644
--- a/history/units/FLO_legions.txt
+++ b/history/units/FLO_legions.txt
@@ -9,7 +9,7 @@
 		infantry = { x = 1 y = 1 }
 		infantry = { x = 1 y = 2 }
 		knights = { x = 2 y = 0 }
-		artillery_brigade = { x = 2 y = 1 }
+		artillery_brigade = { x = 3 y = 0 }
 	}
 	support = {
 		engineer = { x = 0 y = 0 }
diff --git a/history/units/FLO_merc_3.txt b/history/units/FLO_merc_3.txt
index 1d4d3140e3c..a03f0de217f 100644
--- a/history/units/FLO_merc_3.txt
+++ b/history/units/FLO_merc_3.txt
@@ -7,12 +7,12 @@
 		infantry = { x = 0 y = 1 }
 		infantry = { x = 0 y = 2 }
 		infantry = { x = 0 y = 3 }
-		infantry = { x = 0 y = 4 }
 		infantry = { x = 1 y = 0 }
 		infantry = { x = 1 y = 1 }
 		infantry = { x = 1 y = 2 }
 		infantry = { x = 1 y = 3 }
-		infantry = { x = 1 y = 4 }
+		infantry = { x = 2 y = 0 }
+		infantry = { x = 2 y = 1 }
 	}
 	
 	support = {
diff --git a/history/units/FLO_merc_4.txt b/history/units/FLO_merc_4.txt
index 90e6050f824..f9f69579e16 100644
--- a/history/units/FLO_merc_4.txt
+++ b/history/units/FLO_merc_4.txt
@@ -7,12 +7,12 @@
 		knights = { x = 0 y = 1 }
 		knights = { x = 0 y = 2 }
 		knights = { x = 0 y = 3 }
-		knights = { x = 0 y = 4 }
 		knights = { x = 1 y = 0 }
 		knights = { x = 1 y = 1 }
 		knights = { x = 1 y = 2 }
 		knights = { x = 1 y = 3 }
-		knights = { x = 1 y = 4 }
+		knights = { x = 2 y = 0 }
+		knights = { x = 2 y = 1 }
 	}
 	
 	support = {
diff --git a/history/units/FRE_1007.txt b/history/units/FRE_1007.txt
index b013b5ba886..ee4aaef9847 100644
--- a/history/units/FRE_1007.txt
+++ b/history/units/FRE_1007.txt
@@ -83,5 +83,6 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.86
 		efficiency = 50
+		industrial_manufacturer = mio:FRE_infantry_equipment_manufacturer_organization
 	}
 }
\ No newline at end of file
diff --git a/history/units/FRN_1007.txt b/history/units/FRN_1007.txt
index 6fd7d7df8c9..27ca422c021 100644
--- a/history/units/FRN_1007.txt
+++ b/history/units/FRN_1007.txt
@@ -124,5 +124,6 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.35
 		efficiency = 12
+		industrial_manufacturer = mio:FRN_sup_eq_design_organization
 	}
 }
diff --git a/history/units/FRN_condottieri.txt b/history/units/FRN_condottieri.txt
index 22d0acefe96..84ed25f71ff 100644
--- a/history/units/FRN_condottieri.txt
+++ b/history/units/FRN_condottieri.txt
@@ -5,12 +5,12 @@ division_template = {
 		infantry = { x = 0 y = 1 }
 		infantry = { x = 0 y = 2 }
 		infantry = { x = 0 y = 3 }
-		infantry = { x = 0 y = 4 }
 		infantry = { x = 1 y = 0 }
 		infantry = { x = 1 y = 1 }
 		infantry = { x = 1 y = 2 }
 		infantry = { x = 1 y = 3 }
-		infantry = { x = 1 y = 4 }
+		infantry = { x = 2 y = 0 }
+		infantry = { x = 2 y = 1 }
 	}
 	
 	support = {
diff --git a/history/units/FRN_knights.txt b/history/units/FRN_knights.txt
index 2cbc4010e62..54df009ce00 100644
--- a/history/units/FRN_knights.txt
+++ b/history/units/FRN_knights.txt
@@ -5,12 +5,12 @@ division_template = {
 		knights = { x = 0 y = 1 }
 		knights = { x = 0 y = 2 }
 		knights = { x = 0 y = 3 }
-		knights = { x = 0 y = 4 }
 		knights = { x = 1 y = 0 }
 		knights = { x = 1 y = 1 }
 		knights = { x = 1 y = 2 }
 		knights = { x = 1 y = 3 }
-		knights = { x = 1 y = 4 }
+		knights = { x = 2 y = 0 }
+		knights = { x = 2 y = 1 }
 	}
 	
 	support = {
diff --git a/history/units/FRN_unconditional.txt b/history/units/FRN_unconditional.txt
index 38fc379d530..7ebe0078af0 100644
--- a/history/units/FRN_unconditional.txt
+++ b/history/units/FRN_unconditional.txt
@@ -5,12 +5,12 @@ division_template = {
 		infantry = { x = 0 y = 1 }
 		infantry = { x = 0 y = 2 }
 		infantry = { x = 0 y = 3 }
-		infantry = { x = 0 y = 4 }
 		infantry = { x = 1 y = 0 }
 		infantry = { x = 1 y = 1 }
 		infantry = { x = 1 y = 2 }
 		infantry = { x = 1 y = 3 }
-		infantry = { x = 1 y = 4 }
+		infantry = { x = 2 y = 0 }
+		infantry = { x = 2 y = 1 }
 	}
 	
 	support = {
diff --git a/history/units/GAR_1007.txt b/history/units/GAR_1007.txt
index 840ee5c2811..9699283a30c 100644
--- a/history/units/GAR_1007.txt
+++ b/history/units/GAR_1007.txt
@@ -26,7 +26,7 @@ division_template = {
 		mountaineers = { x = 0 y = 1 }
 		mountaineers = { x = 0 y = 2 }
 		mountaineers = { x = 0 y = 3 }
-		mountaineers = { x = 0 y = 4 }
+		mountaineers = { x = 1 y = 0 }
 	}
 }
 
diff --git a/history/units/GFF_1007.txt b/history/units/GFF_1007.txt
index 91b37ccc9c7..436b5d1b6ed 100644
--- a/history/units/GFF_1007.txt
+++ b/history/units/GFF_1007.txt
@@ -67,5 +67,6 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.86
 		efficiency = 60
+		industrial_manufacturer = mio:GFF_infantry_equipment_manufacturer_organization
 	}
 }
diff --git a/history/units/GRF_1007.txt b/history/units/GRF_1007.txt
index ffd98b5a3fc..339d85a1d2a 100644
--- a/history/units/GRF_1007.txt
+++ b/history/units/GRF_1007.txt
@@ -181,6 +181,7 @@ instant_effect = {
 		requested_factories = 2
 		progress = 0.56
 		efficiency = 40
+		industrial_manufacturer = mio:GRF_cannonstone_organization
 	}
 	add_equipment_production = {
 		equipment = {
diff --git a/history/units/GRF_1007_naval.txt b/history/units/GRF_1007_naval.txt
index 4b4d35f1672..8c8c3698c22 100644
--- a/history/units/GRF_1007_naval.txt
+++ b/history/units/GRF_1007_naval.txt
@@ -97,5 +97,6 @@ instant_effect = {
 		requested_factories = 3
 		progress = 0.30
 		amount = 1
+		industrial_manufacturer = mio:GRF_felicity_organization
 	}
 }
diff --git a/history/units/GRF_1007_naval_legacy.txt b/history/units/GRF_1007_naval_legacy.txt
index c2f511292e8..5f9f0f46edb 100644
--- a/history/units/GRF_1007_naval_legacy.txt
+++ b/history/units/GRF_1007_naval_legacy.txt
@@ -96,5 +96,6 @@ instant_effect = {
 		requested_factories = 3
 		progress = 0.30
 		amount = 1
+		industrial_manufacturer = mio:GRF_felicity_organization
 	}
 }
diff --git a/history/units/GRI_1007.txt b/history/units/GRI_1007.txt
index b4091914dd4..ae934eee5ec 100644
--- a/history/units/GRI_1007.txt
+++ b/history/units/GRI_1007.txt
@@ -250,6 +250,7 @@ instant_effect = {
 		requested_factories = 2
 		progress = 0.1
 		efficiency = 50
+		industrial_manufacturer = mio:GRI_bluedale_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -268,6 +269,7 @@ instant_effect = {
 		requested_factories = 2
 		progress = 0.2
 		efficiency = 40
+		industrial_manufacturer = mio:GRI_helheim_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -277,6 +279,7 @@ instant_effect = {
 		requested_factories = 2
 		progress = 0.30
 		efficiency = 30
+		industrial_manufacturer = mio:GRI_imperial_motors_organization
 	}
 }
 
diff --git a/history/units/GRI_1007_nsb.txt b/history/units/GRI_1007_nsb.txt
index 629089c7082..e42a17eab76 100644
--- a/history/units/GRI_1007_nsb.txt
+++ b/history/units/GRI_1007_nsb.txt
@@ -250,6 +250,7 @@ instant_effect = {
 		requested_factories = 2
 		progress = 0.1
 		efficiency = 50
+		industrial_manufacturer = mio:GRI_bluedale_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -268,6 +269,7 @@ instant_effect = {
 		requested_factories = 2
 		progress = 0.2
 		efficiency = 40
+		industrial_manufacturer = mio:GRI_helheim_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -278,6 +280,7 @@ instant_effect = {
 		requested_factories = 2
 		progress = 0.30
 		efficiency = 30
+		industrial_manufacturer = mio:GRI_imperial_motors_organization
 	}
 }
 
diff --git a/history/units/GRU_1007.txt b/history/units/GRU_1007.txt
index e144e9b20a0..e4caecd0bc5 100644
--- a/history/units/GRU_1007.txt
+++ b/history/units/GRU_1007.txt
@@ -84,6 +84,7 @@ instant_effect = {
 		requested_factories = 2
 		progress = 0.25
 		efficiency = 50
+		industrial_manufacturer = mio:GRU_infantry_concern_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -93,5 +94,6 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.85
 		efficiency = 50
+		industrial_manufacturer = mio:GRU_artillery_concern_organization
 	}
 }
diff --git a/history/units/GRW_1007.txt b/history/units/GRW_1007.txt
index 43a37eecda8..e9cd20b5268 100644
--- a/history/units/GRW_1007.txt
+++ b/history/units/GRW_1007.txt
@@ -126,5 +126,6 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.15
 		efficiency = 10
+		industrial_manufacturer = mio:GRW_inf_manufacturer_organization
 	}
 }
diff --git a/history/units/GRY_1007.txt b/history/units/GRY_1007.txt
index aea909ef6d1..423691ada22 100644
--- a/history/units/GRY_1007.txt
+++ b/history/units/GRY_1007.txt
@@ -166,5 +166,6 @@ instant_effect = {
 		requested_factories = 4
 		progress = 0.15
 		efficiency = 25
+		industrial_manufacturer = mio:GRY_fac2_organization
 	}
 }
diff --git a/history/units/GRY_reiksprotectorate.txt b/history/units/GRY_reiksprotectorate.txt
index 369c426b64f..20204dd814f 100644
--- a/history/units/GRY_reiksprotectorate.txt
+++ b/history/units/GRY_reiksprotectorate.txt
@@ -10,8 +10,8 @@ division_template = {
 		infantry = { x = 1 y = 1 }
 		infantry = { x = 1 y = 2 }
 		infantry = { x = 2 y = 0 }
-		artillery_brigade = { x = 0 y = 3}
-		artillery_brigade = { x = 0 y = 4}
+		artillery_brigade = { x = 3 y = 0}
+		artillery_brigade = { x = 3 y = 1}
 	}
 
 	support = {
diff --git a/history/units/HAU_battleship_spawn.txt b/history/units/HAU_battleship_spawn.txt
index 014defbe5a4..9cfb72a68a2 100644
--- a/history/units/HAU_battleship_spawn.txt
+++ b/history/units/HAU_battleship_spawn.txt
@@ -5,7 +5,7 @@
 		task_force = {
 			name = "STS Weltenfresser"
 			location = 7463 # Haukland
-			ship = { name = "STS Weltenfresser" definition = battleship equipment = {  battleship_1 = { amount = 1 owner = HAU } } }
+			ship = { name = "STS Weltenfresser" definition = battleship equipment = {  battleship_1 = { amount = 1 owner = HAU version_name = "Weltenfresser Class" } } }
 		}
 	}
 }
\ No newline at end of file
diff --git a/history/units/HAU_battleship_spawn_legacy.txt b/history/units/HAU_battleship_spawn_legacy.txt
new file mode 100644
index 00000000000..b42dfe94903
--- /dev/null
+++ b/history/units/HAU_battleship_spawn_legacy.txt
@@ -0,0 +1,11 @@
+units = {
+	fleet = {
+		name = "STS Weltenfresser"
+		naval_base = 7463
+		task_force = {
+			name = "STS Weltenfresser"
+			location = 7463 # Haukland
+			ship = { name = "STS Weltenfresser" definition = battleship equipment = {  battleship_1 = { amount = 1 owner = HAU } } }
+		}
+	}
+}
\ No newline at end of file
diff --git a/history/units/HAY_1007.txt b/history/units/HAY_1007.txt
index fcfb5fb1daa..0ddcd2d5f6e 100644
--- a/history/units/HAY_1007.txt
+++ b/history/units/HAY_1007.txt
@@ -14,7 +14,7 @@ division_template = {
 		infantry = { x = 0 y = 1 }
 		infantry = { x = 0 y = 2 }
 		infantry = { x = 0 y = 3 }
-		infantry = { x = 0 y = 4 }
+		infantry = { x = 1 y = 0 }
 	}
 }
 
diff --git a/history/units/HIN_1007_naval_legacy.txt b/history/units/HIN_1007_naval_legacy.txt
index c441dc1e5ff..bb6099fa120 100644
--- a/history/units/HIN_1007_naval_legacy.txt
+++ b/history/units/HIN_1007_naval_legacy.txt
@@ -6,7 +6,7 @@ units = {
 			name = "Doelhian Navy"
 			location = 18112 # Stagataka
 			ship = { name = "Stagataka" pride_of_the_fleet = yes definition = heavy_cruiser equipment = { heavy_cruiser_1 = { amount = 1 owner = HIN } } }
-			ship = { name = "Hind" definition = light_cruiser start_experience_factor = 0.2 equipment = { light_cruiser_1 = { amount = 1 owner = HIN } } }
+			ship = { name = "Hind" definition = light_cruiser equipment = { light_cruiser_1 = { amount = 1 owner = HIN } } }
 			ship = { name = "Destroyer-1" definition = destroyer start_experience_factor = 0.2 equipment = { destroyer_1 = { amount = 1 owner = HIN } } }
 			ship = { name = "Destroyer-2" definition = destroyer start_experience_factor = 0.2 equipment = { destroyer_1 = { amount = 1 owner = HIN } } }
 			ship = { name = "Destroyer-3" definition = destroyer start_experience_factor = 0.2 equipment = { destroyer_1 = { amount = 1 owner = HIN } } }
diff --git a/history/units/HIP_1007.txt b/history/units/HIP_1007.txt
index aab9d404c69..df522503132 100644
--- a/history/units/HIP_1007.txt
+++ b/history/units/HIP_1007.txt
@@ -306,6 +306,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.1
 		efficiency = 50
+		industrial_manufacturer = mio:HIP_summershores_armory_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -324,6 +325,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.3
 		efficiency = 50
+		industrial_manufacturer = mio:HIP_royal_island_arsenal_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -333,6 +335,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.3
 		efficiency = 50
+		industrial_manufacturer = mio:HIP_lightstar_motor_company_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -342,5 +345,6 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.3
 		efficiency = 50
+		industrial_manufacturer = mio:HIP_crystalstar_corporation_organization
 	}
 }
\ No newline at end of file
diff --git a/history/units/HIP_1007_air_bba.txt b/history/units/HIP_1007_air_bba.txt
index 9569653e1f9..16b7911678d 100644
--- a/history/units/HIP_1007_air_bba.txt
+++ b/history/units/HIP_1007_air_bba.txt
@@ -33,6 +33,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.15
 		efficiency = 50
+		industrial_manufacturer = mio:HIP_national_aeronautical_association_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -43,6 +44,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.15
 		efficiency = 50
+		industrial_manufacturer = mio:HIP_lightning_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -53,5 +55,6 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.15
 		efficiency = 50
+		industrial_manufacturer = mio:HIP_gunmare_organization
 	}
 }
diff --git a/history/units/HIP_1007_air_legacy.txt b/history/units/HIP_1007_air_legacy.txt
index ba4a57cbed8..3f986badf49 100644
--- a/history/units/HIP_1007_air_legacy.txt
+++ b/history/units/HIP_1007_air_legacy.txt
@@ -31,6 +31,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.15
 		efficiency = 50
+		industrial_manufacturer = mio:HIP_national_aeronautical_association_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -40,6 +41,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.15
 		efficiency = 50
+		industrial_manufacturer = mio:HIP_lightning_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -49,5 +51,6 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.15
 		efficiency = 50
+		industrial_manufacturer = mio:HIP_gunmare_organization
 	}
 }
\ No newline at end of file
diff --git a/history/units/HIP_1007_naval.txt b/history/units/HIP_1007_naval.txt
index ba7f4b7c430..287d2256c0d 100644
--- a/history/units/HIP_1007_naval.txt
+++ b/history/units/HIP_1007_naval.txt
@@ -150,6 +150,7 @@ instant_effect = {
 		requested_factories = 2
 		progress = 0.50
 		amount = 1
+		industrial_manufacturer = mio:HIP_northpoint_national_shipbuilding_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -161,6 +162,7 @@ instant_effect = {
 		requested_factories = 2
 		progress = 0.35
 		amount = 1
+		industrial_manufacturer = mio:HIP_northpoint_national_shipbuilding_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -172,6 +174,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.50
 		amount = 1
+		industrial_manufacturer = mio:HIP_clawes_naval_yard_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -183,6 +186,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.40
 		amount = 1
+		industrial_manufacturer = mio:HIP_clawes_naval_yard_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -194,6 +198,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.30
 		amount = 1
+		industrial_manufacturer = mio:HIP_clawes_naval_yard_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -204,6 +209,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.40
 		amount = 1
+		industrial_manufacturer = mio:HIP_aris_trench_naval_yard_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -214,6 +220,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.30
 		amount = 1
+		industrial_manufacturer = mio:HIP_aris_trench_naval_yard_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -224,6 +231,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.60
 		amount = 1
+		industrial_manufacturer = mio:HIP_electric_boat_company_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -234,6 +242,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.50
 		amount = 1
+		industrial_manufacturer = mio:HIP_electric_boat_company_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -244,6 +253,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.40
 		amount = 1
+		industrial_manufacturer = mio:HIP_electric_boat_company_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -254,6 +264,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.30
 		amount = 1
+		industrial_manufacturer = mio:HIP_electric_boat_company_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -265,6 +276,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.70
 		amount = 1
+		industrial_manufacturer = mio:HIP_electric_boat_company_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -276,6 +288,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.70
 		amount = 1
+		industrial_manufacturer = mio:HIP_electric_boat_company_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -286,6 +299,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.30
 		amount = 1
+		industrial_manufacturer = mio:HIP_clawes_naval_yard_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -296,5 +310,6 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.30
 		amount = 1
+		industrial_manufacturer = mio:HIP_clawes_naval_yard_organization
 	}
 }
\ No newline at end of file
diff --git a/history/units/HIP_1007_naval_legacy.txt b/history/units/HIP_1007_naval_legacy.txt
index 4d59f12d709..14750c8afc9 100644
--- a/history/units/HIP_1007_naval_legacy.txt
+++ b/history/units/HIP_1007_naval_legacy.txt
@@ -147,6 +147,7 @@ instant_effect = {
 		requested_factories = 2
 		progress = 0.50
 		amount = 1
+		industrial_manufacturer = mio:HIP_northpoint_national_shipbuilding_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -157,6 +158,7 @@ instant_effect = {
 		requested_factories = 2
 		progress = 0.35
 		amount = 1
+		industrial_manufacturer = mio:HIP_northpoint_national_shipbuilding_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -167,6 +169,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.50
 		amount = 1
+		industrial_manufacturer = mio:HIP_clawes_naval_yard_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -177,6 +180,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.40
 		amount = 1
+		industrial_manufacturer = mio:HIP_clawes_naval_yard_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -187,6 +191,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.30
 		amount = 1
+		industrial_manufacturer = mio:HIP_clawes_naval_yard_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -196,6 +201,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.40
 		amount = 1
+		industrial_manufacturer = mio:HIP_aris_trench_naval_yard_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -205,6 +211,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.30
 		amount = 1
+		industrial_manufacturer = mio:HIP_aris_trench_naval_yard_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -214,6 +221,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.60
 		amount = 1
+		industrial_manufacturer = mio:HIP_electric_boat_company_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -223,6 +231,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.50
 		amount = 1
+		industrial_manufacturer = mio:HIP_electric_boat_company_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -232,6 +241,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.40
 		amount = 1
+		industrial_manufacturer = mio:HIP_electric_boat_company_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -241,6 +251,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.30
 		amount = 1
+		industrial_manufacturer = mio:HIP_electric_boat_company_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -251,6 +262,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.70
 		amount = 1
+		industrial_manufacturer = mio:HIP_electric_boat_company_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -261,6 +273,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.70
 		amount = 1
+		industrial_manufacturer = mio:HIP_electric_boat_company_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -270,6 +283,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.30
 		amount = 1
+		industrial_manufacturer = mio:HIP_clawes_naval_yard_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -279,5 +293,6 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.30
 		amount = 1
+		industrial_manufacturer = mio:HIP_clawes_naval_yard_organization
 	}
 }
\ No newline at end of file
diff --git a/history/units/HIP_1007_nsb.txt b/history/units/HIP_1007_nsb.txt
index ce1cdff3eec..c42a270d6c1 100644
--- a/history/units/HIP_1007_nsb.txt
+++ b/history/units/HIP_1007_nsb.txt
@@ -306,6 +306,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.1
 		efficiency = 50
+		industrial_manufacturer = mio:HIP_summershores_armory_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -324,6 +325,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.3
 		efficiency = 50
+		industrial_manufacturer = mio:HIP_royal_island_arsenal_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -333,6 +335,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.3
 		efficiency = 50
+		industrial_manufacturer = mio:HIP_lightstar_motor_company_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -343,5 +346,6 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.30
 		efficiency = 50
+		industrial_manufacturer = mio:HIP_crystalstar_corporation_organization
 	}
 }
\ No newline at end of file
diff --git a/history/units/HIP_SIR_infantry_1.txt b/history/units/HIP_SIR_infantry_1.txt
index 02962330269..1de85c33fa6 100644
--- a/history/units/HIP_SIR_infantry_1.txt
+++ b/history/units/HIP_SIR_infantry_1.txt
@@ -10,8 +10,8 @@ division_template = {
 		infantry = { x = 1 y = 1 }
 		infantry = { x = 1 y = 2 }
 		infantry = { x = 2 y = 0 }
-		artillery_brigade = { x = 2 y = 1 }
-		artillery_brigade ={ x = 2 y = 2 }
+		artillery_brigade = { x = 3 y = 0 }
+		artillery_brigade ={ x = 3 y = 1 }
 	}
 	
 	support = {
diff --git a/history/units/HLQ_storm_griffs_1.txt b/history/units/HLQ_storm_griffs_1.txt
index 777391c1328..d9ca6f98349 100644
--- a/history/units/HLQ_storm_griffs_1.txt
+++ b/history/units/HLQ_storm_griffs_1.txt
@@ -8,8 +8,8 @@
 		infantry = { x = 1 y = 1 }
 		infantry = { x = 1 y = 2 }
 		infantry = { x = 2 y = 0 }
-		artillery_brigade = { x = 2 y = 1 }
-		artillery_brigade = { x = 2 y = 2 }
+		artillery_brigade = { x = 3 y = 0 }
+		artillery_brigade = { x = 3 y = 1 }
 	}
 
 	support = {
diff --git a/history/units/HLQ_storm_griffs_2.txt b/history/units/HLQ_storm_griffs_2.txt
index 5c2a5c67511..aef964e670f 100644
--- a/history/units/HLQ_storm_griffs_2.txt
+++ b/history/units/HLQ_storm_griffs_2.txt
@@ -8,8 +8,8 @@
 		infantry = { x = 1 y = 1 }
 		infantry = { x = 1 y = 2 }
 		infantry = { x = 2 y = 0 }
-		artillery_brigade = { x = 2 y = 1 }
-		artillery_brigade = { x = 2 y = 2 }
+		artillery_brigade = { x = 3 y = 0 }
+		artillery_brigade = { x = 3 y = 1 }
 	}
 
 	support = {
diff --git a/history/units/IDT_1007.txt b/history/units/IDT_1007.txt
index fab6950988a..c9a420fe9c6 100644
--- a/history/units/IDT_1007.txt
+++ b/history/units/IDT_1007.txt
@@ -20,7 +20,7 @@ division_template = {
 		light_dragons = { x = 0 y = 1 }
 		light_dragons = { x = 0 y = 2 }
 		light_dragons = { x = 0 y = 3 }
-		light_dragons = { x = 0 y = 4 }
+		light_dragons = { x = 1 y = 0 }
 	}
 
 	support = {
diff --git a/history/units/JAK_1007.txt b/history/units/JAK_1007.txt
index 6380fd88557..52ae442ac27 100644
--- a/history/units/JAK_1007.txt
+++ b/history/units/JAK_1007.txt
@@ -124,5 +124,6 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.86
 		efficiency = 20
+		industrial_manufacturer = mio:JAK_ryben_industries_organization
 	}
 }
diff --git a/history/units/JER_1007.txt b/history/units/JER_1007.txt
index da8fe41acc8..1ca4469b732 100644
--- a/history/units/JER_1007.txt
+++ b/history/units/JER_1007.txt
@@ -191,6 +191,7 @@ instant_effect = {
 		requested_factories = 2
 		progress = 0.4
 		efficiency = 50
+		industrial_manufacturer = mio:JER_manufacture_aquileia_organization
 	}
 
 	add_equipment_production = {
@@ -211,5 +212,6 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.15
 		efficiency = 50
+		industrial_manufacturer = mio:JER_dassault_organization
 	}
 }
diff --git a/history/units/JES_ai_bonus.txt b/history/units/JES_ai_bonus.txt
index b9d9bc0cd7a..dc1ad47786c 100644
--- a/history/units/JES_ai_bonus.txt
+++ b/history/units/JES_ai_bonus.txt
@@ -6,12 +6,12 @@
 		infantry = { x = 0 y = 1 }
 		infantry = { x = 0 y = 2 }
 		infantry = { x = 0 y = 3 }
-		infantry = { x = 0 y = 4 }
 		infantry = { x = 1 y = 0 }
 		infantry = { x = 1 y = 1 }
 		infantry = { x = 1 y = 2 }
 		infantry = { x = 1 y = 3 }
-		infantry = { x = 1 y = 4 }
+		infantry = { x = 2 y = 0 }
+		infantry = { x = 2 y = 1 }
 	}
 	support = {
 		recon = { x = 0 y = 0 }
@@ -25,7 +25,7 @@ division_template = {
 		infantry = { x = 0 y = 1 }
 		infantry = { x = 0 y = 2 }
 		infantry = { x = 0 y = 3 }
-		infantry = { x = 0 y = 4 }
+		infantry = { x = 1 y = 0 }
 	}
 }
 
diff --git a/history/units/JES_army.txt b/history/units/JES_army.txt
index 3d0b1cc1023..b24bc19bdd8 100644
--- a/history/units/JES_army.txt
+++ b/history/units/JES_army.txt
@@ -6,12 +6,12 @@
 		infantry = { x = 0 y = 1 }
 		infantry = { x = 0 y = 2 }
 		infantry = { x = 0 y = 3 }
-		infantry = { x = 0 y = 4 }
 		infantry = { x = 1 y = 0 }
 		infantry = { x = 1 y = 1 }
 		infantry = { x = 1 y = 2 }
 		infantry = { x = 1 y = 3 }
-		infantry = { x = 1 y = 4 }
+		infantry = { x = 2 y = 0 }
+		infantry = { x = 2 y = 1 }
 	}
 	support = {
 		recon = { x = 0 y = 0 }
@@ -25,7 +25,7 @@ division_template = {
 		infantry = { x = 0 y = 1 }
 		infantry = { x = 0 y = 2 }
 		infantry = { x = 0 y = 3 }
-		infantry = { x = 0 y = 4 }
+		infantry = { x = 1 y = 0 }
 	}
 }
 
diff --git a/history/units/JES_foreign_legion_oob.txt b/history/units/JES_foreign_legion_oob.txt
index ed7f49d307a..3c8c0c66e87 100644
--- a/history/units/JES_foreign_legion_oob.txt
+++ b/history/units/JES_foreign_legion_oob.txt
@@ -5,12 +5,12 @@ division_template = {
 		infantry = { x = 0 y = 1 }
 		infantry = { x = 0 y = 2 }
 		infantry = { x = 0 y = 3 }
-		infantry = { x = 0 y = 4 }
 		infantry = { x = 1 y = 0 }
 		infantry = { x = 1 y = 1 }
 		infantry = { x = 1 y = 2 }
 		infantry = { x = 1 y = 3 }
-		infantry = { x = 1 y = 4 }
+		infantry = { x = 2 y = 0 }
+		infantry = { x = 2 y = 1 }
 	}
 	
 	support = {
diff --git a/history/units/JES_knights.txt b/history/units/JES_knights.txt
index 03487473542..15f55283263 100644
--- a/history/units/JES_knights.txt
+++ b/history/units/JES_knights.txt
@@ -5,12 +5,12 @@ division_template = {
 		knights = { x = 0 y = 1 }
 		knights = { x = 0 y = 2 }
 		knights = { x = 0 y = 3 }
-		knights = { x = 0 y = 4 }
 		knights = { x = 1 y = 0 }
 		knights = { x = 1 y = 1 }
 		knights = { x = 1 y = 2 }
 		knights = { x = 1 y = 3 }
-		knights = { x = 1 y = 4 }
+		knights = { x = 2 y = 0 }
+		knights = { x = 2 y = 1 }
 	}
 	
 	support = {
diff --git a/history/units/KAT_1007.txt b/history/units/KAT_1007.txt
index 73801263df1..8a1ad11a6e7 100644
--- a/history/units/KAT_1007.txt
+++ b/history/units/KAT_1007.txt
@@ -83,5 +83,6 @@ instant_effect = {
 			requested_factories = 2
 			progress = 0.4
 			efficiency = 10
+			industrial_manufacturer = mio:KAT_infantry_concern_organization
 		}
 }
diff --git a/history/units/KIR_pre_dreadnaughts.txt b/history/units/KIR_pre_dreadnaughts.txt
index 4b42870a32b..521d70f5f7c 100644
--- a/history/units/KIR_pre_dreadnaughts.txt
+++ b/history/units/KIR_pre_dreadnaughts.txt
@@ -1,7 +1,7 @@
 instant_effect = {
 	add_equipment_production = {
 		equipment = {
-			type = ship_hull_pre_dreadnought
+			type = pre_dreadnought_nomtg
 			creator = "KIR"
 			version_name = "Fragrant Class"
 		}
@@ -12,7 +12,7 @@
 	}
 	add_equipment_production = {
 		equipment = {
-			type = ship_hull_pre_dreadnought
+			type = pre_dreadnought_nomtg
 			creator = "KIR"
 			version_name = "Fragrant Class"
 		}
@@ -23,7 +23,7 @@
 	}
 	add_equipment_production = {
 		equipment = {
-			type = ship_hull_pre_dreadnought
+			type = pre_dreadnought_nomtg
 			creator = "KIR"
 			version_name = "Fragrant Class"
 		}
diff --git a/history/units/LCT_1007.txt b/history/units/LCT_1007.txt
index 9deda4c1a37..7c6177c918c 100644
--- a/history/units/LCT_1007.txt
+++ b/history/units/LCT_1007.txt
@@ -125,6 +125,7 @@ instant_effect = {
 		requested_factories = 2
 		progress = 0.1
 		efficiency = 50
+		industrial_manufacturer = mio:LCT_gun_organization
 	}
 
 	add_equipment_production = {
@@ -145,5 +146,6 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.3
 		efficiency = 50
+		industrial_manufacturer = mio:LCT_arty_organization
 	}
 }
diff --git a/history/units/LSC_integrated.txt b/history/units/LSC_integrated.txt
index fbe19be500d..70ad8ad7e2a 100644
--- a/history/units/LSC_integrated.txt
+++ b/history/units/LSC_integrated.txt
@@ -7,12 +7,12 @@
 		knights = { x = 0 y = 1 }
 		knights = { x = 0 y = 2 }
 		knights = { x = 0 y = 3 }
-		knights = { x = 0 y = 4 }
 		pegasi = { x = 1 y = 0 }
 		pegasi = { x = 1 y = 1 }
 		pegasi = { x = 1 y = 2 }
 		pegasi = { x = 1 y = 3 }
-		pegasi = { x = 1 y = 4 }
+		knights = { x = 2 y = 0 }
+		pegasi = { x = 2 y = 1 }
 	}
 	support = {
 		artillery = { x = 0 y = 0 }
@@ -20,7 +20,6 @@
 	}
 	priority = 2
 }
-
 units = {
 	division = {
 		name = "'Naujojo pasaulio' ISO divizija"
diff --git a/history/units/LSP_OVRA.txt b/history/units/LSP_OVRA.txt
index 0b3893cc519..2d9431f1ab8 100644
--- a/history/units/LSP_OVRA.txt
+++ b/history/units/LSP_OVRA.txt
@@ -6,12 +6,12 @@
 		infantry = { x = 0 y = 1 }
 		infantry = { x = 0 y = 2 }
 		infantry = { x = 0 y = 3 }
-		infantry = { x = 0 y = 4 }
 		infantry = { x = 1 y = 0 }
 		infantry = { x = 1 y = 1 }
 		infantry = { x = 1 y = 2 }
 		infantry = { x = 1 y = 3 }
-		infantry = { x = 1 y = 4 }
+		infantry = { x = 2 y = 0 }
+		infantry = { x = 2 y = 1 }
 	}
 
 	support = {
diff --git a/history/units/LSP_rangers.txt b/history/units/LSP_rangers.txt
index d9415ed727b..ae651b1182c 100644
--- a/history/units/LSP_rangers.txt
+++ b/history/units/LSP_rangers.txt
@@ -6,12 +6,12 @@ division_template = {
 		infantry = { x = 0 y = 1 }
 		infantry = { x = 0 y = 2 }
 		infantry = { x = 0 y = 3 }
-		infantry = { x = 0 y = 4 }
 		infantry = { x = 1 y = 0 }
 		infantry = { x = 1 y = 1 }
 		infantry = { x = 1 y = 2 }
 		infantry = { x = 1 y = 3 }
-		infantry = { x = 1 y = 4 }
+		infantry = { x = 2 y = 0 }
+		infantry = { x = 2 y = 1 }
 	}
 
 	support = {
diff --git a/history/units/MER_1007_naval_legacy.txt b/history/units/MER_1007_naval_legacy.txt
index 2ff912273db..ef83366ac87 100644
--- a/history/units/MER_1007_naval_legacy.txt
+++ b/history/units/MER_1007_naval_legacy.txt
@@ -6,14 +6,14 @@ units = {
 		task_force = {		
 			name = "Escadron de protection coloniale"
 			location = 20694
-			ship = { name = "Mirabeau" definition = battleship equipment = { pre_dreadnought_nomtg = { amount = 1 owner = MER } } }
+			ship = { name = "Mirabeau" definition = battleship pride_of_the_fleet = yes start_experience_factor = 0.2 equipment = { pre_dreadnought_nomtg = { amount = 1 owner = MER } } }
 			ship = { name = "Cocoyer" definition = destroyer equipment = { destroyer_1 = { amount = 1 owner = MER } } }
 			ship = { name = "Boucan" definition = destroyer equipment = { destroyer_1 = { amount = 1 owner = MER } } }
 		}
 		task_force = {		
 			name = "Escadron d'escorte de convoi"
 			location = 20694 
-			ship = { name = "Mistral" definition = heavy_cruiser equipment = { heavy_cruiser_1 = { amount = 1 owner = MER } } }
+			ship = { name = "Mistral" definition = heavy_cruiser start_experience_factor = 0.1 equipment = { heavy_cruiser_1 = { amount = 1 owner = MER } } }
 			ship = { name = "Aconit" definition = light_cruiser equipment = { light_cruiser_1 = { amount = 1 owner = MER } } }
 			ship = { name = "Germinal" definition = destroyer equipment = { destroyer_1 = { amount = 1 owner = MER } } }
 			ship = { name = "Ventôse" definition = destroyer equipment = { destroyer_1 = { amount = 1 owner = MER } } }
@@ -26,7 +26,7 @@ instant_effect = {
 	### Ships Under Contruction ###
 	add_equipment_production = {
 		equipment = {
-			type = early_submarine
+			type = submarine_1
 			creator = "MER" 
 		}
 		requested_factories = 1
diff --git a/history/units/MGY_1007.txt b/history/units/MGY_1007.txt
index 303ec48cb7b..6d9cb03be17 100644
--- a/history/units/MGY_1007.txt
+++ b/history/units/MGY_1007.txt
@@ -43,10 +43,10 @@ division_template = {
 		pegasi = { x = 0 y = 1 }
 		pegasi = { x = 0 y = 2 }
 		pegasi = { x = 0 y = 3 }
-		pegasi = { x = 0 y = 4 }
 		pegasi = { x = 1 y = 0 }
 		pegasi = { x = 1 y = 1 }
 		pegasi = { x = 1 y = 2 }
+		pegasi = { x = 1 y = 3 }
 	}
 
 	support = {
diff --git a/history/units/MGY_1007_naval.txt b/history/units/MGY_1007_naval.txt
index 9d25114e813..c62bff4bc3a 100644
--- a/history/units/MGY_1007_naval.txt
+++ b/history/units/MGY_1007_naval.txt
@@ -96,7 +96,7 @@ instant_effect = {
 			version_name = "Twilight Class"
 		}
 		requested_factories = 1
-		progress = 0.34
+		progress = 0.40
 		amount = 1
 	}
 }
\ No newline at end of file
diff --git a/history/units/MIT_1007.txt b/history/units/MIT_1007.txt
index 3f33443e38c..3607401bc3f 100644
--- a/history/units/MIT_1007.txt
+++ b/history/units/MIT_1007.txt
@@ -209,6 +209,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.75
 		efficiency = 25
+		industrial_manufacturer = mio:MIT_national_armory_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -227,5 +228,6 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.85
 		efficiency = 20
+		industrial_manufacturer = mio:MIT_hephaistos_organization
 	}
 }
diff --git a/history/units/MNC_1007.txt b/history/units/MNC_1007.txt
index 45e05dee086..7b5f1321b79 100644
--- a/history/units/MNC_1007.txt
+++ b/history/units/MNC_1007.txt
@@ -65,5 +65,6 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.86
 		efficiency = 40
+		industrial_manufacturer = mio:MNC_bandits_black_market_organization
 	}
 }
diff --git a/history/units/MQA_1007.txt b/history/units/MQA_1007.txt
index a1d7bd48bbe..400d44fca08 100644
--- a/history/units/MQA_1007.txt
+++ b/history/units/MQA_1007.txt
@@ -16,7 +16,7 @@ division_template = {
 		infantry = { x = 0 y = 1 }
 		infantry = { x = 0 y = 2 }	
 		infantry = { x = 0 y = 3 }	
-		infantry = { x = 0 y = 4 }
+		infantry = { x = 1 y = 0 }
 	}
 
 	support = {
@@ -30,8 +30,8 @@ division_template = {
 	regiments = {
 		infantry = { x = 0 y = 0 }
 		infantry = { x = 0 y = 1 }
-		artillery_brigade = { x = 0 y = 2 }	
-		artillery_brigade = { x = 0 y = 3 }	
+		artillery_brigade = { x = 1 y = 0 }	
+		artillery_brigade = { x = 1 y = 1 }	
 	}
 
 }
@@ -130,6 +130,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.86
 		efficiency = 90
+		industrial_manufacturer = mio:MQA_gun_making_organization
 	}
 }
 
@@ -142,5 +143,6 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.12
 		efficiency = 80
+		industrial_manufacturer = mio:MQA_massive_cannon_making_organization
 	}
 }
\ No newline at end of file
diff --git a/history/units/MQA_1007_naval.txt b/history/units/MQA_1007_naval.txt
index 52bc1ed3efb..19edefe021b 100644
--- a/history/units/MQA_1007_naval.txt
+++ b/history/units/MQA_1007_naval.txt
@@ -54,6 +54,7 @@ instant_effect = {
 		requested_factories = 2
 		progress = 0.9
 		amount = 1
+		industrial_manufacturer = mio:MQA_coast_protection_organization
 	}
 	### Ships Under Contruction ###
 	add_equipment_production = {
@@ -65,6 +66,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.8
 		amount = 2
+		industrial_manufacturer = mio:MQA_trade_protection_organization
 	}
 
 	### Ships Under Contruction ###
@@ -89,5 +91,6 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.2
 		amount = 1
+		industrial_manufacturer = mio:MQA_heavy_ships_organization
 	}
 }
\ No newline at end of file
diff --git a/history/units/MQA_1007_naval_legacy.txt b/history/units/MQA_1007_naval_legacy.txt
index e4f3f57fdf7..50e1ca40e42 100644
--- a/history/units/MQA_1007_naval_legacy.txt
+++ b/history/units/MQA_1007_naval_legacy.txt
@@ -5,9 +5,9 @@
 		task_force = {
 			name = "Armada Fiarovana Nasionaly"
 			location = 8344  # 
-			ship = { name = "SNF Serkan" definition = battleship equipment = { battleship_1 = { amount = 1 owner = MQA } } }
-			ship = { name = "SNF Yücetepe" definition = battleship equipment = { battleship_1 = { amount = 1 owner = MQA } } }
-			ship = { name = "SNF Adatepe" definition = heavy_cruiser equipment = { heavy_cruiser_1 = { amount = 1 owner = MQA } } }
+			ship = { name = "SNF Serkan" definition = battleship pride_of_the_fleet = yes start_experience_factor = 0.2 equipment = { battleship_1 = { amount = 1 owner = MQA } } }
+			ship = { name = "SNF Yücetepe" definition = battleship equipment = { pre_dreadnought_nomtg = { amount = 1 owner = MQA } } }
+			ship = { name = "SNF Adatepe" definition = heavy_cruiser equipment = { coastal_defense_ship_nomtg = { amount = 1 owner = MQA } } }
 			ship = { name = "SNF Kilic Ali Pasa" definition = destroyer equipment = { destroyer_1 = { amount = 1 owner = MQA } } }
 			ship = { name = "SNF Salih Reis" definition = destroyer equipment = { destroyer_1 = { amount = 1 owner = MQA } } }
 			ship = { name = "SNF Samsun" definition = destroyer equipment = { destroyer_1 = { amount = 1 owner = MQA } } }
@@ -28,7 +28,7 @@
 		task_force = {
 			name = "Fleet fiarovana ny fanampiana"
 			location = 8441  # 
-			ship = { name = "SNF Fikret" definition = battleship equipment = { battleship_1 = { amount = 1 owner = MQA } } }
+			ship = { name = "SNF Fikret" definition = battleship equipment = { pre_dreadnought_nomtg = { amount = 1 owner = MQA } } }
 			ship = { name = "SNF Inönü" definition = heavy_cruiser equipment = { heavy_cruiser_1 = { amount = 1 owner = MQA } } }
 			ship = { name = "SNF Pirireis" definition = light_cruiser equipment = { light_cruiser_1 = { amount = 1 owner = MQA } } }
 			ship = { name = "SNF Hizirreis" definition = light_cruiser equipment = { light_cruiser_1 = { amount = 1 owner = MQA } } }
@@ -53,6 +53,7 @@ instant_effect = {
 		requested_factories = 2
 		progress = 0.9
 		amount = 1
+		industrial_manufacturer = mio:MQA_coast_protection_organization
 	}
 
 	### Ships Under Contruction ###
@@ -64,6 +65,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.8
 		amount = 2
+		industrial_manufacturer = mio:MQA_trade_protection_organization
 	}
 
 	### Ships Under Contruction ###
@@ -86,5 +88,6 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.2
 		amount = 1
+		industrial_manufacturer = mio:MQA_heavy_ships_organization
 	}
 }
\ No newline at end of file
diff --git a/history/units/MSS_1007.txt b/history/units/MSS_1007.txt
index b7e2518492a..1b0777a665e 100644
--- a/history/units/MSS_1007.txt
+++ b/history/units/MSS_1007.txt
@@ -14,7 +14,7 @@ division_template = {
 		infantry = { x = 0 y = 1 }
 		infantry = { x = 0 y = 2 }
 		infantry = { x = 0 y = 3 }
-		infantry = { x = 0 y = 4 }
+		infantry = { x = 1 y = 0 }
 	}
 }
 division_template = {
@@ -24,7 +24,7 @@ division_template = {
 		spirit_warriors = { x = 0 y = 1 }
 		spirit_warriors = { x = 0 y = 2 }
 		spirit_warriors = { x = 0 y = 3 }
-		spirit_warriors = { x = 0 y = 4 }
+		spirit_warriors = { x = 1 y = 0 }
 	}
 	priority = 2
 }
diff --git a/history/units/NCR_pony_divs.txt b/history/units/NCR_pony_divs.txt
index 0206c7b7850..2a414f92ab3 100644
--- a/history/units/NCR_pony_divs.txt
+++ b/history/units/NCR_pony_divs.txt
@@ -9,8 +9,8 @@ division_template = {
 		infantry = { x = 1 y = 1 }
 		infantry = { x = 1 y = 2 }
 		infantry = { x = 2 y = 0 }
-		artillery_brigade = { x = 2 y = 1 }
-		artillery_brigade = { x = 2 y = 2 }
+		artillery_brigade = { x = 3 y = 0 }
+		artillery_brigade = { x = 3 y = 1 }
 	}
 
 	support = {
diff --git a/history/units/OLE_1007.txt b/history/units/OLE_1007.txt
index bae0e2d987f..a908abbbbf3 100644
--- a/history/units/OLE_1007.txt
+++ b/history/units/OLE_1007.txt
@@ -232,6 +232,7 @@ instant_effect = {
 		requested_factories = 4
 		progress = 0.86
 		efficiency = 100
+		industrial_manufacturer = mio:OLE_alda_gunworks_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -241,6 +242,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.90
 		efficiency = 100
+		industrial_manufacturer = mio:OLE_keisarillinen_organization
 	}
 	add_equipment_production = {
 		equipment = {
diff --git a/history/units/OLE_1007_air_bba.txt b/history/units/OLE_1007_air_bba.txt
index da7c1c00a80..89293b46322 100644
--- a/history/units/OLE_1007_air_bba.txt
+++ b/history/units/OLE_1007_air_bba.txt
@@ -46,5 +46,6 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.2
 		efficiency = 50
+		industrial_manufacturer = mio:OLE_kunikaallinen_aeronautics_organization
 	}
 }
diff --git a/history/units/OLE_1007_air_legacy.txt b/history/units/OLE_1007_air_legacy.txt
index 7a693303bf4..d2f0f955e0b 100644
--- a/history/units/OLE_1007_air_legacy.txt
+++ b/history/units/OLE_1007_air_legacy.txt
@@ -42,5 +42,6 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.2
 		efficiency = 50
+		industrial_manufacturer = mio:OLE_kunikaallinen_aeronautics_organization
 	}
 }
diff --git a/history/units/OLV_1007.txt b/history/units/OLV_1007.txt
index df761c54dc3..3a22e2c9fa1 100644
--- a/history/units/OLV_1007.txt
+++ b/history/units/OLV_1007.txt
@@ -79,6 +79,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.1
 		efficiency = 25
+		industrial_manufacturer = mio:OLV_designer_6_organization
 	}
 
 	add_equipment_production = {
@@ -89,5 +90,6 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.3
 		efficiency = 15
+		industrial_manufacturer = mio:OLV_designer_7_organization
 	}
 }
diff --git a/history/units/OSQ_1007.txt b/history/units/OSQ_1007.txt
index bf999019769..be400da19ff 100644
--- a/history/units/OSQ_1007.txt
+++ b/history/units/OSQ_1007.txt
@@ -14,7 +14,7 @@ division_template = {
 		infantry = { x = 0 y = 1 }
 		infantry = { x = 0 y = 2 }
 		infantry = { x = 0 y = 3 }
-		infantry = { x = 0 y = 4 }	
+		infantry = { x = 1 y = 0 }
 	}
 }
 
diff --git a/history/units/PLB_1007.txt b/history/units/PLB_1007.txt
index d7688a56dc2..c0ddafd2146 100644
--- a/history/units/PLB_1007.txt
+++ b/history/units/PLB_1007.txt
@@ -127,6 +127,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.1
 		efficiency = 20
+		industrial_manufacturer = mio:PLB_traditional_gunsmiths_organization
 	}
 	add_equipment_production = {
 		equipment = {
diff --git a/history/units/PLB_1007_naval.txt b/history/units/PLB_1007_naval.txt
index 27b863c2054..6d5d4ad5806 100644
--- a/history/units/PLB_1007_naval.txt
+++ b/history/units/PLB_1007_naval.txt
@@ -28,5 +28,6 @@ instant_effect = {
 		requested_factories = 2
 		progress = 0.75
 		amount = 1
+		industrial_manufacturer = mio:PLB_clan_anker_craftsbears_organization
 	}
 }
\ No newline at end of file
diff --git a/history/units/PLB_1007_naval_legacy.txt b/history/units/PLB_1007_naval_legacy.txt
index a4982de0394..f6dddfb8b18 100644
--- a/history/units/PLB_1007_naval_legacy.txt
+++ b/history/units/PLB_1007_naval_legacy.txt
@@ -27,5 +27,6 @@ instant_effect = {
 		requested_factories = 2
 		progress = 0.75
 		amount = 1
+		industrial_manufacturer = mio:PLB_clan_anker_craftsbears_organization
 	}
 }
diff --git a/history/units/PLB_svartpels.txt b/history/units/PLB_svartpels.txt
index f17b9583f46..8578a00809a 100644
--- a/history/units/PLB_svartpels.txt
+++ b/history/units/PLB_svartpels.txt
@@ -6,7 +6,7 @@
 		infantry = { x = 0 y = 1 }
 		infantry = { x = 0 y = 2 }
 		infantry = { x = 0 y = 3 }
-		infantry = { x = 0 y = 4 }
+		infantry = { x = 1 y = 0 }
 	}
 
 	support = {
diff --git a/history/units/PLB_volsungr.txt b/history/units/PLB_volsungr.txt
index 3d91bd0662e..0c0833243be 100644
--- a/history/units/PLB_volsungr.txt
+++ b/history/units/PLB_volsungr.txt
@@ -21,12 +21,12 @@ division_template = {
 		panzerbar = { x = 0 y = 1 }
 		panzerbar = { x = 0 y = 2 }
 		panzerbar = { x = 0 y = 3 }
-		panzerbar = { x = 0 y = 4 }
 		panzerbar = { x = 1 y = 0 }
 		panzerbar = { x = 1 y = 1 }
 		panzerbar = { x = 1 y = 2 }
 		panzerbar = { x = 1 y = 3 }
-		panzerbar = { x = 1 y = 4 }
+		panzerbar = { x = 2 y = 0 }
+		panzerbar = { x = 2 y = 1 }
 	}
 }
 
diff --git a/history/units/PYT_1007.txt b/history/units/PYT_1007.txt
index ade99431d7d..b782a2f8495 100644
--- a/history/units/PYT_1007.txt
+++ b/history/units/PYT_1007.txt
@@ -113,5 +113,6 @@ instant_effect = {
 		requested_factories = 2
 		progress = 0.1
 		efficiency = 50
+		industrial_manufacturer = mio:PYT_infantry_concern_organization
 	}
 }
diff --git a/history/units/RCT_1007.txt b/history/units/RCT_1007.txt
index 49c5bcc77ed..ce11b3a887e 100644
--- a/history/units/RCT_1007.txt
+++ b/history/units/RCT_1007.txt
@@ -133,6 +133,7 @@ instant_effect = {
 		requested_factories = 2
 		progress = 0.1
 		efficiency = 50
+		industrial_manufacturer = mio:RCT_Weapons_organization
 	}
 
 	add_equipment_production = {
@@ -153,5 +154,6 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.3
 		efficiency = 50
+		industrial_manufacturer = mio:RCT_Rijekograd_shells_organization
 	}
 }
diff --git a/history/units/REE_1007.txt b/history/units/REE_1007.txt
index a5916f86fa4..3e0b96dcb84 100644
--- a/history/units/REE_1007.txt
+++ b/history/units/REE_1007.txt
@@ -14,7 +14,7 @@ division_template = {
 		infantry = { x = 0 y = 1 }
 		infantry = { x = 0 y = 2 }
 		infantry = { x = 0 y = 3 }
-		infantry = { x = 0 y = 4 }
+		infantry = { x = 1 y = 0 }
 	}
 }
 
diff --git a/history/units/SIC_1007.txt b/history/units/SIC_1007.txt
index 2dbca070cc1..9409bf8137c 100644
--- a/history/units/SIC_1007.txt
+++ b/history/units/SIC_1007.txt
@@ -205,6 +205,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.12
 		efficiency = 75
+		industrial_manufacturer = mio:SIC_estrella_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -223,5 +224,6 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.85
 		efficiency = 20
+		industrial_manufacturer = mio:SIC_arsenal_sycamore_organization
 	}
 }
diff --git a/history/units/SON_1007.txt b/history/units/SON_1007.txt
index 1f086d80b0e..1c3f833933e 100644
--- a/history/units/SON_1007.txt
+++ b/history/units/SON_1007.txt
@@ -14,7 +14,7 @@ division_template = {
 		infantry = { x = 0 y = 1 }
 		infantry = { x = 0 y = 2 }
 		infantry = { x = 0 y = 3 }
-		infantry = { x = 0 y = 4 }
+		infantry = { x = 1 y = 0 }
 	}
 }
 division_template = {
@@ -24,7 +24,7 @@ division_template = {
 		spirit_warriors = { x = 0 y = 1 }
 		spirit_warriors = { x = 0 y = 2 }
 		spirit_warriors = { x = 0 y = 3 }
-		spirit_warriors = { x = 0 y = 4 }
+		spirit_warriors = { x = 1 y = 0 }
 	}
 	support = {
 		artillery = { x = 0 y = 0 }
diff --git a/history/units/SPL_1007.txt b/history/units/SPL_1007.txt
index c2a5b6da9c3..2cca16f59a3 100644
--- a/history/units/SPL_1007.txt
+++ b/history/units/SPL_1007.txt
@@ -14,7 +14,7 @@ division_template = {
 		infantry = { x = 0 y = 1 }
 		infantry = { x = 0 y = 2 }
 		infantry = { x = 0 y = 3 }
-		infantry = { x = 0 y = 4 }
+		infantry = { x = 1 y = 0 }
 	}
 }
 division_template = {
diff --git a/history/units/STG_1007.txt b/history/units/STG_1007.txt
index 11fb207eb28..aecac1be75b 100644
--- a/history/units/STG_1007.txt
+++ b/history/units/STG_1007.txt
@@ -157,6 +157,7 @@ instant_effect = {
 		requested_factories = 5
 		progress = 0.86
 		efficiency = 90
+		industrial_manufacturer = mio:STG_grey_design_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -166,6 +167,7 @@ instant_effect = {
 		requested_factories = 2
 		progress = 0.16
 		efficiency = 20
+		industrial_manufacturer = mio:STG_stavropon_factory_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -184,5 +186,6 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.70
 		efficiency = 80
+		industrial_manufacturer = mio:STG_ZAZ_concern_organization
 	}
 }
diff --git a/history/units/STG_1007_air_bba.txt b/history/units/STG_1007_air_bba.txt
index 1af99dedf07..9fe684f8b3a 100644
--- a/history/units/STG_1007_air_bba.txt
+++ b/history/units/STG_1007_air_bba.txt
@@ -49,6 +49,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.90
 		efficiency = 50
+		industrial_manufacturer = mio:STG_prolet_airfleet_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -59,5 +60,6 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.50
 		efficiency = 20
+		industrial_manufacturer = mio:STG_voskhod_organization
 	}
 }
diff --git a/history/units/STG_1007_air_legacy.txt b/history/units/STG_1007_air_legacy.txt
index e58fd7787c7..ea7bcfb8ddc 100644
--- a/history/units/STG_1007_air_legacy.txt
+++ b/history/units/STG_1007_air_legacy.txt
@@ -2,7 +2,7 @@
 	153 = {
 		fighter_equipment_0 = {
 			owner = "STG"
-			amount = 100
+			amount = 150
 		}
 		ace={ # Order is important. Ace will be assigned to the wing above (fighter_equipment_0).
 			modifier="fighter_genius"
@@ -13,7 +13,7 @@
 		}
 		fighter_equipment_1 = {
 			owner = "STG"
-			amount = 50
+			amount = 100
 		}
 	}
 	153 = {
@@ -43,6 +43,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.90
 		efficiency = 50
+		industrial_manufacturer = mio:STG_prolet_airfleet_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -52,5 +53,6 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.50
 		efficiency = 20
+		industrial_manufacturer = mio:STG_voskhod_organization
 	}
 }
diff --git a/history/units/STG_1007_naval.txt b/history/units/STG_1007_naval.txt
index 38efdfcc5f7..b1772ee5c7b 100644
--- a/history/units/STG_1007_naval.txt
+++ b/history/units/STG_1007_naval.txt
@@ -98,6 +98,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.40
 		amount = 1
+		industrial_manufacturer = mio:STG_yantar_organization
 	}
 	add_equipment_production = {
 		equipment = {
diff --git a/history/units/STG_1007_naval_legacy.txt b/history/units/STG_1007_naval_legacy.txt
index 22f04cfc660..fe1ae480693 100644
--- a/history/units/STG_1007_naval_legacy.txt
+++ b/history/units/STG_1007_naval_legacy.txt
@@ -89,13 +89,23 @@ fleet = {
 instant_effect = {
 
 	### Ships Under Contruction ###
+	add_equipment_production = {
+		equipment = {
+			type = heavy_cruiser_2
+			creator = "STG" 
+		}
+		requested_factories = 1
+		progress = 0.40
+		amount = 1
+		industrial_manufacturer = mio:STG_yantar_organization
+	}
 	add_equipment_production = {
 		equipment = {
 			type = submarine_2
 			creator = "STG" 
 		}
 		requested_factories = 1
-		progress = 0.35
+		progress = 0.50
 		amount = 1
 	}
 	add_equipment_production = {
@@ -104,7 +114,7 @@ instant_effect = {
 			creator = "STG" 
 		}
 		requested_factories = 1
-		progress = 0.3
+		progress = 0.45
 		amount = 1
 	}
 	add_equipment_production = {
@@ -113,7 +123,7 @@ instant_effect = {
 			creator = "STG" 
 		}
 		requested_factories = 1
-		progress = 0.25
+		progress = 0.40
 		amount = 1
 	}
 	add_equipment_production = {
@@ -122,7 +132,7 @@ instant_effect = {
 			creator = "STG" 
 		}
 		requested_factories = 1
-		progress = 0.20
+		progress = 0.35
 		amount = 1
 	}
 	add_equipment_production = {
@@ -131,7 +141,7 @@ instant_effect = {
 			creator = "STG" 
 		}
 		requested_factories = 1
-		progress = 0.15
+		progress = 0.30
 		amount = 1
 	}
 	add_equipment_production = {
@@ -140,7 +150,34 @@ instant_effect = {
 			creator = "STG" 
 		}
 		requested_factories = 1
-		progress = 0.1
+		progress = 0.25
+		amount = 1
+	}
+	add_equipment_production = {
+		equipment = {
+			type = destroyer_2
+			creator = "STG" 
+		}
+		requested_factories = 1
+		progress = 0.80
+		amount = 1
+	}
+	add_equipment_production = {
+		equipment = {
+			type = destroyer_2
+			creator = "STG" 
+		}
+		requested_factories = 1
+		progress = 0.70
+		amount = 1
+	}
+	add_equipment_production = {
+		equipment = {
+			type = destroyer_2
+			creator = "STG" 
+		}
+		requested_factories = 1
+		progress = 0.60
 		amount = 1
 	}
 }
diff --git a/history/units/STG_1007_nsb.txt b/history/units/STG_1007_nsb.txt
index 16a2ab3423a..6daf575d099 100644
--- a/history/units/STG_1007_nsb.txt
+++ b/history/units/STG_1007_nsb.txt
@@ -163,6 +163,7 @@ instant_effect = {
 		requested_factories = 4
 		progress = 0.86
 		efficiency = 90
+		industrial_manufacturer = mio:STG_grey_design_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -172,6 +173,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.16
 		efficiency = 20
+		industrial_manufacturer = mio:STG_stavropon_factory_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -191,6 +193,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.9
 		efficiency = 80
+		industrial_manufacturer = mio:STG_PegAz_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -201,6 +204,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.4
 		efficiency = 60
+		industrial_manufacturer = mio:STG_PegAz_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -210,5 +214,6 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.70
 		efficiency = 80
+		industrial_manufacturer = mio:STG_ZAZ_concern_organization
 	}
 }
diff --git a/history/units/STW_1007.txt b/history/units/STW_1007.txt
index 055a6d37651..8f08ded9de2 100644
--- a/history/units/STW_1007.txt
+++ b/history/units/STW_1007.txt
@@ -115,6 +115,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.1
 		efficiency = 50
+		industrial_manufacturer = mio:STW_infantry_equipment_manufacturer_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -133,5 +134,6 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.2
 		efficiency = 20
+		industrial_manufacturer = mio:STW_artillery_manufacturer_organization
 	}
 }
\ No newline at end of file
diff --git a/history/units/TAL_1007.txt b/history/units/TAL_1007.txt
index a8e467c624e..f29121762d8 100644
--- a/history/units/TAL_1007.txt
+++ b/history/units/TAL_1007.txt
@@ -64,6 +64,7 @@ instant_effect = {
 		requested_factories = 2
 		progress = 0.75
 		efficiency = 25
+		industrial_manufacturer = mio:TAL_infantry_manufacturer_organization
 	}
 	add_equipment_production = {
 		equipment = {
diff --git a/history/units/TBK_1007.txt b/history/units/TBK_1007.txt
index 15f11a4600e..7fd39d4cf0b 100644
--- a/history/units/TBK_1007.txt
+++ b/history/units/TBK_1007.txt
@@ -92,6 +92,7 @@ instant_effect = {
 		requested_factories = 2
 		progress = 0.1
 		efficiency = 30
+		industrial_manufacturer = mio:TBK_Starting_Gun_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -110,5 +111,6 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.1
 		efficiency = 15
+		industrial_manufacturer = mio:TBK_Starting_Arty_organization
 	}
 }
\ No newline at end of file
diff --git a/history/units/TBK_1007_naval_legacy.txt b/history/units/TBK_1007_naval_legacy.txt
index efe2fcbf152..8a100500c4a 100644
--- a/history/units/TBK_1007_naval_legacy.txt
+++ b/history/units/TBK_1007_naval_legacy.txt
@@ -6,9 +6,9 @@ units = {
 		task_force = {
 			name = "Green Bay Fleet"
 			location = 18510
-			ship = { name = "TNS Freedom" definition = destroyer start_experience_factor = 0.3 equipment = { destroyer_1 = { amount = 1 owner = TBK } } }
-			ship = { name = "TNS Thunderbreaker"  definition = destroyer start_experience_factor = 0.3 equipment = { destroyer_1 = { amount = 1 owner = TBK } } }
-			ship = { name = "TNS Leviathan"  definition = destroyer start_experience_factor = 0.3 equipment = { destroyer_1 = { amount = 1 owner = TBK } } }
+			ship = { name = "TNS Freedom" definition = destroyer equipment = { destroyer_1 = { amount = 1 owner = TBK } } }
+			ship = { name = "TNS Thunderbreaker"  definition = destroyer equipment = { destroyer_1 = { amount = 1 owner = TBK } } }
+			ship = { name = "TNS Leviathan"  definition = destroyer equipment = { destroyer_1 = { amount = 1 owner = TBK } } }
 		}
 	}
 
diff --git a/history/units/TBK_desert_rifles.txt b/history/units/TBK_desert_rifles.txt
index 18e5b5bf987..326c88f2a9c 100644
--- a/history/units/TBK_desert_rifles.txt
+++ b/history/units/TBK_desert_rifles.txt
@@ -5,12 +5,12 @@
 		infantry = { x = 0 y = 1 }
 		infantry = { x = 0 y = 2 }
 		infantry = { x = 0 y = 3 }
-		infantry = { x = 0 y = 4 }
 		infantry = { x = 1 y = 0 }
 		infantry = { x = 1 y = 1 }
 		infantry = { x = 1 y = 2 }
 		infantry = { x = 1 y = 3 }
-		infantry = { x = 1 y = 4 }
+		infantry = { x = 2 y = 0 }
+		infantry = { x = 2 y = 1 }
 	}
 	support = {
 		engineer = { x = 0 y = 0 }
diff --git a/history/units/TBK_flayers.txt b/history/units/TBK_flayers.txt
index db523f0182d..d7c981f04e4 100644
--- a/history/units/TBK_flayers.txt
+++ b/history/units/TBK_flayers.txt
@@ -5,12 +5,12 @@
 		infantry = { x = 0 y = 1 }
 		infantry = { x = 0 y = 2 }
 		infantry = { x = 0 y = 3 }
-		infantry = { x = 0 y = 4 }
 		infantry = { x = 1 y = 0 }
 		infantry = { x = 1 y = 1 }
 		infantry = { x = 1 y = 2 }
 		infantry = { x = 1 y = 3 }
-		infantry = { x = 1 y = 4 }
+		infantry = { x = 2 y = 0 }
+		infantry = { x = 2 y = 1 }
 	}
 	support = {
 		unicorn_company = { x = 0 y = 0 }
diff --git a/history/units/TBK_levy.txt b/history/units/TBK_levy.txt
index fde6514c803..5247fe90a0d 100644
--- a/history/units/TBK_levy.txt
+++ b/history/units/TBK_levy.txt
@@ -5,12 +5,12 @@
 		infantry = { x = 0 y = 1 }
 		infantry = { x = 0 y = 2 }
 		infantry = { x = 0 y = 3 }
-		infantry = { x = 0 y = 4 }
 		infantry = { x = 1 y = 0 }
 		infantry = { x = 1 y = 1 }
 		infantry = { x = 1 y = 2 }
 		infantry = { x = 1 y = 3 }
-		infantry = { x = 1 y = 4 }
+		infantry = { x = 2 y = 0 }
+		infantry = { x = 2 y = 1 }
 	}
 	priority = 0
 }
diff --git a/history/units/TBK_life_guard.txt b/history/units/TBK_life_guard.txt
index 6a7ab73ee68..d468fb5f7c7 100644
--- a/history/units/TBK_life_guard.txt
+++ b/history/units/TBK_life_guard.txt
@@ -5,12 +5,12 @@
 		pegasi = { x = 0 y = 1 }
 		pegasi = { x = 0 y = 2 }
 		pegasi = { x = 0 y = 3 }
-		pegasi = { x = 0 y = 4 }
 		pegasi = { x = 1 y = 0 }
 		pegasi = { x = 1 y = 1 }
 		pegasi = { x = 1 y = 2 }
 		pegasi = { x = 1 y = 3 }
-		pegasi = { x = 1 y = 4 }
+		pegasi = { x = 2 y = 0 }
+		pegasi = { x = 2 y = 1 }
 	}
 	support = {
 		recon = { x = 0 y = 0 }
diff --git a/history/units/TBK_mercenary_units.txt b/history/units/TBK_mercenary_units.txt
index 4929c95ed78..fe37c8e9f4b 100644
--- a/history/units/TBK_mercenary_units.txt
+++ b/history/units/TBK_mercenary_units.txt
@@ -5,12 +5,12 @@
 		infantry = { x = 0 y = 1 }
 		infantry = { x = 0 y = 2 }
 		infantry = { x = 0 y = 3 }
-		infantry = { x = 0 y = 4 }
 		infantry = { x = 1 y = 0 }
 		infantry = { x = 1 y = 1 }
 		infantry = { x = 1 y = 2 }
 		infantry = { x = 1 y = 3 }
-		infantry = { x = 1 y = 4 }
+		infantry = { x = 2 y = 0 }
+		infantry = { x = 2 y = 1 }
 	}
 	support = {
 		recon = { x = 0 y = 0 }
diff --git a/history/units/TBK_oath_wardens.txt b/history/units/TBK_oath_wardens.txt
index 5eacdffc139..2296ceea004 100644
--- a/history/units/TBK_oath_wardens.txt
+++ b/history/units/TBK_oath_wardens.txt
@@ -7,12 +7,12 @@
 		infantry = { x = 0 y = 1 }
 		infantry = { x = 0 y = 2 }
 		infantry = { x = 0 y = 3 }
-		infantry = { x = 0 y = 4 }
 		infantry = { x = 1 y = 0 }
 		infantry = { x = 1 y = 1 }
 		infantry = { x = 1 y = 2 }
 		infantry = { x = 1 y = 3 }
-		infantry = { x = 1 y = 4 }
+		infantry = { x = 2 y = 0 }
+		infantry = { x = 2 y = 1 }
 	}
 	support = {
 		engineer = { x = 0 y = 0 }
diff --git a/history/units/TBK_special_republican_guard.txt b/history/units/TBK_special_republican_guard.txt
index bbb076751aa..f3e7a0299f3 100644
--- a/history/units/TBK_special_republican_guard.txt
+++ b/history/units/TBK_special_republican_guard.txt
@@ -6,12 +6,12 @@
 		infantry = { x = 0 y = 1 }
 		infantry = { x = 0 y = 2 }
 		infantry = { x = 0 y = 3 }
-		infantry = { x = 0 y = 4 }
 		infantry = { x = 1 y = 0 }
 		infantry = { x = 1 y = 1 }
 		infantry = { x = 1 y = 2 }
 		infantry = { x = 1 y = 3 }
-		infantry = { x = 1 y = 4 }
+		infantry = { x = 2 y = 0 }
+		infantry = { x = 2 y = 1 }
 	}
 	support = {
 		unicorn_company = { x = 0 y = 0 }
diff --git a/history/units/TBK_wallnut_drafted.txt b/history/units/TBK_wallnut_drafted.txt
index f6183228a2e..4923a1fe91c 100644
--- a/history/units/TBK_wallnut_drafted.txt
+++ b/history/units/TBK_wallnut_drafted.txt
@@ -7,12 +7,12 @@
 		infantry = { x = 0 y = 1 }
 		infantry = { x = 0 y = 2 }
 		infantry = { x = 0 y = 3 }
-		infantry = { x = 0 y = 4 }
 		infantry = { x = 1 y = 0 }
 		infantry = { x = 1 y = 1 }
 		infantry = { x = 1 y = 2 }
 		infantry = { x = 1 y = 3 }
-		infantry = { x = 1 y = 4 }
+		infantry = { x = 2 y = 0 }
+		infantry = { x = 2 y = 1 }
 	}
 	support = {
 		recon = { x = 0 y = 0 }
diff --git a/history/units/TBK_worker_guard.txt b/history/units/TBK_worker_guard.txt
index 4a210719393..bc98e187d42 100644
--- a/history/units/TBK_worker_guard.txt
+++ b/history/units/TBK_worker_guard.txt
@@ -5,10 +5,10 @@
 		infantry = { x = 0 y = 1 }
 		infantry = { x = 0 y = 2 }
 		infantry = { x = 0 y = 3 }
-		infantry = { x = 0 y = 4 }
 		infantry = { x = 1 y = 0 }
 		infantry = { x = 1 y = 1 }
 		infantry = { x = 1 y = 2 }
+		infantry = { x = 1 y = 3 }		
 	}
 }
 
diff --git a/history/units/TIM_1007.txt b/history/units/TIM_1007.txt
index 5e3546c2918..71748bed5fa 100644
--- a/history/units/TIM_1007.txt
+++ b/history/units/TIM_1007.txt
@@ -14,7 +14,7 @@ division_template = {
 		infantry = { x = 0 y = 1 }
 		infantry = { x = 0 y = 2 }
 		infantry = { x = 0 y = 3 }
-		infantry = { x = 0 y = 4 }
+		infantry = { x = 1 y = 0 }
 	}
 }
 
diff --git a/history/units/TRD_1007.txt b/history/units/TRD_1007.txt
index 9e21aff2ff2..2d2a68bfda5 100644
--- a/history/units/TRD_1007.txt
+++ b/history/units/TRD_1007.txt
@@ -210,6 +210,7 @@ instant_effect = {
 		requested_factories = 2
 		progress = 0.1
 		efficiency = 50
+		industrial_manufacturer = mio:TRD_tigerdale_organization
 	}
 
 	add_equipment_production = {
@@ -230,5 +231,6 @@ instant_effect = {
 		requested_factories = 2
 		progress = 0.2
 		efficiency = 50
+		industrial_manufacturer = mio:TRD_zetes_organization
 	}
 }
diff --git a/history/units/TRO_CTH_2_holdbreakers.txt b/history/units/TRO_CTH_2_holdbreakers.txt
index 357f8ad0ba5..ae3d6f7d776 100644
--- a/history/units/TRO_CTH_2_holdbreakers.txt
+++ b/history/units/TRO_CTH_2_holdbreakers.txt
@@ -9,8 +9,8 @@
 		infantry = { x = 1 y = 1 }
 		infantry = { x = 1 y = 2 }
 		infantry = { x = 2 y = 0 }
-		artillery_brigade = { x = 2 y = 1 }
-		artillery_brigade = { x = 2 y = 2 }
+		artillery_brigade = { x = 3 y = 0 }
+		artillery_brigade = { x = 3 y = 1 }
 	}
 	support = {
 		artillery = { x = 0 y = 0 }
diff --git a/history/units/TRO_civil_war.txt b/history/units/TRO_civil_war.txt
index 3452beed3d1..9020875f024 100644
--- a/history/units/TRO_civil_war.txt
+++ b/history/units/TRO_civil_war.txt
@@ -81,8 +81,8 @@ division_template = {
 		infantry = { x = 1 y = 1 }
 		infantry = { x = 1 y = 2 }
 		infantry = { x = 2 y = 0 }
-		artillery_brigade = { x = 2 y = 1 }
-		artillery_brigade = { x = 2 y = 2 }
+		artillery_brigade = { x = 3 y = 0 }
+		artillery_brigade = { x = 3 y = 1 }
 	}
 	support = {
 		artillery = { x = 0 y = 0 }
@@ -101,8 +101,8 @@ division_template = {
 		mountaineers = { x = 1 y = 1 }
 		mountaineers = { x = 1 y = 2 }
 		mountaineers = { x = 2 y = 0 }
-		artillery_brigade = { x = 2 y = 1 }
-		artillery_brigade = { x = 2 y = 2 }
+		artillery_brigade = { x = 3 y = 0 }
+		artillery_brigade = { x = 3 y = 1 }
 	}
 	support = {
 		artillery = { x = 0 y = 0 }
diff --git a/history/units/VAN_Militia_Salt.txt b/history/units/VAN_Militia_Salt.txt
index 08978664a15..d411421b594 100644
--- a/history/units/VAN_Militia_Salt.txt
+++ b/history/units/VAN_Militia_Salt.txt
@@ -6,7 +6,7 @@
 		infantry = { x = 0 y = 1 }
 		infantry = { x = 0 y = 2 }
 		infantry = { x = 0 y = 3 }
-		infantry = { x = 0 y = 4 }
+		infantry = { x = 1 y = 0 }
 	}
 
 	support = {
diff --git a/history/units/VAN_Militia_Spawn.txt b/history/units/VAN_Militia_Spawn.txt
index 07bf3af9ac5..127553c2c2b 100644
--- a/history/units/VAN_Militia_Spawn.txt
+++ b/history/units/VAN_Militia_Spawn.txt
@@ -6,7 +6,7 @@
 		infantry = { x = 0 y = 1 }
 		infantry = { x = 0 y = 2 }
 		infantry = { x = 0 y = 3 }
-		infantry = { x = 0 y = 4 }
+		infantry = { x = 1 y = 0 }
 	}
 
 	support = {
diff --git a/history/units/VAN_Militia_Tall_Tales.txt b/history/units/VAN_Militia_Tall_Tales.txt
index 4cee39ead4c..a264c43a572 100644
--- a/history/units/VAN_Militia_Tall_Tales.txt
+++ b/history/units/VAN_Militia_Tall_Tales.txt
@@ -6,7 +6,7 @@
 		infantry = { x = 0 y = 1 }
 		infantry = { x = 0 y = 2 }
 		infantry = { x = 0 y = 3 }
-		infantry = { x = 0 y = 4 }
+		infantry = { x = 1 y = 0 }
 	}
 
 	support = {
@@ -19,7 +19,7 @@ division_template = {
 		pegasi = { x = 0 y = 1 }
 		pegasi = { x = 0 y = 2 }
 		pegasi = { x = 0 y = 3 }
-		pegasi = { x = 0 y = 4 }
+		pegasi = { x = 1 y = 0 }
 	}
 
 	support = {
diff --git a/history/units/VED_1007.txt b/history/units/VED_1007.txt
index 46805f06006..3d0d05dfa07 100644
--- a/history/units/VED_1007.txt
+++ b/history/units/VED_1007.txt
@@ -112,6 +112,7 @@ instant_effect = {
 		requested_factories = 2
 		progress = 0.25
 		efficiency = 25
+		industrial_manufacturer = mio:VED_infantry_equipment_manufacturer_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -130,5 +131,6 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.45
 		efficiency = 15
+		industrial_manufacturer = mio:VED_artillery_manufacturer_organization
 	}
 }
diff --git a/history/units/WAR_1007.txt b/history/units/WAR_1007.txt
index 9c1c9ee8a42..46655ccb3ca 100644
--- a/history/units/WAR_1007.txt
+++ b/history/units/WAR_1007.txt
@@ -53,6 +53,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.1
 		efficiency = 50
+		industrial_manufacturer = mio:WAR_gun_guys_organization
 	}
 }
 
diff --git a/history/units/WIN_BAT_expedition.txt b/history/units/WIN_BAT_expedition.txt
index 138688003c7..6f048a1d425 100644
--- a/history/units/WIN_BAT_expedition.txt
+++ b/history/units/WIN_BAT_expedition.txt
@@ -10,8 +10,8 @@
 		infantry = { x = 1 y = 1 }
 		infantry = { x = 1 y = 2 }
 		infantry = { x = 2 y = 0 }
-		artillery_brigade = { x = 2 y = 1 }
-		artillery_brigade = { x = 2 y = 2 }
+		artillery_brigade = { x = 3 y = 0 }
+		artillery_brigade = { x = 3 y = 1 }
 	}
 	support = {
 		artillery = { x = 0 y = 0 }
diff --git a/history/units/WIN_NRA_infantry.txt b/history/units/WIN_NRA_infantry.txt
index 19d6fd0b2d2..9604ab3b86c 100644
--- a/history/units/WIN_NRA_infantry.txt
+++ b/history/units/WIN_NRA_infantry.txt
@@ -10,8 +10,8 @@
 		infantry = { x = 1 y = 1 }
 		infantry = { x = 1 y = 2 }
 		infantry = { x = 2 y = 0 }
-		artillery_brigade = { x = 2 y = 1 }
-		artillery_brigade = { x = 2 y = 2 }
+		artillery_brigade = { x = 3 y = 0 }
+		artillery_brigade = { x = 3 y = 1 }
 	}
 	support = {
 		artillery = { x = 0 y = 0 }
diff --git a/history/units/WIN_SWAT.txt b/history/units/WIN_SWAT.txt
index 3b04964712c..63443870091 100644
--- a/history/units/WIN_SWAT.txt
+++ b/history/units/WIN_SWAT.txt
@@ -10,8 +10,8 @@
 		infantry = { x = 1 y = 1 }
 		infantry = { x = 1 y = 2 }
 		infantry = { x = 2 y = 0 }
-		artillery_brigade = { x = 2 y = 1 }
-		artillery_brigade = { x = 2 y = 2 }
+		artillery_brigade = { x = 3 y = 0 }
+		artillery_brigade = { x = 3 y = 1 }
 	}
 	support = {
 		recon = { x = 0 y = 0 }
diff --git a/history/units/WIN_black_jean_kommandos.txt b/history/units/WIN_black_jean_kommandos.txt
index fb854296938..ee7567ab82b 100644
--- a/history/units/WIN_black_jean_kommandos.txt
+++ b/history/units/WIN_black_jean_kommandos.txt
@@ -10,8 +10,8 @@
 		mountaineers = { x = 1 y = 1 }
 		mountaineers = { x = 1 y = 2 }
 		mountaineers = { x = 2 y = 0 }
-		artillery_brigade = { x = 2 y = 1 }
-		artillery_brigade = { x = 2 y = 2 }
+		artillery_brigade = { x = 3 y = 0 }
+		artillery_brigade = { x = 3 y = 1 }
 	}
 	support = {
 		artillery = { x = 0 y = 0 }
diff --git a/history/units/WIN_jungle_work_hoofington_holdbreakers.txt b/history/units/WIN_jungle_work_hoofington_holdbreakers.txt
index 03078cda3c4..d912f2908fb 100644
--- a/history/units/WIN_jungle_work_hoofington_holdbreakers.txt
+++ b/history/units/WIN_jungle_work_hoofington_holdbreakers.txt
@@ -10,8 +10,8 @@
 		infantry = { x = 1 y = 1 }
 		infantry = { x = 1 y = 2 }
 		infantry = { x = 2 y = 0 }
-		artillery_brigade = { x = 2 y = 1 }
-		artillery_brigade = { x = 2 y = 2 }
+		artillery_brigade = { x = 3 y = 0 }
+		artillery_brigade = { x = 3 y = 1 }
 	}
 	support = {
 		artillery = { x = 0 y = 0 }
diff --git a/history/units/WIT_austurian_guard.txt b/history/units/WIT_austurian_guard.txt
index 5e4a19316a2..8cc91157d2b 100644
--- a/history/units/WIT_austurian_guard.txt
+++ b/history/units/WIT_austurian_guard.txt
@@ -7,12 +7,13 @@
 		magical_infantry = { x = 0 y = 1 }
 		magical_infantry = { x = 0 y = 2 }
 		magical_infantry = { x = 0 y = 3 }
-		magical_infantry = { x = 0 y = 4 }
 		magical_infantry = { x = 1 y = 0 }
 		magical_infantry = { x = 1 y = 1 }
 		magical_infantry = { x = 1 y = 2 }
 		magical_infantry = { x = 1 y = 3 }
-		magical_infantry = { x = 1 y = 4 }
+		magical_infantry = { x = 2 y = 0 }
+		magical_infantry = { x = 2 y = 1 }
+
 	}
 	support = {
 		recon = { x = 0 y = 0 }
diff --git a/history/units/WIT_merc_1.txt b/history/units/WIT_merc_1.txt
index c702d16e9e8..7341f9184f5 100644
--- a/history/units/WIT_merc_1.txt
+++ b/history/units/WIT_merc_1.txt
@@ -6,12 +6,12 @@
 		infantry = { x = 0 y = 1 }
 		infantry = { x = 0 y = 2 }
 		infantry = { x = 0 y = 3 }
-		infantry = { x = 0 y = 4 }
 		infantry = { x = 1 y = 0 }
 		infantry = { x = 1 y = 1 }
 		infantry = { x = 1 y = 2 }
 		infantry = { x = 1 y = 3 }
-		infantry = { x = 1 y = 4 }
+		infantry = { x = 2 y = 0 }
+		infantry = { x = 2 y = 1 }
 	}
 	support = {
 		unicorn_company = { x = 0 y = 0 }
diff --git a/history/units/WIT_merc_2.txt b/history/units/WIT_merc_2.txt
index f9c24fde1d2..c57fff9c444 100644
--- a/history/units/WIT_merc_2.txt
+++ b/history/units/WIT_merc_2.txt
@@ -6,12 +6,12 @@
 		spirit_warriors = { x = 0 y = 1 }
 		spirit_warriors = { x = 0 y = 2 }
 		spirit_warriors = { x = 0 y = 3 }
-		spirit_warriors = { x = 0 y = 4 }
 		spirit_warriors = { x = 1 y = 0 }
 		spirit_warriors = { x = 1 y = 1 }
 		spirit_warriors = { x = 1 y = 2 }
 		spirit_warriors = { x = 1 y = 3 }
-		spirit_warriors = { x = 1 y = 4 }
+		spirit_warriors = { x = 2 y = 0 }
+		spirit_warriors = { x = 2 y = 1 }
 	}
 	support = {
 		recon = { x = 0 y = 0 }
diff --git a/history/units/WIT_merc_3.txt b/history/units/WIT_merc_3.txt
index d545b44449d..f78547e60ab 100644
--- a/history/units/WIT_merc_3.txt
+++ b/history/units/WIT_merc_3.txt
@@ -6,12 +6,12 @@
 		pegasi = { x = 0 y = 1 }
 		pegasi = { x = 0 y = 2 }
 		pegasi = { x = 0 y = 3 }
-		pegasi = { x = 0 y = 4 }
 		pegasi = { x = 1 y = 0 }
 		pegasi = { x = 1 y = 1 }
 		pegasi = { x = 1 y = 2 }
 		pegasi = { x = 1 y = 3 }
-		pegasi = { x = 1 y = 4 }
+		pegasi = { x = 2 y = 0 }
+		pegasi = { x = 2 y = 1 }
 	}
 	support = {
 		recon = { x = 0 y = 0 }
diff --git a/history/units/WIT_merc_4.txt b/history/units/WIT_merc_4.txt
index ca61daf1989..735641e586a 100644
--- a/history/units/WIT_merc_4.txt
+++ b/history/units/WIT_merc_4.txt
@@ -6,12 +6,12 @@
 		ironpaws = { x = 0 y = 1 }
 		ironpaws = { x = 0 y = 2 }
 		ironpaws = { x = 0 y = 3 }
-		ironpaws = { x = 0 y = 4 }
 		ironpaws = { x = 1 y = 0 }
 		ironpaws = { x = 1 y = 1 }
 		ironpaws = { x = 1 y = 2 }
 		ironpaws = { x = 1 y = 3 }
-		ironpaws = { x = 1 y = 4 }
+		ironpaws = { x = 2 y = 0 }
+		ironpaws = { x = 2 y = 1 }
 	}
 	support = {
 		artillery = { x = 0 y = 0 }
diff --git a/history/units/WIT_merc_5.txt b/history/units/WIT_merc_5.txt
index 80fd5e1ac0e..818f4768024 100644
--- a/history/units/WIT_merc_5.txt
+++ b/history/units/WIT_merc_5.txt
@@ -6,12 +6,12 @@
 		knights = { x = 0 y = 1 }
 		knights = { x = 0 y = 2 }
 		knights = { x = 0 y = 3 }
-		knights = { x = 0 y = 4 }
 		knights = { x = 1 y = 0 }
 		knights = { x = 1 y = 1 }
 		knights = { x = 1 y = 2 }
 		knights = { x = 1 y = 3 }
-		knights = { x = 1 y = 4 }
+		knights = { x = 2 y = 0 }
+		knights = { x = 2 y = 1 }
 	}
 	support = {
 		recon = { x = 0 y = 0 }
diff --git a/history/units/WIT_merc_6.txt b/history/units/WIT_merc_6.txt
index 692774874a5..1260d56297e 100644
--- a/history/units/WIT_merc_6.txt
+++ b/history/units/WIT_merc_6.txt
@@ -6,12 +6,12 @@
 		light_armor = { x = 0 y = 1 }
 		light_armor = { x = 0 y = 2 }
 		light_armor = { x = 0 y = 3 }
-		light_armor = { x = 0 y = 4 }
-		motorized = { x = 1 y = 0 }
-		motorized = { x = 1 y = 1 }
-		motorized = { x = 1 y = 2 }
-		motorized = { x = 1 y = 3 }
-		motorized = { x = 1 y = 4 }
+		light_armor = { x = 1 y = 0 }
+		motorized = { x = 2 y = 0 }
+		motorized = { x = 2 y = 1 }
+		motorized = { x = 2 y = 2 }
+		motorized = { x = 2 y = 3 }
+		motorized = { x = 3 y = 0 }
 	}
 	support = {
 		recon = { x = 0 y = 0 }
diff --git a/history/units/WNG_1007.txt b/history/units/WNG_1007.txt
index d23aa7c7b01..bf46495ea9e 100644
--- a/history/units/WNG_1007.txt
+++ b/history/units/WNG_1007.txt
@@ -279,6 +279,7 @@ instant_effect = {
 		requested_factories = 2
 		progress = 0.1
 		efficiency = 50
+		industrial_manufacturer = mio:WNG_beaketta_organization
 	}
 
 	add_equipment_production = {
diff --git a/history/units/WNG_1007_air_bba.txt b/history/units/WNG_1007_air_bba.txt
index c28d1727021..16433435232 100644
--- a/history/units/WNG_1007_air_bba.txt
+++ b/history/units/WNG_1007_air_bba.txt
@@ -50,5 +50,6 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.2
 		efficiency = 50
+		industrial_manufacturer = mio:WNG_strigivoia_afroaves_organization
 	}
 }
diff --git a/history/units/WNG_1007_air_legacy.txt b/history/units/WNG_1007_air_legacy.txt
index 8d582dee0d9..17a9aaaac9e 100644
--- a/history/units/WNG_1007_air_legacy.txt
+++ b/history/units/WNG_1007_air_legacy.txt
@@ -21,6 +21,16 @@
 			amount = 4
 		}
 	}
+	784 = {
+		CAS_equipment_1 = {
+			owner = "WNG"
+			amount = 32
+		}
+		tac_bomber_equipment_0 = {
+			owner = "WNG"
+			amount = 22
+		}
+	}
 }
 
 instant_effect = {
@@ -33,5 +43,6 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.2
 		efficiency = 50
+		industrial_manufacturer = mio:WNG_strigivoia_afroaves_organization
 	}
 }
diff --git a/history/units/WNG_1007_naval.txt b/history/units/WNG_1007_naval.txt
index 685764310cd..42f519fe149 100644
--- a/history/units/WNG_1007_naval.txt
+++ b/history/units/WNG_1007_naval.txt
@@ -162,7 +162,8 @@ instant_effect = {
 		name = "RM Gittorio"
 		requested_factories = 1
 		progress = 0.20 
-		amount = 1 
+		amount = 1
+		industrial_manufacturer = mio:WNG_gansaldo_organization
 	} 
 
 	add_equipment_production = { 
@@ -175,6 +176,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.15 
 		amount = 1 
+		industrial_manufacturer = mio:WNG_gansaldo_organization
 	} 
 
 	add_equipment_production = { 
@@ -187,6 +189,7 @@ instant_effect = {
 		requested_factories = 1 
 		progress = 0.95 
 		amount = 1 
+		industrial_manufacturer = mio:WNG_gansaldo_organization
 	} 
 
 	add_equipment_production = { 
@@ -199,6 +202,7 @@ instant_effect = {
 		requested_factories = 1 
 		progress = 0.70 
 		amount = 1
+		industrial_manufacturer = mio:WNG_high_seas_fleet_designer_organization
 	} 
 	add_equipment_production = { 
 		equipment = { 
@@ -210,6 +214,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.60 
 		amount = 1 
+		industrial_manufacturer = mio:WNG_high_seas_fleet_designer_organization
 	} 
 
 	add_equipment_production = { 
@@ -222,5 +227,6 @@ instant_effect = {
 		requested_factories = 1 
 		progress = 0.50 
 		amount = 1 
+		industrial_manufacturer = mio:WNG_crdk_organization
 	}
 }
diff --git a/history/units/WNG_1007_naval_legacy.txt b/history/units/WNG_1007_naval_legacy.txt
index 2b57d2069e5..6b5fc0ab710 100644
--- a/history/units/WNG_1007_naval_legacy.txt
+++ b/history/units/WNG_1007_naval_legacy.txt
@@ -161,6 +161,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.20 
 		amount = 1 
+		industrial_manufacturer = mio:WNG_gansaldo_organization
 	} 
 
 	add_equipment_production = { 
@@ -172,6 +173,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.15 
 		amount = 1 
+		industrial_manufacturer = mio:WNG_gansaldo_organization
 	} 
 
 	add_equipment_production = { 
@@ -183,6 +185,7 @@ instant_effect = {
 		requested_factories = 1 
 		progress = 0.95 
 		amount = 1 
+		industrial_manufacturer = mio:WNG_gansaldo_organization
 	} 
 
 	add_equipment_production = { 
@@ -194,6 +197,7 @@ instant_effect = {
 		requested_factories = 1 
 		progress = 0.70 
 		amount = 1
+		industrial_manufacturer = mio:WNG_high_seas_fleet_designer_organization
 	} 
 	add_equipment_production = { 
 		equipment = { 
@@ -204,6 +208,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.60 
 		amount = 1 
+		industrial_manufacturer = mio:WNG_high_seas_fleet_designer_organization
 	} 
 
 	add_equipment_production = { 
@@ -215,5 +220,6 @@ instant_effect = {
 		requested_factories = 1 
 		progress = 0.50 
 		amount = 1 
+		industrial_manufacturer = mio:WNG_crdk_organization
 	}
 }
\ No newline at end of file
diff --git a/history/units/WNG_1007_nsb.txt b/history/units/WNG_1007_nsb.txt
index e3d5913e045..8ea1df7a9a7 100644
--- a/history/units/WNG_1007_nsb.txt
+++ b/history/units/WNG_1007_nsb.txt
@@ -263,6 +263,7 @@ instant_effect = {
 		requested_factories = 2
 		progress = 0.1
 		efficiency = 50
+		industrial_manufacturer = mio:WNG_beaketta_organization
 	}
 
 	add_equipment_production = {
diff --git a/history/units/YAK_1007.txt b/history/units/YAK_1007.txt
index 243c19a57d4..9263b3ea9df 100644
--- a/history/units/YAK_1007.txt
+++ b/history/units/YAK_1007.txt
@@ -89,5 +89,6 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.86
 		efficiency = 20
+		industrial_manufacturer = mio:JAK_ryben_industries_organization
 	}
 }
diff --git a/history/units/YAL_1007.txt b/history/units/YAL_1007.txt
index a72a0cae2b5..f5b0ab60733 100644
--- a/history/units/YAL_1007.txt
+++ b/history/units/YAL_1007.txt
@@ -141,6 +141,7 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.1
 		efficiency = 50
+		industrial_manufacturer = mio:YAL_Yales_buechsenmacher_GmbH_organization
 	}
 	add_equipment_production = {
 		equipment = {
@@ -159,5 +160,6 @@ instant_effect = {
 		requested_factories = 1
 		progress = 0.2
 		efficiency = 20
+		industrial_manufacturer = mio:YAL_Johannes_Werkzeugkiste_organization
 	}
 }
\ No newline at end of file
diff --git a/history/units/YAL_knights_1.txt b/history/units/YAL_knights_1.txt
index d4234fcd8db..48c1af28930 100644
--- a/history/units/YAL_knights_1.txt
+++ b/history/units/YAL_knights_1.txt
@@ -1,18 +1,18 @@
 division_template = {
-	name = "Arcturian Knights"			#Infantry Division -
+	name = "Arcturian Knights"			#knights Division -
 	is_locked = yes
 	division_names_group = YAL_Name_05
 	regiments = {
 		knights = { x = 0 y = 0 }
-		knights = { x = 1 y = 0 }
 		knights = { x = 0 y = 1 }
-		knights = { x = 1 y = 1 }
 		knights = { x = 0 y = 2 }
-		knights = { x = 1 y = 2 }
 		knights = { x = 0 y = 3 }
+		knights = { x = 1 y = 0 }
+		knights = { x = 1 y = 1 }
+		knights = { x = 1 y = 2 }
 		knights = { x = 1 y = 3 }
-		knights = { x = 0 y = 4 }
-		knights = { x = 1 y = 4 }
+		knights = { x = 2 y = 0 }
+		knights = { x = 2 y = 1 }
 	}
 	support = {
 		recon = { x = 0 y = 0 }
diff --git a/history/units/ZEL_1007.txt b/history/units/ZEL_1007.txt
index d76fde8ee7f..bf6b7edda64 100644
--- a/history/units/ZEL_1007.txt
+++ b/history/units/ZEL_1007.txt
@@ -14,7 +14,7 @@ name = "Warriors"		# Melee
 		infantry = { x = 0 y = 1 }
 		infantry = { x = 0 y = 2 }
 		infantry = { x = 0 y = 3 }
-		infantry = { x = 0 y = 4 }
+		infantry = { x = 1 y = 0 }
 	}
 }
 division_template = {
@@ -24,7 +24,7 @@ name = "Royal Guard"		# Melee
 		spirit_warriors = { x = 0 y = 1 }
 		spirit_warriors = { x = 0 y = 2 }
 		spirit_warriors = { x = 0 y = 3 }
-		spirit_warriors = { x = 0 y = 4 }
+		spirit_warriors = { x = 1 y = 0 }
 	}
 	priority = 2
 }
diff --git a/history/units/ZES_1007.txt b/history/units/ZES_1007.txt
index a9b6eb81240..5c5787aef8a 100644
--- a/history/units/ZES_1007.txt
+++ b/history/units/ZES_1007.txt
@@ -83,5 +83,6 @@ instant_effect = {
 		requested_factories = 2
 		progress = 0.86
 		efficiency = 20
+		industrial_manufacturer = mio:ZES_support_equipment_manufacturer_organization
 	}
 }
diff --git a/history/units/ZES_heavy_strike_team.txt b/history/units/ZES_heavy_strike_team.txt
index f57fefeeffb..d4d193306e5 100644
--- a/history/units/ZES_heavy_strike_team.txt
+++ b/history/units/ZES_heavy_strike_team.txt
@@ -9,8 +9,8 @@
 		infantry = { x = 1 y = 1 }
 		infantry = { x = 1 y = 2 }
 		infantry = { x = 2 y = 0 }
-		artillery_brigade = { x = 2 y = 1 }
-		artillery_brigade = { x = 2 y = 2 }
+		artillery_brigade = { x = 3 y = 0 }
+		artillery_brigade = { x = 3 y = 1 }
 	}
 
 	support = {
diff --git a/history/units/ZRS_canterlot.txt b/history/units/ZRS_canterlot.txt
index 105553cacc9..c6cc6fed530 100644
--- a/history/units/ZRS_canterlot.txt
+++ b/history/units/ZRS_canterlot.txt
@@ -7,8 +7,8 @@ division_template = {
 		infantry = { x = 0 y = 1 }
 		infantry = { x = 0 y = 2 }
 		infantry = { x = 0 y = 3 }
-		infantry = { x = 0 y = 4 }
-		infantry = { x = 0 y = 5 }
+		infantry = { x = 1 y = 0 }
+		infantry = { x = 1 y = 1 }
 	}
 
 	support = {
diff --git a/history/units/ZRS_cloud.txt b/history/units/ZRS_cloud.txt
index 96af47f0f7f..5a9bc303c2a 100644
--- a/history/units/ZRS_cloud.txt
+++ b/history/units/ZRS_cloud.txt
@@ -21,7 +21,7 @@ division_template = {
 		pegasi = { x = 0 y = 1 }
 		pegasi = { x = 0 y = 2 }
 		pegasi = { x = 0 y = 3 }
-		pegasi = { x = 0 y = 4 }
+		pegasi = { x = 1 y = 0 }
 	}
 
 	support = {
diff --git a/history/units/ZYO_1007.txt b/history/units/ZYO_1007.txt
index c3e63ecaba9..d0c74aa6da7 100644
--- a/history/units/ZYO_1007.txt
+++ b/history/units/ZYO_1007.txt
@@ -14,7 +14,7 @@ division_template = {
 		infantry = { x = 0 y = 1 }
 		infantry = { x = 0 y = 2 }
 		infantry = { x = 0 y = 3 }
-		infantry = { x = 0 y = 4 }
+		infantry = { x = 1 y = 0 }
 	}
 }
 
diff --git a/interface/countrydiplomacyview.gui b/interface/countrydiplomacyview.gui
old mode 100755
new mode 100644
index 493ca47f504..16483d2ab28
--- a/interface/countrydiplomacyview.gui
+++ b/interface/countrydiplomacyview.gui
@@ -2999,9 +2999,8 @@ guiTypes = {
 
 			instantTextboxType = {
 				name = "title"
-				position = { x = 0 y = 29 }
+				position = { x = -3 y = 29 }
 				font = "hoi_24header"
-				text = "Maus"
 				maxWidth = 530
 				maxHeight = 20
 				format = center
@@ -3018,7 +3017,6 @@ guiTypes = {
 				name = "time_text"
 				position = { x = 110 y = 93 }
 				font = "hoi_18mbs"
-				text = "Maus"
 				maxWidth = 100
 				maxHeight = 50
 			}
@@ -3043,10 +3041,12 @@ guiTypes = {
 			containerWindowType = {
 				name = "groups"
 				position = { x = 0 y = 121 }
-				size = { width = 100%% height = -280 }
-				margin = { top = 13 left = 13 bottom = 15 right = 25}
+				size = { width = 100%% height = -275 }
+				margin = { top = 13 left = 13 bottom = 13 }
 				verticalScrollbar = "right_vertical_slider"
-
+				scroll_wheel_factor = 38
+				smooth_scrolling = yes
+		
 				background = {
 					name = "Background"
 					spriteType ="GFX_tiled_window_1b_border"
@@ -3054,18 +3054,16 @@ guiTypes = {
 
 				instantTextboxType = {
 					name = "empty"
-					position = { x = 20 y = 30 }
+					position = { x = 15 y = 30 }
 					font = "hoi_18mbs"
-					text = "Maus"
 					maxWidth = 470
-					maxHeight = 300
+					maxHeight = 200
 					format = center
 				}
 				gridboxtype = {
 					name = "group_grid"
-					position = { x = 3 y = 5}
-					size = { width = 100%% height = 95%% }
-					slotsize = { width = 200 height = 36 }
+					size = { width = 100%% height = 100%% }
+					slotsize = { width = 489 height = 38 }
 					max_slots_horizontal = 1
 					format = "UPPER_LEFT"
 				}
@@ -3075,7 +3073,7 @@ guiTypes = {
 				name = "description"
 				position = { x = 28 y = -270 }
 				font = "hoi_18mbs"
-				text = "Maus"
+
 				maxWidth = 470
 				maxHeight = 300
 				format = center
@@ -3120,9 +3118,8 @@ guiTypes = {
 
 			instantTextboxType = {
 				name = "title"
-				position = { x = 0 y = 29 }
+				position = { x = -3 y = 29 }
 				font = "hoi_24header"
-				text = "Maus"
 				maxWidth = 530
 				maxHeight = 20
 				format = center
@@ -3131,10 +3128,13 @@ guiTypes = {
 			containerWindowType = {
 				name = "groups"
 				position = { x = 0 y = 80 }
-				size = { width = 100%% height = -285 }
-				margin = { top = 13 left = 13 bottom = 15 right = 25}
+				size = { width = 100%% height = -280 }
+				margin = { top = 13 left = 13 bottom = 13 }
 				verticalScrollbar = "right_vertical_slider"
+				scroll_wheel_factor = 38
+				smooth_scrolling = yes
 
+		
 				background = {
 					name = "Background"
 					spriteType ="GFX_tiled_window_1b_border"
@@ -3142,18 +3142,16 @@ guiTypes = {
 
 				instantTextboxType = {
 					name = "empty"
-					position = { x = 20 y = 30 }
+					position = { x = 15 y = 30 }
 					font = "hoi_18mbs"
-					text = "Maus"
 					maxWidth = 470
-					maxHeight = 300
+					maxHeight = 200
 					format = center
 				}
 				gridboxtype = {
 					name = "group_grid"
-					position = { x = 3 y = 5}
-					size = { width = 100%% height = 95%% }
-					slotsize = { width = 200 height = 36 }
+					size = { width = 100%% height = 100%% }
+					slotsize = { width = 489 height = 38 }
 					max_slots_horizontal = 1
 					format = "UPPER_LEFT"
 				}
@@ -3163,7 +3161,7 @@ guiTypes = {
 				name = "description"
 				position = { x = 28 y = -270 }
 				font = "hoi_18mbs"
-				text = "Maus"
+
 				maxWidth = 470
 				maxHeight = 300
 				format = center
@@ -3802,8 +3800,8 @@ guiTypes = {
 
 		OverlappingElementsBoxType = {
 			name = "relations"
-			position = { x = 420 y = 8 }
-			size = { x = 80 y = 32 }
+			position = { x = 350 y = 8 }
+			size = { x = 155 y = 32 }
 			format = left
 			spacing = 1.0
 		}
@@ -4157,9 +4155,8 @@ guiTypes = {
 
 		buttonType = {
 			name = "maximum_amount_button"
-			quadTextureSprite ="GFX_maximum_stockpile_button"
-			position = { x = 304 y = 40 }
-			scale = 0.9
+			quadTextureSprite ="GFX_add_all_button_32x32"
+			position = { x = 302 y = 34 }
 			clicksound = click_default
 		}
 
@@ -4773,58 +4770,122 @@ guiTypes = {
 			fixedsize = yes
 		}
 	}
+	
 
 	containerWindowType = {
-		name = "diplomacy_expeditionary_group_entry"
-		size = { width = 200 height = 36 }
-		clipping = no
-
+		name = "diplomacy_send_units_group_entry"
+		size = { width=489 height=38 }
 
-		background = {
-			name = "Background"
-			spriteType = "GFX_volunteers_entry_bg"
+		buttonType = {
+			name = "background_button"
+			spriteType = "GFX_send_units_entry_bg"
 			clicksound = click_default
 		}
-		iconType ={
-			name ="color"
-			spriteType = "GFX_armyoverview_group_marker"
-			position = { x=384 y=10 }
-			alwaystransparent = yes
-		}
-		iconType ={
-			name ="exp_selection"
-			spriteType = "GFX_expeditionary_force_icon"
-			position = { x=442 y=-3 }
-			alwaystransparent = yes
-		}
-		iconType ={
-			name ="selection"
-			spriteType = "GFX_volunteer_force_icon"
-			position = { x=442 y=-3 }
-			alwaystransparent = yes
-		}
-		instantTextboxType = {
-			name = "count"
-			position = { x = 12 y = 9 }
-			font = "hoi_16mbs"
-			text = "1 division"
-			maxWidth = 116
-			maxHeight = 20
-			fixedsize = yes
+
+		containerWindowType = {
+			name = "unassigned_divisions"
+
+			instantTextboxType = {
+				name = "description"
+				position = { x = 13 y = 9 }
+				font = "hoi_18mbs"
+				maxWidth = 470
+				maxHeight = 19
+				fixedsize = yes
+				alwaystransparent = yes
+			}
 		}
 
-		instantTextboxType = {
-			name = "commander"
-			position = { x = 165 y = 7 }
-			font = "hoi_18mbs"
-			text = NO_COMMANDER_FOR_GROUP
-			maxWidth = 200
-			maxHeight = 20
-			fixedsize = yes
+		containerWindowType = {
+			name = "army"
+
+			iconType = {
+				name ="army_shield"
+				quadTextureSprite = "GFX_theatre_army_shield"
+				position = { x=5 y=4 }
+				alwaystransparent = yes
+			}
+			instantTextBoxType = {
+				name = "division_count"
+				position = { x=15 y=13 }
+				font = "hoi_18mbs"
+				maxWidth = 28
+				maxHeight = 23
+				fixedsize = yes
+				format = center
+				alwaystransparent = yes
+			}
+			instantTextBoxType = {
+				name = "division_count_wide"
+				position = { x=-5 y=15 }
+				font = "hoi_16mbs"
+				maxWidth = 45
+				maxHeight = 23
+				fixedsize = yes
+				format = right
+				alwaystransparent = yes
+			}
+
+			iconType = {
+				name = "leader_skill_bg"
+				spriteType = "GFX_land_battle_leader_skill_bg"
+				position = { x=43 y=2 }
+				scale = 0.7
+				alwaystransparent = yes
+			}
+			instantTextboxType = {
+				name = "leader_skill"
+				position = { x=40 y=5 }
+				font = "hoi_18mbs"
+				maxWidth = 30
+				maxHeight = 23
+				format = center
+				alwaystransparent = yes
+			}
+
+			iconType = {
+				name = "leader_icon"
+				position = { x=83 y=19 }
+				quadTextureSprite ="GFX_leader_unknown"
+				centerposition = yes
+				scale = 0.17
+				alwaystransparent = yes
+			}
+
+			instantTextboxType = {
+				name = "army_name"
+				position = { x = 106 y = 2 }
+				font = "hoi_16mbs"
+				maxWidth = 180
+				maxHeight = 17
+				fixedsize = yes
+				alwaystransparent = yes
+			}
+			instantTextboxType = {
+				name = "leader_name"
+				position = { x = 106 y = 16 }
+				font = "hoi_18mbs"
+				maxWidth = 180
+				maxHeight = 19
+				fixedsize = yes
+				alwaystransparent = yes
+			}
+
+			OverlappingElementsBoxType = {
+				name = "divisions_summary"
+				position = { x=284 y=5 }
+				size = { x=202 y=27 }
+				spacing = 0
+			}
+			positionType = {
+				name = "divisions_summary_max_item_count"
+				position = { x=11 y=0 }
+			}
 		}
 	}
 
 
+	
 	containerWindowType = {
 		name = "request_license_land_entry"
 		position = { x=6 y=0 }
diff --git a/interface/countrydoctrinetreeview.gui b/interface/countrydoctrinetreeview.gui
index 2d844c2a890..2d1b8826761 100644
--- a/interface/countrydoctrinetreeview.gui
+++ b/interface/countrydoctrinetreeview.gui
@@ -36,25 +36,25 @@ guiTypes = {
 			iconType = {
 				name ="mob_warfare_bg"
 				spriteType = "GFX_mob_warfare_bg"
-				position = { x=85 y=33 }
+				position = { x = 32 y = 33 }
 			}			
 				
 			iconType = {
 				name ="sup_firepower_bg"
 				spriteType = "GFX_sup_firepower_bg"
-				position = { x=575 y=33 }
+				position = { x = 512 y = 33 }
 			}	
 	
 			iconType = {
 				name ="grand_battleplan_bg"
 				spriteType = "GFX_grand_battleplan_bg"
-				position = { x=1050 y=33 }
+				position = { x = 992 y = 33 }
 			}
 
 			iconType = {
 				name = "highlight_grand_battle_plan"
 				spriteType = "GFX_tutorial_research_small_item_icon_glow"
-				position = { x=1245 y=291}
+				position = { x = 1192 y = 291}
 				hide = yes
 				alwaystransparent = yes
 			}
@@ -62,12 +62,12 @@ guiTypes = {
 			iconType = {
 				name ="mass_assault_bg"
 				spriteType = "GFX_mass_assault_bg"
-				position = { x=1535 y=33 }
+				position = { x = 1472 y = 33 }
 			}		
 			
 			instantTextBoxType = {
 				name = "mob_warfare_title"
-				position = { x = 120 y = 35 }
+				position = { x = 68 y = 35 }
 				textureFile = ""
 				font = "hoi_22tech"
 				borderSize = {x = 0 y = 4}
@@ -80,7 +80,7 @@ guiTypes = {
 
 			instantTextBoxType = {
 				name = "superior_firepower_title"
-				position = { x = 600 y = 35 }
+				position = { x = 548 y = 35 }
 				textureFile = ""
 				font = "hoi_22tech"
 				borderSize = {x = 0 y = 4}
@@ -93,7 +93,7 @@ guiTypes = {
 
 			instantTextBoxType = {
 				name = "grand_battleplan_title"
-				position = { x = 1080 y = 35 }
+				position = { x = 1028 y = 35 }
 				textureFile = ""
 				font = "hoi_22tech"
 				borderSize = {x = 0 y = 4}
@@ -106,7 +106,7 @@ guiTypes = {
 			
 			instantTextBoxType = {
 				name = "mass_assault_title"
-				position = { x = 1560 y = 35 }
+				position = { x = 1508 y = 35 }
 				textureFile = ""
 				font = "hoi_22tech"
 				borderSize = {x = 0 y = 4}
@@ -119,12 +119,12 @@ guiTypes = {
 
 			instantTextBoxType = {
 				name = "mob_warfare_desc"
-				position = { x = 140 y = 90 }
+				position = { x = 68 y = 90 }
 				textureFile = ""
 				font = "hoi_20b"
 				borderSize = {x = 0 y = 4}
 				text = "MOBILE_WARFARE_DOCTRINE_DESC"
-				maxWidth = 350
+				maxWidth = 400
 				maxHeight = 122
 				format = center
 				Orientation = "UPPER_LEFT"
@@ -132,7 +132,7 @@ guiTypes = {
 
 			instantTextBoxType = {
 				name = "superior_firepower_desc"
-				position = { x = 600 y = 90 }
+				position = { x = 548 y = 90 }
 				textureFile = ""
 				font = "hoi_20b"
 				borderSize = {x = 0 y = 4}
@@ -145,25 +145,25 @@ guiTypes = {
 
 			instantTextBoxType = {
 				name = "grand_battleplan_desc"
-				position = { x = 1100 y = 90 }
+				position = { x = 1028 y = 90 }
 				textureFile = ""
 				font = "hoi_20b"
 				borderSize = {x = 0 y = 4}
 				text = "GRAND_BATTLEPLAN_DOCTRINE_DESC"
-				maxWidth = 350
+				maxWidth = 400
 				maxHeight = 122
 				format = center
 				Orientation = "UPPER_LEFT"
 			}
 			
 			instantTextBoxType = {
-				name = "mass assault_desc"
-				position = { x = 1606 y = 90 }
+				name = "mass_assault_desc"
+				position = { x = 1508 y = 90 }
 				textureFile = ""
 				font = "hoi_20b"
 				borderSize = {x = 0 y = 4}
 				text = "MASS_ASSAULT_DOCTRINE_DESC"
-				maxWidth = 300
+				maxWidth = 400
 				maxHeight = 122
 				format = center
 				Orientation = "UPPER_LEFT"
@@ -171,7 +171,7 @@ guiTypes = {
 
 			instantTextBoxType = {
 				name = "berlin_path_title"
-				position = { x = 120 y = 1385 }
+				position = { x = 68 y = 1385 }
 				textureFile = ""
 				font = "hoi_22tech"
 				borderSize = {x = 0 y = 4}
@@ -184,12 +184,12 @@ guiTypes = {
 
 			instantTextBoxType = {
 				name = "berlin_path_desc"
-				position = { x = 166 y = 1420 }
+				position = { x = 68 y = 1420 }
 				textureFile = ""
 				font = "hoi_20b"
 				borderSize = {x = 0 y = 4}
 				text = "BERLIN_PATH_DESC"
-				maxWidth = 300
+				maxWidth = 400
 				maxHeight = 122
 				format = center
 				Orientation = "UPPER_LEFT"
@@ -197,12 +197,12 @@ guiTypes = {
 
 			instantTextBoxType = {
 				name = "berlin_path_subtitle1"
-				position = { x = 110 y = 1655 }
+				position = { x = 72 y = 1670 }
 				textureFile = ""
 				font = "hoi_22tech"
 				borderSize = {x = 0 y = 4}
 				text = "BERLIN_PATH_BRANCH1_LABEL"
-				maxWidth = 180
+				maxWidth = 150
 				maxHeight = 122
 				format = center
 				Orientation = "UPPER_LEFT"
@@ -211,12 +211,12 @@ guiTypes = {
 
 			instantTextBoxType = {
 				name = "berlin_path_subtitle2"
-				position = { x = 360 y = 1655 }
+				position = { x = 328 y = 1670 }
 				textureFile = ""
 				font = "hoi_22tech"
 				borderSize = {x = 0 y = 4}
 				text = "BERLIN_PATH_BRANCH2_LABEL"
-				maxWidth = 180
+				maxWidth = 150
 				maxHeight = 122
 				format = center
 				Orientation = "UPPER_LEFT"
@@ -225,7 +225,7 @@ guiTypes = {
 
 			instantTextBoxType = {
 				name = "brussels_path_title"
-				position = { x = 600 y = 1385 }
+				position = { x = 548 y = 1385 }
 				textureFile = ""
 				font = "hoi_22tech"
 				borderSize = {x = 0 y = 4}
@@ -238,12 +238,12 @@ guiTypes = {
 
 			instantTextBoxType = {
 				name = "brussels_path_desc"
-				position = { x = 646 y = 1420 }
+				position = { x = 548 y = 1420 }
 				textureFile = ""
 				font = "hoi_20b"
 				borderSize = {x = 0 y = 4}
 				text = "BRUSSELS_PATH_DESC"
-				maxWidth = 300
+				maxWidth = 400
 				maxHeight = 122
 				format = center
 				Orientation = "UPPER_LEFT"
@@ -251,12 +251,12 @@ guiTypes = {
 
 			instantTextBoxType = {
 				name = "brussels_path_subtitle1"
-				position = { x = 590 y = 1655 }
+				position = { x = 552 y = 1670 }
 				textureFile = ""
 				font = "hoi_22tech"
 				borderSize = {x = 0 y = 4}
 				text = "BRUSSELS_PATH_BRANCH1_LABEL"
-				maxWidth = 180
+				maxWidth = 150
 				maxHeight = 122
 				format = center
 				Orientation = "UPPER_LEFT"
@@ -265,12 +265,12 @@ guiTypes = {
 
 			instantTextBoxType = {
 				name = "brussels_path_subtitle2"
-				position = { x = 840 y = 1655 }
+				position = { x = 808 y = 1670 }
 				textureFile = ""
 				font = "hoi_22tech"
 				borderSize = {x = 0 y = 4}
 				text = "BRUSSELS_PATH_BRANCH2_LABEL"
-				maxWidth = 180
+				maxWidth = 150
 				maxHeight = 122
 				format = center
 				Orientation = "UPPER_LEFT"
@@ -279,7 +279,7 @@ guiTypes = {
 
 			instantTextBoxType = {
 				name = "global_path_title"
-				position = { x = 1080 y = 1385 }
+				position = { x = 1028 y = 1385 }
 				textureFile = ""
 				font = "hoi_22tech"
 				borderSize = {x = 0 y = 4}
@@ -292,12 +292,12 @@ guiTypes = {
 
 			instantTextBoxType = {
 				name = "global_path_desc"
-				position = { x = 1126 y = 1420 }
+				position = { x = 1028 y = 1420 }
 				textureFile = ""
 				font = "hoi_20b"
 				borderSize = {x = 0 y = 4}
 				text = "GLOBAL_PATH_DESC"
-				maxWidth = 300
+				maxWidth = 400
 				maxHeight = 122
 				format = center
 				Orientation = "UPPER_LEFT"
@@ -305,12 +305,12 @@ guiTypes = {
 
 			instantTextBoxType = {
 				name = "global_path_subtitle1"
-				position = { x = 1070 y = 1536 }
+				position = { x = 1032 y = 1551 }
 				textureFile = ""
 				font = "hoi_22tech"
 				borderSize = {x = 0 y = 4}
 				text = "GLOBAL_PATH_BRANCH1_LABEL"
-				maxWidth = 180
+				maxWidth = 150
 				maxHeight = 122
 				format = center
 				Orientation = "UPPER_LEFT"
@@ -319,12 +319,12 @@ guiTypes = {
 
 			instantTextBoxType = {
 				name = "global_path_subtitle2"
-				position = { x = 1320 y = 1536 }
+				position = { x = 1288 y = 1551 }
 				textureFile = ""
 				font = "hoi_22tech"
 				borderSize = {x = 0 y = 4}
 				text = "GLOBAL_PATH_BRANCH2_LABEL"
-				maxWidth = 180
+				maxWidth = 150
 				maxHeight = 122
 				format = center
 				Orientation = "UPPER_LEFT"
@@ -333,12 +333,12 @@ guiTypes = {
 
 			instantTextBoxType = {
 				name = "global_path_subtitle3"
-				position = { x = 1070 y = 2017 }
+				position = { x = 1032 y = 2032 }
 				textureFile = ""
 				font = "hoi_22tech"
 				borderSize = {x = 0 y = 4}
 				text = "GLOBAL_PATH_BRANCH3_LABEL"
-				maxWidth = 180
+				maxWidth = 150
 				maxHeight = 122
 				format = center
 				Orientation = "UPPER_LEFT"
@@ -347,12 +347,12 @@ guiTypes = {
 
 			instantTextBoxType = {
 				name = "global_path_subtitle4"
-				position = { x = 1320 y = 2017 }
+				position = { x = 1288 y = 2032 }
 				textureFile = ""
 				font = "hoi_22tech"
 				borderSize = {x = 0 y = 4}
 				text = "GLOBAL_PATH_BRANCH4_LABEL"
-				maxWidth = 180
+				maxWidth = 150
 				maxHeight = 122
 				format = center
 				Orientation = "UPPER_LEFT"
@@ -361,7 +361,7 @@ guiTypes = {
 
 			instantTextBoxType = {
 				name = "warsaw_path_title"
-				position = { x = 1560 y = 1385 }
+				position = { x = 1508 y = 1385 }
 				textureFile = ""
 				font = "hoi_22tech"
 				borderSize = {x = 0 y = 4}
@@ -374,12 +374,12 @@ guiTypes = {
 
 			instantTextBoxType = {
 				name = "warsaw_path_desc"
-				position = { x = 1606 y = 1420 }
+				position = { x = 1508 y = 1420 }
 				textureFile = ""
 				font = "hoi_20b"
 				borderSize = {x = 0 y = 4}
 				text = "WARSAW_PATH_DESC"
-				maxWidth = 300
+				maxWidth = 400
 				maxHeight = 122
 				format = center
 				Orientation = "UPPER_LEFT"
@@ -387,12 +387,12 @@ guiTypes = {
 
 			instantTextBoxType = {
 				name = "warsaw_path_subtitle1"
-				position = { x = 1550 y = 1536 }
+				position = { x = 1512 y = 1551 }
 				textureFile = ""
 				font = "hoi_22tech"
 				borderSize = {x = 0 y = 4}
 				text = "WARSAW_PATH_BRANCH1_LABEL"
-				maxWidth = 180
+				maxWidth = 150
 				maxHeight = 122
 				format = center
 				Orientation = "UPPER_LEFT"
@@ -401,12 +401,12 @@ guiTypes = {
 
 			instantTextBoxType = {
 				name = "warsaw_path_subtitle2"
-				position = { x = 1800 y = 1536 }
+				position = { x = 1768 y = 1551 }
 				textureFile = ""
 				font = "hoi_22tech"
 				borderSize = {x = 0 y = 4}
 				text = "WARSAW_PATH_BRANCH2_LABEL"
-				maxWidth = 180
+				maxWidth = 150
 				maxHeight = 122
 				format = center
 				Orientation = "UPPER_LEFT"
@@ -415,7 +415,7 @@ guiTypes = {
 
 			instantTextBoxType = {
 				name = "mob_warfare_subtitle1"
-				position = { x = 110 y = 435 }
+				position = { x = 72 y = 435 }
 				textureFile = ""
 				font = "hoi_22tech"
 				borderSize = {x = 0 y = 4}
@@ -429,12 +429,12 @@ guiTypes = {
 
 			instantTextBoxType = {
 				name = "mob_warfare_subtitle2"
-				position = { x = 355 y = 455 }
+				position = { x = 328 y = 435 }
 				textureFile = ""
 				font = "hoi_22tech"
 				borderSize = {x = 0 y = 4}
 				text = "BLITZKRIEG_LABEL"
-				maxWidth = 200
+				maxWidth = 150
 				maxHeight = 122
 				format = center
 				Orientation = "UPPER_LEFT"
@@ -443,7 +443,7 @@ guiTypes = {
 			
 			instantTextBoxType = {
 				name = "mob_warfare_subtitle3"
-				position = { x = 110 y = 919 }
+				position = { x = 72 y = 919 }
 				textureFile = ""
 				font = "hoi_22tech"
 				borderSize = {x = 0 y = 4}
@@ -457,12 +457,12 @@ guiTypes = {
 
 			instantTextBoxType = {
 				name = "mob_warfare_subtitle4"
-				position = { x = 360 y = 919 }
+				position = { x = 328 y = 919 }
 				textureFile = ""
 				font = "hoi_22tech"
 				borderSize = {x = 0 y = 4}
 				text = "MODERN_BLITZKRIEG_LABEL"
-				maxWidth = 180
+				maxWidth = 150
 				maxHeight = 122
 				format = center
 				Orientation = "UPPER_LEFT"
@@ -471,7 +471,7 @@ guiTypes = {
 			
 			instantTextBoxType = {
 				name = "sup_firepower_subtitle1"
-				position = { x = 600 y = 435 }
+				position = { x = 552 y = 435 }
 				textureFile = ""
 				font = "hoi_22tech"
 				borderSize = {x = 0 y = 4}
@@ -485,12 +485,12 @@ guiTypes = {
 
 			instantTextBoxType = {
 				name = "sup_firepower_subtitle2"
-				position = { x = 850 y = 435 }
+				position = { x = 808 y = 435 }
 				textureFile = ""
 				font = "hoi_22tech"
 				borderSize = {x = 0 y = 4}
 				text = "INTEGRATED_SUPPORT_LABEL"
-				maxWidth = 170
+				maxWidth = 150
 				maxHeight = 122
 				format = center
 				Orientation = "UPPER_LEFT"
@@ -499,7 +499,7 @@ guiTypes = {
 			
 			instantTextBoxType = {
 				name = "sup_firepower_subtitle3"
-				position = { x = 600 y = 795 }
+				position = { x = 552 y = 795 }
 				textureFile = ""
 				font = "hoi_22tech"
 				borderSize = {x = 0 y = 4}
@@ -513,12 +513,12 @@ guiTypes = {
 
 			instantTextBoxType = {
 				name = "sup_firepower_subtitle4"
-				position = { x = 840 y = 795 }
+				position = { x = 808 y = 795 }
 				textureFile = ""
 				font = "hoi_22tech"
 				borderSize = {x = 0 y = 4}
 				text = "SHOCK_AND_AWE_LABEL"
-				maxWidth = 170
+				maxWidth = 150
 				maxHeight = 122
 				format = center
 				Orientation = "UPPER_LEFT"
@@ -527,12 +527,12 @@ guiTypes = {
 			
 			instantTextBoxType = {
 				name = "grand_battleplan_subtitle1"
-				position = { x = 1070 y = 575 }
+				position = { x = 1032 y = 560 }
 				textureFile = ""
 				font = "hoi_22tech"
 				borderSize = {x = 0 y = 4}
 				text = "ASSAULT_LABEL"
-				maxWidth = 170
+				maxWidth = 150
 				maxHeight = 122
 				format = center
 				Orientation = "UPPER_LEFT"
@@ -541,12 +541,12 @@ guiTypes = {
 
 			instantTextBoxType = {
 				name = "grand_battleplan_subtitle2"
-				position = { x = 1310 y = 575 }
+				position = { x = 1288 y = 560 }
 				textureFile = ""
 				font = "hoi_22tech"
 				borderSize = {x = 0 y = 4}
 				text = "INFILTRATION_LABEL"
-				maxWidth = 200
+				maxWidth = 150
 				maxHeight = 122
 				format = center
 				Orientation = "UPPER_LEFT"
@@ -555,7 +555,7 @@ guiTypes = {
 			
 			instantTextBoxType = {
 				name = "mass_assault_subtitle1"
-				position = { x = 1560 y = 435 }
+				position = { x = 1512 y = 435 }
 				textureFile = ""
 				font = "hoi_22tech"
 				borderSize = {x = 0 y = 4}
@@ -569,7 +569,7 @@ guiTypes = {
 
 			instantTextBoxType = {
 				name = "mass_assault_subtitle2"
-				position = { x = 1816 y = 435 }
+				position = { x = 1768 y = 435 }
 				textureFile = ""
 				font = "hoi_22tech"
 				borderSize = {x = 0 y = 4}
@@ -583,8 +583,8 @@ guiTypes = {
 				
 			gridboxtype = {
 				name = "mobile_warfare_tree"
-				position = { x=80 y=172 }
-				size = { width = 478 height = 1350 }
+				position = { x = 28 y = 172 }
+				size = { width = 480 height = 1350 }
 				slotsize = { width=60 height= 60 }
 				format = "UP"
 
@@ -597,7 +597,7 @@ guiTypes = {
 
 			gridboxtype = {
 				name = "superior_firepower_tree"
-				position = { x=560 y=172 }
+				position = { x = 508 y = 172 }
 				size = { width = 480 height = 1350 }
 				slotsize = { width=60 height= 60 }
 				format = "UP"
@@ -611,7 +611,7 @@ guiTypes = {
 
 			gridboxtype = {
 				name = "trench_warfare_tree"
-				position = { x=1040 y=172 }
+				position = { x = 988 y = 172 }
 				size = { width = 480 height = 1350 }
 				slotsize = { width=60 height= 60 }
 				format = "UP"
@@ -626,7 +626,7 @@ guiTypes = {
 
 			gridboxtype = {
 				name = "mass_assault_tree"
-				position = { x=1520 y=172 }
+				position = { x = 1468 y = 172 }
 				size = { width = 480 height = 1350 }
 				slotsize = { width=60 height= 60 }
 				format = "UP"
@@ -640,8 +640,8 @@ guiTypes = {
 			}
 			gridboxtype = {
 				name = "berlin_path_tree"
-				position = { x=80 y=1522 }
-				size = { width = 478 height = 1000 }
+				position = { x = 28 y = 1522 }
+				size = { width = 480 height = 1000 }
 				slotsize = { width=60 height= 60 }
 				format = "UP"
 
@@ -654,7 +654,7 @@ guiTypes = {
 
 			gridboxtype = {
 				name = "brussels_path_tree"
-				position = { x=560 y=1522 }
+				position = { x = 508 y = 1522 }
 				size = { width = 480 height = 1000 }
 				slotsize = { width=60 height= 60 }
 				format = "UP"
@@ -668,7 +668,7 @@ guiTypes = {
 
 			gridboxtype = {
 				name = "global_path_tree"
-				position = { x=1040 y=1522 }
+				position = { x = 988 y = 1522 }
 				size = { width = 480 height = 1000 }
 				slotsize = { width=60 height= 60 }
 				format = "UP"
@@ -683,7 +683,7 @@ guiTypes = {
 
 			gridboxtype = {
 				name = "warsaw_path_tree"
-				position = { x=1520 y=1522 }
+				position = { x = 1468 y = 1522 }
 				size = { width = 480 height = 1000 }
 				slotsize = { width=60 height= 60 }
 				format = "UP"
@@ -922,19 +922,19 @@ guiTypes = {
 			iconType = {
 				name ="air_superiority_bg"
 				spriteType = "GFX_strategic_destruction_bg"
-				position = { x=80 y=33 }
+				position = { x=20 y=33 }
 			}			
 				
 			iconType = {
 				name ="battlefield_destruction_bg"
 				spriteType = "GFX_battlefield_destruction_bg"
-				position = { x=595 y=33 }
+				position = { x=455 y=33 }
 			}	
 	
 			iconType = {
 				name ="operational_destruction_bg"
 				spriteType = "GFX_operational_destruction_bg"
-				position = { x=1100 y=33 }
+				position = { x=890 y=33 }
 			}
 			iconType = {
 				name ="jet_cas_doctrines_bg"
@@ -945,7 +945,7 @@ guiTypes = {
 			iconType = {
 				name ="jet_fighter_doctrines_bg"
 				spriteType = "GFX_jet_fighter_doctrines_bg"
-				position = { x=2452 y=33 }
+				position = { x=2402 y=33 }
 			}	
 	
 #			iconType = {
@@ -956,7 +956,7 @@ guiTypes = {
 			
 			instantTextBoxType = {
 				name = "strategic_destruction_title"
-				position = { x = 80 y = 35 }
+				position = { x = 40 y = 35 }
 				font = "hoi_22tech"
 				borderSize = {x = 0 y = 4}
 				text = "TITLE_STRATEGIC_DESTRUCTION"
@@ -968,7 +968,7 @@ guiTypes = {
 
 			instantTextBoxType = {
 				name = "strategic_destruction_desc"
-				position = { x = 108 y = 70 }
+				position = { x = 45 y = 70 }
 				font = "hoi_20b"
 				borderSize = {x = 0 y = 4}
 				text = "STRATEGIC_DESTRUCTION_DESC"
@@ -980,7 +980,7 @@ guiTypes = {
 
 			instantTextBoxType = {
 				name = "battlefield_support_title"
-				position = { x = 605 y = 35 }
+				position = { x = 465 y = 35 }
 				font = "hoi_22tech"
 				borderSize = {x = 0 y = 4}
 				text = "TITLE_BATTLEFIELD_SUPPORT"
@@ -992,7 +992,7 @@ guiTypes = {
 
 			instantTextBoxType = {
 				name = "battlefield_support_desc"
-				position = { x = 620 y = 70 }
+				position = { x = 480 y = 70 }
 				font = "hoi_20b"
 				borderSize = {x = 0 y = 4}
 				text = "BATTLEFIELD_SUPPORT_DESC"
@@ -1004,7 +1004,7 @@ guiTypes = {
 
 			instantTextBoxType = {
 				name = "operational_integrity_title"
-				position = { x = 1105 y = 35 }
+				position = { x = 900 y = 35 }
 				font = "hoi_22tech"
 				borderSize = {x = 0 y = 4}
 				text = "TITLE_OPERATIONAL_INTEGRITY"
@@ -1016,7 +1016,7 @@ guiTypes = {
 
 			instantTextBoxType = {
 				name = "operational_integrity_desc"
-				position = { x = 1120 y = 82 }
+				position = { x = 910 y = 82 }
 				font = "hoi_20b"
 				borderSize = {x = 0 y = 4}
 				text = "OPERATIONAL_INTEGRITY_DESC"
@@ -1051,7 +1051,7 @@ guiTypes = {
 
 			instantTextBoxType = {
 				name = "jet_fighter_doctrines_desc"
-				position = { x = 2475 y = 82 }
+				position = { x = 2425 y = 82 }
 				font = "hoi_20b"
 				borderSize = {x = 0 y = 4}
 				text = "JET_FIGHTER_DOCTRINES_DESC"
@@ -1063,7 +1063,7 @@ guiTypes = {
 
 			instantTextBoxType = {
 				name = "jet_fighter_doctrines_title"
-				position = { x = 2475 y = 35 }
+				position = { x = 2425 y = 35 }
 				font = "hoi_22tech"
 				borderSize = {x = 0 y = 4}
 				text = "JET_FIGHTER_DOCTRINES_TITLE"
@@ -1130,7 +1130,7 @@ guiTypes = {
 			gridboxtype = {
 				#strategic_destruction_tree Needs to be named after first tech (air_superiority)
 				name = "air_superiority_tree"
-				position = { x=80 y=172 }
+				position = { x=20 y=172 }
 				size = { width = 427 height = 1335 }
 				slotsize = { width=60 height= 60 }
 				format = "UP"
@@ -1145,7 +1145,7 @@ guiTypes = {
 			gridboxtype = {
 				#battlefield_support_tree Needs to be named after first tech (formation_flying)
 				name = "formation_flying_tree"
-				position = { x=595 y=172 }
+				position = { x=455 y=172 }
 				size = { width = 427 height = 1335 }
 				slotsize = { width=60 height= 60 }
 				format = "UP"
@@ -1160,7 +1160,7 @@ guiTypes = {
 			gridboxtype = {
 				#operational_integrity_tree Needs to be named after first tech (force_rotation)
 				name = "force_rotation_tree"
-				position = { x=1100 y=172 }
+				position = { x=890 y=172 }
 				size = { width = 427 height = 1335 }
 				slotsize = { width=60 height= 60 }
 				format = "UP"
@@ -1202,7 +1202,7 @@ guiTypes = {
 			
 			gridboxtype = {
 				name = "basic_jet_operations_tree"
-				position = { x=1800 y=172 }
+				position = { x=1750 y=172 }
 				size = { width = 427 height = 1050 }
 				slotsize = { width=60 height= 60 }
 				format = "UP"
@@ -1215,6 +1215,216 @@ guiTypes = {
 			}
 		}
 
+		containerWindowType = {
+			name = "special_forces_doctrine_folder"
+			position = { x=0 y=47 }
+			size = { width = 100%% height = 100%% }
+			margin = { top = 13 left = 13 bottom = 24 right = 25}
+			drag_scroll = { left middle }
+			verticalScrollbar = "right_vertical_slider"
+			horizontalScrollbar = "bottom_horizontal_slider"
+			scroll_wheel_factor = 40
+
+			background = {
+				name = "Background"
+				quadTextureSprite ="GFX_tiled_window_2b_border"
+			}
+
+			containerWindowType = {
+				name = "size_filler"
+				position = { x=0 y=0 }
+				size = { width = 2100 height = 100% }
+			}
+	
+	
+			iconType = {
+				name ="mountaineers_bg"
+				spriteType = "GFX_mountaineers_bg"
+				position = { x=25 y=33 }
+			}			
+				
+			iconType = {
+				name ="marines_bg"
+				spriteType = "GFX_marine_bg"
+				position = { x=510 y=33 }
+			}	
+	
+			iconType = {
+				name ="paratroopers_bg"
+				spriteType = "GFX_paratroopers_bg"
+				position = { x=990 y=33 }
+			}		
+
+			iconType = {
+				name ="racial_specforce_bg"
+				spriteType = "GFX_racial_specforce_bg"
+				position = { x=1470 y=33 }
+			}		
+			
+			instantTextBoxType = {
+				name = "mountaineers_title"
+				position = { x = 60 y = 35 }
+				textureFile = ""
+				font = "hoi_22tech"
+				borderSize = {x = 0 y = 4}
+				text = "MOUNTAINEERS_DOCTRINE_LABEL"
+				maxWidth = 400
+				maxHeight = 122
+				format = center
+				Orientation = "UPPER_LEFT"
+			}			
+
+			instantTextBoxType = {
+				name = "marines_title"
+				position = { x = 540 y = 35 }
+				textureFile = ""
+				font = "hoi_22tech"
+				borderSize = {x = 0 y = 4}
+				text = "MARINES_DOCTRINE_LABEL"
+				maxWidth = 400
+				maxHeight = 122
+				format = center
+				Orientation = "UPPER_LEFT"
+			}
+
+			instantTextBoxType = {
+				name = "paratroopers_title"
+				position = { x = 1020 y = 35 }
+				textureFile = ""
+				font = "hoi_22tech"
+				borderSize = {x = 0 y = 4}
+				text = "PARATROOPERS_DOCTRINE_LABEL"
+				maxWidth = 400
+				maxHeight = 122
+				format = center
+				Orientation = "UPPER_LEFT"
+			}		
+
+			instantTextBoxType = {
+				name = "racial_specforce_title"
+				position = { x = 1500 y = 35 }
+				textureFile = ""
+				font = "hoi_22tech"
+				borderSize = {x = 0 y = 4}
+				text = "RACIAL_SPECFORCE_DOCTRINE_LABEL"
+				maxWidth = 400
+				maxHeight = 122
+				format = center
+				Orientation = "UPPER_LEFT"
+			}		
+
+			instantTextBoxType = {
+				name = "mountaineers_desc"
+				position = { x = 80 y = 90 }
+				textureFile = ""
+				font = "hoi_20b"
+				borderSize = {x = 0 y = 4}
+				text = "MOUNTAINEERS_DOCTRINE_DESC"
+				maxWidth = 350
+				maxHeight = 122
+				format = center
+				Orientation = "UPPER_LEFT"
+			}
+
+			instantTextBoxType = {
+				name = "marines_desc"
+				position = { x = 540 y = 90 }
+				textureFile = ""
+				font = "hoi_20b"
+				borderSize = {x = 0 y = 4}
+				text = "MARINES_DOCTRINE_DESC"
+				maxWidth = 400
+				maxHeight = 122
+				format = center
+				Orientation = "UPPER_LEFT"
+			}
+
+			instantTextBoxType = {
+				name = "paratroopers_desc"
+				position = { x = 1040 y = 90 }
+				textureFile = ""
+				font = "hoi_20b"
+				borderSize = {x = 0 y = 4}
+				text = "PARATROOPERS_DOCTRINE_DESC"
+				maxWidth = 350
+				maxHeight = 122
+				format = center
+				Orientation = "UPPER_LEFT"
+			}
+
+			instantTextBoxType = {
+				name = "racial_specforce_desc"
+				position = { x = 1520 y = 90 }
+				textureFile = ""
+				font = "hoi_20b"
+				borderSize = {x = 0 y = 4}
+				text = "RACIAL_SPECFORCE_DOCTRINE_DESC"
+				maxWidth = 350
+				maxHeight = 122
+				format = center
+				Orientation = "UPPER_LEFT"
+			}
+				
+			gridboxtype = {
+				name = "special_forces_mountaineers_tree"
+				position = { x=20 y=172 }
+				size = { width = 478 height = 1000 }
+				slotsize = { width=60 height= 60 }
+				format = "UP"
+
+				background = {
+					name = "Background"
+					quadTextureSprite ="GFX_fullborder_tiled"
+					position = { x=0 y=-150 }					
+				}					
+				
+			}
+			
+			gridboxtype = {
+				name = "special_forces_marines_tree"
+				position = { x=500 y=172 }
+				size = { width = 478 height = 1000 }
+				slotsize = { width=60 height= 60 }
+				format = "UP"
+
+				background = {
+					name = "Background"
+					quadTextureSprite ="GFX_fullborder_tiled"
+					position = { x=0 y=-150 }					
+				}					
+				
+			}
+			
+			gridboxtype = {
+				name = "special_forces_paratroopers_tree"
+				position = { x=980 y=172 }
+				size = { width = 478 height = 1000 }
+				slotsize = { width=60 height= 60 }
+				format = "UP"
+
+				background = {
+					name = "Background"
+					quadTextureSprite ="GFX_fullborder_tiled"
+					position = { x=0 y=-150 }					
+				}					
+				
+			}	 
+
+			gridboxtype = {
+				name = "racial_specforce_start_tree"
+				position = { x=1460 y=172 }
+				size = { width = 478 height = 1000 }
+				slotsize = { width=60 height= 60 }
+				format = "UP"
+
+				background = {
+					name = "Background"
+					quadTextureSprite ="GFX_fullborder_tiled"
+					position = { x=0 y=-150 }					
+				}					
+				
+			}	 
+		}
 		containerWindowType = {
 			name = "folder_tabs"
 			position = { x=350 y=7 }
@@ -1228,7 +1438,7 @@ guiTypes = {
 				clicksound = ui_doctrine_tab_land
 			}
 			instantTextBoxType = {
-				name = "army_doctrine_title"
+				name = "army_doctrine_folder_title"
 				text = "land_doctrine"
 				position = { x=-190 y=18}
 				font = "hoi_20bs"
@@ -1252,7 +1462,7 @@ guiTypes = {
 				clicksound = ui_doctrine_tab_naval
 			}
 			instantTextBoxType = {
-				name = "navy_doctrine_title"
+				name = "navy_doctrine_folder_title"
 				text = "naval_doctrine"
 				position = { x=60 y=18}
 				font = "hoi_20bs"
@@ -1269,7 +1479,7 @@ guiTypes = {
 				clicksound = ui_doctrine_tab_air
 			}
 			instantTextBoxType = {
-				name = "air_doctrine_title"
+				name = "air_doctrine_folder_title"
 				text = "air_doctrine"
 				position = { x=310 y=18}
 				font = "hoi_20bs"
@@ -1277,8 +1487,26 @@ guiTypes = {
 				maxHeight = 20
 				format = center
 				alwaystransparent = "yes"
-			}			
+			}		
+			buttonType = {
+				name = "special_forces_doctrine_folder_tab"
+				position = { x = 504 y = 0 }
+				quadTextureSprite = "GFX_specialforcesdoctrine_tab_large"
+				frame = 1
+				clicksound = ui_doctrine_tab_air
+			}
+			instantTextBoxType = {
+				name = "special_forces_doctrine_folder_title"
+				text = "special_forces"
+				position = { x=564 y=18}
+				font = "hoi_20bs"
+				maxWidth = 160
+				maxHeight = 20
+				format = center
+				alwaystransparent = "yes"
+			}	
 		}
+		
 
 		buttonType = {
 			name = "close_button"
@@ -1400,6 +1628,42 @@ guiTypes = {
 		}
 	}
 	
+	containerWindowType = {
+		name = "techtree_special_forces_doctrine_folder_item"
+		position = { x=0 y=5 }
+		size = { width = 72 height = 72 }
+		clipping = no
+
+		background = {
+			name = "Background"
+			quadTextureSprite ="GFX_technology_unavailable_item_bg"
+		}
+
+		iconType = {
+			name = "Icon"
+			position = { x=0 y=3 }
+			spriteType = "GFX_technology_medium"
+			alwaystransparent = yes
+		}
+		iconType = {
+			name = "bonus_icon"
+			position = { x=-1 y=-22 }
+			spriteType = "GFX_tech_bonus"
+		}
+		
+		instantTextBoxType = {
+			name = "bonus"
+			position = { x = -1 y = -22 }
+			textureFile = ""
+			font = "hoi_16mbs"
+			borderSize = {x = 4 y = 4}
+			text = "lol boat"
+			maxWidth = 80
+			maxHeight = 20
+			format = center
+		}
+	}
+	
 	containerWindowType = {
 		name = "technology_air_mission_entry"
 		position = { x=5 y=22 }
diff --git a/interface/countrylogisticsview.gui b/interface/countrylogisticsview.gui
index a745b49e01c..22ac4eb7f02 100644
--- a/interface/countrylogisticsview.gui
+++ b/interface/countrylogisticsview.gui
@@ -30,7 +30,7 @@ guiTypes = {
 			font = "hoi_36header"
 			borderSize = {x = 0 y = 0}
 			text = "LOGISTICS_LOGISTICS_LABEL"
-			maxWidth = 240
+			maxWidth = 400
 			maxHeight = 20
 			format = left	
 		}
diff --git a/interface/countrypoliticsview.gui b/interface/countrypoliticsview.gui
index 400116ac5b1..2757c67f15a 100755
--- a/interface/countrypoliticsview.gui
+++ b/interface/countrypoliticsview.gui
@@ -811,6 +811,19 @@ guiTypes = {
 			frame = 1
 		}
 	}
+	containerWindowType = {
+		name = "industrial_org_entry"
+		size = { width = 53 height = 53 }
+		clipping = no
+
+		buttonType = {
+			name = "open_roster_button"
+			position = { x = 31 y = 31 }
+			spriteType = "GFX_add_pol_idea_button"
+			centerposition = yes
+			clicksound = click_default
+		}
+	}
 	
 	containerWindowType = {
 		name = "political_selectable_idea_entry_grid"
diff --git a/interface/countryproductionlineview.gui b/interface/countryproductionlineview.gui
index 01fceb160d8..de11234d908 100755
--- a/interface/countryproductionlineview.gui
+++ b/interface/countryproductionlineview.gui
@@ -38,7 +38,7 @@ guiTypes = {
 			font = "hoi_36header"
 			borderSize = {x = 0 y = 0}
 			text = "PRODUCTION_PRODUCTION_LABEL"
-			maxWidth = 240
+			maxWidth = 440
 			maxHeight = 20
 			format = left
 		}
@@ -1156,7 +1156,6 @@ guiTypes = {
 		hide_animation_type = accelerated
 		animation_time = 300
 		size = { width=495 height=100%% }
-		click_to_front = yes
 
 		background = {
 			name = "Background"
@@ -1188,6 +1187,37 @@ guiTypes = {
 			}
 		}
 
+		containerWindowType = {
+			name = "production_MIOs"
+			position = { x= 20 y = 12}
+			clipping = no
+			size = { width=80 height=35 }
+			Orientation = UPPER_LEFT
+
+				background = {
+					name = "MIO_bg"
+					quadTextureSprite ="GFX_mini_bg"
+				}
+		
+			iconType = {
+				name ="MIO_icon"
+				spriteType = "GFX_industrial_manufacturer_icon"
+				position = { x= 7 y = 7 }
+				Orientation = "UPPER_LEFT"
+			}
+		
+			instantTextBoxType = {
+				name ="available_MIOs"
+				position = { x= 35 y = 8 }
+				font = "hoi_18mbs"
+				text = "999"
+				format = left
+				maxWidth = 30
+				maxHeight = 24
+				fixedsize = yes
+			}
+		}	
+
 		buttonType = {
 			name = "checkbox"
 			position = { x = -355 y = 14 }
@@ -1395,6 +1425,37 @@ guiTypes = {
 			}
 		}
 
+		containerWindowType = {
+			name = "production_MIOs"
+			position = { x= 20 y = 12}
+			clipping = no
+			size = { width=80 height=35 }
+			Orientation = UPPER_LEFT
+
+				background = {
+					name = "MIO_bg"
+					quadTextureSprite ="GFX_mini_bg"
+				}
+		
+			iconType = {
+				name ="MIO_icon"
+				spriteType = "GFX_industrial_manufacturer_icon"
+				position = { x= 5 y = 3 }
+				Orientation = "UPPER_LEFT"
+			}
+		
+			instantTextBoxType = {
+				name ="available_MIOs"
+				position = { x= 40 y = 8 }
+				font = "hoi_18mbs"
+				text = "999"
+				format = left
+				maxWidth = 30
+				maxHeight = 24
+				fixedsize = yes
+			}
+		}	
+
 		buttonType = {
 			name = "checkbox"
 			position = { x = -355 y = 14 }
@@ -1550,18 +1611,37 @@ guiTypes = {
 			pdx_tooltip = "PRODUCTION_DRAG_N_DROP"
 		}
 
+		iconType = {
+			name = "has_mio_background"
+			quadTextureSprite ="GFX_production_item_has_mio"
+			alwaystransparent = yes
+		}
+
 		iconType = {
 			name ="production_line_selected"
 			spriteType = "GFX_production_line_selected"
 			position = { x= 0 y = 0 }
 		}
 
-		buttonType = {
-			name ="increase_priority"
+		iconType = {
+			name ="priority_frame"
 			spriteType = "GFX_conveyor_group_btn_frame"
 			position = { x= 2 y = 1 }
 		}
 
+		buttonType = {
+			name ="attach_manufacturer"
+			spriteType = "GFX_attach_manufacturer"
+			position = { x= 195 y = 1 }
+		}
+
+		buttonType = {
+			name ="change_manufacturer"
+			position = { x= 195 y = 1 }
+			spriteType = "GFX_attach_manufacturer"
+			scale = 0.45
+		}
+
 		instantTextboxType = {
 			name = "priority"
 			position = { x = 3 y = 6 }
@@ -1614,7 +1694,7 @@ guiTypes = {
 		iconType = {
 			name ="equipment_icon"
 			spriteType = "GFX_technology_medium"
-			position = { x=80 y=72 }
+			position = { x=100 y=72 }
 			centerposition = yes
 			alwaystransparent = yes
 		}
@@ -1622,8 +1702,9 @@ guiTypes = {
 		iconType = {
 			name ="sub_tech"
 			spriteType = "GFX_land_equipment_role_icons"
-			position = { x=120 y=54 }
+			position = { x=140 y=74 }
 			alwaystransparent = yes
+			scale = 0.8
 		}
 
 		iconType = {
@@ -1676,6 +1757,14 @@ guiTypes = {
 			alwaystransparent = yes
 		}
 
+		iconType = {
+			name ="equipment_designer_can_upgrade"
+			spriteType = "GFX_refitting"
+			position = { x = 216 y = 59 }
+			scale = 1
+			pdx_tooltip = "INDUSTRIAL_ORG_TOOLTIP_UPGRADE_ALREADY_ASSIGNED_MIO_DELAYED"
+		}
+
 		gridBoxType = {
 			name = "factories_grid"
 			position = { x = 317 y = 33 }
@@ -1715,11 +1804,11 @@ guiTypes = {
 
 		instantTextboxType = {
 			name = "name"
-			position = { x = 54 y = 4 }
+			position = { x = 40 y = 4 }
 			textureFile = ""
 			font = "hoi_18mbs"
 			borderSize = {x = 0 y = 0}
-			maxWidth = 170
+			maxWidth = 154
 			maxHeight = 19
 			multiline = no
 			format = left
@@ -1732,7 +1821,8 @@ guiTypes = {
 			font = "hoi_16mbs"
 			maxWidth = 150
 			maxHeight = 33
-			fixedsize = yes
+			fixedsize = no
+			multiline = no
 			format = left
 			alwaystransparent = yes
 		}
@@ -1758,18 +1848,18 @@ guiTypes = {
 
 		buttonType = {
 			name = "convert"
-			position = { x=10 y=75 }
+			position = { x=30 y=75 }
 			quadTextureSprite = "GFX_production_line_convert"
 			clicksound = click_default
 		}
 
 		buttonType = {
 			name = "expand"
-			position = { x=30 y=4 }
-			quadTextureSprite = "GFX_strategicair_expand"
-			font = "hoi_16mbs"
-			frame = 2
+			position = { x=13 y=8 }
+			quadTextureSprite = "GFX_division_list_column_button"
+			frame = 8
 			clicksound = click_default
+			scale = 1.4
 		}
 
 		iconType = {
@@ -1834,6 +1924,22 @@ guiTypes = {
 			font = "hoi_16mbs"
 			clicksound = click_default
 		}
+		buttonType = {
+			name = "increase_priority"
+			position = { x=4 y=48 }
+			quadTextureSprite = "GFX_arrow_up_small"
+			pdx_tooltip = "PRODUCTION_INCREASE_PRIORITY_LABEL"
+			clicksound = click_default
+		}
+
+		buttonType = {
+			name = "decrease_priority"
+			position = { x=4 y=75	 }
+			quadTextureSprite = "GFX_arrow_down_small"
+			pdx_tooltip = "PRODUCTION_DECREASE_PRIORITY_LABEL"
+			pdx_tooltip_delayed = "PRODUCTION_PRIORITY_DELAYED"
+			clicksound = click_default
+		}
 	}
 
 	containerWindowType = {
@@ -1848,6 +1954,11 @@ guiTypes = {
 			pdx_tooltip = "PRODUCTION_DRAG_N_DROP"
 		}
 
+		iconType = {
+			name = "has_mio_background"
+			quadTextureSprite ="GFX_production_item_has_mio"
+		}
+
 		iconType = {
 			name ="production_line_selected"
 			spriteType = "GFX_production_line_selected_collapsed"
@@ -1860,6 +1971,19 @@ guiTypes = {
 			position = { x= 2 y = 1 }
 		}
 
+		buttonType = {
+			name ="attach_manufacturer"
+			spriteType = "GFX_attach_manufacturer"
+			position = { x= 195 y = 1 }
+		}
+
+		buttonType = {
+			name ="change_manufacturer"
+			position = { x= 195 y = 1 }
+			spriteType = "GFX_attach_manufacturer"
+			scale = 0.45
+		}		
+
 		instantTextboxType = {
 			name = "priority"
 			position = { x = 3 y = 6 }
@@ -2019,11 +2143,11 @@ guiTypes = {
 
 		instantTextboxType = {
 			name = "name"
-			position = { x = 54 y = 4 }
+			position = { x = 40 y = 4 }
 			textureFile = ""
 			font = "hoi_18mbs"
 			borderSize = {x = 0 y = 0}
-			maxWidth = 170
+			maxWidth = 154
 			maxHeight = 20
 			fixedsize = yes
 			format = left
@@ -2068,11 +2192,11 @@ guiTypes = {
 
 		buttonType = {
 			name = "expand"
-			position = { x=30 y=4 }
-			quadTextureSprite = "GFX_strategicair_expand"
-			font = "hoi_16mbs"
-			frame = 1
+			position = { x=13 y=8 }
+			quadTextureSprite = "GFX_division_list_column_button"
+			frame = 2
 			clicksound = click_default
+			scale = 1.4
 		}
 		iconType = {
 			name = "factories_used"
@@ -2426,6 +2550,12 @@ guiTypes = {
 			frame = 1
 		}
 
+		iconType = {
+			name = "has_mio_background"
+			quadTextureSprite ="GFX_production_item_has_mio"
+			alwaystransparent = yes
+		}
+
 		iconType = {
 			name ="production_line_selected"
 			spriteType = "GFX_production_line_selected"
@@ -2438,6 +2568,19 @@ guiTypes = {
 			position = { x= 2 y = 1 }
 		}
 
+		buttonType = {
+			name ="attach_manufacturer"
+			spriteType = "GFX_attach_manufacturer"
+			position = { x= 195 y = 1 }
+		}
+
+		buttonType = {
+			name ="change_manufacturer"
+			position = { x= 195 y = 1 }
+			spriteType = "GFX_attach_manufacturer"
+			scale = 0.45
+		}
+
 		instantTextboxType = {
 			name = "priority"
 			position = { x = 3 y = 6 }
@@ -2486,15 +2629,23 @@ guiTypes = {
 		iconType = {
 			name ="equipment_designer"
 			spriteType = "GFX_tech_idea_bg"
-			position = { x = 45 y = 54 }
+			position = { x = 60 y = 54 }
 			scale = 0.5
 			alwaystransparent = yes
 		}
 
+		iconType = {
+			name ="equipment_designer_can_upgrade"
+			spriteType = "GFX_refitting"
+			position = { x = 85 y = 59 }
+			scale = 1
+			pdx_tooltip = "INDUSTRIAL_ORG_TOOLTIP_UPGRADE_ALREADY_ASSIGNED_MIO_DELAYED"
+		}
+
 		iconType = {
 			name ="equipment_role"
 			spriteType = "GFX_naval_equipment_role_icons"
-			position = { x = 10 y = 49 }
+			position = { x = 25 y = 49 }
 			alwaystransparent = yes
 		}
 
@@ -2522,7 +2673,7 @@ guiTypes = {
 
 		buttonType = {
 			name = "carrier_air_wing_composition"
-			position = { x=245 y=73 }
+			position = { x=245 y=50 }
 			quadTextureSprite = "GFX_carrier_airwing_comp_button"
 			clicksound = click_default
 			pdx_tooltip = CARRIER_AIR_WING_COMPOSITION_TITLE
@@ -2543,7 +2694,7 @@ guiTypes = {
 		iconType = {
 			name ="equipment_icon"
 			spriteType = "GFX_technology_medium"
-			position = { x=138 y=76 }
+			position = { x=158 y=76 }
 			scale=0.8
 			centerposition = yes
 			alwaystransparent = yes
@@ -2602,7 +2753,7 @@ guiTypes = {
 
 		buttonType = {
 			name = "deploy_location"
-			position = { x=222 y=-1	 }
+			position = { x=230 y=-1	 }
 			quadTextureSprite = "GFX_naval_deploy_button"
 			buttonFont = "hoi_16mbs"
 			clicksound = click_default
@@ -2610,19 +2761,19 @@ guiTypes = {
 
 		positionType = {
 			name = "task_force_insignia_pos"
-			position = { x=221 y=0 }
+			position = { x=228 y=0 }
 		}
 
 		iconType = {
 			name = "deploy_icon"
-			position = { x=223 y=-2 }
+			position = { x=230 y=-2 }
 			spriteType = "GFX_deploy_port_fleet_icons"
 			alwaystransparent = yes
 		}
 
 		instantTextboxType = {
 			name = "deploy_name"
-			position = { x = 255 y = 4 }
+			position = { x = 260 y = 4 }
 			font = "hoi_18b"
 			borderSize = {x = 0 y = 0}
 			text = "This buttontext is a bug and should not appear"
@@ -2697,10 +2848,10 @@ guiTypes = {
 
 		instantTextboxType = {
 			name = "name"
-			position = { x = 54 y = 4 }
+			position = { x = 40 y = 4 }
 			font = "hoi_18mbs"
 			borderSize = {x = 0 y = 0}
-			maxWidth = 167
+			maxWidth = 154
 			maxHeight = 19
 			multiline = no
 			format = left
@@ -2714,17 +2865,18 @@ guiTypes = {
 			maxWidth = 150
 			maxHeight = 33
 			fixedsize = yes
+			multiline = no
 			format = left
 			alwaystransparent = yes
 		}
 
 		buttonType = {
 			name = "expand"
-			position = { x=30 y=4 }
-			quadTextureSprite = "GFX_strategicair_expand"
-			font = "hoi_16mbs"
-			frame = 2
+			position = { x=13 y=8 }
+			quadTextureSprite = "GFX_division_list_column_button"
+			frame = 8
 			clicksound = click_default
+			scale = 1.4
 		}
 
 		buttonType = {
@@ -2735,6 +2887,23 @@ guiTypes = {
 			clicksound = click_default
 			buttontext = "HMS William Wallace"
 		}
+
+		buttonType = {
+			name = "increase_priority"
+			position = { x=4 y=48 }
+			quadTextureSprite = "GFX_arrow_up_small"
+			pdx_tooltip = "PRODUCTION_INCREASE_PRIORITY_LABEL"
+			clicksound = click_default
+		}
+
+		buttonType = {
+			name = "decrease_priority"
+			position = { x=4 y=75	 }
+			quadTextureSprite = "GFX_arrow_down_small"
+			pdx_tooltip = "PRODUCTION_DECREASE_PRIORITY_LABEL"
+			pdx_tooltip_delayed = "PRODUCTION_PRIORITY_DELAYED"
+			clicksound = click_default
+		}
 	}
 
 
@@ -2751,6 +2920,12 @@ guiTypes = {
 			frame = 1
 		}
 
+		iconType = {
+			name = "has_mio_background"
+			quadTextureSprite ="GFX_production_item_has_mio"
+			alwaystransparent = yes
+		}
+
 		iconType = {
 			name ="production_line_selected"
 			spriteType = "GFX_production_line_selected_collapsed"
@@ -2763,6 +2938,19 @@ guiTypes = {
 			position = { x= 1 y = 1 }
 		}
 
+		buttonType = {
+			name ="attach_manufacturer"
+			spriteType = "GFX_attach_manufacturer"
+			position = { x= 195 y = 1 }
+		}
+
+		buttonType = {
+			name ="change_manufacturer"
+			position = { x= 195 y = 1 }
+			spriteType = "GFX_attach_manufacturer"
+			scale = 0.45
+		}	
+
 		instantTextboxType = {
 			name = "priority"
 			position = { x = 3 y = 6 }
@@ -2844,10 +3032,11 @@ guiTypes = {
 
 		buttonType = {
 			name = "carrier_air_wing_composition"
-			position = { x=4 y=30 }
+			position = { x=2 y=30 }
 			quadTextureSprite = "GFX_carrier_airwing_comp_button"
 			clicksound = click_default
 			pdx_tooltip = CARRIER_AIR_WING_COMPOSITION_TITLE
+			scale = 0.8
 		}
 
 		gridBoxType = {
@@ -2921,7 +3110,7 @@ guiTypes = {
 
 		buttonType = {
 			name = "deploy_location"
-			position = { x=222 y=-1	 }
+			position = { x=230 y=-1	 }
 			quadTextureSprite = "GFX_naval_deploy_button"
 			buttonFont = "hoi_16mbs"
 			clicksound = click_default
@@ -2929,19 +3118,19 @@ guiTypes = {
 
 		positionType = {
 			name = "task_force_insignia_pos"
-			position = { x=221 y=0 }
+			position = { x=229 y=0 }
 		}
 
 		iconType = {
 			name = "deploy_icon"
-			position = { x=223 y=-2 }
+			position = { x=230 y=-2 }
 			spriteType = "GFX_deploy_port_fleet_icons"
 			alwaystransparent = yes
 		}
 
 		instantTextboxType = {
 			name = "deploy_name"
-			position = { x = 255 y = 4 }
+			position = { x = 260 y = 4 }
 			font = "hoi_18b"
 			borderSize = {x = 0 y = 0}
 			text = "This buttontext is a bug and should not appear"
@@ -2953,10 +3142,10 @@ guiTypes = {
 
 		instantTextboxType = {
 			name = "name"
-			position = { x = 54 y = 4 }
+			position = { x = 40 y = 4 }
 			font = "hoi_18mbs"
 			borderSize = {x = 0 y = 0}
-			maxWidth = 167
+			maxWidth = 154
 			maxHeight = 20
 			fixedsize = yes
 			format = left
@@ -2975,11 +3164,11 @@ guiTypes = {
 
 		buttonType = {
 			name = "expand"
-			position = { x=28 y=4 }
-			quadTextureSprite = "GFX_strategicair_expand"
-			font = "hoi_16mbs"
-			frame = 1
+			position = { x=13 y=8 }
+			quadTextureSprite = "GFX_division_list_column_button"
+			frame = 2
 			clicksound = click_default
+			scale = 1.4
 		}
 		iconType = {
 			name = "factories_used"
@@ -3058,6 +3247,12 @@ guiTypes = {
 			frame = 1
 		}
 
+		iconType = {
+			name = "has_mio_background"
+			quadTextureSprite ="GFX_production_item_has_mio"
+			alwaystransparent = yes
+		}
+
 		iconType = {
 			name ="production_line_selected"
 			spriteType = "GFX_production_line_selected"
@@ -3082,6 +3277,19 @@ guiTypes = {
 			alwaystransparent = yes
 		}
 
+		buttonType = {
+			name ="attach_manufacturer"
+			spriteType = "GFX_attach_manufacturer"
+			position = { x= 195 y = 1 }
+		}
+
+		buttonType = {
+			name ="change_manufacturer"
+			position = { x= 195 y = 1 }
+			spriteType = "GFX_attach_manufacturer"
+			scale = 0.45
+		}
+
 		iconType = {
 			name ="outdated_equipment_overlay"
 			spriteType = "GFX_outdated_equipment_overlay"
@@ -3092,15 +3300,23 @@ guiTypes = {
 		iconType = {
 			name ="equipment_designer"
 			spriteType = "GFX_tech_idea_bg"
-			position = { x = 10 y = 49 }
+			position = { x = 25 y = 49 }
 			scale = 0.5
 			alwaystransparent = yes
 		}
 
+		iconType = {
+			name ="equipment_designer_can_upgrade"
+			spriteType = "GFX_refitting"
+			position = { x = 50 y = 54 }
+			scale = 1
+			pdx_tooltip = "INDUSTRIAL_ORG_TOOLTIP_UPGRADE_ALREADY_ASSIGNED_MIO_DELAYED"
+		}
+
 		iconType = {
 			name ="equipment_role"
 			spriteType = "GFX_naval_equipment_role_icons"
-			position = { x = 238 y = 49 }
+			position = { x = 238 y = 69 }
 			alwaystransparent = yes
 		}
 
@@ -3113,7 +3329,7 @@ guiTypes = {
 		iconType = {
 			name ="equipment_icon"
 			spriteType = "GFX_technology_medium"
-			position = { x=138 y=76 }
+			position = { x=158 y=76 }
 			scale=0.8
 			centerposition = yes
 			alwaystransparent = yes
@@ -3265,10 +3481,10 @@ guiTypes = {
 
 		instantTextboxType = {
 			name = "name"
-			position = { x = 55 y = 3 }
+			position = { x = 40 y = 3 }
 			font = "hoi_18mbs"
 			borderSize = {x = 0 y = 0}
-			maxWidth = 167
+			maxWidth = 155
 			maxHeight = 19
 			multiline = no
 			format = left
@@ -3282,17 +3498,18 @@ guiTypes = {
 			maxWidth = 150
 			maxHeight = 33
 			fixedsize = yes
+			multiline = no
 			format = left
 			alwaystransparent = yes
 		}
 
 		buttonType = {
 			name = "expand"
-			position = { x=29 y=4 }
-			quadTextureSprite = "GFX_strategicair_expand"
-			font = "hoi_16mbs"
-			frame = 2
+			position = { x=13 y=8 }
+			quadTextureSprite = "GFX_division_list_column_button"
+			frame = 8
 			clicksound = click_default
+			scale = 1.4
 		}
 
 		instantTextboxType = {
@@ -3305,6 +3522,23 @@ guiTypes = {
 			fixedsize = yes
 			format = center
 		}
+
+		buttonType = {
+			name = "increase_priority"
+			position = { x=4 y=48 }
+			quadTextureSprite = "GFX_arrow_up_small"
+			pdx_tooltip = "PRODUCTION_INCREASE_PRIORITY_LABEL"
+			clicksound = click_default
+		}
+
+		buttonType = {
+			name = "decrease_priority"
+			position = { x=4 y=75	 }
+			quadTextureSprite = "GFX_arrow_down_small"
+			pdx_tooltip = "PRODUCTION_DECREASE_PRIORITY_LABEL"
+			pdx_tooltip_delayed = "PRODUCTION_PRIORITY_DELAYED"
+			clicksound = click_default
+		}
 	}
 
 	containerWindowType = {
@@ -3320,6 +3554,12 @@ guiTypes = {
 			frame = 1
 		}
 
+		iconType = {
+			name = "has_mio_background"
+			quadTextureSprite ="GFX_production_item_has_mio"
+			alwaystransparent = yes
+		}
+
 		iconType = {
 			name ="production_line_selected"
 			spriteType = "GFX_production_line_selected"
@@ -3332,6 +3572,19 @@ guiTypes = {
 			position = { x= 2 y = 1 }
 		}
 
+		buttonType = {
+			name ="attach_manufacturer"
+			spriteType = "GFX_attach_manufacturer"
+			position = { x= 195 y = 1 }
+		}
+
+		buttonType = {
+			name ="change_manufacturer"
+			position = { x= 195 y = 1 }
+			spriteType = "GFX_attach_manufacturer"
+			scale = 0.45
+		}
+
 		instantTextboxType = {
 			name = "priority"
 			position = { x = 3 y = 6 }
@@ -3394,7 +3647,7 @@ guiTypes = {
 		iconType = {
 			name ="equipment_icon"
 			spriteType = "GFX_technology_medium"
-			position = { x=138 y=76 }
+			position = { x=158 y=76 }
 			scale=0.8
 			centerposition = yes
 			alwaystransparent = yes
@@ -3528,10 +3781,10 @@ guiTypes = {
 
 		instantTextboxType = {
 			name = "name"
-			position = { x = 54 y = 4 }
+			position = { x = 40 y = 4 }
 			font = "hoi_18mbs"
 			borderSize = {x = 0 y = 0}
-			maxWidth = 170
+			maxWidth = 160
 			maxHeight = 19
 			multiline = no
 			format = left
@@ -3545,17 +3798,18 @@ guiTypes = {
 			maxWidth = 150
 			maxHeight = 33
 			fixedsize = yes
+			multiline = no
 			format = left
 			alwaystransparent = yes
 		}
 
 		buttonType = {
 			name = "expand"
-			position = { x=29 y=4 }
-			quadTextureSprite = "GFX_strategicair_expand"
-			font = "hoi_16mbs"
-			frame = 2
+			position = { x=13 y=8 }
+			quadTextureSprite = "GFX_division_list_column_button"
+			frame = 8
 			clicksound = click_default
+			scale = 1.4
 		}
 
 		buttonType = {
@@ -3566,6 +3820,23 @@ guiTypes = {
 			clicksound = click_default
 			buttontext = "Railway Gun Name"
 		}
+
+		buttonType = {
+			name = "increase_priority"
+			position = { x=4 y=48 }
+			quadTextureSprite = "GFX_arrow_up_small"
+			pdx_tooltip = "PRODUCTION_INCREASE_PRIORITY_LABEL"
+			clicksound = click_default
+		}
+
+		buttonType = {
+			name = "decrease_priority"
+			position = { x=4 y=75	 }
+			quadTextureSprite = "GFX_arrow_down_small"
+			pdx_tooltip = "PRODUCTION_DECREASE_PRIORITY_LABEL"
+			pdx_tooltip_delayed = "PRODUCTION_PRIORITY_DELAYED"
+			clicksound = click_default
+		}
 	}
 
 
@@ -3582,14 +3853,20 @@ guiTypes = {
 			frame = 1
 		}
 
+		iconType = {
+			name = "has_mio_background"
+			quadTextureSprite ="GFX_production_item_has_mio"
+			alwaystransparent = yes
+		}
+
 		iconType = {
 			name ="production_line_selected"
 			spriteType = "GFX_production_line_selected_collapsed"
 			position = { x= 0 y = 0 }
 		}
 
-		iconType = {
-			name ="priority_frame"
+		buttonType = {
+			name ="increase_priority"
 			spriteType = "GFX_conveyor_group_btn_frame"
 			position = { x= 1 y = 1 }
 		}
@@ -3807,6 +4084,12 @@ guiTypes = {
 			pdx_tooltip = "PRODUCTION_DRAG_N_DROP"
 		}
 
+		iconType = {
+			name = "has_mio_background"
+			quadTextureSprite ="GFX_production_item_has_mio"
+			alwaystransparent = yes
+		}
+
 		iconType = {
 			name ="production_line_selected"
 			spriteType = "GFX_production_line_selected_collapsed"
@@ -3819,6 +4102,19 @@ guiTypes = {
 			position = { x= 1 y = 1 }
 		}
 
+		buttonType = {
+			name ="attach_manufacturer"
+			spriteType = "GFX_attach_manufacturer"
+			position = { x= 195 y = 1 }
+		}
+
+		buttonType = {
+			name ="change_manufacturer"
+			position = { x= 195 y = 1 }
+			spriteType = "GFX_attach_manufacturer"
+			scale = 0.45
+		}
+
 		instantTextboxType = {
 			name = "priority"
 			position = { x = 2 y = 6 }
@@ -3908,7 +4204,7 @@ guiTypes = {
 			font = "hoi_18b"
 			borderSize = {x = 0 y = 0}
 			text = "This buttontext is a bug and should not appear"
-			maxWidth = 140
+			maxWidth = 90
 			maxHeight = 25
 			fixedsize = yes
 			alwaystransparent = yes
@@ -3916,10 +4212,10 @@ guiTypes = {
 
 		instantTextboxType = {
 			name = "name"
-			position = { x = 55 y = 3 }
+			position = { x = 40 y = 3 }
 			font = "hoi_18mbs"
 			borderSize = {x = 0 y = 0}
-			maxWidth = 225
+			maxWidth = 160
 			maxHeight = 20
 			fixedsize = yes
 			format = left
@@ -3928,11 +4224,11 @@ guiTypes = {
 
 		buttonType = {
 			name = "expand"
-			position = { x=28 y=4 }
-			quadTextureSprite = "GFX_strategicair_expand"
-			font = "hoi_16mbs"
-			frame = 1
+			position = { x=13 y=8 }
+			quadTextureSprite = "GFX_division_list_column_button"
+			frame = 2
 			clicksound = click_default
+			scale = 1.4
 		}
 		iconType = {
 			name = "factories_used"
@@ -4216,6 +4512,14 @@ guiTypes = {
 			alwaystransparent = yes
 		}
 
+		iconType = {
+			name ="equipment_designer_can_upgrade"
+			spriteType = "GFX_refitting"
+			position = { x = 42 y = 42 }
+			scale = 1
+			pdx_tooltip = "INDUSTRIAL_ORG_TOOLTIP_UPGRADE_ALREADY_ASSIGNED_MIO_DELAYED"
+		}
+
 		iconType = {
 			name ="sub_tech"
 			spriteType = "GFX_land_equipment_role_icons"
@@ -4358,6 +4662,14 @@ guiTypes = {
 			alwaystransparent = yes
 		}
 
+		iconType = {
+			name ="equipment_designer_can_upgrade"
+			spriteType = "GFX_refitting"
+			position = { x = 78 y = 42 }
+			scale = 1
+			pdx_tooltip = "INDUSTRIAL_ORG_TOOLTIP_UPGRADE_ALREADY_ASSIGNED_MIO_DELAYED"
+		}
+
 		iconType = {
 			name ="equipment_role"
 			spriteType = "GFX_naval_equipment_role_icons"
diff --git a/interface/countrystateview.gui b/interface/countrystateview.gui
index d02aa07dbff..248bfd613a6 100644
--- a/interface/countrystateview.gui
+++ b/interface/countrystateview.gui
@@ -65,13 +65,14 @@ guiTypes = {
 			
 			instantTextboxType = {
 				name = "shared_slot_count"
-				position = { x = 194 y = 147 }
+				position = { x = 170 y = 147 }
 				textureFile = ""
 				font = "hoi_18mbs"
 				text = "SLOTS"
-				maxWidth = 190
+				maxWidth = 220
 				maxHeight = 30
-				format = center
+				format = left
+				fixedsize = yes
 			}
 			
 			gridBoxType = {
diff --git a/interface/countrytechtreeview.gui b/interface/countrytechtreeview.gui
index 4debc7b325c..67893fde5e7 100644
--- a/interface/countrytechtreeview.gui
+++ b/interface/countrytechtreeview.gui
@@ -380,7 +380,7 @@ guiTypes = {
 			}
 
 			gridboxtype = {
-				name = "motorised_infantry_tree"
+				name = "tech_trucks_tree"
 				position = { x = 140 y = 1040 }
 				slotsize = { width = 70 height = 70 }
 				format = "LEFT"
@@ -611,7 +611,7 @@ guiTypes = {
 				format = "LEFT"
 			}
 			gridboxtype = {
-				name = "motorised_infantry_tree"
+				name = "tech_trucks_tree"
 				position = { x = 100 y = 160 }
 				slotsize = { width = 70 height = 70 }
 				format = "LEFT"
@@ -3390,7 +3390,7 @@ guiTypes = {
 
 		instantTextBoxType = {
 			name = "airtech_subtitle_weapons"
-			position = { x = 1055 y = 110 }
+			position = { x = 1155 y = 110 }
 			textureFile = ""
 			font = "hoi_33"
 			borderSize = {x = 0 y = 4}
@@ -3404,7 +3404,7 @@ guiTypes = {
 
 		instantTextBoxType = {
 			name = "airtech_subtitle_engines"
-			position = { x = 1520 y = 110 }
+			position = { x = 1650 y = 110 }
 			textureFile = ""
 			font = "hoi_33"
 			borderSize = {x = 0 y = 4}
@@ -3470,7 +3470,15 @@ guiTypes = {
 
 		gridboxtype = {
 			name = "aa_lmg_tree"
-			position = { x = 1100 y = 32 }
+			position = { x = 1080 y = 32 }
+			size = { width = 400 height = 1000 }
+			slotsize = { width = 70 height = 70 }
+			format = "UP"
+		}
+
+		gridboxtype = {
+			name = "photo_reconnaisance_tree"
+			position = { x = 1200 y = 32 }
 			size = { width = 400 height = 1000 }
 			slotsize = { width = 70 height = 70 }
 			format = "UP"
@@ -3478,7 +3486,15 @@ guiTypes = {
 
 		gridboxtype = {
 			name = "engines_1_tree"
-			position = { x = 1470 y = 32 }
+			position = { x = 1600 y = 32 }
+			size = { width = 400 height = 400 }
+			slotsize = { width = 70 height = 70 }
+			format = "UP"
+		}
+
+		gridboxtype = {
+			name = "air_torpedoe_1_tree"
+			position = { x = 1325 y = 32 }
 			size = { width = 400 height = 400 }
 			slotsize = { width = 70 height = 70 }
 			format = "UP"
@@ -6135,6 +6151,30 @@ guiTypes = {
 			position = { x=390 y=55 }
 			shortcut = "RETURN"
 		}
+
+		containerWindowType = {
+			name = "research_MIO"
+			position = { x=365 y=55 }
+		
+			buttonType = {
+				name = "research_has_MIO"
+				position = { x = 0 y = 0 }
+				size = { x=200 y=40}
+				text = "RESEARCH"
+				quadTextureSprite = "GFX_government_button"
+				buttonFont = "hoi_16mbs"
+				Orientation = "UPPER_RIGHT"
+				shortcut = "RETURN"
+			}
+		
+			iconType = {
+				name = "MIO_icon"
+				spriteType = "GFX_design_team_icon"
+				position = { x = 8 y = 5 }
+				alwaystransparent = yes
+				Orientation = "CENTER"
+			}
+		}		
 		
 		buttonType = {
 			name = "research_with_xp"
@@ -6147,14 +6187,25 @@ guiTypes = {
 
 		iconType = {
 			name = "research_progressbar"
-			spriteType = "GFX_techtree_details_progress_bar"
-			position = { x=160 y=61 }
+			spriteType = "GFX_prod_progress_bar3"
+			position = { x=190 y=61 }
 		}
 
 		iconType = {
 			name = "research_progressbar_frame"
-			spriteType = "GFX_techtree_details_progress_bar_frame"
-			position = { x=158 y=59 }
+			spriteType = "GFX_production_progressbar_frame2"
+			position = { x=188 y=59 }
+		}
+
+		instantTextboxType = {
+			name = "researchtime_label"
+			position = { x = 182 y = 62 }
+			font = "hoi_20b"
+			borderSize = {x = 0 y = 0}
+			text = ""
+			maxWidth = 185
+			maxHeight = 30
+			format = center
 		}
 
 		instantTextboxType = {
@@ -6233,6 +6284,13 @@ guiTypes = {
 			maxHeight = 20
 			format = center
 		}
+
+		iconType = {
+			name = "can_assign_design_team_icon"
+			position = { x=0 y=42 }
+			spriteType = "GFX_design_team_icon"
+			scale = 0.8
+		}
 	}
 
 	containerWindowType = {
@@ -6323,6 +6381,13 @@ guiTypes = {
 				alwaystransparent = yes
 			}
 		}
+		
+		iconType = {
+			name = "can_assign_design_team_icon"
+			position = { x=5 y=55 }
+			spriteType = "GFX_design_team_icon"
+			scale = 0.8
+		}
 
 	}
 
@@ -6393,7 +6458,12 @@ guiTypes = {
 				alwaystransparent = yes
 			}
 		}
-
+		iconType = {
+			name = "can_assign_design_team_icon"
+			position = { x=5 y=55 }
+			spriteType = "GFX_design_team_icon"
+			scale = 0.8
+		}
 	}
 
 	containerWindowType = {
@@ -6431,6 +6501,12 @@ guiTypes = {
 			maxHeight = 20
 			format = center
 		}
+		iconType = {
+			name = "can_assign_design_team_icon"
+			position = { x=5 y=55 }
+			spriteType = "GFX_design_team_icon"
+			scale = 0.8
+		}
 	}
 
 	containerWindowType = {
@@ -6539,6 +6615,12 @@ guiTypes = {
 				alwaystransparent = yes
 			}
 		}		
+		iconType = {
+			name = "can_assign_design_team_icon"
+			position = { x=5 y=55 }
+			spriteType = "GFX_design_team_icon"
+			scale = 0.8
+		}
 		
 	}
 	
@@ -6576,6 +6658,12 @@ guiTypes = {
 			maxHeight = 20
 			format = center
 		}
+		iconType = {
+			name = "can_assign_design_team_icon"
+			position = { x=0 y=42 }
+			spriteType = "GFX_design_team_icon"
+			scale = 0.8
+		}
 	}
 
 	containerWindowType = {
@@ -6645,6 +6733,12 @@ guiTypes = {
 				alwaystransparent = yes
 			}
 		}
+		iconType = {
+			name = "can_assign_design_team_icon"
+			position = { x=5 y=55 }
+			spriteType = "GFX_design_team_icon"
+			scale = 0.8
+		}
 	}
 
 	containerWindowType = {
@@ -6752,7 +6846,13 @@ guiTypes = {
 				spriteType = "GFX_subtech_aa"
 				alwaystransparent = yes
 			}
-		}			
+		}	
+		iconType = {
+			name = "can_assign_design_team_icon"
+			position = { x=5 y=55 }
+			spriteType = "GFX_design_team_icon"
+			scale = 0.8
+		}		
 	}
 
 	containerWindowType = {
@@ -6788,6 +6888,12 @@ guiTypes = {
 			maxHeight = 20
 			format = right
 		}
+		iconType = {
+			name = "can_assign_design_team_icon"
+			position = { x=0 y=42 }
+			spriteType = "GFX_design_team_icon"
+			scale = 0.8
+		}
 	}
 
 	containerWindowType = {
@@ -6823,6 +6929,12 @@ guiTypes = {
 			maxHeight = 20
 			format = right
 		}
+		iconType = {
+			name = "can_assign_design_team_icon"
+			position = { x=0 y=42 }
+			spriteType = "GFX_design_team_icon"
+			scale = 0.8
+		}
 	}
 
 	containerWindowType = {
@@ -6858,6 +6970,13 @@ guiTypes = {
 			maxHeight = 20
 			format = right
 		}
+		
+		iconType = {
+			name = "can_assign_design_team_icon"
+			position = { x=0 y=42 }
+			spriteType = "GFX_design_team_icon"
+			scale = 0.8
+		}
 	}
 
 	containerWindowType = {
@@ -6909,6 +7028,12 @@ guiTypes = {
 			maxHeight = 20
 			format = center
 		}
+		iconType = {
+			name = "can_assign_design_team_icon"
+			position = { x=5 y=55 }
+			spriteType = "GFX_design_team_icon"
+			scale = 0.8
+		}
 	}
 
 	containerWindowType = {
@@ -7018,6 +7143,12 @@ guiTypes = {
 			}
 		}
 
+		iconType = {
+			name = "can_assign_design_team_icon"
+			position = { x=5 y=55 }
+			spriteType = "GFX_design_team_icon"
+			scale = 0.8
+		}
 	}
 
 	containerWindowType = {
@@ -7088,6 +7219,13 @@ guiTypes = {
 				alwaystransparent = yes
 			}
 		}
+		
+		iconType = {
+			name = "can_assign_design_team_icon"
+			position = { x=5 y=55 }
+			spriteType = "GFX_design_team_icon"
+			scale = 0.8
+		}
 	}
 
 	containerWindowType = {
@@ -7124,6 +7262,12 @@ guiTypes = {
 			maxHeight = 20
 			format = center
 		}
+		iconType = {
+			name = "can_assign_design_team_icon"
+			position = { x=0 y=42 }
+			spriteType = "GFX_design_team_icon"
+			scale = 0.8
+		}
 	}
 
 	containerWindowType = {
@@ -7175,6 +7319,12 @@ guiTypes = {
 			maxHeight = 20
 			format = center
 		}
+		iconType = {
+			name = "can_assign_design_team_icon"
+			position = { x=10 y=40 }
+			spriteType = "GFX_design_team_icon"
+			scale = 0.8
+		}
 	}
 
 	containerWindowType = {
@@ -7211,6 +7361,13 @@ guiTypes = {
 			maxHeight = 20
 			format = center
 		}
+		
+		iconType = {
+			name = "can_assign_design_team_icon"
+			position = { x=0 y=42 }
+			spriteType = "GFX_design_team_icon"
+			scale = 0.8
+		}
 	}	
 	
 	containerWindowType = {
@@ -7298,6 +7455,13 @@ guiTypes = {
 				alwaystransparent = yes
 			}
 		}
+		
+		iconType = {
+			name = "can_assign_design_team_icon"
+			position = { x=10 y=40 }
+			spriteType = "GFX_design_team_icon"
+			scale = 0.8
+		}
 	}
 
 	containerWindowType = {
@@ -7335,6 +7499,13 @@ guiTypes = {
 			maxHeight = 20
 			format = center
 		}
+		
+		iconType = {
+			name = "can_assign_design_team_icon"
+			position = { x=0 y=42 }
+			spriteType = "GFX_design_team_icon"
+			scale = 0.8
+		}
 	}
 
 	###------> Etat Folder Items <><> <><> <><> <><> <><>
@@ -7470,6 +7641,12 @@ guiTypes = {
 			maxHeight = 20
 			format = center
 		}
+		iconType = {
+			name = "can_assign_design_team_icon"
+			position = { x=0 y=42 }
+			spriteType = "GFX_design_team_icon"
+			scale = 0.8
+		}
 	}
 
 	containerWindowType = {
@@ -7541,14 +7718,11 @@ guiTypes = {
 		position = { x=0 y=0 }
 		clipping = no
 		
-		gridboxtype = {
-			name = "research_groups_grid"
-			position = { x = 422 y = 25 }
-			size = { width = 120 height = 60 }
-			slotsize = { width = 60 height = 60 }
-			max_slots_horizontal = 2
-			max_slots_vertical = 1
-			format = "UPPER_LEFT"
+		iconType = {
+			name = "design_team_icon"
+			position = { x = 462 y = 55 }
+			spriteType = "GFX_add_pol_idea_button"
+			centerposition = yes
 		}
 		
 		iconType = {
@@ -8255,6 +8429,12 @@ guiTypes = {
 			maxHeight = 20
 			format = center
 		}
+		iconType = {
+			name = "can_assign_design_team_icon"
+			position = { x=0 y=42 }
+			spriteType = "GFX_design_team_icon"
+			scale = 0.8
+		}
 	}
 
 	containerWindowType = {
@@ -8292,6 +8472,12 @@ guiTypes = {
 			maxHeight = 20
 			format = center
 		}
+		iconType = {
+			name = "can_assign_design_team_icon"
+			position = { x=0 y=42 }
+			spriteType = "GFX_design_team_icon"
+			scale = 0.8
+		}
 	}
 
 	containerWindowType = {
@@ -8329,6 +8515,12 @@ guiTypes = {
 			maxHeight = 20
 			format = center
 		}
+		iconType = {
+			name = "can_assign_design_team_icon"
+			position = { x=0 y=42 }
+			spriteType = "GFX_design_team_icon"
+			scale = 0.8
+		}
 	}
 
 	containerWindowType = {
@@ -8366,6 +8558,12 @@ guiTypes = {
 			maxHeight = 20
 			format = center
 		}
+		iconType = {
+			name = "can_assign_design_team_icon"
+			position = { x=0 y=42 }
+			spriteType = "GFX_design_team_icon"
+			scale = 0.8
+		}
 	}
 
 	containerWindowType = {
@@ -8403,6 +8601,12 @@ guiTypes = {
 			maxHeight = 20
 			format = center
 		}
+		iconType = {
+			name = "can_assign_design_team_icon"
+			position = { x=0 y=42 }
+			spriteType = "GFX_design_team_icon"
+			scale = 0.8
+		}
 	}
 
 	containerWindowType = {
@@ -8440,6 +8644,12 @@ guiTypes = {
 			maxHeight = 20
 			format = center
 		}
+		iconType = {
+			name = "can_assign_design_team_icon"
+			position = { x=0 y=42 }
+			spriteType = "GFX_design_team_icon"
+			scale = 0.8
+		}
 	}
 
 	containerWindowType = {
@@ -8477,6 +8687,12 @@ guiTypes = {
 			maxHeight = 20
 			format = center
 		}
+		iconType = {
+			name = "can_assign_design_team_icon"
+			position = { x=0 y=42 }
+			spriteType = "GFX_design_team_icon"
+			scale = 0.8
+		}
 	}
 	
 	containerWindowType = {
@@ -8514,41 +8730,11 @@ guiTypes = {
 			maxHeight = 20
 			format = center
 		}
-	}
-	containerWindowType = {
-		name = "techtree_polar_item"
-		position = { x=0 y=5 }
-		size = { width = 72 height = 72 }
-		clipping = no
-
-		background = {
-			name = "Background"
-			quadTextureSprite ="GFX_technology_unavailable_item_bg"
-		}
-
-		iconType = {
-			name = "Icon"
-			position = { x=34 y=35 }
-			spriteType = "GFX_technology_medium"
-			centerposition = yes
-			alwaystransparent = yes
-		}
 		iconType = {
-			name = "bonus_icon"
-			position = { x=-1 y=-22 }
-			spriteType = "GFX_tech_bonus"
-		}
-		
-		instantTextBoxType = {
-			name = "bonus"
-			position = { x = -1 y = -22 }
-			textureFile = ""
-			font = "hoi_16mbs"
-			borderSize = {x = 4 y = 4}
-			text = "lol boat"
-			maxWidth = 80
-			maxHeight = 20
-			format = center
+			name = "can_assign_design_team_icon"
+			position = { x=0 y=42 }
+			spriteType = "GFX_design_team_icon"
+			scale = 0.8
 		}
 	}
 	containerWindowType = {
@@ -8586,6 +8772,12 @@ guiTypes = {
 			maxHeight = 20
 			format = center
 		}
+		iconType = {
+			name = "can_assign_design_team_icon"
+			position = { x=0 y=42 }
+			spriteType = "GFX_design_team_icon"
+			scale = 0.8
+		}
 	}
 	
 	containerWindowType = {
@@ -8623,6 +8815,12 @@ guiTypes = {
 			maxHeight = 20
 			format = center
 		}
+		iconType = {
+			name = "can_assign_design_team_icon"
+			position = { x=0 y=42 }
+			spriteType = "GFX_design_team_icon"
+			scale = 0.8
+		}
 	}
 	containerWindowType = {
 		name = "techtree_zebra_folder_item"
@@ -8659,6 +8857,12 @@ guiTypes = {
 			maxHeight = 20
 			format = center
 		}
+		iconType = {
+			name = "can_assign_design_team_icon"
+			position = { x=0 y=42 }
+			spriteType = "GFX_design_team_icon"
+			scale = 0.8
+		}
 	}
 	containerWindowType = {
 		name = "techtree_polar_folder_item"
@@ -8695,6 +8899,13 @@ guiTypes = {
 			maxHeight = 20
 			format = center
 		}
+		
+		iconType = {
+			name = "can_assign_design_team_icon"
+			position = { x=0 y=42 }
+			spriteType = "GFX_design_team_icon"
+			scale = 0.8
+		}
 	}
 }
 
diff --git a/interface/countrytradeview.gui b/interface/countrytradeview.gui
index 28ad89d78f1..9b727d0c4b7 100755
--- a/interface/countrytradeview.gui
+++ b/interface/countrytradeview.gui
@@ -31,7 +31,7 @@ guiTypes = {
 			font = "hoi_36header"
 			borderSize = {x = 0 y = 0}
 			text = "TRADE_TRADE"
-			maxWidth = 240
+			maxWidth = 440
 			maxHeight = 20
 			format = left
 		}
@@ -42,12 +42,6 @@ guiTypes = {
 			quadTextureSprite = "GFX_trade_header"
 		}
 
-		#iconType = {
-		#	name = "factories_bg"
-		#	position = { x = 140 y = 43 }
-		#	quadTextureSprite = "GFX_generic_text_bg_258"
-		#}
-
 		iconType = {
 			name = "civilian_factory_icon"
 			position = { x = 220 y = 47 }
@@ -186,31 +180,33 @@ guiTypes = {
 
 		instantTextboxType = {
 			name = "name"
-				position = { x = 14 y = 407 }
+			position = { x = 21 y = 407 }
 			font = "hoi_16mbs"
 			text = "TRADE_SORT_COUNTRY"
 			maxWidth = 160
 			maxHeight = 18
-			format = center
+			format = center		
 			fixedsize = yes
+			alwaystransparent = yes
 		}
-
+		
 		buttonType = {
 			name = "sort_export"
-			position = {x=257 y=400}
+			position = {x=187 y=400}
 			quadTextureSprite ="GFX_trade_filter_btn_export"
 			clicksound = click_scroll
 		}
 
 		instantTextboxType = {
 			name = "export_label"
-			position = { x = 265 y = 407 }
+			position = { x = 190 y = 407 }
 			font = "hoi_16mbs"
 			text = "TRADE_SORT_EXPORT"
 			maxWidth = 90
 			maxHeight = 18
-			format = center
+			format = center	
 			fixedsize = yes
+			alwaystransparent = yes
 		}
 
 		buttonType = {
diff --git a/interface/eaw_goals.gfx b/interface/eaw_goals.gfx
index 1225923e796..87c08b6a504 100644
--- a/interface/eaw_goals.gfx
+++ b/interface/eaw_goals.gfx
@@ -6628,6 +6628,11 @@ SpriteType = {
 		texturefile = "gfx/interface/goals/KIR/KIR_banner.tga"
 	}
 	
+	SpriteType = {
+		name = "GFX_goal_KIR_bannerkirin"
+		texturefile = "gfx/interface/goals/KIR/KIR_bannerkirin.tga"
+	}
+	
 	SpriteType = {
 		name = "GFX_goal_KIR_teaching"
 		texturefile = "gfx/interface/goals/KIR/KIR_teaching.tga"
diff --git a/interface/eaw_goals_shine.gfx b/interface/eaw_goals_shine.gfx
index 514eb3bc547..63b664d0ecc 100644
--- a/interface/eaw_goals_shine.gfx
+++ b/interface/eaw_goals_shine.gfx
@@ -9381,6 +9381,38 @@ spriteTypes = {
 		legacy_lazy_load = no
 	}
 	
+	SpriteType = {
+		name = "GFX_goal_KIR_bannerkirin_shine"
+		texturefile = "gfx/interface/goals/KIR/KIR_bannerkirin.tga"
+		effectFile = "gfx/FX/buttonstate.lua"
+		animation = {
+			animationmaskfile = "gfx/interface/goals/KIR/KIR_bannerkirin.tga"
+			animationtexturefile = "gfx/interface/goals/shine_overlay.dds"
+			animationrotation = -90.0
+			animationlooping = no
+			animationtime = 0.75
+			animationdelay = 0
+			animationblendmode = "add"
+			animationtype = "scrolling"
+			animationrotationoffset = { x = 0.0 y = 0.0 }
+			animationtexturescale = { x = 1.0 y = 1.0 }
+		}
+
+		animation = {
+			animationmaskfile = "gfx/interface/goals/KIR/KIR_bannerkirin.tga"
+			animationtexturefile = "gfx/interface/goals/shine_overlay.dds"
+			animationrotation = 90.0
+			animationlooping = no
+			animationtime = 0.75
+			animationdelay = 0
+			animationblendmode = "add"
+			animationtype = "scrolling"
+			animationrotationoffset = { x = 0.0 y = 0.0 }
+			animationtexturescale = { x = 1.0 y = 1.0 }
+		}
+		legacy_lazy_load = no
+	}
+	
 	SpriteType = {
 		name = "GFX_goal_KIR_ranks_shine"
 		texturefile = "gfx/interface/goals/KIR/KIR_ranks.tga"
diff --git a/interface/eaw_ideas.gfx b/interface/eaw_ideas.gfx
index 92b517f3aae..e5daee34a87 100644
--- a/interface/eaw_ideas.gfx
+++ b/interface/eaw_ideas.gfx
@@ -7850,7 +7850,7 @@ spriteTypes = {
 	}
 	SpriteType = {
 		name = "GFX_idea_ZES_Garca"
-		texturefile = "gfx/interface/ideas/ZES/ZES_Garca.tga"
+		texturefile = "gfx/interface/ideas/ZES/ZES_garca.tga"
 	}
 	SpriteType = {
 		name = "GFX_idea_ZES_infantry_equipment_manufacturer"
diff --git a/interface/eaw_plane_modules_icons.gfx b/interface/eaw_plane_modules_icons.gfx
index 8719c639e6f..6da6bff9bce 100644
--- a/interface/eaw_plane_modules_icons.gfx
+++ b/interface/eaw_plane_modules_icons.gfx
@@ -19,6 +19,21 @@ spriteTypes = {
 
 
 		#### MODULES ####
+	spriteType = {
+		name = "GFX_EMI_torpedo_mounting_4"
+		textureFile = "gfx/interface/equipmentdesigner/planes/modules/airplane_torpedo_4_icon.dds"
+		legacy_lazy_load = no
+	}
+	spriteType = {
+		name = "GFX_EMI_cannon_defense_turret_2"
+		textureFile = "gfx/interface/equipmentdesigner/planes/modules/airplane_modern_cannon_turret_1_icon.dds"
+		legacy_lazy_load = no
+	}
+	spriteType = {
+		name = "GFX_EMI_cannon_defense_turret_2_2x"
+		textureFile = "gfx/interface/equipmentdesigner/planes/modules/airplane_modern_cannon_turret_2_icon.dds"
+		legacy_lazy_load = no
+	}
 	spriteType = {
 		name = "GFX_EMI_jet_engine_8x"
 		textureFile = "gfx/interface/equipmentdesigner/planes/modules/airplane_jet_engine_8_icon.tga"
diff --git a/interface/eaw_portraits.gfx b/interface/eaw_portraits.gfx
index 88ed666d9ed..3690288e93d 100644
--- a/interface/eaw_portraits.gfx
+++ b/interface/eaw_portraits.gfx
@@ -2348,6 +2348,115 @@ spriteTypes = {
 		textureFile = "gfx/interface/ideas/generic_generals_small/idea_FAT_generic_land_male_20.tga"
 	}
 
+	# Female
+	spriteType = {
+		name = "GFX_portrait_FAT_generic_land_female_1"
+		textureFile = "gfx/leaders/FAT/portrait_FAT_generic_land_female_1.tga"
+	}
+	spriteType = {
+		name = "GFX_portrait_FAT_generic_land_female_1_small"
+		textureFile = "gfx/interface/ideas/generic_generals_small/idea_FAT_generic_land_female_1.tga"
+	}
+
+	spriteType = {
+		name = "GFX_portrait_FAT_generic_land_female_2"
+		textureFile = "gfx/leaders/FAT/portrait_FAT_generic_land_female_2.tga"
+	}
+	spriteType = {
+		name = "GFX_portrait_FAT_generic_land_female_2_small"
+		textureFile = "gfx/interface/ideas/generic_generals_small/idea_FAT_generic_land_female_2.tga"
+	}
+
+	spriteType = {
+		name = "GFX_portrait_FAT_generic_land_female_3"
+		textureFile = "gfx/leaders/FAT/portrait_FAT_generic_land_female_3.tga"
+	}
+	spriteType = {
+		name = "GFX_portrait_FAT_generic_land_female_3_small"
+		textureFile = "gfx/interface/ideas/generic_generals_small/idea_FAT_generic_land_female_3.tga"
+	}
+
+	spriteType = {
+		name = "GFX_portrait_FAT_generic_land_female_4"
+		textureFile = "gfx/leaders/FAT/portrait_FAT_generic_land_female_4.tga"
+	}
+	spriteType = {
+		name = "GFX_portrait_FAT_generic_land_female_4_small"
+		textureFile = "gfx/interface/ideas/generic_generals_small/idea_FAT_generic_land_female_4.tga"
+	}
+
+	spriteType = {
+		name = "GFX_portrait_FAT_generic_land_female_5"
+		textureFile = "gfx/leaders/FAT/portrait_FAT_generic_land_female_5.tga"
+	}
+	spriteType = {
+		name = "GFX_portrait_FAT_generic_land_female_5_small"
+		textureFile = "gfx/interface/ideas/generic_generals_small/idea_FAT_generic_land_female_5.tga"
+	}
+
+	spriteType = {
+		name = "GFX_portrait_FAT_generic_land_female_6"
+		textureFile = "gfx/leaders/FAT/portrait_FAT_generic_land_female_6.tga"
+	}
+	spriteType = {
+		name = "GFX_portrait_FAT_generic_land_female_6_small"
+		textureFile = "gfx/interface/ideas/generic_generals_small/idea_FAT_generic_land_female_6.tga"
+	}
+
+	spriteType = {
+		name = "GFX_portrait_FAT_generic_land_female_7"
+		textureFile = "gfx/leaders/FAT/portrait_FAT_generic_land_female_7.tga"
+	}
+	spriteType = {
+		name = "GFX_portrait_FAT_generic_land_female_7_small"
+		textureFile = "gfx/interface/ideas/generic_generals_small/idea_FAT_generic_land_female_7.tga"
+	}
+
+	spriteType = {
+		name = "GFX_portrait_FAT_generic_land_female_8"
+		textureFile = "gfx/leaders/FAT/portrait_FAT_generic_land_female_8.tga"
+	}
+	spriteType = {
+		name = "GFX_portrait_FAT_generic_land_female_8_small"
+		textureFile = "gfx/interface/ideas/generic_generals_small/idea_FAT_generic_land_female_8.tga"
+	}
+
+	spriteType = {
+		name = "GFX_portrait_FAT_generic_land_female_9"
+		textureFile = "gfx/leaders/FAT/portrait_FAT_generic_land_female_9.tga"
+	}
+	spriteType = {
+		name = "GFX_portrait_FAT_generic_land_female_9_small"
+		textureFile = "gfx/interface/ideas/generic_generals_small/idea_FAT_generic_land_female_9.tga"
+	}
+
+	spriteType = {
+		name = "GFX_portrait_FAT_generic_land_female_10"
+		textureFile = "gfx/leaders/FAT/portrait_FAT_generic_land_female_10.tga"
+	}
+	spriteType = {
+		name = "GFX_portrait_FAT_generic_land_female_10_small"
+		textureFile = "gfx/interface/ideas/generic_generals_small/idea_FAT_generic_land_female_10.tga"
+	}
+
+	spriteType = {
+		name = "GFX_portrait_FAT_generic_land_female_11"
+		textureFile = "gfx/leaders/FAT/portrait_FAT_generic_land_female_11.tga"
+	}
+	spriteType = {
+		name = "GFX_portrait_FAT_generic_land_female_11_small"
+		textureFile = "gfx/interface/ideas/generic_generals_small/idea_FAT_generic_land_female_11.tga"
+	}
+
+	spriteType = {
+		name = "GFX_portrait_FAT_generic_land_female_12"
+		textureFile = "gfx/leaders/FAT/portrait_FAT_generic_land_female_12.tga"
+	}
+	spriteType = {
+		name = "GFX_portrait_FAT_generic_land_female_12_small"
+		textureFile = "gfx/interface/ideas/generic_generals_small/idea_FAT_generic_land_female_12.tga"
+	}
+
 	##### Wingbardian Griffons #####
 	### Generals ###
 	spriteType = {
diff --git a/interface/eaw_tank_modules_icons.gfx b/interface/eaw_tank_modules_icons.gfx
index 6f3b0edbecd..23a054aeb1d 100644
--- a/interface/eaw_tank_modules_icons.gfx
+++ b/interface/eaw_tank_modules_icons.gfx
@@ -11,6 +11,31 @@ spriteTypes = {
 		textureFile = "gfx/interface/equipmentdesigner/tanks/modules/tank_module_aa_gun_5.dds"
 		legacy_lazy_load = no
 	}
+	spriteType = {
+		name = "GFX_EMI_tank_heavy_anti_air_cannon"
+		textureFile = "gfx/interface/equipmentdesigner/tanks/modules/tank_module_heavy_aa_gun.dds"
+		legacy_lazy_load = no
+	}
+	spriteType = {
+		name = "GFX_EMI_tank_heavy_anti_air_cannon_2"
+		textureFile = "gfx/interface/equipmentdesigner/tanks/modules/tank_module_heavy_aa_gun_2.dds"
+		legacy_lazy_load = no
+	}
+	spriteType = {
+		name = "GFX_EMI_tank_heavy_anti_air_cannon_3"
+		textureFile = "gfx/interface/equipmentdesigner/tanks/modules/tank_module_heavy_aa_gun_3.dds"
+		legacy_lazy_load = no
+	}
+	spriteType = {
+		name = "GFX_EMI_tank_heavy_anti_air_cannon_4"
+		textureFile = "gfx/interface/equipmentdesigner/tanks/modules/tank_module_heavy_aa_gun_4.dds"
+		legacy_lazy_load = no
+	}
+	spriteType = {
+		name = "GFX_EMI_tank_heavy_anti_air_cannon_5"
+		textureFile = "gfx/interface/equipmentdesigner/tanks/modules/tank_module_heavy_aa_gun_5.dds"
+		legacy_lazy_load = no
+	}
 	spriteType = {
 		name = "GFX_EMI_tank_small_cannon_3"
 		textureFile = "gfx/interface/equipmentdesigner/tanks/modules/tank_module_small_cannon_3.dds"
@@ -31,6 +56,11 @@ spriteTypes = {
 		textureFile = "gfx/interface/equipmentdesigner/tanks/modules/tank_module_oscillating_turret.dds"
 		legacy_lazy_load = no
 	}
+	spriteType = {
+		name = "GFX_EMI_easy_maintenance_2"
+		textureFile = "gfx/interface/equipmentdesigner/tanks/modules/tank_module_easy_maintenance_access.dds"
+		legacy_lazy_load = no
+	}
 	spriteType = {
 		name = "GFX_EMI_gun_computer"
 		textureFile = "gfx/interface/equipmentdesigner/tanks/modules/tank_module_gun_computer.dds"
diff --git a/interface/eaw_technologies.gfx b/interface/eaw_technologies.gfx
index faf66dde956..86f0eabf927 100644
--- a/interface/eaw_technologies.gfx
+++ b/interface/eaw_technologies.gfx
@@ -676,6 +676,11 @@ SpriteTypes = {
 		name = "GFX_wire_torpedo_medium"
 		texturefile = "gfx/interface/technologies/wiretorpedo.dds"
 	}
+
+	SpriteType = {
+		name = "GFX_air_torpedoe_4_medium"
+		texturefile = "gfx/interface/technologies/bba_tech_air_torpedoe_3.dds"
+	}
 	
 	# Transports
 	SpriteType = {
@@ -853,11 +858,11 @@ SpriteTypes = {
 		texturefile = "gfx/interface/technologies/aircraft/electronic_countermeasures.tga"
 	}
 	SpriteType = {
-		name = "GFX_aa_cannon_3_medium"
+		name = "GFX_aa_cannon_4_medium"
 		texturefile = "gfx/interface/technologies/aircraft/aa_cannon_3.dds"
 	}
 	SpriteType = {
-		name = "GFX_aa_cannon_4_medium"
+		name = "GFX_aa_cannon_5_medium"
 		texturefile = "gfx/interface/technologies/aircraft/aa_cannon_4.dds"
 	}
 	SpriteType = {
@@ -3066,6 +3071,39 @@ SpriteTypes = {
 		texturefile = "gfx/interface/technologies/doctrines/basic_ECM.dds"
 	}
 
+	### Racial Special Forces Doctrines ###
+	
+	spriteType = {
+		name = "GFX_racial_specforce_bg"
+		textureFile = "gfx/interface/officer_corp/special_forces/doctrine_special_forces_racial_bg.dds"
+		alwaystransparent = yes		
+	}
+
+	SpriteType = {
+		name = "GFX_racial_specforce_start_medium"
+		textureFile = "gfx/interface/technologies/racial_specforce_start.dds"
+	}
+	SpriteType = {
+		name = "GFX_racial_specforce_left1_medium"
+		textureFile = "gfx/interface/technologies/racial_specforce_left1.dds"
+	}
+	SpriteType = {
+		name = "GFX_racial_specforce_right1_medium"
+		textureFile = "gfx/interface/technologies/racial_specforce_right1.dds"
+	}
+	SpriteType = {
+		name = "GFX_racial_specforce_left2_medium"
+		textureFile = "gfx/interface/technologies/racial_specforce_left2.dds"
+	}
+	SpriteType = {
+		name = "GFX_racial_specforce_right2_medium"
+		textureFile = "gfx/interface/technologies/racial_specforce_right2.dds"
+	}
+	SpriteType = {
+		name = "GFX_racial_specforce_final_medium"
+		textureFile = "gfx/interface/technologies/racial_specforce_final.dds"
+	}
+
 	##### UNRESEARCHABLE TECHS #####
 	# Dragon Equipment
 	SpriteType = {
diff --git a/interface/equipmentupgradedesignerwindow.gui b/interface/equipmentupgradedesignerwindow.gui
index 78667ed6342..21d6921b6f6 100644
--- a/interface/equipmentupgradedesignerwindow.gui
+++ b/interface/equipmentupgradedesignerwindow.gui
@@ -73,6 +73,40 @@ guiTypes = {
 				format = UPPER_LEFT
 			}
 		}
+
+		containerWindowType = {
+			name = "change_design_team"
+			position = { x=20 y=350 }
+			size = { width=300 height=60 }
+
+			instantTextboxType = {
+				name = "change_design_team_label"
+				position = { x = 115 y = 10 }
+				font = "hoi_18mbs"
+				text = "INDUSTRIAL_ORG_LIST_WINDOW_TITLE"
+				maxWidth = 160
+				maxHeight = 20
+				format = left
+			}			
+
+			background = {
+				name = "Background"
+				spriteType ="GFX_tiled_window_transparent"
+			}
+
+			buttonType = {
+				name = "open_roster"
+				position = { x = 45 y = -5 }
+				spriteType = "GFX_idea_slot_materiel_manufacturer"
+			}
+
+			buttonType = {
+				name = "upgrade_assigned_industrial_org"
+				position = { x = 5 y = 15 }
+				spriteType = "GFX_designer_button_upgrade_strip"
+			}
+		}
+		
 		
 		buttonType = {
 			name = "close_button"
@@ -2320,6 +2354,7 @@ guiTypes = {
 			maxWidth = 150
 			maxHeight = 20
 			format = left
+			fixedsize = yes
 		}
 	
 		instantTextboxType = {
diff --git a/interface/military_industrial_organization/eaw_industrial_organization_department_icons.gfx b/interface/military_industrial_organization/eaw_industrial_organization_department_icons.gfx
new file mode 100644
index 00000000000..871bedbf754
--- /dev/null
+++ b/interface/military_industrial_organization/eaw_industrial_organization_department_icons.gfx
@@ -0,0 +1,54 @@
+spriteTypes = {
+
+	########################################
+	##### EQUIPEMNT TYPES & CATEGORIES #####
+	########################################
+
+	# Used automatically in code
+	# name must have the format : GFX_military_industrial_organization_ + equipment_key
+	# where equipment_key can either be an equipment category or an equipment archetype
+
+	##############################
+	##### INFANTRY EQUIPMENT #####
+	##############################
+
+	spriteType = {
+		name = "GFX_military_industrial_organization_magical_equipment"
+		texturefile = "gfx/interface/military_industrial_organization/department_icons/generic_mio_department_icon_infantry_magical.dds"
+	}	
+
+	#####################
+	##### ARTILLERY #####
+	#####################
+	
+	#######################################	
+	##### TRAINS, TRUCKS & MECHANIZED #####
+	#######################################	
+
+	################
+	##### TANK #####
+	################
+
+	spriteType = {
+		name = "GFX_mio_cat_eq_all_amphibious_tank"
+		texturefile = "gfx/interface/military_industrial_organization/department_icons/generic_mio_department_icon_amphibious_tank.dds"
+	}	
+	
+	spriteType = {
+		name = "GFX_mio_cat_eq_all_main_battle_tank"
+		texturefile = "gfx/interface/military_industrial_organization/department_icons/generic_mio_department_icon_modern_tank.dds"
+	}		
+
+	spriteType = {
+		name = "GFX_mio_cat_eq_all_super_heavy_tank"
+		texturefile = "gfx/interface/military_industrial_organization/department_icons/generic_mio_department_icon_super_heavy_tank.dds"
+	}		
+
+	###################################
+	##### SHIPS & FLOATING HARBOR #####
+	###################################
+
+	####################################
+	##### PLANES & GUIDED MISSILES #####
+	####################################
+}
\ No newline at end of file
diff --git a/interface/popupwindow.gui b/interface/popupwindow.gui
index fcc13951132..31e7408baf2 100644
--- a/interface/popupwindow.gui
+++ b/interface/popupwindow.gui
@@ -3,7 +3,7 @@ guiTypes = {
 	containerWindowType = {
 		name = "diplomacy_standard_popup_window"
 		position = { x = -225 y = -160 }
-		size = { width = 584 height = 280 }
+		size = { width = 584 height = 320 }
 		orientation= center
 		moveable = yes
 		fade_time = 200
@@ -105,17 +105,16 @@ guiTypes = {
 			format = centre
 			scrollbartype = "standardtext_slider"
 		}
-
-		iconType =
-		{
+		
+		iconType = {
 			name ="diplo_popup_bottom"
 			spriteType = "GFX_diplo_popup_bottom_large"
-			position = { x= 0 y = 218 }
+			position = { x= 0 y = 253 }
 		}
 
 		buttonType = {
 			name = "decline_button"
-			position = { x=77 y =231}
+			position = { x=77 y =265}
 			quadTextureSprite ="GFX_button_123x34"
 			buttonText = "FE_DECLINE"
 			buttonFont = "hoi_18mbs"
@@ -124,7 +123,7 @@ guiTypes = {
 
 		buttonType = {
 			name = "accept_button"
-			position = { x=386 y =231}
+			position = { x=386 y =265}
 			quadTextureSprite ="GFX_button_123x34"
 			buttonText = "FE_ACCEPT"
 			buttonFont = "hoi_18mbs"
@@ -804,6 +803,13 @@ guiTypes = {
 			centerposition = yes
 		}
 
+		iconType = {
+			name = "design_team_icon"
+			position = { x= 400 y = 130 }
+			centerposition = yes
+			hide = yes
+		}
+
 		iconType = {
 			name = "equipment_icon"
 			quadTextureSprite ="GFX_land_equipment_role_icons"
@@ -2445,4 +2451,99 @@ guiTypes = {
 			clicksound = click_default
 		}
 	}
+	containerWindowType = {
+		name = "unlock_industrial_org_trait_popup"
+		size = { width = 480 height=356 }
+		orientation= center
+		origo = center
+		moveable = yes
+		fade_time = 200
+		fade_type = linear
+		click_to_front = yes
+
+		background = {
+			name = "Background"
+			quadTextureSprite ="GFX_tiled_window_pol_goal"
+		}
+
+		buttonType = {
+			name = "close_button"
+			position = { x = 350 y = 14 }
+			quadTextureSprite ="GFX_closebutton"
+			buttonFont = "Main_14_black"
+			shortcut = "ESCAPE"
+			Orientation = "UPPER_RIGHT"
+			clicksound = click_close
+			pdx_tooltip = "CLOSE"
+		}
+
+		instantTextBoxType = {
+			name = "title"
+			position = { x = 10 y = 16 }
+			textureFile = ""
+			font = "hoi_24header"
+			borderSize = {x = 0 y = 10}
+			text = "Title"
+			maxWidth = 450
+			maxHeight = 40
+			fixedsize = yes
+			vertical_alignment = center
+			format = centre
+		}
+
+		instantTextBoxType = {
+			name = "description"
+			position = { x = 24 y = 90 }
+			textureFile = ""
+			font = "hoi_18mbs"
+			borderSize = {x = 0 y = 0}
+			text = "Long text here!"
+			maxWidth = 430
+			maxHeight = 155
+			format = centre
+			scrollbartype = "standardtext_slider"
+		}
+
+		checkboxType = {
+			name = "update_variants_checkbox"
+			position = { x=44 y=200 }
+			quadTextureSprite ="GFX_generic_checkbox"
+			buttonText = ""
+			buttonFont = "Main_14_black"
+			clicksound = click_checkbox
+		}
+
+		instantTextBoxType = {
+			name = "update_variants_description"
+			position = { x=84 y=200 }
+			textureFile = ""
+			font = "hoi_18mbs"
+			borderSize = {x = 0 y = 0}
+			text = "Long text here!"
+			maxWidth = 335
+			maxHeight = 48
+			format = left
+			scrollbartype = "standardtext_slider"
+		}
+
+		buttonType = {
+			name = "decline_button"
+			position = { x=90 y=278}
+			quadTextureSprite ="GFX_button_148x34"
+			buttonText = "PDXO_CANCEL"
+			buttonFont = "hoi_16mbs"
+			shortcut = "ESCAPE"
+			clicksound = click_close
+		}
+
+		buttonType = {
+			name = "accept_button"
+			position = { x=260 y=278}
+			quadTextureSprite ="GFX_button_148x34"
+			buttonText = "OK"
+			buttonFont = "hoi_16mbs"
+			shortcut = "RETURN"
+			clicksound = ui_mio_give_trait
+		}
+	}
 }
diff --git a/interface/replace/eaw_general_stuff.gfx b/interface/replace/eaw_general_stuff.gfx
index 21f0962d86b..78627edabba 100644
--- a/interface/replace/eaw_general_stuff.gfx
+++ b/interface/replace/eaw_general_stuff.gfx
@@ -15,13 +15,18 @@ spriteTypes = {
 	spriteType = {
 		name = "GFX_global_alert_icons"
 		texturefile = "gfx/interface/alerts/global_alert_icons.dds"
-		noOfFrames = 56 
+		noOfFrames = 58 
 	}
 
 	spriteType = {
 		name = "GFX_global_alert_icons_no_backgrounds"
 		texturefile = "gfx/interface/alerts/global_alert_icons_no_backgrounds.dds"
-		noOfFrames = 56
+		noOfFrames = 58
+	}
+	spriteType = {
+		name = "GFX_global_diplorequest_icons"
+		texturefile = "gfx/interface/alerts/global_diplorequest_icons.dds"
+		noOfFrames = 17
 	}
 
 	spriteType = {
diff --git a/interface/zzz_CHN_technologies.gfx b/interface/zzz_CHN_technologies.gfx
index 879029cc7ce..59ccbd8b5db 100644
--- a/interface/zzz_CHN_technologies.gfx
+++ b/interface/zzz_CHN_technologies.gfx
@@ -76,6 +76,26 @@ spriteTypes = {
 		name = "GFX_CHN_motorized_equipment_1_medium"
 		texturefile = "gfx/interface/technologies/arm_GER_motorized_equipment_Blitz.dds"
 	}
+	
+	SpriteType = {
+		name = "GFX_CHN_tech_trucks_medium"
+		texturefile = "gfx/interface/technologies/GER_motorized_equipment_0.dds"
+	}
+
+   SpriteType = {
+	   name = "GFX_CHN_motorized_equipment_0_medium"
+	   texturefile = "gfx/interface/technologies/GER_motorized_equipment_0.dds"
+   }
+   
+   SpriteType = {
+	   name = "GFX_CCN_tech_trucks_medium"
+	   texturefile = "gfx/interface/technologies/GER_motorized_equipment_0.dds"
+   }
+
+  SpriteType = {
+	  name = "GFX_CCN_motorized_equipment_0_medium"
+	  texturefile = "gfx/interface/technologies/GER_motorized_equipment_0.dds"
+  }
 	SpriteType = {
 		name = "GFX_CHN_motorized_rocket_unit_medium"
 		texturefile = "gfx/interface/technologies/arm_GER_motorized_rocket_equipment_Sdkfz4.dds"
diff --git a/interface/zzz_EQS_technologies.gfx b/interface/zzz_EQS_technologies.gfx
index 50ac71e1aa0..04c2e5a6a6c 100644
--- a/interface/zzz_EQS_technologies.gfx
+++ b/interface/zzz_EQS_technologies.gfx
@@ -57,6 +57,17 @@ spriteTypes = {
 	}
 	
 	# Motorized
+	
+	SpriteType = {
+		name = "GFX_commonwealth_2d_tech_trucks_medium"
+		texturefile = "gfx/interface/technologies/ENG_motorized_equipment_0.dds"
+	}
+
+	SpriteType = {
+		name = "GFX_commonwealth_2d_motorized_equipment_0_medium"
+		texturefile = "gfx/interface/technologies/ENG_motorized_equipment_0.dds"
+	}
+
 	SpriteType = {
 		name = "GFX_commonwealth_2d_motorised_infantry_medium"
 		texturefile = "gfx/interface/technologies/EQS_motorized_equipment_1.dds"
diff --git a/interface/zzz_HIP_technologies.gfx b/interface/zzz_HIP_technologies.gfx
index 582537f8e09..ec0de4d3b55 100644
--- a/interface/zzz_HIP_technologies.gfx
+++ b/interface/zzz_HIP_technologies.gfx
@@ -65,6 +65,17 @@ spriteTypes = {
 	}
 
 	# Motorized
+	
+	SpriteType = {
+		name = "GFX_hippogriff_2d_tech_trucks_medium"
+		texturefile = "gfx/interface/technologies/USA_motorized_equipment_0.dds"
+	}
+
+	SpriteType = {
+		name = "GFX_hippogriff_2d_motorized_equipment_0_medium"
+		texturefile = "gfx/interface/technologies/USA_motorized_equipment_0.dds"
+	}
+
 	SpriteType = {
 		name = "GFX_hippogriff_2d_motorised_infantry_medium"
 		texturefile = "gfx/interface/technologies/USA_motorized_equipment_1.dds"
diff --git a/interface/zzz_JER_technologies.gfx b/interface/zzz_JER_technologies.gfx
index 1032b1f430e..9c0c012c8c5 100644
--- a/interface/zzz_JER_technologies.gfx
+++ b/interface/zzz_JER_technologies.gfx
@@ -51,6 +51,18 @@ spriteTypes = {
 	}
 
 	# Motorized
+	
+
+	SpriteType = {
+		name = "GFX_aquileia_2d_tech_trucks_medium"
+		texturefile = "gfx/interface/technologies/FRA_motorized_equipment_0.dds"
+	}
+
+   SpriteType = {
+	   name = "GFX_aquileia_2d_motorized_equipment_0_medium"
+	   texturefile = "gfx/interface/technologies/FRA_motorized_equipment_0.dds"
+   }
+
 	SpriteType = {
 		name = "GFX_aquileia_2d_motorised_infantry_medium"
 		texturefile = "gfx/interface/technologies/JER_moto_equipment.dds"
diff --git a/interface/zzz_OLE_technologies.gfx b/interface/zzz_OLE_technologies.gfx
index 609283f513c..dc30b123b21 100644
--- a/interface/zzz_OLE_technologies.gfx
+++ b/interface/zzz_OLE_technologies.gfx
@@ -25,6 +25,17 @@ spriteTypes = {
 		name = "GFX_olenia_2d_improved_infantry_weapons_medium"
 		texturefile = "gfx/interface/technologies/OLE_infantry_equipment_3.dds"
 	}
+
+	
+	SpriteType = {
+		name = "GFX_olenia_2d_motorised_infantry_medium"
+		texturefile = "gfx/interface/technologies/FIN_motorized_equipment_1.dds"
+	}
+
+	SpriteType = {
+		name = "GFX_olenia_2d_motorized_equipment_1_medium"
+		texturefile = "gfx/interface/technologies/FIN_motorized_equipment_1.dds"
+	}
 	
 	### Tanks Tab ###
 	# Light Tanks
diff --git a/interface/zzz_WNG_technologies.gfx b/interface/zzz_WNG_technologies.gfx
index 588035ed4ec..785d81d0da3 100644
--- a/interface/zzz_WNG_technologies.gfx
+++ b/interface/zzz_WNG_technologies.gfx
@@ -51,6 +51,16 @@ spriteTypes = {
 	}
 
 	# Motorized
+	
+	SpriteType = {
+		name = "GFX_wingbardy_2d_tech_trucks_medium"
+		texturefile = "gfx/interface/technologies/ITA_motorized_equipment_0.dds"
+	}
+
+   SpriteType = {
+	   name = "GFX_wingbardy_2d_motorized_equipment_0_medium"
+	   texturefile = "gfx/interface/technologies/ITA_motorized_equipment_0.dds"
+   }
 	SpriteType = {
 		name = "GFX_wingbardy_2d_motorised_infantry_medium"
 		texturefile = "gfx/interface/technologies/ita_motorised_infantry.dds"
diff --git a/interface/zzz_frontendmainviewbg.gfx b/interface/zzz_frontendmainviewbg.gfx
index 8c50cc66cf2..44c05d56cc2 100644
--- a/interface/zzz_frontendmainviewbg.gfx
+++ b/interface/zzz_frontendmainviewbg.gfx
@@ -5,7 +5,7 @@ spriteTypes = {
 		borderSize = { x=0 y= 0 }
 		size = {  x=1920 y= 1440 }
 		tilingCenter = no
-		effectFile = "gfx/FX/buttonstate_nodowneffect.lua"
+		effectFile = "gfx/FX/buttonstate_blendframes.lua"
 	}
 
 	#corneredTileSpriteType = {
diff --git a/interface/zzz_technologies.gfx b/interface/zzz_technologies.gfx
index 7a993495013..8dedd2b3633 100644
--- a/interface/zzz_technologies.gfx
+++ b/interface/zzz_technologies.gfx
@@ -91,6 +91,16 @@ spriteTypes = {
 	}
 
 	### NAVAL TECH ###
+
+	SpriteType = {
+		name = "GFX_air_torpedoe_2_medium"
+		texturefile = "gfx/interface/technologies/bba_tech_air_torpedoe_2.dds"
+	}
+
+	SpriteType = {
+		name = "GFX_air_torpedoe_3_medium"
+		texturefile = "gfx/interface/technologies/electric_torpedo.dds"
+	}
 	# Destroyers
 	SpriteType = {
 		name = "GFX_early_destroyer_medium"
diff --git a/localisation/english/_temp_postNBSchars_l_english.yml b/localisation/english/_temp_postNBSchars_l_english.yml
index 9f679bbb6b6..a87b84f7fb7 100644
--- a/localisation/english/_temp_postNBSchars_l_english.yml
+++ b/localisation/english/_temp_postNBSchars_l_english.yml
@@ -97,6 +97,10 @@ MGY_shepser_of_manephis:0 "Shepser of Manephis"
 MGY_butternut_squash:0 "Butternut Squash"
 MGY_corktantinople:0 "Corktantinople"
 MGY_corktantinople_desc:0 "§YBorn:§! 9th of September, 987 in Prospero\n\n§YBiography:§! Though she was born and raised in Prospero of Asterion, her parents were actually from Maregypt, who had escaped from the desert just to find her a better place to get education. As the daughter of librarians, she developed great interests in books and lexicons, and started her education in an early age in the Library of Prospero.\n\nAfter graduation, she was selected by local government and began her service in the Asterion Army. During the service, she heard news from Maregypt. The rumors about her homeland made it a pity for her since she knew nothing about the blood within her vain.\n\nSo, she decided to go home, to the motherland that she had never stepped on. In the Battle of R'ataphet, just one year before her birth, she was not there with her folks. But this time, things will be different.\n\n§YPortrait By§!: Kaiser Sauce"
+MGY_annu:0 "Annu"
+MGY_annu_desc:0 "§YPortrait By§!: Kleowolfy"
+MGY_violetta_locifer:0 "Violetta Locifer"
+MGY_violetta_locifer_desc:0 "§YPortrait By§!: Stephen Sen"
 
 MSH_almami_zekuris:0 "Almami Zekuris"
 
diff --git a/localisation/english/country_BAK_l_english.yml b/localisation/english/country_BAK_l_english.yml
index 59236e5815e..deca4a3e846 100644
--- a/localisation/english/country_BAK_l_english.yml
+++ b/localisation/english/country_BAK_l_english.yml
@@ -1284,6 +1284,8 @@ BAK_harmonists_elected_tp:0 "§GCobalt Wind has chosen to work with the SDH§!\n
 BAK_libertarian_elected_tp:0 "§GCobalt Wind has chosen to work with the BSP§!\n\n"
 BAK_operation_remove_guarantee_effect_tt:0 "Prohibits all members of §CRiver Coalition§! from §Yguaranteeing§! this country for §Y360§! days."
 
+BAK_tailvoz_hidden_tt:0 "$modifier_production_speed_infrastructure_factor$: §G+5.0%§ "
+
 ### Leaders ###
 BAK_firm_scow:0 "Firm Scow"
 BAK_water_lily:0 "Water Lily"
@@ -1348,6 +1350,7 @@ BAK_tomos:0 "Tomos Heavy Armour Manufacturing"
 BAK_lisica:0 "Lisica Textile Manufacturing"
 BAK_koper:0 "Koper Armoury"
 BAK_ziri:0 "Žiri Cannon Foundry"
+BAK_lisica_and_ziri:0 "Lisica-Žiri United"
 BAK_gorica:0 "Gorica Motors"
 BAK_elan:0 "Elan Shipping"
 BAK_iskra:0 "Iskra Shipbuilding"
diff --git a/localisation/english/country_BAR_l_english.yml b/localisation/english/country_BAR_l_english.yml
index 92f51040728..482b4880ba2 100644
--- a/localisation/english/country_BAR_l_english.yml
+++ b/localisation/english/country_BAR_l_english.yml
@@ -1933,6 +1933,7 @@ BAR_pen_medium_planes:0 "Eadgar Aelfstan"
 BAR_ded_light_planes:0 "Osbeorn Aelfstan"
 BAR_ded_cas:0 "Aebbe Eadburg"
 BAR_ded_medium_planes:0 "Eadgar Aelfstan"
+BAR_ded_shipyard:0 "Hilda Batwyrhta"
 BAR_pen_shipyard:0 "Hilda Batwyrhta"
 
 ##### victory points ######
diff --git a/localisation/english/country_CHN_l_english.yml b/localisation/english/country_CHN_l_english.yml
index 8f1802da011..ed8884dc727 100644
--- a/localisation/english/country_CHN_l_english.yml
+++ b/localisation/english/country_CHN_l_english.yml
@@ -2870,7 +2870,7 @@ CHN_regional_commissariat_unlock_tt:0 "\nUnlocks the §YRegional Commissariat§!
 extractive_regime:0 "Extractivist Regime"
 extractive_regime_resistance_threshold:0 "The Average §RResistance§! of all [From.FROM.GetAdjective] core states under our control is below §Y30.0%§!."
 extractive_regime_compliance_threshold:0 "The Average §GCompliance§! of all [From.FROM.GetAdjective] core states under our control is above §Y30.0%§!."
-extractive_regime_unlock_tt:0 "\nUnlocks the §YExtractivist Regime§! occupation law:\nState Modifier:\n      Local Resources: §G+75%§!\n      Required Garrisons: §R+25%§!\n      Resource Sabotage Chance: §G-25%§!\n      Resource Sabotage Duration: §G-25%§!"
+extractive_regime_unlock_tt:0 "\nUnlocks the §YExtractivist Regime§! occupation law:\nState Modifier:\n      Local Resources: §G+75%§!\n      Resource Gain Efficiency: §G+25%§!\n      Required Garrisons: §R+25%§!\n      Resource Sabotage Chance: §G-25%§!\n      Resource Sabotage Duration: §G-25%§!"
 
  secret_police_oversight_changeling:1 "Secret Police"
 
diff --git a/localisation/english/country_CTH_l_english.yml b/localisation/english/country_CTH_l_english.yml
index 828baefed45..47e73141e7f 100644
--- a/localisation/english/country_CTH_l_english.yml
+++ b/localisation/english/country_CTH_l_english.yml
@@ -2973,9 +2973,9 @@
  CTH_strikes_outlawed_tt:0 "Having low stability will §Yno longer cause strikes§!.\n"
  CTH_popular_power_tt_1:0 "Improved §YPopular Power§!:\nResearch Speed: §G+5%§!\nConstruction Speed: §G+5%§!\n"
  CTH_popular_power_tt_2:0 "Improved §YPopular Power§!:\nMilitary Leader Cost: §G-50%§!\nArmy Organization Factor: §G+5%§!\n"
- CTH_popular_power_tt_3:0 "Improved §YPopular Power§!:\nConsumer Goods Factor: §Y-2.5%§!\nMonthly Population: §G+10%§!\n"
+ CTH_popular_power_tt_3:0 "Improved §YPopular Power§!:\nConsumer Goods Factor: §Y-5%§!\nMonthly Population: §G+10%§!\n"
  CTH_popular_power_tt_4:0 "Improved §YPopular Power§!:\nFactory Output: §G+5%§!\nConscription Factor: §G+10%§!\n"
- CTH_popular_power_tt_5:0 "Improved §YPopular Power§!:\nConsumer Goods Factor: §Y-2.5%§!\nMonthly Population: §G+10%§!\n"
+ CTH_popular_power_tt_5:0 "Improved §YPopular Power§!:\nConsumer Goods Factor: §Y-5%§!\nMonthly Population: §G+10%§!\n"
  CTH_patrician_investments_unlocked_tt:0 "Unlocks §YPatrician Investments§! decisions.\n"
  CTH_clarify_loyalty_penalty:0 "Due to the faction already having §RVery High§! §YPower§!:\n"
  CTH_harmonization_tooltip:0 "The effects of this focus are based on choices made in previous focuses.\n"
@@ -3057,7 +3057,7 @@
  
  CTH_SCIENTIFID_TOOLTIP:0 "The scientific clique is a group of academics who have been an influential faction since Zamilcar Zarca came to power. During his reign, they acted as technocratic advisors, reforming education and importing the industrial revolution to Colthage. The clique's members, commonly known as Scientifids, are proponents of positivist scientific politics. This means they value order and progress above all else.\n\nEach level of §YPower§! provides the following modifiers:\n2% Research Speed\n2% Production Efficiency Cap"
  CTH_MILITARY_FACTION_TOOLTIP:0 "While much of the Colthaginian army was scattered to the wind by the Storm King, the old generals from Zamilcar's time remain in charge. In the chaos following the invasion, these generals were responsible for re-establishing order in Colthage. They became warlords who rule over their forces like decadent kings. Yet they are also fiercely patriotic, ready to fight against anything that threatens Colthage. Anything.\n\nEach level of §YPower§! provides the following modifiers:\n2% Organization\n2% Surrender Limit"
- CTH_LANDOWNERS_TOOLTIP:0 "The rich landowning aristocrats of Colthage are a fairly new faction, whose wealth is tied to the powers they were given during Zamilcar's reign. Traditionally landowners have not been influential in Colthage, with the mercantile patricians dominating the nation, but things have changed. Zamilcar rewarded those loyal to him with sizeable grants of land, while Scientifids consolidated rural property into large estates. This created a new, proud class of landlords who dominate their leaseholders and slaves.\n\nEach level of §YPower§! provides the following modifiers:\n0.1 Political Power Gain\n2% Consumer Goods Factor"
+ CTH_LANDOWNERS_TOOLTIP:0 "The rich landowning aristocrats of Colthage are a fairly new faction, whose wealth is tied to the powers they were given during Zamilcar's reign. Traditionally landowners have not been influential in Colthage, with the mercantile patricians dominating the nation, but things have changed. Zamilcar rewarded those loyal to him with sizeable grants of land, while Scientifids consolidated rural property into large estates. This created a new, proud class of landlords who dominate their leaseholders and slaves.\n\nEach level of §YPower§! provides the following modifiers:\n0.1 Political Power Gain\n4% Consumer Goods Factor"
  CTH_CONSTITUTIONALIST_TOOLTIP:0 "Constitutionalists have their roots in the establishment of the Colthaginian Republic almost two hundred years ago, when the ancient democratic constitution was restored and amended. But like other factions, they were formed during the reign of Zamilcar Zarca as an opposition to his dictatorial and oligarchic rule. Its members, many of whom are middle-class urbanites and patricians, seek to restore liberty and democracy to Colthage, but not necessarily bring about social and economic reforms.\n\nEach level of §YPower§! provides the following modifiers:\n10% Economy and Mobilization Law Cost"
  CTH_HARMONITES_TOOLTIP:0 "Harmonites are the youngest of all factions within Colthage and many still consider them to be a part of the constitutionalists. They are seen by some as radicals, influenced by foreign ideas from countries such as Hippogriffia and Equestria. They advocate for a welfare state where all zebras are equal. While the harmonites share the background of other constitutionalists, they have gained more popularity among the poor and downtrodden.\n\nEach level of §YPower§! provides the following modifiers:\n2.5% Stability Factor\n10% Trade Opinion Factor"
  CTH_LOYALTY_TOOLTIP:0 "§YFaction Loyalty§! represents a faction's relationship with the ruling government. Generally, if Loyalty drops below §Y50%§!, the Faction will become §RDisloyal§!. A loyal faction grants bonuses, while a disloyal faction gives maluses. Worst of all, a disloyal faction with high enough §YPower§! can launch a §RCoup§! to overthrow the government. The §GLandowners§! faction is an exception to this rule."
diff --git a/localisation/english/country_CTL_l_english.yml b/localisation/english/country_CTL_l_english.yml
index 2b25b061f9f..7484d3428d2 100644
--- a/localisation/english/country_CTL_l_english.yml
+++ b/localisation/english/country_CTL_l_english.yml
@@ -2585,17 +2585,17 @@ chital_news.6.c:0 "Capitalism in Hindia? Pathetic."
 
  CTL_benjen_wont_return:0 "§YHoversholm§! has repaid the friend who finally sent him into §Ggovernance.§!\n§YBenjen V§! will not return to Ostkranbi again."
 
- CTL_we_industry_now_tt:0 "Gains National Spirit §YBenjen IV Industrial Bureau§!, which grants (Consumer Goods Factor: §Y-1%§!, Political Power Gain: §R-15%§!, £prod_eff_cap  Production Efficiency Cap: §G+3.00%§!, Factory Output: §G+3.00%§!)"
+ CTL_we_industry_now_tt:0 "Gains National Spirit §YBenjen IV Industrial Bureau§!, which grants (Consumer Goods Factor: §Y-2%§!, Political Power Gain: §R-15%§!, £prod_eff_cap  Production Efficiency Cap: §G+3.00%§!, Factory Output: §G+3.00%§!)"
  CTL_baronnen_focus_tt:0 "Modify §YBenjen IV Industrial Bureau§! by\nPolitical Power Gain: §G+7.5%§!"
  CTL_kahnli_focus_tt:0 "Modify §YBenjen IV Industrial Bureau§! by\nPolitical Power Gain: §G+7.5%§!"
  CTL_manufacturing_focus_tt:0 "Modify §YBenjen IV Industrial Bureau§! by\nFactory Output: §G+7.00%§!"
  CTL_resources_focus_tt:0 "Modify §YBenjen IV Industrial Bureau§! by\nConstruction Speed: §G+7.00%§!"
- CTL_free_market_focus_tt:0 "Modify §YBenjen IV Industrial Bureau§! by\nConsumer Goods Factories: §Y-4%§!\n£prod_eff_cap  Production Efficiency Cap: §R-6.00%§!"
- CTL_minimum_wage_focus_tt:0 "Modify §YBenjen IV Industrial Bureau§! by \nConsumer Goods Factories: §Y+3%§!\n£prod_eff_cap  Production Efficiency Cap: §G+10.00%§!"
- CTL_trade_tt:0 "Modify §YBenjen IV Industrial Bureau§! by \nConsumer Goods Factories: §Y-3%§!"
+ CTL_free_market_focus_tt:0 "Modify §YBenjen IV Industrial Bureau§! by\nConsumer Goods Factories: §Y-8%§!\n£prod_eff_cap  Production Efficiency Cap: §R-6.00%§!"
+ CTL_minimum_wage_focus_tt:0 "Modify §YBenjen IV Industrial Bureau§! by \nConsumer Goods Factories: §Y+6%§!\n£prod_eff_cap  Production Efficiency Cap: §G+10.00%§!"
+ CTL_trade_tt:0 "Modify §YBenjen IV Industrial Bureau§! by \nConsumer Goods Factories: §Y-6%§!"
  CTL_labour_unions_tt:0 "Modify §YBenjen IV Industrial Bureau§! by\n£prod_eff_cap  Production Efficiency Cap: §G+7.00%§!\nPolitical Power Gain: §G+10%§!"
  CTL_crush_the_movement_tt:0 "Modify §YBenjen IV Industrial Bureau§! by\nFactory Output: §G+7.00%§!\nPolitical Power Gain: §G+10%§!"
- CTL_employers_first_tt:0 "Modify §YBenjen IV Industrial Bureau§! by\nConsumer Goods Factories: §Y-3%§!\nPolitical Power Gain: §G+10%§!"
+ CTL_employers_first_tt:0 "Modify §YBenjen IV Industrial Bureau§! by\nConsumer Goods Factories: §Y-6%§!\nPolitical Power Gain: §G+10%§!"
  
  CTL_brienna_focus_tt:0 "Modify §YBrienna I Kudlinen§! by\nDaily Support for Unaligned: §G+0.02§!\nStability: §G+10.00%§!"
  
diff --git a/localisation/english/country_CVA_l_english.yml b/localisation/english/country_CVA_l_english.yml
index 1edc36c60d3..ba99bdcb212 100644
--- a/localisation/english/country_CVA_l_english.yml
+++ b/localisation/english/country_CVA_l_english.yml
@@ -2274,12 +2274,12 @@ CVA_CTH_different_bonuses_16_tp:0 "§GCompleting§! this §Cfocus§! will provid
 CVA_CTH_different_bonuses_17_tp:0 "§GCompleting§! this §Cfocus§! will provide us with additional §Gbonuses§! depending on which §YFaction§! is the most dominant within the §CNUF§!:\n\n - £evolutionary §REvolutionary§! dominance will provide us with an additional £civ_factory §YIndustrial Complex§!\n - £orthodox §POrthodox Zeirutist§! dominance will provide us with additional §Y12§! £decision_aluminium_texticon §YAluminium§! in §YZebinop§!\n - £pragmatist §gPragmatist§! dominance will provide us with an additional £mil_factory §YArms Factory§!\n\n"
 CVA_CTH_different_bonuses_18_tp:0 "§GCompleting§! this §Cfocus§! will provide us with a different §YNational Spirit§! depending on which §YFaction§! is the most dominant within the §CNUF§!:\n\n - £evolutionary §REvolutionary§! dominance will provide:\n      §YZonician Special Forces Command -§! £evolutionary §REvolutionary§!, which grants (Special Forces Defense: §G+10.0%§!, Special Forces Capacity Multiplier: §G+5.0%§!, Weekly £evolutionary §REvolutionary§! political influence gain: §G0.10%§!, Weekly £orthodox §POrthodox Zeirutist§! political influence loss: §R0.05%§!, Weekly £pragmatist §gPragmatist§! political influence loss: §R0.05%§!)\n\n - £orthodox §POrthodox Zeirutist§! dominance will provide:\n      §YZonician Special Forces Command -§! £orthodox §POrthodox§!, which grants (Special Forces Defense: §G+5.0%§!, Special Forces Attack: §G+5.0%§!, Special Forces Capacity Multiplier: §G+10.0%§!, Weekly £evolutionary §REvolutionary§! political influence loss: §R0.05%§!, Weekly £orthodox §POrthodox Zeirutist§! political influence gain: §G0.10%§!, Weekly £pragmatist §gPragmatist§! political influence loss: §R0.05%§!)\n\n - £pragmatist §gPragmatist§! dominance will provide:\n      §YZonician Special Forces Command -§! £pragmatist §gPragmatist§!, which grants (Special Forces Attack: §G+10.0%§!, Special Forces Capacity Multiplier: §G+5.0%§!, Weekly £evolutionary §REvolutionary§! political influence loss: §R0.05%§!, Weekly £orthodox §POrthodox Zeirutist§! political influence loss: §R0.05%§!, Weekly £pragmatist §gPragmatist§! political influence gain: §G0.10%§!)\n\n"
 CVA_CTH_different_bonuses_19_tp:0 "§GCompleting§! this §Cfocus§! will provide us with different §Gbonuses§! depending on which §YFaction§! is the most dominant within the §CNUF§!:\n\n - £evolutionary §REvolutionary§! dominance will provide:\n       Gain Base War Support: §G+5.00%§!\n       Political Power: §G+50§!\n - £orthodox §POrthodox Zeirutist§! dominance will provide:\n       Gain Base Stability: §G+3.00%§!\n       Gain Base War Support: §G+3.00%§!\n       Political Power: §G+30§!\n - £pragmatist §gPragmatist§! dominance will provide: \n       Gain Base Stability: §G+5.00%§!\n       Political Power: §G+50§!\n\n"
-CVA_CTH_different_bonuses_20_tp:0 "While modifying the §YSocialised Public Utilities§! National Spirit through various §Cfocuses§! the spirit will receive different bonuses and maluses depending on which §YFaction§! within the §CNUF§! is dominant when the §Cfocus§! is completed:\n\n - £evolutionary §REvolutionary§! dominance will provide:\n      Weekly Stability: §G+0.10%§!\n      Consumer Goods: §Y+0.5%§!\n      Monthly Population: §R-5%§!\n - £orthodox §POrthodox Zeirutist§! dominance will provide:\n      Weekly Stability: §R-0.05%§!\n      Consumer Goods: §Y+0.5%§!\n      Monthly Population: §G10%§!\n - £pragmatist §gPragmatist§! dominance will provide:\n      Weekly Stability: §R-0.05%§!\n      Consumer Goods: §Y-1.0%§!\n      Monthly Population: §R-5%§!\n\nAdditionally each time the §YNational Spirit§! is upgraded our Political Power Gain gained through it shall increase by §G2.5%§!\n\n"
-CVA_CTH_different_bonuses_21_tp:0 "§GCompleting§! this §Cfocus§! will grant us the §YSocialised Public Utilities§! National Spirit. While modifying the National Spirit through various §Cfocuses§! the spirit will receive different bonuses and maluses depending on which §YFaction§! within the §CNUF§! is dominant when the §Cfocus§! is completed:\n\n - £evolutionary §REvolutionary§! dominance will provide:\n      Weekly Stability: §G+0.10%§!\n      Consumer Goods: §Y+0.5%§!\n      Monthly Population: §R-5%§!\n - £orthodox §POrthodox Zeirutist§! dominance will provide:\n      Weekly Stability: §R-0.05%§!\n      Consumer Goods: §Y+0.5%§!\n      Monthly Population: §G10%§!\n - £pragmatist §gPragmatist§! dominance will provide:\n      Weekly Stability: §R-0.05%§!\n      Consumer Goods: §Y-1.0%§!\n      Monthly Population: §R-5%§!\n\nAdditionally each time the §YNational Spirit§! is upgraded our Political Power Gain gained through it shall increase by §G2.5%§!\n\n"
+CVA_CTH_different_bonuses_20_tp:0 "While modifying the §YSocialised Public Utilities§! National Spirit through various §Cfocuses§! the spirit will receive different bonuses and maluses depending on which §YFaction§! within the §CNUF§! is dominant when the §Cfocus§! is completed:\n\n - £evolutionary §REvolutionary§! dominance will provide:\n      Weekly Stability: §G+0.10%§!\n      Consumer Goods: §Y+1§!\n      Monthly Population: §R-5%§!\n - £orthodox §POrthodox Zeirutist§! dominance will provide:\n      Weekly Stability: §R-0.05%§!\n      Consumer Goods: §Y+1%§!\n      Monthly Population: §G10%§!\n - £pragmatist §gPragmatist§! dominance will provide:\n      Weekly Stability: §R-0.05%§!\n      Consumer Goods: §Y-2.0%§!\n      Monthly Population: §R-5%§!\n\nAdditionally each time the §YNational Spirit§! is upgraded our Political Power Gain gained through it shall increase by §G2.5%§!\n\n"
+CVA_CTH_different_bonuses_21_tp:0 "§GCompleting§! this §Cfocus§! will grant us the §YSocialised Public Utilities§! National Spirit. While modifying the National Spirit through various §Cfocuses§! the spirit will receive different bonuses and maluses depending on which §YFaction§! within the §CNUF§! is dominant when the §Cfocus§! is completed:\n\n - £evolutionary §REvolutionary§! dominance will provide:\n      Weekly Stability: §G+0.10%§!\n      Consumer Goods: §Y+1%§!\n      Monthly Population: §R-5%§!\n - £orthodox §POrthodox Zeirutist§! dominance will provide:\n      Weekly Stability: §R-0.05%§!\n      Consumer Goods: §Y+1%§!\n      Monthly Population: §G10%§!\n - £pragmatist §gPragmatist§! dominance will provide:\n      Weekly Stability: §R-0.05%§!\n      Consumer Goods: §Y-2.0%§!\n      Monthly Population: §R-5%§!\n\nAdditionally each time the §YNational Spirit§! is upgraded our Political Power Gain gained through it shall increase by §G2.5%§!\n\n"
 CVA_CTH_different_bonuses_22_tp:0 "§GCompleting§! this §Cfocus§! will provide us with different §Gbonuses§! depending on which §YFaction§! is the most dominant within the §CNUF§!:\n\n - £evolutionary §REvolutionary§! dominance will provide:\n      Political Power: §G+50§!\n      Every owned and controlled core state:\n            Ponypower: §G+20000§!\n - £orthodox §POrthodox Zeirutist§! dominance will provide:\n      Every owned and controlled core state:\n            Add §G1§! Building Slot\n            Ponypower: §G+10000§!\n - £pragmatist §gPragmatist§! dominance will provide:\n      Gain Base Stability: §G+5.00%§!\n      Every owned and controlled core state:\n            Add §G2§! Building Slot\n\n"
 CVA_CTH_different_bonuses_23_tp:0 "§GCompleting§! this §Cfocus§! will provide us with a different §YNational Spirit§! depending on which §YFaction§! is the most dominant within the §CNUF§!:\n\n - £evolutionary §REvolutionary§! dominance will provide:\n      §YRatifying The Constitution -§! £evolutionary §REvolutionary§!, which grants (Weekly War Support: §G+0.50%§!, Daily Communism Support: §G+0.05§!, Weekly £evolutionary §REvolutionary§! political influence gain: §G0.80%§!, Weekly £orthodox §POrthodox Zeirutist§! political influence loss: §R0.40%§!, Weekly £pragmatist §gPragmatist§! political influence loss: §R0.40%§!) for §Y90§! days\n\n - £orthodox §POrthodox Zeirutist§! dominance will provide:\n      §YRatifying The Constitution -§! £orthodox §POrthodox§!, which grants (Political Power Gain: §G+15%§!, Daily Harmony Support: §G+0.05§!, Weekly £evolutionary §REvolutionary§! political influence loss: §R0.40%§!, Weekly £orthodox §POrthodox Zeirutist§! political influence gain: §G0.80%§!, Weekly £pragmatist §gPragmatist§! political influence loss: §R0.40%§!) for §Y90§! days\n\n - £pragmatist §gPragmatist§! dominance will provide:\n      §YRatifying The Constitution -§! £pragmatist §gPragmatist§!, which grants (Weekly Stability: §G+0.50%§!, Daily Support for Unaligned: §G+0.05§!, Weekly £evolutionary §REvolutionary§! political influence loss: §R0.40%§!, Weekly £orthodox §POrthodox Zeirutist§! political influence loss: §R0.40%§!, Weekly £pragmatist §gPragmatist§! political influence gain: §G0.80%§!) for §Y90§! days\n\n"
-CVA_CTH_different_bonuses_24_tp:0 "§GCompleting§! this §Cfocus§! will grant us the §YDecentralized Economic Planning§! National Spirit. While modifying the National Spirit through various §Cfocuses§! the spirit will receive different bonuses and maluses depending on which §YFaction§! within the §CNUF§! is dominant when the §Cfocus§! is completed:\n\n - £evolutionary §REvolutionary§! dominance will provide:\n      Factory Output: §G+2.50%§!\n      Construction Speed: §R-2.00%§!\n      £prod_eff Production Efficiency Growth: §R-2.00%§!\n - £orthodox §POrthodox Zeirutist§! dominance will provide:\n      Factory Output: §R-2.00%§!\n      Construction Speed: §G+2.50%§!\n      £prod_eff Production Efficiency Growth: §R-2.00%§!\n - £pragmatist §gPragmatist§! dominance will provide:\n      Factory Output: §R-2.00%§!\n      Construction Speed: §R-2.00%§!\n      £prod_eff Production Efficiency Growth: §G+2.50%§!\n\nAdditionally each time the §YNational Spirit§! is upgraded our Consumer Goods Factor gained through it shall decrease by §Y-1.0%§!\n\n"
-CVA_CTH_different_bonuses_25_tp:0 "While modifying the §YDecentralized Economic Planning§! National Spirit through various §Cfocuses§! the spirit will receive different bonuses and maluses depending on which §YFaction§! within the §CNUF§! is dominant when the §Cfocus§! is completed:\n\n - £evolutionary §REvolutionary§! dominance will provide:\n      Factory Output: §G+2.50%§!\n      Construction Speed: §R-2.00%§!\n      £prod_eff Production Efficiency Growth: §R-2.00%§!\n - £orthodox §POrthodox Zeirutist§! dominance will provide:\n      Factory Output: §R-2.00%§!\n      Construction Speed: §G+2.50%§!\n      £prod_eff Production Efficiency Growth: §R-2.00%§!\n - £pragmatist §gPragmatist§! dominance will provide:\n      Factory Output: §R-2.00%§!\n      Construction Speed: §R-2.00%§!\n      £prod_eff Production Efficiency Growth: §G+2.50%§!\n\nAdditionally each time the §YNational Spirit§! is upgraded our Consumer Goods Factor gained through it shall decrease by §Y-1.0%§!"
+CVA_CTH_different_bonuses_24_tp:0 "§GCompleting§! this §Cfocus§! will grant us the §YDecentralized Economic Planning§! National Spirit. While modifying the National Spirit through various §Cfocuses§! the spirit will receive different bonuses and maluses depending on which §YFaction§! within the §CNUF§! is dominant when the §Cfocus§! is completed:\n\n - £evolutionary §REvolutionary§! dominance will provide:\n      Factory Output: §G+2.50%§!\n      Construction Speed: §R-2.00%§!\n      £prod_eff Production Efficiency Growth: §R-2.00%§!\n - £orthodox §POrthodox Zeirutist§! dominance will provide:\n      Factory Output: §R-2.00%§!\n      Construction Speed: §G+2.50%§!\n      £prod_eff Production Efficiency Growth: §R-2.00%§!\n - £pragmatist §gPragmatist§! dominance will provide:\n      Factory Output: §R-2.00%§!\n      Construction Speed: §R-2.00%§!\n      £prod_eff Production Efficiency Growth: §G+2.50%§!\n\nAdditionally each time the §YNational Spirit§! is upgraded our Consumer Goods Factor gained through it shall decrease by §Y-2.0%§!\n\n"
+CVA_CTH_different_bonuses_25_tp:0 "While modifying the §YDecentralized Economic Planning§! National Spirit through various §Cfocuses§! the spirit will receive different bonuses and maluses depending on which §YFaction§! within the §CNUF§! is dominant when the §Cfocus§! is completed:\n\n - £evolutionary §REvolutionary§! dominance will provide:\n      Factory Output: §G+2.50%§!\n      Construction Speed: §R-2.00%§!\n      £prod_eff Production Efficiency Growth: §R-2.00%§!\n - £orthodox §POrthodox Zeirutist§! dominance will provide:\n      Factory Output: §R-2.00%§!\n      Construction Speed: §G+2.50%§!\n      £prod_eff Production Efficiency Growth: §R-2.00%§!\n - £pragmatist §gPragmatist§! dominance will provide:\n      Factory Output: §R-2.00%§!\n      Construction Speed: §R-2.00%§!\n      £prod_eff Production Efficiency Growth: §G+2.50%§!\n\nAdditionally each time the §YNational Spirit§! is upgraded our Consumer Goods Factor gained through it shall decrease by §Y-2.0%§!"
 CVA_CTH_full_oob_tp:0 "§GCompleting§! this §Cfocus§! will grant us §Y100%§! of §gColthage§!'s original §YStarting Army§!\n\n"
 CVA_CTH_half_oob_tp:0 "§GCompleting§! this §Cfocus§! will grant us §Y50%§! of §gColthage§!'s original §YStarting Army§!\n\n"
 CVA_CTH_crystalized_military_policy_tp:0 "Our §YMilitary Policy§! has been §OCrystalised§!"
diff --git a/localisation/english/country_FEA_l_english.yml b/localisation/english/country_FEA_l_english.yml
index 92e2a047648..fd5ff97a637 100644
--- a/localisation/english/country_FEA_l_english.yml
+++ b/localisation/english/country_FEA_l_english.yml
@@ -1505,6 +1505,7 @@ FEA_alliance_desc:0 "We cannot stand alone against the Empire. If we do not coop
 feat_company_1:0 "Artillerie-Werken"
 feat_company_2:0 "Rottendedam Arsenaal"
 feat_company_3:0 "Verweer Arsenaal"
+feat_company_2_and_3:0 "Rottendedam-Verweer Arsenaal"
 feat_company_4:0 "dVAF"
 feat_company_5:0 "Hertogelijke Schelp"
 feat_company_6:0 "Eimuiden Hoogovens"
diff --git a/localisation/english/country_FRN_l_english.yml b/localisation/english/country_FRN_l_english.yml
index d1c86891c87..e2e0678ef52 100644
--- a/localisation/english/country_FRN_l_english.yml
+++ b/localisation/english/country_FRN_l_english.yml
@@ -1342,7 +1342,7 @@
  FRN_unconditional_oob:0 "Three 20-width §Yinfantry divisions§! will appear in Pulcino.\n"
  FRN_unlock_deurbanization_decisions:0 "Unlocks §YDeurbanization§! missions which activate when you finish coring Talouse, Wingbardy and Falcor.\n"
  RULE_ALLOW_RELEASE_NATIONS_NOT_TARRIN_TOOLTIP:0 "Francistria is not allowed to release Tarrin.\n"
- FRN_increase_order_thrift:0 "§YIncreases§! Order §GThrift§!\nConsumer Goods Factories: §Y-2.5%§!\nFactory Output: §G+5.00%§!\nConstruction Speed: §G+5.00%§!\nResource Gain: §G+5.00%§!"
+ FRN_increase_order_thrift:0 "§YIncreases§! Order §GThrift§!\nConsumer Goods Factories: §Y-5%§!\nFactory Output: §G+5.00%§!\nConstruction Speed: §G+5.00%§!\nResource Gain: §G+5.00%§!"
  FRN_increase_order_militancy:0 "§YIncreases§! Order §RMilitancy§!\nTraining Time: §Y-5%§!\nRecruitable Population: §G+5.00%§!\nArmy Experience Gain: §G+5.00%§!\nWar Support: §G+5.00%§!"
  FRN_vincenzo_stats_tp:0 "§RAttack Skill§!: §Y3§!\n§YDefense Skill§!: §Y1§!\n§GPlanning Skill§!: §Y3§!\n§CLogistics Skill§!: §Y1§!\n\n"
  FRN_fabrizio_stats_tp:0 "§RAttack Skill§!: §Y1§!\n§YDefense Skill§!: §Y3§!\n§GPlanning Skill§!: §Y1§!\n§CLogistics Skill§!: §Y3§!\n\n"
diff --git a/localisation/english/country_GRI_aprilfool_l_english.yml b/localisation/english/country_GRI_aprilfool_l_english.yml
index 624d0ff050c..80b87b0449c 100644
--- a/localisation/english/country_GRI_aprilfool_l_english.yml
+++ b/localisation/english/country_GRI_aprilfool_l_english.yml
@@ -962,7 +962,7 @@ GRI_AF_an_industry_transformed_desc:0 "The old Empire's industry has been transf
  GRI_AF_in_the_lands_of_the_loyal_tt:0 "Add §YPillars of the Imperium§!, which grants\nWar Support: §G+10.00%§!"
  GRI_AF_all_teh_sons_of_the_empire_tt: "Modify §YPillars of the Imperium§! by\nFactory Output: §G+10.00%§!\nStability: §G+20.00%§!"
  GRI_AF_marshall_the_troops_tt:0 "Modify §YPillars of the Imperium§! by \nStability:  §G+20.00%§!"
- GRI_AF_unto_itself_tt:0 "Modify §YPillars of the Imperium§! by\nConsumer Goods Factories: §Y-5.00%§!"
+ GRI_AF_unto_itself_tt:0 "Modify §YPillars of the Imperium§! by\nConsumer Goods Factories: §Y-10.00%§!"
  GRI_AF_and_their_inventions_tt:0 "Modify §YPillars of the Imperium§! by\nResearch Speed: §G+5.00%§!"
  GRI_AF_the_traitor_general_tt:0 "Modify §YPillars of the Imperium§! by\nWar Penalty Stability Modifier : §G50.00%§!"
  GRI_AF_the_winds_of_boreas_tt:0 "Modify §YPillars of the Imperium§! by\nConstruction Speed : §G+10.00%§!"
diff --git a/localisation/english/country_HEL_l_english.yml b/localisation/english/country_HEL_l_english.yml
index 3e3bc5141e2..7134be9bb02 100644
--- a/localisation/english/country_HEL_l_english.yml
+++ b/localisation/english/country_HEL_l_english.yml
@@ -1627,7 +1627,7 @@ adelart.231.d:0 ""What in Eyr’s name are you all doing here?!" A shrill voice
 adelart.231.a:0 ""FIRE!""
 
 adelart.18.t:0 "A Ceremony Long Overdue" 
-adelart.18.d:0 "The church was beautiful, or at least it had been. The halls were packed with hopeful Greifwaldians, worried Adelartians and cautious optimists. Throughout the church, who’s markings had been changed twice over its long service, the air of unease was dampened by a guilty feeling of celebration.\n\nMany who would have laid their lives down for Merlock’s cause only a few months ago stood close to the exit, their worries keeping them from sitting in the lines of pews. They would be the first to witness their new Sheriff as he entered through a pair of ornate doors.\n\nJean wore a surprisingly fancy suit, which stood at odds against his normal dishevelled look, and walked with a confidence that had been unseen for two decades. At his side was his loyal stalwart, Lady Adalgisel vun Kurg, wearing a more decorated version of her own uniform. Just out of Jean’s sight, she held a slight blush and carried herself with nobility.\n\nBy the altar stood a squat little griffon, the mayor of Eagleton, visibly shaking but holding a ceremonial sword. He was flanked by two of Jean’s stalwarts, and jumped every time one of them moved. He froze when Jean stepped before him, and readied the blunted sword as he knelt before him.\n\n"W-with the power vested in me, by Eyr-" The mayor gulped, and rereadied the sword. "By the t-trinity. I grant you the title of Sheriff of Adelart, J-Jean de nottemagne. May your reign be glorious and your protection a-absolute." He tapped Jean’s shoulders with the blade, and shrunk back as Adelart’s officially accepted Sheriff stood tall."
+adelart.18.d:0 "The church was beautiful, or at least it had been. The halls were packed with hopeful Greifwaldians, worried Adelartians and cautious optimists. Throughout the church, who’s markings had been changed twice over its long service, the air of unease was dampened by a guilty feeling of celebration.\n\nMany who would have laid their lives down for Merlock’s cause only a few months ago stood close to the exit, their worries keeping them from sitting in the lines of pews. They would be the first to witness their new Sheriff as he entered through a pair of ornate doors.\n\nJean wore a surprisingly fancy suit, which stood at odds against his normal dishevelled look, and walked with a confidence that had been unseen for two decades. At his side was his loyal stalwart, Lady Adalgisel vun Kurg, wearing a more decorated version of her own uniform. Just out of Jean’s sight, she held a slight blush and carried herself with nobility.\n\nBy the altar stood a squat little griffon, the mayor of Eagleton, visibly shaking but holding a ceremonial sword. He was flanked by two of Jean’s stalwarts, and jumped every time one of them moved. He froze when Jean stepped before him, and readied the blunted sword as he knelt before him.\n\n"W-with the power vested in me, by Eyr-" The mayor gulped, and rereadied the sword. "By the t-trinity. I grant you the title of Sheriff of Adelart, J-Jean de Nottemagne. May your reign be glorious and your protection a-absolute." He tapped Jean’s shoulders with the blade, and shrunk back as Adelart’s officially accepted Sheriff stood tall."
 adelart.18.a:0 "A decades long wrong finally righted."
 
 # Popular Help Succeeds
diff --git a/localisation/english/country_HIE_l_english.yml b/localisation/english/country_HIE_l_english.yml
index 57294dc51c7..ea6085f476b 100644
--- a/localisation/english/country_HIE_l_english.yml
+++ b/localisation/english/country_HIE_l_english.yml
@@ -718,11 +718,11 @@ HIE_CTH_economic_projects_unlocked_tp: "§GCompleting§! this §Cfocus§! will u
 HIE_CTH_economic_projects_unlocked_2_tp: "§GCompleting§! this §Cfocus§! will unlock £decision_icon_small §Cdecisions§! which will allow us to embark upon various §YEcological Projects§! across the §rAscendancy§!\n\n"
 HIE_CTH_economic_projects_unlocked_3_tp: "§GCompleting§! this §Cfocus§! will unlock £decision_icon_small §Cdecisions§! which will allow us to transmute the various §YResource Deposits§! across the §rAscendancy§!\n\n"
 HIE_CTH_agrarian_variants_tp: "§GCompleting§! this §Cfocus§! will provide us with the §YThe Agrarian Ideal§! national spirit which will, depending on which strain of §YEconomic Thought§! is the most dominant within the §rAscendancy§!, provide us with different modifiers:\n\n - £faction_tur_kurdish §rZynskaite§! dominance will provide:\n      §YThe Agrarian Ideal§!, which grants (Resource Gain Efficiency: §G+10.00%§!, Monthly Population: §R-10.0%§!, Recruitable Population Factor: §G5%§!, Supply Consumption: §G-5.0%§!)\n\n - £civ_factory_output §rZidonite§! dominance will provide:\n      §YThe Agrarian Ideal§!, which grants (Monthly Population: §R-10.0%§!, Max Factories in a State §G+10%§!, Construction Speed: §G+10.00%§!, £prod_eff Production Efficiency Growth: §G+5.00%§!)\n\n"
-HIE_CTH_cosmopolitan_variants_tp: "§GCompleting§! this §Cfocus§! will provide us with the §YThe Artistry Of Cosmopolitanism§! national spirit which will, depending on which strain of §YEconomic Thought§! is the most dominant within the §rAscendancy§!, provide us with different modifiers:\n\n - £faction_tur_kurdish §rZynskaite§! dominance will provide:\n      §YThe Artistry Of Cosmopolitanism§!, which grants (Monthly Population: §R-10.0%§!, Factory Output: §G+5.00%§!, §YMilitary Factory§! construction speed: §G+10.00%§!)\n\n - £civ_factory_output §rZidonite§! dominance will provide:\n      §YThe Artistry Of Cosmopolitanism§!, which grants (Monthly Population: §R-10.0%§!, Consumer Goods Factories: §Y-2.5%§!, Research Speed: §G+2.50%§!, §YCivilian Factory§! construction speed: §G+10.00%§!)\n\n"
+HIE_CTH_cosmopolitan_variants_tp: "§GCompleting§! this §Cfocus§! will provide us with the §YThe Artistry Of Cosmopolitanism§! national spirit which will, depending on which strain of §YEconomic Thought§! is the most dominant within the §rAscendancy§!, provide us with different modifiers:\n\n - £faction_tur_kurdish §rZynskaite§! dominance will provide:\n      §YThe Artistry Of Cosmopolitanism§!, which grants (Monthly Population: §R-10.0%§!, Factory Output: §G+5.00%§!, §YMilitary Factory§! construction speed: §G+10.00%§!)\n\n - £civ_factory_output §rZidonite§! dominance will provide:\n      §YThe Artistry Of Cosmopolitanism§!, which grants (Monthly Population: §R-10.0%§!, Consumer Goods Factories: §Y-5%§!, Research Speed: §G+2.50%§!, §YCivilian Factory§! construction speed: §G+10.00%§!)\n\n"
 HIE_CTH_increase_agrarian_influence_1_tp: "£faction_tur_kurdish §rZynskaite§! influence will §Gincrease§! by §Yone§! level\n£civ_factory_output §rZidonite§! influence will §Rdecrease§! by §Yone§! level\n\n"
 HIE_CTH_increase_urbanite_influence_1_tp: "£faction_tur_kurdish §rZynskaite§! influence will §Rdecrease§! by §Yone§! level\n£civ_factory_output §rZidonite§! influence will §Gincrease§! by §Yone§! level\n\n"
 HIE_CTH_guilds_variants_tp: "§GCompleting§! this §Cfocus§! will provide us with the §YThe Guilds Of Old§! national spirit which will, depending on which strain of §YEconomic Thought§! is the most dominant within the §rAscendancy§!, provide us with different modifiers:\n\n - £faction_tur_kurdish §rZynskaite§! dominance will provide:\n      §YThe Guilds Of Old§!, which grants (£prod_eff_cap Production Efficiency Cap: §G+10.00%§!, Production Efficiency Base: §G+5.00%§!, Factory Output: §R-5.00%§!)\n\n - £civ_factory_output §rZidonite§! dominance will provide:\n      §YThe Guilds Of Old§!, which grants (£prod_eff Production Efficiency Growth: §G+10.00%§!, Lack of Resources Penalty: §G-10.00%§!, Factory Output: §R-5.00%§!)\n\n"
-HIE_CTH_the_caste_variants_tp: "§GCompleting§! this §Cfocus§! will provide us with the §YThe Castes Of Production§! national spirit which will, depending on which strain of §YEconomic Thought§! is the most dominant within the §rAscendancy§!, provide us with different modifiers:\n\n - £faction_tur_kurdish §rZynskaite§! dominance will provide:\n      §YThe Castes Of Production§!, which grants (Consumer Goods Factor: §Y-2.5%§!, Weekly Stability: §R-0.10%§!, Weekly War Support: §G+0.30%§!, £prod_eff Production Efficiency Growth: §R-10.00%§!, Factory Output: §G+5.00%§!)\n\n - £civ_factory_output §rZidonite§! dominance will provide:\n      §YThe Castes Of Production§!, which grants (Weekly Stability: §G+0.30%§!, Weekly War Support: §R-0.10%§!, £prod_eff Production Efficiency Growth: §R-10.00%§!, Factory Output: §G+10.00%§!)\n\n"
+HIE_CTH_the_caste_variants_tp: "§GCompleting§! this §Cfocus§! will provide us with the §YThe Castes Of Production§! national spirit which will, depending on which strain of §YEconomic Thought§! is the most dominant within the §rAscendancy§!, provide us with different modifiers:\n\n - £faction_tur_kurdish §rZynskaite§! dominance will provide:\n      §YThe Castes Of Production§!, which grants (Consumer Goods Factor: §Y-5%§!, Weekly Stability: §R-0.10%§!, Weekly War Support: §G+0.30%§!, £prod_eff Production Efficiency Growth: §R-10.00%§!, Factory Output: §G+5.00%§!)\n\n - £civ_factory_output §rZidonite§! dominance will provide:\n      §YThe Castes Of Production§!, which grants (Weekly Stability: §G+0.30%§!, Weekly War Support: §R-0.10%§!, £prod_eff Production Efficiency Growth: §R-10.00%§!, Factory Output: §G+10.00%§!)\n\n"
 HIE_CTH_agrarian_dominance_tp: "The £faction_tur_kurdish §rZynskaite§! branch of §YEconomic Thought§! is the most dominant within the §rAscendancy§!\n\n"
 HIE_CTH_urban_dominance_tp: "The £civ_factory_output §rZidonite§! branch of §YEconomic Thought§! is the most dominant within the §rAscendancy§!\n\n"
 HIE_CTH_artistic_dominance_tp: "The £counter_intelligence §rZumanite§! branch of §YPolitical Thought§! is the most dominant within the §rAscendancy§!\n\n"
@@ -764,6 +764,7 @@ HIE_CTH_owns_HIP_tp: "All of §YHippogriffia§!'s primary island is §Gowned§!
 HIE_CTH_star_father_speaks.tp: "The world shall §Yhear the voice§! of the §rStar Father§!.\n "
 HIE_BAT_interesting_consequences_tp: "§RAllying with the Ascendancy will disable the standard North Zebrican War mechanics. However, we will receive all of Zumidia, Warzena and Winggarden upon the war's conclusion.§!"
 HIE_CTH_apotheosis_tp: "§rApotheosis is at hoof!§!\n\n"
+HIE_CTH_post_apotheosis_tp: "\n§rMaybe the Guide can shed some light on what happened soon.§!"
 HIE_CTH_ending_tp: "§rAt least no one can claim I love griffons anymore. Thank you for playing the Star Father path to its conclusion, a lot of effort went into North Zebrica so I'd advise going back in time and trying something else. After all, who knows what sorts of thrilling stories and titillating twists you've yet to discover?\n\n- With kind regards, Cyrus (Lead Developer)\n\nSpecial thanks to those who worked really hard on this path:\nScars (GUI Developer)\nLilian (Writer)\nPodrick Equus (Writer)\nTiddo (GFX Artist)\n\nAnd thanks to all the others who contributed along the way.§!"
 
 ### Characters ###
@@ -1055,7 +1056,7 @@ HIE_magic_crystal_effects: "Makes the collection process of crystals from the §
 HIE_loyalty_effects: "Division Recovery Rate: §G+5§!\nDivision Organization: §R-5.00%§!"
 HIE_vespers_of_invincibility_effects: "Division Recovery Rate: §G15.00%§!\nDivision Strength: §R-10.00%§!"
 HIE_heartbreaker_effects: "Division Defense: §G+10.00%§!\nMonthly Population: §R-5.00%§!"
-HIE_kiss_effects: "Consumer Goods Factories: §Y-8.00%§!\nMonthly Population: §G+6.90%§!"
+HIE_kiss_effects: "Consumer Goods Factories: §Y-16.00%§!\nMonthly Population: §G+6.90%§!"
 HIE_stormcaller_effects: "Cold acclimatization gain factor: §G+10.00%§!\nBad Weather Penalty: §G-15.00%§!"
 
 ### ASPJ Events ###
diff --git a/localisation/english/country_HIP_l_english.yml b/localisation/english/country_HIP_l_english.yml
index 816f0eb12d6..c60b3dff385 100644
--- a/localisation/english/country_HIP_l_english.yml
+++ b/localisation/english/country_HIP_l_english.yml
@@ -9,7 +9,9 @@
  HIP_posada:0 "Posada"
  HIP_sky_beak:0 "Sky Beak"
  HIP_nimbus_cloudstriker:0 "Nimbus Cloudstriker"
- HIP_arcus_flamefeather:0 "Arcus Flamefeather"
+ HIP_arcus_flamefeather:0 "Arcus Firebrand"
+ HIP_arden_ironquill:0 "Arden Ironquill"
+ HIP_ulyssess:0 "Ulyssess"
  HIP_lucy_duskfeather:0 "Lucy Duskfeather"
  HIP_seaspray:0 "Seaspray"
  HIP_nobody:0 "Nobody"
@@ -6169,10 +6171,12 @@ HIP_jet_fighter_equipment_2_desc:0 ""Okay, I was wrong about jets. They're actua
  HIP_RAZORBEAK_DESC:0 "§YRank§!: Colonel\n\nA harsh and demanding officer, Colonel Razorbeak has spent most of her career as an instructor at Hippogriffia's military academies, attempting to weed out weakness among future officers. Her career peaked at colonel due to her controversial methods and alleged ties to far-right organizations, and she has made many enemies over the years. Still, the high command frequently calls upon her to lead strike forces when raw aggression and an iron will are needed to carry the day.\n\n§YPortrait By§!: Egil"
  HIP_SKY_BEAK_DESC:0 "§YRank§!: General\n\n§YPortrait By§!: Kessel"
  HIP_CLOUDSTRIKER_DESC:0 "§YRank§!: General\n\n§YPortrait By§!: Leo"
- HIP_ARCUS_DESC:0 "§YRank§!: Lieutenant General\n\n§YPortrait By§!: Echo"
+ HIP_ARCUS_DESC:0 "§YRank§!: Lieutenant General\n\n§YPortrait By§!: AdagioString"
+ HIP_ARDEN_DESC:0 "§YRank§!: Lieutenant General\n\n§YPortrait By§!: Kleowolfy"
+ HIP_ULYSSES_DESC:0 "§YRank§!: Major General\n\n§YPortrait By§!: Kleowolfy"
  HIP_COLD_DESC:0 "§YRank§!: Brigadier General\n\n§YPortrait By§!: Kam"
  HIP_FABER_DESC:0 "§YRank§!: Major General\n\n§YPortrait By§!: Printik"
- HIP_OCEAN_BREEZE_DESC:0 "§YRank§!: General\n\n§YPortrait By§!: Neither"
+ HIP_OCEAN_BREEZE_DESC:0 "§YRank§!: Lieutenant General\n\n§YPortrait By§!: Neither"
  HIP_SEASPRAY_DESC:0 "§YRank§!: Fleet Admiral\n\n§YPortrait By§!: Bunnyshrubby"
  HIP_TYPHOON_DESC:0 "§YRank§!: Admiral\n\n§YPortrait By§!: Tofkov"
  HIP_SKYBOLT_DESC:0 "§YRank§!: Rear Admiral\n\n§YPortrait By§!: Kaiser-Sauce"
@@ -6389,7 +6393,7 @@ HIP_jet_fighter_equipment_2_desc:0 ""Okay, I was wrong about jets. They're actua
  HIP_anarchist_society_3:0 "Modify §YAnarchist Society§! by\nResearch Speed: §G+15%§!"
  HIP_anarchist_society_4:0 "Modify §YAnarchist Society§! by\nStability: §R-10%§!\nResistance Target in our states occupied by the enemy: §G+10%§!\nResistance Decay Speed in our states occupied by the enemy: §G-10%§!\nResistance Growth Speed in our states occupied by the enemy: §G+10%§!\nCompliance Growth Speed in our states occupied by the enemy: §G-10%§!\nDamage to Enemy Garrisons in our states occupied by the enemy: §G+10%§!"
  HIP_anarchist_society_5:0 "Modify §YAnarchist Society§! by\nRecruitable Population: §Y+3.00%§!"
- HIP_anarchist_society_6:0 "Modify §YAnarchist Society§! by\nConsumer Goods Factories: §Y-5.00%§!"
+ HIP_anarchist_society_6:0 "Modify §YAnarchist Society§! by\nConsumer Goods Factories: §Y-10.00%§!"
  HIP_anarchist_society_7:0 "Modify §YAnarchist Society§! by\nWar Support: §G+100.00%§!"
  HIP_thank_you_for_playing_posada:0 "Thank you for playing §2Posada§!!"
 
@@ -6405,13 +6409,13 @@ HIP_jet_fighter_equipment_2_desc:0 ""Okay, I was wrong about jets. They're actua
  HIP_no_more_supercommunism:0 "Posada's plans have §tfailed§!...\n\n§tRemoves all beneficial national spirits from her part of the focus tree.§!"
  HIP_thermonuke_warning_tt:0 "§RWe are opening a box we may never close...§!"
 
- HIP_coalition_reconstruction_1:0 "Gains National Spirit §YReconstruction§!, which grants (Consumer Goods Factories: §Y+10.0%§!, §YInfrastructure§! construction speed: §G+25.00%§!, §YRailway§! construction speed: §G+25.00%§!)."
+ HIP_coalition_reconstruction_1:0 "Gains National Spirit §YReconstruction§!, which grants (Consumer Goods Factories: §Y+20.0%§!, §YInfrastructure§! construction speed: §G+25.00%§!, §YRailway§! construction speed: §G+25.00%§!)."
  HIP_coalition_reconstruction_2:0 "Modify §YReconstruction§! by\nProduction Efficiency Cap: §R-15%§!\nWeekly Stability: §G+1.00%§!"
  HIP_coalition_reconstruction_3:0 "Modify §YReconstruction§! by\nConstruction Speed: §G+15%§!\nFactory Repair Speed: §G+15%§!\nRecruitable Population Factor: §R-20.00%§!"
  HIP_coalition_reconstruction_4:0 "Modify §YReconstruction§! by\nTrade deal opinion factor: §Y+50.00%§!\nMax Factories in state: §G+15%§!\nWar Support: §R-10.00%§!"
  HIP_coalition_reconstruction_5:0 "Modify §YReconstruction§! by\nFactory Output: §G+10%§!\nDockyard Output: §G+10%§!"
  HIP_coalition_reconstruction_6:0 "Modify §YReconstruction§! by\nProduction Efficiency Cap: §G+10%§!\nResources to Market: §Y+20%§!"
- HIP_coalition_reconstruction_7:0 "Modify §YReconstruction§! by\nConsumer Goods Factories: §Y+5.0%§!\nDivision Defense on core territory: §G+20.0%§!\nMonthly Population: §G+20.0%§!"
+ HIP_coalition_reconstruction_7:0 "Modify §YReconstruction§! by\nConsumer Goods Factories: §Y+10.0%§!\nDivision Defense on core territory: §G+20.0%§!\nMonthly Population: §G+20.0%§!"
  HIP_coalition_reconstruction_8:0 "Modify §YReconstruction§! by\nResearch Speed: §G+7.00%§!"
 
 
@@ -6450,7 +6454,7 @@ HIP_jet_fighter_equipment_2_desc:0 ""Okay, I was wrong about jets. They're actua
  HIP_smile_assistance:0 "Stability: §G+10%§!\nDamage to Garrisons: §G-25%§!"
  HIP_ohs_assistance:0 "Foreign subversive activities efficiency: §G-15%§!\nSubversive activities cost: §G-25%§!"
  HIP_ohs_assistance_lar:0 "Counter intelligence: §G+0.75§!\nOwn operative detection factor: §G-25%§!"
- HIP_foreign_nationals_covered:0 "Consumer Goods: §Y-2%§!\nWar Support: §G+5%§!"
+ HIP_foreign_nationals_covered:0 "Consumer Goods: §Y-4%§!\nWar Support: §G+5%§!"
  HIP_anti_harmonic_terrorism:0 "Recruitable population factor: §G+5%§!\nWar Support: §G+5%§!\nGarrison Penetration Chance: §G-5%§!\nDaily Supremacy support: §G0.02%§!"
  HIP_defined_Harmony:0 "War Support: §G+5%§!"
  HIP_zumidian_volunteer_tooltip:0 "Three §Ydivisions§! of §Ysix infantry§! with §Yengineers§! and §Yrecon§! will be raised in §YAin Trotgourait§!."
diff --git a/localisation/english/country_KIR_l_english.yml b/localisation/english/country_KIR_l_english.yml
index c9b22944de0..c65c8810284 100644
--- a/localisation/english/country_KIR_l_english.yml
+++ b/localisation/english/country_KIR_l_english.yml
@@ -195,7 +195,7 @@ KIR_POST_6B_tt:0 "Enables the §YDefender of Harmony§! £decision_icon_small De
 KIR_guardian_of_zebrica:0 "Defender of Harmony"
 KIR_guardian_of_zebrica_desc:0 "[Root.GetNameDefCap], having successfully emerged from the §RSilence§!, is ready to assume the noble duty of defending §PHarmony§! in Zebrica. Kiria will marshal its vast industrial and military resources to ensure that §Rextremist forces§! will not threaten §PHarmony§! — the delicate balance between §COrder§! and §OChaos§! — on the continent."
 KIR_demand_disarmament:0 "Demand [FROM.GetAdjective] Disarmament"
-KIR_demand_disarmament_desc:0 "[FROM.GetAdjective] aggression has gone too far. Their ambitions are a threat to harmony, and we have a responsibility to rein them in to safeguard peace and liberty in Zebrica.\n\n§W§Y[FROM.GetNameDefCap]§! has met at least [?KIR.KIR_demand_disarmament_threshold|Y0] of our criteria to justify §Omilitary intervention§! against them:\n[FROM.GetKIRDemandDisarmamentReq]\n[FROM.GetKIRDemandDisarmamentReqA]\n[FROM.GetKIRDemandDisarmamentReqB]\n[FROM.GetKIRDemandDisarmamentReqH]\n[FROM.GetKIRDemandDisarmamentReqE]\n[FROM.GetKIRDemandDisarmamentReqF]\n[FROM.GetKIRDemandDisarmamentReqG]\n[FROM.GetKIRDemandDisarmamentReqC]\n[FROM.GetKIRDemandDisarmamentReqD]§!"
+KIR_demand_disarmament_desc:0 "[FROM.GetAdjective] aggression has gone too far. Their ambitions are a threat to harmony, and we have a responsibility to rein them in to safeguard peace and liberty in Zebrica.\n\n§W§Y[FROM.GetNameDefCap]§! has met at least [?KIR.KIR_demand_disarmament_threshold|Y0] of our criteria to justify §Omilitary intervention§! against them:\n[FROM.GetKIRDemandDisarmamentReq]\n[FROM.GetKIRDemandDisarmamentReqA]\n[FROM.GetKIRDemandDisarmamentReqB]\n[FROM.GetKIRDemandDisarmamentReqH]\n[FROM.GetKIRDemandDisarmamentReqE]\n[FROM.GetKIRDemandDisarmamentReqF]\n[FROM.GetKIRDemandDisarmamentReqG]\n[FROM.GetKIRDemandDisarmamentReqC]\n[FROM.GetKIRDemandDisarmamentReqD]\n[FROM.GetKIRDemandDisarmamentReqI]§!"
 reduce_army_size_KIR:0 "Comply with Kirian Disarmament"
 reduce_army_size_KIR_desc:0 "Tough negotiations with Kirian diplomats have resulted in a tight three month schedule for the partial disarmament and demobilisation of our military forces. Failure to comply will result in escalation; we must either commit to fulfilling our duties under the schedule, or use what time we have left to prepare for war with Kiria."
 reduce_army_size_KIR_req_tt:0 "The total amount of Frontline Battalions and Support Companies deployed in our Divisions ([?num_battalions|Y*0]) is §Oless than§! or §Oequal to§! ([?army_size_reduction_KIR|Y*0]). Battalions and Companies deployed in Garrisons are exempted from this calculation."
@@ -219,6 +219,8 @@ KIR_demand_disarmament_req_G_Y:0 "   £trigger_yes  Has a §Ylarger standing arm
 KIR_demand_disarmament_req_G_N:0 "   £trigger_no  Has a §Ylarger standing army§! than Kiria"
 KIR_demand_disarmament_req_H_Y:0 "   £trigger_yes  Is Brutally Oppressing another country"
 KIR_demand_disarmament_req_H_N:0 "   £trigger_no  Is Brutally Oppressing another country"
+KIR_demand_disarmament_req_I_Y:0 "   £trigger_yes  Is the §Yaggressor§! in a war against another country"
+KIR_demand_disarmament_req_I_N:0 "   £trigger_no  Is the §Yaggressor§! in a war against another country"
 
 KIR_POST_7:0 "Eight Golden Mayoralties"
 KIR_POST_7_desc:0 "The Eight Great Cities of Kiria are powerhouses of industry, commerce, and political influence, and each have unique needs that are difficult to address at the national level. Expansive autonomy under the new Mayoralty system will allow them to manage their local affairs and further uphold the principles of consociationalism."
@@ -281,7 +283,7 @@ KIR_POST_COM_X:0 "Apologise to Rising Sun"
 KIR_POST_COM_X_desc:0 "Rising Sun and the western kirin loyal to her were excluded from the Plenum at a critical juncture in Kiria's history. That was a mistake, and while it can never be fully fixed, we can at least begin to reconcile with the Rising Fire."
 KIR_POST_COM_1:0 "Give Us Our Daily Bread" #move up industry. welfare programme tt, prevents poverty
 KIR_POST_COM_1_desc:0 "Poverty in Kiria is extensive, exacerbated by the rapid movement of the peasant class to the cities. We must begin to address their needs, even if the process will be slow and expensive."
-KIR_POST_COM_1_tt:0 "We shall enact §Ywelfare programs§! to §Gassist the needy§! and combat §Rpoverty§!.\n\n"
+KIR_POST_COM_1_tt:0 "We shall enact §Ywelfare programs§! to §Gassist the needy§! and combat §Rpoverty§!.\n"
 KIR_POST_COM_2A:0 "For Land and Labour, Let's Fight Together!" ##one struggle, MWPK and peasants unity and LLL Synarchy
 KIR_POST_COM_2A_desc:0 "The needs of the urban and rural poor are distinct, but they are united by a common desire: better conditions for the working classes. As such, an alliance is brewing between the three largest left-wing parties in Kiria, unifying their disparate bases into a potent political bloc."
 KIR_POST_COM_2A_tt:0 "The §Yland§! and §Ylabour struggles§! shall §Gunite§!, and the §CProgressive movement§! shall stand in solidarity with them!\n\n§YAvailable§! as §CPolitical Synarchy§! between Provincial Diet and Mayoralty:\nThe §CLeague for Labour and Liberty§!, between the §YMovement for a Modern Kiria§! (§YProgress Bloc§!) and the §YAll-Kiria Union of Farmers and Peasants§! and the §YMarksist Workers' Party of Kiria§!."
@@ -559,7 +561,7 @@ KIR_PJD_SGUI_No_Democracy_desc:0 "The democratically elected Diet of this provin
 
 KIR_Balance_Modifier_Real:0 "The Balance of the Realm"
 KIR_Balance_Modifier:0 "The Balance of the Realm"
-KIR_Balance_Modifier_desc:0 ""
+KIR_Balance_Modifier_desc:0 "The Realm is held together by an intricate web of compromises, concessions, and consensus that hold in check Kiria's myriad contradictory and conflicting interests and ideologies. This delicate balance of power, and Autumn Blaze's framework of power sharing, must be upheld to ensure the unity of the Realm and its kirin."
 KIR_Balance_1_Modifier:0 "Number of §YProvincial Diets§!"
 KIR_Balance_1A_Modifier:0 "  - Number of §YProvincial Diets§! with a Ruling Party"
 KIR_Balance_1A_Alt_Modifier:0 "  - Number of §YProvincial Diets§! with a\n    Ruling Party"
@@ -1444,8 +1446,8 @@ KIR_republic_postwar_focus_20a_tt:0 "Three Motorized Units of the §YSupervised
 KIR_republic_postwar_focus_20b:0 "Campaign Against Foreign Infiltration"
 KIR_republic_postwar_focus_20b_desc:0 "Kiria will not be turned into a puppet, a mere pardoy of nations across the world. It is our task, and ours alone, to carry out the divine will of Concord. The Rising Fire has no need for the heresies of the rest of the world, and if it finds itself as the sole light surrounded by eternal darkness, our solution is not to change to fit in, but to burn ever brighter." ##One Rising Sun diary entry; danger of foreign Marksism. Kill them harder than we killed the NAKP.
 KIC_fire_above_all:0 "The Flame Above All"
-KIR_republic_postwar_focus_20c:0 "Internment Campaigns"
-KIR_republic_postwar_focus_20c_desc:0 "The kirin of Greater Providence despise us, not unfairly, as conquerers bent on eradicating their way of life, for it must go to make way for the better world that we have envisaged. That is why they resent us, and that is why they support the foreigners. And that is why we have interned them. They should be grateful for small mercies, for there are other ways to kill an insurgency that are less costly and arduous."
+KIR_republic_postwar_focus_20c:0 "Anti-Separatism Drive"
+KIR_republic_postwar_focus_20c_desc:0 "The kirin of Greater Providence despise us, not unfairly, as conquerers bent on eradicating their way of life, for it must go to make way for the better world that we have envisaged. That is why they resent us, and that is why they support the foreigners. And that is why we have locked them up. They should be grateful for small mercies, for there are other ways to kill an insurgency that are less costly and arduous."
 KIR_republic_postwar_focus_21:0 "The Grand Army of the Fraternal Republic"
 KIR_republic_postwar_focus_21_desc:0 "Though the Banners served The Rising Fire well in the righteous war, the march of progress does not hold the same loyalty. As such, the soldiers of the Banners must move forward from the past, and find themselves apart of a new, modern army that serves the realm above all." ##Completely abolish the Banner system. Replace it with a proper, secular, modern army that owes it allegiance to the Republic, not their individual banner. Separate from the Incarnadine Soldiery.
 KIR_republic_postwar_focus_22a:0 "Supply the Troops"
@@ -1482,7 +1484,7 @@ KIR_republic_postwar_focus_25a_desc:0 "Certain measure must be taken during a re
 KIR_republic_postwar_focus_26a:0 "Leaving the Nest"
 KIR_republic_postwar_focus_26a_desc:0 "Rising Sun has provided us with a future that is almost impossible to fully appreciate. Yet, no revolution is truly won by just one mare. As democracy washes over Kiria in a healing warmth, Rising Sun must step away from the burdens she bears. After so long, it is now her turn to enjoy the fruits of socialist revolution."
 KIR_republic_postwar_focus_27a:0 "Consolidation Deployments" ##buffs banner jurisdictions
-KIR_republic_postwar_focus_27a_desc:0 "A soldier is not an unthinking monster. Fear infects the hjeart of any soldier, as does love, as does happiness. We have asked much of our soldiers, tasks of incredible violence and destruction. We know their tenacity, their grit can be put to far more constructive uses."
+KIR_republic_postwar_focus_27a_desc:0 "A soldier is not an unthinking monster. Fear infects the heart of any soldier, as does love, as does happiness. We have asked much of our soldiers, tasks of incredible violence and destruction. We know their tenacity, their grit can be put to far more constructive uses."
 KIR_republic_postwar_focus_27a_tt:0 "Increases the Maximum Threshold for Modifiers from §YProspecting Bureau§! and §YProduction Brigade§! in §OBanner Jurisdictions§! by §G+10%§!, to a total of (§Y60%§!) and (§Y40%§!) respectively."
 KIR_republic_postwar_focus_28a:0 "Our Younger Sisters"
 KIR_republic_postwar_focus_28a_desc:0 "One wonders if the scars of the Great Silence could ever truly fade. Though, the question persists to Kiria on how to truly heal from them. Even now, Concord's subjects live divided among borders. Is it within our right to remedy this?"
@@ -1508,8 +1510,13 @@ KIR_republic_postwar_focus_Z_tt:0 "Unlocks £decision_icon_small Decisions to §
 
 KIR_republic_postwar_focus_XY:0 "Pacify the Zebras"
 KIR_republic_postwar_focus_XY_desc:0 "The world is a dangerous, unforgiving place. Even just beyond our borders, despots, slavers, tyrants and heretics rule with oppression over their realms. Concord has no limits. Neither shall we."
+KIR_republic_postwar_focus_XY_WG_tt:0 "Gains §YAnnex§! war goal against this country."
 KIR_republic_postwar_focus_XY_tt:0 "\nEnables §OBanner Jurisdictions§! in conquered §YZebluan§! and §YZongolese§! territories."
 
+KIR_republic_postwar_focus_ZY:0 "Pre-Emptive Strike"
+KIR_republic_postwar_focus_ZY_desc:0 "Kiria is harmed and imperiled by the traumas that have been wrought onto her. Our belligerent neighbours to the west, sensing weakness, will surely take advantage and come knocking sooner or later. If war is inevitable, then we would rather fight on their soil than ours."
+KIR_republic_postwar_focus_ZY_WG_tt:0 "Gains §YPuppet§! war goal against this country."
+
 KIR_republic_postwar_focus_24b:0 "A Lesson They'll Never Forget"
 KIR_republic_postwar_focus_24b_desc:0 "Our revolution will never have a shortage of enemies. Of its traitors, lurking in the shadows, whose hearts become corrupted by the heretical forces that are always assembled to crush the kirin people. We can never slacken. We can never falter. Our aims will be achieved, and if a mountain of corpses is the price, it won't be ours."
 KIR_republic_postwar_focus_25b:0 "Supremacy of the Matriarchate"
@@ -1532,12 +1539,6 @@ decision_cost_50_pp_manpower_25000_tooltip:0 "It costs [This.GetDecisionCostReal
 KIR_republic_postwar_focus_29b:0 "Guided Development"
 KIR_republic_postwar_focus_29b_desc:0 "The core of our life, is spirit. Concord brings to us all that we cherish and love, and we have her light to thank for everything we have. Thus, any heresies and contradictions to her divine rule are merely inventions of the reactionary to bring low Kirin society. Nothing comes before Concord, before the Rising Fire."
 
-KIC_concentration_camps:0 "Concentration Camps"
-KIC_concentration_camps_desc:0 "§Ldesc§!"
-KIC_concentration_camps_unlock_tt:0 "\nUnlocks the §YConcentration Camps§! occupation law:\nState Modifier:\n      Monthly Population: §R-40%§!\n      Required Garrisons: §R+40%§!\n      Local Ponypower: §R-20%§!\n      Local Resources: §R-20%§!\n      Local Factories: §R-20%§!\n      Intel to Enemies: §G-40%§!\n      Resistance Target: §G-40%§!\n      Resistance Decay Speed: §G+40%§!\n      Resistance Growth Speed: §G-40%§!\n      Garrison Penetration Chance: §G-20%§!\n      Damage to Garrisons: §G-20%§!\n\nState Modifier when Resistance is Suppressed:\n      Local Ponypower: §G+20%§!\n      Local Resources: §G+20%§!\n      Local Factories: §G+20%§!\n"
-
-KIR_concentration_camps_resistance_threshold:0 "The Average §RResistance§! of all [From.FROM.GetAdjective] core states under our control is above §Y50.0%§!."
-
 KIC_focus_consume_marepower_tt:0 "Because the §Ytechnological requirements§! for this focus have not been met, §Rtaking this focus will cost 40,000 Ponypower!§!\n\n"
 KIC_construction_boom:0 "Construction Boom"
 
@@ -2172,13 +2173,13 @@ kirin.200.d:0 "Protests and civil unrest have erupted in the province of [KIR_ST
 kirin.200.a:0 "Get [KIR_STATE_DIET_SUSPENDED_PROTESTS_TARGET.GetCapitalVictoryPointName] on the phone, now!"
 KIR_event_200_tt:0 "\nChoose a §YProvincial Ruling Party§! for [KIR_STATE_DIET_SUSPENDED_PROTESTS_TARGET.GetName] to remove the effects from §RSuspended Provincial Diet§!."
 
-kirin.201.t:0 "The Blessings Of Humility"
-kirin.201.d:0 "The Way of Fire is perhaps most famed for its ritual and splendour, temples wreathed in incense and mystics clothed in silk. But recently, a new order has been spotted in Vermilion, and temples in cities around the country are taking to their model. They eschew the rich embroidered silks of their rightful stations in the hierarchy and instead don simple initiates' robes of burlap and jute, and travel into Kiria's increasingly vast slums to provide alms for the urban poor. They bring carts loaded with rice, bread, and fish to give away, they assist however they can in clinics and hospitals, they care for and teach the children of working parents who would otherwise soon be caught up in the grim underbelly of the slums.\n\nThe rural poor have their fields, and if nothing else, the nation's forests to feed and clothe themselves from. The growing class of urban poor, crowded into unsanitary and unsafe slums, have nothing but what the day's wages can buy. Under the Silence, all kirin were poor but usually well-fed and content. Now the noveau riche's parties spill onto the streets in the richest districts while foals go hungry in the slums, and the government has proven so far unable to do much but promise things will improve. Already there is discontent at the living conditions of the working poor - and the specter of riots like those that forced the establishment of the Silence weighs heavily on the country.\n\nThe Way of Fire, however, and its pious believers, are ever bound to the will of Concord - and Concord does not will her children should suffer. And so the new Benevolent Associations continue to grow, pooling donations above and beyond the usual tithes to fund the actions of a small army of pious volunteers. For now, their compassion is the Realm's best defense against revolution."
-kirin.201.a:0 "If not for the charity of the kirin people, our Gallop would have stumbled."
+kirin.201.t:0 "Excess Rural Labor"
+kirin.201.d:0 "Wealth does not always bring prosperity.\n\nAcross Kiria, the industrial boom unleashed by the Grand Gallop Onward and the Realm's continued economic expansion has led to an almost unceasing tide of rural peasants leaving their lands and seeking higher-paying factory work in the cities. With agricultural mecahnization well underway at the same time, the Realm's food production is not threatened, but these rural kirin often fail to realize the truly precarious situation they are thrusting themselves into by seeking wage employement.\n\nWith no land to live on, or farm, Kiria's ballooning urban underclasses live a hoof-to-mouth existence, spending almost all of their meager daily wages to pay for a few bowls of white rice and a shantytown roof to sleep under. Unprepared to recieve this enormous influx of rural residents, the city governments have no choice but to allow vast slum districts to spring up around their cores - the only alternative is to make these kirin homeless.\n\nWith more hopefuls arriving every day and keeping wages at rock-bottom, the situation will only get worse if something is not done."
+kirin.201.a:0 "A regrettable reality of industrialization."
 
-kirin.202.t:0 "The Tide Will Rise, By Decree"
-kirin.202.d:0 "Strangely, after the Realm and Harmony Party's presentation to the Secretariat, not even the furthest right-wing parties had had much to say in opposition to the proposed Urban Reform And Assistance Act. What could they have said, when slide after slide, exhibit after exhibit, showed the abject poverty of the working class in the cities? The private charity workers who had documented these miseries testified for hours that even their best efforts were only blunting the impact of the Realm's increasing poverty.\n\nOnly the staunchest of partisans could look at images of hungry kirin crowded around soup kitchens and remain heartless - and even they recognized that starving, discontent urban masses are the allies of their Marksist rivals. In the end, the squabbling was over the precise details, not the spirit of the new law.\n\nIn Fragrance, the traders and the executives balked at their new tax bills, and there was much bluster about cancelling government contracts that never amounted to anything. In cities across the country, the government had to scramble to acquire warehouses and office buildings to adminster and deliver the new promises of aid to the urban poor. In the countryside, the farmers were more than happy to oblige the desperate government kirin willing to pay top-tael to buy up grain.\n\nIn the slums, however, as the new government measures kicked in, there was mostly just peace. Cheap bread and rice, sold at a steep loss, flooded the cities and filled hungry bellies. New schools kept children off of the unsafe streets. Within a few weeks, thousands of kirin were finding stable jobs building new homes to replace Kiria's sprawling shantytowns. It would take years to fully pull the slums out of poverty, but at least now, the government could not be accused of dragging its hooves."
-kirin.202.a:0 "A strained treasury is better than a guilty conscience."
+kirin.202.t:0 "It Is Said History Rhymes"
+kirin.202.d:0 "The poor farmers were promised a future gilt with the blessings of modernity, and they find themselves more tired, more hungry, and more anxious than they ever were under the Silence.\n\nEach day, the slums surrounding the Realm's industrial powerhouses swell with trainloads and caravans of migrants - the excess rural labor force made redundant by the increasing efficiency of Kiria's agriculture. And each day, the cracks in the foundation of the new, modern Kiria widen as these farmers find nothing but a crowded, filthy, impoverished life of dangerous factory work in the cities - for those who remain healthy enough to work.\n\nWhat began as a few isolated incidents of frustrated kirin going nirik in the slums - a crime usually euphemised as simply 'arson' - has swollen into a dangerous epidemic and a pattern of behavior that threatens the Realm. Hungry kirin, malcontent and radicalized, pin their anger onto many things - foreigners, the upper class, the Premier - and their rage simmers and smolders until something sets them off.\n\nThe Realm's police and fire departments are beginning to buckle under the strain. Sooner or later, if nothing is done, something will break, and then it will burn."
+kirin.202.a:0 "One is reminded why Noctilucent Charm decreed the Silence..."
 
 kirin.203.t:0 "The Maritime Mayoralties Act"
 kirin.203.d:0 "Hyacinth, Sycee, Jubilee, Jasmine, and Teak were far from the biggest cities in Kiria. They occupied a strange second-rate between the Eight Great Cities and the vast ocean of smaller towns and villages that made up the rest of the country. Big enough to deserve some influence, and small enough that they never actually seemed to get any. In the past few weeks, several delegates from these cities - referring to themselves as the Five Ports - had begun to stir up trouble with some procedural chicanery in the Morning Secretariat and the National Plenum, demanding to be respected. Autumn Blaze had called them to her office to resolve the matter.\n\n"We want to be taken seriously, Premier," the delegate from Hyacinth said, with four comrades crowded on the other side of Autumn's desk around her. "All the money, attention, and political capital gets sloshed around the big cities, but most kirin in the realm live in or near a towns like ours. And for several million kirin across the country, our ports are the easiest access to international markets for their goods, but all of the shipping regulations and infrastructure grants seem to be written as if Fragrance, Radiance, and Verdant are the only places a kirin is allowed to put a boat in water."\n\nBlaze frowned. "I understand your concern. I'm just not sure what you want me to do to help you. Do you have a specific plan?"\n\nThe delegate from Jasmine slid a packet of papers across the desk. "We want your help putting this in front of the Secretariat and the Plenum. It's a bill to create new Maritime Mayoralties that'll give our cities more local authority and help us serve the interests of the millions of kirin living in our hinterlands, too."\n\nBlaze skimmed the front page of the paper, and gulped."
@@ -2195,6 +2196,14 @@ kirin.205.d:0 "The expanding influence of the Kirian state has spread to the sea
 kirin.205.a:0 "Whether anything comes of it is now up to the Premier."
 KIR_event_205_tt:0 "Unlocks Focus: §YZebridean Naval Bases§!."
 
+kirin.206.t:0 "The Blessings Of Humility"
+kirin.206.d:0 "The Way of Fire is perhaps most famed for its ritual and splendour, temples wreathed in incense and mystics clothed in silk. But recently, a new order has been spotted in Vermilion, and temples in cities around the country are taking to their model. They eschew the rich embroidered silks of their rightful stations in the hierarchy and instead don simple initiates' robes of burlap and jute, and travel into Kiria's increasingly vast slums to provide alms for the urban poor. They bring carts loaded with rice, bread, and fish to give away, they assist however they can in clinics and hospitals, they care for and teach the children of working parents who would otherwise soon be caught up in the grim underbelly of the slums.\n\nThe rural poor have their fields, and if nothing else, the nation's forests to feed and clothe themselves from. The growing class of urban poor, crowded into unsanitary and unsafe slums, have nothing but what the day's wages can buy. Under the Silence, all kirin were poor but usually well-fed and content. Now the noveau riche's parties spill onto the streets in the richest districts while foals go hungry in the slums, and the government has proven so far unable to do much but promise things will improve. Already there is discontent at the living conditions of the working poor - and the specter of riots like those that forced the establishment of the Silence weighs heavily on the country.\n\nThe Way of Fire, however, and its pious believers, are ever bound to the will of Concord - and Concord does not will her children should suffer. And so the new Benevolent Associations continue to grow, pooling donations above and beyond the usual tithes to fund the actions of a small army of pious volunteers. For now, their compassion is the Realm's best defense against revolution."
+kirin.206.a:0 "If not for the charity of the kirin people, our Gallop would have stumbled."
+
+kirin.207.t:0 "The Tide Will Rise, By Decree"
+kirin.207.d:0 "Strangely, after the Realm and Harmony Party's presentation to the Secretariat, not even the furthest right-wing parties had had much to say in opposition to the proposed Urban Reform And Assistance Act. What could they have said, when slide after slide, exhibit after exhibit, showed the abject poverty of the working class in the cities? The private charity workers who had documented these miseries testified for hours that even their best efforts were only blunting the impact of the Realm's increasing poverty.\n\nOnly the staunchest of partisans could look at images of hungry kirin crowded around soup kitchens and remain heartless - and even they recognized that starving, discontent urban masses are the allies of their Marksist rivals. In the end, the squabbling was over the precise details, not the spirit of the new law.\n\nIn Fragrance, the traders and the executives balked at their new tax bills, and there was much bluster about cancelling government contracts that never amounted to anything. In cities across the country, the government had to scramble to acquire warehouses and office buildings to adminster and deliver the new promises of aid to the urban poor. In the countryside, the farmers were more than happy to oblige the desperate government kirin willing to pay top-tael to buy up grain.\n\nIn the slums, however, as the new government measures kicked in, there was mostly just peace. Cheap bread and rice, sold at a steep loss, flooded the cities and filled hungry bellies. New schools kept children off of the unsafe streets. Within a few weeks, thousands of kirin were finding stable jobs building new homes to replace Kiria's sprawling shantytowns. It would take years to fully pull the slums out of poverty, but at least now, the government could not be accused of dragging its hooves."
+kirin.207.a:0 "A strained treasury is better than a guilty conscience."
+
 kirin.300.t:0 "Amending the Party Charter"
 kirin.300.d:0 ""We are in a position where we're expected to play by the rules of the system we agreed to three and a half years ago." Cypress Snow looked to the other board members. The discussions around the NAKP's party charter had been ongoing for a good while, and as seemingly always was the case, he found himself at odds with Ardent Bloom. "I know that some of us find the Constitution stifling, but its principles are sound and offer stability. Going ahead, there is little sense in maintaining our military assets. They are a drain on our finances, and we have plenty of market opportunities without resorting to aggressive expansion. Disbanding them, disavowing aggressive expansionism and focusing on soft power efforts is completely in line with the current mode of the government, and will net us goodwill aplenty."\n\n"While I am in agreement that we should bring our charter in line with the constitution, it is not, will never be, and cannot be controversial to protect one's property." Dr. Ardent Bloom interjected. "Hamstringing our ability to protect our assets to make a show of enthusiastic compliance is a mistake. I am in favour of ceasing proactive expansionism, that much we can trade away, but our mandate is Kirian economic interests. If we hope to fulfil that, we have to ensure that we can protect our interests. There is nothing about recent global events that indicates that corporate pacifism will be the most efficient choice."\n\n"There is no discussion of pacifism here, we are talking about aggression, not security. If a situation has proven untenable enough that proactive military force is needed, then we should be divesting, not deploying. This is not extreme, this is standard operating procedure for companies across the world. Furthermore, the assets we free up will be available for other more peaceful ventures. Do we wish to invest in the future, or cling to an old money pit?" The looks from the other boardmembers turned more and more open to the idea, and Cypress Snow smiled."
 kirin.300.a:0 "Our highest goal is Kirian peace and prosperity."
@@ -2253,9 +2262,10 @@ kirin.309.t:0 "The Far South Army Sector"
 kirin.309.d:0 "In order to address the current crisis in the Far South, Kiria's affairs in the region will be placed under the control of the Far South Army Sector. This new polity, headed by KIRFORS Supreme Commander General [KIRGetFSGeneralName], will hopefully help our military intervention efforts in the region and minimise the financial and logistical strain it has placed on our military. It will be given greater autonomy and make decisions about how to address the situations it finds itself without waiting for direct approval from Vermilion. Drastic though the measure of it seems to be the best way to ensure a swift end to the hostilities."
 kirin.309.a:0 "An army with a state."
 
-kirin.310.t:0 "Order for Internment Camps"
-kirin.310.d:0 "The native tribes are spread throughout the jungle, and where they normally would be limited in their cooperation, they are currently resisting across tribal lines. Vermilion demands a minimum of 'civilian' bloodshed, but a tribe left in place is a tribe that will serve as a supply hub for continued resistance among the warbands. To address this, the tribes will be gathered up into safe zones to ensure there is nokirin out there to resupply the warriors.\n\nTo ensure compliance with the rules of engagement, the occupants will be provided with adequate amenities and housing. There will be doctors on site to prevent disease outbreaks, and for their duration of the stay they will be given education and the opportunity to make a gainful living with the SSVC. The camps will be fortified and kept under constant guard for the occupants' safety, and a minimum of one hundred meters of one hundred meters of vegetation will be cleared between the outer fence and the jungle.\n\nIn order to ensure the success of the campaign, evacuation to the safe zones will be mandatory, and local commanders are expected to use their best judgement in ensuring there will be no supplies left for our opponents.\n\nBy order of KIRFORS Supreme Commander General Hyssop Garnet"
+kirin.310.t:0 "Order for Safe Zones"
+kirin.310.d:0 "The native tribes are spread throughout the jungle, and where they normally would be limited in their cooperation, they are currently resisting across tribal lines. Vermilion demands a minimum of 'civilian' bloodshed, but a tribe left in place is a tribe that will serve as a supply hub for continued resistance among the warbands. To address this, the tribes will be gathered up into "Safe Zones" to ensure there is nokirin out there to resupply the warriors.\n\nTo ensure compliance with the rules of engagement, the occupants will be provided with adequate amenities and housing. There will be doctors on site to prevent disease outbreaks, and for their duration of the stay they will be given education and the opportunity to make a gainful living with the SSVC. The zones will be fortified and kept under constant guard for the occupants' safety, and a minimum of one hundred meters of one hundred meters of vegetation will be cleared between the outer fence and the jungle.\n\nIn order to ensure the success of the campaign, evacuation to the safe zones will be mandatory, and local commanders are expected to use their best judgement in ensuring there will be no supplies left for our opponents.\n\nBy order of KIRFORS Supreme Commander General Hyssop Garnet"
 kirin.310.a:0 "It is for their own good."
+KIR_event_310_tt:0 "Unlocks the §YForced Labor§! and §YHarsh Quotas§! occupation laws for [IDO.GetFlag] §Y[IDO.GetAdjective]§!, [IST.GetFlag] §Y[IST.GetAdjective]§!, and [DEL.GetFlag] §Y[DEL.GetAdjective]§! occupied territories.\n"
 
 kirin.311.t:0 "Order for Nation-Building"
 kirin.311.d:0 "Despite good progress, the native resistance continues unabated due to cultural/spiritual pressure from the local witch doctors that serve as the closest thing to central authority in these lands. If we are to secure the peninsula, we must break their hold on the populace hold and create a secular leadership for the region. To this end, the coastal tribes that served as our first contacts are to be empowered and equipped to be entrusted with the task of governance.\n\nWith the evacuation of the tribes to the previously established safe zones, we will be able to create new administrative provinces in the secured areas without the risk of dividing the region's demographics over provincial borders. Long term, we will be able to lay the foundation for a modern administration in these regions through the establishment of institutions such as courts, police stations and schools, whose staff will be trained in Kiria to ensure their ability to take on the task of creating an actual [DEL.GetAdjective] state. These provinces will serve as the founding states of a new [DEL.GetAdjective] Republic, founded on secular law and popular enfranchisement.\n\nIn order to ensure the founding of this new state goes smoothly the following measures will be taken:\n* Expedited construction of necessary security and administrative infrastructure.\n* The deployment of [DEL.GetAdjective] auxiliaries to low-risk areas to accustom their fellow natives to their presence.\n* Surveying and distributing the land among the tribes to ensure equal distribution of resources.\n* Violent activity in secured zones will henceforth be treated as banditry and dealt with as such within the framework of Kirian military law.\n* The arrest and incarceration of witch doctors present in secured zones until the situation has stabilised.\n\nBy order of KIRFORS Supreme Commander General Hyssop Garnet"
@@ -2318,14 +2328,14 @@ kirin.333.d:0 ""Wolfsbane, huh? I understand you fought in the Far South before
 kirin.333.a:0 "Concord willing, Captain, that will depend on your actions."
 
 kirin.334.t:0 "The First Light Dossier" ## Happens if Hyssop Garnet is KIRFORS commander and you did war crimes in DEL.
-kirin.334.d:0 "After the cataclysmic destruction of the Golden City, KIRFORS and our efforts in the Far South has come under intense scrutiny. What was meant to be an intervention to protect our local partners had completely spiralled out of control. Questions are being asked by politicians, journalists and the bereaved family members who have lost their beloved ones in a poorly defined conflict that has caused countless deaths.\n\nThough there were initially some attempts to control the narrative, the entire situation exploded when an anonymous dossier, simply entitled 'First Light', arrived at Kiria's largest newspapers. The dossier contained photographs, copies of letters and internal documentation from KIRFORS. It described how the "Internment Camps" set up for the protection of the local tribes were little more than fetid prison camps where disease and malnourishment is rampant, with their captive inhabitants often used as slave labour. Local authority figures and religious leaders were rounded up and locked away, many times under appalling conditions to expire on their own. Religious sites and villages were carelessly demolished if they were deemed in the way, and SSVC agents have orchestrated land grabs across the region. Furthermore, the dossier revealed that numerous NAKP politicians and businesskirin affiliated with the SSVC had applied pressure on KIRFORS Supreme Commander, General Hyssop Garnet, to cover up these grave atrocities when reported to him by KIRFORS personnel and civilian witnesses.\n\nAlongside a now-iconic photograph of an emaciated zebra foal cradled in her mother's forelegs, the text on the last page of the dossier now adorn the front pages of newspapers and broadsheets across the Realm:\n"THIS is Kiria's great step into the wider world: by force of arms and to take by force whatever it wishes.\nTHIS is the "guidance" Kiria offer its neighbors: by clasping them in fetters and devastating their way of life.\nTHIS is how Kiria creates the future: by creating a wasteland and calling it harmony."\n\nAt a hastily-convened press conference, Premier Autumn Blaze, who sported dark bags under her eyes, vowed to order an independent investigation to prosecute all those involved. Across the Realm and in Fragrance in particular, the MWPK and trade unions have mobilised in massive protests against their provincial and mayoral NAKP delegates, including those in the Fragrance NAKP's powerful party machine who were implicated by the dossier. With many Fragrancese declaring that will boycott the NAKP, the popularity of the Fragrance NAKP has taken a sharp nosedive from which it may never recover."
+kirin.334.d:0 "After the cataclysmic destruction of the Golden City, KIRFORS and our efforts in the Far South has come under intense scrutiny. What was meant to be an intervention to protect our local partners had completely spiralled out of control. Questions are being asked by politicians, journalists and the bereaved family members who have lost their beloved ones in a poorly defined conflict that has caused countless deaths.\n\nThough there were initially some attempts to control the narrative, the entire situation exploded when an anonymous dossier, simply entitled 'First Light', arrived at Kiria's largest newspapers. The dossier contained photographs, copies of letters and internal documentation from KIRFORS. It described how the "Safe Zones" set up for the protection of the local tribes were little more than fetid prison camps where disease and malnourishment is rampant, with their captive inhabitants often used as slave labour. Local authority figures and religious leaders were rounded up and locked away, many times under appalling conditions to expire on their own. Religious sites and villages were carelessly demolished if they were deemed in the way, and SSVC agents have orchestrated land grabs across the region. Furthermore, the dossier revealed that numerous NAKP politicians and businesskirin affiliated with the SSVC had applied pressure on KIRFORS Supreme Commander, General Hyssop Garnet, to cover up these grave atrocities when reported to him by KIRFORS personnel and civilian witnesses.\n\nAlongside a now-iconic photograph of an emaciated zebra foal cradled in her mother's forelegs, the text on the last page of the dossier now adorn the front pages of newspapers and broadsheets across the Realm:\n"THIS is Kiria's great step into the wider world: by force of arms and to take by force whatever it wishes.\nTHIS is the "guidance" Kiria offer its neighbors: by clasping them in fetters and devastating their way of life.\nTHIS is how Kiria creates the future: by creating a wasteland and calling it harmony."\n\nAt a hastily-convened press conference, Premier Autumn Blaze, who sported dark bags under her eyes, vowed to order an independent investigation to prosecute all those involved. Across the Realm and in Fragrance in particular, the MWPK and trade unions have mobilised in massive protests against their provincial and mayoral NAKP delegates, including those in the Fragrance NAKP's powerful party machine who were implicated by the dossier. With many Fragrancese declaring that will boycott the NAKP, the popularity of the Fragrance NAKP has taken a sharp nosedive from which it may never recover."
 kirin.334.a:0 "How was all this allowed to happen!?"
 KIR_event_334_tt:0 "[1071.GetName] §Rwill no longer be a Stronghold§! of the §YNational Association of Kirin Patriots§!."
 KIR_event_334_tt_2:0 "(@KIR§YAutumn Blaze§!) gains §Y'Tired'§! which grants (Political Power Gain: §R-5%§!) for §Y90§! days."
 KIR_tired_trait:0 "Tired"
 
 kirin.335.t:0 "The Talarayi Truth and Accountability Report"
-kirin.335.d:0 "The report read like a horror story, and knowing she had been the hoof that pushed these events into action made Autumn Blaze queasy. Hyssop Garnet's plan of shock and awe had proven ineffective, and the entire campaign devolved into a drawn out war of attrition and mass murder, where the solution to the mobile tribes' jungle warfare was to burn down the jungles and herd the natives into concentration camps. Even worse, as KIRFORS had advanced, the SSVC had been right behind, claiming the land for 'further development' in tight coordination with the military.\n\nTheir plan was clear in its purpose; break the natives and use them as a cheap labour force for resource extraction on their ancestral land, now property of the SSVC. This was no defensive war, this was a war of conquest and enslavement, and she was culpable in it. She would have been angry, enraged even, but all she could feel was overwhelming shame. She had done this. She had let these events take place...\n\n"Recall Hyssop Garnet at once. Relieve him of his command and suspend him from active duty, pending further disciplinary action." She looked up to the ministers that sat around the table with her. "Get KIRFORS under control, and start pulling it back. Deploy regular forces if we have to. I want the entire board of the SSVC arrested as well. Put together a plan for how we'll get these zebras out of those damn camps and restore as much of their lives as we can."\n\n"What will we do about Talarayi?", somekirin asked. Autumn Blaze was distraught enough that she didn't even register who it was. What indeed?"
+kirin.335.d:0 "The report read like a horror story, and knowing she had been the hoof that pushed these events into action made Autumn Blaze queasy. Hyssop Garnet's plan of shock and awe had proven ineffective, and the entire campaign devolved into a drawn out war of attrition and mass murder, where the solution to the mobile tribes' jungle warfare was to burn down the jungles and herd the natives into "Safe Zones". Even worse, as KIRFORS had advanced, the SSVC had been right behind, claiming the land for 'further development' in tight coordination with the military.\n\nTheir plan was clear in its purpose; break the natives and use them as a cheap labour force for resource extraction on their ancestral land, now property of the SSVC. This was no defensive war, this was a war of conquest and enslavement, and she was culpable in it. She would have been angry, enraged even, but all she could feel was overwhelming shame. She had done this. She had let these events take place...\n\n"Recall Hyssop Garnet at once. Relieve him of his command and suspend him from active duty, pending further disciplinary action." She looked up to the ministers that sat around the table with her. "Get KIRFORS under control, and start pulling it back. Deploy regular forces if we have to. I want the entire board of the SSVC arrested as well. Put together a plan for how we'll get these zebras out of those damn camps and restore as much of their lives as we can."\n\n"What will we do about Talarayi?", somekirin asked. Autumn Blaze was distraught enough that she didn't even register who it was. What indeed?"
 kirin.335.a:0 "We'll pull out entirely. We've hurt them enough."
 KIR_event_335a_tt:0 "\n[DEL.GetFlag] §YTalarayi§! will be freed from the [KIR.GetFlag] Kirian yoke: the £SET_flag  §YSouth Sea Enterprise Territory§! will be abolished, and KIRFORS withdrawn from the Far South.\n\n§LHaving already caused immense suffering, Kiria will withdraw from the Far South and let the natives rebuild as best they can. The power vacuum will create further infighting among the tribes, but their fate will be theirs to determine, not Kiria's.§!"
 kirin.335.b:0 "We have to replace what we took from them with something..."
@@ -2432,9 +2442,9 @@ KIR_DEL_BAT_CAP_Valiants_tt:0 " and §YValiants§!"
 
 KIR_DEL_War_Limit_Real:0 "KIRFORS Mandate Exceeded"
 KIR_DEL_War_Limit_A:0 "The KIRFORS Mandate"
-KIR_DEL_War_Limit_A_desc:0 ""
+KIR_DEL_War_Limit_A_desc:0 "Wary over the ramifications of Kiria's debut onto the world stage playing the role of an interventionist regional power, a crossbench bloc of Secretarial delegates from United for Harmony and Kiria Awoken has voted for a carefully-drafted mandate delineating the remit of KIRFORS in the Far South Intervention."
 KIR_DEL_War_Limit:0 "The KIRFORS Mandate"
-KIR_DEL_War_Limit_desc:0 ""
+KIR_DEL_War_Limit_desc:0 "Wary over the ramifications of Kiria's debut onto the world stage playing the role of an interventionist regional power, a crossbench bloc of Secretarial delegates from United for Harmony and Kiria Awoken has voted for a carefully-drafted mandate delineating the remit of KIRFORS in the Far South Intervention."
 KIR_DEL_War_Limit_M1:0 "The maximum number of Battalions and Support Companies, excluding §YIrregular Infantry§!, that we may field in §YIpagapened§!, §YBalaganeigh§!, §YBalisilak§!, §YTukiday§!, §YGlaan§! and §YKaruyungan§! is"
 KIR_DEL_War_Limit_M1_A:0 "The maximum number of Battalions and Support Companies, excluding §YIrregular Infantry§! and §YValiants§!, that we may field in §YIpagapened§!, §YBalaganeigh§!, §YBalisilak§!, §YTukiday§!, §YGlaan§! and §YKaruyungan§! is"
 KIR_DEL_War_Limit_M2:0 "\nThe current number of Battalions and Support Companies fielded is"
@@ -3679,14 +3689,14 @@ kirin_council.37.a:0 "Such is our future, and we can make it a reality."
 
 kirin_council.38.t:0 "Buying Rank"
 kirin_council.38.d:0 "Mayflower Bloom didn't know what to expect when she heard that her cousin had become an officer in the Order of the Iron Chrysanthemum, but even Ardent Bloom dressed in full officer's garb standing across from her in the kitchen of her home in Fragrance somehow didn't feel real. "You like it, May?" he asked her, and he smirked as he held out a foreleg to show off the epaulettes on his shoulder.\n\nMayflower suppressed an amused snort and tried to hide the look on her face by turning back to the tea she was preparing for the two of them. "I didn't take you for an army type, Ardent. How in the world did you end up as a... what did you say it was? Brigand-General?"\n\n"Brigadier-General," Ardent clarified with an annoyed growl. "And I'll tell you how. With war on the horizon, the NAKP was looking to make the Order of the Iron Chrysanthemum a more professional force to be the tip of the spear. Yesterday, the Order was just a bunch of street thugs, bandits, and yes, brigands, hastily assembled into a kind of informal police force to do the party's bidding. But now that the Order's putting together the Death's Head Brigade, they needed money to lure some of the best marines the trading houses have to offer into its ranks, and to equip them with the best Griffonian ordnance we could buy. So I made a contribution, and they awarded me with a rank befitting of my gift."\n\n"And how much was that?" Mayflower asked, finally finishing their tea and pouring it into two waiting cups. From everything it sounded like, nokirin was going to listen to somekirin who bought their rank when it came time to fight, least of all Ardent, who was more at home in his spreadsheets and ledgers than he was on the battlefield.\n\n"A little more than a week's worth of pay," Ardent said with a shrug, but he quickly chased it off with a smile. "But this is just the beginning. Right now, the Order has to buy the best from elsewhere, and it needs the money to do that. One day, though, the true patriots of Kiria will produce the best equipment and the best soldiers the world has ever seen!""
-kirin_council.38.a:0 "How nice... Now, would you like to have your tea, cousin?"
+kirin_council.38.a:0 ""How nice... Now, would you like to have your tea, cousin?""
 
 kirin_council.39.t:0 "Beggar at the Ball"
 kirin_council.39.d:0 "Fickle Current hurriedly flagged down the cocktail waitress and exchanged his empty glass of champagne for another one, immediately taking a few quick gulps. What was it, his fourth of the night? Fifth? He didn't know, and it was probably better that way. His nerves were fraying, and though he was hardly a heavy drinker, he was reaching for something to help soothe them. After all, he was about to make a very difficult request, and the hit to his reputation would take some time to recover.\n\nHe looked out at all the kirin slowly filing into the grand ballroom of 88 Chrysanthemum Plaza, many of them clutching drinks in their colorful magical auras, and all of them dressed to the nines. They were all members of the pinnacle of modern kirin society, the highest of the Diaspora's high society, and they had all paid 5000 Griffonian idols a head to attend the night's fundraising festivities. And here Current was about to ask them for more.\n\nWhen they had all gathered into the ballroom, Current took the microphone to thank them for their charity and give them all a pat on the back for having the means to afford the exorbitant entrance fee, as he knew all socialite types craved. That part of the speech was easy; then came the hard part. "And now, I'd like to remind everykirin of the reason why we're having this ball tonight, and how much more we all have to give to make our dreams a reality," he said, steeling himself for the inevitable reproachful looks from those gathered before him. "We will soon be finding ourselves in a war, and a very expensive one at that. Suffice it to say, the coffers of the NAKP are simply inadequate for waging war against our foes in Vermilion. Therefore, I regretfully ask of you all if you have anything else you can spare for the war effort, the NAKP will be greatly appreciative of any and all contributions. When the war is won, we will, of course, remember your generosity in the future."\n\nThe scoffs from the gathered kirin and the sniffs of disgust made Current feel like somekirin was pulling his scales off one by one with a pair of pliers, but he did his best to maintain a smile through their murmuring. That was nothing, however, compared, to the words he overhead Silver Silks, heiress to the Sycee Trading House and the single wealthiest kirin present at the party, mutter to her friends. "Begging is quite unbecoming of the Chairkirin, wouldn't you agree? I suppose we should give him what he wants. Elsewise, he may become even more desperate at the next gala, and that just won't do at all."\n\nTheir tittering bit deep, but Current swallowed that embarrassment regardless. If the NAKP didn't get the funds it needed to fight the war, then it was doomed anyway."
 kirin_council.39.a:0 "Wounded pride is nothing if our cause collapses, right?"
 
 kirin_council.40.t:0 "Picking Your Friends"
-kirin_council.40.d:0 "I hate being in debt," Fickle Current announced to Ardent Bloom as he paced in the latter's office. "Business deals are one thing. Debts change with time. They're unpredictable, and you don't know what you're in for when the debt is called." He sighed and shook his head. "But it's a necessary evil, is it not? We need overseas investors, and our contacts in Griffonia are happy to give us funds if we lease them land, property, and resources as collateral. If we lose, we won't have to worry about our creditors in Skyfall or Flowena calling due, but if we win..."\n\n"There is another option that's not with our usual Griffonian contacts," Ardent said, steepling his hooves as he considered whether or not to press forward. But at Current's curious look, he continued. "The Changelings have caught wind of our offer. I don't know how, but when you're dealing with a race of shapeshifting insects, I suppose it only makes sense that they would. They're interested, and they're offering exceedingly generous terms."\n\n"How generous?" Current asked. In his experience, the more generous the terms, the larger the knife hidden behind a creature's back.\n\n"They want the same things as our Griffonian business partners, but they're more interested in property than resources, and they're willing to pay more for it — much more. But..." Here he hesitated, then sighed and continued. "They're negotiating through Main Hive Industries, their largest industrial conglomerate. It's all run through one bug named Finicus Vesali, and I'll warn you, he's no slouch when it comes to the negotiating table. He probably knows how to cut a deal as well as you do, Current. Long story short, I don't trust them."\n\n"And to make a short story slightly longer?" Current asked, raising an eyebrow.\n\n"Well, the Changelings, unlike Skyfall or Flowena, have the means to collect if we don't pay up," Bloom said. "And they want land more than anything else. You'd think an industrial powerhouse like them would want resources above anything else. Something's fishy, and I don't like it... but at the end of the day, it's your call.""
+kirin_council.40.d:0 ""I hate being in debt," Fickle Current announced to Ardent Bloom as he paced in the latter's office. "Business deals are one thing. Debts change with time. They're unpredictable, and you don't know what you're in for when the debt is called." He sighed and shook his head. "But it's a necessary evil, is it not? We need overseas investors, and our contacts in Griffonia are happy to give us funds if we lease them land, property, and resources as collateral. If we lose, we won't have to worry about our creditors in Skyfall or Flowena calling due, but if we win..."\n\n"There is another option that's not with our usual Griffonian contacts," Ardent said, steepling his hooves as he considered whether or not to press forward. But at Current's curious look, he continued. "The Changelings have caught wind of our offer. I don't know how, but when you're dealing with a race of shapeshifting insects, I suppose it only makes sense that they would. They're interested, and they're offering exceedingly generous terms."\n\n"How generous?" Current asked. In his experience, the more generous the terms, the larger the knife hidden behind a creature's back.\n\n"They want the same things as our Griffonian business partners, but they're more interested in property than resources, and they're willing to pay more for it — much more. But..." Here he hesitated, then sighed and continued. "They're negotiating through Main Hive Industries, their largest industrial conglomerate. It's all run through one bug named Finicus Vesali, and I'll warn you, he's no slouch when it comes to the negotiating table. He probably knows how to cut a deal as well as you do, Current. Long story short, I don't trust them."\n\n"And to make a short story slightly longer?" Current asked, raising an eyebrow.\n\n"Well, the Changelings, unlike Skyfall or Flowena, have the means to collect if we don't pay up," Bloom said. "And they want land more than anything else. You'd think an industrial powerhouse like them would want resources above anything else. Something's fishy, and I don't like it... but at the end of the day, it's your call.""
 kirin_council.40.a:0 "Generous terms from the Changelings are to our advantage."
 kirin_council.40.b:0 "It's better to cut a deal with somegriffon who can't hurt you should we break it."
 KIR_council_focus_5c_40b_tt:0 "\nUpon our §Yvictory§! in the §Ycivil war§!:"
@@ -3763,7 +3773,7 @@ kirin_council.55.a:0 "The Corporation shall be the government's will."
 kirin_council.55.b:0 "The Corporation shall be the government's custodian."
 
 kirin_council.56.t:0 "Voting for the Vote"
-kirin_council.56.d:0 "Silver Silks yawned and idly twirled her cigarette holder in her magic, watching the smoke trail from the end as some NAKP peon named Simple Survey or something like that prattled off on something about voting rights. Silver genuinely wished she was anywhere but here; the stallion speaking had a terribly grating voice, and this meeting was the type of thing she would usually delegate somekirin else to attend in her place. But when the NAKP had summoned representatives from all the corporations to attend to discuss the matter, Silver's advisor had suggested that she attend the meeting in person in case it was important. But all Simple Survey had done was make some kind of half-baked lesson in the values of democracy and suffrage in the Empire, and Silver was bored. She'd need to find a new advisor after she got home and fired the old one for suggesting she attend this boring meeting.\n\n"And now, to the meat of the matter," Survey said, and Silver sighed in relief and pointed her ears up to at least take in the crux of the matter that she'd wasted her day on. "The NAKP values democracy, of course. When done correctly, and under the guidance of a benevolent state apparatus, the private sector, and the mature leadership of the national Party, democracy facilitates and enshrines the principles conductive to commercial-esque competition in a free marketplace of ideas, engendering an incentive for political organizations to provide the best value service to stakeholder-electors. Thusly, the Party, in its wisdom, and to achieve this vision of a harmonic and stable democratic system of governance, will implement limited electoral reforms to allow stakeholders from all sections of society to determine Kiria's political direction.\n\n"How will we accomplish this?" Survey continued, and  a slide projector clicked over to a set of bullet points. "The executive council has come up with two proposals, which we will vote on. The first is an electoral system wherein propertied individuals and entities will be able to cast votes proportional to the total value of their assets. This will encompass corporations, landowners, and those other propertied stakeholders in society. There is also an alternative: the so-called "suffragette lottery" model, wherein kirin purchase "franchise shares". There is a lottery that determines which 30% of the shares will become actual votes. Don't be put off by the utter radicalness of this proposal, good friends; of course, corporations can purchase franchise shares en masse, but the marginal element of randomness is supposed to act as an equalizer."\n\n"Good, good, can we get on with it, though?" Silver asked, finally exhausted enough by the meeting to raise her voice and force a vote. The entire ordeal mattered little to her; as the wealthiest kirin in the Realm, she knew her voice was the loudest no matter how the NAKP pitched its sham democracy."
+kirin_council.56.d:0 "Silver Silks yawned and idly twirled her cigarette holder in her magic, watching the smoke trail from the end as some NAKP peon named Simple Survey or something like that prattled off on something about voting rights. Silver genuinely wished she was anywhere but here; the stallion speaking had a terribly grating voice, and this meeting was the type of thing she would usually delegate somekirin else to attend in her place. But when the NAKP had summoned representatives from all the corporations to attend to discuss the matter, Silver's advisor had suggested that she attend the meeting in person in case it was important. But all Simple Survey had done was make some kind of half-baked lesson in the values of democracy and suffrage in the Empire, and Silver was bored. She'd need to find a new advisor after she got home and fired the old one for suggesting she attend this boring meeting.\n\n"And now, to the meat of the matter," Survey said, and Silver sighed in relief and pointed her ears up to at least take in the crux of the matter that she'd wasted her day on. "The NAKP values democracy, of course. When done correctly, and under the guidance of a benevolent state apparatus, the private sector, and the mature leadership of the national Party, democracy facilitates and enshrines the principles conductive to commercial-esque competition in a free marketplace of ideas, engendering an incentive for political organizations to provide the best value service to stakeholder-electors. Thusly, the Party, in its wisdom, and to achieve this vision of a harmonic and stable democratic system of governance, will implement limited electoral reforms to allow stakeholders from all sections of society to determine Kiria's political direction.\n\n"How will we accomplish this?" Survey continued, and a slide projector clicked over to a set of bullet points. "The executive council has come up with two proposals, which we will vote on. The first is an electoral system wherein propertied individuals and entities will be able to cast votes proportional to the total value of their assets. This will encompass corporations, landowners, and those other propertied stakeholders in society. There is also an alternative: the so-called "suffragette lottery" model, wherein kirin purchase "franchise shares". There is a lottery that determines which 30% of the shares will become actual votes. Don't be put off by the utter radicalness of this proposal, good friends; of course, corporations can purchase franchise shares en masse, but the marginal element of randomness is supposed to act as an equalizer."\n\n"Good, good, can we get on with it, though?" Silver asked, finally exhausted enough by the meeting to raise her voice and force a vote. The entire ordeal mattered little to her; as the wealthiest kirin in the Realm, she knew her voice was the loudest no matter how the NAKP pitched its sham democracy."
 kirin_council.56.a:0 "Let everykirin's voice be weighted by the size of her assets."
 kirin_council.56.b:0 "Let everykirin's voice be weighted by the number of tickets she holds."
 
@@ -3940,7 +3950,7 @@ kirin_council.88.d:0 "For the attention of Operationsdirektorin Cheli Cerae,\n\n
 kirin_council.88.a:0 "Music to my ears!"
 
 kirin_council.89.t:0 "Preparation" ##Part 1/2
-kirin_council.89.d:0 ""Enough is enough," Cheli Cerae's low voice reverberated throughout the room where she stood surrounded by her loyal infiltrators. "Three organised threats still remain to our rule over this city: the Fragrance New Realm Party led by Maple Dew, the MSWPK led by Hawthorn Blaze, and finally, Fragrance's own civilian government led by [ROOT.GetLeader], who has proven to be quite recalcitrant and uncooperative."\n\n"Despite being our nominal puppet, he remains independent-minded, and from what our spies in his staff report, still harbours fantastical notions of overthrowing changeling rule and restoring the NAKP to power." At this, several of the assembled agents chucked, and Cheli herself smirked.\n\n"Ahem. To this end, he has reached out to the NRP and MSWPK. Which, conveniently enough, has allowed our infiltrators to infiltrate those organisations as well, since his personal staff is so thoroughly saturated with our changelings."\n\n"Which brings us to the Liquidation Operation." Cheli levitated a pointer to the photos of Maple Dew, Hawthorn Blaze, and [ROOT.GetLeader] pinned to the wall behind her. "Our objective is to bring these malcontents under control once and for all. Unteragent Biroi, Unteragent Phantine, Unteragent Orusso, each of you will be crucial to this operation's success.  Do you all understand your assignments?"\n\nUnteragent Tohmax Phantine took a breath and nodded in response. He knew Hawthorn Blaze: he had studied the kirin's every movement for months. He was ready. Tohmax looked around and saw similar affirmations from his fellow agents. They all had faith in Cheli, and she had faith in them; the time had come to prove that faith was not misplaced."
+kirin_council.89.d:0 ""Enough is enough," Cheli Cerae's low voice reverberated throughout the room where she stood surrounded by her loyal infiltrators. "Three organised threats still remain to our rule over this city: the Fragrance New Realm Party led by Maple Dew, the MSWPK led by Hawthorn Blaze, and finally, Fragrance's own civilian government led by [ROOT.GetLeader], who has proven to be quite recalcitrant and uncooperative."\n\n"Despite being our nominal puppet, he remains independent-minded, and from what our spies in his staff report, still harbours fantastical notions of overthrowing changeling rule and restoring the NAKP to power." At this, several of the assembled agents chucked, and Cheli herself smirked.\n\n"Ahem. To this end, he has reached out to the NRP and MSWPK. Which, conveniently enough, has allowed our infiltrators to infiltrate those organisations as well, since his personal staff is so thoroughly saturated with our changelings."\n\n"Which brings us to the Liquidation Operation." Cheli levitated a pointer to the photos of Maple Dew, Hawthorn Blaze, and [ROOT.GetLeader] pinned to the wall behind her. "Our objective is to bring these malcontents under control once and for all. Unteragent Biroi, Unteragent Phantine, Unteragent Orusso, each of you will be crucial to this operation's success. Do you all understand your assignments?"\n\nUnteragent Tohmax Phantine took a breath and nodded in response. He knew Hawthorn Blaze: he had studied the kirin's every movement for months. He was ready. Tohmax looked around and saw similar affirmations from his fellow agents. They all had faith in Cheli, and she had faith in them; the time had come to prove that faith was not misplaced."
 kirin_council.89.a:0 "Commence the operation!"
 KIS_event_89_tt:0 "The §OInfils.-kommando Ost-Zebrika§! will §Gliquidate§! all §Ropposition§! to §CChangeling rule§! over §YFragrance§!."
 
@@ -3986,7 +3996,7 @@ kirin_council.96.a:0 "This stinks of a changeling plot!"
 kirin_council.96.b:0 "Just as planned."
 
 kirin_council.960.t:0 "Interlude" #FRV only
-kirin_council.960.d:0 ""Look alive, soldiers! Our moment has arrived." Oberst-Infiltrator Ichneumion Orax addressed the drones packed together before him. He levitated a pointer toward the map of Hyacinth on the wall behind hum, a sharp tapping sound cutting through the low hum of the projector. "Here's the game plan: invade Hyacinth first to secure the city, and a hoofhold in Kiria." The projector image changed to reflect the changeling plan of attack, black arrows stretching from the sea to the heart of the city. "That is the most important aspect of our mission - to secure a hoofhold in Kiria. We must secure the city first, before the kirin can recapture it." His gruff voice conveyed a palpable sense of urgency.\n\n"Speed is key." Orax stomped a hoof for emphasis. "This invasion is a race against the clock!" He wore a stern expression for a long moment, making the troops anxious, before breaking into a small grin. "The good news is the way has been paved for us, we can thank the infiltrators already in Hyacinth for that. We have accurate intelligence on the details of Hyacinth's coastal fortifications, including which ones are left." The pirate onslaught had done considerable damage to the city's defences.\n\n"Our second objective is Auburn Isle. The kirin navy is weak, so it's unlikely they'll get there before us." Orax made a gesture with his hoof, and the image behind him changed to a photo of the Isle. "Once we control Hyacinth, we can use it as a base for a nice, leisurely naval invasion of Auburn Isle, which will be an almost guaranteed victory." His forecast drew quizzical looks from some of the soldiers.  Wouldn't taking the Isle be difficult? Orax's face broke into a confident smile. "I have a hunch Crimson Line's defences won't be very formidable. But don't worry about that. Just do your jobs, and it'll all work out splendidly.""
+kirin_council.960.d:0 ""Look alive, soldiers! Our moment has arrived." Oberst-Infiltrator Ichneumion Orax addressed the drones packed together before him. He levitated a pointer toward the map of Hyacinth on the wall behind hum, a sharp tapping sound cutting through the low hum of the projector. "Here's the game plan: invade Hyacinth first to secure the city, and a hoofhold in Kiria." The projector image changed to reflect the changeling plan of attack, black arrows stretching from the sea to the heart of the city. "That is the most important aspect of our mission - to secure a hoofhold in Kiria. We must secure the city first, before the kirin can recapture it." His gruff voice conveyed a palpable sense of urgency.\n\n"Speed is key." Orax stomped a hoof for emphasis. "This invasion is a race against the clock!" He wore a stern expression for a long moment, making the troops anxious, before breaking into a small grin. "The good news is the way has been paved for us, we can thank the infiltrators already in Hyacinth for that. We have accurate intelligence on the details of Hyacinth's coastal fortifications, including which ones are left." The pirate onslaught had done considerable damage to the city's defences.\n\n"Our second objective is Auburn Isle. The kirin navy is weak, so it's unlikely they'll get there before us." Orax made a gesture with his hoof, and the image behind him changed to a photo of the Isle. "Once we control Hyacinth, we can use it as a base for a nice, leisurely naval invasion of Auburn Isle, which will be an almost guaranteed victory." His forecast drew quizzical looks from some of the soldiers. Wouldn't taking the Isle be difficult? Orax's face broke into a confident smile. "I have a hunch Crimson Line's defences won't be very formidable. But don't worry about that. Just do your jobs, and it'll all work out splendidly.""
 kirin_council.960.a:0 "Order will be restored!"
 
 kirin_council.97.t:0 "A New Pirate Queen?" 
@@ -4052,7 +4062,7 @@ kirin_council.110.d:0 ""Proud kirin, do not sit idly by while your glorious home
 kirin_council.110.a:0 "Manipulating the masses is just too easy."
 
 kirin_council.111.t:0 "Armaments and Agitators"
-kirin_council.111.d:0 "On a warm and sunny afternoon, a nondescript flat bottomed barge made its way down a gently flowing river. An excited crowd of kirin had gathered at the wharf where this boat would unload its cargo, chattering hopefully. Lately, trucks and barges filled with guns had been flowing into the Providence Demesne, and there seemed to be no end in sight. The weapons were to arm the Society to Pierce the Veil and the anti-changeling movement it led.\n\nAfter the barge docked, the crowd wasted no time off-loading its precious cargo. Inside were weapons of all kinds: swords, spears, outdated lever-action rifles, Hindian breech-loaders, sabres, and antiquated Griffonian cannon. They were no match for truly modern military hardware, but for a bunch of enthusiastic amateurs that didn't matter. The kirin were eager to get their hooves on whatever they could.\n\nA grizzled kirin emerged from the barge, grabbing the crowd's attention. "Everykirin, I have an announcement, a message from our Society's leaders!"  He smiled internally, knowing that those leaders were in fact changeling infiltrators like himself. "They have declared the formation of the Righteous Realm Army, tasked with the divine mission to reconquer Fragrance from the foreign imperialist pests and restore it to the Kirian fold and Concord's loving embrace. We will squash the bugs!" The now-armed mob cheered wildly, firing their guns into the air in a frenzy."
+kirin_council.111.d:0 "On a warm and sunny afternoon, a nondescript flat bottomed barge made its way down a gently flowing river. An excited crowd of kirin had gathered at the wharf where this boat would unload its cargo, chattering hopefully. Lately, trucks and barges filled with guns had been flowing into the Providence Demesne, and there seemed to be no end in sight. The weapons were to arm the Society to Pierce the Veil and the anti-changeling movement it led.\n\nAfter the barge docked, the crowd wasted no time off-loading its precious cargo. Inside were weapons of all kinds: swords, spears, outdated lever-action rifles, Hindian breech-loaders, sabres, and antiquated Griffonian cannon. They were no match for truly modern military hardware, but for a bunch of enthusiastic amateurs that didn't matter. The kirin were eager to get their hooves on whatever they could.\n\nA grizzled kirin emerged from the barge, grabbing the crowd's attention. "Everykirin, I have an announcement, a message from our Society's leaders!" He smiled internally, knowing that those leaders were in fact changeling infiltrators like himself. "They have declared the formation of the Righteous Realm Army, tasked with the divine mission to reconquer Fragrance from the foreign imperialist pests and restore it to the Kirian fold and Concord's loving embrace. We will squash the bugs!" The now-armed mob cheered wildly, firing their guns into the air in a frenzy."
 kirin_council.111.a:0 "Enjoy your presents, fools."
 
 kirin_council.112.t:0 "The Righteous Rebellion"
@@ -4132,7 +4142,7 @@ kirin_council.506.d:0 ""Start it," Fickle Current said as soon as he sat down in
 kirin_council.506.a:0 "We're standing on the brink of a war between two VasCorps."
 
 kirin_council.507.t:0 "Corporate War"
-kirin_council.507.d:0 "The ExecCo was in turmoil, and Fickle Current had been up since dawn pulling his mane out.\n\nThere was no more pretense to the game anymore: earlier that week, the Sycee Trading House and the All-Kiria Artificers' Guild had formally declared the beginning of 'hostile business relations' with each other, immediately followed by clashes and open combat between the two VasCorp's private security arms in the fields of the Vespertine Valley. In Sycee's holdings from the Comely Cape to the Peaks of Peril, and in the Guild's demesne from their Massicot headquarters to the southeastern coastlands, the two VasCorps had locked down their territory, rallied their private armies, and set all their industry and subsidiaries to produce equipment and materiel for a war at full bore. Even in Vermilion, the rumbling of distant artillery was difficult to ignore.\n\nThe problems did not stop there; no, they were only the beginning. The war was already undercutting the NAKP's authority over the Realm, as banners that would normally be supplied to the Imperial Kirian Army by the Guild and Sycee had instead defected to their parent corporations and both sides refused to engage in dialogue with the ExecCo while there was still 'unfinished business' to be dealt with. On top of that, a consortium of the VasCorps led by the Sorghum Foundry had unilaterally declared that they would keep the conflict out of the heartlands of the Realm, and established the Mellifluve Delta Authority that would answer to the consortium's board, not the ExecCo. On top of that, local NAKP governors and commanders of Civil Defense in the western reaches of the Realm had declared the Government for Peace and Security in the West, effectively establishing a western governorate independent of the party's control. In the blink of an eye, Fickle Current found his hold on the Realm effectively quartered with nothing more than lip service from its constituents to assure him of their loyalty.\n\nBut to Current, that was not the worst part. The worst came  when the ExecCo preemptively vetoed any attempts by the state to intervene in what was happening, citing Article 12 of the Imperial Code and stressing that the state must not interfere in intercorporate affairs without the consent of all the corporate parties involved. Even his own board was in revolt against him, and there was nothing Current could do to rein them in. And with the situation as volatile as it was, there was nothing he could do but sit and wait and pray that he could find a solution before the Realm's nationalist-corporatist experiment went up in flames."
+kirin_council.507.d:0 "The ExecCo was in turmoil, and Fickle Current had been up since dawn pulling his mane out.\n\nThere was no more pretense to the game anymore: earlier that week, the Sycee Trading House and the All-Kiria Artificers' Guild had formally declared the beginning of 'hostile business relations' with each other, immediately followed by clashes and open combat between the two VasCorp's private security arms in the fields of the Vespertine Valley. In Sycee's holdings from the Comely Cape to the Peaks of Peril, and in the Guild's demesne from their Massicot headquarters to the southeastern coastlands, the two VasCorps had locked down their territory, rallied their private armies, and set all their industry and subsidiaries to produce equipment and materiel for a war at full bore. Even in Vermilion, the rumbling of distant artillery was difficult to ignore.\n\nThe problems did not stop there; no, they were only the beginning. The war was already undercutting the NAKP's authority over the Realm, as banners that would normally be supplied to the Imperial Kirian Army by the Guild and Sycee had instead defected to their parent corporations and both sides refused to engage in dialogue with the ExecCo while there was still 'unfinished business' to be dealt with. On top of that, a consortium of the VasCorps led by the Sorghum Foundry had unilaterally declared that they would keep the conflict out of the heartlands of the Realm, and established the Mellifluve Delta Authority that would answer to the consortium's board, not the ExecCo. On top of that, local NAKP governors and commanders of Civil Defense in the western reaches of the Realm had declared the Government for Peace and Security in the West, effectively establishing a western governorate independent of the party's control. In the blink of an eye, Fickle Current found his hold on the Realm effectively quartered with nothing more than lip service from its constituents to assure him of their loyalty.\n\nBut to Current, that was not the worst part. The worst came when the ExecCo preemptively vetoed any attempts by the state to intervene in what was happening, citing Article 12 of the Imperial Code and stressing that the state must not interfere in intercorporate affairs without the consent of all the corporate parties involved. Even his own board was in revolt against him, and there was nothing Current could do to rein them in. And with the situation as volatile as it was, there was nothing he could do but sit and wait and pray that he could find a solution before the Realm's nationalist-corporatist experiment went up in flames."
 kirin_council.507.a:0 "We have to find a way to put a stop to this infighting!"
 KIS_sycee_guild_corporate_dispute_tt:0 "Commences the §RKirian Corporate War§! between the §YSycee Trading House of Kiria§! and the §YAll-Kiria Artificers' Guild§!.\n\n"
 KIS_CORPORATE_WAR_disable_revoke_milacc_tt:0 "§RThe §YCorporate War§! knows no borders.§!"
@@ -4495,7 +4505,7 @@ kirin_republic.24.d:0 "Hallowed Saber peered up from knee-deep water and through
 kirin_republic.24.a:0 "The explosion was heard for miles, and the guns fell silent."
 
 kirin_republic.25.t:0 "Look What the Tide Washed In"
-kirin_republic.25.d:0 "Rising Sun looked at the figure prostrate before her, gagged and bound in chains and hemp rope. A mare in soldier's garb stood over the prisoner, chest puffed up with pride. "First Priestess Sun, may I present to you: the pirate queen Roaring Fire, having turned to banditry after the destruction of her fleet, captured two weeks ago by the loyal soldiers of the Republic in the Noctilucent Forest, where the last of her brigands were destroyed. May Concord, in her divine wisdom, have mercy on her soul."\n\n"How the mighty have fallen," Rising Sun quietly mused to herself. Long had she known about the pirates of Nacre sailing under Roaring Fire's banner. For years they had menaced the riverine trade that sailed out of Verdant, or what little remained of it throughout the Silence, abducting and slaughtering helpless foals of Concord for their own pleasure and gain. She wanted nothing more than to smite the pirate before her, to strike her head from her shoulders with a sword and toss her body in the river, but cold logic stopped her. While executing Roaring Fire would be helpful to add to her image as a protector of kirin everywhere, the pirate queen was a skilled warrior and could be a useful tool.\n\nA plan formed in her head, and she stepped forward, signaling to the soldier to yank Roaring Fire's mane back to force the pirate to look her in the eyes. "Roaring Fire, menace of the seas, terror on water. I should have you killed for your many crimes, but Concord is merciful. She will not discard what can still be of use to Her glory, and so it is with you. Thus, I offer you a choice; prostrate yourself before me as Her messenger and fight in the name of the Roaring Fire, or prepare your spark to be returned to the Primordial Fire in Her care."\n\nRoaring Fire glared up at Rising Sun, fixing her with a dreadfully baleful look, and for a moment, Rising Sun wondered whether the pirate queen would be defiant to the last. But reason won out in the end, and the pirate slowly bowed before Rising Sun. Nodding in approval, Rising Sun turned to the soldier. "Bring her to her cell to rest and eat up. She will need to be strong to serve our Goddess."\n\nAs the two kirin left, Rising Sun turned aside to where Dayspring Rose stood behind her. "You will accompany the pirate," she told her faithful acolyte. "You are the brightest and best of our young leadership, but you lack experience in the field. This will be a valuable lesson. Study its teachings closely, and one day you will be ready to lead the Rising Fire just as I have.""
+kirin_republic.25.d:0 "Rising Sun looked at the figure prostrate before her, gagged and bound in chains and hemp rope. A mare in soldier's garb stood over the prisoner, chest puffed up with pride. "First Priestess Sun, may I present to you: the pirate queen Roaring Fire, having turned to banditry after the destruction of her fleet, captured two weeks ago by the loyal soldiers of the Republic in the Noctilucent Forest, where the last of her brigands were destroyed. May Concord, in her divine wisdom, have mercy on her soul."\n\n"How the mighty have fallen," Rising Sun quietly mused to herself. Long had she known about the pirates of Nacre sailing under Roaring Fire's banner. For years they had menaced the riverine trade that sailed out of Verdant, or what little remained of it throughout the Silence, abducting and slaughtering helpless foals of Concord for their own pleasure and gain. She wanted nothing more than to smite the pirate before her, to strike her head from her shoulders with a sword and toss her body in the river, but cold logic stopped her. While executing Roaring Fire would be helpful to add to her image as a protector of kirin everywhere, the pirate queen was a skilled warrior and could be a useful tool.\n\nA plan formed in her head, and she stepped forward, signaling to the soldier to yank Roaring Fire's mane back to force the pirate to look her in the eyes. "Roaring Fire, menace of the seas, terror on water. I should have you killed for your many crimes, but Concord is merciful. She will not discard what can still be of use to Her glory, and so it is with you. Thus, I offer you a choice; prostrate yourself before me as Her messenger and fight in the name of the Rising Fire, or prepare your spark to be returned to the Primordial Fire in Her care."\n\nRoaring Fire glared up at Rising Sun, fixing her with a dreadfully baleful look, and for a moment, Rising Sun wondered whether the pirate queen would be defiant to the last. But reason won out in the end, and the pirate slowly bowed before Rising Sun. Nodding in approval, Rising Sun turned to the soldier. "Bring her to her cell to rest and eat up. She will need to be strong to serve our Goddess."\n\nAs the two kirin left, Rising Sun turned aside to where Dayspring Rose stood behind her. "You will accompany the pirate," she told her faithful acolyte. "You are the brightest and best of our young leadership, but you lack experience in the field. This will be a valuable lesson. Study its teachings closely, and one day you will be ready to lead the Rising Fire just as I have.""
 kirin_republic.25.a:0 ""I serve the Rising Fire, Priestess""
 
 kirin_republic.26.t:0 "Concord's Loyal Servant"
@@ -4606,7 +4616,7 @@ KIC_event_45a_tt:0 "Decision £decision_icon_small §YProselytise the Faith§!:\
 kirin_republic.45.b:0 "The First Priestess has her beliefs, and the preachers their own. Isn't that how it works?"
 
 kirin_republic.46.t:0 "You Get What You Deserve"
-kirin_republic.46.d:0 ""The Order of the Iron Chrysanthemum was mostly smashed and scattered to the winds, but there are still a few diehard partisans out there looting and raiding. If you hear gunshots, don't be alarmed. And in a little bit, maybe you'll understand."\n\nDayspring Rose cocked her head at that odd warning, but nevertheless she followed the younger stallion past the razorwire-topped fences set up around the camp. She had set out to Greater Providence that day on the invitation of Flash Pan, one of Kindling Flash's students and friends, and the young stallion had proven himself both chatty and full of conviction and idealism. Dayspring appreciated both of those traits, but as the pair passed by the bannerkirin guarding the camp, she wondered where that fervor would take them.\n\nShe didn't have to wait long to find out. They were barely a hundred yards from the gate when Flash Pan stopped and gestured at the dirty squalor and filth surrounding them, and the emaciated kirin huddled together in whatever shelter they could find from the harsh noon sun. "Did you know things were this bad?" Flash Pan asked her. "This internment camp for the NAKP partisans and collaborators is more like a death camp. The prisoners here are given no medication, offered no sanitation, and only scraps of old and moldy food. And for what? Because Iron Chrysanthemum partisans keep attacking our patrols?" He stomped his hoof down in frustration. "This is cruel and collective punishment! I thought we were supposed to be better than this! Liberators, not tyrants! Why does the First Priestess let this cruelty continue?"\n\nDayspring looked at the skeletal kirin huddled together, and a frown placed heavy weights on the corners of her muzzle. "It's not that simple," she said in a low voice as she regarded the foreigners who were once her enemy on the battlefield. "The populace here despise us. They're clinging to the promises the foreigners gave them, of building a utopia for them on the backs of our slave labor. They support the NAKP partisans, and until they do, they have to be punished for it. Only when they stop clinging to the lie the NAKP fed them and realize that they stand to prosper from working with us and not against us, then the misery can hopefully end." She closed her eyes for a moment before adding, "I fought in the war. I know how brutal and vicious things got. Entire towns in the west no longer exist because of the fighting. These kirin should consider themselves lucky that the same hasn't befallen them."\n\nFlash Pan regarded her with a scrutinizing glare before abruptly turning away. "Only a monster thinks monstrosities are acceptable if they happen to somecreature else.""
+kirin_republic.46.d:0 ""The Order of the Iron Chrysanthemum was mostly smashed and scattered to the winds, but there are still a few diehard partisans out there looting and raiding. If you hear gunshots, don't be alarmed. And in a little bit, maybe you'll understand."\n\nDayspring Rose cocked her head at that odd warning, but nevertheless she followed the younger stallion past the razorwire-topped fences set up around the camp. She had set out to Greater Providence that day on the invitation of Flash Pan, one of Kindling Flash's students and friends, and the young stallion had proven himself both chatty and full of conviction and idealism. Dayspring appreciated both of those traits, but as the pair passed by the bannerkirin guarding the camp, she wondered where that fervor would take them.\n\nShe didn't have to wait long to find out. They were barely a hundred yards from the gate when Flash Pan stopped and gestured at the dirty squalor and filth surrounding them, and the emaciated kirin huddled together in whatever shelter they could find from the harsh noon sun. "Did you know things were this bad?" Flash Pan asked her. "This prison for the NAKP partisans and collaborators is more like a dumping ground. The prisoners here are given no medication, offered no sanitation, and only scraps of old and moldy food. And for what? Because Iron Chrysanthemum partisans keep attacking our patrols?" He stomped his hoof down in frustration. "This is cruel and collective punishment! I thought we were supposed to be better than this! Liberators, not tyrants! Why does the First Priestess let this cruelty continue?"\n\nDayspring looked at the skeletal kirin huddled together, and a frown placed heavy weights on the corners of her muzzle. "It's not that simple," she said in a low voice as she regarded the foreigners who were once her enemy on the battlefield. "The populace here despise us. They're clinging to the promises the foreigners gave them, of building a utopia for them on the backs of our slave labor. They support the NAKP partisans, and until they do, they have to be punished for it. Only when they stop clinging to the lie the NAKP fed them and realize that they stand to prosper from working with us and not against us, then the misery can hopefully end." She closed her eyes for a moment before adding, "I fought in the war. I know how brutal and vicious things got. Entire towns in the west no longer exist because of the fighting. These kirin should consider themselves lucky that the same hasn't befallen them."\n\nFlash Pan regarded her with a scrutinizing glare before abruptly turning away. "Only a monster thinks monstrosities are acceptable if they happen to somecreature else.""
 kirin_republic.46.a:0 ""I am not a monster. I am only a realist.""
 
 kirin_republic.111.t:0 "No Easy Answers"
@@ -4896,7 +4906,7 @@ kirin_republic.109.d:0 "The Fragrancese held a lot of pain behind their smiles,
 kirin_republic.109.a:0 ""Don't they ever just... spend time alone?""
 
 kirin_republic.1091.t:0 "With Open Hearts, And Calloused Hooves"
-kirin_republic.1091.d:0 "Hoo'fran woke up this morning to a note asking him to go to a special interview about how he was adjusting to the city. He was even excused from a work assignment for it, so it must've been important. He headed straight there. One of the teachers, Laverbreeze, was waiting for him on the grounds. He taught a few classes on fishing and biology, which made sense, because everyone knew he was a fisherkirin before he got injured during the war.\n\n"Hello! We can get right to it - some students are saying you don't think you fit in here, and I wanted to ask about that."  Hoo'fran made a point not to look at his teachers' scarred, crippled leg. \n\n"W-well, I... everything here feels strange. I don't want to be disrespectful, you've all been so nice to us..." Hoo'fran trailed off, but Laverbreeze gestured for him to continue. "The cherries are too sour, and I don't like how incense smells, and - I just don't think I'm ever going to get used to kirin things, and, and-"\n\nThis time, the teacher cut him off. "You know, I had to change how I lived, too. I didn't have to get used to incense or sour cherries, but I did have to start a whole new life after I got hurt. I miss the sea, the way I think you miss home. The sea was home, for me." Laverbreeze trailed off, and took a deep breath, before picking back up. "You know what's important? That we've both been trying. You work hard in your lessons, you've made good friends, and you spend so much time working in that greenhouse. Volunteering after work assignments are over, even! You know that we donate all the extra food to a local hospital?" Hoo'fran shook his head. "You've been putting in the work thinking that you have to pay Fragrance back for taking you in. But folks doing that kind of work is why we could take you in at all. You're a model citizen, Hoo'fran. Fragrance is better for having you."\n\n"
+kirin_republic.1091.d:0 "Hoo'fran woke up this morning to a note asking him to go to a special interview about how he was adjusting to the city. He was even excused from a work assignment for it, so it must've been important. He headed straight there. One of the teachers, Laverbreeze, was waiting for him on the grounds. He taught a few classes on fishing and biology, which made sense, because everyone knew he was a fisherkirin before he got injured during the war.\n\n"Hello! We can get right to it - some students are saying you don't think you fit in here, and I wanted to ask about that." Hoo'fran made a point not to look at his teachers' scarred, crippled leg. \n\n"W-well, I... everything here feels strange. I don't want to be disrespectful, you've all been so nice to us..." Hoo'fran trailed off, but Laverbreeze gestured for him to continue. "The cherries are too sour, and I don't like how incense smells, and - I just don't think I'm ever going to get used to kirin things, and, and-"\n\nThis time, the teacher cut him off. "You know, I had to change how I lived, too. I didn't have to get used to incense or sour cherries, but I did have to start a whole new life after I got hurt. I miss the sea, the way I think you miss home. The sea was home, for me." Laverbreeze trailed off, and took a deep breath, before picking back up. "You know what's important? That we've both been trying. You work hard in your lessons, you've made good friends, and you spend so much time working in that greenhouse. Volunteering after work assignments are over, even! You know that we donate all the extra food to a local hospital?" Hoo'fran shook his head. "You've been putting in the work thinking that you have to pay Fragrance back for taking you in. But folks doing that kind of work is why we could take you in at all. You're a model citizen, Hoo'fran. Fragrance is better for having you."\n\n"
 kirin_republic.1091.a:0 "Being a kirin doesn't make one Fragrancese. Doing right by their comrades, does."
 
 kirin_republic.110.t:0 "A Tree, The Sea, And You, And Me" 
@@ -4908,23 +4918,23 @@ kirin_republic.1101.d:0 ""The Chair recognizes delegate Lychee. Delegate, for wh
 kirin_republic.1101.a:0 "Lychee sulked for a while... and then proposed a successful motion to start a swimming club."
 
 kirin_republic.112.t:0 "Blood In The Mellifluve"
-kirin_republic.112.d:0 "Rising Sun had ever paid homage to the poor kirin of Verdant, the first brave souls who had defied the Way of Fire to strike out their own way during the Silence. And though the center of the Rising Fire's energies had long shifted north to Chrysanthemum, Verdant enjoyed a pleasant, if largely forgotten, existence under their rule. Many had left to fight under Rising Sun's banners, those still home rejoiced in their newfound freedom, and the news from the front was triumphant and revolutionary. Perhaps Rising Sun was a bit self-aggrandizing, but such things can be forgiven in triumphant heroes of faith.\n\nPropaganda, however, does not hide the refuse of Kiria, which floats down the mighty Mellifluve and bobs through Verdant on the way to the sea. And the joyous mood in Verdant had long since soured as burnt timbers, toppled wagons, bloodied clothing, and an unceasing stream of corpses became caught in the foundations of the City of Stilts.\n\nWhen the messengers from Fragrance came to Verdant and told of the brutality of Rising Sun's forces, they found a city already simmering. The next morning, the Rising Fire's garrison found their barracks besieged by a furious mob of fisherkirin and firebrand preachers: those still true to the harmonic beginnings of their faith."
-kirin_republic.112.a:0 "If Chrysanthemum has stumbled into darkness, then Verdant will bear harmony's torch."
+kirin_republic.112.d:0 "Rising Sun had ever paid homage to the poor kirin of Verdant, the first brave souls who had defied the Way of Fire to strike out their own way during the Silence. And though the center of the Rising Fire's energies had long shifted north to [KIC.Capital.GetName], Verdant enjoyed a pleasant, if largely forgotten, existence under their rule. Many had left to fight under Rising Sun's banners, those still home rejoiced in their newfound freedom, and the news from the front was triumphant and revolutionary. Perhaps Rising Sun was a bit self-aggrandizing, but such things can be forgiven in triumphant heroes of faith.\n\nPropaganda, however, does not hide the refuse of Kiria, which floats down the mighty Mellifluve and bobs through Verdant on the way to the sea. And the joyous mood in Verdant had long since soured as burnt timbers, toppled wagons, bloodied clothing, and an unceasing stream of corpses became caught in the foundations of the City of Stilts.\n\nWhen the messengers from Fragrance came to Verdant and told of the brutality of Rising Sun's forces, they found a city already simmering. The next morning, the Rising Fire's garrison found their barracks besieged by a furious mob of fisherkirin and firebrand preachers: those still true to the harmonic beginnings of their faith."
+kirin_republic.112.a:0 "If [KIC.Capital.GetName] has stumbled into darkness, then Verdant will bear harmony's torch."
 
 kirin_republic.113.t:0 "So Long As There Is Peace And Plenty"
-kirin_republic.113.d:0 "Kindling Flash was in Sorghum when the call for help from Fragrance arrived. The Fragrancese messengers with their saddlebags loaded with photos and leaflets had proof enough of their wild claims - the Incarnadine Soldiery were engaged in a campaign that made Kindling Flash's stomach churn just to think of it. He'd seen the pictures of the cruelties that Rising Fire soldiers - doubtless some from right here in Sorghum! - had inflicted onto their victims.\n\nDid Rising Sun know? He had known now for a long time that there was only greed for power in her heart, but the things the Fragrancese were saying, whole villages vanishing in the night, corpses defiled... were these her orders? Or was this simply a matter of the soldiery being overzealous, far from the watchful eye of Chrysanthemum? He sent a telegram to the capital, reporting what he had seen, demanding an explanation, and while he awaited the reply, he spread the word of these abuses through the city, knowing what he might have to do.\n\nWhen a train from Chrysanthemum disgorged a contingent of Incarnadine Soldiery proclaiming the warrant for his arrest, there was no choice. So Kindling sparked a blaze, and in the fashion of Fragrance, there was a glorious day of revolution in Sorghum. Now the better-than-thou rumblings in Providence would have to stop - for the West was standing up against Chrysanthemum, too."
+kirin_republic.113.d:0 "Kindling Flash was in Sorghum when the call for help from Fragrance arrived. The Fragrancese messengers with their saddlebags loaded with photos and leaflets had proof enough of their wild claims - the Incarnadine Soldiery were engaged in a campaign that made Kindling Flash's stomach churn just to think of it. He'd seen the pictures of the cruelties that Rising Fire soldiers - doubtless some from right here in Sorghum! - had inflicted onto their victims.\n\nDid Rising Sun know? He had known now for a long time that there was only greed for power in her heart, but the things the Fragrancese were saying, whole villages vanishing in the night, corpses defiled... were these her orders? Or was this simply a matter of the soldiery being overzealous, far from the watchful eye of [KIC.Capital.GetName]? He sent a telegram to the capital, reporting what he had seen, demanding an explanation, and while he awaited the reply, he spread the word of these abuses through the city, knowing what he might have to do.\n\nWhen a train from [KIC.Capital.GetName] disgorged a contingent of Incarnadine Soldiery proclaiming the warrant for his arrest, there was no choice. So Kindling sparked a blaze, and in the fashion of Fragrance, there was a glorious day of revolution in Sorghum. Now the better-than-thou rumblings in Providence would have to stop - for the West was standing up against [KIC.Capital.GetName], too."
 kirin_republic.113.a:0 "We'll show her a hundred-day campaign - right to her throne."
 
 kirin_republic.114.t:0 "What We Rightfully Stole"
-kirin_republic.114.d:0 "There was nothing that the kirin from Fragrance were preaching that General [SBC.GetLeader] had not already heard before. She'd read the reports, back when she still cared. When being a general of the Republic had meant something more than signing stacks of death warrants for 'reactionaries' she knew well were mostly innocent peasants.\n\nShe was true to the path of the Rising Fire. These revolutionaries from Fragrance had little to tell her that she would listen to. But what did linger on her mind was something from her time closer to the frontlines.\n\nAs she had lead the Rising Fire's forces to victory over Vermilion, many rich kirins' treasures had been requisitioned and shipped back behind the lines. For redistribution, of course, but now that she thought about it, she'd never heard of much ending up redistributed. There must be stashes of plundered riches squirreled away around Chrysanthemum for Rising Sun's personal enjoyment. Stashes which [SBC.GetLeader] had stolen for her.\n\nWhen the Fragrancese had come, she spotted her chance, and immediately begun to plan. There was an obvious spot - the hill-country north of Chrysanthemum. And an obvious mission.\n\n[SBC.GetLeader] had strict orders to redistribute wealth to the nation. Well. Now she'd found who was hoarding it."
+kirin_republic.114.d:0 "There was nothing that the kirin from Fragrance were preaching that General [SBC.GetLeader] had not already heard before. She'd read the reports, back when she still cared. When being a general of the Republic had meant something more than signing stacks of death warrants for 'reactionaries' she knew well were mostly innocent peasants.\n\nShe was true to the path of the Rising Fire. These revolutionaries from Fragrance had little to tell her that she would listen to. But what did linger on her mind was something from her time closer to the frontlines.\n\nAs she had lead the Rising Fire's forces to victory over Vermilion, many rich kirins' treasures had been requisitioned and shipped back behind the lines. For redistribution, of course, but now that she thought about it, she'd never heard of much ending up redistributed. There must be stashes of plundered riches squirreled away around [KIC.Capital.GetName] for Rising Sun's personal enjoyment. Stashes which [SBC.GetLeader] had stolen for her.\n\nWhen the Fragrancese had come, she spotted her chance, and immediately begun to plan. There was an obvious spot - the hill-country north of Chrysanthemum. And an obvious mission.\n\n[SBC.GetLeader] had strict orders to redistribute wealth to the nation. Well. Now she'd found who was hoarding it."
 kirin_republic.114.a:0 "In the name of Concord, Sun - your money, or your life."
 
 kirin_republic.115.t:0 "The Old Guard In A New Fight"
-kirin_republic.115.d:0 "Revolutionary Fragrance's heroic tale, regardless of whether the news was triumphant or tragic, made Silver Thatch grit his teeth anytime he heard it. He remembered well the day his city had exploded into chaos, rebelling against Rising Sun. He had been her reluctant supporter, then. Seeing what had happened on the streets that day, he was no more. But Fragrance was too small to win, too weak, too reactionary at its heart - and more importantly, his pride was too strong to fight alongside what he had condemned at birth.\n\nWhich is why Thatch found himself with a band of Marksist die-hards in the dappled woods south of Massicot, drawing up plans. They'd cut deals with all the local resistance members, they'd carefully gathered their forces while Chrysanthemum's eye was on Fragrance and the north. But the annoying missives from Fragrance were right - if there was a time to strike, it was now.\n\nThatch looked over his plans. Barracks to storm, bridges to blow, depots to burn, junctions to block. They had to strike hard, make themselves look like a threat to Massicot, to draw the Rising Fire's attention. His old training came back to him. A guerrilla war in the countryside. Hit and run. Living among the peasantry. His fellow party faithful, many themselves fled from Fragrance, stood gathered around, waiting for his leadership."
+kirin_republic.115.d:0 "Revolutionary Fragrance's heroic tale, regardless of whether the news was triumphant or tragic, made Silver Thatch grit his teeth anytime he heard it. He remembered well the day his city had exploded into chaos, rebelling against Rising Sun. He had been her reluctant supporter, then. Seeing what had happened on the streets that day, he was no more. But Fragrance was too small to win, too weak, too reactionary at its heart - and more importantly, his pride was too strong to fight alongside what he had condemned at birth.\n\nWhich is why Thatch found himself with a band of Marksist die-hards in the dappled woods south of Massicot, drawing up plans. They'd cut deals with all the local resistance members, they'd carefully gathered their forces while Rising Sun's eye was on Fragrance and the north. But the annoying missives from Fragrance were right - if there was a time to strike, it was now.\n\nThatch looked over his plans. Barracks to storm, bridges to blow, depots to burn, junctions to block. They had to strike hard, make themselves look like a threat to Massicot, to draw the Rising Fire's attention. His old training came back to him. A guerrilla war in the countryside. Hit and run. Living among the peasantry. His fellow party faithful, many themselves fled from Fragrance, stood gathered around, waiting for his leadership."
 kirin_republic.115.a:0 ""It's now or never, kirin. Pull every trigger we've got.""
 
 kirin_republic.116.t:0 "A Little Treason By The Sea"
-kirin_republic.116.d:0 "Ember Wane stood at the wharves of Hyacinth, watching ships bobbing in the harbor and the distant, hazy outline of Auburn Isle on the horizon. Today was the day.\n\nThere were pawns still out of place on the board, kirin not yet swayed who should have been. His thicket of contacts from his days as Vermilion's spymaster was much thinned these past few years. He wasn't sure exactly what he was about to do, who he was about to declare for - but one thing was certain. The Rising Fire had to go.\n\nThere was no Realm to restore now, the Matriarchate was destroyed. Someone, he was unsure who, would deliver a stable Kiria, given enough time. He had been preparing these southern provinces, ready to deliver them to the right kirin, one who could restore peace - but there was no time to pick the perfect candidate. Fragrance was rallying Kiria to its cause, and the Rising Fire were stretched thin with revolt and revolution on every hoof. If Rising Sun was to fall - and she had to fall - then Wane had to act now.\n\nOne stroke of his pen, one code word, one missive handed off to the bannerkirin standing behind him. By the end of the afternoon, the Banner of the Covered Cage had sprung their traps, and the Rising Fire's lackeys from Teak to Basalt found themselves betrayed by bribed garrisons and blackmailed commanders."
+kirin_republic.116.d:0 "Ember Wane stood at the wharves of Hyacinth, watching ships bobbing in the harbor and the distant, hazy outline of Auburn Isle on the horizon. Today was the day.\n\nThere were pawns still out of place on the board, kirin not yet swayed who should have been. His thicket of contacts from his days as Vermilion's spymaster was much thinned these past few years. He wasn't sure exactly what he was about to do, who he was about to declare for - but one thing was certain. The Rising Fire had to go.\n\nThere was no Realm to restore now, the Matriarchate was destroyed. Someone, he was unsure who, would deliver a stable Kiria, given enough time. He had been preparing these southern provinces, ready to deliver them to the right kirin, one who could restore peace - but there was no time to pick the perfect candidate. Fragrance was rallying Kiria to its cause, and the Rising Fire were stretched thin with revolt and revolution on every hoof. If Rising Sun was to fall - and she had to fall - then Wane had to act now.\n\nOne stroke of his pen, one code word, one missive hoofed off to the bannerkirin standing behind him. By the end of the afternoon, the Banner of the Covered Cage had sprung their traps, and the Rising Fire's lackeys from Teak to Basalt found themselves betrayed by bribed garrisons and blackmailed commanders."
 kirin_republic.116.a:0 "The South, for now, was theirs."
 
 kirin_republic.117.t:0 "The Small Matter Of Payroll"
@@ -4936,7 +4946,7 @@ kirin_republic.118.d:0 "Not a Realm, she had said, but a Republic, a Kiria of th
 kirin_republic.118.a:0 "The good student does as their master says, not as they do."
 
 kirin_republic.119.t:0 "The Sun Sets In The West"
-kirin_republic.119.d:0 "Matriarch-Protector Rising Sun appeared to be missing this morning, following a thorough search of the entire capital. Auspiciously, her disappearance comes on the tail of triumphant celebrations by the Fragrancese revolutionaries - reports of red banners fluttering over Vermilion confirm that the rebels secured full control over the ancient capital of the old Realm.\n\nThe Fraternal Republic, meanwhile, is all but shattered.\n\nWith rebellion in provinces once considered bastions of Chrysanthemum's power and the Fragrancese revolution overrunning the heart of Kiria, Rising Sun's flame has been snuffed out. The moment that the general public learned of the Matriarch-Protector's disappearance, a wave of defections, surrenders, and other high-ranking disappearances destroyed whatever was left. In the wake of this apparent abdication, whatever provincial or popular authorities remain are quickly pledging themselves to the victorious revolutionaries. Fragrance's authorities were quick to announce a radical new vision for a Second Kirian Republic, one with the absolute self-determination of the provinces as its highest ideal."
+kirin_republic.119.d:0 "Matriarch-Protector Rising Sun appeared to be missing this morning, following a thorough search of the entire capital. Auspiciously, her disappearance comes on the tail of triumphant celebrations by the Fragrancese revolutionaries - reports of red banners fluttering over Vermilion confirm that the rebels secured full control over the ancient capital of the old Realm.\n\nThe Fraternal Republic, meanwhile, is all but shattered.\n\nWith rebellion in provinces once considered bastions of the Rising Fire's power and the Fragrancese revolution overrunning the heart of Kiria, Rising Sun's flame has been snuffed out. The moment that the general public learned of the Matriarch-Protector's disappearance, a wave of defections, surrenders, and other high-ranking disappearances destroyed whatever was left. In the wake of this apparent abdication, whatever provincial or popular authorities remain are quickly pledging themselves to the victorious revolutionaries. Fragrance's authorities were quick to announce a radical new vision for a Second Kirian Republic, one with the absolute self-determination of the provinces as its highest ideal."
 kirin_republic.119.a:0 "Kiria has deposed its last Matriarch."
 
 kirin_republic.200.t:0 "A Revolution Homecoming"
@@ -4954,7 +4964,7 @@ KIR_republic_202_tt:0 "Unlocks §YNew Foci§! for the §Cdemocratization§! of 
 KIC_democratic_ending_flag:0 "Rising Sun has relinquished power."
 
 kirin_republic.203.t:0 "The Faint Fragrance of Forgiveness"
-kirin_republic.203.d:0 "Dayspring blew faintly on the ink drying on the sheet of parchment paper to help it along, then paused to consider her words. Though the characters would be transcribed  by printing presses and dispersed across the Realm through telegraph, she gave what would soon become an executive order in the vein of the imperial decrees of the Matriarchs the attention to detail and polish it deserved before presenting it to Rising Sun for her signature. Though, she decided, it wasn't the parchment itself as the reason why she gave it such attention, but the message it contained.\n\nWith Rising Sun's announcement that the democratization of Kiria had finally begun, one of the first and loudest new movements that finally felt safe and confident enough to make its voice heard was to grant amnesty to the Fragrancese Revolutionaries. Though the kirin of Fragrance had been put down and forced under strict military occupation by the Incarnadine Soldiery for daring to oppose the Rising Fire, many agreed that it was time to loosen the reins and extend a hoof in forgiveness. Prison camps would be emptied, the military garrison in the city reduced to a skeleton crew, and delegates from both Vermilion and Fragrance would meet to discuss terms on autonomy and freedom that would dictate the latter's relationship to the former as a member of the Republic. Even though they had lost their revolt, it seemed like the kirin of Fragrance got what they wanted in the end.\n\nDayspring paused as she thought that over. No, the revolt had not lost. They fought for what they believed in, and even though it had been squashed, they had established their position with blood, and when Vermilion invited them back to the negotiating table, they had a clear and strong hoof to play. Perhaps the Fragrancese struggle of death and destruction mirrored the Rising Fire's in a way nokirin thought possible at the time... though of course, it would need to be seen in practice to be believed.\n\nHumming, Dayspring rolled up the scroll and set off to find Rising Sun for her signature."
+kirin_republic.203.d:0 "Dayspring blew faintly on the ink drying on the sheet of parchment paper to help it along, then paused to consider her words. Though the characters would be transcribed by printing presses and dispersed across the Realm through telegraph, she gave what would soon become an executive order in the vein of the imperial decrees of the Matriarchs the attention to detail and polish it deserved before presenting it to Rising Sun for her signature. Though, she decided, it wasn't the parchment itself as the reason why she gave it such attention, but the message it contained.\n\nWith Rising Sun's announcement that the democratization of Kiria had finally begun, one of the first and loudest new movements that finally felt safe and confident enough to make its voice heard was to grant amnesty to the Fragrancese Revolutionaries. Though the kirin of Fragrance had been put down and forced under strict military occupation by the Incarnadine Soldiery for daring to oppose the Rising Fire, many agreed that it was time to loosen the reins and extend a hoof in forgiveness. Prison camps would be emptied, the military garrison in the city reduced to a skeleton crew, and delegates from both Vermilion and Fragrance would meet to discuss terms on autonomy and freedom that would dictate the latter's relationship to the former as a member of the Republic. Even though they had lost their revolt, it seemed like the kirin of Fragrance got what they wanted in the end.\n\nDayspring paused as she thought that over. No, the revolt had not lost. They fought for what they believed in, and even though it had been squashed, they had established their position with blood, and when Vermilion invited them back to the negotiating table, they had a clear and strong hoof to play. Perhaps the Fragrancese struggle of death and destruction mirrored the Rising Fire's in a way nokirin thought possible at the time... though of course, it would need to be seen in practice to be believed.\n\nHumming, Dayspring rolled up the scroll and set off to find Rising Sun for her signature."
 kirin_republic.203.a:0 "Did anykirin really lose when both sides got what they wanted in the end?"
 
 kirin_republic.204.t:0 "Taking the Politics out of Prisons"
@@ -4985,6 +4995,7 @@ kirin_republic.209.d:0 "[This.GetNewspaperHeader]As the polls close and the ball
 kirin_republic.209.a:0 "Best of luck to our sisters in Blossom!"
 
 KIC_authoritarian_ending_flag:0 "Rising Sun reigns supreme."
+KIC_8_hundred_days_campaign_completed_flag:0 "All eight Hundred Day Campaigns have been completed."
 
 kirin_republic.300.t:0 "The Zenith of the Sun"
 kirin_republic.300.d:0 "Rising Sun stood in the Verdigris Rotunda, surrounded by powerful kirin from all across the Realm. Leaders of the Incarnadine Soldiery and the most influential members of the Rising Fire looked on in awe, and perhaps some apprehension, as Rising Sun stood before them dressed in fiery, flowing robes. She wasted little time before launching forward with her address, feeling completely confident and in control of the air she commanded. "The time has come for radical changes," she announced to them all, her piercing, burning gaze sweeping over the gathered kirin one by one. "The republic is an unsteady, dangerous thing. Everywhere we look, heretics, hedonists, and foreign infiltrators turn the tools of democracy against us. Every loophole in the law is exploited, and insidious agents tie knots in our faith. If our work is to continue, if we are to keep what we have gained, this cannot happen any longer."\n\nHer audience listened in enraptured silence, and the corners of Rising's lips curved upwards. They were true believers, she could tell. Zealous and loyal. "Tomorrow, I will assume the mantle of Supreme Matriarch of Kiria. The Rising Fire has flourished under my guidance; when I merge the responsibilities as head of our faith with those of the head of state, the Realm will grow stronger than ever before. Where the republic was weak, the Realm of the Kirin under my guidance will be eternal and infallible. I shall bring freedom and prosperity to all kirin, regardless of where they are, as Concord demands it. The Incarnadine Soldiery will be my bow, and they shall let fly the arrow of Concord's justice at our enemies, wherever they may be. The Banner Jurisdictions shall be my voice, and they shall let it be heard with absolute clarity throughout the Realm."\n\nThen she swept her eyes over the crowd once more. "And you all shall be my foals, those who will build the Realm with me. As you once bowed before the Matriarch Superior, kneel before me as your Supreme Matriarch. Your loyalty will be rewarded, and your flames will grow brighter than ever before. Let me know now if I should nurture them or snuff them out.""
@@ -5732,9 +5743,9 @@ KIR_silence_organisation2_tt:0 "Division Organization: §G+15.0%§!"
 KIR_silence_minimumtraining2_tt:0 "Minimum training level: §G-20%§!"
 KIR_silence_experience1_tt:0 "Army Experience Gain: §G+10.0%§!"
 KIR_silence_experience2_tt:0 "Army Experience Gain: §G+20.0%§!"
-KIR_silence_consumergoods_tt:0 "Consumer Goods Factories: §Y-5%§!"
-KIR_silence_consumergoods1_tt:0 "Consumer Goods Factories: §Y-3%§!"
-KIR_silence_consumergoods2_tt:0 "Consumer Goods Factories: §Y-2%§!"
+KIR_silence_consumergoods_tt:0 "Consumer Goods Factories: §Y-10%§!"
+KIR_silence_consumergoods1_tt:0 "Consumer Goods Factories: §Y-6%§!"
+KIR_silence_consumergoods2_tt:0 "Consumer Goods Factories: §Y-4%§!"
 KIR_silence_general_cost1_tt:0 "Military Leader Cost: §G-25.0%§!"
 KIR_silence_planning1_tt:0 "Planning Speed: §G+25.0%§!"
 KIR_silence_planning2_tt:0 "Planning Speed: §G+10.0%§!"
@@ -6156,6 +6167,7 @@ KIR_Industry_WK:0 "Industrialise Western Kiria"
 KIR_Industry_WK_req_tt:0 "Every State in §YWestern Kiria§! (§YWestern Territories§! and §Y[926.GetName]§!) has at least §Y1 Civilian Factory§!"
 KIR_Industry_Literacy:0 "Reading and Writing Campaign"
 KIR_Industry_Science:0 "Science and Innovation Campaign"
+KIR_toggle_diet_auto_renew_turn_on:0 "§CToggle§! the §YEnable Automatic Re-selection of Incumbent Party§! £decision_icon_small Decision to §Gautomatically re-select§! the §YRuling Party§! in a Provincial Diet upon the end of their incumbency for a subsequent term."
 KIR_toggle_diet_auto_renew_on:0 "Enable Automatic Re-selection of Incumbent Party"
 KIR_toggle_diet_auto_renew_on_tt:0 "Upon the end of the incumbency of the §YRuling Party§! in a Provincial Diet, they will be §Gautomatically re-selected§! for a subsequent term.\n"
 KIR_toggle_diet_auto_renew_off:0 "Disable Automatic Re-selection of Incumbent Party"
@@ -7274,7 +7286,7 @@ FRV_Focus_5_desc:0 "Fragrance's former police force is still armed, and trained,
 FRV_Focus_6:0 "The Party Remnants"
 FRV_Focus_6_desc:0 "The organized defence of Fragrance is being led by a former NAKP commander, Alpenstrine. She's very skilled, but sooner or later, we're going to have to confront her... problematic, beliefs."
 FRV_Focus_7:0 "The Arks of Fragrance"
-FRV_Focus_7_desc:0 "Thousands of refugees are trying to flee Fragrance by sea, but the sitaution at the harbour is deteriorating into chaos. Something has to be done or there's going to be a stampede."
+FRV_Focus_7_desc:0 "Thousands of refugees are trying to flee Fragrance by sea, but the situation at the harbour is deteriorating into chaos. Something has to be done or there's going to be a stampede."
 FRV_Focus_8:0 "Revolution in One City?"
 FRV_Focus_8_desc:0 "Some in the Council feel Fragrance is doomed without help, and are suggesting we encourage the rest of Providence Demesne to join our revolution. Of course, this isn't without controversy..."
 FRV_Focus_9:0 "Seize the Bank Reserves"
diff --git a/localisation/english/country_KXN_l_english.yml b/localisation/english/country_KXN_l_english.yml
index 28d57f2150a..1335399f217 100644
--- a/localisation/english/country_KXN_l_english.yml
+++ b/localisation/english/country_KXN_l_english.yml
@@ -6,4 +6,9 @@ lan_kir_placeholder.1.a:0 "Zaikiria will be whole!"
 
 lan_kir_placeholder.2.t:0 "Conquest of Kiria"
 lan_kir_placeholder.2.d:0 "The Realm of Kiria, the ancestral homeland, has fallen to decadence and corruption. It is time for us to march on Vermilion and save our Kirian brethren from themselves, to restore the rightful rule of the Matriarchs Superior, aided and assisted by her loyal Banners, over kirinity."
-lan_kir_placeholder.2.a:0 "The orphans of the Silence are coming home."
\ No newline at end of file
+lan_kir_placeholder.2.a:0 "The orphans of the Silence are coming home."
+
+lan_kir_placeholder.100.t:0 "[FROM.GetNameDefCap] Threatens War!"
+lan_kir_placeholder.100.d:0 "[FROM.GetNameDefCap] is massing troops on our border. We must prepare to defend ourselves against their invasion!"
+lan_kir_placeholder.100.a:0 "To arms!"
+lan_kir_placeholder_100_tt:0 "Gains §YAnnex§! war goal against §Y[ROOT.GetNameDef]§!."
\ No newline at end of file
diff --git a/localisation/english/country_LNS_l_english.yml b/localisation/english/country_LNS_l_english.yml
index 67e4c6dc6de..a78d6286b25 100644
--- a/localisation/english/country_LNS_l_english.yml
+++ b/localisation/english/country_LNS_l_english.yml
@@ -2108,7 +2108,7 @@ starry_dead:0 "Starry Night has perished"
 LSC_national_transformation:0 "Construction of Destiny"
 LSC_interspecies_study_groups_tooltip:0 "Modify §YConstruction of Destiny§! by\nResearch Speed: §G+5.00%§!\n"
 LSC_full_employment_tooltip:0 "Modify §YConstruction of Destiny§! by\n£prod_eff_cap  Production Efficiency Cap: §G+10.00%§!\nFactory Output: §G+10.00%§!"
-LSC_pantheon_construction_tooltip:0 "Modify §YConstruction of Destiny§! by\nWar Support: §G+10.00%§!\nConsumer Goods Factories: §Y-5%§!"
+LSC_pantheon_construction_tooltip:0 "Modify §YConstruction of Destiny§! by\nWar Support: §G+10.00%§!\nConsumer Goods Factories: §Y-10%§!"
 LSC_language_reconstruction_tooltip:0 "Modify §YConstruction of Destiny§! by\nWar Support: §G+10.00%§!\nRecruitable Population Factor: §G+10%§!"
 LSC_vadeiva_cult_tooltip:0 "Modify §YConstruction of Destiny§! by\nPolitical Power Gain: §G+5%§!\nDivision Recovery Rate: §G+10.0%§!"
 LSC_forced_integration_tooltip:0 "Modify §YConstruction of Destiny§! by\nRecruitable Population Factor: §G+10%§!\n"
diff --git a/localisation/english/country_MAN&ELF_l_english.yml b/localisation/english/country_MAN&ELF_l_english.yml
index eafc0ac2858..61a27a3c70f 100644
--- a/localisation/english/country_MAN&ELF_l_english.yml
+++ b/localisation/english/country_MAN&ELF_l_english.yml
@@ -427,7 +427,7 @@ ABILITY_FRIENDSHIP_DESC:0 "Inherent in Friendship is the ideal of self-sacrifice
 ABILITY_FRIENDSHIP_TOOLTIP:0 "Pro Amicis Mori ($LEADER$)"
 
 #AUTONOMY STATE/COSMETIC TAGS
-autonomy_de_jure_puppet:0 "De Jure Puppet"
+autonomy_de_jure_puppet:0 "De Iure Puppet"
 
 MAN_CHN_autonomous_fascism:0 "Manehattan Autonomous Protectorate"
 MAN_CHN_autonomous_fascism_DEF:0 "the Autonomous Government of the Changeling Protectorate of Manehattan and Eastern Equestria"
@@ -746,7 +746,7 @@ MAN_extra_5_desc:0 "Queen Chrysalis, being the tyrant she is (hush-hush about th
 MAN_extra_6:0 "A National Bourgeoisie"
 MAN_extra_6_desc:0 "If we wish to maintain our prosperity, the ponies of the former establishment should be further incorporated into our state apparatus. Power over civilian affairs is to be further devolved to the national bourgeoisie, comprised of the upper crust of pony society from whose ranks we found our collaborationist allies."
 MAN_extra_7:0 "From the High Tower"
-MAN_extra_7_desc:0 "While we have included the ponies in our government for the sake of unity, Lady Lilac is the one that guided the fledgling Protectorate into a modern state free from the stifling grip of Vesalipolis. Lady-Protectress Lilac is wise, and will continue managing the affairs of the Dominion and Federation from the Crystaller Building, with the help of her loyal Ost-Kommando."
+MAN_extra_7_desc:0 "While we have included the ponies in our government for the sake of unity, Lady Lilac is the one that guided the fledgling Protectorate into a modern state free from the stifling grip of Vesalipolis. Lady Protectress Lilac is wise, and will continue managing the affairs of the Dominion and Federation from the Crystaller Building, with the help of her loyal Ost-Kommando."
 #I seem to have skipped 8
 MAN_extra_9:0 "Love is Reciprocal"
 MAN_extra_9_desc:0 "The process of Love extraction had been one of the most controversial aspects of the early days of our rule. But that is no longer the case, as ponies realise that the benefit of our rule outweigh the hassle of the occasional Love feeding. After all, we provide security, stability, and prosperity, all in exchange for a reasonable quota of Love - a reciprocal and mutually-beneficial relationship."
@@ -755,7 +755,7 @@ MAN_extra_10_desc:0 "For the past month, our delegates and consuls have been vis
 MAN_extra_center:0 "Amending Fences"
 MAN_extra_center_desc:0 "The days of the Protectorate are behind us. No longer are we a territory to be assimilated into the greater Changeling Hegemony. Instead, we are a diverse nation, where pony and changeling work in tandem for a better future. In order to ensure good will, however, we will have to resolve long-standing conflicts stretching all the way back to the Great War. It's time to reconcile our differences."
 MAN_extra_the_last_one_i_swear:0 "Leaving the Hive"
-MAN_extra_the_last_one_i_swear_desc:0 "The day has finally come to end our status as a de-jure part of the Changeling Hegemony and transition into becoming an independent nation. The bird of Manehattan will finally be free from its cage. With one final stroke of bureaucratic genius, Lady-Protectress Lilac shall finally realise her dreams for a free and prosperous Dominion of the Federation of Eastern Equestria."
+MAN_extra_the_last_one_i_swear_desc:0 "The day has finally come to end our status as a de iure part of the Changeling Hegemony and transition into becoming an independent nation. The bird of Manehattan will finally be free from its cage. With one final stroke of bureaucratic genius, Lady Protectress Lilac shall finally realise her dreams for a free and prosperous Dominion of the Federation of Eastern Equestria."
 
 MAN_continuous_love_tax_sucking:0 "The Love Harvest" #continuous foci
 MAN_continuous_love_tax_sucking_desc:0 "We will engage in intensified harvesting of Love from our pony population to increase our stockpile of erots for future use."
@@ -2173,7 +2173,7 @@ MAN_ELF.123.d:0 "It has been eight hours, and still, the jaeger squadrons have n
 MAN_ELF.123.a:0 ""That is probably our best shot.""
 
 MAN_ELF.124.t:0 "Meeting Transcript"
-MAN_ELF.124.d:0 "FROM THE OST-KOMMANDO OF THE MANEHATTAN PROTECTORATE | CONFIDENTIAL MEETING REGARDING SPECIAL AFFAIRS | [GetYear]\nThis meeting of the Ost-Kommando was called to order by Lady-Protectress Lilac today in the penthouse of the Crystaller Building. All officers of the Ost-Kommando were ordered to attend.\nApproval of Agenda: The agenda was unanimously approved as presented.\nAfter numerous failed attempts at pacifying Manehattan, the Ost-Kommando's agenda has been lagging behind for months, stunting the growth of the collaborator apparatus and leaving the garrisons weakened, with the E.L.F. growing stronger by the day. The final of a series of proposals in the meeting was presented by Lady Lilac herself - a comprehensive plan to flush out the resistance by provoking the ponies into rising up on our terms. The plan includes a number of components: conducting false flag attacks, infiltrating the E.L.F. and ensuring an advantage in the premature rebellion. The plan is highly risky and it could end in disaster for the Ost-Kommando, but Lady Lilac believes there are no other options at this point in time. It is also imperative that the plan remain top secret, as it would be considered high treason by Vesalipolis and would provoke a strong reaction from loyalist officers in the garrisons. To this end, the attendants of the meeting were made to swear a sacred oath of secrecy. The meeting was adjourned and the plan was immediately set in motion."
+MAN_ELF.124.d:0 "FROM THE OST-KOMMANDO OF THE MANEHATTAN PROTECTORATE | CONFIDENTIAL MEETING REGARDING SPECIAL AFFAIRS | [GetYear]\nThis meeting of the Ost-Kommando was called to order by Lady Protectress Lilac today in the penthouse of the Crystaller Building. All officers of the Ost-Kommando were ordered to attend.\nApproval of Agenda: The agenda was unanimously approved as presented.\nAfter numerous failed attempts at pacifying Manehattan, the Ost-Kommando's agenda has been lagging behind for months, stunting the growth of the collaborator apparatus and leaving the garrisons weakened, with the E.L.F. growing stronger by the day. The final of a series of proposals in the meeting was presented by Lady Lilac herself - a comprehensive plan to flush out the resistance by provoking the ponies into rising up on our terms. The plan includes a number of components: conducting false flag attacks, infiltrating the E.L.F. and ensuring an advantage in the premature rebellion. The plan is highly risky and it could end in disaster for the Ost-Kommando, but Lady Lilac believes there are no other options at this point in time. It is also imperative that the plan remain top secret, as it would be considered high treason by Vesalipolis and would provoke a strong reaction from loyalist officers in the garrisons. To this end, the attendants of the meeting were made to swear a sacred oath of secrecy. The meeting was adjourned and the plan was immediately set in motion."
 MAN_ELF.124.a:0 "The die has been cast."
 
 MAN_ELF.125.t:0 "Talking Over Drinks"
@@ -2248,7 +2248,7 @@ MAN_ELF.139.d:0 "With the most turbulent times of the Manehattan Protectorate be
 MAN_ELF.139.a:0 "Let's do a bit of digging, shall we?"
 
 MAN_ELF.140.t:0 "Behind Closed Doors"
-MAN_ELF.140.d:0 ""Really, Protectoress, I can handle this myself," Suri Polomare said trying to keep a polite smile on her face as she, Lilac, and two changeling commandos walked down the hall, stumbling trying to keep up. "There's no need for you to be here."\n\n"Hundreds of complaints from the garrison says otherwise," Lilac responded, not even bothering to give the pony the time of day. "If you didn't make the uniforms yourself, then I would like to meet the pony who did. It is either this, or we can raid this building with the Ost-Kommando. Would you prefer that?"\n\n"No, of course not," she answered quickly, "but the pony you're looking for is very busy, and-"\n\n"Surely she can make time for the Lady-Protectress of Manehattan." The three changelings all stopped, leaving Suri almost tumbling to the floor. "Now, where is she?"\n\nThe fashionista paused, seemingly weighing the options presented to her, which deepened Lilac's suspicions even further. Normally the earth pony was all-too eager to listen to changeling orders; this was something else. Finally, she seemed to make up her mind and moved to a nondescript office door, pulling out a key. "Believe me, I only had the best intentions in mind bringing her here..."\n\n"Suri?" a voice called out from inside. "Is it really lunchtime already? If it's a new order, I'm still not quite finished with the last one yet!"\n\nLilac's eyes narrowed. That voice... it was refined in a way different to what she was used to, sounding more like Canterlot than the Manehattanite culture she had started. Pushing past Suri into the room, her eyes had to adjust for a moment to the darkness, but she didn't need her full vision to instantly recognize the pony in front of her. The white coat stained with dirt, her purple mane out of place, yet there was only one pony it could be.\n\nLilac gasped in shock. "You? But you're supposed to be..." The two commandos hurried in behind her and gave similar noises of shock, the three staring at the mare in front of them."
+MAN_ELF.140.d:0 ""Really, Protectoress, I can handle this myself," Suri Polomare said trying to keep a polite smile on her face as she, Lilac, and two changeling commandos walked down the hall, stumbling trying to keep up. "There's no need for you to be here."\n\n"Hundreds of complaints from the garrison says otherwise," Lilac responded, not even bothering to give the pony the time of day. "If you didn't make the uniforms yourself, then I would like to meet the pony who did. It is either this, or we can raid this building with the Ost-Kommando. Would you prefer that?"\n\n"No, of course not," she answered quickly, "but the pony you're looking for is very busy, and-"\n\n"Surely she can make time for the Lady Protectress of Manehattan." The three changelings all stopped, leaving Suri almost tumbling to the floor. "Now, where is she?"\n\nThe fashionista paused, seemingly weighing the options presented to her, which deepened Lilac's suspicions even further. Normally the earth pony was all-too eager to listen to changeling orders; this was something else. Finally, she seemed to make up her mind and moved to a nondescript office door, pulling out a key. "Believe me, I only had the best intentions in mind bringing her here..."\n\n"Suri?" a voice called out from inside. "Is it really lunchtime already? If it's a new order, I'm still not quite finished with the last one yet!"\n\nLilac's eyes narrowed. That voice... it was refined in a way different to what she was used to, sounding more like Canterlot than the Manehattanite culture she had started. Pushing past Suri into the room, her eyes had to adjust for a moment to the darkness, but she didn't need her full vision to instantly recognize the pony in front of her. The white coat stained with dirt, her purple mane out of place, yet there was only one pony it could be.\n\nLilac gasped in shock. "You? But you're supposed to be..." The two commandos hurried in behind her and gave similar noises of shock, the three staring at the mare in front of them."
 MAN_ELF.140.a:0 "Rarity?!"
 
 MAN_ELF.141.t:0 "Chains of Generosity"
diff --git a/localisation/english/country_MIT_l_english.yml b/localisation/english/country_MIT_l_english.yml
index d98cd1a8fd0..526395e6379 100644
--- a/localisation/english/country_MIT_l_english.yml
+++ b/localisation/english/country_MIT_l_english.yml
@@ -626,6 +626,7 @@
  MIT_socalist_minotaurs:0 "Socialist Minotaurs"
  MIT_align_pact_opinion:0 "Asterionese-Wingbardian Reconciliation"
  MIT_SIC_commie_faction:0 "Concordat of Socialist Nations"
+ MIT_amtank_designer:0 "Amphibious Tank Designer" 
  
  MIT_has_completed_mic_focus:0 "If the focus '§YExpand the Military-Industrial Complex§!' has been completed:\n"
  
diff --git a/localisation/english/country_PLB_l_english.yml b/localisation/english/country_PLB_l_english.yml
index 069d91f0935..8cfca3bdad5 100644
--- a/localisation/english/country_PLB_l_english.yml
+++ b/localisation/english/country_PLB_l_english.yml
@@ -64,6 +64,7 @@ PLB_penguin_trotsky:0 "Ragnel Dahlin"
 PLB_falangist:0 "Askr of Volsugr"
 PLB_monarchist_guy:0 "Typpa of Volsugr"
 PLB_queen_guard:0 "Carapace the Feared"
+PLB_queen_guard_desc:0 "§YBorn§!: 12th of March 936\n§YRank§!:Korpsführer für die Nordfront\n§YBiography§!:Carapace was born into a connected family within Ditrysium which ensured, that when he grew up and joined the army, he was given a position of commander. Carapace would serve in this position during campaigns against deer fanatics in 962 and Hive of Vraks in 971, earning a reputation for brutality, battlefield cruelty, contempt for weakness, obsession with engaging in difficult battles and pushing himself through horrid conditions, in one case even continuing to fight despite acid burns. Due to this he was invited to join Chrysalis’ Queen’s Guard, where he quickly rose through the ranks.\n\nHowever, the star of Carapace would not rise far, despite a core of loyalists that formed around him. For he often clashed with other commanders over foreign policy. He cared little for geopolitics of love, limiting his own consumption to harden himself, and even less of subjugating Equestrians. In his mind, changelings either had to dominate the North or strike overseas, where harder foes than ponies awaited. To most commanders and queens, however, this sounded like ramblings of a madbug. Ramblings, which together with the failure of 1002, angered Chrysalis enough that she cast him out, assigning him to an obscure position near Soryth and sidelining his followers, pushing Lacin Cardo and his generation to even greater prominence than before.\n\nHowever Carapace found acceptance and even friendship within exiled bear clans that fled to Changeling lands after campaigns of Paw Wellington. He respected their militant culture, while they admired him for a perceived "frozen soul". And thus, when Bjornling marched east, Carapace volunteered to join. And while Chrysalis and Lacin seem to live under delusion that he is a senile old loyalist, merely supervising the Northern Protectorate, his spite is strong, his blood runs cold with revitalizing drugs and his loyalties lie in the North."
 PLB_queen_guard_alt:0 "Sternite the Noble"
 PLB_lorke_of_scyfling:0 "Lorke of Scyfling"
 PLB_yuri_of_the_south:0 "Yuri of the South"
@@ -112,8 +113,7 @@ PLB_NP_schizo_builds:0 "Modify §YThe Madbear Unchained§! by\nShared Building S
 PLB_NP_schizo_army:0 "Modify §YThe Madbear Unchained§! by\nArmy Attack: §G+5%§!\nArmy Recovery Rate: §G+10%§!"
 PLB_NP_schizo_bad:0 "Modify §YThe Madbear Unchained§! by\nMonthly Population: §R-5%§!"
 
-
-
+PLB_jagers_elite_tt:0 "Enables technology: §YElite Among Elite§! giving:!\n\nSpecial Forces:\nHP: §G+3%§!\nBreakthrough: §G+15%§!\nSoft Attack: §G+15%§!\nHard Attack: §G+15%§!\nDefense: §G+15%§!\n\nHowever Special Forces from now will require require:\nTraining time: §R+5%§!"\n§R30 more§! units of infantry equipment per battalion"\n§R5 more§! units of support equipment per battalion"
 
 ### Focus Trees ###
 polar_bear_focus:0 "the Starting Focus Tree"
@@ -4357,6 +4357,9 @@ PLB_exuvia_changelingia_fascism_ADJ:0 "Changeling-Bear"
 PLB_exu_equus_fascism:0 "Titanic Realm of Equus"
 PLB_exu_equus_fascism_DEF:0 "the Titanic Realm of Equus"
 PLB_exu_equus_fascism_ADJ:0 "Equus"
+PLB_wild_hunt:0 "Great Realm of the Wilds"
+PLB_wild_hunt_ADJ:0 "The Great Realm of the Wilds"
+PLB_wild_hunt_DEF:0 "Wilds"
 
 PLB_juche_desc:0 "Selvstendighet, sometimes translated as Self-Reliance, is the belief that the masses cannot self-regulate, but rather must be guided by a 'Great Leader' who is the mastermind of the working class. The Great Leader is without flaw and never commits mistakes, is always benevolent and always rules for the masses. The army is the greatest of all institutions guided by the Great Leader."
 
@@ -4844,7 +4847,14 @@ POLAR_AXIS:0 "Polar Axis"
  exu_war:0 "\n§9Ignite the War in Heaven§!"
  PLB_exuvia_unifier:0 "Primordial Ruler"
  
- 
+PLB_jagers_research:0 "The Queen's Guard Training Program"
+PLB_jagers2:0 "Jager Battalion II Upgrade"
+PLB_jagers3:0 "Jager Battalion III Upgrade"
+PLB_jagers4:0 "Jager Battalion IV Upgrade"
+PLB_jagers5:0 "Jager Battalion V Upgrade"
+PLB_jagers_armored:0 "Armour Them in Northern Steel"
+PLB_jagers_elite:0 "Forge the Northern Queen's Guard Into Elite Among Elite"
+
 
 
 PLB_remove_illiteracy:0 "End Illiteracy"
diff --git a/localisation/english/country_ROA_l_english.yml b/localisation/english/country_ROA_l_english.yml
index 8000aec666b..b7fa936c598 100644
--- a/localisation/english/country_ROA_l_english.yml
+++ b/localisation/english/country_ROA_l_english.yml
@@ -26,4 +26,9 @@ roam_placeholder.6.a:0 "They will be crushed beneath our hooves."
 
 roam_placeholder.7.t:0 "Conquest of Kiria"
 roam_placeholder.7.d:0 "The time has come.\n\nWe will conquer Kiria for [ROOT.GetNameDef].\n\nLong Live [ROOT.GetNameDef]!"
-roam_placeholder.7.a:0 "They will be crushed beneath our hooves."
\ No newline at end of file
+roam_placeholder.7.a:0 "They will be crushed beneath our hooves."
+
+roam_placeholder.100.t:0 "[FROM.GetNameDefCap] Threatens War!"
+roam_placeholder.100.d:0 "[FROM.GetNameDefCap] is massing troops on our border. We must prepare to defend ourselves against their invasion!"
+roam_placeholder.100.a:0 "To arms!"
+roam_placeholder_100_tt:0 "Gains §YAnnex§! war goal against §Y[ROOT.GetNameDef]§!."
\ No newline at end of file
diff --git a/localisation/english/country_SIC_l_english.yml b/localisation/english/country_SIC_l_english.yml
index 02b66b75a97..3dc98813ebb 100644
--- a/localisation/english/country_SIC_l_english.yml
+++ b/localisation/english/country_SIC_l_english.yml
@@ -1935,4 +1935,4 @@
  modifier_experience_gain_large_cruiser3_combat_factor:0 "Large cruiser combat factor"
  modifier_experience_gain_monitor_training_factor:0 "Monitor training factor"
  modifier_experience_gain_monitor_combat_factor:0 "Monitor combat factor"
- 
+ SIC_minotaurian_business_flag:0 "Sicameon-Minotaur Business Relations Established"
diff --git a/localisation/english/country_TRO_l_english.yml b/localisation/english/country_TRO_l_english.yml
index 4ea75ff1502..be8b2ae612b 100644
--- a/localisation/english/country_TRO_l_english.yml
+++ b/localisation/english/country_TRO_l_english.yml
@@ -1050,7 +1050,7 @@ TRO_CTH_gain_30_points_tp: "We will §Ggain§! 30 §YPoints§! in the §gGreat G
 TRO_CTH_disappear_tp: "§RThis national spirit will be removed if we we ever wage war against Colthage or if Colthage ceases to be independent§!"
 TRO_CTH_disappear_2_tp: "§RThis national spirit will be removed if we we ever wage war against Hippogriffia or if Hippogriffia ceases to be independent§!"
 TRO_CTH_disappear_3_tp: "§RThis national spirit will be removed if we we ever wage war against Chiropterra or if Chiropterra ceases to be independent§!"
-TRO_CTH_gerzanomics_tp: "§GCompleting§! this §Cfocus§! will grant us different §Ybonuses§! depending upon how many points we have managed to acquire during the §gGreat Game§!:\n - Acquiring §Y1§! - §Y25§! Points grants: No Reward\n - Acquiring §Y25§! - §Y50§! Points grants:\n      Gains §YBooming Economy§! which grants: (Monthly Population: §G+15.0%§!, Consumer Goods Factories §Y-5.0§!, £prod_eff_cap Production Efficiency Cap: §G+10.00%§!, Factory Output: §G+10.00%§!, Dockyard Output: §G+10.00%§!) for §Y730§! days\n - Acquiring §Y50§! - §Y75§! Points grants:\n      Gains §YBooming Economy§! which grants: (Monthly Population: §G+15.0%§!, Consumer Goods Factories §Y-5.0§!, £prod_eff_cap Production Efficiency Cap: §G+10.00%§!, Factory Output: §G+10.00%§!, Dockyard Output: §G+10.00%§!) for §Y1095§! days\n      (§YEvery owned core state§!):\n         Add §G1§! Building Slots\n         Add §Y1 Civilian Factory§!\n - Acquiring §Y75§! - §Y100§! Points grants:\n      Gains §YBooming Economy§! which grants: (Monthly Population: §G+15.0%§!, Consumer Goods Factories §Y-5.0§!, £prod_eff_cap Production Efficiency Cap: §G+10.00%§!, Factory Output: §G+10.00%§!, Dockyard Output: §G+10.00%§!) for §Y1460§! days\n      (§YEvery owned core state§!):\n         Add §G2§! Building Slots\n         Add §Y1 Civilian Factory§!\n         Add §Y1 Military Factory§!\nNote: Once this §Cfocus§! has been §Rcompleted§! the §gGreat Game§! mechanic will be permanently §Rdisabled§!\n"
+TRO_CTH_gerzanomics_tp: "§GCompleting§! this §Cfocus§! will grant us different §Ybonuses§! depending upon how many points we have managed to acquire during the §gGreat Game§!:\n - Acquiring §Y1§! - §Y25§! Points grants: No Reward\n - Acquiring §Y25§! - §Y50§! Points grants:\n      Gains §YBooming Economy§! which grants: (Monthly Population: §G+15.0%§!, Consumer Goods Factories §Y-5.0§!, £prod_eff_cap Production Efficiency Cap: §G+10.00%§!, Factory Output: §G+10.00%§!, Dockyard Output: §G+10.00%§!) for §Y730§! days\n - Acquiring §Y50§! - §Y75§! Points grants:\n      Gains §YBooming Economy§! which grants: (Monthly Population: §G+15.0%§!, Consumer Goods Factories §Y-10.0§!, £prod_eff_cap Production Efficiency Cap: §G+10.00%§!, Factory Output: §G+10.00%§!, Dockyard Output: §G+10.00%§!) for §Y1095§! days\n      (§YEvery owned core state§!):\n         Add §G1§! Building Slots\n         Add §Y1 Civilian Factory§!\n - Acquiring §Y75§! - §Y100§! Points grants:\n      Gains §YBooming Economy§! which grants: (Monthly Population: §G+15.0%§!, Consumer Goods Factories §Y-10.0§!, £prod_eff_cap Production Efficiency Cap: §G+10.00%§!, Factory Output: §G+10.00%§!, Dockyard Output: §G+10.00%§!) for §Y1460§! days\n      (§YEvery owned core state§!):\n         Add §G2§! Building Slots\n         Add §Y1 Civilian Factory§!\n         Add §Y1 Military Factory§!\nNote: Once this §Cfocus§! has been §Rcompleted§! the §gGreat Game§! mechanic will be permanently §Rdisabled§!\n"
 TRO_CTH_the_end_tp: "§gThank you for playing through yet another of Colthage's many paths - now please, go play something more interesting, like Hippogriffia.§!\n\n"
 
 ### Party Names ###
diff --git a/localisation/english/country_VED_l_english.yml b/localisation/english/country_VED_l_english.yml
index 281d43cc97c..f7274857fef 100644
--- a/localisation/english/country_VED_l_english.yml
+++ b/localisation/english/country_VED_l_english.yml
@@ -499,7 +499,7 @@
  VED_Princess_hos_TT:0 "§YPrincess Sköldsvärd§! gains:\n    "
  VED_Level_Up_Combat_tt:0 "Increase Skill Level and Skills"
  VED_Level_Up_Statecraft_tt:0 "Increase various Country Leader modifiers"
- VED_No_Charity_Teaching_Trait_tt:0 "§YPrincess Sköldsvärd the Cold§!\n      - Consumer Goods Factories: §Y-2%§!\n"
+ VED_No_Charity_Teaching_Trait_tt:0 "§YPrincess Sköldsvärd the Cold§!\n      - Consumer Goods Factories: §Y-4%§!\n"
  VED_Learn_From_Reformer_Prince_tt:0 "§YLycklig's Teachings§!\n      - Recruitable Population Factor: §G+5%§!\n      - Stability: §G+5.00%§!"
  VED_Learn_From_Fascist_Prince_tt:0 "§YOndska's Teachings§!\n      - War Support: §G+10%§!"
  VED_Learn_From_Welfare_tt:0 "§YWelfare Focus§!\n      - Recruitable Population Factor: §G+5%§!\n      - Stability Factor: §G+5%§!"
diff --git a/localisation/english/country_YAL_l_english.yml b/localisation/english/country_YAL_l_english.yml
index ccf1b43fc65..1448196aeef 100644
--- a/localisation/english/country_YAL_l_english.yml
+++ b/localisation/english/country_YAL_l_english.yml
@@ -2181,6 +2181,7 @@
  YAL_Wurst_Cervelat:0 "Wurst Cervelat"
  YAL_Wurst_Cervelat_desc:0 "§YBorn§!: 4th of February, 967 in Greenback\n§YPosition§!: Party leader of NDPH\n§YBiography§!: Cervelat loves to eat."
  YAL_tommykay:0 "Thomas Kesselclaw"
+ YAL_tommykay_desc:0 "§YBorn:§! 13th of September, 979 in Middenheim\n§YRank:§! Freshly promoted Wachtmeister\n§YBiography:§! Many generals of the Empire outside of Yales territories were shocked by the election of a mere Garrison Hauptmann such as Thomas was able to receive a title of a Wachtmeister without any military achievements whatsoever, that was, until they got invited for a professional wargame session against Thomas himself. The voices of discontent were much more silent after the remarkable feat that was Thomas victory in a wargame match against the Field Marshal Bronzetail himself, opening a way for this young griff to show his "superior tactics and maneuvers" onto a real battlefield, with a smirk of pride and overconfidence by his side, this firebrand newbie is ready to face the real life wargame. "
 
  YAL_tank_development:0 "Tank Development Programs"
  YAL_tank_development_desc:0 "We must remain on the cutting-edge of armoured warfare if we are to survive. New development programs will allow our tanks to outperform all others."
diff --git a/localisation/english/country_ZAR_l_english.yml b/localisation/english/country_ZAR_l_english.yml
index 197d79607f1..938910d83fe 100644
--- a/localisation/english/country_ZAR_l_english.yml
+++ b/localisation/english/country_ZAR_l_english.yml
@@ -300,7 +300,7 @@
 
  ZAR_trans_zebharan_project_participation_tt:0 "We will pay §YZarantia§! to connect us to the §YTrans-Zebharan Railroad§!! Upon §YZarantia§! finishing the construction, we will gain the §YNational Spirit§! §CTrans-Zebharan Railroad§!. This §YNational Spirit§! will §Cimprove§! the more §Ycountries§! join §YZarantia§! on this project."
  ZAR_trans_zebharan_project_added_modifier_tt:0 "Modifies §YTrans-Zebharan Railroad§! to grant:"
- ZAR_trans_zebharan_project_added_new_nation_tt:0 "  Consumer Goods Factories: §Y-0.5%§!\n  Factory Output: §G+2%§!\n\nThe §YTarget Country§! will also §Cgain§! this §YNational Spirit§!!\n"
+ ZAR_trans_zebharan_project_added_new_nation_tt:0 "  Consumer Goods Factories: §Y-1%§!\n  Factory Output: §G+2%§!\n\nThe §YTarget Country§! will also §Cgain§! this §YNational Spirit§!!\n"
 
  ZAR_socialist_rebellion_swap_tt:0 "§YSelecting this option will make you play as the Zarantian Rebels!§!"
 
@@ -376,27 +376,27 @@
 
  ZAR_empire_core_BAT:0 "The Reformation of Chiropterra"
  ZAR_empire_core_BAT_desc:0 ""
- ZAR_empire_core_BAT_tt:0 "[ZAR_EMPIRE_Core_scripted_loc_start] §YHegemon of North Zebrica§! [ZAR_EMPIRE_Core_scripted_loc_end]\n  Daily Political Power Gain: §G+0.08§!\n  Recruitable Population Factor: §G+2%§!\n  Consumer Goods Factories: §Y-1.0%§!\n  Factory Output: §G+2.00%§!\n\n[ZAR_EMPIRE_Core_scripted_loc_start] §YZarantian Imperial Core§! in our §YImperial Core States§! [ZAR_EMPIRE_Core_scripted_loc_end]\n  Max Factories in State: §G+8%§!\n  Local Construction Speed: §G+2%§!\n\nWe will integrate §YChiropterra§! within the §YZarantian Empire§!. Their territories will become our §CCores§!. §YChiropterra§! will receive nominal autonomy as a reformed §CMilitarised Component§! of the §YEmpire§!.\n\nAll §Cnewly-cored§! §Ystates§! will receive the following §Ylocal modifier§!:\nAdds §YLand of the Imperial Lunar Legions§! which grants:\n  Max Factories in State: §R-10%§!\n  Recruitable Population: §R-10.00%§!\n  Local Construction Speed: §R-10%§!\n"
+ ZAR_empire_core_BAT_tt:0 "[ZAR_EMPIRE_Core_scripted_loc_start] §YHegemon of North Zebrica§! [ZAR_EMPIRE_Core_scripted_loc_end]\n  Daily Political Power Gain: §G+0.08§!\n  Recruitable Population Factor: §G+2%§!\n  Consumer Goods Factories: §Y-2.0%§!\n  Factory Output: §G+2.00%§!\n\n[ZAR_EMPIRE_Core_scripted_loc_start] §YZarantian Imperial Core§! in our §YImperial Core States§! [ZAR_EMPIRE_Core_scripted_loc_end]\n  Max Factories in State: §G+8%§!\n  Local Construction Speed: §G+2%§!\n\nWe will integrate §YChiropterra§! within the §YZarantian Empire§!. Their territories will become our §CCores§!. §YChiropterra§! will receive nominal autonomy as a reformed §CMilitarised Component§! of the §YEmpire§!.\n\nAll §Cnewly-cored§! §Ystates§! will receive the following §Ylocal modifier§!:\nAdds §YLand of the Imperial Lunar Legions§! which grants:\n  Max Factories in State: §R-10%§!\n  Recruitable Population: §R-10.00%§!\n  Local Construction Speed: §R-10%§!\n"
 
  ZAR_empire_core_WAR:0 "The Vassalage of Warzena"
  ZAR_empire_core_WAR_desc:0 ""
- ZAR_empire_core_WAR_tt:0 "[ZAR_EMPIRE_Core_scripted_loc_start] §YHegemon of North Zebrica§! [ZAR_EMPIRE_Core_scripted_loc_end]\n  Daily Political Power Gain: §G+0.05§!\n  Recruitable Population Factor: §G+1%§!\n  Consumer Goods Factories: §Y-0.5%§!\n  Factory Output: §G+1.50%§!\n\n[ZAR_EMPIRE_Core_scripted_loc_start] §YZarantian Imperial Core§! in our §YImperial Core States§! [ZAR_EMPIRE_Core_scripted_loc_end]\n  Max Factories in State: §G+3%§!\n  Local Construction Speed: §G+1.5%§!\n\nWe will integrate §YWarzena§! within the §YZarantian Empire§!. Their territories will become our §CCores§!, but they will become a semi-autonomous §RMilitarily Restricted§! §YVassal§! of the §YEmpire§!. Their land will be exploited for resources, and we will receive Indentured Servants in our §YImperial Core States§!.\n\nAll §Cnewly-cored§! §Ystates§! will receive the following §Ylocal modifier§!:\nAdds §YZarantian Imperial Vassal§! which grants:\n  Resource Gain Efficiency: §G+25.00%§!\n  Max Factories in State: §R-30%§!\n  Recruitable Population: §R-85.00%§!\n  Local Construction Speed: §R-30%§!\n"
+ ZAR_empire_core_WAR_tt:0 "[ZAR_EMPIRE_Core_scripted_loc_start] §YHegemon of North Zebrica§! [ZAR_EMPIRE_Core_scripted_loc_end]\n  Daily Political Power Gain: §G+0.05§!\n  Recruitable Population Factor: §G+1%§!\n  Consumer Goods Factories: §Y-1%§!\n  Factory Output: §G+1.50%§!\n\n[ZAR_EMPIRE_Core_scripted_loc_start] §YZarantian Imperial Core§! in our §YImperial Core States§! [ZAR_EMPIRE_Core_scripted_loc_end]\n  Max Factories in State: §G+3%§!\n  Local Construction Speed: §G+1.5%§!\n\nWe will integrate §YWarzena§! within the §YZarantian Empire§!. Their territories will become our §CCores§!, but they will become a semi-autonomous §RMilitarily Restricted§! §YVassal§! of the §YEmpire§!. Their land will be exploited for resources, and we will receive Indentured Servants in our §YImperial Core States§!.\n\nAll §Cnewly-cored§! §Ystates§! will receive the following §Ylocal modifier§!:\nAdds §YZarantian Imperial Vassal§! which grants:\n  Resource Gain Efficiency: §G+25.00%§!\n  Max Factories in State: §R-30%§!\n  Recruitable Population: §R-85.00%§!\n  Local Construction Speed: §R-30%§!\n"
 
  ZAR_empire_core_ZUM:0 "The New Mistress of Zumidia"
  ZAR_empire_core_ZUM_desc:0 ""
- ZAR_empire_core_ZUM_tt:0 "[ZAR_EMPIRE_Core_scripted_loc_start] §YHegemon of North Zebrica§! [ZAR_EMPIRE_Core_scripted_loc_end]\n  Daily Political Power Gain: §G+0.05§!\n  Recruitable Population Factor: §G+1%§!\n  Consumer Goods Factories: §Y-0.5%§!\n  Factory Output: §G+1.50%§!\n\n[ZAR_EMPIRE_Core_scripted_loc_start] §YZarantian Imperial Core§! in our §YImperial Core States§! [ZAR_EMPIRE_Core_scripted_loc_end]\n  Max Factories in State: §G+3%§!\n  Local Construction Speed: §G+1.5%§!\n\nWe will integrate §YZumidia§! within the §YZarantian Empire§!. Their territories will become our §CCores§!, but they will become a semi-autonomous §RMilitarily Restricted§! §YVassal§! of the §YEmpire§!. Their land will be exploited for resources, and we will receive Indentured Servants in our §YImperial Core States§!.\n\nAll §Cnewly-cored§! §Ystates§! will receive the following §Ylocal modifier§!:\nAdds §YZarantian Imperial Vassal§! which grants:\n  Resource Gain Efficiency: §G+25.00%§!\n  Max Factories in State: §R-30%§!\n  Recruitable Population: §R-85.00%§!\n  Local Construction Speed: §R-30%§!\n"
+ ZAR_empire_core_ZUM_tt:0 "[ZAR_EMPIRE_Core_scripted_loc_start] §YHegemon of North Zebrica§! [ZAR_EMPIRE_Core_scripted_loc_end]\n  Daily Political Power Gain: §G+0.05§!\n  Recruitable Population Factor: §G+1%§!\n  Consumer Goods Factories: §Y-1%§!\n  Factory Output: §G+1.50%§!\n\n[ZAR_EMPIRE_Core_scripted_loc_start] §YZarantian Imperial Core§! in our §YImperial Core States§! [ZAR_EMPIRE_Core_scripted_loc_end]\n  Max Factories in State: §G+3%§!\n  Local Construction Speed: §G+1.5%§!\n\nWe will integrate §YZumidia§! within the §YZarantian Empire§!. Their territories will become our §CCores§!, but they will become a semi-autonomous §RMilitarily Restricted§! §YVassal§! of the §YEmpire§!. Their land will be exploited for resources, and we will receive Indentured Servants in our §YImperial Core States§!.\n\nAll §Cnewly-cored§! §Ystates§! will receive the following §Ylocal modifier§!:\nAdds §YZarantian Imperial Vassal§! which grants:\n  Resource Gain Efficiency: §G+25.00%§!\n  Max Factories in State: §R-30%§!\n  Recruitable Population: §R-85.00%§!\n  Local Construction Speed: §R-30%§!\n"
 
  ZAR_empire_core_CGI:0 "The New Khan of the Quagga"
  ZAR_empire_core_CGI_desc:0 ""
- ZAR_empire_core_CGI_tt:0 "[ZAR_EMPIRE_Core_scripted_loc_start] §YHegemon of North Zebrica§! [ZAR_EMPIRE_Core_scripted_loc_end]\n  Daily Political Power Gain: §G+0.10§!\n  Recruitable Population Factor: §G+2%§!\n  Consumer Goods Factories: §Y-1.0%§!\n  Factory Output: §G+3.00%§!\n\n[ZAR_EMPIRE_Core_scripted_loc_start] §YZarantian Imperial Core§! in our §YImperial Core States§! [ZAR_EMPIRE_Core_scripted_loc_end]\n  Max Factories in State: §G+10%§!\n  Local Construction Speed: §G+3%§!\n\nWe will integrate §YQuaggatai§! within the §YZarantian Empire§!. Their territories will become our §CCores§!, but they will become a semi-autonomous §RMilitarily Restricted§! §YVassal§! of the §YEmpire§!. Their land will be exploited for resources, and we will receive Indentured Servants in our §YImperial Core States§!.\n\nIf we own §YZrumqi§! or §YColtdar§! and they are not yet §Ccored§!, they will also be §Ccored§!.\nWhich will modify §YHegemon of North Zebrica§! further to grant:\n  Daily Political Power Gain: §G+0.05§!\n  Recruitable Population Factor: §G+1%§!\n  Consumer Goods Factories: §Y-0.5%§!\n  Factory Output: §G+1.50%§!\nAnd will modify §YZarantian Imperial Core§! in our §YImperial Core States§! further to grant:\n  Max Factories in State: §G+3%§!\n  Local Construction Speed: §G+1.5%§!\n\nAll §Cnewly-cored§! §Ystates§! will receive the following §Ylocal modifier§!:\nAdds §YZarantian Imperial Vassal§! which grants:\n  Resource Gain Efficiency: §G+25.00%§!\n  Max Factories in State: §R-30%§!\n  Recruitable Population: §R-85.00%§!\n  Local Construction Speed: §R-30%§!\n"
+ ZAR_empire_core_CGI_tt:0 "[ZAR_EMPIRE_Core_scripted_loc_start] §YHegemon of North Zebrica§! [ZAR_EMPIRE_Core_scripted_loc_end]\n  Daily Political Power Gain: §G+0.10§!\n  Recruitable Population Factor: §G+2%§!\n  Consumer Goods Factories: §Y-2.0%§!\n  Factory Output: §G+3.00%§!\n\n[ZAR_EMPIRE_Core_scripted_loc_start] §YZarantian Imperial Core§! in our §YImperial Core States§! [ZAR_EMPIRE_Core_scripted_loc_end]\n  Max Factories in State: §G+10%§!\n  Local Construction Speed: §G+3%§!\n\nWe will integrate §YQuaggatai§! within the §YZarantian Empire§!. Their territories will become our §CCores§!, but they will become a semi-autonomous §RMilitarily Restricted§! §YVassal§! of the §YEmpire§!. Their land will be exploited for resources, and we will receive Indentured Servants in our §YImperial Core States§!.\n\nIf we own §YZrumqi§! or §YColtdar§! and they are not yet §Ccored§!, they will also be §Ccored§!.\nWhich will modify §YHegemon of North Zebrica§! further to grant:\n  Daily Political Power Gain: §G+0.05§!\n  Recruitable Population Factor: §G+1%§!\n  Consumer Goods Factories: §Y-2%§!\n  Factory Output: §G+1.50%§!\nAnd will modify §YZarantian Imperial Core§! in our §YImperial Core States§! further to grant:\n  Max Factories in State: §G+3%§!\n  Local Construction Speed: §G+1.5%§!\n\nAll §Cnewly-cored§! §Ystates§! will receive the following §Ylocal modifier§!:\nAdds §YZarantian Imperial Vassal§! which grants:\n  Resource Gain Efficiency: §G+25.00%§!\n  Max Factories in State: §R-30%§!\n  Recruitable Population: §R-85.00%§!\n  Local Construction Speed: §R-30%§!\n"
 
  ZAR_empire_core_CTH:0 "The Division of Colthage"
  ZAR_empire_core_CTH_desc:0 ""
- ZAR_empire_core_CTH_tt:0 "[ZAR_EMPIRE_Core_scripted_loc_start] §YHegemon of North Zebrica§! [ZAR_EMPIRE_Core_scripted_loc_end]\n  Daily Political Power Gain: §G+0.12§!\n  Recruitable Population Factor: §G+2%§!\n  Consumer Goods Factories: §Y-1.0%§!\n  Factory Output: §G+4.00%§!\n\n[ZAR_EMPIRE_Core_scripted_loc_start] §YZarantian Imperial Core§! in our §YImperial Core States§! [ZAR_EMPIRE_Core_scripted_loc_end]\n  Max Factories in State: §G+15%§!\n  Local Construction Speed: §G+4%§!\n\nWe will integrate §YColthage§! within the §YZarantian Empire§!. Their territories will become our §CCores§!, but they will become a semi-autonomous §RMilitarily Restricted§! §YVassal§! of the §YEmpire§!. Their land will be exploited for resources, and we will receive Indentured Servants in our §YImperial Core States§!.\n\nIf we own §YZrumqi§! or §YColtdar§! and they are not yet §Ccored§!, they will also be §Ccored§!.\nWhich will modify §YHegemon of North Zebrica§! further to grant:\n  Daily Political Power Gain: §G+0.05§!\n  Recruitable Population Factor: §G+1%§!\n  Consumer Goods Factories: §Y-0.5%§!\n  Factory Output: §G+1.50%§!\nAnd will modify §YZarantian Imperial Core§! in our §YImperial Core States§! further to grant:\n  Max Factories in State: §G+3%§!\n  Local Construction Speed: §G+1.5%§!\n\nAll §Cnewly-cored§! §Ystates§! will receive the following §Ylocal modifier§!:\nAdds §YZarantian Imperial Vassal§! which grants:\n  Resource Gain Efficiency: §G+25.00%§!\n  Max Factories in State: §R-30%§!\n  Recruitable Population: §R-85.00%§!\n  Local Construction Speed: §R-30%§!\n"
+ ZAR_empire_core_CTH_tt:0 "[ZAR_EMPIRE_Core_scripted_loc_start] §YHegemon of North Zebrica§! [ZAR_EMPIRE_Core_scripted_loc_end]\n  Daily Political Power Gain: §G+0.12§!\n  Recruitable Population Factor: §G+2%§!\n  Consumer Goods Factories: §Y-2.0%§!\n  Factory Output: §G+4.00%§!\n\n[ZAR_EMPIRE_Core_scripted_loc_start] §YZarantian Imperial Core§! in our §YImperial Core States§! [ZAR_EMPIRE_Core_scripted_loc_end]\n  Max Factories in State: §G+15%§!\n  Local Construction Speed: §G+4%§!\n\nWe will integrate §YColthage§! within the §YZarantian Empire§!. Their territories will become our §CCores§!, but they will become a semi-autonomous §RMilitarily Restricted§! §YVassal§! of the §YEmpire§!. Their land will be exploited for resources, and we will receive Indentured Servants in our §YImperial Core States§!.\n\nIf we own §YZrumqi§! or §YColtdar§! and they are not yet §Ccored§!, they will also be §Ccored§!.\nWhich will modify §YHegemon of North Zebrica§! further to grant:\n  Daily Political Power Gain: §G+0.05§!\n  Recruitable Population Factor: §G+1%§!\n  Consumer Goods Factories: §Y-1%§!\n  Factory Output: §G+1.50%§!\nAnd will modify §YZarantian Imperial Core§! in our §YImperial Core States§! further to grant:\n  Max Factories in State: §G+3%§!\n  Local Construction Speed: §G+1.5%§!\n\nAll §Cnewly-cored§! §Ystates§! will receive the following §Ylocal modifier§!:\nAdds §YZarantian Imperial Vassal§! which grants:\n  Resource Gain Efficiency: §G+25.00%§!\n  Max Factories in State: §R-30%§!\n  Recruitable Population: §R-85.00%§!\n  Local Construction Speed: §R-30%§!\n"
 
  ZAR_empire_core_CVA:0 "The Cowing of Coltva"
  ZAR_empire_core_CVA_desc:0 ""
- ZAR_empire_core_CVA_tt:0 "[ZAR_EMPIRE_Core_scripted_loc_start] §YHegemon of North Zebrica§! [ZAR_EMPIRE_Core_scripted_loc_end]\n  Daily Political Power Gain: §G+0.05§!\n  Recruitable Population Factor: §G+1%§!\n  Consumer Goods Factories: §Y-0.5%§!\n  Factory Output: §G+1.50%§!\n\n[ZAR_EMPIRE_Core_scripted_loc_start] §YZarantian Imperial Core§! in our §YImperial Core States§! [ZAR_EMPIRE_Core_scripted_loc_end]\n  Max Factories in State: §G+3%§!\n  Local Construction Speed: §G+1.5%§!\n\nWe will integrate §YColtva§! within the §YZarantian Empire§!. Their territories will become our §CCores§!, but they will become a semi-autonomous §RMilitarily Restricted§! §YVassal§! of the §YEmpire§!. Their land will be exploited for resources, and we will receive Indentured Servants in our §YImperial Core States§!.\n\nAll §Cnewly-cored§! §Ystates§! will receive the following §Ylocal modifier§!:\nAdds §YZarantian Imperial Vassal§! which grants:\n  Resource Gain Efficiency: §G+25.00%§!\n  Max Factories in State: §R-30%§!\n  Recruitable Population: §R-85.00%§!\n  Local Construction Speed: §R-30%§!\n"
+ ZAR_empire_core_CVA_tt:0 "[ZAR_EMPIRE_Core_scripted_loc_start] §YHegemon of North Zebrica§! [ZAR_EMPIRE_Core_scripted_loc_end]\n  Daily Political Power Gain: §G+0.05§!\n  Recruitable Population Factor: §G+1%§!\n  Consumer Goods Factories: §Y-1%§!\n  Factory Output: §G+1.50%§!\n\n[ZAR_EMPIRE_Core_scripted_loc_start] §YZarantian Imperial Core§! in our §YImperial Core States§! [ZAR_EMPIRE_Core_scripted_loc_end]\n  Max Factories in State: §G+3%§!\n  Local Construction Speed: §G+1.5%§!\n\nWe will integrate §YColtva§! within the §YZarantian Empire§!. Their territories will become our §CCores§!, but they will become a semi-autonomous §RMilitarily Restricted§! §YVassal§! of the §YEmpire§!. Their land will be exploited for resources, and we will receive Indentured Servants in our §YImperial Core States§!.\n\nAll §Cnewly-cored§! §Ystates§! will receive the following §Ylocal modifier§!:\nAdds §YZarantian Imperial Vassal§! which grants:\n  Resource Gain Efficiency: §G+25.00%§!\n  Max Factories in State: §R-30%§!\n  Recruitable Population: §R-85.00%§!\n  Local Construction Speed: §R-30%§!\n"
 
  ZAR_empire_core_kar_alpaka:0 "Bring Kar Alpaka into the Fold"
  ZAR_empire_core_kar_alpaka_desc:0 ""
diff --git a/localisation/english/eaw_cityfall_l_english.yml b/localisation/english/eaw_cityfall_l_english.yml
index 6dedd0ffacd..fa7b0ae71eb 100644
--- a/localisation/english/eaw_cityfall_l_english.yml
+++ b/localisation/english/eaw_cityfall_l_english.yml
@@ -145,7 +145,7 @@ cityfall.35.t:0 "New Skynavia Burns"
  cityfall.40.c:0 "The bats have been defanged."
 
 cityfall.50.t:0 "The Fall of Vermilion"
- cityfall.50.d:0 "[This.GetNewspaperHeader]The holiest of the kirin cities and the location from which the Kirin Matriarchs Superior had reigned for centuries, the city of Vermilion finally fell after a lengthy, draining, and brutal campaign of fighting in and around the city. The defenders of [old_controller.GetAdjective] fought almost to the last, forcing the attacking army of [new_controller.GetNameDef] to invest heavily in clearing the city building by building. Despite one last desperate charge from the defenders in an effort to break the invaders' final offensive, resistance in the city had fallen into a disorganized mess by nightfall, and the presence of many nirik had shifted the army's attention away from rooting out the last of the defenders to attempting to contain the raging fires."
+ cityfall.50.d:0 "[This.GetNewspaperHeader]The holiest of the kirin cities and the location from which the Kirin Matriarchs Superior had reigned for centuries, the city of Vermilion finally fell after a lengthy, draining, and brutal campaign of fighting in and around the city. The [old_controller.GetAdjective] defenders fought almost to the last, forcing the attacking army of [new_controller.GetNameDef] to invest heavily in clearing the city building by building. Despite one last desperate charge from the defenders in an effort to break the invaders' final offensive, resistance in the city had fallen into a disorganized mess by nightfall, and the presence of many nirik had shifted the army's attention away from rooting out the last of the defenders to attempting to contain the raging fires."
  cityfall.50.b:0 "The loss of Vermilion is an affront to Concord!"
  cityfall.50.a:0 "The fires will take days to put out..."
  cityfall.50.c:0 "Kiria was not ready for the perils of the modern age."
diff --git a/localisation/english/eaw_decisions_l_english.yml b/localisation/english/eaw_decisions_l_english.yml
index 2d3d499a732..24fd9f55721 100644
--- a/localisation/english/eaw_decisions_l_english.yml
+++ b/localisation/english/eaw_decisions_l_english.yml
@@ -20,6 +20,9 @@ ban_neutral_party_desc:0 "The traditionalist and monarchist parties have been pr
 ban_neutrality_party_tt:1 "Change in popularity of Neutrality: §G-§![?Root.party_popularity@neutrality|%0G].\n"
 anti_neutral_raids:0 "Anti-Traditionalist Raids"
 anti_neutral_raids_desc:0 "We must crack down on traditionalist and monarchist elements in our nation for the sake of long-term domestic stability. Their influence is too great, and may potentially become a problem to the government."
+ seize_some_trucks_woo:0 "Commandeer Civilian Trucks"
+ seize_some_trucks_woo_desc:0 "The merchant car companies hold sway over our infrastructure. With war looming, we are well within our rights to commandeer equipment for state use."
+
 
 ## RESOURCE PROSPECTS ####
 develop_baltimare_aluminium:0 "Baltimare Aluminium Smeltery"
diff --git a/localisation/english/eaw_difficulty_l_english.yml b/localisation/english/eaw_difficulty_l_english.yml
index 82b8411b9e1..44e8a6b405e 100644
--- a/localisation/english/eaw_difficulty_l_english.yml
+++ b/localisation/english/eaw_difficulty_l_english.yml
@@ -21,6 +21,9 @@
  custom_diff_strong_HIP:0 "Strengthen Hippogriffia"
  custom_diff_strong_BAT:0 "Strengthen Chiropterra"
  custom_diff_strong_CTH:0 "Strengthen Colthaginian Republic"
+ custom_diff_strong_ROA:0 "Strengthen Roaman Kaiserate"
+ custom_diff_strong_TSV:0 "Strengthen Talonsvaal Republiek"
+ custom_diff_strong_KXN:0 "Strengthen Lan Kir Militarchy"
  custom_diff_strong_KIR:0 "Strengthen Realm of Kiria"
  custom_diff_strong_KIS:0 "Strengthen Council of North Kiria"
  custom_diff_strong_KIC:0 "Strengthen Republic of Kiria"
diff --git a/localisation/english/eaw_fantasy_events_l_english.yml b/localisation/english/eaw_fantasy_events_l_english.yml
index 1468ae70340..5ea5bcc3fa8 100644
--- a/localisation/english/eaw_fantasy_events_l_english.yml
+++ b/localisation/english/eaw_fantasy_events_l_english.yml
@@ -42,7 +42,7 @@
  fantasyflavor.9.a:0 "This is a disaster!"
  
  fantasyflavor.10.t:0 "Successful Experiment"
- fantasyflavor.10.d:0 "After we granted the scholar everything he needed for his ambitious experiment, we didn't hear much from him, assuming he was busy with work. However earlier today he finally contacted us, submitting a lengthy report on the experiment, its results and his observations. He also said he was going to write a tome based on the experiment and its groundbreaking revelations in the field of magic, which would then be published for all to read.\n\nA few individuals are upset that the scholar is "demystifying" magic and even claim him of blasphemy, but they are in the minority. Most folk are happy with the news and are already imagining a future where magic is entirely tamed and mundane, fully in our control and used to make everyone's lives better and easier."
+ fantasyflavor.10.d:0 "After we granted the scholar everything he needed for his ambitious experiment, we didn't hear much from him, assuming he was busy with work. However earlier today he finally contacted us, submitting a lengthy report on the experiment, its results and his observations. He also said he was going to write a tome based on the experiment and its groundbreaking revelations in the field of magic, which would then be published for all to read.\n\nA few individuals are upset that the scholar is "demystifying" magic and even accuse him of blasphemy, but they are in the minority. Most folk are happy with the news and are already imagining a future where magic is entirely tamed and mundane, fully in our control and used to make everyone's lives better and easier."
  fantasyflavor.10.a:0 "Wonderful, truly."
  
  fantasyflavor.11.t:0 "Blue Moon Festival"
diff --git a/localisation/english/eaw_generic_techs_l_english.yml b/localisation/english/eaw_generic_techs_l_english.yml
index 68b6e7f2f98..060a5f0a7b5 100644
--- a/localisation/english/eaw_generic_techs_l_english.yml
+++ b/localisation/english/eaw_generic_techs_l_english.yml
@@ -133,7 +133,6 @@
  cat_strategic_destruction:0 "Strategic Destruction Doctrine" #for BAR_air_strat_dest
  category_mechanical:0 "All Mechanical Battalions"
  category_motmech:0 "Motorized/Mechanized Infantry"
- category_engineer:0 "Engineers"
  category_scout_plane:0 "Scout Planes"
  category_magical:0 "All Magical Battalions"
  TITLE_GENERIC_SOCIETY_MAGIC_SUBTITLE:0 "SOCIETY"
diff --git a/localisation/english/eaw_military_industrial_organization_l_english.yml b/localisation/english/eaw_military_industrial_organization_l_english.yml
new file mode 100644
index 00000000000..7c62f564fb3
--- /dev/null
+++ b/localisation/english/eaw_military_industrial_organization_l_english.yml
@@ -0,0 +1,142 @@
+l_english:
+
+###################################################################################################
+#### Code and UX localization
+###################################################################################################
+
+
+
+
+########  #######  ##     ## #### ########  ##     ## ######## ##    ## ########     ######   ########   #######  ##     ## ########   ######  
+##       ##     ## ##     ##  ##  ##     ## ###   ### ##       ###   ##    ##       ##    ##  ##     ## ##     ## ##     ## ##     ## ##    ## 
+##       ##     ## ##     ##  ##  ##     ## #### #### ##       ####  ##    ##       ##        ##     ## ##     ## ##     ## ##     ## ##       
+######   ##     ## ##     ##  ##  ########  ## ### ## ######   ## ## ##    ##       ##   #### ########  ##     ## ##     ## ########   ######  
+##       ##  ## ## ##     ##  ##  ##        ##     ## ##       ##  ####    ##       ##    ##  ##   ##   ##     ## ##     ## ##              ## 
+##       ##    ##  ##     ##  ##  ##        ##     ## ##       ##   ###    ##       ##    ##  ##    ##  ##     ## ##     ## ##        ##    ## 
+########  ##### ##  #######  #### ##        ##     ## ######## ##    ##    ##        ######   ##     ##  #######   #######  ##         ######  
+
+
+mio_cat_eq_all_amphibious_tank: "All Amphibious Tanks"
+mio_cat_eq_all_main_battle_tank: "All Medium and MBT Tank Equipment"
+mio_cat_eq_all_super_heavy_tank: "All Heavy Tank and Super Heavy Tank Equipment" 
+
+
+##     ## ########    ###    ########  ######## ########   ######  
+##     ## ##         ## ##   ##     ## ##       ##     ## ##    ## 
+##     ## ##        ##   ##  ##     ## ##       ##     ## ##       
+######### ######   ##     ## ##     ## ######   ########   ######  
+##     ## ##       ######### ##     ## ##       ##   ##         ## 
+##     ## ##       ##     ## ##     ## ##       ##    ##  ##    ## 
+##     ## ######## ##     ## ########  ######## ##     ##  ######  
+
+#######################
+##### MIO HEADERS #####
+#######################
+
+
+
+
+
+########   #######  ##       ####  ######  #### ########  ######  
+##     ## ##     ## ##        ##  ##    ##  ##  ##       ##    ## 
+##     ## ##     ## ##        ##  ##        ##  ##       ##       
+########  ##     ## ##        ##  ##        ##  ######    ######  
+##        ##     ## ##        ##  ##        ##  ##             ## 
+##        ##     ## ##        ##  ##    ##  ##  ##       ##    ## 
+##         #######  ######## ####  ######  #### ########  ######  
+
+
+mio_policy_HIP_land_flechette_rifles: "Flechette Rifle Patterns"
+mio_policy_HIP_land_caseless_rifles: "Caseless Rifle Patterns"
+
+
+#   #  ##   ###  ##  ###       ##   ##  #  # #  # ### ###  ### ###  ## 
+## ## #  #    # #  # #  #     #  # #  # #  # ## #  #  #  #  #  #   #   
+# # # ####    # #  # ###      #    #  # #  # # ##  #  ###   #  ##   #  
+#   # #  # #  # #  # #  #     #  # #  # #  # #  #  #  #  #  #  #     # 
+#   # #  #  ##   ##  #  #      ##   ##   ##  #  #  #  #  # ### ### ##  
+
+OLE_mio_trait_german_landsverk_tech_exchange:0 "Changeling-Olenian Tech Exchange"
+
+
+ ######   ######## ##    ## ######## ########  ####  ######   ######  
+##    ##  ##       ###   ## ##       ##     ##  ##  ##    ## ##    ## 
+##        ##       ####  ## ##       ##     ##  ##  ##       ##       
+##   #### ######   ## ## ## ######   ########   ##  ##        ######  
+##    ##  ##       ##  #### ##       ##   ##    ##  ##             ## 
+##    ##  ##       ##   ### ##       ##    ##   ##  ##    ## ##    ## 
+ ######   ######## ##    ## ######## ##     ## ####  ######   ######  
+
+generic_mio_initial_trait_magical_designer:0 "Magical Weapons Manufacturer"
+
+###  ##  #  # # #     #   # ###  ##       ##  ###   ##  #  # ### ### #   # ###  ###  ## 
+ #  #  # ## # # #     ## ##  #  #  #     #  # #  # #  # #  # #    #   # #  #  # #   #   
+ #  #### # ## ##      # # #  #  #  #     #### ###  #    #### ##   #    #   ###  ##   #  
+ #  #  # #  # # #     #   #  #  #  #     #  # #  # #  # #  # #    #    #   #    #     # 
+ #  #  # #  # # #     #   # ###  ##      #  # #  #  ##  #  # ###  #    #   #    ### ##  
+
+
+#############################
+##### MAIN BATTLE PLANT #####
+#############################
+
+generic_main_battle_tank_organization: "Main Battle Tank Manufacturer"
+generic_mio_initial_trait_main_battle_tank_designer: "Main Battle Tank Designer"
+generic_mio_trait_mbt_all_round_cupola: "Turbocharger Integration"
+generic_mio_trait_mbt_simplified_turret_design: "Tuned Arc Welding Equipment"
+generic_mio_trait_mbt_specialist_shells: "Sabot and Fin Stablisation"
+generic_mio_trait_mbt_improved_gun_metallurgy: "Early Bore Evactuators"
+generic_mio_trait_mbt_armor_steel_working: "Computer-Assisted Plant Management"
+generic_mio_trait_mbt_spaced_armor: "Extreme Angle Armour Schemes"
+generic_mio_trait_mbt_crew_survival_layout: "Internal Compartment Separation"
+generic_mio_trait_mbt_sloped_side_armor: "Experimental Night Vision Equipment"
+generic_mio_trait_mbt_truck_engines: "Twin Engine Trials"
+generic_mio_trait_mbt_aircraft_engines: "Gas Turbine Trials"
+generic_mio_trait_mbt_improved_suspension: "Hydropneumatic Suspension"
+generic_mio_trait_mbt_advanced_shells: "Fire Support Capacity"
+generic_mio_trait_mbt_power_traverse:0 "Auxiliary Traverse Pump"
+
+#############################
+##### SUPER HEAVY PLANT #####
+#############################
+generic_super_heavy_tank_organization: "Super Heavy Tank Manufacturer"
+generic_mio_initial_trait_super_heavy_tank_designer: "Super Heavy Tank Designer"
+generic_mio_trait_sht_double_tracks: "Double Tracks"
+generic_mio_trait_sht_one_piece_hull_side_coverings: "Heavy-Duty Moulds"
+generic_mio_trait_sht_simplified_transmission_system: "Dedicated Maintanence Trenches"
+generic_mio_trait_sht_improved_engine_output: "Repurposed Aircraft Engines"
+generic_mio_trait_sht_sloping_armor: "Moving Bunker Design Philosophy"
+generic_mio_trait_sht_improved_crew_ergonomics: "Smoke Shell Racks"
+generic_mio_trait_sht_reinforced_construction: "High Tolerance Welding"
+generic_mio_trait_sht_fully_cast_turret: "Pikenose Armour Scheme"
+generic_mio_trait_sht_commander_cupola: "Additional HMG Mountings"
+generic_mio_trait_sht_simplified_layout: "Hardened Plant Equipment"
+generic_mio_trait_sht_high_explosive_shells: "Secondary Fire Support Cannons"
+generic_mio_trait_sht_apcr_hvap_shells: "Cannons Built for Destroyers"
+
+
+
+ ## #  # ### ###      #   # ###  ##       ##  ###   ##  #  # ### ### #   # ###  ###  ## 
+#   #  #  #  #  #     ## ##  #  #  #     #  # #  # #  # #  # #    #   # #  #  # #   #   
+ #  ####  #  ###      # # #  #  #  #     #### ###  #    #### ##   #    #   ###  ##   #  
+  # #  #  #  #        #   #  #  #  #     #  # #  # #  # #  # #    #    #   #    #     # 
+##  #  # ### #        #   # ###  ##      #  # #  #  ##  #  # ###  #    #   #    ### ##  
+
+
+ ##  ### ###   ##  ###   ##  ### ###     #   # ###  ##       ##  ###   ##  #  # ### ### #   # ###  ###  ## 
+#  #  #  #  # #  # #  # #  # #    #      ## ##  #  #  #     #  # #  # #  # #  # #    #   # #  #  # #   #   
+####  #  ###  #    ###  #### ##   #      # # #  #  #  #     #### ###  #    #### ##   #    #   ###  ##   #  
+#  #  #  #  # #  # #  # #  # #    #      #   #  #  #  #     #  # #  # #  # #  # #    #    #   #    #     # 
+#  # ### #  #  ##  #  # #  # #    #      #   # ###  ##      #  # #  #  ##  #  # ###  #    #   #    ### ##  
+
+
+#   #  ##  ### ### ###  ### ### #       #   # ###  ##       ##  ###   ##  #  # ### ### #   # ###  ###  ## 
+## ## #  #  #  #   #  #  #  #   #       ## ##  #  #  #     #  # #  # #  # #  # #    #   # #  #  # #   #   
+# # # ####  #  ##  ###   #  ##  #       # # #  #  #  #     #### ###  #    #### ##   #    #   ###  ##   #  
+#   # #  #  #  #   #  #  #  #   #       #   #  #  #  #     #  # #  # #  # #  # #    #    #   #    #     # 
+#   # #  #  #  ### #  # ### ### ###     #   # ###  ##      #  # #  #  ##  #  # ###  #    #   #    ### ##  
+
+
+DEBUG_generic_refurbishment_repair_organization: "$generic_refurbishment_repair_organization$"
+DEBUG_generic_super_heavy_tank_organization: "$generic_super_heavy_tank_organization$"
+DEBUG_generic_main_battle_tank_organization: "$generic_main_battle_tank_organization$"
diff --git a/localisation/english/eaw_plane_designer_l_english.yml b/localisation/english/eaw_plane_designer_l_english.yml
index 28cab037cc4..aa8009adf57 100644
--- a/localisation/english/eaw_plane_designer_l_english.yml
+++ b/localisation/english/eaw_plane_designer_l_english.yml
@@ -19,6 +19,9 @@
  fast_jet_engine_6x:0 "6x Supersonic Jet Engines"
  fast_jet_engine_6x_desc:0 "Six engines with boron-enriched zip fuel can provide astounding speed, although at a hefty price and fuel consumption. They also take up as much space as 8 normal jet engines, thus requiring a larger airframe to mount."
 
+ torpedo_mounting_4:0 "Modern Torpedo Mountings"
+ torpedo_mounting_4_desc:0 "Hardpoints to allow a modernized, more deadly torpedo to be mounted under the fuselage. This gives the plane a potent weapon to use against enemy ships."
+
  rocket_engine_4:0 "Crystal Engine I"
  rocket_engine_4_desc:0 "Similar to a rocket engine, this design uses the radical idea of liquid crystals for its power source. This increases performance, at the cost of requiring access to said crystals."
  rocket_engine_5:0 "Crystal Engine II"
@@ -36,6 +39,11 @@
  aircraft_cannon_4_2x_desc:0 "With firepower comparable to an air-to-air missile, very little can stand up to a bombardment from these cannons."
  guided_air_to_surface_missile:0 "Guided Air-to-Surface Missile"
  guided_air_to_surface_missile_desc:0 "A bomb with joystick guidance and a rocket engine, this missile is among the first true precision air-to-surface weapons."
+ cannon_defense_turret_2:0 "Modern Cannon Defense Turret"
+ cannon_defense_turret_2_desc:0 "Further modernizing cannons to have a higher rate of fire makes assaulting them an even deadlier prospect. Computer-assisted fire can tear apart even modern fighters."
+ cannon_defense_turret_2_2x:0 "2x Modern Cannon Defense Turrets"
+ cannon_defense_turret_2_2x_desc:0 "Two fully modern cannons can shred virtually anything that might attack. Very little can survive an assault on this fortress."
+
  guided_air_to_air_missile:0 "Guided Air-to-Air Missile"
  guided_air_to_air_missile_desc:0 "A high explosive charge with a rocket engine and heat or radar guidance, this new weapon of war is a serious threat to planes currently flying."
  nuclear_air_to_air_rocket:0 "Unguided Nuclear Air-to-Air Rocket"
@@ -90,10 +98,10 @@
 
  hardpoints:0 "Hardpoints"
  hardpoints_desc:0 "Whilst there is much to be gained in the specialisation of aircraft in certain roles, versatility is nevertheless an important factor in aircraft design. The premise of hardpoints conceptually is simple: Provide a platform which can mount any kind of weapon, allowing the aircraft on which the hardpoint is mounted to perform many different roles without sacrificing its effectiveness in any one area. Much to the surprise and annoyance of veteran dogfighters, this innovation has proven to be incredibly effective."
- aa_cannon_3:0 "Advanced Aircraft Cannons"
- aa_cannon_3_desc:0 "Despite modern aircraft utilising armour and being made almost entirely of metal, existing calibres used in current air-to-air cannons are still more than capable of tearing enemy fighters in half. Their primary limitation was poor volume of fire, making it quite difficult to actually land effective fire on manoeuvrable opponents. This shortcoming has been largely rectified with the implementation of improved cannons, with the added benefit of giving the weapons increased capacity to strafe ground targets; though the results of such strafing runs are still mixed."
- aa_cannon_4:0 "Modern Aircraft Cannons"
- aa_cannon_4_desc:0 "Using multiple barrels in the style of old Catling guns enables a truly astonishing rate of fire, even with 20mm rounds. Jet engines also provide enough electricity to rotate the barrel when flying. They also perform better against ground targets."
+ aa_cannon_4:0 "Advanced Aircraft Cannons"
+ aa_cannon_4_desc:0 "Despite modern aircraft utilising armour and being made almost entirely of metal, existing calibres used in current air-to-air cannons are still more than capable of tearing enemy fighters in half. Their primary limitation was poor volume of fire, making it quite difficult to actually land effective fire on manoeuvrable opponents. This shortcoming has been largely rectified with the implementation of improved cannons, with the added benefit of giving the weapons increased capacity to strafe ground targets; though the results of such strafing runs are still mixed."
+ aa_cannon_5:0 "Modern Aircraft Cannons"
+ aa_cannon_5_desc:0 "Using multiple barrels in the style of old Catling guns enables a truly astonishing rate of fire, even with 20mm rounds. Jet engines also provide enough electricity to rotate the barrel when flying. They also perform better against ground targets."
  tank_buster_3:0 "Anti-Tank Cannon III"
  tank_buster_3_desc:0 "Since the inception of air-to-ground gunnery, utilising the firepower of cannons mounted on aircraft has been limited in effectiveness by the precision required to damage or destroy enemy armour. Providing useful close air support required particularly skilled pilots and the absence of enemy anti-air to make strafing runs effective, but no longer. Rapid fire weaponry has rendered the skill previously required to destroy armour and mechanised equipment a non-factor as the volume of fire compensates for general lack of accuracy."
  electronic_countermeasures:0 "Anti-Missile Countermeasures"
@@ -109,6 +117,8 @@
  modern_large_airframe_2:0 "$large_plane_airframe_5$"
  modern_large_airframe_2_desc:0 "$large_plane_airframe_5_desc$"
 
+ air_torpedoe_4:0 "Modern Air Launched Torpedoes"
+ air_torpedoe_4_desc:0 "Increasingly powerful and computerized torpedoes allow for devastating air attack potential."
 
  small_plane_cas_airframe_5:0 "Modern Close Air Support Airframe"
  small_plane_naval_bomber_airframe_5:0 "Modern Naval Bomber Airframe"
diff --git a/localisation/english/eaw_research_l_english.yml b/localisation/english/eaw_research_l_english.yml
index fa7d259c69f..d69ecfd41e1 100644
--- a/localisation/english/eaw_research_l_english.yml
+++ b/localisation/english/eaw_research_l_english.yml
@@ -49,6 +49,10 @@
  army_integration:0 "Army Integration"
  army_integration_desc:0 "Our Special Forces should be a standing and regular unit in our army groups. All divisions shall be fitted with trained specialists, ensuring that any and all situations can be dealt with."
 
+ cat_mountaineers_doctrine:0 "Mountaineers Doctrine"
+ cat_marines_doctrine:0 "Marines Doctrine"
+ cat_paratroopers_doctrine:0 "Paratroopers Doctrine"
+ cat_racial_specforce_doctrine:0 "Racial Special Forces Doctrine"
  mechanised_infantry_c:0 "Advanced Waterproofing"
  mechanised_infantry_c_desc:0 "Taking lessons learned from amtracs and amtanks, we can help even our ordinary, non-marine light armor float. While no replacement for true marines, our troops will at least not be as helpless as they were."
  MECHANIZED_INFANTRY_C_TOOLTIP:0 "§HMarsh§!\n      Attack: §G+10%§!\n      Movement: §G+5%§!\n§HRiver§!\n      Attack: §G+10%§!\n      Movement: §G+5%§!\n§HAmphibious§!\n      Attack: §G+30%§!\n\nMechanized Infantry:\n§HMarsh§!\n      Attack: §G+10%§!\n§HRiver§!\n      Attack: §G+10%§!\n      Movement: §G+5%§!\n§HAmphibious§!\n      Attack: §G+30%§!\n\nArmored Cars:\n§HMarsh§!\n      Attack: §G+10%§!\n      Movement: §G+5%§!\n§HRiver§!\n      Attack: §G+10%§!\n      Movement: §G+5%§!\n§HAmphibious§!\n      Attack: §G+30%§!"
@@ -486,6 +490,21 @@
  JET_FIGHTER_DOCTRINES_TITLE:0 "Jet Age Fighter Theory"
  JET_FIGHTER_DOCTRINES_DESC:0 "Advances in propulsion, radar, and missiles will forever change how we approach air combat."
 
+ RACIAL_SPECFORCE_DOCTRINE_LABEL:0 "Racial Special Forces"
+ RACIAL_SPECFORCE_DOCTRINE_DESC:0 "Though modern weapons and tactics have steadily become more widespread, our own specialties are not to be forgotten."
+ racial_specforce_start:0 "Elavate Our Best"
+ racial_specforce_start_desc:0 "Evolutions of old traditions and equipment have proven to be very effective when officers young enough to consistently innovate are placed in command. It’s no wonder that even today our kind’s specialised combat roles manage to remain relevant, which is precisely why we have dedicated more internal resources to division reform."
+ racial_specforce_left1:0 "Comprehensive Command Integration"
+ racial_specforce_left1_desc:0 "In the past it has proven difficult to utilise our most valuable units in conjunction with the rest of the army, but this shall be the case no more. We cannot afford infighting over positions, titles and ranks that often compromises the effectiveness of the military, so we must codify a crystal clear chain of command."
+ racial_specforce_right1:0 "Unyielding Volley Fire"
+ racial_specforce_right1_desc:0 "Although massed infantry fire is typically considered to be ineffective against planes, a large part of the problem is the relative inaccuracy of regular soldiers when under duress. It has been noted that our most resilient and best trained troops perform much better when threatened with enemy air support, which has encouraged the development of anti-air volley fire techniques to supplement the usage of proper AA weaponry."
+ racial_specforce_left2:0 "Unique Fortification Strategies"
+ racial_specforce_left2_desc:0 "Although our regular infantry are more than capable of constructing adequate defensive positions, they are limited by their basic equipment and training. Having been dragged into the modern era, our specialist troops are more than willing and able to create unique fortification networks that consistently surprise and repel our enemies."
+ racial_specforce_right2:0 "Specialised Armour Support"
+ racial_specforce_right2_desc:0 "Although tanks have proven to be immensely useful on the battlefield, it is already clear that they do not operate quite as well in conjunction with our specialised divisions. To that end we have developed modifications to the commonly deployed models that serve the needs of our best in ways that they previously couldn’t."
+ racial_specforce_final:0 "The Pride of a Kind"
+ racial_specforce_final_desc:0 "Though some may shy away from the responsibility of representing one’s kind at its peak, our modernised units of once-traditional warriors no know such fear. They are the pride of a kind and their ever-exceptional performance in combat only serves to cement their place as the best of the best."
+
 
  #Doesn't display when adding as tech, so added here
  early_ship_hull_light:0 "Torpedo Boat Destroyer" 
diff --git a/localisation/english/eaw_resistance_l_english.yml b/localisation/english/eaw_resistance_l_english.yml
index 5dcbef95239..9a88f681001 100644
--- a/localisation/english/eaw_resistance_l_english.yml
+++ b/localisation/english/eaw_resistance_l_english.yml
@@ -1,8 +1,27 @@
 l_english:
-integration_occupation:0 "Integration (only for certain countries)"
+integration_occupation:0 "Integration"
+integration_occupation_desc:0 "§YFor certain countries only.§!"
 compliance_40_core:0 "Full Integration"
 add_to_ROOT_potential_original_cores_TT:0 "Can be cored by [Root.GetName] using the §YIntegration§! Occupation Law if average §Hcompliance§! of occupied states reaches §H40%§!."
 add_to_ROOT_potential_cores_TT:0 "Can be cored by [Root.GetName] using the §YIntegration§! Occupation Law if average §Hcompliance§! of occupied states reaches §H40%§!."
 resistance_boosted:0 "Resistance already strengthened"
 add_to_PREV_potential_original_cores_TT:0 "Can be cored by [Prev.GetName] using the §YIntegration§! Occupation Law if average §Hcompliance§! of occupied states reaches §H40%§!."
-add_to_PREV_potential_cores_TT:0 "Can be cored by [Prev.GetName] using the §YIntegration§! Occupation Law if average §Hcompliance§! of occupied states reaches §H40%§!."
\ No newline at end of file
+add_to_PREV_potential_cores_TT:0 "Can be cored by [Prev.GetName] using the §YIntegration§! Occupation Law if average §Hcompliance§! of occupied states reaches §H40%§!."
+
+forced_labor_occupation_improved_EaW_tt:0 "\nModify Occupation Law §Y$forced_labor_occupation$§! by: \n $MODIFIER_RESISTANCE_DECAY$: §G+40%§! \n $MODIFIER_RESISTANCE_GROWTH$: §G-40%§! \n $MODIFIER_LOCAL_RESOURCES$: §G+10%§! \n $MODIFIER_LOCAL_FACTORIES$: §G+10%§! \n $MODIFIER_ATTRITION_FOR_CONTROLLER$: §G-25%§! \n Resource Sabotage Chance: §G-5%§! \n Resource Sabotage Duration: §G-15%§! \n $MODIFIER_COMPLIANCE_GAIN_ADD$: §G+0.030%§! \n"
+
+harsh_quotas_occupation_improved_EaW_tt:0 "\nModify Occupation Law §Y$harsh_quotas_occupation$§! by: \n $MODIFIER_RESISTANCE_DECAY$: §G+40%§! \n $MODIFIER_RESISTANCE_GROWTH$: §G-40%§! \n $MODIFIER_RESISTANCE_DAMAGE_TO_GARRISONS$: §G-20%§! \n $MODIFIER_LOCAL_RESOURCES$: §G+15%§! \n $MODIFIER_LOCAL_FACTORIES$: §G+15%§! \n $MODIFIER_LOCAL_SUPPLIES_FOR_CONTROLLER$: §G+25%§! \n Civilian Factory Sabotage Chance: §G-5%§! \n Military Factory Sabotage Chance: §G-5%§! \n $MODIFIER_COMPLIANCE_GAIN_ADD$: §G+0.030%§! \n"
+
+forced_labor_occupation_improved_EaW:1 "$forced_labor_occupation$"
+harsh_quotas_occupation_improved_EaW:1 "$harsh_quotas_occupation$"
+
+resource_sabotage_improved_EaW_decrease_tooltip:0 "  Resource Sabotage Chance: §G-30%§!\n  Resource Sabotage Duration: §G-40%§!"
+factory_sabotage_improved_EaW_decrease_tooltip:0 "  Civilian Factory Sabotage Chance: §G-30%§!\n  Military Factory Sabotage Chance: §G-30%§!"
+
+#these are used for comparison
+resource_sabotage_improved_EaW_decrease_tooltip_ADDED:0 "  Resource Sabotage Chance: §G-30%§! (§G-30%§!)\n  Resource Sabotage Duration: §G-40%§! (§G-40%§!)"
+factory_sabotage_improved_EaW_decrease_tooltip_ADDED:0 "  Civilian Factory Sabotage Chance: §G-30%§! (§G-30%§!)\n  Military Factory Sabotage Chance: §G-30%§! (§G-30%§!)"
+resource_sabotage_improved_EaW_decrease_tooltip_REMOVED:0 "  Resource Sabotage Chance: §H+0%§! (§R+30%§!)\n  Resource Sabotage Duration: §H+0%§! (§R+40%§!)"
+factory_sabotage_improved_EaW_decrease_tooltip_REMOVED:0 "  Civilian Factory Sabotage Chance: §H+0%§! (§R+30%§!)\n  Military Factory Sabotage Chance: §H+0%§! (§R+30%§!)"
+resource_sabotage_improved_EaW_decrease_tooltip_UNCHANGED:0 "  Resource Sabotage Chance: §G-30%§! (§H+0%§!)\n  Resource Sabotage Duration: §G-40%§! (§H+0%§!)"
+factory_sabotage_improved_EaW_decrease_tooltip_UNCHANGED:0 "  Civilian Factory Sabotage Chance: §G-30%§! (§H+0%§!)\n  Military Factory Sabotage Chance: §G-30%§! (§H+0%§!)"
\ No newline at end of file
diff --git a/localisation/english/eaw_riverfed_l_english.yml b/localisation/english/eaw_riverfed_l_english.yml
index 4570ef4582f..5bd310685cc 100644
--- a/localisation/english/eaw_riverfed_l_english.yml
+++ b/localisation/english/eaw_riverfed_l_english.yml
@@ -269,6 +269,14 @@
  #### TOOLTIPS ####
  RIV_rdc_rail_projects_tt:0 "§YEvery controlled core state§! with less than 5 infrastructure will have §Y1 infrastructure§! built in it.\n"
  RIV_eastern_transport_fund_tt:0 "All other countries that fund the RDC will benefit from this.\n"
+ RIV_found_the_rec_tt:0 "All other countries in the River Coal and Steel Community will be invited to the River Economic Community.\n"
+ RIV_social_fund_tt:0 "All other countries in the River Economic Community will benefite from this.\n"
+ RIV_river_parliament_tt:0 "All Members of the River Social Development Fund will be invited to join the River Parliament.\n"
+ RIV_the_rivbit_tt:0 "All Members of the River Central Bank will be invited to adopt the Rivbit.\n"
+ RIV_free_movement_tt:0 "All Members of the River Parliament will be invited to form a Free Travel Area.\n"
+ RIV_the_river_union_tt:0 "All members who have rattified all previous treaties will be invited to form the River Union.\n"
+ RIV_river_army_tt:0 "All members of the River Union will be invited to form the River Army\n"
+ RIV_river_government_tt:0 "All members of the River Union will be invited to form a United River Government\n"
  RIV_fed_race_plus_tt:0 "Adds §G1§! to your standing in the §YRace to form the River Federation§!.\n"
  RIV_fed_race_minus1_tt:0 "Reduces your standing in the §YRace to form the River Federation§! by §R1§!.\n"
  RIV_fed_race_minus3_tt:0 "Reduces your standing in the §YRace to form the River Federation§! by §R3§!.\n"
diff --git a/localisation/english/eaw_tank_modules_l_english.yml b/localisation/english/eaw_tank_modules_l_english.yml
index f2436cb8300..8d549247c93 100644
--- a/localisation/english/eaw_tank_modules_l_english.yml
+++ b/localisation/english/eaw_tank_modules_l_english.yml
@@ -1,8 +1,12 @@
 l_english:
 
  EQ_MOD_CAT_tank_special_module_stabilizer_TITLE:0 "Stabilizer"
+ EQ_MOD_CAT_tank_special_module_maintenance_TITLE:0 "Easy Maintenance"
+
  EQ_MOD_CAT_tank_special_module_skirts_TITLE:0 "Armor Skirts"
- EQ_MOD_CAT_tank_magic_cannon_TITLE:0 "Magic Cannons"
+ EQ_MOD_CAT_tank_magic_cannon_light_TITLE:0 "Light Magic Cannons"
+ EQ_MOD_CAT_tank_magic_cannon_medium_TITLE:0 "Medium Magic Cannons"
+ EQ_MOD_CAT_tank_magic_cannon_heavy_TITLE:0 "Heavy Magic Cannons"
 
  ### EQUIPMENT MODULES ###
  armor_skirts_2:0 "Hybrid Mesh Skirts"
@@ -22,6 +26,9 @@
  tank_hydropneumatic_suspension:0 "Hydropneumatic Suspension"
  tank_hydropneumatic_suspension_desc:0 "This advanced system uses a mixture of gases and liquids to give unparalleled ride comfort, maneuverability in rough terrain, and speed, while not sacrificing on ease of maintenance. This comes at the cost of being considerably more expensive to produce."
 
+ easy_maintenance_2:0 "Even Easier Maintenance"
+ easy_maintenance_2_desc:0 "More hatches, more spare parts, and general improvements make this tank even easier to repair in the field."
+
  tank_magic_auto_cannon:0 "Spellfire Cannon"
  tank_magic_auto_cannon_desc:0 "Adapted from magical infantry weapons, this automatic cannon can lay down a hail of fire that is devastating to soft targets. The small caliber does limit its anti-armor performance."
  tank_magic_auto_cannon_2:0 "Improved Spellfire Cannon"
@@ -58,7 +65,16 @@
  tank_anti_air_cannon_4_desc:0 "A fast-firing automatic gun designed to engage aircraft. It has limited potential as a fire-support weapon against ground targets."
  tank_anti_air_cannon_5:0 "Modern Anti-Air Gun"
  tank_anti_air_cannon_5_desc:0 "A fast-firing automatic gun designed to engage aircraft. It has limited potential as a fire-support weapon against ground targets."
-
+ tank_heavy_anti_air_cannon:0 "2x Basic Anti-Air Guns"
+ tank_heavy_anti_air_cannon_desc:0 "Doubling the firepower increases the output against aircraft, at the cost of increased production cost and needing to be mounted in on a larger tank."
+ tank_heavy_anti_air_cannon_2:0 "2x Improved Anti-Air Guns"
+ tank_heavy_anti_air_cannon_2_desc:0 "Doubling the firepower increases the output against aircraft, at the cost of increased production cost and needing to be mounted in on a larger tank."
+ tank_heavy_anti_air_cannon_3:0 "2x Advanced Anti-Air Guns"
+ tank_heavy_anti_air_cannon_3_desc:0 "Doubling the firepower increases the output against aircraft, at the cost of increased production cost and needing to be mounted in on a larger tank."
+ tank_heavy_anti_air_cannon_4:0 "2x Semi-Modern Anti-Air Guns"
+ tank_heavy_anti_air_cannon_4_desc:0 "Doubling the firepower increases the output against aircraft, at the cost of increased production cost and needing to be mounted in on a larger tank."
+ tank_heavy_anti_air_cannon_5:0 "2x Modern Anti-Air Guns"
+ tank_heavy_anti_air_cannon_5_desc:0 "Doubling the firepower increases the output against aircraft, at the cost of increased production cost and needing to be mounted in on a larger tank."
 
 
  tank_medium_cannon_3:0 "Advanced Medium Cannon"
@@ -116,13 +132,15 @@
  surface_to_air_missiles_desc:0 "The newest rocket launcher, which can be mounted atop a tank, can hit aerial targets very effectively."
 
  main_battle_tank_chassis_b:0 "First-Generation Main Battle Tank Chassis"
- main_battle_tank_chassis_b_short:0 "1st-Gen MBT Chassis"
+ main_battle_tank_chassis_b_short:0 "1021 MBT"
  main_battle_tank_chassis_c:0 "Second-Generation Main Battle Tank Chassis"
- main_battle_tank_chassis_c_short:0 "2nd-Gen MBT Chassis"
+ main_battle_tank_chassis_c_short:0 "1026 MBT"
  modern_tank_chassis_2:0 "1st-Gen MBT Chassis"
  modern_tank_chassis_2_desc:0 "The earliest Main Battle Tanks were uneasy forays into the field, often struggling with speed or armor. Lessons learned from them have paved the way for a true universal tank."
  modern_tank_chassis_3:0 "2nd-Gen MBT Chassis"
  modern_tank_chassis_3_desc:0 "Better armor, smarter electronics, stronger engines, and even the potential of a new composite armor and hydropneumatic suspension all make these tanks devastatingly powerful and versatile."
+ modern_tank_chassis_2_short:0 "1021 MBT"
+ modern_tank_chassis_3_short:0 "1026 MBT"
  modern_tank_artillery_chassis_2:0 "1st-Gen Modern SP Artillery"
  modern_tank_artillery_chassis_3:0 "2nd-Gen Modern SP Artillery"
  modern_tank_destroyer_chassis_2:0 "1st-Gen Main Battle Tank Destroyer"
@@ -132,8 +150,12 @@
 
  super_heavy_tank_chassis_b:0 "Improved Super-Heavy Tank Chassis"
  super_heavy_tank_chassis_c:0 "Advanced Super-Heavy Tank Chassis"
+ super_heavy_tank_chassis_b_short:0 "1020 Super-Heavy"
+ super_heavy_tank_chassis_c_short:0 "1026 Super-Heavy"
  super_heavy_tank_chassis_2:0 "Improved Super-Heavy Tank Chassis"
  super_heavy_tank_chassis_3:0 "Advanced Super-Heavy Tank Chassis"
+ super_heavy_tank_chassis_2_short:0 "1020 Super-Heavy"
+ super_heavy_tank_chassis_3_short:0 "1026 Super-Heavy"
 
  super_heavy_tank_chassis_2_desc:0 "These tanks are rolling monstrosities, with high-caliber bunker smashing cannons and several layers of reinforced armor. But even with the most advanced engines and extra-wide double tracks, these tanks have trouble traversing marshes and have to ford rivers with a snorkel."
  super_heavy_tank_chassis_3_desc:0 "Faster treads allow these super heavy tanks to compete on the modern battlefield. High-caliber bunker smashing cannons and several layers of reinforced armor render them nearly unstoppable in a fair fight. While they will likely never reclaim dominance from the main battle tanks due to their reduced versatility, they nonetheless can provide devastating firepower when our troops need it most."
diff --git a/localisation/english/eaw_unit_l_english.yml b/localisation/english/eaw_unit_l_english.yml
index 8dda8cb6ce3..e9422b9d31e 100644
--- a/localisation/english/eaw_unit_l_english.yml
+++ b/localisation/english/eaw_unit_l_english.yml
@@ -2,6 +2,7 @@
  category_heavy_infantry:0 "Infantry"
  category_magical_infantry:0 "Magical Infantry"
  #category_special_forces:0 "Special Forces"# Identical duplicate from hoi4
+ category_racial_special_forces:0 "Racial Special Forces"
  tech_unicorn_company:0 "Unicorn Company"
  unicorn:0 "Unicorn Company"
  unicorn_desc:0 "Unicorns trained to use their magic under fire in various combat roles."
diff --git a/localisation/english/eaw_welcomescreen_l_english.yml b/localisation/english/eaw_welcomescreen_l_english.yml
index a480f5c711c..3b35ab4b65d 100644
--- a/localisation/english/eaw_welcomescreen_l_english.yml
+++ b/localisation/english/eaw_welcomescreen_l_english.yml
@@ -28,7 +28,7 @@
  EAW_WS_TAB_1_HEADER:0 "[Root.GetNiceCountryName]" #scripted loc for nicer stuff
  EAW_WS_TAB_2_HEADER:0 "[Root.GetRegionName]"
  EAW_WS_TAB_3_HEADER:0 "£eaw_text Equestria at War Mechanics"
- EAW_WS_TAB_4_HEADER:0 "'The Way of Fire' 2.2"
+ EAW_WS_TAB_4_HEADER:0 "'The Way of Fire' 2.2.1"
 
  #24 lines of text
  EAW_WS_TAB_1_TXT:0 "[Root.GetCountryIntro]"
@@ -41,14 +41,14 @@
  EAW_WS_TAB_3_TXT_HEADER_6:0 "Game Rules"
  EAW_WS_TAB_3_TXT_HEADER_7:0 "Dynamic Leader Generation"
  EAW_WS_TAB_3_TXT:0 "\n\n£eaw_text  §YEquestria at War§! incorporates a fork of §YRoad to 56§! by §YGreatexperiment§! (used with permission), that has been edited and streamlined to fit our design goals better. This allows for a longer game with more technologies to research.\n\nEaW introduces §YMagical Equipment§! and a new resource - £resources_strip|7  §YCrystals§! - used to produce it. §YMagical Equipment§! provides a more resource, IC-intensive, less reliable, but more powerful alternative to regular §YInfantry Equipment§!.\n\n§YPre-Industrial Infantry Equipment§! and §YArtillery§! have been added, to represent the weapons used by nations that have not yet industrialized.\n\nFurthermore, EaW introduces the §YRaces§! system. Each country has one of twenty three races - §YPony§!, §YChangeling§!, §YGriffon§!, §YDeer§!, §YDiamond Dog§!, §YDragon§!, §YBuffalo§!, §YPolar Bear§!, §YPenguin§!, §YMinotaur§!, §YZebra§!, §YHippogriff§!, §YKirin§!, §YHorse§!, §YCamel§!, §YGiraffe§!, §YDonkey§!, §YAbyssinian§!, §YLlama§!, §YGargoyle§!, §YCentaur§!, §YYeti§! or §YUnspecified§!. Many races have their own unique racial tech tree folder, and in some cases racial unique units. Races cannot be manually changed during the game.\n\n\n\nIn order to better represent the differences in industrial/societal and research development of nations in Equestria at War, §YScientific Development§!, §YSociety Development§!, §YIlliteracy§!, and §YPoverty§! idea categories have been implemented.\n\n§YScientific Development§! represents the level of education and research capabilities of the nation. Low levels of §YScientific Development§! impose §RResearch§! maluses. §YScientific Development§! can be improved by §YNational Focuses§! or §YDecisions§!, depending on the country. For §Ygriffon§! countries, owning major centers of learning in Griffonia can be used to improve §YScientific Development§! as well.\n\n§YSociety Development§! represents the general state of industrialization and advancement of economy and society. Low levels of §YSociety Development§! impose §RIndustry§!, §RResearch§! and §RPolitical§! maluses. §YDevelopment§! can be improved by §YNational Focuses§! or §YDecisions§!, depending on the country.\n\n§YIlliteracy§! represents how many of your citizens can read and write. Low levels of §YIlliteracy§! impose §RResearch§! and §RConstruction§! maluses. §YIlliteracy§! can be improved by §YNational Focuses§! or §YDecisions§!, depending on the country.\n\n§YPoverty§! represents how well-functioning your economy is. Low levels of §YPoverty§! impose §RResearch§!, §RRecruitable Population§!, §RIndustry§!, and §RMonthly Population§! maluses. Both of these can be improved by §YNational Focuses§! or §YDecisions§!, depending on the country.\n\n\n\nThe potential of nuclear warfare and the horror of unleashing such terrible weapons is not quite seen in Vanilla. In order to rectify this, EaW introduces the following changes:\n- Nuclear attacks will now reduce the population of a hit §Ystate§!, using believable casualty numbers depending on state population and development (using multiple nuclear bombs on a state in short succession will not reduce population as drastically).\n- A §Ystate§! hit by a nuclear attack will receive the §YFallout§! state modifier, reducing state factories, supplies, division organization and increasing division attrition. The modifier will last for a §Yyear§!. Subsequent nuclear attacks will not stack the modifier, but will reset the one year timer.\n- Production of §Ynuclear bombs§! requires a supply of £resources_strip|7  §YCrystals§!. If none are available, no new §Ynuclear bombs§! will be produced. Each §YNuclear Reactor§! consumes 12 £resources_strip|7  §YCrystals§!.\n\n\n\nAfter a country has been defeated in a war, and a peace conference has ended, the victors will have a chance to receive §Gone-time 50-200% research speed bonuses§! to §Ytechnologies§! that the loser had researched, and the victor has not.\n\nThe chance to receive the bonus is random, and calculated per technology. The more of loser's §YIndustry§! that has been taken over by the victor (either by puppeting or annexation), the higher the chance to receive a bonus, which means that not every victor will have an equal chance. The level of §YDevelopment§! of the victor is also a factor - the worse the Development, the smaller the chance.\n\n\n\nAn effort was made to improve the AI. While it is by no means perfect, and most of the real improvements can only be implemented by Paradox, we have done our best to tweak AI's behaviors, and improve AI's handling of Division Templates. AI will use all of the added units and technologies. AI will intelligently choose Doctrines based on the bonuses they recieve in their Focus Tree. AI will use dynamic strategies to respond to events and changes on the world stage. Peace Conference AI has been improved, though it is not perfect.\n\n\n\nSince 1.6 Ironclad update, new Game Rules for various countries and game setups have been added, to allow the player to customize their £eaw_text  §YEquestria at War§! experience.\n\n\n\n£eaw_text  §YEquestria at War§! provides a new, flavorful system of general, admiral and, for players with the La Resistance DLC, operative generation. Various nations will generate different leaders of different races depending on their circumstances. For example, a nation may have both pony and griffon generals, or use multiple namelists. This does not carry any gameplay changes."
- EAW_WS_TAB_4_TXT_HEADER_1:0 "§Y'The Way of Fire' 2.2.0.1§!"
+ EAW_WS_TAB_4_TXT_HEADER_1:0 "§Y'The Way of Fire' 2.2.1§!"
  EAW_WS_TAB_4_TXT_HEADER_2:0 "§Y'In the Shadow of Mountains' 1.8.2.1§!"
  EAW_WS_TAB_4_TXT_HEADER_3:0 "§Y'In the Shadow of Mountains' 1.8.2§!"
  EAW_WS_TAB_4_TXT_HEADER_4:0 "§Y'In the Shadow of Mountains' 1.8.1§!"
  EAW_WS_TAB_4_TXT_HEADER_5:0 "§Y'In the Shadow of Mountains' 1.8.0.1§!"
  #EAW_WS_TAB_4_TXT_HEADER_6:0 "§Y'In the Shadow of Mountains' 1.8§!"
  #EAW_WS_TAB_4_TXT_HEADER_7:0 "§Y'Pax Chrysalia: Redux' 1.7.7.1§!"
- EAW_WS_TAB_4_TXT:0 "\n+ Additions:\n    - New loading screen.\n    - Replaced the vanilla event background with a custom one.\n    - Added two new starting generals for Kiria.\n    - There are now game rules to strengthen Kirian tags.\n    - There is now a game setup rule for the Kirian Civil War.\n    - Revolutionary Fragrance has been given new decisions for raising militias, spreading the revolution southward, and reconciliation with the Nirik Contumancy.\n    - Added railways in the Zaikirian region.\n+ Changes:\n    - The new content interface has been moved from the main menu to the continental selection screen.\n    - AI Equestria can now remove its negative army spirits.\n    - Zaikirian minors now start with higher societal and scientific development, as well as more starting technologies.\n    - Significantly nerfed Kiria's Mayflower Bloom.\n    - Rebalanced the Kirian civil war.\n    - Scientific Astrology now protects better against bad luck.\n    - Several Kirian events will now only trigger once, preventing unintended interactions.\n    - Proper Heritage now makes Vanguards free to design.\n    - Slightly sped up placeholder wars between Roam and Lan Kir.\n    - Roam and Talonsvaal can no longer core Kiria.\n    - Roam, Talonsvaal, and Lan Kir will now always refuse to disarm when demanded by Kiria, and will no longer declare war on the International City of Fragrance.\n    - Harmonic and communist regimes will now dislike nations with Slave Economy.\n    - Polar Shamans technology will now buff recon companies instead of field hospitals.\n+ Fixes:\n    - Corrected dragon generics not having their GFX defined.\n    - Aquileia can now properly demand Tarrin from Adelart, if they control it.\n    - Fixed an issue with tank research bonuses in Kirian focus tree.\n    - Fixed Pingland's starting cruiser design having incorrect modules.\n    - Kirian state GUIs will no longer briefly appear for a second after selecting a state.\n    - Kiria can no longer purchase equipment from Equestria if it doesn't exist.\n    - AI opponents in the Kirian civil war will no longer receive hidden bonuses against a player.\n    - Removed a corporatist Kiria exploit to lower puppet autonomy far quicker than intended.\n    - Added a decision for Colthage to cancel trade deals.\n    - Reverted some strait and impassable changes.\n    - Various issues with Kirian content have been corrected.\n    - Miscellaneous bugfixes and improvements.\n    - Miscellaneous localisation fixes."
+ EAW_WS_TAB_4_TXT:0 "\n+ Additions:\n    - Full compatibility ensured with Arms Against Tyranny.\n    - Added female generic griffon Republican general portraits.\n    - Added a new cosmetic tag for the Titanic Realm, and the ability for them to research Jagers.\n    - New victory points and supply hubs have been added in the hillpony region.\n    - Added heavy anti-air and close support gun tank modules.\n    - Implemented a decision to commandeer civilian trucks.\n    - Added options to strengthen Roam, Talonsvaal and Lan Kir.\n    - The Realm of Kiria can now intervene against expansionist Roam, Talonsvaal and Lan Kir.\n    - The Republic of Kiria can now gain war goals against their western neighbours.\n+ Changes:\n    - The land doctrine GUI has been reorganised.\n    - Improved the custom event background.\n    - Replaced the background image for the Kirian technology tree.\n    - Placeholder wars from Roam, Talonsvaal and Lan Kir now notify the player of their intentions.\n    - Replaced Pharynx's Armour Officer trait with Veteran Jager trait.\n    - Scientific Astrology now also provides better protection against resistance activities.\n    - Super-heavy turrets no longer have a reliability reduction and a production cost increase.\n    - Increased Rocket Engine thrust to pre-AAT levels and increased their speed as well.\n    - Increased Engineer Company entrenchment to pre-AAT levels.\n    - Increased Signal Company initiative to pre-AAT level.\n    - Great War Truck's hardness has been reduced.\n    - SPAA will now receive buffs from small AA technologies.\n    - Consumer Goods modifiers have been rebalanced.\n    - Pioneer and Engineer companies' mutual exclusivity has been removed.\n    - Talarayi's flag has been reworked.\n+ Fixes:\n    - Corrected AI weight for Wingbardy which could result in them not invading Francistria, Talouse and Arantiga.\n    - AI should be more willing to take islands in peace deals even if they don't neighbour them.\n    - Implemented a proper AI template for marines.\n    - Changeling Fragrance's political screen should no longer break upon reloading a save.\n    - Fixed an issue where Changeling Fragrance could produce too many infiltrators on a weekly basis.\n    - Corrected an issue where several characters could be active in both Changeling Lands and Free Changeling Hives.\n    - Fixed magical medium/heavy cannon tank modules being available on light tanks.\n    - Fixed an issue where Sicameon would not get a designer despite saying otherwise.\n    - Corrected an issue where Kirian pirate raid events didn't trigger properly.\n    - Various minor issues with Kirian content have been corrected.\n    - Corrected many issues with starting naval and aircraft forces.\n    - Fixed the joint focus tree in the River Federation.\n    - Puppeting the Dread League as Viira will now remove all of their ideas.\n    - Tobuck's decisions for white peace now work properly.\n    - An issue with Zarantia's Tatzelwurm state modifier has been fixed.\n    - Fixed ELF's Manehattan liberation news event never firing.\n    - Corrected issues with various strategy plans.\n    - Starting production lines have been made matching regardless of DLC ownership.\n    - Miscellaneous bugfixes and improvements.\n    - Miscellaneous localisation fixes."
  
  # Continent
  EAW_WS_Zebrica:0 "Zebrica - Crossroad of Civilizations"
@@ -228,13 +228,13 @@
  EAW_WS_NCR_desc:0 "War. War never changes.\n\nIn the year 2270, prospectors discovered a long-forgotten vault under the Sierra Nevada Mountains. In the vault was a gateway that lead to another world, untouched by the atomic fires that ravaged the Earth long ago. News of this gateway to paradise quickly spread and §YPresident Wendell Peterson§! of the §YNew California Republic§! ordered an expedition to be sent through.\n\nThey created a settlement on the other side of the portal in a world free of toxins and radiation. The community grew and explorers set out in search for more land. But it soon became apparent that they weren't alone in this new world.\n\nThis land was home to a race of intelligent quadrupeds called §YPonies§!, sharing the name with ancient depictions of a creature from earth. Relations were peaceful at first but attempts of trade failed to bear fruit. The ponies weere seemingly without want and weere in abundance of food, water, medicine and natural resources. They were happy to offer quantities to the expedition for free and teach the expedition how to work the land around the Gateway. But little of the goods the NCR could offer satisfied the local ponies enough for large-scale trade.\n\nThe desire for resources, and the lack of trade to the locals convinced the Peterson administration that there could only be one course of action: the full-scale colonisation and integration of this strange new world. The further the NCR's troops marched, the more resistance they encountered. Soon skirmishes broke out between the two equally matched sides. A stalemate settled in. In the year 2273, or the year 1005 in the Equestrian calendar, the §YTreaty of Las Pegasus§! was signed between the NCR and the §YEquestria§!. The NCR's border would remain in its current position in exchange of recognition of both sides. All ponies were also to be treated freely and equally as full citizens of the NCR. Finally trade deals would be drawn up between the two nations, allowing the flow of goods the NCR so desperately needed.\n\nNow under §YGovernor-Colonel Jameson§!, the §YNew California Expedition§! is experiencing a boom as the NCR's most prized possession. Safe, secure, it is the paradise the Earth so desperately needs.\n\nBut even this world is not safe from war. Tension between this world's superpowers are rising, fuelled by familiar old desires. The NCR might soon find itself fighting not against mountain bandits or desert raiders, but against an industrial and military might not seen in 200 years. Only time will tell what the outcome will be. After all, war never changes."
  
  EAW_WS_KIR:0 "[Root.GetNameDef] - A Silent Land"
- EAW_WS_KIR_desc:0 "The §GRealm of Kiria§!, born from the squabbling mess of kirin villages and tribes that dotted the land for centuries, was only birthed roughly around the year 450 ALB, becoming the first unified nation-state in the specie's history. Until that point, the kirin lived in a state of constant conflict, with the political landscape of the region consisting of an ever-shifting set of alliances that formed and fractured along with the temperaments of their leaders. For the kirin species bears a powerful and dangerous curse within them: the ability to transform into a beast of fire and fury, a §Rnirik§!, upon becoming enraged, losing all sense of friend and foe, shedding their inhibitions and better judgement. When disagreements could leave entire villages §Rburnt to cinders§!, unification of this aggressive species seemed impossible.\n\nBut where conquest, cunning, and cooperation had failed, §CThe Way of Fire§! proved successful. The §CWay§! was a set of religious beliefs that taught its followers to practice controlling their emotions and reject the §Rnirik state§! so that it would be possible for kirin to live in peace and harmony with each other. Those that followed the §CWay§! pointed to the teachings and responsibilities given to all kirin by their mythological deity, §YConcord§!, who had entrusted the kirin species with the last spark of the primordial fire that birthed the world. Succumbing to the destruction of the §Rnirik state§! was a rejection and corruption of Concord's gift, and kirin could only be worthy of Her gifts if they ceased their fighting and worked together. To the kirin, long weary of the destruction and fighting their violent natures enforced on them, §CThe Way of Fire§! offered an escape to a better life. Over the years, the majority of the kirin in the Realm unified under the leadership of the §OVermilion Priests§!, establishing a peaceful society for the first time in their history to work together and better their lot in life.\n\nOver time, the priests that ruled this society slowly morphed into the §OVermilion Dynasty§!, led by an infallible Matriarch Superior. The stability offered by the Dynasty and the Way enabled the Kirin nation to expand in power and influence, allowing it to dominate much of south-eastern Zebrica. But even the Dynasty's power was not enough to prepare Kiria for the modern age. As ninth-century Kiria transitioned from feudalism to capitalism, significant technological progress took place alongside socioeconomic and political transformation. At the centre of this wave of modernity sweeping across the Kirin homeland were the cities of §CRhapsody§!, §OFragrance§!, and §GVerdant§!. With a population boom induced by agricultural advancements, the growth of these cities created conditions ideal for the ascent of a Kirin bourgeoisie of §Ymerchants§!, §Ylandlords§!, and §Yscholar-intellectuals§!, whose growing influence §Yundermined§! the control of the Dynasty and the Way of Fire over the Realm.\n\nWith the §Ystratification of society§! along class lines came an increase in conflict. As they attempted to extend their control over Kiria's economy and agriculture, the interests of merchants and landlords came into opposition with those of the peasants and city-dwelling labourers. Discontent built up among the lower classes, and before too long, violent and destructive §Rpeasant uprisings§! engulfed the land, exacerbated by the violent transformations of thousands of disgruntled peasants into nirik that ravaged large parts of the countryside and set flame to the Realm's urban centers. In an act of desperation, §YMatriarch Superior Noctilucent Charm§! instituted a series of harsh political measures and decrees that would collectively come to be known as §RThe Silence§!. The Matriarch decreed that it was treason to assume a position of power over another kirin, as it undermined the absolutism of her divine rule. All forms of currency were thereby declared blasphemous, as were property rights. All forms of hierarchical organisation and relationships were also outlawed. The only exception was families — and the Way of Fire's §CHierocracy§!, albeit reduced to a rump of its most zealous and ultraorthodox, and therefore trustworthy, acolytes. Most city-dwelling kirin returned to the countryside and engaged in subsistence farming, depopulating the cities. Those who defied §RThe Silence§! were ostracized and shunned, for the worship and veneration of the §OVermilion Dynasty§! was so prolific and deeply entrenched within Kirin society that much of the populace at the time had become firmly devoted to their Matriarch; during that period of conflict and strife, as Kiria teetered on the brink of §Rcivil war§!, the Matriarch Superior had become a bastion of serenity and calm in the midst of the tempest. The remnants of the Kirin bourgeoisie fled, either overseas, or to the most distant reaches of the Realm, away from Imperial authority — now more or less defunct, because there was no longer a state through which the Matriarch Superior could exercise her power. The §GRealm of Kiria§! had, effectively, been put in a dark corner to slowly die.\n\nNoctilucent Charm died in 971, at which point her only daughter, Princess §CRain Shine§!, ascended as Matriarch Superior in a markedly modest affair. Rain Shine was determined to live up to her mother's legacy, and set about upholding the decrees of the Silence, dedicating most of her time to intensive study of the scriptures of the Way of Fire.\n\n§RThe Silence§! would last for roughly a century before an §YEquestrian diplomatic mission§! would venture into the isolated nation with the hopes of gaining an audience with Rain Shine. Working with a few dissident kirin, the mission was ultimately successful in helping Rain Shine realize her mother's errors, and began the first steps in opening up the country. As a new era dawns on Kiria, it is up to the Matriarch to undo the damage §RThe Silence§! has caused to her Realm and bring her nation into the brave new world it finds itself in, before the influence of her dynasty §Yfades forever§!."
+ EAW_WS_KIR_desc:0 "The §GRealm of Kiria§!, born from the squabbling mess of kirin villages and tribes that dotted the land for centuries, was only birthed roughly around the year 450 ALB, becoming the first unified nation-state in the species' history. Until that point, the kirin lived in a state of constant conflict, with the political landscape of the region consisting of an ever-shifting set of alliances that formed and fractured along with the temperaments of their leaders. For the kirin species bears a powerful and dangerous curse within them: the ability to transform into a beast of fire and fury, a §Rnirik§!, upon becoming enraged, losing all sense of friend and foe, shedding their inhibitions and better judgement. When disagreements could leave entire villages §Rburnt to cinders§!, unification of this aggressive species seemed impossible.\n\nBut where conquest, cunning, and cooperation had failed, §CThe Way of Fire§! proved successful. The §CWay§! was a set of religious beliefs that taught its followers to practice controlling their emotions and reject the §Rnirik state§! so that it would be possible for kirin to live in peace and harmony with each other. Those that followed the §CWay§! pointed to the teachings and responsibilities given to all kirin by their mythological deity, §YConcord§!, who had entrusted the kirin species with the last spark of the primordial fire that birthed the world. Succumbing to the destruction of the §Rnirik state§! was a rejection and corruption of Concord's gift, and kirin could only be worthy of Her gifts if they ceased their fighting and worked together. To the kirin, long weary of the destruction and fighting their violent natures enforced on them, §CThe Way of Fire§! offered an escape to a better life. Over the years, the majority of the kirin in the Realm unified under the leadership of the §OVermilion Priests§!, establishing a peaceful society for the first time in their history to work together and better their lot in life.\n\nOver time, the priests that ruled this society slowly morphed into the §OVermilion Dynasty§!, led by an infallible Matriarch Superior. The stability offered by the Dynasty and the Way enabled the Kirin nation to expand in power and influence, allowing it to dominate much of south-eastern Zebrica. But even the Dynasty's power was not enough to prepare Kiria for the modern age. As ninth-century Kiria transitioned from feudalism to capitalism, significant technological progress took place alongside socioeconomic and political transformation. At the centre of this wave of modernity sweeping across the Kirin homeland were the cities of §CRhapsody§!, §OFragrance§!, and §GVerdant§!. With a population boom induced by agricultural advancements, the growth of these cities created conditions ideal for the ascent of a Kirin bourgeoisie of §Ymerchants§!, §Ylandlords§!, and §Yscholar-intellectuals§!, whose growing influence §Yundermined§! the control of the Dynasty and the Way of Fire over the Realm.\n\nWith the §Ystratification of society§! along class lines came an increase in conflict. As they attempted to extend their control over Kiria's economy and agriculture, the interests of merchants and landlords came into opposition with those of the peasants and city-dwelling labourers. Discontent built up among the lower classes, and before too long, violent and destructive §Rpeasant uprisings§! engulfed the land, exacerbated by the violent transformations of thousands of disgruntled peasants into nirik that ravaged large parts of the countryside and set flame to the Realm's urban centers. In an act of desperation, §YMatriarch Superior Noctilucent Charm§! instituted a series of harsh political measures and decrees that would collectively come to be known as §RThe Silence§!. The Matriarch decreed that it was treason to assume a position of power over another kirin, as it undermined the absolutism of her divine rule. All forms of currency were thereby declared blasphemous, as were property rights. All forms of hierarchical organisation and relationships were also outlawed. The only exception was families — and the Way of Fire's §CHierocracy§!, albeit reduced to a rump of its most zealous and ultraorthodox, and therefore trustworthy, acolytes. Most city-dwelling kirin returned to the countryside and engaged in subsistence farming, depopulating the cities. Those who defied §RThe Silence§! were ostracized and shunned, for the worship and veneration of the §OVermilion Dynasty§! was so prolific and deeply entrenched within Kirin society that much of the populace at the time had become firmly devoted to their Matriarch; during that period of conflict and strife, as Kiria teetered on the brink of §Rcivil war§!, the Matriarch Superior had become a bastion of serenity and calm in the midst of the tempest. The remnants of the Kirin bourgeoisie fled, either overseas, or to the most distant reaches of the Realm, away from Imperial authority — now more or less defunct, because there was no longer a state through which the Matriarch Superior could exercise her power. The §GRealm of Kiria§! had, effectively, been put in a dark corner to slowly die.\n\nNoctilucent Charm died in 971, at which point her only daughter, Princess §CRain Shine§!, ascended as Matriarch Superior in a markedly modest affair. Rain Shine was determined to live up to her mother's legacy, and set about upholding the decrees of the Silence, dedicating most of her time to intensive study of the scriptures of the Way of Fire.\n\n§RThe Silence§! would last for roughly a century before an §YEquestrian diplomatic mission§! would venture into the isolated nation with the hopes of gaining an audience with Rain Shine. Working with a few dissident kirin, the mission was ultimately successful in helping Rain Shine realize her mother's errors, and began the first steps in opening up the country. As a new era dawns on Kiria, it is up to the Matriarch to undo the damage §RThe Silence§! has caused to her Realm and bring her nation into the brave new world it finds itself in, before the influence of her dynasty §Yfades forever§!."
 
  EAW_WS_KIS:0 "[Root.GetNameDef] - Righting Old Wrongs"
  EAW_WS_KIS_desc:0 "At the break of day, the bells throughout the magnificent port city of §YFragrance§! began to ring. Their clamorous cacophony echoed far and wide throughout the kirin city, the noise reverberating off of ship hulls and carrying across the waters of the Kirin Sea. Every kirin in the city streets stopped what they were doing and looked around, and as a crowd began to form from thin air, they moved to join it, swelling its numbers and adding their weight to the procession. Soon, they reached their destination: 88 Chrysanthemum Plaza, the national headquarters of the National Association of Kirin Patriots, and the onlookers craned their necks to see over the countless rows of red horns to catch a glimpse of enforcers in crisp uniforms fashioning a perimeter around a stage. The stage was large, magnificent, but hurriedly assembled, and as the crowd looked on, one kirin in a pressed suit stepped forward and took the podium before everykirin assembled.\n\n§YChairkirin Fickle Current§! looked out at the crowd that had come to hear this speech, summoned by the ringing of the bells. There were at least four, maybe five thousand kirin in front of him, with others watching from the windows of nearby buildings. He touched the speech notes he'd hastily scribbled down this morning and stuffed in his coat pocket, if only to remind himself of their contents, and when a sufficient quiet anticipation had settled over the crowd, he began to recite his speech from memory.\n\n"Kirin of Fragrance," he began, his gaze sweeping across the crowd. "Today marks an important day in the history of our beloved city. I scarce need to remind any of you of how Fragrance suffered during §RThe Silence§! a century ago, how Vermilion's backwards politics nearly strangled the life out of our prosperous mercantile town. When The Silence was lifted and §GThe Grand Gallop Onward§! began, I dared to believe like so many of us returning from our exile across the world that things would change. Change, they indeed have, but nokirin can definitively say whether it was for the better or the worse."\n\nHe frowned at the crowd, projecting some of his emotion into the kirin gathered around him. "Kirin of Fragrance, the Grand Gallop Onward was a failure. It was sabotaged by §Cunbending spiritual dogma§!, §Rblasphemous revolution§!, and the §Osheer incompetence§! of those that led it. Fragrance already knew the path forward to peace and prosperity, but our voice was drowned out by ignorance and superstition. And now, with the house of cards beginning to topple in Vermilion, we are supposed to pledge unending loyalty to the regime that fostered all this failure?"\n\n"I will not have it," Current said with a stomp of his hoof. "Fragrance has suffered under Vermilion for too long. No more, I say! No more will we be shackled to the fate of our §Ylesser sibling§!. No more will Vermilion hold sway over us. We, who have been given all the tools we need to succeed, will no longer share them with those that know not how to use them properly. It is time for Fragrance to stand on its own. It is time for the kirin of the north, the kirin of §GGreater Providence§!, to claim the independent identity we have longed for for so long!"\n\n"It is time that we break with Vermilion, and we do what our inept leaders could not: bring Kiria into a §Gnew and prosperous modern era!§!" #lack of closing quotation mark an intentional stylistic choice.
  
  EAW_WS_KIC:0 "[Root.GetNameDef] - Fanning the Flames"
- EAW_WS_KIC_desc:0 "Under a fiery sunset, the waters of the Great Mellifluve ran §Rcrimson§!.\n\nIn §YChrysanthemum§!, the Western Sentinel of the Realm, kirin hooves shed kirin blood, though both sides bled equally. That morning, hundreds if not thousands of poor kirin had taken up arms against the loyalist garrison from Vermilion, intent on driving them out of the city and claiming it in the name of §OThe Rising Fire§!, but the garrison had resisted. The kirin from Vermilion were armed with rifles, while the peasants carried pitchforks, scythes, spades, and whatever other tools they could get their hooves on, but the garrison was forty against four thousand. Though countless peasants died in storming the garrison's barracks, once the defenders ran out of ammunition, they were slaughtered to the very last. It was then that the anger of The Rising Fire reached a feverish pitch and boiled over.\n\n§YRising Sun§! watched from the banks of the Great Mellifluve as countless priests, mystics, and other affluent kirin were dragged from their homes and down to the water's edge. She had known many of these kirin in a past life, debated theology with them, had asked them for alms for the poor only to be snubbed by their indifference or pride. Now, they begged for their lives as they were taken down to the banks of the Great Mellifluve, where they were dealt with one by one, and their bodies tossed into its waters. Once it was over her followers and faithful gathered around to hear Rising Sun speak.\n\n"There is no turning back now," Rising Sun warned them, her eyes dancing over farm tools all stained red with blood. "We have embarked on the great liberation of Kiria from the wasteful hedonists within §CThe Way of Fire§!. Their failures have brought the realm to the brink of ruin, and we all have had to pay the price. Yet even as we suffered, they stood above us, interpreting our suffering as §OConcord's Will!§! Is Concord not a benevolent goddess? Does she not love her foals, the foals she entrusted with the last spark of the §YPrimordial Fire?§! Why would she deign for us to suffer if she loves us so?"\n\n"The truth is simple: this is not her will," Rising Sun continued, and the light glittering off the crimson waters of the Great Mellifluve outlined her in a red glow. "We have been lied to, my faithful kirin, by corrupt leaders who desire to profit off of our suffering! Even now, they invite foreigners into the country to better craft the machines of our oppression. They hold our beloved §GMatriarch Superior§! hostage within Vermilion's walls, twisting the Avatar of Concord to their covetous greed!"\n\nThe crowd let out a harsh roar of anger and disapproval, and Rising Sun matched their anger with a showmare's sneer of her own. "But we, The Rising Fire, will not have it! We shall be the true salvation of Kiria! Only we can save what is left of our home and our religion from those who would destroy it! Only we can march to Vermilion and free the Matriarch Superior from those who would use her as a puppet to their own ends!"\n\n"And only we have the strength to do what must be done: to fight with every last drop of blood in our beating hearts, until §YKiria is pure once more!"
+ EAW_WS_KIC_desc:0 "Under a fiery sunset, the waters of the Great Mellifluve ran §Rcrimson§!.\n\nIn §YChrysanthemum§!, the Western Sentinel of the Realm, kirin hooves shed kirin blood, though both sides bled equally. That morning, hundreds if not thousands of poor kirin had taken up arms against the loyalist garrison from Vermilion, intent on driving them out of the city and claiming it in the name of §OThe Rising Fire§!, but the garrison had resisted. The kirin from Vermilion were armed with rifles, while the peasants carried pitchforks, scythes, spades, and whatever other tools they could get their hooves on, but the garrison was forty against four thousand. Though countless peasants died in storming the garrison's barracks, once the defenders ran out of ammunition, they were slaughtered to the very last. It was then that the anger of The Rising Fire reached a feverish pitch and boiled over.\n\n§YRising Sun§! watched from the banks of the Great Mellifluve as countless priests, mystics, and other affluent kirin were dragged from their homes and down to the water's edge. She had known many of these kirin in a past life, debated theology with them, had asked them for alms for the poor only to be snubbed by their indifference or pride. Now, they begged for their lives as they were taken down to the banks of the Great Mellifluve, where they were dealt with one by one, and their bodies tossed into its waters. Once it was over her followers and faithful gathered around to hear Rising Sun speak.\n\n"There is no turning back now," Rising Sun warned them, her eyes dancing over farm tools all stained red with blood. "We have embarked on the great liberation of Kiria from the wasteful hedonists within §CThe Way of Fire§!. Their failures have brought the realm to the brink of ruin, and we all have had to pay the price. Yet even as we suffered, they stood above us, interpreting our suffering as §OConcord's Will!§! Is Concord not a benevolent goddess? Does she not love her foals, the foals she entrusted with the last spark of the §YPrimordial Fire?§! Why would she deign for us to suffer if she loves us so?"\n\n"The truth is simple: this is not her will," Rising Sun continued, and the light glittering off the crimson waters of the Great Mellifluve outlined her in a red glow. "We have been lied to, my faithful kirin, by corrupt leaders who desire to profit off of our suffering! Even now, they invite foreigners into the country to better craft the machines of our oppression. They hold our beloved §GMatriarch Superior§! hostage within Vermilion's walls, twisting the Avatar of Concord to their covetous greed!"\n\nThe crowd let out a harsh roar of anger and disapproval, and Rising Sun matched their anger with a showmare's sneer of her own. "But we, The Rising Fire, will not have it! We shall be the true salvation of Kiria! Only we can save what is left of our home and our religion from those who would destroy it! Only we can march to Vermilion and free the Matriarch Superior from those who would use her as a puppet to their own ends!"\n\n"And only we have the strength to do what must be done: to fight with every last drop of blood in our beating hearts, until §YKiria is pure once more§!"
   
  EAW_WS_KXN:0 "[Root.GetNameDef] - Strength Through Fury"
  EAW_WS_KXN_desc:0 "Prior to the §RSilence§!, the region now known as Lan Kir was part of the §YCommandery of Zaikiria§! in vassalage to the §YVermilion Dynasty of Kiria§!. Lan Kir's location on the periphery of the Vermilion Realm meant that it was one of the few places that saw regular combat between Kirin and Zebra. What should have been a sleepy frontier, therefore, instead became an important as well as prestigious military outpost §Ydespite lacking economic or political value§!. Owing to the incessant skirmishes erupting along the conflict-prone border, the §GBanners§! dispatched to defend Lan Kir's borders were viewed as among the most capable in Kiria, and the Banners of the Zaikirian Commandery rotated regularly through the region in order to benefit from the abundance of fighting and valuable combat experience to be had.\n\nAt the onset of the §RSilence§!, the Commandery of Zaikiria became a refuge for Kirin refusing to subject themselves to a slow death by §Rprimitive retrogression§!. As a multitude of petty regional secessionists took advantage of Vermilion's dysfunction to rise up in open rebellion against the Commandery, the Banners of Zaikiria, themselves riven by fratricidal infighting over the imposition of the Silence, failed to restore order, and the entire region §Rexploded into violence§!. In the end, the Zaikirian Banners, marooned at their postings and isolated from Vermilion, were defeated by the wave of local insurgencies in the wake of Kiria's collapse. Of their shattered remnants, some managed to retreat to §Ythe forests of the Zaikirian frontier§!, where the once-proud Banners of Zaikiria attempted to regroup for a counterattack into Zaikiria. Yet no aid was forthcoming from Kiria, where the Silence had already taken hold of the Realm. The last orders from Vermilion, dispatched via dragonfire candle, §Rcensured§! the failure of the Zaikirian Banners to maintain control over the Commandery, and ordered them return to Kiria and submit to the §RSilence§!.\n\nThe message caused great dismay among the soldiers, many of whom had fought for years to keep the frontiers of Kiria safe. Vermilion's brusque dismissal of their service caused much bitterness and anger among the ranks — a tide of rage and fury which saw the remnants of the Banners fall apart in a wave of desertions, banditry, and §Rnirik transformations§!. The crisis culminated with a proclamation by Imperial Commissioner §CSummer Storm§! — formerly the Governor of §YBlossom§! — that the Zaikirian Banners, mutinous, would no longer obey §Rthe dictates of Vermilion§!. The achievements of the §GTwenty Banners§! were nothing to be cast aside so lightly, and instead, he vowed to let their strength and fury be given its due reward. If Kiria would not help them restore order, §Ythen they would do so themselves§!. This proclamation would uplift morale amongst the ranks, and restore a semblance of order and discipline, setting the stage for the founding of the State of Lan Kir with Summer Storm as its first General of State.\n\nFor twenty years, Lan Kir and its native kirin were ruled under a §Yde-facto military occupation§! by the Twenty Banners, but in the end, starvation, attrition, and the §Rsolidification of independent successor states§! in §YSen Kinh§! and §YKhamrin§! meant that the restoration of the Zaikirian Commandery became nigh-on-impossible. After the death of Summer Storm in a raid against a Zeblu farmstead, with the Lan Kir Banners facing yet another crisis of leadership, §CLong Dusk§! — the daughter of Summer Storm — rallied the remaining Bannerkirin against the looming fate of a slow and humiliating demise in exile, and succeeded her father as Lan Kir's §Gsecond General of State§!. Under her guidance, Lan Kir underwent a reformation from a territory under military occupation to something approaching a §Ysemi-modern nation-state§!, ruled over by a stratocratic government premised upon the structures of the §CBanner System§!. A rough and militaristic §Ydemocracy§! emerged within the Banners, where decisions on matters of significance were determined by a system of voting in which the number of votes castable by an individual Bannerkirin increased with the §Yseniority§! of their §Ymilitary rank§!. Over the years, the functions of the military dictatorship were progressively §Ydelegated to bureaucratic institutions§!, and Lan Kir's natives were incorporated into the Banners as auxiliaries and §Ysoldiers§! — the latter category being eligible for full §Ginduction into the Banner System§!. With a secure route to Bannerkirin status in place, a slow but steady §Ydemographic shift§! took place over the course of Long Dusk's reign, where the descendants of the original Bannerkirin and the natives of Lan Kir slowly became one — a people united in their service to a heavily militarized state unlike any seen in Kirin history.\n\nA hundred years after the Silence and the establishment of the State of Lan Kir, the state stands before a precipice, with rumours of the §Yend of the Silence§! in Kiria rumbling throughout Zaikiria. Lan Kir also faces a demographic crisis, brought about by a population boom in the past decades. With arable farmland §Rscarce§! in the densely-forested region and without the technology, industry, or trade to make up for an increasing deficit in food, the State is forced to rely on §Yraids against neighbouring countries§! to provide for the ever growing number of newborn Bannerkirin to feed. A growing number of commanders in the Banners are beginning to express §Ypro-Kirian sympathies§!, with some wanting to reunite with the old homeland, whilst others call for the reconquest of Zaikiria in the name of Matriarch Superior Rain Shine, the spiritual leader of all kirin. Long Dusk has grown old and infirm, and whoever succeeds her as General of State will determine the future of Lan Kir in this turbulent new millennium."
diff --git a/localisation/english/victory_points_l_english.yml b/localisation/english/victory_points_l_english.yml
index 711cd955cb9..0833244e0de 100644
--- a/localisation/english/victory_points_l_english.yml
+++ b/localisation/english/victory_points_l_english.yml
@@ -141,7 +141,7 @@
  VICTORY_POINTS_8106:0 "Asselt"
  VICTORY_POINTS_4742:0 "Grieslein"
  VICTORY_POINTS_6482:0 "Eindlem"
- VICTORY_POINTS_12903:0 "Goldmire"
+ VICTORY_POINTS_11002:0 "Goldmire"
  VICTORY_POINTS_4367:0 "Qwoptia"
  VICTORY_POINTS_12436:0 "Twelt"
  VICTORY_POINTS_874:0 "Summerfield"
@@ -809,4 +809,7 @@
  VICTORY_POINTS_2333:0 "Frosteberg"
  VICTORY_POINTS_8059:0 "Rostlunda"
  VICTORY_POINTS_10198:0 "Nordanborg"
+ VICTORY_POINTS_1117:0 "Skulling"
+ VICTORY_POINTS_12609:0 "Oldpine"
+ VICTORY_POINTS_1446:0 "Gazedale"
  
\ No newline at end of file
diff --git a/localisation/replace/english/_eaw_overrides_l_english.yml b/localisation/replace/english/_eaw_overrides_l_english.yml
index 60f4035ab2e..4eb37684991 100644
--- a/localisation/replace/english/_eaw_overrides_l_english.yml
+++ b/localisation/replace/english/_eaw_overrides_l_english.yml
@@ -327,7 +327,13 @@
  #lar_decisions_l
  recruit_in_state_tt:0 "We will gain a local agent of the given culture. This agent will be harder to detect when infiltrating and operating in countries of that culture."
  recruit_in_state_to_pool_tt:1 "A local agent of the given culture becomes available for recruitment if we have an open §YOperative Slot§!. This agent will be harder to detect when infiltrating and operating in countries of that culture."
- 
+
+ #military_industrial_organization_l
+
+ mio_cat_eq_all_light_tank: "All Light and Light Amphibious Tank Equipment"
+ mio_cat_eq_all_medium_tank: "All Medium and MBT Tank Equipment"
+ mio_cat_eq_all_heavy_tank: "All Heavy Tank and Super Heavy Tank Equipment" 
+
  #modifiers_l
  democratic_drift:0 "Daily Harmony Support"
  democratic_acceptance:0 "Acceptance of Harmonist Diplomacy"
@@ -433,6 +439,8 @@
  atlantic_fleet_naval_manufacturer:0 "Celestial Sea Fleet Designer"
  mediterranean_naval_manufacturer:0 "Arabian Sea Fleet Designer"
  black_sea_naval_manufacturer:0 "Middle Sea Fleet Designer"
+ generic_black_sea_fleet_organization: "Middle Sea Fleet Manufacturer"
+ generic_mio_initial_trait_black_sea_fleet_designer: "Middle Sea Fleet Designer"
  cavalry_leader:0 "Motorized Leader"
  cavalry_expert:0 "Motorized Expert"
  cavalry_officer:0 "Motorized Officer"
@@ -479,6 +487,8 @@
  TRIGGER_MANPOWER_IN_DEPLOYMENT_QUEUE:0 "ponypower in deployment queue"
  TRIGGER_ARMY_MANPOWER_IN_STATE_OF_TYPE:0 "ponypower deployed in $STATE|H$ from $TYPE|H$ divisions."
  TRIGGER_ARMY_MANPOWER_IN_STATE:0 "ponypower deployed in $STATE|H$."
+ can_unlock_new_special_forces_tree_none: "£trigger_yes §HBranch Specialisms§! Remaining: §H2§!"
+
 
  #unit_l
  CURRENT_MANPOWER:0 " - Current Ponypower: $VAL|*H1$ ($PER|%0H$)\n"
diff --git a/localisation/replace/english/eaw_tank_modules_overrides_l_english.yml b/localisation/replace/english/eaw_tank_modules_overrides_l_english.yml
index 1fbb0914a5f..f42a1ad0826 100644
--- a/localisation/replace/english/eaw_tank_modules_overrides_l_english.yml
+++ b/localisation/replace/english/eaw_tank_modules_overrides_l_english.yml
@@ -22,7 +22,7 @@
  tank_designer_modern_tank_chassis:0 "Main Battle Tank"
  modern_tank_chassis:0 "Main Battle Tank"
  main_battle_tank_chassis:0 "Early Main Battle Tank Chassis"
- main_battle_tank_chassis_short:0 "Early MBT Chassis"
+ main_battle_tank_chassis_short:0 "1016 MBT"
  modern_tank_chassis_1:0 "Early Main Battle Tank Chassis"
  modern_tank_artillery_chassis_1:0 "Early Modern SP Artillery"
  modern_tank_destroyer_chassis_1:0 "Early Main Battle Tank Destroyer"
@@ -30,6 +30,7 @@
 
  super_heavy_tank_chassis:0 "Super-Heavy Tank"
  super_heavy_tank_chassis_1:0 "Basic Super-Heavy Tank Chassis"
+ super_heavy_tank_chassis_1_short:0 "1014 Super Heavy"
  super_heavy_tank_artillery_chassis_1:0 "Basic Super-Heavy SP Artillery"
  super_heavy_tank_destroyer_chassis_1:0 "Basic Super-Heavy Tank Destroyer"
  super_heavy_tank_aa_chassis_1:0 "Basic Super-Heavy SP Anti-Air"
diff --git a/localisation/replace/english/equip_air_overrides_l_english.yml b/localisation/replace/english/equip_air_overrides_l_english.yml
index 6b42a047f46..b388d4fb695 100644
--- a/localisation/replace/english/equip_air_overrides_l_english.yml
+++ b/localisation/replace/english/equip_air_overrides_l_english.yml
@@ -356,8 +356,10 @@
  aa_hmg_desc:0 "Newer all-metal planes, while not impervious to rifle-calibre weaponry, can prove difficult to down. Previous machine guns calibres simply don't do enough damage. This problem is more noticeable with larger aircrafts such as heavy fighters and bombers. As such, higher calibre machine guns that use larger cartridges are the natural evolution for most forms of primary and defensive armaments for aircraft."
  aa_cannon_1:0 "Dedicated Aircraft Cannons"
  aa_cannon_1_desc:0 "Sometimes, machine guns are not enough. Their small cartridges cannot carry enough explosive mass. A forward-facing automatic cannon is, in essence, an upscaled machine gun. Though notably heavy enough to impact the agility of an aircraft, their damage output can make mincemeat of even armoured planes. In some cases, these cannons can even punch through tanks in strafing runs!"
- aa_cannon_2:0 "Improved Aircraft Cannons"
- aa_cannon_2_desc:0 "Further refinements in automatic cannons and the introduction of dedicated anti-aircraft ammunition belts have significantly improved their performance. This allows us to mount the new iterations of these cannons in turreted positions, providing a deadly deterrent against even determined attackers. Though their weight can still be problematic for smaller aircraft, the weapons more than compensate with their devastating firepower."
+ aa_cannon_2:0 "Large Aircraft Cannons"
+ aa_cannon_2_desc:0 "Simply upsizing the cannons allows for ferocious firepower to be unleashed, though it does inhibit aerial performance in dogfighting."
+ aa_cannon_3:0 "Improved Aircraft Cannons"
+ aa_cannon_3_desc:0 "Further refinements in automatic cannons and the introduction of dedicated anti-aircraft ammunition belts have significantly improved their performance. This allows us to mount the new iterations of these cannons in turreted positions, providing a deadly deterrent against even determined attackers. Though their weight can still be problematic for smaller aircraft, the weapons more than compensate with their devastating firepower."
 
  engines_1:0 "Dedicated Aircraft Engines"
  engines_1_desc:0 "A powerful yet lightweight engine is essential to power a propeller's rotations enough to lift a heavier-than-air aircraft. The first generation of these "aero engines" are not dissimilar in shape to most concurrent engines in ground vehicles. There are many engine configuration, from simple piston engines to radial engines. However, great care has been taken to make these engines as robust as possible while keeping their weight low."
diff --git a/localisation/replace/russian/_eaw_overrides_l_russian.yml b/localisation/replace/russian/_eaw_overrides_l_russian.yml
index 56fb0734c5e..56397ce52f0 100644
--- a/localisation/replace/russian/_eaw_overrides_l_russian.yml
+++ b/localisation/replace/russian/_eaw_overrides_l_russian.yml
@@ -332,6 +332,12 @@
  #lar_decisions_l
  recruit_in_state_tt:0 "Мы получим местного агента из данной культуры. Этого агента будет труднее засечь, когда он проникнет и начнёт работу в государствах, принадлежащих к данной культуре."
  recruit_in_state_to_pool_tt:1 "Местный агент из данной культуры становится доступен для вербовки, если у нас есть свободная §Yячейка для агентов§!. Этого агента будет труднее засечь, когда он проникнет и начнёт работу в государствах, принадлежащих к данной культуре."
+
+ #military_industrial_organization_l
+
+ mio_cat_eq_all_light_tank: "Все легкие танки и танки-амфибии"
+ mio_cat_eq_all_medium_tank: "Все средние танки и основные боевые танки"
+ mio_cat_eq_all_heavy_tank: "Все тяжелые и сверхтяжёлые танки" 
  
  #modifiers_l
  democratic_drift:0 "Ежедневная поддержка гармонии"
@@ -448,6 +454,8 @@
  atlantic_fleet_naval_manufacturer:0 "Конструктор кораблей флота Селестийского Моря"
  mediterranean_naval_manufacturer:0 "Конструктор кораблей флота Аравийского Моря"
  black_sea_naval_manufacturer:0 "Конструктор кораблей Среднего Моря"
+ generic_black_sea_fleet_organization: "Производитель кораблей Среднего Моря"
+ generic_mio_initial_trait_black_sea_fleet_designer: "Конструктор кораблей Среднего Моря"
  cavalry_leader:0 "Командующий мотопехотой"
  cavalry_expert:0 "Эксперт по мотопехоте"
  cavalry_officer:0 "Мотопехотный офицер"
@@ -498,6 +506,7 @@
  TRIGGER_MANPOWER_IN_DEPLOYMENT_QUEUE:0 "Пони ресурсы в очереди на развертывание"
  TRIGGER_ARMY_MANPOWER_IN_STATE_OF_TYPE:0 "пони ресурсы развернуты в регионе $STATE|H$ из $TYPE|H$ дивизий."
  TRIGGER_ARMY_MANPOWER_IN_STATE:0 "пони ресурсы развернуты в регионе $STATE|H$."
+ can_unlock_new_special_forces_tree_none: "£trigger_yes §HСпециализаций§! осталось: §H2§!"
 
  #unit_l
  CURRENT_MANPOWER:0 " - текущие пони ресурсы: $VAL|*H1$ ($PER|%0H$)\n"
diff --git a/localisation/replace/russian/eaw_tank_modules_overrides_l_russian.yml b/localisation/replace/russian/eaw_tank_modules_overrides_l_russian.yml
index 69d1df97d48..1cba1a9303f 100644
--- a/localisation/replace/russian/eaw_tank_modules_overrides_l_russian.yml
+++ b/localisation/replace/russian/eaw_tank_modules_overrides_l_russian.yml
@@ -22,7 +22,7 @@
  tank_designer_modern_tank_chassis:0 "Основной боевой танк"
  main_battle_tank_chassis:0 "Шасси раннего ОБТ"
  modern_tank_chassis:0 "Основной боевой танк"
- main_battle_tank_chassis_short:0 "Шасси раннего ОБТ"
+ main_battle_tank_chassis_short:0 "ОБТ 1016 года"
  modern_tank_chassis_1:0 "Шасси раннего ОБТ танка"
  modern_tank_artillery_chassis_1:0 "Ранняя современная САУ"
  modern_tank_destroyer_chassis_1:0 "Ранняя современная ПТ-установка"
@@ -30,6 +30,7 @@
 
  super_heavy_tank_chassis:0 "Сверхтяжёлый танк"
  super_heavy_tank_chassis_1:0 "Базовое шасси сверхтяжёлого танка"
+  super_heavy_tank_chassis_1_short:0 "Сверхтяжёлый танк 1014 года "
  super_heavy_tank_artillery_chassis_1:0 "Базовая сверхтяжёлая САУ"
  super_heavy_tank_destroyer_chassis_1:0 "Базовая сверхтяжёлая ПТ-установка"
  super_heavy_tank_aa_chassis_1:0 "Базовая сверхтяжёлая ЗСУ"
diff --git a/localisation/replace/russian/equip_air_overrides_l_russian.yml b/localisation/replace/russian/equip_air_overrides_l_russian.yml
index d2fb1d02503..05c78547983 100644
--- a/localisation/replace/russian/equip_air_overrides_l_russian.yml
+++ b/localisation/replace/russian/equip_air_overrides_l_russian.yml
@@ -356,8 +356,10 @@
  aa_hmg_desc:0 "Новые цельнометаллические самолёты весьма непросто сбить, так как пулемёты прежних калибров просто не наносят достаточного урона, особенно тяжёлым истребителям и бомбардировщикам. Поэтому пулемёты, использующие более крупные патроны, являются естественной эволюцией для большинства видов вооружения самолетов."
  aa_cannon_1:0 "Специализированные авиационные пушки"
  aa_cannon_1_desc:0 "Иногда пулемётов недостаточно. Автоматическая пушка - это, по сути, усовершенствованный пулемёт. И хотя они достаточно тяжелы, чтобы снижать маневренность самолёта, эти пушки могут сбивать бронированные цели. И даже поражать танки на земле!"
- aa_cannon_2:0 "Улучшенные авиационные пушки"
- aa_cannon_2_desc:0 "Дальнейшие усовершенствования автоматических пушек значительно улучшили их характеристики и даже позволили устанавливать их на турели. Хотя их вес всё ещё может доставлять проблемы для небольших самолётов, разрушительная огневая мощь с лихвой компенсирует это."
+ aa_cannon_2:0 "Увеличенные авиационные пушки"
+ aa_cannon_2_desc:0 "Простое увеличение пушек позволяет увеличить огневую мощь, хотя и снижает эффективность в воздушных боях."
+ aa_cannon_3:0 "Улучшенные авиационные пушки"
+ aa_cannon_3_desc:0 "Дальнейшие усовершенствования автоматических пушек значительно улучшили их характеристики и даже позволили устанавливать их на турели. Хотя их вес всё ещё может доставлять проблемы для небольших самолётов, разрушительная огневая мощь с лихвой компенсирует это."
 
  engines_1:0 "Специальные авиационные двигатели"
  engines_1_desc:0 "Мощный, но лёгкий двигатель необходим для отрыва самолёта от земли. Первое поколение авиационных двигателей не слишком отличалось от большинства аналогичных двигателей наземных машин. Существует множество конфигураций двигателей, но немалое внимание было уделено тому, чтобы сделать эти устройства как можно более надёжными, сохранив при этом их небольшой вес."
diff --git a/localisation/replace/russian/equip_naval_overrides_l_russian.yml b/localisation/replace/russian/equip_naval_overrides_l_russian.yml
index 563ba6033bf..a6b1f1074c1 100644
--- a/localisation/replace/russian/equip_naval_overrides_l_russian.yml
+++ b/localisation/replace/russian/equip_naval_overrides_l_russian.yml
@@ -162,7 +162,7 @@
  basic_fire_control_system:0 "Центральное управление огнём"
  basic_fire_control_system_desc:0 "В прошлом морские артиллеристы вели прицельный огонь, расчеты и стрельбу со своего боевого поста. Такое управление огнем становится ненадежным по мере роста размера и количества орудий, серьезно снижая эффективность корабля. Главный командир ведения огня, обычно находящийся рядом с мостиком или где-то в центральной надстройке, может координировать заграждения, рассчитывать огневые решения и отслеживать цели для каждого орудия. С помощью специализированных оптических прицелов особая группа артиллерийских офицеров контролирует систему управления огнём корабля."
  improved_fire_control_system:0 "Электромеханический компьютер управления огнём"
- improved_fire_control_system_desc:0 "В пылу сражения точные огневые решения имеют решающее значение для победы на море, а ручные меры склонны к ошибкам. Установка электромеханического компьютера перекладывает бремя быстрых расчетов на точную машину, которая может предсказать огневое решение ещё до того, как наши орудийные экипажи будут готовы к огню, обеспечивая непрерывное и точное заграждение."
+ improved_fire_control_system_desc:0 "В пылу сражения точные огневые решения имеют решающее значение для победы на море, а неавтоматические меры склонны к ошибкам. Установка электромеханического компьютера перекладывает бремя быстрых расчетов на точную машину, которая может предсказать огневое решение ещё до того, как наши орудийные экипажи будут готовы к огню, обеспечивая непрерывное и точное заграждение."
  advanced_fire_control_system:0 "Радиолокационное дополненное управление огнём"
  advanced_fire_control_system_desc:0 "До сих пор мы полагались на оптические дальномеры для подачи информации, необходимой для работы нашего командира ведения огня. Однако визуальное измерение дальности на больших расстояниях или ночью затруднено из-за ограниченности наших наблюдателей. С помощью небольших специализированных радиолокационных дальномеров мы сможем получить более надёжные данные для наших систем управления огнём и сделать наши корабли способными вести боевые действия на больших расстояниях и в ночное время."
  
diff --git a/localisation/russian/_temp_postNBSchars_l_russian.yml b/localisation/russian/_temp_postNBSchars_l_russian.yml
index 62941f92fb3..7fece945438 100644
--- a/localisation/russian/_temp_postNBSchars_l_russian.yml
+++ b/localisation/russian/_temp_postNBSchars_l_russian.yml
@@ -97,6 +97,10 @@ MGY_shepser_of_manephis:0 "Шепсер из Мейнфиса"
 MGY_butternut_squash:0 "Баттернат Сквош"
 MGY_corktantinople:0 "Корктантинополь"
 MGY_corktantinople_desc:0 "§YДата рождения:§! 9 сентября 987 года в Просперо\n\n§YБиография:§! Хотя Корктантинополь родилась и выросла в Просперо, что располагается на островах Астериона, на самом деле её родители прибыли из Мейргипта. Они оставили пустыню позади, чтобы найти для своей дочери наилучшее место для получения образования. Корктантинополь, как дочь библиотекарей, с детства интересовалась книгами и словарями и начала получать своё образование в библиотеке Просперо.\n\nПосле окончания школы она заинтересовала местное правительство и вступила в ряды армии Астериона. Во время прохождения службы Корктантинополь услышала новости из Мейргипта и поняла, что ничего не знает о крови, которая течёт в её жилах.\n\nПоэтому она решила вернуться на родину, на которой она никогда прежде не бывала. Корктантинополь не смогла принять участие в битве при Р'атафете, ведь она произошла за год до её рождения, но в этот раз всё будет по-другому.\n\n§YАвтор портрета§!: Kaiser Sauce"
+MGY_annu:0 "Анну"
+MGY_annu_desc:0 "§YАвтор портрета§!: Kleowolfy"
+MGY_violetta_locifer:0 "Виолетта Лоцифер"
+MGY_violetta_locifer_desc:0 "§YАвтор портрета§!: Stephen Sen"
 
 MSH_almami_zekuris:0 "Альмами Зекурис"
 
diff --git a/localisation/russian/country_BAK_l_russian.yml b/localisation/russian/country_BAK_l_russian.yml
index ac9feb9a9e4..df5e4b1ac6b 100644
--- a/localisation/russian/country_BAK_l_russian.yml
+++ b/localisation/russian/country_BAK_l_russian.yml
@@ -1284,6 +1284,8 @@ BAK_harmonists_elected_tp:0 "§GКобальт Винд решила работ
 BAK_libertarian_elected_tp:0 "§GКобальт Винд решила работать с БПП§!\n\n"
 BAK_operation_remove_guarantee_effect_tt:0 "Запрещает всем членам §CРечной Коалиции§! §Yгарантировать независимость этой страны§! на §Y360§! дней."
 
+BAK_tailvoz_hidden_tt:0 "$modifier_production_speed_infrastructure_factor$: §G+5.0%§ "
+
 ### Leaders ###
 BAK_firm_scow:0 "Фёрм Скау"
 BAK_water_lily:0 "Уотер Лили"
diff --git a/localisation/russian/country_BAR_l_russian.yml b/localisation/russian/country_BAR_l_russian.yml
index 5ad540774b9..638564ffa48 100644
--- a/localisation/russian/country_BAR_l_russian.yml
+++ b/localisation/russian/country_BAR_l_russian.yml
@@ -1935,6 +1935,7 @@ BAR_pen_medium_planes:0 "Эдгар Эльфстан"
 BAR_ded_light_planes:0 "Осбьорн Эльфстан"
 BAR_ded_cas:0 "Эббе Эдберг"
 BAR_ded_medium_planes:0 "Эдгар Эльфстан"
+BAR_ded_shipyard:0 "Хильда Батвирта"
 BAR_pen_shipyard:0 "Хильда Батвирта"
 
 ##### victory points ######
diff --git a/localisation/russian/country_BAT_l_russian.yml b/localisation/russian/country_BAT_l_russian.yml
index 5dae8725cab..1a6635a448c 100644
--- a/localisation/russian/country_BAT_l_russian.yml
+++ b/localisation/russian/country_BAT_l_russian.yml
@@ -1814,7 +1814,7 @@ bat.25.d:0 "Когда мы только прибыли в Хироптерру,
 bat.25.a:0 "Да, нужно что-то менять."
 
 bat.26.t:0 "Проект "Столб""
-bat.26.d:0 "Проект "Столб" недавно перешёл в этап тестирования, что значит, что мы теперь на шаг ближе к созданию ручного противотанкового орудия, что даст нам необходимое преимущество в бою против бронированного транспорта. Недавний отчёт от команды разработки и исследования оружия показал, что команда желает на выходе формально переименовать орудие в "Лансер".\n\nКоманда заявляет, что это "в честь" одного из офицеров Легиона, которого назначили выполнять испытания орудия, Капитана Мунлайт Лансер. Капитану Лансеру была поставлена задача проверять возможности оружия с различных точек обзора. Фестрал выполнил каждый приказ слово в слово и пришёл к выводу, что лучше всего оружие применять против врага с воздуха, над врагом.\n\nОчень сложно описать удивление команды исследователей, когда они увидели, как Капитан Лансер выстрелил из прототипа "Столба", даже не опираясь о мимолётную тучу. Достаточно сказать, что отдача сломала офицеру плечо, и, падая, он порвал крыло. \n\nХоть этот урок был бесценен для команды разработчиков и подтвердил их догадки об отдачи в воздухе, они желают отдать честь офицеру, который привёл их к таким выводам. Капитан Лансер хорошо ко всему отнёсся и прояснил, что он только за такое наименование, как "первый из многих павших от этой безбожной штуки.""
+bat.26.d:0 "Проект "Столб" недавно перешёл в этап тестирования, что значит, что мы теперь на шаг ближе к созданию переносного противотанкового орудия, что даст нам необходимое преимущество в бою против бронированного транспорта. Недавний отчёт от команды разработки и исследования оружия показал, что команда желает на выходе формально переименовать орудие в "Лансер".\n\nКоманда заявляет, что это "в честь" одного из офицеров Легиона, которого назначили выполнять испытания орудия, Капитана Мунлайт Лансер. Капитану Лансеру была поставлена задача проверять возможности оружия с различных точек обзора. Фестрал выполнил каждый приказ слово в слово и пришёл к выводу, что лучше всего оружие применять против врага с воздуха, над врагом.\n\nОчень сложно описать удивление команды исследователей, когда они увидели, как Капитан Лансер выстрелил из прототипа "Столба", даже не опираясь о мимолётную тучу. Достаточно сказать, что отдача сломала офицеру плечо, и, падая, он порвал крыло. \n\nХоть этот урок был бесценен для команды разработчиков и подтвердил их догадки об отдачи в воздухе, они желают отдать честь офицеру, который привёл их к таким выводам. Капитан Лансер хорошо ко всему отнёсся и прояснил, что он только за такое наименование, как "первый из многих павших от этой безбожной штуки.""
 bat.26.a:0 "Прекрасно, значит, будет "Лансер"!"
 
 bat.27.t:0 "Моей Единственной Мун"
@@ -2183,7 +2183,7 @@ bat.115.d:0 "Опал Скай вытер пот со лба. Несмотря 
 bat.115.a:0 "Новое начало!"
 
 bat.116.t:0 "Работая с рельсами"
-bat.116.d:0 "Манго Мэнглер однажды заметил довольно очевидный изъян в Хироптеррском распределении труда. Несколько месяцев назад он подметил, что военнопленные, преступники и работники использовались для ручного труда, но они работали раздельно. По сути, он предложил объединить разные группы рабочих для работы над определёнными инфраструктурными объектами. Не имеет значение, кто будет крепить рельсы, если всё согласно расписанию.\n\nЗатем Манго был пойман за хищением бюджета для программы.\n\nСовет Легионеров, узнав о данном преступлении, покорно объявил, что Манго будет отбывать срок в программе, которую он помогал создавать. Ему выдали молоток, комбинезон и отправили прокладывать рельсы. Рабочие, военнопленные и преступники, подобные ему, обеспечили размеренный темп расширения путей Хироптерры. В соответствии с его предложением, скованные цепями заключённые были неприкрытым принудительным трудом.\n\nЕсли бы Манго знал, что он сюда попадёт, то он бы позаботился об условиях работы.\n\nРабота молотом была мучительной. Труд железнодорожника каждый день рвал кожу под копытами Манго. Темп был миля в день, и Манго сделал две, чтобы увидеть лицо смотрителя после этого. Над головой угнетающе светило Солнце, заставляя Манго пропотеть. Он держал темп с помощью рабочих песен, которые сосредотачивали его внимание на работе, а не сожалениях.\n\nМанго все ещё желал, чтобы он тогда держал рот на замке."
+bat.116.d:0 "Манго Мэнглер однажды заметил довольно очевидный изъян в Хироптеррском распределении труда. Несколько месяцев назад он подметил, что военнопленные, преступники и работники использовались для физического труда, но они работали раздельно. По сути, он предложил объединить разные группы рабочих для работы над определёнными инфраструктурными объектами. Не имеет значение, кто будет крепить рельсы, если всё согласно расписанию.\n\nЗатем Манго был пойман за хищением бюджета для программы.\n\nСовет Легионеров, узнав о данном преступлении, покорно объявил, что Манго будет отбывать срок в программе, которую он помогал создавать. Ему выдали молоток, комбинезон и отправили прокладывать рельсы. Рабочие, военнопленные и преступники, подобные ему, обеспечили размеренный темп расширения путей Хироптерры. В соответствии с его предложением, скованные цепями заключённые были неприкрытым принудительным трудом.\n\nЕсли бы Манго знал, что он сюда попадёт, то он бы позаботился об условиях работы.\n\nРабота молотом была мучительной. Труд железнодорожника каждый день рвал кожу под копытами Манго. Темп был миля в день, и Манго сделал две, чтобы увидеть лицо смотрителя после этого. Над головой угнетающе светило Солнце, заставляя Манго пропотеть. Он держал темп с помощью рабочих песен, которые сосредотачивали его внимание на работе, а не сожалениях.\n\nМанго все ещё желал, чтобы он тогда держал рот на замке."
 bat.116.a:0 "Иронично."
 
 bat.117.t:0 "Имперская экспертиза"
diff --git a/localisation/russian/country_BRF_l_russian.yml b/localisation/russian/country_BRF_l_russian.yml
index 109b92013cf..9b3c7cd8f91 100644
--- a/localisation/russian/country_BRF_l_russian.yml
+++ b/localisation/russian/country_BRF_l_russian.yml
@@ -883,7 +883,7 @@ brodfeld.2.a:0 "Отправить поддержку! Красные должн
 brodfeld.2.b:0 "Это их проблема."
 
 brodfeld.3.t:0 "Прибыли иностранные военные советники!"
-brodfeld.3.d:0 "Иностранные советники и добровольцы прибыли, чтобы поддержать нас! Советники - ветераны с обширным знанием тактики и стратегии, в то время как волонтеры стремятся бороться за наше дело. Мы едины против Красной угрозы, которая стремится отменить все, что нам дорого."
+brodfeld.3.d:0 "Иностранные советники и добровольцы прибыли, чтобы поддержать нас! Советники - ветераны с обширным знанием тактики и стратегии, в то время как добровольцы стремятся бороться за наше дело. Мы едины против красной угрозы, которая стремится отменить все, что нам дорого."
 brodfeld.3.a:0 "Отлично!"
 
 brodfeld.3.t_not_arrived:0 "Помощь никто не отправил!"
diff --git a/localisation/russian/country_CHN_l_russian.yml b/localisation/russian/country_CHN_l_russian.yml
index fe3d39fa71a..e862e54fb46 100644
--- a/localisation/russian/country_CHN_l_russian.yml
+++ b/localisation/russian/country_CHN_l_russian.yml
@@ -2870,7 +2870,7 @@ CHN_regional_commissariat_unlock_tt:0 "\nРазблокирует оккупац
 extractive_regime:0 "Экстрактивистский режим"
 extractive_regime_resistance_threshold:0 "Средняя §Rсила сопротивления§! во всех [From.FROM.GetAdjective]их национальных территориях под нашим контролем ниже §Y30.0%§!."
 extractive_regime_compliance_threshold:0 "Среднее §Gподчинение§! во всех [From.FROM.GetAdjective]их национальных территориях под нашим контролем выше §Y30.0%§!."
-extractive_regime_unlock_tt:0 "\nРазблокирует оккупационный закон §YЭкстрактивистский режим§!:\nРегиональный модификатор:\n      Местные ресурсы: §G+75%§!\n      Нужно гарнизонов: §R+25%§!\n      Шанс подрыва добычи ресурсов: §G-25%§!\n      Длительность подрыва добычи ресурсов: §G-25%§!"
+extractive_regime_unlock_tt:0 "\nРазблокирует оккупационный закон §YЭкстрактивистский режим§!:\nРегиональный модификатор:\n      Местные ресурсы: §G+75%§!\n      Эффективность увеличения ресурсов: §G+25%§!\n      Нужно гарнизонов: §R+25%§!\n      Шанс подрыва добычи ресурсов: §G-25%§!\n      Длительность подрыва добычи ресурсов: §G-25%§!"
 
  secret_police_oversight_changeling:1 "Тайная полиция"
 
diff --git a/localisation/russian/country_CRY_l_russian.yml b/localisation/russian/country_CRY_l_russian.yml
index a5cf8043a38..6d9ee24073e 100644
--- a/localisation/russian/country_CRY_l_russian.yml
+++ b/localisation/russian/country_CRY_l_russian.yml
@@ -187,7 +187,7 @@ CRY_eqsforces_desc:0 "Внешние угрозы больше нельзя иг
 CRY_eqsadvisors:0 "Эквестрийские военные советники"
 CRY_eqsadvisors_desc:0 "Запрос о помощи от эквестрийской армии для обучения наших сил может показаться противоречащим пожеланиям многих наших подданных, но было бы весьма глупо не использовать их опыт."
 CRY_eqsengineers:0 "Инженеры"
-CRY_eqsengineers_desc:0 "Среди эквестрийских волонтеров есть те, кто был бы более полезен вдали от фронта. Многие из них ранее имели отношение к науке и промышленности и могут помочь нам в этих областях"
+CRY_eqsengineers_desc:0 "Среди эквестрийских добровольцев есть те, кто был бы более полезен вдали от фронта. Многие из них ранее имели отношение к науке и промышленности и могут помочь нам в этих областях"
 CRY_eqsfactories:0 "Селестийская программа фабрик"
 CRY_eqsfactories_desc:0 "Наша недавняя деятельность в области промышленности не осталась незамеченной и Эквестрия предложила нам поддержку. «Селестийская программа фабрик», как её назвали, представляет собой план, по которому Эквестрия субсидирует промышленный рост Кристальной империи, помогая ускорить наш промышленный прогресс."
 CRY_subordination:0 "Субординация"
diff --git a/localisation/russian/country_CTH_l_russian.yml b/localisation/russian/country_CTH_l_russian.yml
index e393da9b07b..6bb0121de11 100644
--- a/localisation/russian/country_CTH_l_russian.yml
+++ b/localisation/russian/country_CTH_l_russian.yml
@@ -2213,7 +2213,7 @@
  
  colthage_other.97.t_no_colthage:0 "Возвращение кольтфагенцев"
  colthage_other.97.t_colthage:0 "Отчёт об экспедиции: Руины Нового Кольтфагена"
- colthage_other.97.d_no_colthage:0 "После смерти профессора Балазара Затида кольтфагенские археологические исследования на острове Скарлет прекратились по соображениям безопасности. Место раскопок Нового Кольтфагена перестало изучаться, хотя его поддерживали и защищали от воздействия стихии местные учёные из Эскарлаты.\n\nНо теперь на горизонте снова показались корабли кольтфагенцев. Они вернулись, чтобы завершить начатое. Место раскопок снова ожило и там началась работа. Учёные Эскарлаты чувствовали вину за произошедшие ранее события и делали всё возможное, чтобы помогать. Также многие грифоны вызвались помочь там, где в ходе раскопок требовался ручной труд. Археологов охраняли хорошо вооружённые кольтфагенские солдаты.\n\nЧерез несколько месяцев были раскопаны руины города Нового Кольтфаген и было найдено бесчисленное количество артефактов. Они помогут историкам восстановить в подробностях историю этого места. В благодарность за помощь кольтфагенцы пожертвовали небольшую часть найденных предметов учёным Эскарлаты. Грифоны пообещали открыть на острове музей, посвященный кольтфагенской истории, где эти предметы будут выставлены на всеобщее обозрение.\n\nЗатем кольтфагенцы скрылись за горизонтом, забрав с собой найденные сокровища."
+ colthage_other.97.d_no_colthage:0 "После смерти профессора Балазара Затида кольтфагенские археологические исследования на острове Скарлет прекратились по соображениям безопасности. Место раскопок Нового Кольтфагена перестало изучаться, хотя его поддерживали и защищали от воздействия стихии местные учёные из Эскарлаты.\n\nНо теперь на горизонте снова показались корабли кольтфагенцев. Они вернулись, чтобы завершить начатое. Место раскопок снова ожило и там началась работа. Учёные Эскарлаты чувствовали вину за произошедшие ранее события и делали всё возможное, чтобы помогать. Также многие грифоны вызвались помочь там, где в ходе раскопок требовался физический труд. Археологов охраняли хорошо вооружённые кольтфагенские солдаты.\n\nЧерез несколько месяцев были раскопаны руины города Нового Кольтфаген и было найдено бесчисленное количество артефактов. Они помогут историкам восстановить в подробностях историю этого места. В благодарность за помощь кольтфагенцы пожертвовали небольшую часть найденных предметов учёным Эскарлаты. Грифоны пообещали открыть на острове музей, посвященный кольтфагенской истории, где эти предметы будут выставлены на всеобщее обозрение.\n\nЗатем кольтфагенцы скрылись за горизонтом, забрав с собой найденные сокровища."
  colthage_other.97.d_colthage:0 "Аннотация:\n\nПрофессор Балазар Затид большую часть своей жизни посвятил изучению истории зоникийской цивилизации. Из древних источников он узнал, что Кольтфагенская Республика когда-то пыталась колонизировать Грифонию, основав поселение Новый Кольтфаген на острове, который, по его предположению, ныне известен как Скарлет. Это поселение было уничтожено карфинским полководцем Грипио Зебриканусом, и местоположение этого города затерялось во тьме веков. Благодаря тщательному изучению источников и географии, Затид нашел место, которое, по его мнению, было местом расположения колонии. Он организовал в те края археологическую экспедицию и убедился в своей правоте. Однако его работу прервало неожиданное убийство профессора, и экспедиция вернулась домой. Цель новой экспедиции - завершить раскопки, начатые много лет назад.\nОбзор экспедиции:\nНебольшая флотилия в сопровождении военных судов вышла из порта Гиппон и направилась на север к острову Скарлет. Хотя сикамеонцы скептически отнеслись к солдатам, сопровождавшим экспедицию, они разрешили им высадиться и охранять учёных. Затем экспедиция направилась к месту раскопок, которое было сохранено местным научным сообществом, и приступила к раскопкам. Сикамеонские грифоны вызвались помочь в физическом труде. Через несколько месяцев было найдено множество разрушенных зданий, а также несколько тысяч артефактов - от наконечников стрел до золотых украшений и монет. Полный список предметов приведен в приложении.\nВыводы:\nЭкспедиция завершила работу профессора Балазара Затида и позволила историкам получить гораздо более полный образ кольтфагенской истории. Сикамеонцы оказались гораздо более сговорчивыми, чем прежде, и в качестве компенсации за помощь им были переданы некоторые из обнаруженных артефактов (пожертвованные предметы отмечены в списке). Остальные были возвращены в Кольтфаген, и некоторые из них будут выставлены в доступном для общественности музее."
  colthage_other.97.a:0 "Мы закончили начатое им."
  colthage_other.97.b:0 "Кажется, они простили сикамеонцев за произошедшее."
@@ -2973,9 +2973,9 @@
  CTH_strikes_outlawed_tt:0 "Низкая стабильность §Yбольше не будет вызывать забастовки§!.\n"
  CTH_popular_power_tt_1:0 "Улучшит §YНародовластие§! следующим образом:\nТемпы исследований: §G+5%§!\nСкорость строительства: §G+5%§!\n"
  CTH_popular_power_tt_2:0 "Улучшит §YНародовластие§! следующим образом:\nСтоимость командира: §G-50%§!\nОрганизация армии: §G+5%§!\n"
- CTH_popular_power_tt_3:0 "Улучшит §YНародовластие§! следующим образом:\nФабрики, производящие товары народного потребления: §Y-2.5%§!\nЕжемесячный прирост населения: §G+10%§!\n"
+ CTH_popular_power_tt_3:0 "Улучшит §YНародовластие§! следующим образом:\nФабрики, производящие товары народного потребления: §Y-5%§!\nЕжемесячный прирост населения: §G+10%§!\n"
  CTH_popular_power_tt_4:0 "Улучшит §YНародовластие§! следующим образом:\nОбъем заводского производства: §G+5%§!\nФактор призывного населения: §G+10%§!\n"
- CTH_popular_power_tt_5:0 "Улучшит §YНародовластие§! следующим образом:\nФабрики, производящие товары народного потребления: §Y-2.5%§!\nЕжемесячный прирост населения: §G+10%§!\n"
+ CTH_popular_power_tt_5:0 "Улучшит §YНародовластие§! следующим образом:\nФабрики, производящие товары народного потребления: §Y-5%§!\nЕжемесячный прирост населения: §G+10%§!\n"
  CTH_patrician_investments_unlocked_tt:0 "Разблокирует решения §Yпатрицианских инвестиций§!.\n"
  CTH_clarify_loyalty_penalty:0 "Из-за того, что фракция уже имеет §Rочень высокую§! §Yвласть§!:\n"
  CTH_harmonization_tooltip:0 "Эффекты этого фокуса будут зависеть от выборов, сделанных в предыдущих фокусах.\n"
@@ -3057,7 +3057,7 @@
  
  CTH_SCIENTIFID_TOOLTIP:0 "Научная клика - это группа учёных, которые стали влиятельной фракцией после прихода к власти Замилькара Зарки. Во время его правления они выступали в роли технократов-советников, реформируя образование и импортируя плоды промышленной революции в Кольтфаген. Члены этой клики, также известные как "сайентифиды", являются сторонниками позитивистской научной политики. Это означает, что они превыше всего ценят порядок и прогресс.\n\nКаждый уровень §Yвласти§! предоставляет следующие модификаторы:\n2% скорости исследований\n2% макс. эффективности производства"
  CTH_MILITARY_FACTION_TOOLTIP:0 "Хотя большая часть кольтфагенской армии была разбита королём Штормом, старые генералы времен Замилькара остались у власти. В хаосе после вторжения эти генералы отвечали за восстановление порядка в Кольтфагене. Они стали военачальниками, которые управляют своими войсками подобно декадентским королям. Но при этом они ярые патриоты, готовые сражаться против всего, что угрожает Кольтфагену. Против всего и кого угодно.\n\nКаждый уровень §Yвласти§! предоставляет следующие модификаторы:\n2% организации\n2% лимита капитуляции"
- CTH_LANDOWNERS_TOOLTIP:0 "Богатые землевладельцы-аристократы Кольтфагена - довольно новая фракция, чьё богатство связано с властью, которую они получили во время правления Замилькара. Традиционно землевладельцы не пользовались влиянием в Кольтфагене, где господствовали торговцы-патриции, но всё изменилось. Замилькар вознаграждал верных ему зебр значительными земельными наделами, а сайентифиды объединили сельскую собственность в крупные поместья. Это создало новый класс помещиков, которые господствовали над своими арендаторами и рабами.\n\nКаждый уровень §Yвласти§! предоставляет следующие модификаторы:\n0.1 прирост политической власти\n-2% фабрик, производящих товары народного потребления"
+ CTH_LANDOWNERS_TOOLTIP:0 "Богатые землевладельцы-аристократы Кольтфагена - довольно новая фракция, чьё богатство связано с властью, которую они получили во время правления Замилькара. Традиционно землевладельцы не пользовались влиянием в Кольтфагене, где господствовали торговцы-патриции, но всё изменилось. Замилькар вознаграждал верных ему зебр значительными земельными наделами, а сайентифиды объединили сельскую собственность в крупные поместья. Это создало новый класс помещиков, которые господствовали над своими арендаторами и рабами.\n\nКаждый уровень §Yвласти§! предоставляет следующие модификаторы:\n0.1 прирост политической власти\n-4% фабрик, производящих товары народного потребления"
  CTH_CONSTITUTIONALIST_TOOLTIP:0 "История конституционалистов уходит корнями к созданию Кольтфагенской Республики почти двести лет назад, когда была восстановлена и изменена древняя демократическая конституция. Конституционалисты сформировались во время правления Замилькара Зарки как оппозиция его диктаторскому и олигархическому правлению. Члены этой фракции, многие из которых являются представителями среднего класса горожан и патрициев, стремятся восстановить свободу и демократию в Кольтфагене, но для них совсем не обязательно проводить социальные и экономические реформы.\n\nКаждый уровень §Yвласти§! предоставляет следующие модификаторы:\n-10% к стоимости законов мобилизации и экономики"
  CTH_HARMONITES_TOOLTIP:0 "Гармониты - самая молодая из всех фракций Кольтфагена, и многие до сих пор считают их частью конституционалистов. Некоторые считают гармонитов радикалами, находящимися под влиянием иностранных идей из стран вроде Гиппогрифии и Эквестрии. Они выступают за социальное государство, в котором все зебры равны. Хотя происхождение гармонитов сходно с конституционалистами, они завоевали большую популярность среди бедных и угнетенных граждан.\n\nКаждый уровень §Yвласти§! предоставляет следующие модификаторы:\n2.5% стабильности\n10% к торговым отношениям"
  CTH_LOYALTY_TOOLTIP:0 "§YЛояльность фракции§! представляет собой отношения фракции с правящим правительством. Как правило, если лояльность падает ниже §Y50%§!, фракция становится §Rнелояльной§!. Лояльная фракция даёт бонусы, а нелояльная - минусы. Но наихудшим вариантом будет нелояльная фракция с достаточно высоким уровнем §Yвласти§! - они могут попытаться устроить §Rпереворот§! против правительства. Фракция §Gземлевладельцев§! является исключением."
diff --git a/localisation/russian/country_CTL_l_russian.yml b/localisation/russian/country_CTL_l_russian.yml
index 62764b4bc86..3fb421279b6 100644
--- a/localisation/russian/country_CTL_l_russian.yml
+++ b/localisation/russian/country_CTL_l_russian.yml
@@ -1642,7 +1642,7 @@ chital.8.a:0 "Не стоит копать слишком глубоко. Да 
 chital.8.b:0 "Я должен принять меры."
 
 chital.9.t:0 "Семеро согласных"
-chital.9.d:0 "Бенджен расслабился в кресле на балконе, с которого открывался вид на море. Плечи устало повисли, получасовое заседание Совета растянулось на два часа. А спорили из-за мелких деталей и неверно подобранных слов; и не важно, что каждый по-своему говорил об одном и том же — все как будто искали повод для ругани, будто ради неё и пришли на собрание. Как и вчера. И позавчера. Безостановочная петля междоусобиц, повторяющаяся снова и снова.\nСледовало найти нечто, способное их объединить, но это само по себе было проблемой в половине случаев. Все соглашались насчёт целей и задач, но вот пути выполнения вызывали вопросы, дьявол крылся в деталях. Бенджен никогда не видел, чтобы олени столько спорили, притом что в целом они друг с другом соглашались, не проще ли было вместо всего этого выйти на море в лодке и покорять волны?\n\n— Боги, ненавижу политику, — простонал он.\n\n— Как ты всё это выносишь? — спросила олениха, поставив стакан воды на столе рядом. Он вдохнул полную грудь вечернего воздуха и приободрился.\n\n— Я справлюсь. Мы достигли соглашения по равным правам на образование, а это хоть что-то, пускай оно и заняло весь день.\n\nЕго возлюбленная Руусу с беспокойством смотрела на Бенджена.\n\n— В последнее время ты перетруждаешь себя. Как насчет того, чтобы устроить нам выходной? Только ты да я, никаких полуночных совещаний, никаких документов или выступлений. Тебе будет очень полезно немного отвлечься.\n\nЯрил сиял, представляя себе такое путешествие, и отчаянно желал принять её предложение.\n\n— Что бы я без тебя делал! — он вздохнул и положил голову ей на плечо.\n\n— Сидел бы на очередном совещании, — усмехнулась она, — Ну так скажи, как всё прошло?"
+chital.9.d:0 "Бенджен расслабился в кресле на балконе, с которого открывался вид на море. Плечи устало повисли, получасовое заседание Совета растянулось на два часа. А спорили из-за мелких деталей и неверно подобранных слов; и не важно, что каждый по-своему говорил об одном и том же — все как будто искали повод для ругани, будто ради неё и пришли на собрание. Как и вчера. И позавчера. Безостановочная петля междоусобиц, повторяющаяся снова и снова.\nСледовало найти нечто, способное их объединить, но это само по себе было проблемой в половине случаев. Все соглашались насчёт целей и задач, но вот пути выполнения вызывали вопросы, демоны крылись в деталях. Бенджен никогда не видел, чтобы олени столько спорили, притом что в целом они друг с другом соглашались, не проще ли было вместо всего этого выйти на море в лодке и покорять волны?\n\n— Боги, ненавижу политику, — простонал он.\n\n— Как ты всё это выносишь? — спросила олениха, поставив стакан воды на столе рядом. Он вдохнул полную грудь вечернего воздуха и приободрился.\n\n— Я справлюсь. Мы достигли соглашения по равным правам на образование, а это хоть что-то, пускай оно и заняло весь день.\n\nЕго возлюбленная Руусу с беспокойством смотрела на Бенджена.\n\n— В последнее время ты перетруждаешь себя. Как насчет того, чтобы устроить нам выходной? Только ты да я, никаких полуночных совещаний, никаких документов или выступлений. Тебе будет очень полезно немного отвлечься.\n\nЯрил сиял, представляя себе такое путешествие, и отчаянно желал принять её предложение.\n\n— Что бы я без тебя делал! — он вздохнул и положил голову ей на плечо.\n\n— Сидел бы на очередном совещании, — усмехнулась она, — Ну так скажи, как всё прошло?"
 chital.9.a:0 "Сумбурно, но с пользой."
 
 chital.10.t:0 "Встреча с Годи"
@@ -1893,7 +1893,7 @@ chital.66.d:0 "— Спасибо, что пришли, — сказал Яко
 chital.66.a:0 "Бенджен будет недоволен, но он просто не знает, чего хочет." # Garion
 
 chital.67.t:0 "Оценка ситуации"
-chital.67.d:0 "Стол Ивара скрипел под тяжестью папки: стопка отчётов и предсказаний высотой c бочку, перевязанная бечёвкой. Полный план развития Промышленного бюро, впервые разработанный Бендженом IV, раздутое чудовище конструкции. Он держал в копыте двухстраничное резюме, смутную попытку подвести итог пяти годам ошибок, просчетов и ужасных решений.\n\nВ лучшем случае он был плохо продуман, в худшем — совершенно бесполезен. В нём говорилось о предоставлении ручных инструментов фермерам вместо тракторов, о лучшем способе поощрения местных оружейников вместо централизации производства на заводах, о том, как улучшить существующее строительство вместо того, чтобы экспериментировать с совершенно новыми инженерными подходами. Это резюме было довольно унизительным, в нём предполагалось, что большинство коренных хиндийцев живут в хижинах в джунглях и выживают за счёт охоты, не имея достаточного представления о собственности на землю. Было и описано о захвате фермерских земель для выращивания специй без оплаты за землю.\n\nДругой документ был отчётом из трёх тысяч страниц устаревшей, бессмысленной административной брехни. Ивар вздохнул, позволяя сводке упасть на его стол. Он знал Бенджена IV лучше других, имел самое глубокое представление о различных отделах, работавших над бюро, и благодаря своим политическим связям мог получить доступ к протоколам всех совещаний, на которых обсуждался этот вопрос.\n\nЕго вывод: выбросить всё и начать сначала. Попытка спасти этот прославленный бумажный мусор приведёт только к потере времени, которое никто не мог себе позволить. Читал нужно было модернизировать сейчас, а не через двадцать лет, и сделать это нужно было без развязывания гражданской войны, разозлив собственных оленей."
+chital.67.d:0 "Стол Ивара скрипел под тяжестью папки: стопка отчётов и предсказаний высотой c бочку, перевязанная бечёвкой. Полный план развития Промышленного бюро, впервые разработанный Бендженом IV, раздутое чудовище конструкции. Он держал в копыте двухстраничное резюме, смутную попытку подвести итог пяти годам ошибок, просчетов и ужасных решений.\n\nВ лучшем случае он был плохо продуман, в худшем — совершенно бесполезен. В нём говорилось о предоставлении фермерам инструментов для копытного труда вместо тракторов, о лучшем способе поощрения местных оружейников вместо централизации производства на заводах, о том, как улучшить существующее строительство вместо того, чтобы экспериментировать с совершенно новыми инженерными подходами. Это резюме было довольно унизительным, в нём предполагалось, что большинство коренных хиндийцев живут в хижинах в джунглях и выживают за счёт охоты, не имея достаточного представления о собственности на землю. Было и описано о захвате фермерских земель для выращивания специй без оплаты за землю.\n\nДругой документ был отчётом из трёх тысяч страниц устаревшей, бессмысленной административной брехни. Ивар вздохнул, позволяя сводке упасть на его стол. Он знал Бенджена IV лучше других, имел самое глубокое представление о различных отделах, работавших над бюро, и благодаря своим политическим связям мог получить доступ к протоколам всех совещаний, на которых обсуждался этот вопрос.\n\nЕго вывод: выбросить всё и начать сначала. Попытка спасти этот прославленный бумажный мусор приведёт только к потере времени, которое никто не мог себе позволить. Читал нужно было модернизировать сейчас, а не через двадцать лет, и сделать это нужно было без развязывания гражданской войны, разозлив собственных оленей."
 chital.67.a:0 "Похоже, старый Ярил не совсем закончил свои реформы..."
 
 chital.68.t:0 "Первый день на работе" # Garion
@@ -2585,17 +2585,17 @@ chital_news.6.c:0 "Капитализм в Хиндии? Жалкое зрели
 
  CTL_benjen_wont_return:0 "§YХоверсхольм§! отплатил другу, который дал ему §Gвласть§!.\n§YБенджен V§! больше не вернется в Осткранби."
 
- CTL_we_industry_now_tt:0 "Будет получен национальный дух §YПромышленное Бюро Бенджена IV§!, который даёт (Фабрики, производящие товары народного потребления: §Y-1%§!, Прирост политической власти: §R-15%§!, £prod_eff_cap  Эффективность производства: §G+3.00%§!, Объём заводского производства: §G+3.00%§!)"
+ CTL_we_industry_now_tt:0 "Будет получен национальный дух §YПромышленное Бюро Бенджена IV§!, который даёт (Фабрики, производящие товары народного потребления: §Y-2%§!, Прирост политической власти: §R-15%§!, £prod_eff_cap  Эффективность производства: §G+3.00%§!, Объём заводского производства: §G+3.00%§!)"
  CTL_baronnen_focus_tt:0 "Изменит §YПромышленное Бюро Бенджена IV§! на\nПрирост политической власти: §G+7.5%§!"
  CTL_kahnli_focus_tt:0 "Изменит §YПромышленное Бюро Бенджена IV§! на\nПрирост политической власти: §G+7.5%§!"
  CTL_manufacturing_focus_tt:0 "Изменит §YПромышленное Бюро Бенджена IV§! на\nОбъём заводского производства: §G+7.00%§!"
  CTL_resources_focus_tt:0 "Изменит §YПромышленное Бюро Бенджена IV§! на\nСкорость строительства: §G+7.00%§!"
- CTL_free_market_focus_tt:0 "Изменит §YПромышленное Бюро Бенджена IV§! на\nФабрики, производящие товары народного потребления: §Y-4%§!\n£prod_eff_cap  Эффективность производства: §R-6.00%§!"
- CTL_minimum_wage_focus_tt:0 "Изменит §YПромышленное Бюро Бенджена IV§! на \nФабрики, производящие товары народного потребления: §Y+3%§!\n£prod_eff_cap  Эффективность производства: §G+10.00%§!"
- CTL_trade_tt:0 "Изменит §YПромышленное Бюро Бенджена IV§! на \nФабрики, производящие товары народного потребления: §Y-3%§!"
+ CTL_free_market_focus_tt:0 "Изменит §YПромышленное Бюро Бенджена IV§! на\nФабрики, производящие товары народного потребления: §Y-8%§!\n£prod_eff_cap  Эффективность производства: §R-6.00%§!"
+ CTL_minimum_wage_focus_tt:0 "Изменит §YПромышленное Бюро Бенджена IV§! на \nФабрики, производящие товары народного потребления: §Y+6%§!\n£prod_eff_cap  Эффективность производства: §G+10.00%§!"
+ CTL_trade_tt:0 "Изменит §YПромышленное Бюро Бенджена IV§! на \nФабрики, производящие товары народного потребления: §Y-6%§!"
  CTL_labour_unions_tt:0 "Изменит §YПромышленное Бюро Бенджена IV§! на\n£prod_eff_cap  Эффективность производства: §G+7.00%§!\nПрирост политической власти: §G+10%§!"
  CTL_crush_the_movement_tt:0 "Изменит §YПромышленное Бюро Бенджена IV§! на\nОбъём заводского производства: §G+7.00%§!\nПрирост политической власти: §G+10%§!"
- CTL_employers_first_tt:0 "Изменит §YПромышленное Бюро Бенджена IV§! на\nФабрики потребительских товаров: §Y-3%§!\nПрирост политической власти: §G+10%§!"
+ CTL_employers_first_tt:0 "Изменит §YПромышленное Бюро Бенджена IV§! на\nФабрики потребительских товаров: §Y-6%§!\nПрирост политической власти: §G+10%§!"
  
  CTL_brienna_focus_tt:0 "Изменит §YБриенна I Кудлинен§! на\nЕжедевная поддержка нейтралитета: §G+0.02§!\nСтабильность: §G+10.00%§!"
  
diff --git a/localisation/russian/country_EQS_l_russian.yml b/localisation/russian/country_EQS_l_russian.yml
index 6a41cd196bb..9b94a7c794c 100644
--- a/localisation/russian/country_EQS_l_russian.yml
+++ b/localisation/russian/country_EQS_l_russian.yml
@@ -547,7 +547,7 @@ EQS_improve_tank3:0 "Модернизировать военную теорию"
 
 #EVENTS
 #EQS#EQUESTRIA
- equestria.1.t:0 "С Новым Годом и счастливого Дня Согревающего Очага!"
+ equestria.1.t:0 "С Новым Годом и\nсчастливого Дня Согревающего Очага!"
  equestria.1.d:0 "Несколько дней назад пони по всей стране отметили День Согревающего Очага - ежегодный праздник, посвящённый основанию Эквестрии. По традиции в канун Дня Согревающего Очага пони собираются, чтобы посмотреть на театральные постановки, которые воссоздают воспетое в легендах основание страны. Самое крупное театрализованное представление проходит в Кантерлоте. Согласно легенде, три племени пони - единороги, пегасы и земные пони - с трудом уживались друг с другом, но потом страшная метель заставила их искать себе новую родину. Однако вожди племён претендуют на одну и ту же землю и начинают спорить друг с другом, в результате чего снова возвращается метель. Легенда утверждает, что резкое похолодание было вызвано магическими существами Виндиго, которые питаются ненавистью. Вожди племён оказались заморожены во льду, но их заместители смогли подружиться друг с другом и создать Огонь Дружбы - пламя в форме сердца - которое навсегда изгнало Виндиго и растопило как тела, так и сердца вождей племён. Затем три племени согласились совместно жить на этой новой земле, которую они назвали Эквестрией. После завершения театрализованных представлений в этот день семьи пони наслаждаются вкусной едой, дарят друг другу подарки и поднимают флаг Эквестрии.\n\nИ вот наступил новый год. Пони на улицах делятся оптимистичными взглядами на будущее и желают каждому встречному чужаку счастья в новом году. Впрочем, в Эквестрии никто не чувствует себя чужаком. Принцессы также произнесли свою традиционную речь для публики о важности гармонии и единства. Пони знают, что пока они работают вместе, они могут преодолеть любой брошенный им вызов."
  equestria.1.a:0 "Будущее выглядит светлым."
  equestria.2.t:0 "Проблема с бизонами"
diff --git a/localisation/russian/country_FAL_l_russian.yml b/localisation/russian/country_FAL_l_russian.yml
index c2f6929faf2..cb58654fcb1 100644
--- a/localisation/russian/country_FAL_l_russian.yml
+++ b/localisation/russian/country_FAL_l_russian.yml
@@ -508,7 +508,7 @@ FAL_Falcoria_communism_DEF:0 "Объединённые Социалистиче
 
 
 FAL_prepare_border_for_war_tt:0 "Несколько дивизий, состоящих из наших сторонников за границей, будут сформированы для предстоящей борьбы."
-FAL_volunteers_from_farmers_tt:0 "Несколько дивизий, состоящих из сельских фермеров и волонтеров, будут сформированы для предстоящей борьбы."
+FAL_volunteers_from_farmers_tt:0 "Будет сформировано несколько дивизий, состоящих из фермеров и добровольцев, которые помогут нам в предстоящей борьбе."
 FAL_unlock_harmony_path_tt:0 "Фалькорские дворяне дадут §Yпринцессе§! шанс §Gмирно§! решить наши проблемы."
 FAL_unlock_fascist_path_tt:0 "В Фалькоре случится серьёзный §Rкризис§!, в ходе которого §Rэкстремисты§! захватят власть."
 FAL_train_falcorian_resistance_tt:0 "Как только разразится война между Фалькором и Вингбардией, будет разблокировано §Yрешение§!, чтобы подать сигнал нашим тайным сторонникам, которые восстанут вокруг города Фалькора."
diff --git a/localisation/russian/country_FEA_l_russian.yml b/localisation/russian/country_FEA_l_russian.yml
index 746a624f8ab..eb91b86af5b 100644
--- a/localisation/russian/country_FEA_l_russian.yml
+++ b/localisation/russian/country_FEA_l_russian.yml
@@ -1505,6 +1505,7 @@ FEA_alliance_desc:0 "Мы не можем сражаться в одиночку
 feat_company_1:0 "Артиллерийский завод"
 feat_company_2:0 "Арсенал Роттендедама"
 feat_company_3:0 "Оборонительный арсенал"
+feat_company_2_and_3:0 "Арсенал Роттендедама-Вервейера"
 feat_company_4:0 "dVAF"
 feat_company_5:0 "Хертохлике Схел"
 feat_company_6:0 "Доменные печи Аймудховенс"
diff --git a/localisation/russian/country_FEZ_l_russian.yml b/localisation/russian/country_FEZ_l_russian.yml
index cc7742ccb2c..2cc17e7ef6f 100644
--- a/localisation/russian/country_FEZ_l_russian.yml
+++ b/localisation/russian/country_FEZ_l_russian.yml
@@ -170,7 +170,7 @@
  lying_to_aqulia_tt:0 "Мы пошлём дипломатическую миссию в Аквелию, в надежде на получение защиты. Мы попытаемся завершить сделку с помощью пары взяток, но если всё пойдёт не по плану, нам придётся столкнуться с §Rнепредвиденными обстоятельствами§!"
  FEZ_smugglers_help_tt:0 "Несколько отрядов ополчения будут сформированы для поддержки наших сил в предстоящем бою."
  FEZ_expanding_market_tt:0 "Мы станем проводить наши контрабандные операции по всему миру."
- FEZ_maf_help_tt:0 "Будет сформировано несколько отрядов, состоящих из мафиозных убийц и волонтеров, для войны со Скайфолом."
+ FEZ_maf_help_tt:0 "Будет сформировано несколько отрядов, состоящих из мафиозных убийц и добровольцев, для войны со Скайфолом."
  FEZ_insipire_pd_tt:0 "Несколько полицейских батальонов будут сформированы, чтобы оказать поддержку в рейде криминальных схронов."
  FEZ_police_tt:0 "Разблокирует решения о начале полицейских рейдов против преступников."
  FEZ_war_prep_tt:0 "Дополнительные полицейские батальоны будут сформированы для защиты Фезеры."
diff --git a/localisation/russian/country_FRN_l_russian.yml b/localisation/russian/country_FRN_l_russian.yml
index 237c022a49a..6a69c171527 100644
--- a/localisation/russian/country_FRN_l_russian.yml
+++ b/localisation/russian/country_FRN_l_russian.yml
@@ -1342,7 +1342,7 @@
  FRN_unconditional_oob:0 "Три §Yпехотные дивизии§! в 20 ширины фронта появятся в Пульчино.\n"
  FRN_unlock_deurbanization_decisions:0 "Откроет миссии по §Yдеурбанизации§!, которые активируются, когда вы национализируете Талузу, Вингбардию и Фалькор.\n"
  RULE_ALLOW_RELEASE_NATIONS_NOT_TARRIN_TOOLTIP:0 "Францистрии нельзя выпускать Таррин.\n"
- FRN_increase_order_thrift:0 "§YУвеличит§! §Gбережливость§! Ордена\nТовары общего потребления: §Y-2.5%§!\nПроизводство: §G+5.00%§!\nСкорость строительства: §G+5.00%§!\nУвеличение ресурсов: §G+5.00%§!"
+ FRN_increase_order_thrift:0 "§YУвеличит§! §Gбережливость§! Ордена\nТовары общего потребления: §Y-5%§!\nПроизводство: §G+5.00%§!\nСкорость строительства: §G+5.00%§!\nУвеличение ресурсов: §G+5.00%§!"
  FRN_increase_order_militancy:0 "§YУвеличит§! §Rвоинственность§! Ордена\nВремя тренировки: §Y-5%§!\nПризываемое население: §G+5.00%§!\nПолучение опыта армии: §G+5.00%§!\nПоддержка войны: §G+5.00%§!"
  FRN_vincenzo_stats_tp:0 "§RАтака§!: §Y3§!\n§YЗащита§!: §Y1§!\n§GПланирование§!: §Y3§!\n§CЛогистика§!: §Y1§!\n\n"
  FRN_fabrizio_stats_tp:0 "§RАтака§!: §Y1§!\n§YЗащита§!: §Y3§!\n§GПланирование§!: §Y1§!\n§CЛогистика§!: §Y3§!\n\n"
diff --git a/localisation/russian/country_GRF_l_russian.yml b/localisation/russian/country_GRF_l_russian.yml
index a1244185a46..327906fc1ae 100644
--- a/localisation/russian/country_GRF_l_russian.yml
+++ b/localisation/russian/country_GRF_l_russian.yml
@@ -16,7 +16,7 @@ GRF_northern_roads_desc:0 "Освоив новые нефтяные местор
 GRF_southern_industry:0 "Уэтерский промышленный район"
 GRF_southern_industry_desc:0 "Несмотря на все неудачи, мы наконец-то смогли привлечь достаточно инвесторов для создания промышленного центра в Уэтере."
 GRF_military_south:0 "Оружейные заводы Голдфезера"
-GRF_military_south_desc:0 "С нами связался Скейрон Голдфезер - один из богатейших аристократов старой империи, связанный с поставками оружия в Эквестрию. Несмотря на то, что империи уже нет, он всё ещё занимается оружием и предлагает нам свои услуги."
+GRF_military_south_desc:0 "С нами связался Скейрон Голдфезер - один из богатейших аристократов старой страны, связанный с торговлей эквестрийским оружием. Однако из-за проблем на родине Голдфезер решил сменить обстановку и предложил нам свои услуги, а также услуги компании "Талон Ганворкс"."
 GRF_northern_industry:0 "Профинансировать Север"
 GRF_northern_industry_desc:0 "Долгое время Север был мрачным регионом. Открытие нефтяных месторождений и строительство нефтеперерабатывающих заводов превратили его в один из самых густонаселённых районов страны. Нам стоит продолжать инвестировать в этот регион."
 GRF_military_north:0 "Оружейные заводы Тритона"
@@ -686,17 +686,17 @@ GRF_frontier_help:0 "Финансирование Фронтира"
  griffons.32.a:0 "Отправим большой груз оружия и с нас хватит."
  griffons.32.b:0 "Отправим в Эквестрию пару добровольческих дивизий."
  griffons.32.c:0 "Это нас не касается."
- griffons.33.t:0 "Грифоны-Волонтеры прибыли"
- griffons.33.d:0 "Похоже, Грифоны представляют какую угрозу Найтмер Мун создает для всего мира, и послали несколько добровольческих дивизий, чтобы помочь нам победить в войне."
- griffons.33.a:0 "По крайней мере, хоть какая-то помощь."
+ griffons.33.t:0 "Прибыли грифоны-добровольцы"
+ griffons.33.d:0 "Похоже, что грифоны понимают, какую угрозу Найтмер Мун создаёт для всего мира, и поэтому послали несколько добровольческих дивизий, чтобы помочь нам победить в войне."
+ griffons.33.a:0 "Ну хоть какая-то помощь."
  griffons.34.t:0 "Чейнджлингско-Эквестрийская Война"
  griffons.34.d:0 "Кажется чейнджлинги совершили крупномасштабное вторжение в Эквестрию и не думают останавливаться. Мы не можем просто сидеть на месте пока наши соседи борются не на жизнь, а на смерть. Большинство грифонов в правительстве советуют поддержать эквестрийцев."
  griffons.34.a:0 "Отправим большой груз оружия и я уверен им хватит."
  griffons.34.b:0 "Мы должны отправить в Эквестрию добровольческие дивизии. Грузите их на корабли!"
  griffons.34.c:0 "У нас и так забот хватает."
- griffons.35.t:0 "Грифоны-Волонтеры прибыли"
- griffons.35.d:0 "Похоже, Грифоны представляют какую угрозу Кризалис создает для всего мира, и послали несколько добровольческих дивизий, чтобы помочь нам победить в войне."
- griffons.35.a:0 "По крайней мере, хоть какая-то помощь."
+ griffons.35.t:0 "Прибыли грифоны-добровольцы"
+ griffons.35.d:0 "Похоже, что грифоны понимают, какую угрозу Кризалис создаёт для всего мира, и поэтому послали несколько добровольческих дивизий, чтобы помочь нам победить в войне."
+ griffons.35.a:0 "Ну хоть какая-то помощь."
  griffons.50.t:0 "Долгий марш"
  griffons.50.d:0 "Весь путь от Уэтера, наши войска шли вперед на северо-запад. Когда наши силы достигли холмов, коммунистические партизаны начали перестрелку с истощенными войсками, но не все было потеряно. Хайхилл сплотил солдат, повёл их в контратаку и в мгновение ока сломили дух террористов. Вскоре холмы и горы были очищены от коммунистов. Победа наша, по крайней мере, сегодня."
  griffons.50.a:0 "Долгая дорога до Кингсмейр..."
diff --git a/localisation/russian/country_GRI_aprilfool_l_russian.yml b/localisation/russian/country_GRI_aprilfool_l_russian.yml
index 78285b0514c..1c4eb0dc63e 100644
--- a/localisation/russian/country_GRI_aprilfool_l_russian.yml
+++ b/localisation/russian/country_GRI_aprilfool_l_russian.yml
@@ -962,7 +962,7 @@ GRI_AF_an_industry_transformed_desc:0 "Промышленность старой
  GRI_AF_in_the_lands_of_the_loyal_tt:0 "Будет получен модификатор §YСтолпы Империума§!, который дает:\nПрирост базовой поддержки войны: §G+10.00%§!"
  GRI_AF_all_teh_sons_of_the_empire_tt: "Изменит эффекты §YСтолпов Империума§!:\nПроизводительность военных заводов: §G+10.00%§!\nСтабильность: §G+20.00%§!"
  GRI_AF_marshall_the_troops_tt:0 "Изменит эффекты §YСтолпов Империума§!:\nСтабильность:  §G+20.00%§!"
- GRI_AF_unto_itself_tt:0 "Изменит эффекты §YСтолпов Империума§!:\nФабрики, производящие товары народного потребления: §Y-5.00%§!"
+ GRI_AF_unto_itself_tt:0 "Изменит эффекты §YСтолпов Империума§!:\nФабрики, производящие товары народного потребления: §Y-10.00%§!"
  GRI_AF_and_their_inventions_tt:0 "Изменит эффекты §YСтолпов Империума§!:\nТемпы исследований: §G+5.00%§!"
  GRI_AF_the_traitor_general_tt:0 "Изменит эффекты §YСтолпов Империума§!:\nШтраф к стабильности от наступательной войны: §G50.00%§!"
  GRI_AF_the_winds_of_boreas_tt:0 "Изменит эффекты §YСтолпов Империума§!:\nСкорость строительства: §G+10.00%§!"
diff --git a/localisation/russian/country_HEL_l_russian.yml b/localisation/russian/country_HEL_l_russian.yml
index a82bcb80eb2..751650896fe 100644
--- a/localisation/russian/country_HEL_l_russian.yml
+++ b/localisation/russian/country_HEL_l_russian.yml
@@ -268,7 +268,7 @@ HEL_integrate_the_militias_desc:0 "Хотя наша армия так и буд
 #HEL_the_sisters_of_eyr_desc:0 "Сестры Эйр - довольно... эксцентричная группа. Разъезжая по Аделарту на своих железных чудовищах, они исполняют волю богов на земле. Мы должны приложить усилия, чтобы попытаться интегрировать их в свою армию, и использовать их божественную силу в своих интересах."
 
 HEL_the_merrimane_column:0 "Колонна Мерримана"
-HEL_the_merrimane_column_desc:0 "Колонна Мерримана, собрание интернациональных социалистов-революционеров из Эквестрии и ветеранов левого крыла Первой Аквелийской Революции, обосновалась в Аделарте во время местной революции в 987 году П.И.Л. С тех пор они завоевали репутацию центра воинствующих левых и базы, где волонтеры со всего мира помогают строить новый Аделарт."
+HEL_the_merrimane_column_desc:0 "Колонна Мерримана, собрание интернациональных социалистов-революционеров из Эквестрии и ветеранов левого крыла Первой Аквелийской Революции, обосновалась в Аделарте во время местной революции в 987 году П.И.Л. С тех пор они завоевали репутацию центра воинствующих левых и базы, где добровольцы со всего мира помогают строить новый Аделарт."
 
 HEL_haven_of_socialism:0 "Пристанище глобального социализма"
 HEL_haven_of_socialism_desc:0 "В то время как большинство отвергло бы идею предоставления безопасного проезда и жилья социалистам-революционерам со всего мира, у нас нет причин бояться этих единомышленников. [HEL.GetNameDefCap] будет надёжным убежищем и центром операций для наших красных друзей по всему континенту и за его пределами!"
@@ -1160,7 +1160,7 @@ HEL_restore_archonate_infrastructure_desc:0 "С возвращением шер
 HEL_griffonian_industrial_aid:0 "Промышленники Фетизии" 
 HEL_griffonian_industrial_aid_desc:0 "В последние годы наши северные соседи показали себя отличными промышленниками, хотя в связи с их недавними кризисами ясно видно, что некоторые из их наиболее известных компаний стремятся застраховать часть своего капитала в других местах. Сделав несколько очень щедрых предложений этим компаниям, мы сможем заручиться их помощью в расширении нашей экономики."
 
-HEL_the_aquileian_demon:0 "Дьявол в Аквиле"
+HEL_the_aquileian_demon:0 "Маар в Аквиле"
 HEL_the_aquileian_demon_desc:0 "За последние годы, кто бы ни правил в Аквиле, он нажил множество ярых врагов, большинство из которых готовы взяться за оружие, чтобы бороться против нового правительства. Если мы предложим этим существам место в наших рядах, мы сможем пополнить нашу армию и обеспечить себе ценную и лояльную базу солдат."
 
 HEL_abolish_the_adelartian_language:0 "Развенчать вымысел об "Аделарте"" 
@@ -2021,7 +2021,7 @@ adelart.102.t:0 "Тридцать"
 adelart.102.d:0 "— Знаешь, это приятно конечно, но мне это никогда не заменит всю боль и ненависть, что я испытывал за все 30 лет. — донеслись слова Жана сквозь грохот джипа. Они катили по зеленым полям навстречу закату, его язвительность была направлена на привязанного сзади Вуда, за которым тянулись обезоруженные друзья бандита.\n\nТридцать лет изгнания и подготовки. За это время бандиты, которым было позволено всё, они просто раздали народу бесконечные обещания. Их веселья и взаимного подбадривания не хватило, чтобы задержать неудержимое. Жан чувствовала витающий в воздухе страх даже сидя на водительском сиденье, хотя даже сейчас кричащие сзади все ещё пытались сопротивляться. Большинство из них были настолько упрямыми, что им пришлось заткнуть клювы, чтобы не прекращающийся поток оскорблений не отвлекал водителя от дороги.\n\nДеревни пылали, и их дым закрывал собой небо. Фермы превратились в пепел, трава превратилась в пыль. У большинства друзей Вуда спустя час езды уже были проломлены головы или свёрнуты щеи. Хотя может быть они погибли из-за многочисленных переломов. Однако кляп во рту был по прежнему у всех.\n\n— Ты был мёртв с самого начала метяжа, — сказал Жан. — Грайфвальд снова вздохнёт свободно, и те бедняги, которых вы держали в заложниках, наконец узнают, каково это - жить в нормальном государстве.\n\nОни почти подъехали к базе. Сзади послышались выстрелы из револьвера. Конечно, это был Клавдий или Иоланда. Судя по их ликованию, пуля пробила обе головы за один раз. Взглянув в зеркало заднего вида, он увидел, что Вуд начал плакать. Он остался последним. Небо тут было оранжевым, а не чёрным.\n\n— Прятаться - просто глупо. Неужели вы, маленькие глупые бандиты, не научились этому за все эти годы? — Жан достал пистолет, целясь в своего многолетнего мучителя. Это было сложно, но оттого и ещё веселее. Вообще странно, что она так долго оставался в живых. Хотя кобура, которая скрывала оружие, убившее Вуда, уже где-то потерялась. — Всё это время вы просто терроризировали мирных жителей и всякую мелочь... с чего вы вообще взяли, что можете победить шерифа?"
 adelart.102.a:0 "Ноль."
 
-adelart.103.t:0 "Mutton"
+adelart.103.t:0 "Идиоты"
 adelart.103.d:0 "— Где он!? — закричал Жан, сжимая в когтях кременвый пистолет Вуда, тыкая им прямо в лицо Сестре Селене. Её танк превратился в пылающий искореженный металлом, а на теле грифины было множество шрамов и ожогов. Селену окружали клубы дыма и остовы разбитых танков, в которых остались её друзья.\n\nЗа шерифом было ещё больше дыма - от горящих храмов Эйр. Оборванцы в своих жалких одеждах бежали от угрозы быть разорванными на куски. В этот раз шериф решил проявить милосердие. Он, так сказать, предоставил грифонам шанс воссоединиться с их любимой богиней. Ноттемань был так доволен ролью, отведенной ему Богами: Он был и Их Судьей, и Их Присяжными, и даже Их Палачом.\n\n— Да проклянёт тебя Эйр за всё, что ты сделал с нами, ты, палач Клаудетов!\n\nОн зарядил пистолет. — Ты скажешь мне, где он, или нет?\n\n— Нет! Я—\n\nОна упала замертво. Остальные повернули к нему головы сквозь оружейный дым. — Селена не предала бы его, даже если бы мы привязали её к стулу и избили кувалдой, — сказал Жану один из его солдат. Он ткнул когтем в сторону последнего трупа; несколько подчиненных унесли её прочь. — Всего через несколько миль начнётся граница Грайфвальда.  Вы, ребята, обыскали весь лес, вычистили все тайники и святилища Луки. А ведь он должен был выполнять работу капеллана для своих солдат. И где он? Знаешь, что это значит? — Злая ухмылка мелькнула на его клюве, отчего солдат начал нервничать. — Измена. Бросил свою паству. Так что теперь он мёртв для всех - нас в том числе."
 adelart.103.a:0 "Не пастырь, а позорище."
 
diff --git a/localisation/russian/country_HIE_l_russian.yml b/localisation/russian/country_HIE_l_russian.yml
index 9606977d472..53e7e7637e8 100644
--- a/localisation/russian/country_HIE_l_russian.yml
+++ b/localisation/russian/country_HIE_l_russian.yml
@@ -717,12 +717,12 @@ HIE_CTH_start_of_tree_2: "§rБыло провозглашено Вознесе
 HIE_CTH_economic_projects_unlocked_tp: "§GЗавершение§! этого §Cфокуса§! откроет £decision_icon_small §Cрешения§!, которые позволят нам заняться разными §Yэкономическими проектами§! во всём §rВознесении§!\n\n"
 HIE_CTH_economic_projects_unlocked_2_tp: "§GЗавершение§! этого §Cфокуса§! откроет £decision_icon_small §Cрешения§!, которые позволят нам заняться разными §Yэкономическими проектами§! во всём §rВознесении§!\n\n"
 HIE_CTH_economic_projects_unlocked_3_tp: "§GЗавершение§! этого §Cфокуса§! откроет £decision_icon_small §Cрешения§!, которые позволят нам заняться разными §Yэкономическими проектами§! во всём §rВознесении§!\n\n"
-HIE_CTH_agrarian_variants_tp: "§GЗавершение§! этого §Cфокуса§! даст нам национальный дух §YАграрный идеал§!, который, в зависимости от статуса нашей §Yэкономической политики§!, даст следующие эффекты:\n\n - В случае доминирования £faction_tur_kurdish §rЗинскайтов§!:\n      §YАграрный идеал§!: Эффективность добычи ресурсов: §G+10.00%§!, Ежемесячный прирост населения: §R-10.0%§!, Фактор военнообязанного населения: §G5%§!, Нехватка припасов: §G-5.0%§!\n\n - В случае доминирования £civ_factory_output §rЗидонитов§!:\n      §YАграрный идеал§!: which grants Ежемесячный прирост населения: §R-10.0%§!, Максимальное количество фабрик в регионе §G+10%§!, Скорость строительства: §G+10.00%§!, £prod_eff Рост эффективности производства: §G+5.00%§!\n\n"
-HIE_CTH_cosmopolitan_variants_tp: "§GЗавершение§! этого §Cфокуса§! даст нам национальный дух §YИскусство космополитизма§!, который, в зависимости от статуса нашей §Yэкономической политики§!, даст следующие эффекты:\n\n - В случае доминирования £faction_tur_kurdish §rЗинскайтов§!:\n      §YИскусство космополитизма§!: Ежемесячный прирост населения: §R-10.0%§!, Производительность фабрик: §G+5.00%§!, Скорость строительства §Yвоенных заводов§!: §G+10.00%§!\n\n - В случае доминирования £civ_factory_output §rЗидонитов§!:\n      §YИскусство космополитизма§!: Ежемесячный прирост населения: §R-10.0%§!, Фабрики, производящие товары народного потребления: §Y-2.5%§!, Темпы исследований: §G+2.50%§!, Скорость строительства §Yфабрик§!: §G+10.00%§!)\n\n"
+HIE_CTH_agrarian_variants_tp: "§GЗавершение§! этого §Cфокуса§! даст нам национальный дух §YАграрный идеал§!, который, в зависимости от статуса нашей §Yэкономической политики§!, даст следующие эффекты:\n\n - В случае доминирования £faction_tur_kurdish §rЗинскайтов§!:\n      §YАграрный идеал§!: Эффективность увеличения ресурсов: §G+10.00%§!, Ежемесячный прирост населения: §R-10.0%§!, Фактор военнообязанного населения: §G5%§!, Нехватка припасов: §G-5.0%§!\n\n - В случае доминирования £civ_factory_output §rЗидонитов§!:\n      §YАграрный идеал§!: which grants Ежемесячный прирост населения: §R-10.0%§!, Максимальное количество фабрик в регионе §G+10%§!, Скорость строительства: §G+10.00%§!, £prod_eff Рост эффективности производства: §G+5.00%§!\n\n"
+HIE_CTH_cosmopolitan_variants_tp: "§GЗавершение§! этого §Cфокуса§! даст нам национальный дух §YИскусство космополитизма§!, который, в зависимости от статуса нашей §Yэкономической политики§!, даст следующие эффекты:\n\n - В случае доминирования £faction_tur_kurdish §rЗинскайтов§!:\n      §YИскусство космополитизма§!: Ежемесячный прирост населения: §R-10.0%§!, Производительность фабрик: §G+5.00%§!, Скорость строительства §Yвоенных заводов§!: §G+10.00%§!\n\n - В случае доминирования £civ_factory_output §rЗидонитов§!:\n      §YИскусство космополитизма§!: Ежемесячный прирост населения: §R-10.0%§!, Фабрики, производящие товары народного потребления: §Y-5%§!, Темпы исследований: §G+2.50%§!, Скорость строительства §Yфабрик§!: §G+10.00%§!)\n\n"
 HIE_CTH_increase_agrarian_influence_1_tp: "Влияние £faction_tur_kurdish §rЗинскайтов§! §Gувеличится§! на §Yодин§! уровень\nВлияние £civ_factory_output §rЗидонитов§! §Rснизится§! на §Yодин§! уровень\n\n"
 HIE_CTH_increase_urbanite_influence_1_tp: "Влияние £faction_tur_kurdish §rЗинскайтов§! §Rснизится§! на §Yодин§! уровень\nВлияние £civ_factory_output §rЗидонитов§! §Gувеличится§! на §Yодин§! уровень\n\n"
 HIE_CTH_guilds_variants_tp: "§GЗавершение§! этого §Cфокуса§! даст нам национальный дух §YСтарые гильдии§!, который, в зависимости от статуса нашей §Yэкономической политики§!, даст следующие эффекты:\n\n - В случае доминирования £faction_tur_kurdish §rЗинскайтов§!:\n      §YСтарые гильдии§!: £prod_eff_cap Мощность эффективности производства: §G+10.00%§!, Базовая эффективность производства: §G+5.00%§!, Производительность фабрик: §R-5.00%§!\n\n - В случае доминирования £civ_factory_output §rЗидонитов§!:\n      §YСтарые гильдии§!: £prod_eff Рост эффективности производства: §G+10.00%§!, Штраф за нехватку ресурсов: §G-10.00%§!, Производительность фабрик: §R-5.00%§!\n\n"
-HIE_CTH_the_caste_variants_tp: "§GЗавершение§! этого §Cфокуса§! даст нам национальный дух §YПроизводственные касты§!, который, в зависимости от статуса нашей §Yэкономической политики§!, даст следующие эффекты:\n\n - В случае доминирования £faction_tur_kurdish §rЗинскайтов§!:\n      §YПроизводственные касты§!: Фабрики, производящие товары народного потребления: §Y-2.5%§!, Еженедельный прирост стабильности: §R-0.10%§!, Еженедельный прирост поддержки войны: §G+0.30%§!, £prod_eff Рост эффективности производства: §R-10.00%§!, Производительность фабрик: §G+5.00%§!\n\n - В случае доминирования £civ_factory_output §rЗидонитов§!:\n      §YПроизводственные касты§!: Еженедельный прирост стабильности: §G+0.30%§!, Еженедельный прирост поддержки войны: §R-0.10%§!, £prod_eff Рост эффективности производства: §R-10.00%§!, Производительность фабрик: §G+10.00%§!)\n\n"
+HIE_CTH_the_caste_variants_tp: "§GЗавершение§! этого §Cфокуса§! даст нам национальный дух §YПроизводственные касты§!, который, в зависимости от статуса нашей §Yэкономической политики§!, даст следующие эффекты:\n\n - В случае доминирования £faction_tur_kurdish §rЗинскайтов§!:\n      §YПроизводственные касты§!: Фабрики, производящие товары народного потребления: §Y-5%§!, Еженедельный прирост стабильности: §R-0.10%§!, Еженедельный прирост поддержки войны: §G+0.30%§!, £prod_eff Рост эффективности производства: §R-10.00%§!, Производительность фабрик: §G+5.00%§!\n\n - В случае доминирования £civ_factory_output §rЗидонитов§!:\n      §YПроизводственные касты§!: Еженедельный прирост стабильности: §G+0.30%§!, Еженедельный прирост поддержки войны: §R-0.10%§!, £prod_eff Рост эффективности производства: §R-10.00%§!, Производительность фабрик: §G+10.00%§!)\n\n"
 HIE_CTH_agrarian_dominance_tp: "§YЭкономические идеи§! £faction_tur_kurdish §rЗинскайтов§! доминируют в §rВознесении§!\n\n"
 HIE_CTH_urban_dominance_tp: "§YЭкономические идеи§! £civ_factory_output §rЗидонитов§! доминируют в §rВознесении§!\n\n"
 HIE_CTH_artistic_dominance_tp: "§YПолитические идеи§! £counter_intelligence §rЗуманитов§! доминируют в §rВознесении§!\n\n"
@@ -1055,7 +1055,7 @@ HIE_magic_crystal_effects: "Делает процесс создания кри
 HIE_loyalty_effects: "Скорость восстановления: §G+5§!\nОрганизация дивизии: §R-5.00%§!"
 HIE_vespers_of_invincibility_effects: "Скорость восстановления: §G15.00%§!\nСила дивизии: §R-10.00%§!"
 HIE_heartbreaker_effects: "Оборона дивизии: §G+10.00%§!\nЕжемесячный прирост населения: §R-5.00%§!"
-HIE_kiss_effects: "Фабрики, производящие товары народного потребления: §Y-8.00%§!\nЕжемесячный прирост населения: §G+6.90%§!"
+HIE_kiss_effects: "Фабрики, производящие товары народного потребления: §Y-16.00%§!\nЕжемесячный прирост населения: §G+6.90%§!"
 HIE_stormcaller_effects: "Акклиматизация к холоду: §G+10.00%§!\nШтраф за плохую погоду: §G-15.00%§!"
 
 ### ASPJ Events ###
@@ -1532,7 +1532,7 @@ hippone_jrnl_misc_gr.4.desc: "Хозяин гостиницы заговорил
 hippone_jrnl_misc_gr.4.a: "Трактирщик сделал паузу, чтобы прочистить горло, затем продолжил."
 
 hippone_jrnl_misc_gr.5.t: "Настоящая сила" #podrick
-hippone_jrnl_misc_gr.5.desc: "— "Все солдаты ушли, оставив Рагу наедине примерно с двумя сотнями заключенных. Она расстегнула наши замки и приказала нам бежать, пока мы можем. Сбежали все пони. Годы спустя я попытался связаться с ней, но узнал, что её судили за государственную измену и расстреляли на следующий день после того, как она освободила нас." — Хозяин гостиницы открыл стол и достал фотографию, показав её Зетро и Проводнику. Оба изучили фотографию. На ней были изображены молодой грифон и пони, обнимающие друг друга. — "Я также узнал, что она была близкой подругой моего покойного сына до того, как присоединилась к реформистам. Несмотря на то, что она сделала много ужасных выборов в жизни, в конце концов она решила быть героем."\n\nЗебры уставились на фотографию. В этом не было никакого смысла. Дьяволы Заал-Маара не были такими. Для них было невозможно быть такими самоотверженными. Тут было что-то ещё, какая-то иная причина. Наверное пони просто лгал... но это было не так, судя по всему. Её копыта дрожали. История и фотография были сводящим с ума противоречием всему, во что она верила. Там не было-\n\n— "Ты можешь оставить фото себе."\n\nПроводник замерла. Взгляд зебры метнулся к хозяину гостиницы, который просто улыбнулся ей. Зетро почувствовал напряженную атмосферу и тихо извинился, чтобы пойти спать. После того, как он поспешил вверх по лестнице, жеребец продолжил, — "В твоей жизни было много боли. Ты похожа на того, кто скрывает свою боль, притворяясь могущественным, причиняя боль тем, кто с тобой не согласен. Но позволь мне сказать тебе: настоящая сила - это когда у тебя есть все основания убивать, а ты этого не делаешь." — Проводник всё так же шокировано молчала. — "Но эй, Я просто уставший, старый жеребец, который слишком много болтает. Спокойной ночи, ладно?""
+hippone_jrnl_misc_gr.5.desc: "— "Все солдаты ушли, оставив Рагу наедине примерно с двумя сотнями заключенных. Она расстегнула наши замки и приказала нам бежать, пока мы можем. Сбежали все пони. Годы спустя я попытался связаться с ней, но узнал, что её судили за государственную измену и расстреляли на следующий день после того, как она освободила нас." — Хозяин гостиницы открыл стол и достал фотографию, показав её Зетро и Проводнику. Оба изучили фотографию. На ней были изображены молодой грифон и пони, обнимающие друг друга. — "Я также узнал, что она была близкой подругой моего покойного сына до того, как присоединилась к реформистам. Несмотря на то, что она сделала много ужасных выборов в жизни, в конце концов она решила быть героем."\n\nЗебры уставились на фотографию. В этом не было никакого смысла. Дьяволы Заал-Маара не были такими. Для них было невозможно быть такими самоотверженными. Тут было что-то ещё, какая-то иная причина. Наверное пони просто лгал... но это было не так, судя по всему. Её копыта дрожали. История и фотография были сводящим с ума противоречием всему, во что она верила. Там не было-\n\n— "Ты можешь оставить фото себе."\n\nПроводник замерла. Взгляд зебры метнулся к хозяину гостиницы, который просто улыбнулся ей. Зетро почувствовал напряженную атмосферу и тихо извинился, чтобы пойти спать. После того, как он поспешил вверх по лестнице, жеребец продолжил, — "В твоей жизни было много боли. Ты похожа на того, кто скрывает свою боль, притворяясь могущественным, причиняя боль тем, кто с тобой не согласен. Но позволь мне сказать тебе: настоящая сила - это когда у тебя есть все основания убивать, а ты этого не делаешь." — Проводник всё так же шокировано молчала. — "Но эй, я просто уставший, старый жеребец, который слишком много болтает. Спокойной ночи, ладно?""
 hippone_jrnl_misc_gr.5.a: "Хозяин гостиницы ушел, оставив Проводника наедине с этим открытием."
 hippone_jrnl_misc_gr.5.a.tt: "§rОна§! это запомнит."
 
diff --git a/localisation/russian/country_HIP_l_russian.yml b/localisation/russian/country_HIP_l_russian.yml
index 26782b46e6e..8c39beb3246 100644
--- a/localisation/russian/country_HIP_l_russian.yml
+++ b/localisation/russian/country_HIP_l_russian.yml
@@ -9,7 +9,9 @@
  HIP_posada:0 "Посада"
  HIP_sky_beak:0 "Скай Бик"
  HIP_nimbus_cloudstriker:0 "Нимбус Клаудстрайкер"
- HIP_arcus_flamefeather:0 "Аркус Флеймфезер"
+ HIP_arcus_flamefeather:0 "Аркус Файрбренд"
+ HIP_arden_ironquill:0 "Арден Айронквилл"
+ HIP_ulyssess:0 "Улисс"
  HIP_lucy_duskfeather:0 "Люси Даскфезер"
  HIP_seaspray:0 "Сиспрей"
  HIP_nobody:0 "Никто"
@@ -6169,10 +6171,12 @@
  HIP_RAZORBEAK_DESC:0 "§YЗвание§!: Полковник\n\nСуровая и требовательная полковник Разорбик большую часть своей карьеры была инструктором в военных академиях Гиппогрифии. Там она пыталась отсеять слабаков среди будущих офицеров. Разорбик не продвинулась в звании выше полковника из-за её противоречивых методов и потенциальных связей с ультраправыми организациями, и за эти годы у неё появилось много врагов. Тем не менее, высшее командование нередко призывает её возглавить ударные силы, когда для победы необходимы агрессия и железная воля.\n\n§YАвтор портрета§!: Egil"
  HIP_SKY_BEAK_DESC:0 "§YRank§!: General\n\n§YPortrait By§!: Kessel"
  HIP_CLOUDSTRIKER_DESC:0 "§YRank§!: General\n\n§YPortrait By§!: Leo"
- HIP_ARCUS_DESC:0 "§YRank§!: Lieutenant General\n\n§YPortrait By§!: Echo"
+ HIP_ARCUS_DESC:0 "§YRank§!: Lieutenant General\n\n§YPortrait By§!: AdagioString"
+ HIP_ARDEN_DESC:0 "§YRank§!: Lieutenant General\n\n§YPortrait By§!: Kleowolfy"
+ HIP_ULYSSES_DESC:0 "§YRank§!: Major General\n\n§YPortrait By§!: Kleowolfy"
  HIP_COLD_DESC:0 "§YRank§!: Brigadier General\n\n§YPortrait By§!: Kam"
  HIP_FABER_DESC:0 "§YRank§!: Major General\n\n§YPortrait By§!: Printik"
- HIP_OCEAN_BREEZE_DESC:0 "§YRank§!: General\n\n§YPortrait By§!: Neither"
+ HIP_OCEAN_BREEZE_DESC:0 "§YRank§!: Lieutenant General\n\n§YPortrait By§!: Neither"
  HIP_SEASPRAY_DESC:0 "§YRank§!: Fleet Admiral\n\n§YPortrait By§!: Bunnyshrubby"
  HIP_TYPHOON_DESC:0 "§YRank§!: Admiral\n\n§YPortrait By§!: Tofkov"
  HIP_SKYBOLT_DESC:0 "§YRank§!: Rear Admiral\n\n§YPortrait By§!: Kaiser-Sauce"
@@ -6389,7 +6393,7 @@
  HIP_anarchist_society_3:0 "Изменит §YАнархическое общество§!\nТемп исследований: §G+15%§!"
  HIP_anarchist_society_4:0 "Изменит §YАнархическое общество§!\nСтабильность: §R-10%§!\nЦель сопротивления в наших регионах, оккупированных врагом: §G+10%§!\nСкорость спада сопротивления в наших регионах, оккупированных врагом: §G-10%§!\nСкорость роста сопротивления в наших регионах, оккупированных врагом: §G+10%§!\nСкорость роста подчинения в наших регионах, оккупированных врагом: §G-10%§!\nУрон вражеским гарнизонам в наших регионах, оккупированных врагом: §G+10%§!"
  HIP_anarchist_society_5:0 "Изменит §YАнархическое общество§!\nВоеннообязанное население: §Y+3.00%§!"
- HIP_anarchist_society_6:0 "Изменит §YАнархическое общество§!\nФабрики, производящие товары народного потребления: §Y-5.00%§!"
+ HIP_anarchist_society_6:0 "Изменит §YАнархическое общество§!\nФабрики, производящие товары народного потребления: §Y-10.00%§!"
  HIP_anarchist_society_7:0 "Изменит §YАнархическое общество§!\nПоддержка войны: §G+100.00%§!"
  HIP_thank_you_for_playing_posada:0 "Спасибо за игру за §2Посаду§!!"
 
@@ -6405,13 +6409,13 @@
  HIP_no_more_supercommunism:0 "Планы Посады §tпровалились§!...\n\n§tВсе полезные национальные духи из древа фокусов Посады будут удалены.§!"
  HIP_thermonuke_warning_tt:0 "§RМы открываем ящик, который, возможно, никогда не сможем закрыть...§!"
 
- HIP_coalition_reconstruction_1:0 "Вы получите национальный дух §YВосстановление§! со следующими эффектами: Фабрики, производящие товары народного потребления: §Y+10.0%§!, Скорость строительства §Yинфраструктуры§!: §G+25.00%§!, Скорость строительства §Yжелезных дорог§!: §G+25.00%§!))."
+ HIP_coalition_reconstruction_1:0 "Вы получите национальный дух §YВосстановление§! со следующими эффектами: Фабрики, производящие товары народного потребления: §Y+20.0%§!, Скорость строительства §Yинфраструктуры§!: §G+25.00%§!, Скорость строительства §Yжелезных дорог§!: §G+25.00%§!))."
  HIP_coalition_reconstruction_2:0 "Изменит §YВосстановление§! следующим образом:\nМакс. эффективность производства: §R-15%§!\nСтабильность в неделю: §G+1.00%§!"
  HIP_coalition_reconstruction_3:0 "Изменит §YВосстановление§! следующим образом:\nСкорость строительства: §G+15%§!\nFactory Repair Speed: §G+15%§!\nФактор военнообязанного населения: §R-20.00%§!"
  HIP_coalition_reconstruction_4:0 "Изменит §YВосстановление§! следующим образом:\nВлияние мнения на торговые сделки: §Y+50.00%§!\nМаксимум фабрик в регионе: §G+15%§!\nПоддержка войны: §R-10.00%§!"
  HIP_coalition_reconstruction_5:0 "Изменит §YВосстановление§! следующим образом:\nОбъем заводского производства: §G+10%§!\nПроизводительность верфи: §G+10%§!"
  HIP_coalition_reconstruction_6:0 "Изменит §YВосстановление§! следующим образом:\nМакс. эффективность производства: §G+10%§!\nРесурсы на рынок: §Y+20%§!"
- HIP_coalition_reconstruction_7:0 "Изменит §YВосстановление§! следующим образом:\nФабрики, производящие товары народного потребления: §Y+5.0%§!\nОборона дивизии на национальной территории: §G+20.0%§!\nЕжемесячный прирост населения: §G+20.0%§!"
+ HIP_coalition_reconstruction_7:0 "Изменит §YВосстановление§! следующим образом:\nФабрики, производящие товары народного потребления: §Y+10.0%§!\nОборона дивизии на национальной территории: §G+20.0%§!\nЕжемесячный прирост населения: §G+20.0%§!"
  HIP_coalition_reconstruction_8:0 "Изменит §YВосстановление§! следующим образом:\nТемпы исследований: §G+7.00%§!"
 
 
@@ -6450,7 +6454,7 @@
  HIP_smile_assistance:0 "Стабильность: §G+10%§!\nУрон гарнизонам: §G-25%§!"
  HIP_ohs_assistance:0 "Эффективность зарубежной подрывной деятельности: §G-15%§!\nСтоимость подрывной деятельности: §G-25%§!"
  HIP_ohs_assistance_lar:0 "Контрразведка: §G+0.75§!\nКоэффициент обнаружения собственного оперативника: §G-25%§!"
- HIP_foreign_nationals_covered:0 "Потребительские товары: §Y-2%§!\nПоддержка войны: §G+5%§!"
+ HIP_foreign_nationals_covered:0 "Потребительские товары: §Y-4%§!\nПоддержка войны: §G+5%§!"
  HIP_anti_harmonic_terrorism:0 "Фактор военнообязанного населения: §G+5%§!\nПоддержка войны: §G+5%§!\nШанс проникновения в гарнизон: §G-5%§!\nЕжедневный рост поддержки превосходства: §G0.02%§!"
  HIP_defined_Harmony:0 "Поддержка войны: §G+5%§!"
  HIP_zumidian_volunteer_tooltip:0 "Три §Yдивизии§! из §Y6 батальонов пехоты§! с §Yинженерами§! и §Yразведкой§! будут сформированы в §YЭйн-Тротгуре§!."
diff --git a/localisation/russian/country_HLR_l_russian.yml b/localisation/russian/country_HLR_l_russian.yml
index 0ca3e69344a..6e702a7043d 100644
--- a/localisation/russian/country_HLR_l_russian.yml
+++ b/localisation/russian/country_HLR_l_russian.yml
@@ -314,7 +314,7 @@ HLR_northerntribes_peace:0 "Пригласить Фиану"
 HLR_northerntribes_peace_desc:0 "На западе находятся Северные племена, королевство, которым управляет [NTR.GetLeader]. Альянс с ними был бы весьма привлекательным. Их столица, Эверфрост, является вторым по величине городом на севере с богатой промышленностью. Их территория полна лесов и холмов, что обеспечивает много возможностей для обороны. Наконец, их монарх верен принципам гармонии и являются нашим естественным союзником."
 
 HLR_convert_maar_supporters:0 "Вторая священная лига"
-HLR_convert_maar_supporters_desc:0 "Теперь, когда наши альянсы укреплены, из-за рубежа начали прибывать волонтеры. Эти свежие рекруты дадут возможность сформировать вторую Священную лигу по образу первой.\n\n Однако, новобранцы родом из разных земель - они могут принести с собой радикальные идеи, что является проблемой."
+HLR_convert_maar_supporters_desc:0 "Теперь, когда наши альянсы укреплены, из-за рубежа начали прибывать добровольцы. Эти свежие рекруты дадут возможность сформировать вторую Священную лигу по образу первой.\n\n Однако, новобранцы родом из разных земель - они могут принести с собой радикальные идеи, что является проблемой."
 
 ###PI Political - Non-Aligned (Aka the one with the less hot gryphon)
 HLR_Nonallign:0 "Подтверждение наших убеждений"
diff --git a/localisation/russian/country_JUN_l_russian.yml b/localisation/russian/country_JUN_l_russian.yml
index 1b59ac9b4ae..e8b39d08be4 100644
--- a/localisation/russian/country_JUN_l_russian.yml
+++ b/localisation/russian/country_JUN_l_russian.yml
@@ -282,7 +282,7 @@ jungle.5.d:0 "Вода - важнейший ресурс для любой ци
 jungle.5.a:0 "Разве эти каналы не прекрасны?"
 
 jungle.6.t:0 "Удивительное открытие"
-jungle.6.d:0 "Восстановление старых руин было нелегкой задачей, я это прекрасно знал. Со старыми, грубыми и неровными камнями трудно работать. Я боялся, что этого будет больше проблем, чем пользы.\n\nПока однажды мы не натолкнулись на секретную камеру в одних руинах. Она была полна невероятных богатств, и на этот раз никакие противные авантюристы не помешали мне претендовать на добычу. Местные жители были правы, когда сказали нам исследовать это место. Я могу лишь задаться вопросом, возможно ли, что они хотели, чтобы мы нашли эти сокровища? Тем не менее, открытие подняло настроение пони, и казалось, что все предыдущие неудобства просто забылись, и работа продолжалась без помех.\n\nСо всеми этими новыми зданиями и сокровищами нация становится всё более и более перспективной для меня."
+jungle.6.d:0 "Восстановление старых руин было нелегкой задачей, я это прекрасно знал. Со старыми, грубыми и неровными камнями трудно работать. Я боялся, что от этого будет больше проблем, чем пользы.\n\nПока однажды мы не натолкнулись на секретную камеру в одних руинах. Она была полна невероятных богатств, и на этот раз никакие противные авантюристы не помешали мне претендовать на добычу. Местные жители были правы, когда сказали нам исследовать это место. Я могу лишь задаться вопросом, возможно ли, что они хотели, чтобы мы нашли эти сокровища? Тем не менее, открытие подняло настроение пони, и казалось, что все предыдущие неудобства просто забылись, и работа продолжалась без помех.\n\nСо всеми этими новыми зданиями и сокровищами нация становится всё более и более перспективной для меня."
 jungle.6.a:0 "Золото, драгоценные камни и многое другое!"
 
 jungle.7.t:0 "Жалобы местных"
@@ -294,7 +294,7 @@ jungle.8.d:0 "Война окончена, пули больше не свист
 jungle.8.a:0 "Ну ... думаю, теперь я диктатор"
 
 jungle.9.t:0 "Встреча с главами профсоюзов"
-jungle.9.d:0 "С тяжёлым сердцем я иду на эту встречу с Голден Делишесом и прочими представителями профсоюза. Я видел, но что способны эти пони и не уверен, чего ожидать от них.\n\nНо переговоры прошли просто отлично, не о чём сожалеть. И хотя я нахожу их разговоры о населении или рабочих весьма утомительными, я могу понять их точку зрения. Мои пони нуждаются в организации, и, кажется, эти профсоюзы могут предоставить мне именно это. И они, очевидно, хотят сохранить свою собственную идеологию. По крайней мере, их нельзя назвать радикалами, как некоторых других, что идёт в плюс.\n\nХотя эта дискуссия была успешной, нам ещё многое предстоит сделать, прежде чем будут достигнуты реальные результаты. Но я должен сказать, что приятно удивлен."
+jungle.9.d:0 "С тяжёлым сердцем я иду на эту встречу с Голден Делишесом и прочими представителями профсоюза. Я видел, на что способны эти пони и не уверен, чего ожидать от них.\n\nНо переговоры прошли просто отлично, не о чём сожалеть. И хотя я нахожу их разговоры о населении или рабочих весьма утомительными, я могу понять их точку зрения. Мои пони нуждаются в организации, и, кажется, эти профсоюзы могут предоставить мне именно это. И они, очевидно, хотят сохранить свою собственную идеологию. По крайней мере, их нельзя назвать радикалами, как некоторых других, что идёт в плюс.\n\nХотя эта дискуссия была успешной, нам ещё многое предстоит сделать, прежде чем будут достигнуты реальные результаты. Но я должен сказать, что приятно удивлен."
 jungle.9.a:0 "Всё-таки они в целом разумные пони"
 
 jungle.10.t:0 "Встреча с верховными вождями"
diff --git a/localisation/russian/country_KIR_PSOL_alerts_l_russian.yml b/localisation/russian/country_KIR_PSOL_alerts_l_russian.yml
index 4b97eb04f4d..064ae860125 100644
--- a/localisation/russian/country_KIR_PSOL_alerts_l_russian.yml
+++ b/localisation/russian/country_KIR_PSOL_alerts_l_russian.yml
@@ -12,25 +12,25 @@
  KIR_PSOL_alerticon_8_tt:0 "[!KIR_PSOL_alerticon_8_click]"
 
  #The text for your alerts. Some of them include named data scripted loc and require additional processing in their scripted loc reference. 
- KIR_PSOL_alerticon_title_1:0 "§YNo Ruling Party§! - Provincial Diet"
- KIR_PSOL_alerticon_title_1_desc:0 "Provincial Diets with no Ruling Party: [THIS.KIR_PSOL_alert_location_array_recursive_loc_1]"
- KIR_PSOL_alerticon_title_2:0 "§YChoose New Ruling Party§! - Provincial Diet"
- KIR_PSOL_alerticon_title_2_desc:0 "We can choose a new Ruling Party for: [THIS.KIR_PSOL_alert_location_array_recursive_loc_2]"
- KIR_PSOL_alerticon_title_3:0 "§YSuspended Provincial Diet§!"
- KIR_PSOL_alerticon_title_3_desc:0 "Suspended Provincial Diets: [THIS.KIR_PSOL_alert_location_array_recursive_loc_3]"
- KIR_PSOL_alerticon_title_4:0 "§YNo Ruling Party§! - Mayoralty"
- KIR_PSOL_alerticon_title_4_desc:0 "Mayoralties with no Ruling Party: [THIS.KIR_PSOL_alert_location_array_recursive_loc_4]"
- KIR_PSOL_alerticon_title_5:0 "§YChoose New Ruling Party§! - Mayoralty"
- KIR_PSOL_alerticon_title_5_desc:0 "We can choose a new Ruling Party for: [THIS.KIR_PSOL_alert_location_array_recursive_loc_5]"
+ KIR_PSOL_alerticon_title_1:0 "§YНет правящей партии§! - Провинциальный парламент"
+ KIR_PSOL_alerticon_title_1_desc:0 "Провинциальные парламенты без правящей партии: [THIS.KIR_PSOL_alert_location_array_recursive_loc_1]"
+ KIR_PSOL_alerticon_title_2:0 "§YВыберете новую правящую партию§! - Провинциальный парламент"
+ KIR_PSOL_alerticon_title_2_desc:0 "Мы можем выбрать новую правящую партию для: [THIS.KIR_PSOL_alert_location_array_recursive_loc_2]"
+ KIR_PSOL_alerticon_title_3:0 "§YПриостановленный провинциальный парламент§!"
+ KIR_PSOL_alerticon_title_3_desc:0 "Приостановленные провинциальные парламенты: [THIS.KIR_PSOL_alert_location_array_recursive_loc_3]"
+ KIR_PSOL_alerticon_title_4:0 "§YНет правящей партии§! - Муниципалитет"
+ KIR_PSOL_alerticon_title_4_desc:0 "Муниципалитеты без правящей партии: [THIS.KIR_PSOL_alert_location_array_recursive_loc_4]"
+ KIR_PSOL_alerticon_title_5:0 "§YВыберете новую правящую партию§! - Муниципалитет"
+ KIR_PSOL_alerticon_title_5_desc:0 "Мы можем выбрать новую правящую партию для: [THIS.KIR_PSOL_alert_location_array_recursive_loc_5]"
 
- KIR_PSOL_alert_location_array_recursive_loc_1_tt:0 "\n - §Y[?KIR_PSOL_alert_location_array_recursive_loc_temp_var_1.GetName]§! Provincial Diet[THIS.KIR_PSOL_alert_location_array_recursive_loc_1]"
- KIR_PSOL_alert_location_array_recursive_loc_2_tt:0 "\n - §Y[?KIR_PSOL_alert_location_array_recursive_loc_temp_var_2.GetName]§! Provincial Diet\nIncumbency will end in ([?KIR_PSOL_alert_location_array_recursive_loc_temp_var_2:KIR_STATE_SGUI_PALACE_TERM_REMOVAL_TIMER|Y0]) days.[THIS.KIR_PSOL_alert_location_array_recursive_loc_2]" #Add for each recursive alert type
- KIR_PSOL_alert_location_array_recursive_loc_3_tt:0 "\n - §Y[?KIR_PSOL_alert_location_array_recursive_loc_temp_var_3.GetName]§! Provincial Diet[THIS.KIR_PSOL_alert_location_array_recursive_loc_3]"
- KIR_PSOL_alert_location_array_recursive_loc_4_tt:0 "\n - §Y[?KIR_PSOL_alert_location_array_recursive_loc_temp_var_4.GetCapitalVictoryPointName]§! Mayoralty[THIS.KIR_PSOL_alert_location_array_recursive_loc_4]"
- KIR_PSOL_alert_location_array_recursive_loc_5_tt:0 "\n - §Y[?KIR_PSOL_alert_location_array_recursive_loc_temp_var_5.GetCapitalVictoryPointName]§! Mayoralty\nIncumbency will end in ([?KIR_PSOL_alert_location_array_recursive_loc_temp_var_5:KIR_STATE_SGUI_PALACE_TERM_REMOVAL_TIMER|Y0]) days.[THIS.KIR_PSOL_alert_location_array_recursive_loc_5]" #Add for each recursive alert type
+ KIR_PSOL_alert_location_array_recursive_loc_1_tt:0 "\n - §Y[?KIR_PSOL_alert_location_array_recursive_loc_temp_var_1.GetName]§! Провинциальный парламент[THIS.KIR_PSOL_alert_location_array_recursive_loc_1]"
+ KIR_PSOL_alert_location_array_recursive_loc_2_tt:0 "\n - §Y[?KIR_PSOL_alert_location_array_recursive_loc_temp_var_2.GetName]§! Провинциальный парламентt\nСрок полномочий закончится через ([?KIR_PSOL_alert_location_array_recursive_loc_temp_var_2:KIR_STATE_SGUI_PALACE_TERM_REMOVAL_TIMER|Y0]) дней.[THIS.KIR_PSOL_alert_location_array_recursive_loc_2]" #Add for each recursive alert type
+ KIR_PSOL_alert_location_array_recursive_loc_3_tt:0 "\n - §Y[?KIR_PSOL_alert_location_array_recursive_loc_temp_var_3.GetName]§! Провинциальный парламент[THIS.KIR_PSOL_alert_location_array_recursive_loc_3]"
+ KIR_PSOL_alert_location_array_recursive_loc_4_tt:0 "\n - §Y[?KIR_PSOL_alert_location_array_recursive_loc_temp_var_4.GetCapitalVictoryPointName]§! Муниципалитет[THIS.KIR_PSOL_alert_location_array_recursive_loc_4]"
+ KIR_PSOL_alert_location_array_recursive_loc_5_tt:0 "\n - §Y[?KIR_PSOL_alert_location_array_recursive_loc_temp_var_5.GetCapitalVictoryPointName]§! Муниципалитет\nСрок полномочий закончится через ([?KIR_PSOL_alert_location_array_recursive_loc_temp_var_5:KIR_STATE_SGUI_PALACE_TERM_REMOVAL_TIMER|Y0]) дней.[THIS.KIR_PSOL_alert_location_array_recursive_loc_5]" #Add for each recursive alert type
  KIR_PSOL_alert_none:0 ""
 
- KIR_PSOL_alerticon_tt_delayed:0 "[THIS.KIR_PSOL_alerticon_title_desc]\n\n§GClick to go to the next Province.\nRight-click to dismiss.§!"
- KIR_PSOL_alerticon_tt_delayed_desc:0 "§GRight-click to dismiss.§!"
+ KIR_PSOL_alerticon_tt_delayed:0 "[THIS.KIR_PSOL_alerticon_title_desc]\n\n§GНажмите, чтобы перейти к следующей провинции.\nНажмите правой кнопкой мыши, чтобы убрать предупреждение.§!"
+ KIR_PSOL_alerticon_tt_delayed_desc:0 "§GНажмите правой кнопкой мыши, чтобы убрать предупреждение.§!"
  
  ## Backend Code for Custom Alerts SGUI courtesy of Sozin (Fire-Lord-Sozin#1846) from the EaW submod Pax Solaris, used with permission. Many thanks - Caspy.
\ No newline at end of file
diff --git a/localisation/russian/country_KIR_l_russian.yml b/localisation/russian/country_KIR_l_russian.yml
index e5c9054ff0c..b88fef445c6 100644
--- a/localisation/russian/country_KIR_l_russian.yml
+++ b/localisation/russian/country_KIR_l_russian.yml
@@ -13,7 +13,7 @@ KIR_focus_3a_desc:0 "Если Царство хочет преодолеть у
 KIR_focus_3b:0 "3½-летний план"
 KIR_focus_3b_desc:0 "Глубокая модернизация Кирии принесёт с собой хаос, и потому не может продолжаться долго. Матриарх провозгласила "великий скачок вперёд", стремясь за три с половиной года нагнать целый век утерянного прогресса. Пленуму придётся осторожно контролировать бурные волны трансформации нашего общества и культуры, чтобы Кирия вышла невредимой из этой грубой и поспешной метаморфозы."
 KIR_focus_3d:0 "Бюро реформ"
-KIR_focus_3d_desc:0 "Бюро реформ - это централизованный исполнительный орган, созданный для Всекиринского Пленума Национального Возрождения, которому сама матриарх предоставила ограниченный объём особых полномочий. Он служит центральным руководящим аппаратом быстро меняющегося Царства, и именно здесь разрабатываются и доводятся до ума проекты законопроектов перед тем, как они попадут к Рейн Шайн."
+KIR_focus_3d_desc:0 "Бюро реформ - это централизованный исполнительный орган, созданный для Всекиринского Пленума Национального Возрождения, которому сама матриарх предоставила ограниченный объём особых полномочий. Он служит центральным управляющим аппаратом быстро меняющегося Царства, и именно здесь разрабатываются и доводятся до ума проекты законопроектов перед тем, как они попадут к Рейн Шайн."
 KIR_focus_3e:0 "Восстановить владычество"
 KIR_focus_3e_desc:0 "В течение столетия удушающая хватка Безмолвия чувствовалась в Царстве Кирия, и абсолютная власть династии ослабевала по всей стране, поскольку все контакты с Киноварью попросту прекратились. Новая серия царских указов и подтверждение божественной власти матриарха Рейн Шайн начнут восстанавливать её власть над страной, хотя некоторые могут быть недовольны возобновлением нашего правления."
 KIR_focus_4a:0 "Обратиться к диаспоре"
@@ -21,7 +21,7 @@ KIR_focus_4a_desc:0 "С самого начала Безмолвия некот
 KIR_focus_4e:0 "При дворе Киновари"
 KIR_focus_4e_desc:0 "Делегаты на Пленуме начали объединяться в различные фракции, со своими собственными идеями и программами относительно модернизации Кирии, весьма далёкими от неоднородной смеси идей и опыта, на которую изначально надеялась наша матриарх. Однако же и эти три партии, новообразованные на Пленуме, являлись гласом не всех её подданных..."
 KIR_focus_4f:0 "Служба связи"
-KIR_focus_4f_desc:0 "Понимая невозможность посещения столицы каждым кирином Царства, желающим поделиться своими идеями и жалобами с верховному матриарху, Рейн Шайн распорядилась учредить службу связи, которая будет получать письма и обращения от её подданных и доводить их до её непосредственного сведения, чтобы они могли обсуждаться во время собраний Пленума."
+KIR_focus_4f_desc:0 "Понимая невозможность посещения столицы каждым кирином Царства, желающим поделиться своими идеями и жалобами к верховному матриарху, Рейн Шайн распорядилась учредить службу связи, которая будет получать письма и обращения от её подданных и доводить их до её непосредственного сведения, чтобы они могли обсуждаться во время собраний Пленума."
 KIR_focus_6b:0 "Переселить кирийских репатриантов"
 KIR_focus_6b_desc:0 "Возвращающихся домой давно потерянным сыновьям и дочерям Кирии нужно обеспечить крышей над головой. К счастью, в нашем Царстве множество незанятых территорий, и большинство посёлков и городов мало населены, а это значит, что найти дома для представителей диаспоры будет легко. Дополнительным преимуществом этого является повышение среднего уровня грамотности в наших населенных пунктах, даже если это даст рост потенциально подрывным иностранным идеям."
 KIR_focus_6c:0 "Совет Медной Ротонды"
@@ -53,7 +53,7 @@ KIR_focus_5c_desc:0 "Усилия Пленума по модернизации 
 KIR_focus_6h:0 "Северная промышленность"
 KIR_focus_6h_desc:0 "Благоухание и Рапсодия были двумя важными бастионами модернизации до Безмолвия, и оба города в разной степени сопротивлялись навязыванию этого режима, закладывая семена для будущих усилий по модернизации. Теперь они станут одними из первых городов, извлекающих выгоду из возобновления модернизации, и там уже заложены новые промышленные мегакомплексы, чтобы максимально использовать такие изменения."
 KIR_focus_6a:0 "Аграрная консолидация"
-KIR_focus_6a_desc:0 "Когда кирины переехали из городов в начале Безмолвия, они основали фермерские хозяйства по всей сельской местности, где только смогли найти землю. Большинство этих хозяйств небольшие и неэффективные, полностью зависящие от ручного труда при выращивании любых культур. Объединение кластеров этих ферм под руководством одного управляющего и внедрение современной сельскохозяйственной техники повысит их производительность и освободит ценные земли."
+KIR_focus_6a_desc:0 "Когда кирины переехали из городов в начале Безмолвия, они основали фермерские хозяйства по всей сельской местности, где только смогли найти землю. Большинство этих хозяйств небольшие и неэффективные, полностью зависящие от копытного труда при выращивании любых культур. Объединение кластеров этих ферм под контролем одного управляющего и внедрение современной сельскохозяйственной техники повысит их производительность и освободит ценные земли."
 KIR_focus_7c:0 "Речная экономика"
 KIR_focus_7c_desc:0 "Медоносная - это кровеносная система и колыбель Кирии. Эта река соединяет отдалённые поселки, обеспечивая при этом плодородную почву для сельскохозяйственных угодий между ними. Инвестиции в приречную экономику значительно укрепят мощь нашей нации, что позволит нам обеспечить бурный рост бизнеса в наших центральных районах, и тем самым мы обеспечим процветание всего Царства."
 KIR_focus_8b:0 "Открыть наши гавани"
@@ -153,7 +153,7 @@ KIR_POST_4B_tt:0 "В качестве §Cполитической синархи
 KIR_POST_4C:0 "Двухсистемные суды" ## RHP stronghold
 KIR_POST_4C_desc:0 "Мы должны умерить свою жгучую страсть ко всему современному, проявляя должное уважение к вековым традициям и институтам Кирии. Потому мы начнём поэтапное введение светских судов общей юрисдикции, действующих на основе смешанной правовой системы, включающей элементы общего права Эквестрии и гражданского кодекса грифонов. Система судебных разбирательств с храмовыми жрицами и магистратами в соответствии с законами Пути Огня и Священными Писаниями будет сохранена, и ей будет предоставлен равный и защищенный статус."
 #KIR_POST_4C_tt:0 "The province of §Y[1060.GetName]§! becomes a §GStronghold§! of the §CProcurate of Rhapsody§!.\n\nThe £pol_power  Political Power cost to select the §YRealm and Harmony Party§! (§YConcord Caucus§!) or the §YCircle of Serene Tendency§! as the §YProvincial Ruling Party§! in [1060.GetName] decreases by §G-66%§!, but the £pol_power  Political Power cost of selecting other Political Parties increases by §R+100%§!."
-KIR_POST_4C_tt:0 "§Y[1060.GetName]§! станет §Gоплотом§! §Cпрокуратуры Рапсодии§!.\n§Y[1060.GetName]§! Провинциальные парламенты:\n   Цена §YПартия за Царство и Гармонию§! (§Yфракция Конкорд§!) Cost: §G-66%§!\n   Цена §YКруга безмятежных§!: §G-66%§!\n   Цена для других партий: §R+100%§!"
+KIR_POST_4C_tt:0 "§Y[1060.GetName]§! станет §Gоплотом§! §Cпрокуратуры Рапсодии§!.\n§Y[1060.GetName]§! Провинциальные парламенты:\n   Цена §YПартия за Царство и Гармонию§! (§Yфракция Конкорд§!) Цена: §G-66%§!\n   Цена §YКруга безмятежных§!: §G-66%§!\n   Цена для других партий: §R+100%§!"
 KIR_POST_4D:0 "Комиссия по земельным ресурсам Царства"
 KIR_POST_4D_desc:0 "Стремительная индустриализация Царства требует огромного количества природных ресурсов, а также земли, на которой можно строить новые фабрики и промышленные комплексы, наряду со всей сопутствующей инфраструктурой для поддержания новой экономики. Земельная комиссия получит предусмотренные законом полномочия по поиску и приобретению территорий для застройки и добычи ресурсов."
 KIR_POST_4E:0 "Отечественные корпорации"
@@ -180,7 +180,7 @@ KIR_POST_5C:0 "Учреждение мирового класса" ##recruit new
 KIR_POST_5C_desc:0 "Всекирийская коллегия доказала свою состоятельность в качестве ключевого двигателя научно-технической модернизации Кирии. Потому ей необходимо выделить больше средств и поддержки, чтобы сделать это академическое учреждение не просто национальным или региональным, но и глобальным поводом для гордости у Кирии и её народа."
 KIR_POST_5D:0 "Ресурсы Царства"
 KIR_POST_5D_desc:0 "Обширное Царство имеет множество нетронутых природных ресурсов, оставленных без внимания из-за Безмолвия. Теперь, когда Великий Скачок Вперёд закончился, мы можем позволить себе сделать шаг назад и провести углубленные исследования, чтобы оценить, каким ресурсам следует уделять приоритетное внимание при разведке и добыче."
-KIR_POST_5D_tt:0 "Даёт доступ к £decision_icon_small механике решений §YКаолин Нэшнл - департамент распределения ресурсов§!, позволяющей нам §Gувеличить эффективность добычи ресурсов§! благодаря §Yгражданским фабрикам§! и §Yзаводам по производству синтетического топлива§!."
+KIR_POST_5D_tt:0 "Даёт доступ к £decision_icon_small механике решений §YКаолин Нэшнл - департамент распределения ресурсов§!, позволяющей нам §Gувеличить эффективность увеличения ресурсов§! благодаря §Yгражданским фабрикам§! и §Yзаводам по производству синтетического топлива§!."
 KIR_POST_6A:0 "Земля гармонии" ##increase RaHP party cap, move up science
 KIR_POST_6A_desc:0 "Отэм Блейз успешно вывела Кирию из Безмолвия, в процессе переделывая Царство в соответствии с её гармоничным видением и идеалами. Сегодняшняя Кирия — не только современная и индустриализированная, но и демократичная, гармоничная и прогрессивная - эти характеристики навсегда будут нашей новой Кирии."
 KIR_POST_6A_tt:0 "Партийная популярность §Yгармонистов§! никогда не упадёт ниже §Y25%§!.\nКоличество §Yпровинциальных парламентов§! [KIRGetMayoralties] занимаемых §YПартией за Царство и Гармонию§! увеличится на §G+1§!."
@@ -195,7 +195,7 @@ KIR_POST_6B_tt:0 "Активирует £decision_icon_small механику р
 KIR_guardian_of_zebrica:0 "Защитник гармонии"
 KIR_guardian_of_zebrica_desc:0 "[Root.GetNameDefCap], успешно преодолела все проблемы §RБезмолвия§!, и готова взять на себя благородный долг по защите §PГармонии§! в Зебрике. Кирия мобилизует свои огромные промышленные и военные ресурсы для обеспечения безопасности §PГармонии§! от §Rэкстремистов§!  — таким образом устанавливая деликатный баланс между §Cпорядком§! и §Oхаосом§! на континенте."
 KIR_demand_disarmament:0 "Потребовать [FROM.GetAdjective]ого разоружения"
-KIR_demand_disarmament_desc:0 "[FROM.GetAdjective]ая агрессия зашла слишком далеко. Их амбиции представляют угрозу гармонии, и мы обязаны обуздать их, чтобы сохранить мир и свободу в Зебрике.\n\n§W§Y[FROM.GetNameDefCap]§! соответствует как минимум [?KIR.KIR_demand_disarmament_threshold|Y0] нашим критериям для обоснования §Oвоенной интервенции§! против них:\n[FROM.GetKIRDemandDisarmamentReq]\n[FROM.GetKIRDemandDisarmamentReqA]\n[FROM.GetKIRDemandDisarmamentReqB]\n[FROM.GetKIRDemandDisarmamentReqH]\n[FROM.GetKIRDemandDisarmamentReqE]\n[FROM.GetKIRDemandDisarmamentReqF]\n[FROM.GetKIRDemandDisarmamentReqG]\n[FROM.GetKIRDemandDisarmamentReqC]\n[FROM.GetKIRDemandDisarmamentReqD]§!"
+KIR_demand_disarmament_desc:0 "[FROM.GetAdjective]ая агрессия зашла слишком далеко. Их амбиции представляют угрозу гармонии, и мы обязаны обуздать их, чтобы сохранить мир и свободу в Зебрике.\n\n§W§Y[FROM.GetNameDefCap]§! соответствует как минимум [?KIR.KIR_demand_disarmament_threshold|Y0] нашим критериям для обоснования §Oвоенной интервенции§! против них:\n[FROM.GetKIRDemandDisarmamentReq]\n[FROM.GetKIRDemandDisarmamentReqA]\n[FROM.GetKIRDemandDisarmamentReqB]\n[FROM.GetKIRDemandDisarmamentReqH]\n[FROM.GetKIRDemandDisarmamentReqE]\n[FROM.GetKIRDemandDisarmamentReqF]\n[FROM.GetKIRDemandDisarmamentReqG]\n[FROM.GetKIRDemandDisarmamentReqC]\n[FROM.GetKIRDemandDisarmamentReqD]\n[FROM.GetKIRDemandDisarmamentReqI]§!"
 reduce_army_size_KIR:0 "Соблюдение соглашения о разоружении"
 reduce_army_size_KIR_desc:0 "В результате напряжённых переговоров с кирийскими дипломатами был составлен жёсткий трехмесячный график частичного разоружения и демобилизации наших вооружённых сил. Невыполнение графика приведёт к эскалации напряжённости: мы должны либо выполнять свои обязанности в соответствии с графиком, либо использовать оставшееся время для подготовки к войне с Кирией."
 reduce_army_size_KIR_req_tt:0 "Общее количество фронтовых батальонов и рот поддержки, развернутых в наших дивизиях ([?num_battalions|Y*0]) должно быть §Oменьше§! или же §Oравно§! ([?army_size_reduction_KIR|Y*0]). Батальоны и роты, дислоцированные в гарнизонах, не включены в этот расчёт."
@@ -219,6 +219,8 @@ KIR_demand_disarmament_req_G_Y:0 "   £trigger_yes  Имеет армию §Yб
 KIR_demand_disarmament_req_G_N:0 "   £trigger_no  Имеет армию §Yбольше§! чем у Кирии"
 KIR_demand_disarmament_req_H_Y:0 "   £trigger_yes  Жестоко угнетает другую страну"
 KIR_demand_disarmament_req_H_N:0 "   £trigger_no  Жестоко угнетает другую страну"
+KIR_demand_disarmament_req_I_Y:0 "   £trigger_yes  §YАгрессор§! в войне против другой страны"
+KIR_demand_disarmament_req_I_N:0 "   £trigger_no  §YАгрессор§! в войне против другой страны"
 
 KIR_POST_7:0 "Восемь золотых муниципалитетов"
 KIR_POST_7_desc:0 "Оживленные городские центры Царства являются главными источниками модернизации и индустриализации Кирии. Однако города сталкиваются с уникальными проблемами управления, и потому премьер-министр создаст новые муниципальные органы власти с широкими полномочиями по самоуправлению в пределах их соответствующих юрисдикций. Эти новые должности мэров позволят киринам городов Кирии стать на шаг ближе к настоящей демократии."
@@ -281,7 +283,7 @@ KIR_POST_COM_X:0 "Извиниться перед Райзин Сан"
 KIR_POST_COM_X_desc:0 "Райзин Сан и верные ей кирины Запада были исключены из Пленума в критический момент истории Царства. Это действие было ошибкой, и хотя мы никогда не сможем полностью искупить свою вину, по крайней мере, правительство может начать попытки примирения с Разгорающимся Пламенем."
 KIR_POST_COM_1:0 "Дай же нам Хлеб наш насущный" #move up industry. welfare programme tt, prevents poverty
 KIR_POST_COM_1_desc:0 "Бедность в Кирии почти повсеместна, и из-за быстрого перемещения крестьян в города ситуация становится всё хуже. Мы должны начать заботиться о своём народе, даже если этот процесс будет медленным и дорогостоящим."
-KIR_POST_COM_1_tt:0 "Мы запустим §Yсоциальные программы§! для §Gоказания помощи нуждающимся§! и борьбы с §Rбедностью§!.\n\n"
+KIR_POST_COM_1_tt:0 "Мы запустим §Yсоциальные программы§! для §Gоказания помощи нуждающимся§! и борьбы с §Rбедностью§!.\n"
 KIR_POST_COM_2A:0 "За землю и труд давайте бороться вместе!" ##one struggle, MWPK and peasants unity and LLL Synarchy
 KIR_POST_COM_2A_desc:0 "Потребности городской и сельской бедноты различны, но их объединяет общее желание: улучшить условия для рабочего класса. Таким образом, между тремя крупнейшими левыми партиями Кирии назревает альянс, объединяющий их разрозненные базы в мощный политический блок."
 KIR_POST_COM_2A_tt:0 "§YБорьба рабочих§! и §Yкрестьян§! станет §Gединой§!, и §Cпрогрессивное движение§! объединится с ними в качестве акта солидарности!\n\nСтанут §Yдоступными§! в качестве §Cполитической синархии§! между провинциальными парламентами и муниципалитетами:\n§CЛига за Труд и Свободу§!, являющейся объединением §Yдвижения за современную Кирию§! (§Yблок прогрессивистов§!) и §YВсекирийского союза фермеров и крестьян§!, а также §YМарксистской рабочей партии Кирии§!."
@@ -359,7 +361,7 @@ KIR_STATE_H1_Ideology_1_tt:0 "Гармоничный либерализм"
 KIR_STATE_H1_PALACE_STATE_tt:0 "§YПартия за Царство и Гармонию§! [KIRGetH1Radical]\nОбщий бонус для получения ежедневной политической власти: §G+[?ROOT.KIR_CONSOCSYS_political_power_gain|2]§!\nОбщий бонус к приросту популярности гармонии (§YОбъединение за гармонию§!): §G+[?ROOT.KIR_CONSOCSYS_democratic_drift|2]§!\nКоличество занимаемых §Yпровинциальных парламентов§![KIRGetMayoralties]: (§Y[?ROOT.KIR_STATE_H1_PALACE_NUM]§!)\n\n"
 KIR_STATE_H1_PALACE_MENU_tt:0 "§YПартия за Царство и Гармонию§! [KIRGetH1Radical]\nБонус к приросту политической власти: §G+[?ROOT.KIR_CONSOCSYS_political_power_gain_var|2]§!\nБонус к приросту популярности гармонии: §G+0.01§!\n\n"
 KIR_STATE_H1_PALACE_SELECTED_tt:0 "[THIS.KIRGetPartyH1Selected][!KIR_STATE_H1_PALACE_BUTTON_click][!KIR_STATE_H1_PALACE_BUTTON_click_enabled]\n\n"
-KIR_STATE_H1_desc_tt:0 "Party Ideology: §Y[THIS.KIRGetH1Ideology]§!\nПолитический Блок: §YОбъединение за гармонию§!\nПолитические Синархии:\n  - §YПартия за Царство и Гармонию§!\n  - §YДвижение за современную Кирию§! (§YБлок прогрессивистов§!)[KIRGetH1CCSynergy][KIRGetH1LPSynergy]"
+KIR_STATE_H1_desc_tt:0 "Идеология партии: §Y[THIS.KIRGetH1Ideology]§!\nПолитический Блок: §YОбъединение за гармонию§!\nПолитические Синархии:\n  - §YПартия за Царство и Гармонию§!\n  - §YДвижение за современную Кирию§! (§YБлок прогрессивистов§!)[KIRGetH1CCSynergy][KIRGetH1LPSynergy]"
 KIR_STATE_H1_YAMEN_MENU_tt:0 "§YПартия за Царство и Гармонию§! [KIRGetH1Radical]\nБонус к ежедневному приросту политической власти: §G+[?ROOT.KIR_CONSOCSYS_YAMEN_political_power_gain_var|2]§!\nБонус к приросту популярности гармонии: §G+0.01§![KIRGetH1Synergy]\n\n[!KIR_STATE_H1_YAMEN_BUTTON_click_enabled]"
 KIR_YAMEN_H1_SYNERGY_tt:0 "\n\n§CПарламентско-муниципалитетская синархия§! [GetH1SynergyLink]\n[KIRGetPalaceSynergy]"
 KIR_PALACE_H1_SYNERGY_tt:0 "Бонус к ежедневному приросту политической власти: §G+[?ROOT.KIR_CONSOCSYS_SYNERGY_political_power_gain_var|2]§!"
@@ -467,7 +469,7 @@ KIR_PALACE_C1_SYNERGY_tt:0 "Бонус к фактору военнообяза
 
 KIR_STATE_C2_PALACE_tt:0 "ВСФК"
 KIR_STATE_C2_NAME_tt:0 "§YВсекирийский союз фермеров и крестьян§!"
-KIR_STATE_C2_PALACE_STATE_tt:0 "§Всекирийский союз фермеров и крестьян§!\nОбщий бонус к ежемесячному приросту населения: §G+[?ROOT.KIR_CONSOCSYS_monthly_population|1%]§!\nОбщий бонус к приросту популярности коммунизма (§YПробуждённая Кирия§!): §Y+[?ROOT.KIR_CONSOCSYS_communism_drift|2]§!\nКоличество занимаемых §Yпровинциальных парламентов§![KIRGetMayoralties]: (§Y[?ROOT.KIR_STATE_C2_PALACE_NUM]§!)\n\n"
+KIR_STATE_C2_PALACE_STATE_tt:0 "§YВсекирийский союз фермеров и крестьян§!\nОбщий бонус к ежемесячному приросту населения: §G+[?ROOT.KIR_CONSOCSYS_monthly_population|1%]§!\nОбщий бонус к приросту популярности коммунизма (§YПробуждённая Кирия§!): §Y+[?ROOT.KIR_CONSOCSYS_communism_drift|2]§!\nКоличество занимаемых §Yпровинциальных парламентов§![KIRGetMayoralties]: (§Y[?ROOT.KIR_STATE_C2_PALACE_NUM]§!)\n\n"
 KIR_STATE_C2_PALACE_BUTTON_click_enabled_tt:0 "Количество занимаемых §YВсекирийским союзом фермеров и крестьян§! §Yпровинциальных парламентов§![KIRGetMayoralties] ([?ROOT.KIR_STATE_C2_PALACE_NUM|Y0]) меньше чем ([?ROOT.KIR_STATE_C2_PALACE_NUM_CAP|Y0]).\n\n[KIRGetC23PalaceCost]"
 KIR_STATE_C2_PALACE_MENU_tt:0 "§YВсекирийский союз фермеров и крестьян§!\nБонус к ежемесячному приросту населения: §G+[?ROOT.KIR_CONSOCSYS_monthly_population_var|1%]§!\nБонус к приросту популярности коммунизма: §Y+0.01§!\n\n"
 KIR_STATE_C2_PALACE_SELECTED_tt:0 "[THIS.KIRGetPartyC2Selected][!KIR_STATE_C2_PALACE_BUTTON_click][!KIR_STATE_C2_PALACE_BUTTON_click_enabled]\n\n"
@@ -536,11 +538,11 @@ KIR_STATE_PALACE_COST_RHP_EXCLUDED_blocked_tt:0 "Так как [THIS.GetName] я
 KIR_STATE_PALACE_COST_MMK_EXCLUDED_tt:0 "Так как [THIS.GetName] является §Rфорпостом§! §YДвижения за современную Кирию§!, это действие будет стоить £pol_power  [?KIR.KIR_STATE_PALACE_COST_EXCLUDED_VAR|*0Y]."
 KIR_STATE_PALACE_COST_MMK_EXCLUDED_blocked_tt:0 "Так как [THIS.GetName] является §Rфорпостом§! §YДвижения за современную Кирию§!, это действие будет стоить £pol_power  [?KIR.KIR_STATE_PALACE_COST_EXCLUDED_VAR|*0R]."
 
-KIR_STATE_WoF_Exclusion_tt:0 " Открывается фокусом: §YA MultiDenominational Confessional State§!."
-KIR_STATE_RF_Exclusion_tt:0 " Открывается фокусом: §YA MultiDenominational Confessional State§!."
-KIR_STATE_PEASANT_Exclusion_tt:0 " Открывается фокусом: §YFor Land and Labour, Let's Fight Together!§!"
-KIR_STATE_WORKER_Exclusion_tt:0 " Открывается фокусом: §YFor Land and Labour, Let's Fight Together!§!"
-KIR_STATE_NAKP_Exclusion_tt:0 " Открывается фокусом: §YThe Patriotic Renewal§!."
+KIR_STATE_WoF_Exclusion_tt:0 " Открывается фокусом: §YМногоконфессиональное государство§!."
+KIR_STATE_RF_Exclusion_tt:0 " Открывается фокусом: §YМногоконфессиональное государство§!."
+KIR_STATE_PEASANT_Exclusion_tt:0 " Открывается фокусом: §YЗа землю и труд давайте бороться вместе!§!"
+KIR_STATE_WORKER_Exclusion_tt:0 " Открывается фокусом: §YЗа землю и труд давайте бороться вместе!§!"
+KIR_STATE_NAKP_Exclusion_tt:0 " Открывается фокусом: §YПатриотическое обновление§!."
 
 KIR_consociational_system:0 "Национальный Пленум провинций"
 KIR_consociational_system_desc:0 "Судебно-политическую систему Кирии после Безмолвия, вторую систему Отэм можно охарактеризовать как социально гармоничную, унитарно-децентрализованную, плюриюрисдикционную, синархическую, консоциальную, соопределяющую, многопартийную, двухпалатную парламентскую систему Согласия, а также как демократический и многоконфессионально-конфессиональный конституционный матриархат с киринской спецификой, регионалистскими особенностями, а также характеристиками теократии и высокой степенью децентрализации и местного самоуправления."
@@ -708,7 +710,7 @@ KIR_VaKA_SFDS_tt:0 "Изменит национальный дух §YУправ
 SFDS_Modifier:0 "\n§YУпрощённая схема конструкции огнестрельного оружия§!\n§YПехотное снаряжение§!:\n      £production_cost  Стоимость производства!"
 
 KIR_VAKA_category:0 "Армия Кирии и Киновари"
-KIR_VAKA_category_description:0 "§YЭшелонированная оборона§!: партизанские операции резервных сил в Западной Кирии помешают §Rвторжению врага§!. Захватчики будут вынуждены платить кровью за каждую пядь занятой земли, пока не будут окончательно разбиты молотом §Gхорошо организованного контрнаступления§!. Мы сделаем это силой армий, сформированных из мобилизованных солдат, которые будут построены вокруг профессионального ядра отборных подразделений, служащих в качестве манёвренных формирований."
+KIR_VAKA_category_description:0 "§YЭшелонированная оборона§!: партизанские операции резервных сил в Западной Кирии помешают §Rвторжению врага§!. Захватчики будут истекать кровью за каждую пядь нашей земли, пока не будут окончательно разбиты §Gхорошо организованным контрнаступлением§!. Мы сделаем это силой армий, сформированных из мобилизованных солдат, которые будут построены вокруг профессионального ядра подразделений, служащих в качестве манёвренных формирований."
 KIR_VAKA_OPERATIONS_tt:0 "<Операции>"
 KIR_VAKA_raise_territorial_guard:0 "Развернуть территориальное ополчение в [FROM.GetName]"
 KIR_VAKA_raise_territorial_guard_desc:0 "Отчаянные времена требуют отчаянных мер и мобилизация территориального ополчения не является исключением. То, что в мирное время было силами вспомогательной полиции вполне может стать нашим единственным спасением, которое позволит нам остановить наступление и защитить Верховного Матриарха."
@@ -769,7 +771,7 @@ KIRFactoryEqual_tt:0 "§Gне меньше и не больше§!"
 KIRFactoryDisproportionate_tt:0 "§Oне меньше и не больше§!"
 KIRFactoryCAN_tt:0 "§Gможем§!"
 KIRFactoryCAN_NOT_tt:0 "§Rне можем§!"
-KIR_FACTORY_RATIO_OPTIONS_TITLE_tt:0 "Установить соотношение"
+KIR_FACTORY_RATIO_OPTIONS_TITLE_tt:0 "Изменить"
 KIR_FACTORY_RATIO_1:0 "Переключить к соотношению §Y3 - 2 - 1§!:\n\n(§Y3§!) гражданские фабрики,\n(§Y2§!) военных завода,\n(§Y1§!) верфь\n\n§YНеобходимые условия:§!\n[!KIR_FACTORY_RATIO_OPTION_1_click_enabled]\n[GetKIRFactory100Cost]"
 KIR_FACTORY_RATIO_2:0 "Переключить к соотношению §Y2 - 2 - 1§!:\n\n(§Y2§!) гражданские фабрики,\n(§Y2§!) военных завода,\n(§Y1§!) верфь\n\n§YНеобходимые условия:§!\n[!KIR_FACTORY_RATIO_OPTION_2_click_enabled]\n[GetKIRFactory150Cost]"
 KIR_FACTORY_RATIO_3:0 "Переключить к соотношению §Y2 - 1 - 1§!:\n\n(§Y2§!) гражданские фабрики,\n(§Y1§!) военный завод,\n(§Y1§!) верфь\n\n§YНеобходимые условия:§!\n[!KIR_FACTORY_RATIO_OPTION_3_click_enabled]\n[GetKIRFactory150Cost]"
@@ -926,7 +928,7 @@ KIR_civil_war_focus_3b_desc:0 "Вдалеке тяжело бьют бараба
 KIR_civil_war_focus_3s:0 "Обращение матриарха"
 KIR_civil_war_focus_3s_desc:0 "В жизни сегодняшних киринов, их дедов и прадедов Великий Матриарх всегда была как бы в стороне. Неприкосновенная, недосягаемая фигура, почти божественная для своих преданных подданных. До чего глупая в ретроспективе традиция. Теперь, когда целое поколение шагает, чтобы умереть во имя неё, соотечественники должны знать, за кого они сражаются и помнить, что значат их усилия."
 KIR_civil_war_focus_4a:0 "Призвать к соглашению"
-KIR_civil_war_focus_4a_desc:0 "Когда эквестрийки Флаттершай и Эпплджек ступили в светозарное Алое Царство, они пришли с одной философией - философией Гармонии. Рэйн Шайн близко к сердцу приняла правительственную систему гармоничной монархии, но теперь пришло время обратиться к другому её значению: гармонии между Эквестрией и Кирией. Если эти две иноземные пони сдержат свои слова как защитницы гармонии, то мы дождёмся помощи в скором времени."
+KIR_civil_war_focus_4a_desc:0 "Когда эквестрийки Флаттершай и Эпплджек ступили в светозарное Алое Царство, они пришли с одной философией - философией Гармонии. Рейн Шайн близко к сердцу приняла правительственную систему гармоничной монархии, но теперь пришло время обратиться к другому её значению: гармонии между Эквестрией и Кирией. Если эти две иноземные пони сдержат свои слова как защитницы гармонии, то мы дождёмся помощи в скором времени."
 KIR_civil_war_focus_4b:0 "Обратиться к киринам"
 KIR_civil_war_focus_4b_desc:0 "Войны выигрываются не только с помощью солдат или тактики. Ни одна война не может быть действительно выиграна, если она не рассматривается как справедливая в глазах населения. Без этого его усилия обернутся прахом. Уже ревут от напряжения типографии, улицы наводняют памфлеты, не позволяющие киринам забыть о войне и о том, что поставлено на карту."
 KIR_civil_war_focus_4c:0 "Киноварь зовёт"
@@ -945,9 +947,9 @@ KIR_civil_war_focus_4f_B_desc:0 "Когда-то Путь Разгорающег
 KIR_civil_war_focus_5a:0 "Эскадрилья 'Гром и молнии'"
 KIR_civil_war_focus_5a_desc:0 "Даже небеса взревели от негодования по отношению к предателям, когда первая в истории киринская воздушная эскадрилья "Гром и молнии" прибыла на поле боя. Даже огрызки военно-воздушных сил Эквестрии, отправленная через океан, чтобы сражаться за гармонию, наносит беспрецедентный ущерб неподготовленным силам противника."
 KIR_civil_war_focus_5b:0 "Лояльная диаспора"
-KIR_civil_war_focus_5b_desc:0 "Кирия - это не просто нация; это идея, надежда. Мечта о гармонии между киринами, о процветании, о мире. Это то, чего Фикл Каррент и его банда вероломных предателей никогда не смогли бы понять. Лучшую Кирию невозможно купить, её нельзя произвести на фабрике. Это заложено в душе и сознании тех, кто остаётся верным Высшему Матриарху даже перед лицом искушения."
+KIR_civil_war_focus_5b_desc:0 "Кирия - это не просто нация; это идея, надежда. Мечта о гармонии между киринами, о процветании, о мире. Это то, чего Фикл Каррент и его банда вероломных предателей никогда не смогли бы понять. Лучшую Кирию невозможно купить, её нельзя произвести на фабрике. Это заложено в душе и сознании тех, кто остаётся верным Верховному Матриарху даже перед лицом искушения."
 KIR_civil_war_focus_5c:0 "Территориальное ополчение"
-KIR_civil_war_focus_5c_desc:0 "На войне не бывает простых решений. С тяжёлым сердцем Рэйн Шайн одобрила формирование нового парамилитарного формирования под названием 'территориальное ополчение'. По определению состоящее из непригодных к несению нормальной военной службы ополченцев, оно служат резервными гарнизонными силами, последней, шаткой линией обороны, когда всё остальное потеряно."
+KIR_civil_war_focus_5c_desc:0 "На войне не бывает простых решений. С тяжёлым сердцем Рейн Шайн одобрила формирование нового парамилитарного формирования под названием 'территориальное ополчение'. По определению состоящее из непригодных к несению нормальной военной службы ополченцев, оно служат резервными гарнизонными силами, последней, шаткой линией обороны, когда всё остальное потеряно."
 KIR_civil_war_focus_5d:0 "Перековка Знамён"
 KIR_civil_war_focus_5d_desc:0 "Дух войны не беспокоил Кирию веками, позволив некогда великолепным Тысячам Знамён увянуть, как цветам зимой. По сравнению с несгибаемым подразделением современной профессиональной армии группа солдат, работающих неполный рабочий день, аттестованных только по праву своего происхождения, выглядит жалко. Трудности, с которыми мы сталкиваемся ужасны; тем не менее, мы должны, по крайней мере, попытаться преодолеть этот разрыв."
 KIR_civil_war_focus_5e:0 "Разжечь пламя народной войны"
@@ -958,7 +960,7 @@ KIR_civil_war_focus_6a:0 "Мрачное воссоединение"
 KIR_civil_war_focus_6a_desc:0 "Окружённая водоворотом смерти, искра надежды возвращается вместе с Эпплджек, эквестрийским элементом гармонии и пони, возможно, наиболее ответственной за революционные события в современной истории Кирии. Такая важная новость даже пробудила Отэм Блейз от её оцепенения, и именно премьер Кирии, эта разбитая внутри кобылка встретится со своим наставником и другом."
 KIR_civil_war_focus_6x:0 "Крестоносцы гармонии"
 KIR_civil_war_focus_6x_desc:0 "Опираясь на щедрость наших друзей эквестрийцев, мы можем выставить две высокомобильные ударные бригады, способные совершать наступательные прорывы на поле боя. Эти обученные и оснащённые эквестрийским снаряжением войска обладают способностью переломить ход войны. Мы никогда не забудем интернациональную дружбу наших друзей-пони за океаном."
-KIR_civil_war_focus_6x_tt:0 "Будет сформирована и развёрнута 881-я бронетанковая бригада '§YКрестоносцы гармонии§!', в составе 3 батальонов §HЛёгких танков§!, 6 батальонов §HМеханизированной пехоты§! а так же §HМеханизированной разведывательной ротой§!, §HАртиллерийской§! и §HРемесленной§! ротами поддержки.\nБудет сформирована и развёрнута мобильная бригада № 903 '§YЗащитники гармонии§!', в составе 9 батальонов §HМоторизированной пехоты§!, а также §HМоторизированной разведывательной роты§!, §HАртиллерийской§! и §Ремесленной§! роты поддержки."
+KIR_civil_war_focus_6x_tt:0 "Будет сформирована и развёрнута 881-я бронетанковая бригада '§YКрестоносцы гармонии§!', в составе 3 батальонов §HЛёгких танков§!, 6 батальонов §HМеханизированной пехоты§! а так же §HМеханизированной разведывательной ротой§!, §HАртиллерийской§! и §HРемесленной§! ротами поддержки.\nБудет сформирована и развёрнута мобильная бригада № 903 '§YЗащитники гармонии§!', в составе 9 батальонов §HМоторизированной пехоты§!, а также §HМоторизированной разведывательной роты§!, §HАртиллерийской§! и §HРемесленной§! роты поддержки."
 KIR_civil_war_focus_6b:0 "Восточный редут"
 KIR_civil_war_focus_6b_desc:0 "Приморский Хребет - относительно периферийный регион Кирии, изолированный от районов, которым война угрожает непосредственно. Окутанная Безмолвием, это была полоска невозделанной земли, лишённая промышленности. Теперь, охраняемый почти неприступными Кварцевыми горами на западе, Хребет должен служить ядром чрезвычайного военно-морского производства, укреплённый самой надёжной защитой в кратчайшие сроки."
 KIR_civil_war_focus_6c:0 "Манёвренная война"
@@ -966,7 +968,7 @@ KIR_civil_war_focus_6c_desc:0 "В отличие от наших врагов, 
 KIR_civil_war_focus_6d:0 "Решительная оборона"
 KIR_civil_war_focus_6d_desc:0 "Несмотря на первоначальный шок, мы сохраняем выгодное положение во многих смыслах по сравнению с повстанцами. Теория, преобладающая в верховном командовании, заключается в том, что патовая ситуация - это поражение для нашего противника. Упираться копытами - самый верный способ выиграть эту войну."
 KIR_civil_war_focus_6e:0 "Инквизиторы-исповедники"
-KIR_civil_war_focus_6e_desc:0 "Сегодня преданность в дефиците. Однако, всё же, есть одна группа, которая остаётся непоколебимой в своей вере. Монахи Пути Огня, прошедшие обучение в фундаменталистской традиции, являются слугами, телом и душой воли Конкорд и Высшего Матриарха. Хотя выпускать их на волю может быть опасно, Кирия может быть спокойна, зная, что ересь и измена скоро станут лишь смутным воспоминанием."
+KIR_civil_war_focus_6e_desc:0 "Сегодня преданность в дефиците. Однако, всё же, есть одна группа, которая остаётся непоколебимой в своей вере. Монахи Пути Огня, прошедшие обучение в фундаменталистской традиции, являются слугами, телом и душой воли Конкорд и Верховного Матриарха. Хотя выпускать их на волю может быть опасно, Кирия может быть спокойна, зная, что ересь и измена скоро станут лишь смутным воспоминанием."
 KIR_civil_war_focus_6f:0 "Воинствующие Мистики"
 KIR_civil_war_focus_6f_desc:0 "Самые талантливые в военном отношении и в высшей степени преданные монахи Кирии, известные как Безмятежные Мистики, дают магически связывающую клятву защищать Конкорд и её избранных всеми силами. Говорят, что, если они нарушат эту клятву, священное пламя медленно сожжёт их изнутри. Как бы то ни было, на их боевую ярость страшно смотреть и именно она воодушевит наши силы."
 KIR_civil_war_focus_7a:0 "Студенты-добровольцы"
@@ -1074,7 +1076,7 @@ KIS_reconcile_focus_7b_desc:0 "Пришло время официально ур
 KIS_reconcile_focus_7c:0 "Знамёна вице-королевства"
 KIS_reconcile_focus_7c_desc:0 "Теперь, когда мы уладили дипломатические вопросы, необходимые для установления нашего вице-королевства, пришло время сосредоточиться на улучшении нашего военного сотрудничества с Киноварью. Мы создадим систему Знамён, используя солдат, предоставленных Киноварью и оснастим их современным снаряжением, произведённым здесь, у нас, чтобы воплотить первое из наших совместных военных начинаний."
 KIS_reconcile_focus_8:0 "Конфедеративный союз"
-KIS_reconcile_focus_8_desc:0 "Поскольку вопрос о нашей независимости обеспечен и решён, мы должны реорганизовать власть на нашей земле в более эффективное государство, фактически возглавляемое НАКП. Хотя мы заявляем о своей легитимности, демонстрируя преклонение перед Верховным Матриархом Рэйн Шайн во всех духовных вопросах, на самом деле это просто слова и Матриарх не влияет на дела в пределах наших границ."
+KIS_reconcile_focus_8_desc:0 "Поскольку вопрос о нашей независимости обеспечен и решён, мы должны реорганизовать власть на нашей земле в более эффективное государство, фактически возглавляемое НАКП. Хотя мы заявляем о своей легитимности, демонстрируя преклонение перед Верховным Матриархом Рейн Шайн во всех духовных вопросах, на самом деле это просто слова и Матриарх не влияет на дела в пределах наших границ."
 KIS_reconcile_focus_8a:0 "Гвардия Конфедерации"
 KIS_reconcile_focus_8a_desc:0 "Благодаря благотворительным пожертвованиям некоторых из наших самых богатых покровителей и членов партии мы организовали сбор средств для приобретения самых современных артиллерийских систем и моторизованной техники из Грифонии. Это оружие во многом поможет нашим усилиям положить конец угрозе Разгорающегося Пламени."
 KIS_reconcile_focus_9:0 "Война на сдерживание"
@@ -1170,12 +1172,12 @@ KIR_empire_focus_1_desc:0 "Наконец-то мы контролируем в
 KIR_empire_focus_2a:0 "Вернуть Матриарха"
 KIR_empire_focus_2a_desc:0 "Несмотря на то, что в течение многих лет с ней нянчились предатели и коммунисты, Верховный матриарх по-прежнему сердце и душа киринской культуры и общества. Без неё наше правительство никогда не получило бы поддержки Пути Огня или большинства соотечественников. Пришло время восстановить роль Матриарха Рейн Шайн в качестве духовного лидера - всем остальным будет заниматься НАКП."
 KIR_empire_focus_2b:0 "Перестроить нацию"
-KIR_empire_focus_2b_desc:0 "В то время как Великий Скачок Вперёд был полным провалом под руководством старого правительства, НАКП не собирается избавляться от всех предыдущих достижений. Мы добьёмся успеха там, где другие потерпели неудачу, потому что промышленность и интеллигенция Империи стоят за нами. Любой ценой Благоухание и Царство должны процветать."
+KIR_empire_focus_2b_desc:0 "В то время как Великий Скачок Вперёд старого правительства окончился полным провалом, НАКП не собирается избавляться от всех предыдущих достижений. Мы добьёмся успеха там, где другие потерпели неудачу, потому что промышленность и интеллигенция Империи стоят за нами. Любой ценой Благоухание и Царство должны процветать."
 KIR_empire_focus_3a:0 "Консигнация Киновари"
 KIR_empire_focus_3a_desc:0 "В Кирии очень мало киринов, которым мы и Верховный Матриарх, можем доверять. Но если и есть что-то, что всегда обеспечит лояльность, так это деньги. Вот почему мы знаем, что корпорации прикроют наши спины. Оставаясь верными короне, мы оба процветаем, и именно поэтому пришло время передать дальнейшую власть корпорациям, узаконив их как великих феодальных вассалов из старых времён."
 KIR_empire_focus_roaring_fire:0 "Заслуженная награда"
-KIR_empire_focus_roaring_fire_desc:0 "Пришло время заслуженно заплатить Роарин Файр. Она сыграла свою роль в захвате контроля над южными океанами для НАКП, и теперь пришло время дать ей то, чего она хочет: свободно править в Южно-Киринском море. Место пиратов  в новом порядке обеспечено до тех пор, покуда они будут продолжать платить налоги."
-KIR_empire_focus_roaring_fire_tt:0 "£ENEZ_flag  §YСпециальная экономическая зона Южной Кирии§! будет организована в §Y[833.GetName]§! и §Y[1065.GetName]§!.\n§СЭЗ Южной Кирии будет организована в Южной Кирии§! в качестве марионетки.\n\nХотя [833.GetName] и [1065.GetName] останутся под контролем §YСЭЗ Южной Кирии§!, (§G+4.00K§!) £GFX_sycee_text  §Yзолотых монет§! ежемесячно будут поступать в казну партии."
+KIR_empire_focus_roaring_fire_desc:0 "Пришло время заслуженно заплатить Роарин Файр. Она сыграла свою роль в захвате контроля над южными океанами для НАКП, и теперь пришло время дать ей то, чего она хочет: свободно править в Южно-Киринском море. Место пиратов в новом порядке обеспечено до тех пор, покуда они будут продолжать платить налоги."
+KIR_empire_focus_roaring_fire_tt:0 "£ENEZ_flag  §YСпециальная экономическая зона Южной Кирии§! будет организована в §Y[833.GetName]§! и §Y[1065.GetName]§!.\n§YСЭЗ Южной Кирии будет организована в Южной Кирии§! в качестве марионетки.\n\nХотя [833.GetName] и [1065.GetName] останутся под контролем §YСЭЗ Южной Кирии§!, (§G+4.00K§!) £GFX_sycee_text  §Yзолотых монет§! ежемесячно будут поступать в казну партии."
 KIR_empire_focus_3b:0 "Свести счета"
 KIR_empire_focus_3b_desc:0 "Согласно системе компенсации за услуги по контракту, лица, обвиняемые в финансовых преступлениях, обязаны предоставлять государству свою рабочую силу до тех пор, покуда их долг не будет выплачен. При участии в компенсационной схеме все расходы на проживание должны быть учтены в долгу работника в соответствии с подразделом-9a. Жалобы следует подавать в Бюро по справедливому обращению с киринами, которое находится... где-то там."
 KIR_empire_focus_3c:0 "Киринская имперская армия"
@@ -1217,7 +1219,7 @@ KIR_empire_focus_8a_desc:0 "Кирия процветает, бизнес на 
 KIR_empire_focus_8b:0 "Корпоративная десятина" ##1K gold per month per corporate vassal, Resolve Accounting Errors
 KIR_empire_focus_8b_desc:0 "Без вассальных корпораций мы бы никогда не добились своей цели. Однако и они обязаны нам своими рекордными прибылями и богатством, а также благоприятствующей бизнесу политике. Государство многим пожертвовало, чтобы сделать корпорации счастливыми, поэтому пришло время и им порадовать нас."
 KIR_empire_focus_8c:0 "Секторизация промышленности"
-KIR_empire_focus_8c_desc:0 "Царство Кирии благословлено изобилием земель, многочисленными реками, предоставляющими условия для идеальной логистики,  и огромным количеством дешевой крестьянской рабочей силы. Создавая специальные сектора промышленности, мы можем более эффективно управлять своими богатыми ресурсами, создавая новые заводы быстрее, чем когда-либо."
+KIR_empire_focus_8c_desc:0 "Царство Кирии благословлено изобилием земель, многочисленными реками, предоставляющими условия для идеальной логистики, и огромным количеством дешевой крестьянской рабочей силы. Создавая специальные сектора промышленности, мы можем более эффективно управлять своими богатыми ресурсами, создавая новые заводы быстрее, чем когда-либо."
 KIR_empire_focus_8x:0 "Новый военный класс"
 KIR_empire_focus_8x_desc:0 "Кирины, доблестно сражаются за нас, чтобы спасти Царство от суеверий и социализма, стали важной опорой нашего общества. Эти солдаты значительно лучше наёмников, и потому вдохновляют остальных киринов. Мы должны внушить идею гордости новыми Знамёнами населению и укрепить ряды нового военного класса с помощью опытных ветеранов или комиссии по закупкам оружия у состоятельных партийных вкладчиков.."
 KIR_empire_focus_9a:0 "Переговоры с Рапсодией"
@@ -1256,19 +1258,19 @@ KIS_maximum_brutality:0 "Максимальная жестокость"
 KIR_empire_focus_coc4:0 "Под опекой государства"
 KIR_empire_focus_coc4_desc:0 "Почему крестьянство восстало против нас? Что ж, на этот вопрос есть простой ответ: подобно непокорным детям, они склонны к бунту и вспышкам гнева, когда их должным образом не дисциплинируют. Чтобы этого никогда больше не повторилось, мы должны более жестко обращаться с селянами и не допускать, чтобы у них даже было возможности подумать о восстании вдали от бдительного ока государства."
 
-KIS_continuous_army_research:0 "Fund Army Research"
-KIS_continuous_army_research_desc:0 "We must focus on researching and developing new equipment and doctrines for our army. This is now our top priority!"
-KIS_continuous_army_research_idea:0 "Army Research Funding"
-KIS_continuous_navy_research:0 "Fund Naval Research"
-KIS_continuous_navy_research_desc:0 "We must focus on researching and developing new equipment and doctrines for our navy. This is now our top priority!"
-KIS_continuous_navy_research_idea:0 "Naval Research Funding"
-KIS_continuous_air_research:0 "Fund Air Research"
-KIS_continuous_air_research_desc:0 "We must focus on researching and developing new equipment and doctrines for our air forces. This is now our top priority!"
-KIS_continuous_air_research_idea:0 "Air Research Funding"
-KIS_continuous_industry_research:0 "Fund Industrial Research"
-KIS_continuous_industry_research_desc:0 "We must focus on researching and developing new means of production and machinery to fuel the growth of our nation. This is now our top priority!"
-KIS_continuous_industry_research_idea:0 "Industrial Research Funding"
-KIS_continuous_research_cost_tt:0 "(§R-[?KIS.KIS_continuous_research_foci_cost]§!) £GFX_sycee_text  §YGold Coins§! will be Withdrawn from the Party Treasury §YEvery Day§!."
+KIS_continuous_army_research:0 "Финансировать армейские исследования"
+KIS_continuous_army_research_desc:0 "Мы должны сосредоточиться на исследованиях и разработке новой техники и доктрин для нашей армии. Теперь это - наш главный приоритет!"
+KIS_continuous_army_research_idea:0 "Финансирование армейских исследований"
+KIS_continuous_navy_research:0 "Финансировать военно-морские исследования"
+KIS_continuous_navy_research_desc:0 "Мы должны сосредоточиться на исследованиях и разработке новых судов и доктрин для нашего военно-морского флота. Теперь это - наш главный приоритет!"
+KIS_continuous_navy_research_idea:0 "Финансирование военно-морских исследований"
+KIS_continuous_air_research:0 "Финансировать исследования ВВС"
+KIS_continuous_air_research_desc:0 "Мы должны сосредоточиться на исследованиях и разработке новых машин и доктрин для наших военно-воздушных сил. Теперь это  - наш главный приоритет!"
+KIS_continuous_air_research_idea:0 "Финансирование исследований ВВС"
+KIS_continuous_industry_research:0 "Финансировать промышленные исследования"
+KIS_continuous_industry_research_desc:0 "Мы должны сосредоточиться на исследованиях и разработке новых средств производства и машин, которые будут способствовать росту нашей экономики. Теперь это - наш главный приоритет!"
+KIS_continuous_industry_research_idea:0 "Финансирование промышленных исследований"
+KIS_continuous_research_cost_tt:0 "(§R-[?KIS.KIS_continuous_research_foci_cost]§!) £GFX_sycee_text  §Yзолотых монет§! будет тратиться из партийной казны §Yкаждый день§!."
 
 # Empire of Kiria #
 
@@ -1444,8 +1446,8 @@ KIR_republic_postwar_focus_20a_tt:0 "Three Motorized Units of the §YSupervised
 KIR_republic_postwar_focus_20b:0 "Campaign Against Foreign Infiltration"
 KIR_republic_postwar_focus_20b_desc:0 "Kiria will not be turned into a puppet, a mere pardoy of nations across the world. It is our task, and ours alone, to carry out the divine will of Concord. The Rising Fire has no need for the heresies of the rest of the world, and if it finds itself as the sole light surrounded by eternal darkness, our solution is not to change to fit in, but to burn ever brighter." ##One Rising Sun diary entry; danger of foreign Marksism. Kill them harder than we killed the NAKP.
 KIC_fire_above_all:0 "The Flame Above All"
-KIR_republic_postwar_focus_20c:0 "Internment Campaigns"
-KIR_republic_postwar_focus_20c_desc:0 "The kirin of Greater Providence despise us, not unfairly, as conquerers bent on eradicating their way of life, for it must go to make way for the better world that we have envisaged. That is why they resent us, and that is why they support the foreigners. And that is why we have interned them. They should be grateful for small mercies, for there are other ways to kill an insurgency that are less costly and arduous."
+KIR_republic_postwar_focus_20c:0 "Anti-Separatism Drive"
+KIR_republic_postwar_focus_20c_desc:0 "The kirin of Greater Providence despise us, not unfairly, as conquerers bent on eradicating their way of life, for it must go to make way for the better world that we have envisaged. That is why they resent us, and that is why they support the foreigners. And that is why we have locked them up. They should be grateful for small mercies, for there are other ways to kill an insurgency that are less costly and arduous."
 KIR_republic_postwar_focus_21:0 "The Grand Army of the Fraternal Republic"
 KIR_republic_postwar_focus_21_desc:0 "Though the Banners served The Rising Fire well in the righteous war, the march of progress does not hold the same loyalty. As such, the soldiers of the Banners must move forward from the past, and find themselves apart of a new, modern army that serves the realm above all." ##Completely abolish the Banner system. Replace it with a proper, secular, modern army that owes it allegiance to the Republic, not their individual banner. Separate from the Incarnadine Soldiery.
 KIR_republic_postwar_focus_22a:0 "Supply the Troops"
@@ -1482,7 +1484,7 @@ KIR_republic_postwar_focus_25a_desc:0 "Certain measure must be taken during a re
 KIR_republic_postwar_focus_26a:0 "Leaving the Nest"
 KIR_republic_postwar_focus_26a_desc:0 "Rising Sun has provided us with a future that is almost impossible to fully appreciate. Yet, no revolution is truly won by just one mare. As democracy washes over Kiria in a healing warmth, Rising Sun must step away from the burdens she bears. After so long, it is now her turn to enjoy the fruits of socialist revolution."
 KIR_republic_postwar_focus_27a:0 "Consolidation Deployments" ##buffs banner jurisdictions
-KIR_republic_postwar_focus_27a_desc:0 "A soldier is not an unthinking monster. Fear infects the hjeart of any soldier, as does love, as does happiness. We have asked much of our soldiers, tasks of incredible violence and destruction. We know their tenacity, their grit can be put to far more constructive uses."
+KIR_republic_postwar_focus_27a_desc:0 "A soldier is not an unthinking monster. Fear infects the heart of any soldier, as does love, as does happiness. We have asked much of our soldiers, tasks of incredible violence and destruction. We know their tenacity, their grit can be put to far more constructive uses."
 KIR_republic_postwar_focus_27a_tt:0 "Increases the Maximum Threshold for Modifiers from §YProspecting Bureau§! and §YProduction Brigade§! in §OBanner Jurisdictions§! by §G+10%§!, to a total of (§Y60%§!) and (§Y40%§!) respectively."
 KIR_republic_postwar_focus_28a:0 "Our Younger Sisters"
 KIR_republic_postwar_focus_28a_desc:0 "One wonders if the scars of the Great Silence could ever truly fade. Though, the question persists to Kiria on how to truly heal from them. Even now, Concord's subjects live divided among borders. Is it within our right to remedy this?"
@@ -1508,8 +1510,13 @@ KIR_republic_postwar_focus_Z_tt:0 "Unlocks £decision_icon_small Decisions to §
 
 KIR_republic_postwar_focus_XY:0 "Pacify the Zebras"
 KIR_republic_postwar_focus_XY_desc:0 "The world is a dangerous, unforgiving place. Even just beyond our borders, despots, slavers, tyrants and heretics rule with oppression over their realms. Concord has no limits. Neither shall we."
+KIR_republic_postwar_focus_XY_WG_tt:0 "Gains §YAnnex§! war goal against this country."
 KIR_republic_postwar_focus_XY_tt:0 "\nEnables §OBanner Jurisdictions§! in conquered §YZebluan§! and §YZongolese§! territories."
 
+KIR_republic_postwar_focus_ZY:0 "Pre-Emptive Strike"
+KIR_republic_postwar_focus_ZY_desc:0 "Kiria is harmed and imperiled by the traumas that have been wrought onto her. Our belligerent neighbours to the west, sensing weakness, will surely take advantage and come knocking sooner or later. If war is inevitable, then we would rather fight on their soil than ours."
+KIR_republic_postwar_focus_ZY_WG_tt:0 "Gains §YPuppet§! war goal against this country."
+
 KIR_republic_postwar_focus_24b:0 "A Lesson They'll Never Forget"
 KIR_republic_postwar_focus_24b_desc:0 "Our revolution will never have a shortage of enemies. Of its traitors, lurking in the shadows, whose hearts become corrupted by the heretical forces that are always assembled to crush the kirin people. We can never slacken. We can never falter. Our aims will be achieved, and if a mountain of corpses is the price, it won't be ours."
 KIR_republic_postwar_focus_25b:0 "Supremacy of the Matriarchate"
@@ -1532,12 +1539,6 @@ decision_cost_50_pp_manpower_25000_tooltip:0 "It costs [This.GetDecisionCostReal
 KIR_republic_postwar_focus_29b:0 "Guided Development"
 KIR_republic_postwar_focus_29b_desc:0 "The core of our life, is spirit. Concord brings to us all that we cherish and love, and we have her light to thank for everything we have. Thus, any heresies and contradictions to her divine rule are merely inventions of the reactionary to bring low Kirin society. Nothing comes before Concord, before the Rising Fire."
 
-KIC_concentration_camps:0 "Концентрационные лагеря"
-KIC_concentration_camps_desc:0 "§Ldesc§!"
-KIC_concentration_camps_unlock_tt:0 "\nРазблокирует оккупационную политику §YКонцентрационные лагеря§!:\nКоэффициент региона:\n      Ежемесячный прирост населения: §R-40%§!\n      Нужно гарнизонов: §R+40%§!\n      Пони ресурсы в провинции: §R-20%§!\n      Ресурсы в провинции: §R-20%§!\n      Местные фабрики: §R-20%§!\n      Разведданные врагов: §G-40%§!\n      Цель сопротивления: §G-40%§!\n      Скорость спада сопротивления: §G+40%§!\n      Скорость роста сопротивления: §G-40%§!\n      Шанс проникновения в гарнизон: §G-20%§!\n      Урон наносимый гарнизонам: §G-20%§!\n\nКоэффициент региона при подавленном сопротивлении:\n      Пони ресурсы в провинции: §G+20%§!\n      Ресурсы в провинции: §G+20%§!\n      Местные фабрики: §G+20%§!\n"
-
-KIR_concentration_camps_resistance_threshold:0 "Среднее §Rсопротивление§! всех [From.FROM.GetAdjective] национальных территорий под нашим контролем выше §Y50.0%§!."
-
 KIC_focus_consume_marepower_tt:0 "Because the §Ytechnological requirements§! for this focus have not been met, §Rtaking this focus will cost 40,000 Ponypower!§!\n\n"
 KIC_construction_boom:0 "Construction Boom"
 
@@ -1851,7 +1852,7 @@ kirin.3.d:0 "Наибожественному верховному матриа
 kirin.3.a:0 "Ваша преданная слуга, премьер Отэм Блейз"
 
 kirin.4.t:0 "Великий Скачок Вперёд"
-kirin.4.d:0 "Верховный матриарх Рейн Шайн на мгновение замешкалась, когда вышла на трибуну, установленную на ступенях перед императорским дворцом. Её красные глаза окинули сотни... нет, тысячи лиц, уставившихся на неё в ответ. Рейн Шайн пришлось напомнить себе, что большинство её подданных впервые увидели свою правительницу лично. За всю свою жизнь она редко покидала стены дворца, и ещё реже ей случалось говорить со своими подданными или же позволять им говорить с ней. Она получила престол сразу же, как потух погребальный костёр её матери, но это было тихой и закрытой церемонией в стенах дворца, и лишь царские прокламации к киринам Киновари дали народу понять, что 36 лет назад произошла смена лидерства. Теперь она стояла перед ними как новая верховный матриарх, готовая вывести их из тьмы Безмолвия, которая так долго сковывала общество киринов.\n\n— Мои преданные и верные подданные, — начала Рейн Шайн, сперва взглянув на подготовленную речь перед собой, а затем снова на толпу. — Я знаю, что большинство из вас впервые видят свою матриарха. Я знаю, что вы впервые слышите мой голос. Но новая эра для Кирии не могла начаться без вашего знакомства со мной. Я не моя мать. Я не та кобыла, которая составила и издала указы и законы, породившие то, что мы сегодня называем Безмолвием. Я не Ноктилюцент Чарм, но я её дочь. И сегодня я начну исправлять ошибки моей матери.\n\nПо толпе пронёсся удивлённый ропот, и Рейн Шайн дала всей толпе осознать её слова, прежде чем продолжить. — Я уже составила ряд указов и подготовила несколько встреч, которые приведут к концу Безмолвия, — сказала она. — Сегодня начинается новая эра для Кирии. Но я не могу сотворить наше будущее в одиночку. Пришло время всем киринам Царства присоединиться ко мне и вместе создать новое будущее. Народ киринов должен присоединиться ко мне в Великом Скачке Вперёд, который позволит нам модернизировать нашу промышленность, технологии, сельское хозяйство и науку. Это Царство, доверенное нам Конкорд, благословлено её мудростью и благосклонностью. Мы, кирины - изобретательный народ, хорошо знакомый с созидательной и разрушительной силой огня. Мы будем использовать наши дары, чтобы максимально воспользоваться благословением Конкорд. Благодаря упорному трудолюбию, упорству и горячей преданности богине огня, Царство Кирия ВЫЙДЕТ из Безмолвия и станет важной мировой силой в течение десятилетия. Нет ничего, чего бы мы не смогли достичь вместе! Поэтому я спрашиваю вас, кирины Царства... присоединитесь ли вы ко мне в Великом Скачке Вперёд?\n\nТолпа ответила громогласными аплодисментами и восторженными возгласами, которые, казалось, были слышны во всём Царстве."
+kirin.4.d:0 "Верховный матриарх Рейн Шайн на мгновение замешкалась, когда вышла на трибуну, установленную на ступенях перед императорским дворцом. Её красные глаза окинули сотни... нет, тысячи лиц, уставившихся на неё в ответ. Рейн Шайн пришлось напомнить себе, что большинство её подданных впервые увидели свою правительницу лично. За всю свою жизнь она редко покидала стены дворца, и ещё реже ей случалось говорить со своими подданными или же позволять им говорить с ней. Она получила престол сразу же, как потух погребальный костёр её матери, но это было тихой и закрытой церемонией в стенах дворца, и лишь царские прокламации к киринам Киновари дали народу понять, что 36 лет назад произошла смена лидерства. Теперь она стояла перед ними как новая верховный матриарх, готовая вывести их из тьмы Безмолвия, которая так долго сковывала общество киринов.\n\n— Мои преданные и верные подданные, — начала Рейн Шайн, сперва взглянув на подготовленную речь перед собой, а затем снова на толпу. — Я знаю, что большинство из вас впервые видят свою матриарха. Я знаю, что вы впервые слышите мой голос. Но новая эра для Кирии не могла начаться без вашего знакомства со мной. Я не моя мать. Я не та кобыла, которая составила и издала указы и законы, породившие то, что мы сегодня называем Безмолвием. Я не Ноктилюцент Чарм, но я её дочь. И сегодня я начну исправлять ошибки моей матери.\n\nПо толпе пронёсся удивлённый ропот, и Рейн Шайн дала всей толпе осознать её слова, прежде чем продолжить. — Я уже составила ряд указов и подготовила несколько встреч, которые приведут к концу Безмолвия, — сказала она. — Сегодня начинается новая эра для Кирии. Но я не могу сотворить наше будущее в одиночку. Пришло время всем киринам Царства присоединиться ко мне и вместе создать новое будущее. Народ киринов должен присоединиться ко мне в Великом Скачке Вперёд, который позволит нам модернизировать нашу промышленность, технологии, сельское хозяйство и науку. Это Царство, доверенное нам Конкорд, благословлено её мудростью и благосклонностью. Мы, кирины - изобретательный народ, хорошо знакомый с созидательной и разрушительной силой огня. Мы будем использовать наши дары, чтобы максимально воспользоваться благословением Конкорд. Благодаря трудолюбию, упорству и горячей преданности богине огня, Царство Кирия ВЫЙДЕТ из Безмолвия и станет важной мировой силой в течение десятилетия. Нет ничего, чего бы мы не смогли достичь вместе! Поэтому я спрашиваю вас, кирины Царства... присоединитесь ли вы ко мне в Великом Скачке Вперёд?\n\nТолпа ответила громогласными аплодисментами и восторженными возгласами, которые, казалось, были слышны во всём Царстве."
 kirin.4.a:0 "Великий Скачок Вперёд стартует сегодня!"
 
 kirin.5.t:0 "Эмигранты возвращаются на родину"
@@ -2034,7 +2035,7 @@ kirin.51.d:0 "К удивлению многих, Отэм Блейз оказа
 kirin.51.a:0 "Надеюсь, это погасит последние вспышки гнева в Секретариате."
 
 kirin.52.t:0 "Конституционный матриархат"
-kirin.52.d_1:0 "Столетия правления по указу Киновари подошли к официальному и полному завершению сегодня, с окончательным неограниченным указом Верховного Матриарха Рейн Шайн. Уже в течение нескольких лет она предоставляла прерогативы и полномочия Пленуму, премьер-министру и Утреннему Секретариату, но сегодня она наделила их этой властью навсегда и ограничила себя - и всех будущих матриархов - Конституцией Царства Кирия. Приняв нетипичное решение самостоятельно провозгласить этот указ в столице, Рейн Шайн просто сказала, что — Новое столетие приносит с собой новую реальность, и я не буду из гордости лишать своих подданных свободы управлять страной, которой пользуются столь многие народы мира. Как Верховному Матриарху, мне поручено вести киринов к миру и процветанию, и я чувствую, что Утренний Секретариат и премьер-министр принесут Кирии и то, и другое.\n\nИмперский премьер Отэм Блейз подала в отставку со своего поста непосредственно перед тем, как он был упразднён указом Матриарха и новой Конституцией. После речи Рейн Шайн Утренний Секретариат собрался, чтобы выбрать первого демократически избранного премьера Кирии, и, в свете её успеха в руководстве страной в ходе Великого Скачка Вперёд, решил избрать Отэм Блейз на пятилетний срок."
+kirin.52.d_1:0 "Столетия правления по указу Киновари подошли к официальному и полному завершению сегодня, с окончательным неограниченным указом Верховного Матриарха Рейн Шайн. Уже в течение нескольких лет она предоставляла прерогативы и полномочия Пленуму, премьер-министру и Утреннему Секретариату, но сегодня она наделила их этой властью навсегда и ограничила себя - и всех будущих матриархов - Конституцией Царства Кирия. Приняв нетипичное решение самостоятельно провозгласить этот указ в столице, Рейн Шайн просто сказала, что — Новое столетие приносит с собой новую реальность, и я не буду из гордости лишать своих подданных свободы управлять страной, которой пользуются столь многие народы мира. Как Верховному Матриарху, мне поручено вести киринов к миру и процветанию, и я чувствую, что Утренний Секретариат и премьер-министр принесут Кирии и то, и другое.\n\nИмперский премьер Отэм Блейз подала в отставку со своего поста непосредственно перед тем, как он был упразднён указом Матриарха и новой Конституцией. После речи Рейн Шайн Утренний Секретариат собрался, чтобы выбрать первого демократически избранного премьера Кирии, и, в свете её успеха в лидерстве страной в ходе Великого Скачка Вперёд, решил избрать Отэм Блейз на пятилетний срок."
 kirin.52.d_2:0 "Столетия правления по указу завершились сегодня. Верховный Матриарх Рейн Шайн провозгласила, что её матриархат отныне и навеки будет ограничен конституцией Царства. Многие полномочия, предоставленные Пленуму, премьеру и Утреннему Секретариату, теперь навсегда закреплены в законе. Матриарх сохраняет за собой "лишь те полномочия, которые необходимы для охраны Царства", говорится в тексте её указа.\n\nНа церемонии провозглашения конституционного матриархата Рейн Шайн выступила перед притихшей толпой, сказав следующие простые слова: — В свете недавнего конфликта в Провидении я считаю необходимым убедиться в том, что, хотя род матриархов будет существовать вечно, я и мои преемницы будут окружены добрыми советниками, которые не допустят повторения столь трагических событий. Для этого я должна довериться мудрости моих самых верных советников - Утреннего Секретариата и премьер-министра Кирии. Вместе мы сможем обеспечить эпоху мира и процветания в нашем Царстве.\n\nИмперский премьер Отэм Блейз подала в отставку со своего поста непосредственно перед тем, как он был упразднён указом Матриарха и новой Конституцией. После речи Рейн Шайн Утренний Секретариат собрался, чтобы выбрать первого демократически избранного премьера Кирии, и решил избрать Отэм Блейз на пятилетний срок."
 kirin.52.a:0 "Новый рассвет для гармонии в Утреннем Секретариате."
 kirin.52.b:0 "Конец неограниченному матриархизму, но это по-прежнему правительство Её Сиятельства."
@@ -2147,7 +2148,7 @@ kirin.78.a:0 "За начало прекрасной дружбы!"
 KIR_event_78_tt:0 "([HIP.GetFlag]§Y[HIP.GetName]§!):\n   Будет получено: §YСверкающее посольство§!, что даёт:\n     - Мнение о государстве §Y[KIR.GetName]§! §G+50§!\n   При взаимодействии с государством [KIR.GetFlag]§Y[KIR.GetName]§!:\n     - Расходы на торговлю с выбранной страной: §G-20%§!\n     - Затраты на покупку лицензии: §G-5%§!\n     - Согласие на продажу лицензии: §G+20§!\n     - Скорость лицензированного производства: §G+20%§!\n     - Разница в скорости производства по лицензированной технологии: §G+20%§!\n\n([KIR.GetFlag]§Y[KIR.GetName]§!):\n   Будет получено: §Y[1165.GetCapitalVictoryPointName], посольство§!, что даёт:\n     - Мнение о государстве §Y[HIP.GetName]§! §G+50§!\n     - Торговое влияние с государством §Y[HIP.GetName]§! §G+25§!\n   При взаимодействии с государством [HIP.GetFlag]§Y[HIP.GetName]§!:\n     - Расходы на торговлю с выбранной страной: §G-20%§!\n     - Затраты на покупку лицензии: §G-5%§!\n     - Согласие на продажу лицензии: §G+20§!\n     - Скорость лицензированного производства: §G+20%§!\n     - Разница в скорости производства по лицензированной технологии: §G+20%§!\n"
 
 kirin.80.t:0 "Ультиматум о разоружении от государства [FROM.GetNameDef]" ## Fires for an un-harmonic country
-kirin.80.d:0 "Кирия, ссылаясь на наши недавние "негармонические" вторжения на чужую территорию, выдвинула требования о немедленном разоружении и сокращении численности нашей постоянной армии. На это кирийские дипломаты отвели нам три месяца. Взамен они пообещали заключить с нами пакт о ненападении. По их словам это делается для обеспечения мира и гармонии в Зебрике.\n\nОчевидно, что это ущемление нашего суверенитета. Однако Кирия, триумфально завершившая Великий Скачок Вперёд, является быстро развивающейся  державой континентального масштаба в Зебрике, и пакт о ненападении, который мы заключим, если согласимся на их требования, может оказаться выгодным для наших интересов в долгосрочной перспективе.\n\nКирины пригрозили военным вмешательством, если мы не примем их ультиматум. Ясно, что мы должны преклонить колено перед Алым Троном или готовиться к войне.\n\nНекоторые высокопоставленные военные предлагают принять кирийский ультиматум не потому, что мы намерены уступить их требованиям, а для того, чтобы по истечении этого срока у нас было ещё три месяца на мобилизацию вооружённых сил и промышленности для подготовки к войне с Кирией."
+kirin.80.d:0 "Кирия, ссылаясь на наши недавние "негармонические" вторжения на чужую территорию, выдвинула требования о немедленном разоружении и сокращении численности нашей постоянной армии. На это кирийские дипломаты отвели нам три месяца. Взамен они пообещали заключить с нами пакт о ненападении. По их словам это делается для обеспечения мира и гармонии в Зебрике.\n\nОчевидно, что это ущемление нашего суверенитета. Однако Кирия, триумфально завершившая Великий Скачок Вперёд, является быстро развивающейся державой континентального масштаба в Зебрике, и пакт о ненападении, который мы заключим, если согласимся на их требования, может оказаться выгодным для наших интересов в долгосрочной перспективе.\n\nКирины пригрозили военным вмешательством, если мы не примем их ультиматум. Ясно, что мы должны преклонить колено перед Алым Троном или готовиться к войне.\n\nНекоторые высокопоставленные военные предлагают принять кирийский ультиматум не потому, что мы намерены уступить их требованиям, а для того, чтобы по истечении этого срока у нас было ещё три месяца на мобилизацию вооружённых сил и промышленности для подготовки к войне с Кирией."
 kirin.80.a:0 "Мы согласны... пока что."
 kirin.80.b:0 "Мы ни перед кем не преклоняемся!"
 
@@ -2172,13 +2173,13 @@ kirin.200.d:0 "В провинции [KIR_STATE_DIET_SUSPENDED_PROTESTS_TARGET.G
 kirin.200.a:0 "Свяжитесь с провинцией [KIR_STATE_DIET_SUSPENDED_PROTESTS_TARGET.GetCapitalVictoryPointName] как можно скорее!"
 KIR_event_200_tt:0 "\nВыберете §YПравящую провинциальную партию§! для провинции [KIR_STATE_DIET_SUSPENDED_PROTESTS_TARGET.GetName], чтобы убрать эффекты от §Rприостановленного провинциального парламента§!."
 
-kirin.201.t:0 "Благодать смирения"
-kirin.201.d:0 "Путь Огня, пожалуй, наиболее известен своими обрядами и общей напыщенностью, храмами, окутанными благовониями, и мистиками, одетыми в шёлк. Однако недавно, в Киновари настал новый порядок, и храмы в городах по всей стране последовали этому примеру. Мистики отказались от прежних расшитых шёлком роб и снизошли до ношения простых одежд послушников из мешковины и джута, и путешествуют по всё ширящимся трущобам Кирии, раздавая милостыню местным нищим. Они перевозят с собой тележки с рисом, хлебом и рыбой на раздачу, помогают в меру сил в местных клиниках и госпиталях, заботятся о детях, чьи родители не могут должным образом делать это из-за работы, и обучают их.\n\nУ деревенских бедняков есть собственные поля, а если нет – то по крайней мере леса, в которых те могут прокормить себя и одеть, в то время как всё прирастающий класс городских бедняков, толпящихся в негигиеничных и попросту небезопасных трущобах, не имеет почти ничего, кроме вещей, которые они могут позволить себе на дневную заработную плату. Под влиянием Безмолвия, все кирины были бедны, но при том хорошо прокормлены и ухожены. Теперь же взошедшие из грязи в князи богачи выплеснулись на улицы богатейших районов, в то время как в трущобах голодают жеребята, а правительство показывает полную неспособность улучшить положение, лишь раздавая бесчисленные обещания. Уже сейчас возникают беспорядки на почве низкого уровня жизни бедного рабочего класса, а перспектива разрастания бунтов, положивших ранее начало Безмолвию, тяжким грузом висит над страной.\n\nПуть Огня, однако, и его благочестивые верующие, навечно связаны с волей Конкорд – и Конкорд не желает страдания её детей, а потому, всё прирастают новые благотворительные организации, собирающие всё больше и больше пожертвований для поддержки маленькой армии набожных добровольцев. На данный момент, их сострадание – лучшая защита Кирии от революции."
-kirin.201.a:0 "Без щедрости народа Кирии, наш Великий Скачок бы давно запнулся."
+kirin.201.t:0 "Избыток рабочей силы из сельской местности"
+kirin.201.d:0 "Богатство не всегда приводит к процветанию.\n\nПо всей Кирии промышленный бум, вызванный Великим Скачком Вперёд, и продолжающаяся экономическая экспансия Царства привели к тому, что крестьяне почти непрерывным потоком покидают свои земли и ищут более высокооплачиваемую работу на заводах в городах. Благодаря тому, что одновременно идёт процесс механизации сельского хозяйства, производство продовольствия в Царстве не уменьшается, однако сельские кирины часто не осознают, в какое опасное положение они попадают, ища работу по найму.\n\nНе имея земли, на которой можно было жить или заниматься сельским хозяйством, разросшиеся городские слои населения Кирии влачат весьма жалкое существование, тратя почти весь свой скудный дневной заработок на то, чтобы заплатить за парочку мисок белого риса и крышу над головой, под которой можно спать. Городские власти не готовы к такому наплыву сельских жителей и вынуждены позволять разрастаться огромным трущобам. Ведь иначе этим киринам придётся спать на улице.\n\nВ условиях, когда с каждым днём прибывает все больше полных надежд и оптимизма работников, а заработная плата остаётся на минимальном уровне, ситуация будет лишь ухудшаться, если ничего не предпринять."
+kirin.201.a:0 "Прискорбная реальность индустриализации."
 
-kirin.202.t:0 "Течение вдохновлённое указом"
-kirin.202.d:0 "Как ни странно, после презентации, устроенной перед Секретариатом Партией за Царство и Гармонию, даже самым крайне-правым партиям было нечего сказать против предложенного Закона о Реновации и Поддержке Городов. Да и что они могли сказать, когда им слайд за слайдом, пример за примером, показали крайнюю степень нищеты городского рабочего класса? Работники частных благотворительных организаций, задокументировавших всё это, часами свидетельствовали о том, что даже самые серьёзные их усилия лишь немного облегчали воздействие всё растущей бедности.\n\nЛишь самые непоколебимые партизаны могли бы смотреть на изображения голодных киринов, толпящихся вокруг бесплатных столовых, и оставаться бесчувственными – но даже они осознали бы, что голодные, недовольные массы горожан – это потенциальные союзники их соперников марксистов. В конце концов, обсуждение разгорелось лишь касаемо конкретных моментов, нежели самой сути и необходимости принятия нового закона.\n\nКогда же закон пришёл в действие, торговцы и директора предприятий в Благоухании выступили против выставленных им новых налоговых счётов, а также возникло много шума по поводу отмены правительственных контрактов, которые так ни к чему и не привели. В городах по всей стране, правительству пришлось приложить немало усилий, чтобы приобрести склады и офисные здания для администрирования и выполнения новых обещаний помощи городским беднякам. Сельские фермеры же были более чем счастливы услужить отчаявшимся чиновникам, готовым скупать зерно за огромные деньги.\n\nВ трущобах, однако, при вступлении новых мер, в основном воцарились мир да благодать. Дешёвые хлеб и рис, продаваемые в убыток, хлынули в города и заполнили голодные желудки, а новые школы позволили удержать детей подальше от опасных улиц. За несколько недель, тысячи киринов нашли стабильную работу на стройке новых домов на местах разросшихся трущоб Кирии. Хотя их расчистка и займёт годы – по крайней мере, сейчас правительство не выйдет обвинить в безделии."
-kirin.202.a:0 "Стеснённая казна лучше, чем нечистая совесть."
+kirin.202.t:0 "История повторяется"
+kirin.202.d:0 "Бедным крестьянам обещали будущее, полное благ современности, но на самом деле они оказались более уставшими, более голодными и более тревожными, чем когда-либо во время Безмолвия.\n\nКаждый день в трущобы, окружающие промышленные центры Царства, прибывают поезда и караваны с мигрантами из сельской местности, которые стали ненужными благодаря росту эффективности сельского хозяйства Кирии. И с каждым днём трещины в фундаменте новой, современной Кирии расширяются, поскольку эти крестьяне не находят ничего, кроме тесной, грязной, нищенской жизни на опасных фабриках в городах. И то только для тех, кто остаётся достаточно здоровым, чтобы работать.\n\nСперва произошло несколько единичных случаев, когда разочарованные кирины превращались в трущобах в нирика. Но это преступление, которое обычно считалось простым "поджогом", вскоре переросло в опасную эпидемию и модель поведения, угрожающую всему Царству. Голодные, недовольные и радикально настроенные кирины желают выместить свой гнев на многих вещах - иностранцах, высшем классе, премьер-министре - и их ярость кипит и тлеет, ожидая возможности вспыхнуть.\n\nПолицейские и пожарные службы королевства перестают справляться с нагрузкой. Рано или поздно, если ничего не предпринять, что-то сломается, а потом вспыхнет."
+kirin.202.a:0 "Именно поэтому Ноктилюцент Чарм ввела Безмолвие..."
 
 kirin.203.t:0 "Акт о приморских муниципалитетах"
 kirin.203.d:0 "Гиацинт, Сайси, Празднество, Жасмин и Тик – далеко не крупнейшие города Кирии. Они занимают странное второсортное положение между восемью великими городами и бескрайним океаном небольших городков и деревушек, составляющих остальную часть страны. По сути, они достаточно крупны, чтобы заслуживать хоть какое-то влияние, но достаточно незначительны, чтобы никогда фактически его не получать.\nВ последние несколько недель, группа делегатов из этих городов, называющих себя Пятью Портами, начала создавать проблемы методичной софистикой в Утреннем Секретариате и на Национальном Пленуме, требуя уважения. В конечном счёте, Отэм Блейз позвала их в свой офис, чтобы разрешить вопрос.\n\n— Мы хотим чтобы нас воспринимали всерьёз, премьер, — заявила делегат из Гиацинта, столпившаяся с четырьмя товарищами по другую сторону стола Отэм. — Все деньги, внимание и политическое влияние стекаются к крупным городам, но большая часть населения живёт рядом с более мелкими населёнными пунктами, подобными нашим. Так и выходит, что для нескольких миллионов киринов по всей стране, наши порты являются легчайшим способом добраться до международных рынков сбыта, но при этом все регламенты и инфраструктурные гранты, похоже написаны так, будто бы Благоухание, Сияние, и Зеленеющий – единственные места, где кирину разрешено спустить корабль на воду.\n\nБлейз нахмурилась:\n— Я понимаю, что вас тревожит. Просто не уверена, чем я могу вам помочь. У вас есть какой-то более конкретный план?\n\nДелегат из Жасмина передал пачку бумаг через стол:\n— Мы хотим, чтобы вы показали это Секретариату и Пленуму. Это законопроект о создании новых приморских муниципалитетов, который предоставит нашим городам больше влияния на местном уровне и позволит выступать за интересы миллионов киринов наших пригородов.\n\nБлейз бегло просмотрела титульную страницу бумаги и сглотнула."
@@ -2195,6 +2196,14 @@ kirin.205.d:0 "Всё расширяющееся влияние Кирии ра
 kirin.205.a:0 "Выйдет ли из этого что-нибудь, теперь зависит от премьера."
 KIR_event_205_tt:0 "Разблокирует фокус: §YЗебридские военно-морские базы§!."
 
+kirin.206.t:0 "Благодать смирения"
+kirin.206.d:0 "Путь Огня, пожалуй, наиболее известен своими обрядами и общей напыщенностью, храмами, окутанными благовониями, и мистиками, одетыми в шёлк. Однако недавно в Киновари настал новый порядок, и храмы в городах по всей стране последовали этому примеру. Мистики отказались от прежних расшитых шёлком роб и снизошли до ношения простых одежд послушников из мешковины и джута, и путешествуют по всё ширящимся трущобам Кирии, раздавая милостыню местным нищим. Они перевозят с собой тележки с рисом, хлебом и рыбой на раздачу, помогают в меру сил в местных клиниках и госпиталях, заботятся о детях, чьи родители не могут должным образом делать это из-за работы, и обучают их.\n\nУ деревенских бедняков есть собственные поля, а если нет – то по крайней мере леса, в которых те могут прокормить себя и одеть, в то время как всё прирастающий класс городских бедняков, толпящихся в негигиеничных и попросту небезопасных трущобах, не имеет почти ничего, кроме вещей, которые они могут позволить себе на дневную заработную плату. Во время Безмолвия все кирины были бедны, но при том сыты и ухожены. Теперь же взошедшие из грязи в князи богачи выплеснулись на улицы богатейших районов, в то время как в трущобах голодают жеребята, а правительство показывает полную неспособность улучшить положение, лишь раздавая бесчисленные обещания. Уже сейчас возникают беспорядки на почве низкого уровня жизни бедного рабочего класса, а перспектива разрастания бунтов, ранее положивших начало Безмолвию, тяжким грузом висит над страной.\n\nПуть Огня, однако, и его благочестивые верующие, навечно связаны с волей Конкорд – и Конкорд не желает страдания её детей, а потому всё появляются новые благотворительные организации, собирающие всё больше и больше пожертвований для поддержки маленькой армии набожных добровольцев. На данный момент их сострадание – лучшая защита Кирии от революции."
+kirin.206.a:0 "Без щедрости народа Кирии наш Великий Скачок бы давно запнулся."
+
+kirin.207.t:0 "Течение, вдохновлённое указом"
+kirin.207.d:0 "Как ни странно, но после презентации, устроенной перед Секретариатом Партией за Царство и Гармонию, даже самым крайне правым партиям было нечего сказать против предложенного Закона о Реновации и Поддержке Городов. Да и что они могли сказать, когда им слайд за слайдом, пример за примером, показали крайнюю степень нищеты городского рабочего класса? Работники частных благотворительных организаций, задокументировавших всё это, часами свидетельствовали о том, что даже самые серьёзные их усилия лишь немного облегчали воздействие всё растущей бедности.\n\nЛишь самые непоколебимые могли смотреть на изображения голодных киринов, толпящихся вокруг бесплатных столовых, и оставаться бесчувственными – но даже они осознали, что голодные, недовольные массы горожан – это потенциальные союзники их соперников-марксистов. В конце концов обсуждение разгорелось лишь касаемо конкретных моментов, нежели самой сути и необходимости принятия нового закона.\n\nКогда же закон пришёл в действие, торговцы и директора предприятий в Благоухании выступили против выставленных им новых налоговых счётов, а также возникло много шума по поводу отмены правительственных контрактов, которые так ни к чему и не привели. В городах по всей стране правительству пришлось приложить немало усилий, чтобы приобрести склады и офисные здания для администрирования и выполнения новых обещаний помощи городским беднякам. Сельские фермеры же были более чем счастливы услужить отчаявшимся чиновникам, готовым скупать зерно за огромные деньги.\n\nВ трущобах, однако, при вступлении новых мер, в основном воцарились мир да благодать. Дешёвые хлеб и рис, продаваемые в убыток, хлынули в города и заполнили голодные желудки, а новые школы позволили удержать детей подальше от опасных улиц. За несколько недель тысячи киринов нашли стабильную работу на стройке новых домов на местах разросшихся трущоб Кирии. Хотя их расчистка и займёт годы – по крайней мере сейчас правительство не выйдет обвинить в безделии."
+kirin.207.a:0 "Стеснённая казна лучше, чем нечистая совесть."
+
 kirin.300.t:0 "Внесение поправок в устав партии"
 kirin.300.d:0 "— Мы находимся в особом положении и от нас ожидают, что мы будем играть по правилам системы, на которую мы согласились три с половиной года назад. — Сайпресс Сноу посмотрел на других членов совета. Обсуждение партийного устава НАКП продолжалось уже довольно долго, и он привычно разошёлся во мнениях с Ардентом Блумом. — Я знаю, что некоторые из нас считают конституцию чересчур удушающей, но её принципы разумны и обеспечивают стабильность. В будущем нет смысла поддерживать наши военные активы. Они лишь истощают наши финансы, и у нас достаточно рыночных возможностей, чтобы не прибегать к агрессивной экспансии. Их расформирование, отказ от агрессивного экспансионизма и сосредоточение усилий на "мягкой силе" полностью соответствует нынешнему курсу правительства и принесут нам немало добра.\n\n— Хотя я согласен с тем, что мы должны привести наш устав в соответствие с конституцией, защита чьей-либо собственности не является, не будет и не может быть спорной. — Доктор Ардент Блум вступил в разговор. — Ограничение нашей способности защищать свои активы ради демонстрации полного энтузиазма подчинения - это явная ошибка. Я выступаю за прекращение активного экспансионизма, этим мы можем пожертвовать, но наш мандат - это экономические интересы Кирии. Если мы надеемся выполнить его, то должны быть уверены, что сможем защитить наши интересы. А последние глобальные события точно не свидетельствуют о том, что корпоративный пацифизм будет наиболее разумным выбором.\n\n— Здесь обсуждается не пацифизм. Мы говорим об агрессии, а не о безопасности. Если ситуация оказалась настолько несостоятельной, что потребовалась активное применение силы, то мы должны выводить войска, а не развёртывать их. Это не крайность, это стандартная операционная процедура для компаний по всему миру. Более того, высвободившиеся активы можно будет использовать для других, более мирных предприятий. Хотим ли мы инвестировать в будущее или цепляться за старую денежную яму? — Взгляды других членов правления становились всё более благосклонными к этой идее, и Сайпресс Сноу улыбнулся."
 kirin.300.a:0 "Наша высшая цель - мир и процветание Кирии."
@@ -2253,9 +2262,10 @@ kirin.309.t:0 "Армейский Сектор Дальнего Юга"
 kirin.309.d:0 "Для преодоления нынешнего кризиса на дальнем юге дела Кирии в этом регионе будут переданы под контроль Армейского Сектора Дальнего Юга. Этот новый орган власти, который возглавляет верховный главнокомандующий KIRFORS, генерал по имени [KIRGetFSGeneralName], будет, как мы надеемся, способствовать нашей военной интервенции в регионе и минимизировать финансовую и логистическую нагрузку на вооружённые силы. Армейский Сектор получит значительную автономию и сможет принимать решения о том, как поступать в тех или иных ситуациях, не дожидаясь прямого одобрения Киновари. Несмотря на радикальность этой меры, она представляется наилучшим способом обеспечить скорейшее прекращение военных действий."
 kirin.309.a:0 "Армия, имеющая своё государство."
 
-kirin.310.t:0 "Создание лагерей для интернированных"
-kirin.310.d:0 "Местные племена разбросаны по джунглям и в настоящее время они оказывают нам яростное сопротивление. Киноварь требует минимальных потерь среди "гражданских", но оставленное на месте своего проживания племя будет служить центром снабжения для сражающихся против нас групп сопротивления. Для решения этой проблемы племена будут переселены в безопасные зоны, чтобы никто больше не смог снабжать партизан.\n\nПроживающим в лагерях будут предоставлены надлежащие бытовые условия и жильё. На территории лагеря будут находиться врачи для предотвращения вспышек заболеваний, а на время пребывания в этом месте жителям племён будет предоставлено образование и возможность зарабатывать на жизнь с помощью ССВК. Для безопасности обитателей сами лагеря будут укреплены и находиться под постоянной охраной, а между внешним забором и джунглями от растительности будет расчищена полоса шириной не менее ста метров .\n\nДля обеспечения успеха кампании переселение в безопасные зоны будет обязательным, и местные командиры должны использовать все возможности, чтобы не лишить наших противников любых припасов.\n\nПриказ верховного командующего KIRFORS, генерала Хиссоп Гарнета"
+kirin.310.t:0 "Создание безопасных зон"
+kirin.310.d:0 "Местные племена разбросаны по джунглям и в настоящее время они оказывают нам яростное сопротивление. Киноварь требует минимальных потерь среди "гражданских", но оставленное на месте своего проживания племя будет служить центром снабжения для сражающихся против нас групп сопротивления. Для решения этой проблемы племена будут переселены в "безопасные зоны", чтобы никто больше не смог снабжать партизан.\n\nПроживающим в зонах будут предоставлены надлежащие бытовые условия и жильё. На территории лагеря будут находиться врачи для предотвращения вспышек заболеваний, а на время пребывания в этом месте жителям племён будет предоставлено образование и возможность зарабатывать на жизнь с помощью ССВК. Для безопасности обитателей сами лагеря будут укреплены и находиться под постоянной охраной, а между внешним забором и джунглями от растительности будет расчищена полоса шириной не менее ста метров .\n\nДля обеспечения успеха кампании переселение в безопасные зоны будет обязательным, и местные командиры должны использовать все возможности, чтобы не лишить наших противников любых припасов.\n\nПриказ верховного командующего KIRFORS, генерала Хиссоп Гарнета"
 kirin.310.a:0 "Это делается для их же блага."
+KIR_event_310_tt:0 "Откроет оккупационные законы §YПринудительный труд§! и §YЖёсткие нормы§! для [IDO.GetFlag] §Y[IDO.GetAdjective]их§!, [IST.GetFlag] §Y[IST.GetAdjective]их§! и [DEL.GetFlag] §Y[DEL.GetAdjective]их§! оккупированных территорий.\n"
 
 kirin.311.t:0 "Приказ на построение государства"
 kirin.311.d:0 "Несмотря на уже достигнутые успехи, сопротивление местных жителей не ослабевает из-за культурного и духовного давления со стороны местных шаманов, которые ближе всего к представителям центральной власти в этих землях. Если мы хотим обезопасить полуостров, нам необходимо разрушить их власть над населением и создать светское лидерство для региона. Для этого необходимо расширить возможности прибрежных племён, с которыми мы установили первые контакты, и доверить им власть.\n\nПосле эвакуации племён в ранее созданные безопасные зоны мы сможем создать новые административные провинции на территориях без риска разделения демографических групп провинциальными границами. В долгосрочной перспективе мы сможем заложить основы современной администрации в этих регионах путём создания учреждений вроде судов, полицейских участков и школ, персонал которых будет проходить обучение в Кирии, чтобы поспособствовать созданию реального [DEL.GetAdjective]ого государства. Эти провинции станут основой новой [DEL.GetAdjective]ой республики, основанной на светском праве и народном самоуправлении.\n\nДля того чтобы основание нового государства прошло гладко, будут предприняты следующие меры:\n* Ускоренное строительство необходимой охранной и административной инфраструктуры.\n* Развёртывание [DEL.GetAdjective]их вспомогательных отрядов в зонах низкого риска, чтобы местные жители привыкли к их присутствию.\n* Проведение изучения и перераспределения земель между племенами для обеспечения равного распределения ресурсов.\n* Насильственные действия в охраняемых зонах отныне будут рассматриваться как бандитизм и пресекаться в соответствии с кирийским военным законодательством.\n* Арест и заключение под стражу шаманов, находящихся в охраняемых зонах, до стабилизации ситуации.\n\nПриказ верховного командующего KIRFORS, генерала Хиссоп Гарнета"
@@ -2318,14 +2328,14 @@ kirin.333.d:0 "— Аконит, да? Я так понимаю, вы воева
 kirin.333.a:0 "— Это будет зависеть от ваших действий, капитан."
 
 kirin.334.t:0 "Досье "Первый свет"" ## Happens if Hyssop Garnet is KIRFORS commander and you did war crimes in DEL.
-kirin.334.d:0 "После катастрофического разрушения Золотого Города деятельность KIRFORS на дальнем юге оказалась под пристальным вниманием. То, что задумывалось как вмешательство для защиты наших местных партнёров, полностью вышло из-под контроля. Вопросы задают политики, журналисты и члены семей, потерявших своих близких в результате плохо оправданного конфликта, который привел к гибели бесчисленного количества существ.\n\nИ хотя поначалу предпринимались попытки контролировать ход событий, ситуация полностью полетела под откос, когда в крупнейшие кирийские газеты поступило анонимное досье, озаглавленное простым "Первый свет". Досье содержало фотографии, копии писем и внутреннюю документацию KIRFORS. В нём рассказывалось о том, что "лагеря для интернированных", созданные для защиты местных племён, представляют собой не более чем сырые тюремные лагеря, где свирепствуют болезни и недоедание, а пленные жители часто привлекаются к рабскому труду. Местные фигуры, обладающие властью, и религиозные лидеры арестовывались и помещались в тюрьмы, причем условия в них нередко были столь ужасающи, что большинство заключённых там не выживало. Религиозные объекты и деревни бездумно уничтожались, если считалось, что они мешают, а агенты ССВК организовывали захват земель по всему региону. Кроме того, досье показало, что многочисленные политики и бизнесмены из НАКП, связанные с ССВК, оказывали давление на верховного командующего KIRFORS генерала Хиссопа Гарнета, чтобы он скрыл эти тяжкие злодеяния, о которых ему сообщали сотрудники KIRFORS и гражданские свидетели.\n\nТекст на последней странице досье, а также ставшая уже культовой фотография истощённого жеребёнка-зебры в объятиях своей матери, украшают первые полосы газет по всему царству:\n"ВОТ великий шаг Кирии в широкий мир: забирать всё желаемое под дулом оружия.\nВОТ какое "наставничество" предлагает Кирия своим соседям: заковать их в кандалы и разрушить их образ жизни.\nВОТ как Кирия создаёт будущее: творит пустошь и называет это гармонией."\n\nНа спешно созванной пресс-конференции премьер-министр Отэм Блейз, у которой под глазами залегли тёмные мешки, пообещала провести независимое расследование и привлечь к ответственности всех причастных. По всему царству и, в частности, в Благоухании, МРПК и профсоюзы провели массовые акции протеста против своих делегатов от НАКП в провинциях и мэриях, в том числе против тех членов мощной партийной машины НАКП, которые были упомянуты в досье. Многие представители Благоухания заявили, что будут бойкотировать НАКП, и популярность НАКП резко упала, от чего Ассоциация, возможно, уже никогда не оправится."
+kirin.334.d:0 "После катастрофического разрушения Золотого Города деятельность KIRFORS на дальнем юге оказалась под пристальным вниманием. То, что задумывалось как вмешательство для защиты наших местных партнёров, полностью вышло из-под контроля. Вопросы задают политики, журналисты и члены семей, потерявших своих близких в результате плохо оправданного конфликта, который привел к гибели бесчисленного количества существ.\n\nИ хотя поначалу предпринимались попытки контролировать ход событий, ситуация полностью полетела под откос, когда в крупнейшие кирийские газеты поступило анонимное досье, озаглавленное простым "Первый свет". Досье содержало фотографии, копии писем и внутреннюю документацию KIRFORS. В нём рассказывалось о том, что "безопасные зоны", созданные для защиты местных племён, представляют собой не более чем сырые тюремные лагеря, где свирепствуют болезни и недоедание, а пленные жители часто привлекаются к рабскому труду. Местные фигуры, обладающие властью, и религиозные лидеры арестовывались и помещались в тюрьмы, причем условия в них нередко были столь ужасающи, что большинство заключённых там не выживало. Религиозные объекты и деревни бездумно уничтожались, если считалось, что они мешают, а агенты ССВК организовывали захват земель по всему региону. Кроме того, досье показало, что многочисленные политики и бизнесмены из НАКП, связанные с ССВК, оказывали давление на верховного командующего KIRFORS генерала Хиссопа Гарнета, чтобы он скрыл эти тяжкие злодеяния, о которых ему сообщали сотрудники KIRFORS и гражданские свидетели.\n\nТекст на последней странице досье, а также ставшая уже культовой фотография истощённого жеребёнка-зебры в объятиях своей матери, украшают первые полосы газет по всему царству:\n"ВОТ великий шаг Кирии в широкий мир: забирать всё желаемое под дулом оружия.\nВОТ какое "наставничество" предлагает Кирия своим соседям: заковать их в кандалы и разрушить их образ жизни.\nВОТ как Кирия создаёт будущее: творит пустошь и называет это гармонией."\n\nНа спешно созванной пресс-конференции премьер-министр Отэм Блейз, у которой под глазами залегли тёмные мешки, пообещала провести независимое расследование и привлечь к ответственности всех причастных. По всему царству и, в частности, в Благоухании, МРПК и профсоюзы провели массовые акции протеста против своих делегатов от НАКП в провинциях и мэриях, в том числе против тех членов мощной партийной машины НАКП, которые были упомянуты в досье. Многие представители Благоухания заявили, что будут бойкотировать НАКП, и популярность НАКП резко упала, от чего Ассоциация, возможно, уже никогда не оправится."
 kirin.334.a:0 "Как мы это допустили!?"
 KIR_event_334_tt:0 "[1071.GetName] §Rбольше не будет форпостом§! §YНациональной Ассоциации Киринов-Патриотов§!."
 KIR_event_334_tt_2:0 "(@KIR§YОтэм Блейз§!) получит черту §Y'Усталость'§!, которая даёт (Прирост политической власти: §R-5%§!) в течении §Y90§! дней."
 KIR_tired_trait:0 "Усталость"
 
 kirin.335.t:0 "Отчёт о событиях в Таларае"
-kirin.335.d:0 "Отчёт был похож на историю ужасов, и от осознания того, что именно она позволила воплотиться этому в реальности, Отэм Блейз стало не по себе. План Хиссопа Гарнета "шок и трепет" оказался неэффективным, и вся кампания превратилась в затяжную войну на истощение с массовыми убийствами, где для борьбы с мобильными племенами приходилось выжигать джунгли и сгонять местных жителей в концентрационные лагеря. А хуже всего было то, что сразу за KIRFORS следовала ССВК и в тесном сотрудничестве с военными захватывала земли для "дальнейшего развития".\n\nИх план был понятен: сломить местных жителей и использовать их в качестве дешёвой рабочей силы для добычи ресурсов на земле их предков, которая теперь принадлежала ССВК. Это была не оборонительная война, а война ради завоевания и порабощения. И Отэм была в ней повинна. Она должна была бы рассердиться, даже разгневаться, но она могла чувствовать лишь всепоглощающий стыд. Она сделала это. Она позволила этим событиям произойти...\n\n— Немедленно отзовите Хиссопа Гарнета. Освободите его от командования и отстраните от исполнения служебных обязанностей до дальнейшего дисциплинарного взыскания. — Она подняла глаза на министров, сидевших рядом с ней за столом. — Возьмите KIRFORS под контроль и начните выведение его сил. Если потребуется, разверните регулярные войска. Я хочу, чтобы все члены правления ССВК были арестованы. Составьте план, чтобы мы могли освободить зебр из этих проклятых лагерей и восстановить их жизнь настолько, насколько это вообще возможно.\n\n— Что мы будем делать с Талараем? — Спросил кто-то. Отэм Блейз была в таком смятении, что даже не заметила, кто это был. Действительно, что именно с ними будет?"
+kirin.335.d:0 "Отчёт был похож на историю ужасов, и от осознания того, что именно она позволила воплотиться этому в реальности, Отэм Блейз стало не по себе. План Хиссопа Гарнета "шок и трепет" оказался неэффективным, и вся кампания превратилась в затяжную войну на истощение с массовыми убийствами, где для борьбы с мобильными племенами приходилось выжигать джунгли и сгонять местных жителей в "Безопасные зоны". А хуже всего было то, что сразу за KIRFORS следовала ССВК и в тесном сотрудничестве с военными захватывала земли для "дальнейшего развития".\n\nИх план был понятен: сломить местных жителей и использовать их в качестве дешёвой рабочей силы для добычи ресурсов на земле их предков, которая теперь принадлежала ССВК. Это была не оборонительная война, а война ради завоевания и порабощения. И Отэм была в ней повинна. Она должна была бы рассердиться, даже разгневаться, но она могла чувствовать лишь всепоглощающий стыд. Она сделала это. Она позволила этим событиям произойти...\n\n— Немедленно отзовите Хиссопа Гарнета. Освободите его от командования и отстраните от исполнения служебных обязанностей до дальнейшего дисциплинарного взыскания. — Она подняла глаза на министров, сидевших рядом с ней за столом. — Возьмите KIRFORS под контроль и начните выведение его сил. Если потребуется, разверните регулярные войска. Я хочу, чтобы все члены правления ССВК были арестованы. Составьте план, чтобы мы могли освободить зебр из этих проклятых лагерей и восстановить их жизнь настолько, насколько это вообще возможно.\n\n— Что мы будем делать с Талараем? — Спросил кто-то. Отэм Блейз была в таком смятении, что даже не заметила, кто это был. Действительно, что именно с ними будет?"
 kirin.335.a:0 "Мы уйдём насовсем. Мы причинили им достаточно вреда."
 KIR_event_335a_tt:0 "\n[DEL.GetFlag] §YТаларай§! будет освобождён от ига [KIR.GetFlag] Кирии: the £SET_flag  §YТерритория Предприятия Южного Моря§! будет упразднена, а KIRFORS будут выведены с дальнего юга.\n\n§LМы уже причинили огромные страдания, так что Кирия уйдёт с дальнего юга и предоставит местным жителям возможность восстановиться их собственными силами. Вакуум власти приведёт к дальнейшей междоусобице среди племён, но их судьбу будут решать уже они сами, а не Кирия.§!"
 kirin.335.b:0 "Мы должны возместить отнятое у них..."
@@ -2379,7 +2389,7 @@ KIR_event_350_tt:0 "Будет создана £SET_flag  §YТерритори
 KIR_event_350a_tt:0 "Будет создана £SET_flag  §YТерритория Предприятия Южного Моря§!, заменив £FSA_flag  §YАрмейский Сектор Дальнего Юга§!.\n"
 
 KIR_FS_WAR_TITLE:0 "Война на дальнем Юге"
-KIR_FS_WAR_TITLE_desc:0 "§OВоенная интервенция на дальний Юг§! это не совсем обычная война, а иностранная военная экспедиция, в которой участвует специально сформированный отряд — §YKIRFORS§!, которым командует §YВГенерал§! [KIRGetFSGeneralName], чья задача - достигнуть ряда конкретных и ограниченных целей на данном театре военных действий.[KIRCoralRiverMissing]"
+KIR_FS_WAR_TITLE_desc:0 "§OВоенная интервенция на дальний Юг§! это не совсем обычная война, а иностранная военная экспедиция, в которой участвует специально сформированный отряд — §YKIRFORS§!, которым командует §YГенерал§! [KIRGetFSGeneralName], чья задача - достигнуть ряда конкретных и ограниченных целей на данном театре военных действий.[KIRCoralRiverMissing]"
 KIRCoralRiverMissing_tt:0 " Однако генерал Корал Ривер §Rпропала§!, оставив силы Кирии на юге под командованием её заместителя Танбарк Оака."
 KIR_tanbark_oak:0 "Танбарк Оак"
 KIR_FS_DEC_1:0 "Прибрежная операция 'Прогрев побережья'" ## These cost Army XP and Command Power
@@ -2432,9 +2442,9 @@ KIR_DEL_BAT_CAP_Valiants_tt:0 " и §YХрабрецов§!"
 
 KIR_DEL_War_Limit_Real:0 "Мандат KIRFORS истёк"
 KIR_DEL_War_Limit_A:0 "Мандат KIRFORS"
-KIR_DEL_War_Limit_A_desc:0 ""
+KIR_DEL_War_Limit_A_desc:0 "Опасаясь последствий того, что Кирия дебютирует на мировой арене как региональный агрессор-интервенционист, межрегиональный блок делегатов Секретариата от "Объединения за гармонию" и "Пробуждённой Кирии" проголосовал за внедрение тщательно проработанного мандата, определяющего полномочия KIRFORS в рамках интервенции на дальнем юге."
 KIR_DEL_War_Limit:0 "Мандат KIRFORS"
-KIR_DEL_War_Limit_desc:0 ""
+KIR_DEL_War_Limit_desc:0 "Опасаясь последствий того, что Кирия дебютирует на мировой арене как региональный агрессор-интервенционист, межрегиональный блок делегатов Секретариата от "Объединения за гармонию" и "Пробуждённой Кирии" проголосовал за внедрение тщательно проработанного мандата, определяющего полномочия KIRFORS в рамках интервенции на дальнем юге."
 KIR_DEL_War_Limit_M1:0 "Максимальное число батальонов и рот обеспечения, за исключением §Yнерегулярной пехоты§!, которое мы можем разместить в регионах §YИпагапенед§!, §YБалаганей§!, §YБалисилак§!, §YТукидай§!, §YГлаан§! и §YКаруюнган§! равно"
 KIR_DEL_War_Limit_M1_A:0 "Максимальное число батальонов и рот обеспечения, за исключением §Yнерегулярной пехоты§![ и §YХрабрецов§!, которое мы можем разместить в регионах §YИпагапенед§!, §YБалаганей§!, §YБалисилак§!, §YТукидай§!, §YГлаан§! и §YКаруюнган§! равно"
 KIR_DEL_War_Limit_M2:0 "\nТекущее число батальонов и рот обеспечения на поле боя равно"
@@ -2609,11 +2619,11 @@ kirin_loyalists.16.d:0 "Эмбер Уэйн стоял на травянисто
 kirin_loyalists.16.a:0 "Наши враги будут раздавлены их металлическими копытами!"
 
 kirin_loyalists.17.t:0 "Утонувшие в ереси" ##only fires if not allied with Rising Fire
-kirin_loyalists.17.d:0 "Мирную тишину над озером нарушили беспорядочные крики, и пара журавлей, спасаясь от суматохи, улетела в небо. Внизу, на берегу, жители близлежащего городка следовали за процессией жрецов Пути Огня к воде, где отряд солдат тащил на небольшую баржу несколько связанных и избитых киринов. Некоторые из пленников сопротивлялись, другие плакали, а остальные, похоже, смирились со своей участью.\n\nКогда кирины образовали нестройный полукруг на берегу, самая старшая священница обратилась к ним. — Кирины, которых вы видите перед собой, были судимы и осуждены за наиболее непростительную ересь, — торжественно возвестила она. — Они действовали против интересов матриарха, царства и самой Конкорд, поверив в ложь и обман Разгорающегося Пламени. За это они были приговорены к достойной еретика смерти, дабы их предательство послужило примером для тех, кто отвернётся от Конкорд.\n\nОдин за другим солдаты на барже грубо заталкивали пленников в огнеупорные мешки, зашивая единственное отверстие тяжелым шнуром, к которому были привязаны свинцовые грузы. Последняя пленница брыкалась и кричала, понимая, что сейчас произойдёт, и потребовалось три солдата, чтобы затолкать сопротивляющуюся кобылу в мешок. — Нет! — Закричала она во всю мощь своих лёгких. — Я невиновна, клянусь! Я люблю Конкорд! Я люблю матриарха! Нет, не делайте этого! — Но её крики никого не интересовали. Рот кобылы насильно заткнули кляпом, после чего она оказалась в мешке подобно её товарищам по несчастью.\n\nПока солдаты с шестами двигали баржу на середину озера, священница продолжала свою проповедь перед собравшимися. — Когда мы умираем, наши тела сжигаются, чтобы наше пламя могло воссоединиться с Первородным Огнём, который Конкорд поддерживает на небесах. Но то, что оказалось в воде, никогда не сгорит. Такова судьба всех еретиков: рыбы будут пировать их плотью, не оставив после них ничего, кроме обглоданных костей. А души этих еретиков останутся вечно страдать в этом мире. Пусть это послужит уроком и предупреждением для тех, кто возьмётся за оружие и выступит против матриарха и царства: за ересь всегда придётся платить и только истинная преданность позволит Конкорд гордиться своими жеребятами.\n\nЕё последние слова сопровождались звуками нескольких всплесков, когда солдаты пинками начали сбрасывать в озеро извивающиеся мешки."
+kirin_loyalists.17.d:0 "Мирную тишину над озером нарушили беспорядочные крики, и пара журавлей, спасаясь от суматохи, улетела в небо. Внизу, на берегу, жители близлежащего городка следовали за процессией жрецов Пути Огня к воде, где отряд солдат тащил на небольшую баржу несколько связанных и избитых киринов. Некоторые из пленников сопротивлялись, другие плакали, а остальные, похоже, смирились со своей участью.\n\nКогда кирины образовали нестройный полукруг на берегу, самая старшая священница обратилась к ним. — Кирины, которых вы видите перед собой, были судимы и осуждены за наиболее непростительную ересь, — торжественно возвестила она. — Они действовали против интересов матриарха, царства и самой Конкорд, поверив в ложь и обман Разгорающегося Пламени. За это они были приговорены к достойной еретика смерти, дабы их предательство послужило примером для тех, кто отвернётся от Конкорд.\n\nОдин за другим солдаты на барже грубо заталкивали пленников в огнеупорные мешки, зашивая единственное отверстие тяжёлым шнуром, к которому были привязаны свинцовые грузы. Последняя пленница брыкалась и кричала, понимая, что сейчас произойдёт, и потребовалось три солдата, чтобы затолкать сопротивляющуюся кобылу в мешок. — Нет! — Закричала она во всю мощь своих лёгких. — Я невиновна, клянусь! Я люблю Конкорд! Я люблю матриарха! Нет, не делайте этого! — Но её крики никого не интересовали. Рот кобылы насильно заткнули кляпом, после чего она оказалась в мешке подобно её товарищам по несчастью.\n\nПока солдаты с шестами двигали баржу на середину озера, священница продолжала свою проповедь перед собравшимися. — Когда мы умираем, наши тела сжигаются, чтобы наше пламя могло воссоединиться с Первородным Огнём, который Конкорд поддерживает на небесах. Но то, что оказалось в воде, никогда не сгорит. Такова судьба всех еретиков: рыбы будут пировать их плотью, не оставив после них ничего, кроме обглоданных костей. А души этих еретиков останутся вечно страдать в этом мире. Пусть это послужит уроком и предупреждением для тех, кто возьмётся за оружие и выступит против матриарха и царства: за ересь всегда придётся платить и только истинная преданность позволит Конкорд гордиться своими жеребятами.\n\nЕё последние слова сопровождались звуками нескольких всплесков, когда солдаты пинками начали сбрасывать в озеро извивающиеся мешки."
 kirin_loyalists.17.a:0 "Мы не позволим ереси сбить нас с пути."
 
 kirin_loyalists.18.t:0 "Свободная или допустимая религия?"
-kirin_loyalists.18.d:0 "После начала гражданской войны Утренний Секретариат долгое время был закрыт, но сегодня его вновь открыли для всех желающих. Внутри собрались представители фракций, всё ещё лояльных Киновари. Они желали стать свидетелями знаменательного исторического соглашения, которое должна была озвучить сама высшая матриарх Рейн Шайн. Матриарх сделает беспрецедентный шаг, осудив преследование Разгорающегося Пламени, которое в это неспокойное время оставалось верным союзником Киновари, даже несмотря на свои религиозные разногласия с Путём Огня.\n\nКонечно, всё было не так просто. Ещё до приезда матриарха представители обеих сект успели обсудить некоторые спорные детали готовящегося провозглашения. Спор вели Райзин Сан и Винтер и две кобылы буквально столкнулись рогами в центре Секретариата. — Думаешь, я не понимаю что это такое? — Винтер Фрост бросила вызов, обнажив зубы, которые, несмотря на попытки сдержать ярость, стали пугающе длинными. — Как только твоя ересь будет разрешена, ты и твои последователи сделаете всё возможное, чтобы распространить её, подобно мору, по царству.\n\n— Если ты не признаешь право Разгорающегося Пламени на сосуществование с Путём Огня, то я и мои сторонники тут же покинем этот зал и заключим мир с севером, — высказала встречную угрозу Сан. — Тогда-то вы все будете в одиночку противостоять промышленному гневу Фикл Каррента.\n\nВинтер зашипела, но в угрозе Райзин Сан ей почудились оскаленные клыки. — Я не откажусь от своей поддержки в последний момент, — заверила она наконец Сан. — Но Путь Огня - это государственная религия Кирии, и она была нашим спасением на протяжении веков. Я хочу, чтобы в соглашение был внесён пункт о том, что Путь Огня имеет приоритет над Разгорающимся Пламенем во всех вопросах. Особенно в том, что преподается и спонсируется государством.\n\n— Ты обвиняешь меня в обмане ради личной выгоды, а затем пытаешься подчинить меня своей ортодоксальной вере? — Сан ощетинилась, — Я ни за что не допущу, чтобы такой пункт попал в соглашение. Если тебе действительно нужен знак доброй воли, то как насчёт такого: мы согласимся, чтобы Путь Огня продолжил быть государственной религией, если вы согласитесь не вмешиваться в наше право исповедовать наши убеждения. Я получаю то, что хочу. Ты получаешь то, что хочешь. Все довольны, так? Если нет, то я отказываюсь от поддержки как этого соглашения, так и самой Киновари."
+kirin_loyalists.18.d:0 "После начала гражданской войны Утренний Секретариат долгое время был закрыт, но сегодня его вновь открыли для всех желающих. Внутри собрались представители фракций, всё ещё лояльных Киновари. Они желали стать свидетелями знаменательного исторического соглашения, которое должна была озвучить сама Рейн Шайн. Матриарх сделает беспрецедентный шаг, осудив преследование Разгорающегося Пламени, которое в это неспокойное время оставалось верным союзником Киновари, даже несмотря на свои религиозные разногласия с Путём Огня.\n\nКонечно, всё было не так просто. Ещё до приезда матриарха представители обеих сект успели обсудить некоторые спорные детали готовящегося провозглашения. Спор вели Райзин Сан и Винтер и две кобылы буквально столкнулись рогами в центре Секретариата. — Думаешь, я не понимаю что это такое? — Винтер Фрост бросила вызов, обнажив зубы, которые, несмотря на попытки сдержать ярость, стали пугающе длинными. — Как только твоя ересь будет разрешена, ты и твои последователи сделаете всё возможное, чтобы распространить её, подобно мору, по царству.\n\n— Если ты не признаешь право Разгорающегося Пламени на сосуществование с Путём Огня, то я и мои сторонники тут же покинем этот зал и заключим мир с севером, — высказала встречную угрозу Сан. — Тогда-то вы все будете в одиночку противостоять промышленному гневу Фикл Каррента.\n\nВинтер зашипела, но в угрозе Райзин Сан ей почудились оскаленные клыки. — Я не откажусь от своей поддержки в последний момент, — заверила она наконец Сан. — Но Путь Огня - это государственная религия Кирии, и она была нашим спасением на протяжении веков. Я хочу, чтобы в соглашение был внесён пункт о том, что Путь Огня имеет приоритет над Разгорающимся Пламенем во всех вопросах. Особенно в том, что преподается и спонсируется государством.\n\n— Ты обвиняешь меня в обмане ради личной выгоды, а затем пытаешься подчинить меня своей ортодоксальной вере? — Сан ощетинилась, — Я ни за что не допущу, чтобы такой пункт попал в соглашение. Если тебе действительно нужен знак доброй воли, то как насчёт такого: мы согласимся, чтобы Путь Огня продолжил быть государственной религией, если вы согласитесь не вмешиваться в наше право исповедовать наши убеждения. Я получаю то, что хочу. Ты получаешь то, что хочешь. Все довольны, так? Если нет, то я отказываюсь от поддержки как этого соглашения, так и самой Киновари."
 kirin_loyalists.18.a:0 "Стоит проявить добрую волю и к Райзин Сан..." ##Feel free to modify the premise to make it make more sense intuitively. But make sure it reflects the effects (+5 communism, or +3 communism and -3 drift defence)
 kirin_loyalists.18.b:0 "Хорошо, мы согласны на компромисс."
 
@@ -2659,7 +2669,7 @@ KIR_loyalist_event_26_tt:0 "§RНачалась вторая Какофония.
 kirin_loyalists.260.t:0 "Царство в руинах" ## Loc duplicate of kirin_loyalists.26
 kirin_loyalists.260.d:0 "Киноварь пылала.\n\nНикто не знал, кто первым поджёг фитиль. Но каждый кирин мог выпустить потенциальное инферно и кто-то не смог сдержаться. Киноварь, величайшее поселение Царства Кирия и священный город, с помощью которого Путь Огня веками поддерживал мир в державе, был практически превращён в пепел.\n\nСлухи распространялись по царству как дым от разрушенного города. Кто-то попытался совершить переворот, но никто не знал, кто нанёс удар первым. Трупы мистиков Круга Безмятежных лежали на улицах, а воды Великой Медоносной уносили тела мёртвых аколитов Разгорающегося Пламени. На улицах бушевали нирики, а их бездумные вопли ярости создавали какофонию истинного апокалипсиса над разрушенной столицей.\n\nЭти слухи доходили до фронта куда быстрее телеграфных или радио сообщений. Сначала последствия были локальны, но вскоре один тлеющий уголёк разжёг большой костер. Солдаты Пути Огня и Разгорающегося Пламени ополчились друг на друга по всему фронту, в жестокой кровавой бойне уничтожая своих бывших союзников. Попав под перекрёстный огонь, гармонисты ПзЦГ отвечали на атаку контратакой. Дивизии распадались, а командная цепочка была разрушена. Существовало только одно правило: убей или будь убит. Ни друзей, ни союзников больше не было.\n\nКогда Киноварь горела, матриарх исчезла в дыму. Никто не знал, что случилось с Рейн Шайн, но когда пламя угасло, от неё не осталось и следа. Была ли она мертва? Спряталась? Её тело так и не было найдено, но от дворца после пожаров мало что осталось. Осталась лишь ненависть, яростная и жестокая, и сторонники каждой из трёх партий, некогда сражавшихся за защиту царства, сплотились вокруг своих лидеров как во времена старых военачальников-нириков. По жестокой иронии судьбы, только НАКП осталась в здравом уме - единственное государство, не искажённое ненавистью нириков.\n\nТолько время покажет, удастся ли им потушить пламя или инферно охватит и Фикл Каррента, и его союзников."
 kirin_loyalists.260.a:0 "НАКП - последняя надежда на стабильное царство."
-KIR_loyalist_event_260_tt:0 "\nБудут сформированы и развёрнуты §Yшесть §W(§!6§W)§! следующих подразделений§! §CАрмии взаимной защиты от нириков§!:\n  - '§YPrincess Fall Shade§!' Anti-Nirik Patriotic Regiment\n  - No. 2 Anti-Nirik Patriotic Army '§YSave the Realm§!'\n  - All-Kiria Business and Trade Circles Patriotic Salvation Roundtable Volunteer Brigade\n  - No. 3 Anti-Nirik Mutual Protection Army '§YFragrancese Volunteer Rifles§!'\n  - No. 5 Anti-Nirik Mutual Protection Army\n  - No. 6 Anti-Nirik Mutual Protection Army"
+KIR_loyalist_event_260_tt:0 "\nБудут сформированы и развёрнуты §Yшесть §W(§!6§W)§! следующих подразделений§! §CАрмии взаимной защиты от нириков§!:\n  - Анти-нирикский патриотический полк '§YТени Осени§!'\n  - Анти-нирикский патриотическая армия No. 2 '§YСпасение Царства§!'\n  - Всекирийская добровольческая бригада по патриотическому спасению бизнеса и торговли Царства\n  - Анти-нирикская армия взаимной защиты No. 3 '§YДобровольцы Благоухания§!'\n  - Анти-нирикская армия взаимной защиты No. 5\n  - Анти-нирикская армия взаимной защиты No. 6"
 
 kirin_loyalists.27.t:0 "Восстанавливающееся царство" ##Standard Kiria Successful Grand Gallop Onward Focus Tree sans NAKP/Fickle Current branch.
 kirin_loyalists.27.d:0 "Когда в Киновари наступил рассвет, на поле боя прогремел последний выстрел... а затем наступила тишина. Премьер Отэм Блейз стояла у порога зала Утреннего Секретариата и смотрела на восход солнца, которое сначала осветило восточную часть неба, а затем превратилось в яркий золотой диск, пробивающийся сквозь утреннюю дымку и далёкий чёрный смог порохового дыма. Вчера в полночь Ферн Флэйр разбудила её и сообщила, что Благоухание капитулировало и что война окончена.\n\nС тех пор она не спала. Впервые за бесчисленное количество дней ей показалось, что кошмар закончился и она наконец-то проснулась.\n\nКогда она вошла внутрь, Секретариат наполнился восторженной болтовней, которая внезапно смолкла, когда Премьер впервые с начала войны официально появилась в Секретариате. Шаги её копыт гулко отдавались в тишине зала. Отэм, не привыкшая к тишине, поняла, что в её голове проносятся мысли, которые она пока не может выразить словами. Она собиралась объявить о завершении самого страшного периода в истории царства с момента его основания, который был даже хуже Безмолвия. Она собиралась объявить о заключении соглашения о разделе власти между Путём Огня и Разгорающимся Пламенем, которое было выработано в ходе бесчисленных дебатов на протяжении всей войны. Она собиралась объявить о проекте реконструкции, чтобы вернуть Великое Провидение в состав царства и продолжить осторожную модернизацию с того момента, где Великий Скачок Вперёд потерпел неудачу. Она собиралась объявить бесчисленным семьям царства, что их сыновья и дочери, братья и сестры, отцы и матери наконец-то вернутся домой.\n\nКогда она наконец заняла трибуну и окинула взглядом собравшихся, то увидела, что тысячи глаз следят за ней, затаив дыхание. И тогда Отэм одним чётким заявлением нарушила тишину, как уже нарушила её однажды, казалось, целую жизнь назад."
@@ -2696,11 +2706,11 @@ kirin_loyalists.285.a:0 "— Скажите ей, что мы согласны.
 kirin_loyalists.285.b:0 "— Мы отказываемся. Я встречусь с ней лично. Поставьте генералов в известность."
 
 kirin_loyalists.286.t:0 "Допустимый риск"
-kirin_loyalists.286.d:0 "Охрана здания номер 88 на площади Хризантем вела Ферн по коридорам. В открытых дверях виднелись горы бумаг и слышались звонки, посвящённые разговорам о продаже или эвакуации. Пара охранников заблокировала дверь, за которой нирик ревел о падении акций.\n\nЕё завели в офис вице-короля. С другой стороны стола стоял Сайпресс Сноу, а рядом с ним - измождённый Фикл, терзающий свой растрёпанный галстук. Груда документов н6а столе пыталась выглядеть так, будто её разложили по какой-то системе, но это было бесполезно. — Выглядишь не лучшим образом, — сказала Ферн.\n\n— Длинная ночь, — ответил Фикл. — Это ещё не конец. Нам предстоит проработать множество деталей. — Страницы, окружённые аурой его магии, поплыли в сторону Ферн. Наиболее важные разделы этих бумаг были подчёркнуты. — Единственная серьёзная уступка, о которой мы просим вас - это выделение охраны для меня и моей группы до тех пор, пока мы не покинем кирийские воды. — Ферн пролистала бумаги. Всё соответствовало заранее присланной телеграмме: [KIS.GetNameDef] мирно войдёт в состав Царства. Также там был список чиновников НАКП, которым заплатили за сотрудничество с Царством в качестве "экономических консультантов". Корпорации диаспоры продолжат свою деятельность при условии соблюдения ими бизнес-кодекса Царства.\n\nВсё это выглядело подозрительно просто. — Я предполагала, что будет какое-то сопротивление, Фикл, но ты отдаёшь нам всё почти даром. Почему?\n\nФикл перестал поправлять галстук. — Я понимаю, когда предприятие слишком нестабильно, чтобы вкладывать в него деньги. После того как вы победили еретиков, это был лишь вопрос времени, когда вы придёте за нашими деньгами. Сражаться с вами было бы дорого, а я пришёл сюда не для того, чтобы убивать. Что касается переговоров? Ну, мы пытались, но наше отделение показывает как они прошли. Здесь им не место. Я, Сайпресс и ещё парочка наших уйдём на более зелёные пастбища. Возможно, в будущем у нас обоих будет больше возможностей для переговоров, но сейчас..."
+kirin_loyalists.286.d:0 "Охрана здания номер 88 на Площади Хризантемы вела Ферн по коридорам. В открытых дверях виднелись горы бумаг и слышались звонки, посвящённые разговорам о продаже или эвакуации. Пара охранников заблокировала дверь, за которой нирик ревел о падении акций.\n\nЕё завели в офис вице-короля. С другой стороны стола стоял Сайпресс Сноу, а рядом с ним - измождённый Фикл, терзающий свой растрёпанный галстук. Груда документов н6а столе пыталась выглядеть так, будто её разложили по какой-то системе, но это было бесполезно. — Выглядишь не лучшим образом, — сказала Ферн.\n\n— Длинная ночь, — ответил Фикл. — Это ещё не конец. Нам предстоит проработать множество деталей. — Страницы, окружённые аурой его магии, поплыли в сторону Ферн. Наиболее важные разделы этих бумаг были подчёркнуты. — Единственная серьёзная уступка, о которой мы просим вас - это выделение охраны для меня и моей группы до тех пор, пока мы не покинем кирийские воды. — Ферн пролистала бумаги. Всё соответствовало заранее присланной телеграмме: [KIS.GetNameDef] мирно войдёт в состав Царства. Также там был список чиновников НАКП, которым заплатили за сотрудничество с Царством в качестве "экономических консультантов". Корпорации диаспоры продолжат свою деятельность при условии соблюдения ими бизнес-кодекса Царства.\n\nВсё это выглядело подозрительно просто. — Я предполагала, что будет какое-то сопротивление, Фикл, но ты отдаёшь нам всё почти даром. Почему?\n\nФикл перестал поправлять галстук. — Я понимаю, когда предприятие слишком нестабильно, чтобы вкладывать в него деньги. После того как вы победили еретиков, это был лишь вопрос времени, когда вы придёте за нашими деньгами. Сражаться с вами было бы дорого, а я пришёл сюда не для того, чтобы убивать. Что касается переговоров? Ну, мы пытались, но наше отделение показывает как они прошли. Здесь им не место. Я, Сайпресс и ещё парочка наших уйдём на более зелёные пастбища. Возможно, в будущем у нас обоих будет больше возможностей для переговоров, но сейчас..."
 kirin_loyalists.286.a:0 "— ...это всё с нашей стороны."
 
 kirin_loyalists.287.t:0 "Ложь, писанная чернилами"
-kirin_loyalists.287.d:0 "Великолепный город Благоухание поприветствовал Ферн Флэйр телеграммой с простым ответом Фикла: нет.\n\nПокорение западных холмов и лесов не окончили войну. Городские огни и открытое море, окружающее их, предвещали вторую порцию резни. Царство уже уничтожило многих духовно заблудших детей Конкорд, а теперь придётся истребить множество её сыновей и дочерей, рождённых за границей...\n\nЕё седан помчался к зданию номер 88 на площади Хризантем, нервному центру НАКП, обгоняя свой кортеж. Она потребовала аудиенции с вице-королем, и он вышел из парадных дверей в сопровождении личной охраны. — Вице-король, — начала Ферн, — ваша реакция была довольно... неожиданной. — Формальные приличия тяготили её, поэтому Ферн Флэйр на мгновение перестала быть премьером и отбросила притворство: — Фикл, после всех этих боёв на западе ты сделал это? Я... ты же знаешь, что должно сделать Царство, чтобы не потерять лицо.\n\n— Насколько я помню, — ответил Фикл, — Мы договорились о сохранении определённого уровня автономии Севера, идеального баланса между независимостью и подчинением, так сказать. Но последняя просьба Киновари возмутительно нарушает этот баланс. Отступив от своего слова, Царство потеряло своё лицо. — Он покачал головой, изображая стыд (Ферн не знала, было ли это притворством или нет). — Возможно, тебе был нужен не баланс, а достаточно времени, чтобы пожары утихли, и мы забыли, почему север покинул вас.\n\nОн протянул копыто для пожатия. Ферн пожала его, а затем поспешила прочь под гул кораблей и зловещий звон городских колоколов."
+kirin_loyalists.287.d:0 "Великолепный город Благоухание поприветствовал Ферн Флэйр телеграммой с простым ответом Фикла: нет.\n\nПокорение западных холмов и лесов не окончили войну. Городские огни и открытое море, окружающее их, предвещали вторую порцию резни. Царство уже уничтожило многих духовно заблудших детей Конкорд, а теперь придётся истребить множество её сыновей и дочерей, рождённых за границей...\n\nЕё седан помчался к зданию номер 88 на Площади Хризантемы, нервному центру НАКП, обгоняя свой кортеж. Она потребовала аудиенции с вице-королем, и он вышел из парадных дверей в сопровождении личной охраны. — Вице-король, — начала Ферн, — ваша реакция была довольно... неожиданной. — Формальные приличия тяготили её, поэтому Ферн Флэйр на мгновение перестала быть премьером и отбросила притворство: — Фикл, после всех этих боёв на западе ты сделал это? Я... ты же знаешь, что должно сделать Царство, чтобы не потерять лицо.\n\n— Насколько я помню, — ответил Фикл, — Мы договорились о сохранении определённого уровня автономии Севера, идеального баланса между независимостью и подчинением, так сказать. Но последняя просьба Киновари возмутительно нарушает этот баланс. Отступив от своего слова, Царство потеряло своё лицо. — Он покачал головой, изображая стыд (Ферн не знала, было ли это притворством или нет). — Возможно, тебе был нужен не баланс, а достаточно времени, чтобы пожары утихли, и мы забыли, почему север покинул вас.\n\nОн протянул копыто для пожатия. Ферн пожала его, а затем поспешила прочь под гул кораблей и зловещий звон городских колоколов."
 kirin_loyalists.287.a:0 "Вопрос современности писан кровью."
 
 kirin_loyalists.28.t:0 "Проклятие"
@@ -2709,7 +2719,7 @@ kirin_loyalists.28.a:0 "... просить о божественном нака
 KIR_loyalists_event_28_tt:0 "Разблокирует древо фокусов §YПослевоенного Царства Кирия§!."
 
 kirin_loyalists.29.t:0 "Наведи порядок в своём доме" ##1 of 4 - Winter Frost's coup
-kirin_loyalists.29.d:0 "Вернувшись в свой кабинет, Отэм прижала прижала к груди бумажную повестку первого за долгое время заседания Утреннего Секретариата. Его двери редко открывались во время войны, которая нагружала партии непривычными для них обязанностями. Список тем на этот раз соответствовал мирному времени включал в себя обсуждение восстановительных работ и льгот для многих выживших семей.\n\nДверь в её кабинет шумно открылась. — Итак, Отэм, ты ещё помнишь утренние встречи, которые проводятся во дворце? — Спросила Ферн, всё так же неуклюже закрывая дверь.\n\n— О, мотивационные материалы, упражнения и ритуалы, собственно встреча... в основном там те, кто не являются делегатами от разных партий, обсуждают дальшейшие планы. — Она посмотрела Ферн прямо в глаза. И понимающе улыбнулась, — Ты ведь посетила одну из них, не так ли? Это суперсекретная конспирологическая группа, верно? — Пошутила она.\n\n— ...возможно? — ответила она. Это заставило Отэм встать со стула. — Обычно там присутствуют только партийные функционеры, но тогда в последний раз там были и Винтер Фрост, и несколько старших делегатов ПзЦГ. — Убедившись в том, что Отэм удивлена, она продолжила, — Я понимаю, что это межпартийная встреча, но для совещания такого уровня это просто неслыханно.\n\n— Я, наверное, последняя, кто должна это говорить, — прервала Отэм, — но это не повод для беспокойства. Винтер Фрост помогает нам, хотя мы во многом расходимся во мнениях, и не похоже, что встреча с Кругом Безмятежных - это преступление или что-то в этом роде. Раз НАКП больше нет, мы должны сотрудничать с Винтер. Надо отдать должное тем, кто присутствовал на встрече; они проявили больше инициативы, чем я.\n\nФерн вздохнула, только сейчас сев напротив стола. — Я просто надеюсь, что всё это домыслы, потому что никто из делегатов не сказал мне заранее о сегодняшней встрече с Винтер."
+kirin_loyalists.29.d:0 "Вернувшись в свой кабинет, Отэм прижала к груди бумажную повестку первого за долгое время заседания Утреннего Секретариата. Его двери редко открывались во время войны, которая нагружала партии непривычными для них обязанностями. Список тем на этот раз соответствовал мирному времени включал в себя обсуждение восстановительных работ и льгот для многих выживших семей.\n\nДверь в её кабинет шумно открылась. — Итак, Отэм, ты ещё помнишь утренние встречи, которые проводятся во дворце? — Спросила Ферн, всё так же неуклюже закрывая дверь.\n\n— О, мотивационные материалы, упражнения и ритуалы, собственно встреча... в основном там те, кто не являются делегатами от разных партий, обсуждают дальшейшие планы. — Она посмотрела Ферн прямо в глаза. И понимающе улыбнулась, — Ты ведь посетила одну из них, не так ли? Это суперсекретная конспирологическая группа, верно? — Пошутила она.\n\n— ...возможно? — ответила она. Это заставило Отэм встать со стула. — Обычно там присутствуют только партийные функционеры, но тогда в последний раз там были и Винтер Фрост, и несколько старших делегатов ПзЦГ. — Убедившись в том, что Отэм удивлена, она продолжила, — Я понимаю, что это межпартийная встреча, но для совещания такого уровня это просто неслыханно.\n\n— Я, наверное, последняя, кто должна это говорить, — прервала Отэм, — но это не повод для беспокойства. Винтер Фрост помогает нам, хотя мы во многом расходимся во мнениях, и не похоже, что встреча с Кругом Безмятежных - это преступление или что-то в этом роде. Раз НАКП больше нет, мы должны сотрудничать с Винтер. Надо отдать должное тем, кто присутствовал на встрече; они проявили больше инициативы, чем я.\n\nФерн вздохнула, только сейчас сев напротив стола. — Я просто надеюсь, что всё это домыслы, потому что никто из делегатов не сказал мне заранее о сегодняшней встрече с Винтер."
 kirin_loyalists.29.a:0 "— Всё будет в порядке! Просто скажите им внести это в расписание."
 
 kirin_loyalists.30.t:0 "Гармония, которую мы создаём" ##2 of 4
@@ -2717,7 +2727,7 @@ kirin_loyalists.30.d:0 "— Вся группа снова в сборе! — О
 kirin_loyalists.30.a:0 "Только Ферн и Синдер услышали её плач."
 
 kirin_loyalists.31.t:0 "Дождь" ##3 of 4
-kirin_loyalists.31.d:0 "— Ты не можешь взять и позволить ей сделать это! — Отэм выплеснула свои эмоции перед Рейн Шайн прямо в её тронном зале. — Я ей верила! Всё это, все наши чаепития, все наши встречи, а она просто...\n\n— Успокойся. — Рейн Шайн использовала магию, чтобы погладить Отэм по спине, облегчив страдания бывшего премьера. Прошло несколько минут, каждая из которых была тяжёлым бременем для Отэм. — Я вижу то, что вижу; я говорю то, что говорю. Я не могу отменить демократическое голосование...\n\n— Почему я была так слепа!? — Провыла безутешная Отэм. — Неужели я действительно была настолько поглощена собой, настолько увлечена Скачком Вперёд, что думала, что меня окружают солнце и радуга, пока на самом деле Кирия умирала по моей вине? Из-за меня мы сожгли друг друга, мы исчерпали себя, мы...\n\nКопыто, принадлежащее её матриарху, погладило Отэм по чешуе. — Это не твоя вина, Отэм. Знай, что в тебе горит пламя, которое ничем не погасить. Твоя присутствие и твоя работа здесь - неоспоримое тому доказательство. И хотя по политическим причинам ты вынуждена уйти, знай: в моём сердце ты всегда останешься тем премьером, которой не было всё равно. Это мне предстоит пережить лидерство Винтер Фрост, а ты... позволь Конкорд направить тебя на лучший путь.\n\nДальнейший разговор был бессмысленным. Отэм нашла силы выйти из тронного зала. Ночь царствовала во дворе под открытым небом, где не было никого, кроме неподвижных стражников и ожидающей её Ферн Флэйр. — Мы всё ещё можем дать бой жрице, — пробормотала она, вторя мрачной походке Отэм. — Возможно, мы и потеряли доверие Рейн Шайн, но большая часть ПзЦГ всё ещё на нашей стороне. В основном, против нас выступают немногочисленные старшие члены, а у нас есть сотни функционеров. На нашей стороне даже генерал Брайт Бёрн, который симпатизирует...\n\n— В чём смысл?\n\nГорько спросила Отэм. Ошеломлённая Ферн остановилась, а Отэм продолжила путь. Последним, что увидела Ферн, был обвисший хвост и поникшая голова Отэм."
+kirin_loyalists.31.d:0 "— Ты не можешь взять и позволить ей сделать это! — Отэм выплеснула свои эмоции перед Рейн Шайн прямо в её тронном зале. — Я ей верила! Всё это, все наши чаепития, все наши встречи, а она просто...\n\n— Успокойся. — Рейн Шайн использовала магию, чтобы погладить Отэм по спине, облегчив страдания бывшего премьера. Прошло несколько минут, каждая из которых была тяжёлым бременем для Отэм. — Я вижу то, что вижу; я говорю то, что говорю. Я не могу отменить демократическое голосование...\n\n— Почему я была так слепа!? — Провыла безутешная Отэм. — Неужели я действительно была настолько поглощена собой, настолько увлечена Скачком Вперёд, что думала, что меня окружают солнце и радуга, пока на самом деле Кирия умирала по моей вине? Из-за меня мы сожгли друг друга, мы исчерпали себя, мы...\n\nКопыто, принадлежащее её матриарху, погладило Отэм по чешуе. — Это не твоя вина, Отэм. Знай, что в тебе горит пламя, которое ничем не погасить. Твоё присутствие и твоя работа здесь - неоспоримое тому доказательство. И хотя по политическим причинам ты вынуждена уйти, знай: в моём сердце ты всегда останешься тем премьером, которой не было всё равно. Это мне предстоит пережить лидерство Винтер Фрост, а ты... позволь Конкорд направить тебя на лучший путь.\n\nДальнейший разговор был бессмысленным. Отэм нашла силы выйти из тронного зала. Ночь царствовала во дворе под открытым небом, где не было никого, кроме неподвижных стражников и ожидающей её Ферн Флэйр. — Мы всё ещё можем дать бой жрице, — пробормотала она, вторя мрачной походке Отэм. — Возможно, мы и потеряли доверие Рейн Шайн, но большая часть ПзЦГ всё ещё на нашей стороне. В основном, против нас выступают немногочисленные старшие члены, а у нас есть сотни функционеров. На нашей стороне даже генерал Брайт Бёрн, который симпатизирует...\n\n— В чём смысл?\n\nГорько спросила Отэм. Ошеломлённая Ферн остановилась, а Отэм продолжила путь. Последним, что увидела Ферн, был обвисший хвост и поникшая голова Отэм."
 kirin_loyalists.31.a:0 "— Ты любила смеяться над всем, Отэм..."
 
 kirin_loyalists.32.t:0 "Отэм Блейз уходит в отставку, Винтер Фрост становится премьером" ##4 of 4 - AB accepts that she's been deposed and calls for unity behind the new Premier, Winter Frost
@@ -2735,7 +2745,7 @@ kirin_loyalists.34.d:0 "Двенадцать магистратур. Двена
 kirin_loyalists.34.a:0 "Да обретём мы совершенную добродетель."
 
 kirin_loyalists.35.t:0 "Лучшая"
-kirin_loyalists.35.d:0 "В кабинете Ферн были слышны лишь звуки письма шариковой ручки по бумаге. И этот звук служил саундтреком к неспокойным мыслям киринши.\n\nВернующие из партии по-прежнему занимали свои места в правительстве: они заявляли о себе как о молодых, способных к адаптации, желающих присмотреться к современному миру. Однако новые причудливые вещи всех форм и размеров из внешнего мира меркли перед необходимостью питать умы... Очередной отчёт сообщал ей о том, что ещё одна пара мистиков стала региональными надзирателями за сельским хозяйством и образованием. Сколько еще времени по-настоящему гармоничные кирины из рядов ПзЦГ смогут удерживать оборону против прилива нового Безмолвия, желающего затушить их достижения? Ферн могла только догадываться и прикидывать.\n\nПоля смерти. Все те солдаты, что погибли на поле боя вечность назад пожертвовали своими жизнями ради жёсткой перезагрузки, бесконечного отступления.\n\nОна сделали последний росчерк ручкой, после чего дверь распахнулась. В кабинет вошёл излучающий триумф Биттер Рут в костюме-тройке. — Мисс Ферн, я хочу...\n\n...сообщить мне, что я понижаюсь в должности или ухожу с поста заместителя премьера и моей позиции в партии? — закончила она, встретившись с ним взглядом. Плохо скрытое удивление в глазах кирина дало ей ответ. Этого давно следовало ожидать.\n\n— Ты весьма проницательна, но именно тебе мы хотим предложить возглавить сектор тяжёлой промышленности Кирии. Вместо того чтобы сидеть в далёком кабинете, ты займёшься практической работой, которая выведет Кирию на высокий уровень.\n\nИз его нагрудного кармана выскользнул свиток пергамента. Аккуратно написанное письмо с просьбой об отставке.\n\nПустое место в нижней части предлагало поставить там её подпись."
+kirin_loyalists.35.d:0 "В кабинете Ферн были слышны лишь звуки письма шариковой ручки по бумаге. И этот звук служил саундтреком к неспокойным мыслям киринши.\n\nВернующие из партии по-прежнему занимали свои места в правительстве: они заявляли о себе как о молодых, способных к адаптации, желающих присмотреться к современному миру. Однако новые причудливые вещи всех форм и размеров из внешнего мира меркли перед необходимостью питать умы... Очередной отчёт сообщал ей о том, что ещё одна пара мистиков стала региональными надзирателями за сельским хозяйством и образованием. Сколько ещё времени по-настоящему гармоничные кирины из рядов ПзЦГ смогут удерживать оборону против прилива нового Безмолвия, желающего затушить их достижения? Ферн могла только догадываться и прикидывать.\n\nПоля смерти. Все те солдаты, что погибли на поле боя вечность назад пожертвовали своими жизнями ради жёсткой перезагрузки, бесконечного отступления.\n\nОна сделала последний росчерк ручкой, после чего дверь распахнулась. В кабинет вошёл излучающий триумф Биттер Рут в костюме-тройке. — Мисс Ферн, я хочу...\n\n...сообщить мне, что я понижаюсь в должности или ухожу с поста заместителя премьера и моей позиции в партии? — закончила она, встретившись с ним взглядом. Плохо скрытое удивление в глазах кирина дало ей ответ. Этого давно следовало ожидать.\n\n— Ты весьма проницательна, но именно тебе мы хотим предложить возглавить сектор тяжёлой промышленности Кирии. Вместо того чтобы сидеть в далёком кабинете, ты займёшься практической работой, которая выведет Кирию на высокий уровень.\n\nИз его нагрудного кармана выскользнул свиток пергамента. Аккуратно написанное письмо с просьбой об отставке.\n\nПустое место в нижней части предлагало поставить там её подпись."
 kirin_loyalists.35.a:0 "— Тогда... Я стану лучшим министром тяжёлой промышленности, которого когда-либо видела Кирия."
 
 kirin_loyalists.36.t:0 "Ошибки"
@@ -2783,12 +2793,12 @@ kirin_loyalists.44.d:0 "Двое учёных из рядов храбрецов
 kirin_loyalists.44.a:0 "— Тогда пусть начнутся ваши судьбоносные двенадцать часов."
 
 kirin_loyalists.45.t:0 "Мир и покой"
-kirin_loyalists.45.d:0 "Камеры, микрофоны, радио... Винтер всю жизнь прожила без них. Если бы не Отэм, она бы вернулась в Первородное Пламя, так и не увидев их. Обязанности имперского премьера накладывались на её другие планы, поэтому эти странные вещи заполнили конференц-зал, где она должна была подписать Совместный Меморандум о Взаимопонимании между Кругом Безмятежных и ПзЦГ. Она изо всех сил старалась не вздрагивать; только самые проницательные могли заметить её колебания.\n\nНо потом это потеряло значение, когда прибыл Биттер Рут и делегаты от ПзЦГ, что встали напротив нее. Винтер и Биттеру сказали встать посередине и начать свои речи о единстве, которое Меморандум должен был возвеличить и закрепить в законе. Меморандум, заключённый между Кругом и ПзЦГ, подчинял госслужбу Киновари Лучезарной Иерократии, подтверждая, что Царство является полноценной теократией, где вера является истинным признаком государственной службы.\n\nКогда Биттер завершил свою речь, настала очередь Винтер. Она поднялась на трибуну и окинула взглядом любимых детей Конкорд, собравшихся в зале. Она ожидала увидеть модные костюмы-тройки вперемешку с одеяниями священников. Но сейчас в зале собрались кирины в более обычной одежде. Фермеры, шахтеры, рыбаки... Их глаза умоляли дать им наконец отдых: передышку от войны, от убийств их семей, которые мир навязал им гедонизмом и ересью. Они жаждали мира и покоя до конца своих дней.\n\nКогда Винтер и Биттер поставили свои подписи под меморандумом, она наконец-то подарила им мир, покой и отдых, которого они так жаждали."
+kirin_loyalists.45.d:0 "Камеры, микрофоны, радио... Винтер всю жизнь прожила без них. Если бы не Отэм, она бы вернулась в Первородное Пламя, так и не увидев их. Обязанности имперского премьера накладывались на её другие планы, поэтому эти странные вещи заполнили конференц-зал, где она должна была подписать Совместный Меморандум о Взаимопонимании между Кругом Безмятежных и ПзЦГ. Она изо всех сил старалась не вздрагивать; только самые проницательные могли заметить её колебания.\n\nНо потом это потеряло значение, когда прибыл Биттер Рут и делегаты от ПзЦГ, что встали напротив неё. Винтер и Биттеру сказали встать посередине и начать свои речи о единстве, которое Меморандум должен был возвеличить и закрепить в законе. Меморандум, заключённый между Кругом и ПзЦГ, подчинял госслужбу Киновари Лучезарной Иерократии, подтверждая, что Царство является полноценной теократией, где вера является истинным признаком государственной службы.\n\nКогда Биттер завершил свою речь, настала очередь Винтер. Она поднялась на трибуну и окинула взглядом любимых детей Конкорд, собравшихся в зале. Она ожидала увидеть модные костюмы-тройки вперемешку с одеяниями священников. Но сейчас в зале собрались кирины в более обычной одежде. Фермеры, шахтеры, рыбаки... Их глаза умоляли дать им наконец отдых: передышку от войны, от убийств их семей, которые мир навязал им гедонизмом и ересью. Они жаждали мира и покоя до конца своих дней.\n\nКогда Винтер и Биттер поставили свои подписи под меморандумом, она наконец-то подарила им мир, покой и отдых, которого они так жаждали."
 kirin_loyalists.45.a:0 "Пусть Конкорд уничтожит тех, кто посмеет нарушить наш мир."
 KIR_ists_event_45_tt:0 "\n§LСовместный Меморандум закрепил послевоенную пирамидальную общественно-политическую иерархию Царства Кирия под лидерством Круга Безмятежных. Матриархат, исполнительная и законодательная власть которого в период премьерства Отэм постепенно ослабевала в пользу Утреннего Секретариата и Всекирийского Пленума, был восстановлен в своём официальном положении абсолютной власти над всеми аспектами жизни кирийского государства и общества. Демократические и светские органы, созданные для управления Великим Скачком Вперёд, были заменены Лучезарной Иерократией Круга Безмятежных, которая взяла на себя управление Царством от имени верховного матриарха. Государственная бюрократия Киновари, подвергшаяся частичной модернизации в период правления Отэм Блейз, полностью подчинилась Иерократии в качестве функционеров, выполняющих её приказы на провинциальном и местном уровнях. Партия за Царство и Гармонию, бывшая политическая сила, потерявшая значительную часть своей поддержки в народе после гражданской войны, стала младшим членом правящей коалиции Круга Безмятежных. Тысяча Знамён также вернулись к своей роли профессиональной военной касты Царства, как оно было до наступления Безмолвия, хотя ныне и под строгим контролем Иерократии. Богатство, привилегии и власть кирийского купеческого сословия и его меркантильные интересы были жёстко ограничены мерами, напоминающими репрессивные указы эпохи Безмолвия. Наконец, поддержанием целостности иерархии будут заниматься Парчовые Комиссары — тайная полиция, подчиняющаяся матриархату, но контролируемая Иерократией. Она держит под пристальным и постоянным наблюдением бюрократию, военных и простых киринов.§!\n— Эхо Безмолвия: взлёт и падение премьерства Отэм"
 
 kirin_loyalists.46.t:0 "Забудь себя"
-kirin_loyalists.46.d:0 "Резиденция клана Мэллоу горела и яростное пламя освещало бесчисленные ряды кремнелицых Парчовых Комиссаров, обстреливающих поселение. А молодой жеребец пытался вычеркнуть из своих мыслей собственную незаконную личность.\n\nИмперский указ Винтер Сноу не стеснялся в выражениях. Он был озаглавлен как "УНИЧТОЖЕНИЕ КЛАНОВ-ПРЕДАТЕЛЕЙ БЛУМ, МЭЛЛОУ И СНОУ". Для старших матриархов и патриархов осужденных родов применялся способ казни - утопление в тигле: каждого из несчастных помещали в закрытый, герметичный чугунный тигель на горящем костре. В тигель подавалась морская вода до тех пор, пока огонь жизни не был утоплен в кипящем соляном растворе.\n\nВерная служанка вела его под тлеющими арками и горящими деревьями - она знала местность лучше, чем её господин. Мерцающие языки пламени едва касались их, когда они проскакивали мимо последнего кольца артиллерийских батарей комиссаров; оставшиеся знаменосцы, верные его роду, превратились в нириков, прежде чем атаковать порядки комиссаров. И их неистовое наступление уничтожило некогда пышные сады и фермы, окружавшие резиденцию. Оставалась лишь тщетная надежда на то, что Парчовые Комиссары сгорят вместе с ними.\n\nПара киринов не останавливалась до тех пор, пока не достигла реки, укрытой от посторонних глаз лесом. Молодой жеребец всё ещё мог видеть столб дыма, поднимающийся из пепла его некогда многообещающего будущего.\n\n— Они будут преследовать вас за имя, которое вы носите, — сказала служанка, набирая воду из журчащего ручья. — Они убьют, бросят в тюрьму, утопят каждого жеребёнка, чьи родители осмелятся носить фамилию Мэллоу. Но я знаю одного кирина, который может подделать личность. Смените гриву, нацепите очки, отрастите бороду... Он отвезёт вас в хиндийские трущобы, а может и в Хамрине, дав имя новорождённого, чьё пламя угасло почти сразу же. Вы... вы принесли ценности, господин?\n\nОн кивнул, доставая мешок. Куча таэлей и слитков семьи зазвенела, когда его копыто порылось в мешке. Но тут служанка задала следующий вопрос: — Как вы будете называть себя, господин?"
+kirin_loyalists.46.d:0 "Резиденция клана Мэллоу горела и яростное пламя освещало бесчисленные ряды кремнелицых Парчовых Комиссаров, обстреливающих поселение. А молодой жеребец пытался вычеркнуть из своих мыслей собственную незаконную личность.\n\nИмперский указ Винтер Фрост не стеснялся в выражениях. Он был озаглавлен как "УНИЧТОЖЕНИЕ КЛАНОВ-ПРЕДАТЕЛЕЙ БЛУМ, МЭЛЛОУ И СНОУ". Для старших матриархов и патриархов осужденных родов применялся способ казни - утопление в тигле: каждого из несчастных помещали в закрытый, герметичный чугунный тигель на горящем костре. В тигель подавалась морская вода до тех пор, пока огонь жизни не был утоплен в кипящем соляном растворе.\n\nВерная служанка вела его под тлеющими арками и горящими деревьями - она знала местность лучше, чем её господин. Мерцающие языки пламени едва касались их, когда они проскакивали мимо последнего кольца артиллерийских батарей комиссаров; оставшиеся знаменосцы, верные его роду, превратились в нириков, прежде чем атаковать порядки комиссаров. И их неистовое наступление уничтожило некогда пышные сады и фермы, окружавшие резиденцию. Оставалась лишь тщетная надежда на то, что Парчовые Комиссары сгорят вместе с ними.\n\nПара киринов не останавливалась до тех пор, пока не достигла реки, укрытой от посторонних глаз лесом. Молодой жеребец всё ещё мог видеть столб дыма, поднимающийся из пепла его некогда многообещающего будущего.\n\n— Они будут преследовать вас за имя, которое вы носите, — сказала служанка, набирая воду из журчащего ручья. — Они убьют, бросят в тюрьму, утопят каждого жеребёнка, чьи родители осмелятся носить фамилию Мэллоу. Но я знаю одного кирина, который может подделать личность. Смените гриву, нацепите очки, отрастите бороду... Он отвезёт вас в хиндийские трущобы, а может и в Хамрине, дав имя новорождённого, чьё пламя угасло почти сразу же. Вы... вы принесли ценности, господин?\n\nОн кивнул, доставая мешок. Куча таэлей и слитков семьи зазвенела, когда его копыто порылось в мешке. Но тут служанка задала следующий вопрос: — Как вы будете называть себя, господин?"
 kirin_loyalists.46.a:0 "Он мог лишь сидеть среди пепла своей семьи."
 
 kirin_loyalists.47.t:0 "" ## Unused
@@ -2974,7 +2984,7 @@ KIR_a_firm_hoof:0 "Железное копыто"
 KIR_TRAD_2_A:0 "Правильное воспитание"
 KIR_TRAD_2_A_desc:0 "Сохранять индивидуальность, отвергая своих родителей и нашего собственного Матриарха, - это порочная мысль. Заблудшие будут наставлены на путь истинный мистиками-учителями во время обширных турне по всей Кирии, подтверждая безоговорочную преданность Верховному Матриарху неопровержимыми аргументами."
 lack_of_scientists_KIR:0 "Религиозная мораль"
-lack_of_scientists_KIR_desc:0 "Краеугольным камнем этики должно быть что-то или кто-то, возвышающий нас. Основывать свой образ жизни на несгибаемых принципах - значит обеспечить себе благословенные годы, которые наполнятся ещё большим количеством благословений Конкорд. В этом ключе к любому отклонению от этих принципов следует относиться, по крайней мере, с большим подозрением.\n\nВ этом свете Кирия стала свидетельницей конечного состояния системы правых и неправых, отделённой от Конкорд и Высшего Матриарха: междоусобицы, порождённые многочисленными противоречиями и "принципами", которые на самом деле были податливыми оправданиями во имя тщеславного прагматизма и потакания своим желаниям.\n\nМатриарх отказалась терпеть такой непредубеждённый гедонизм, лишённому какой-либо постоянной цели. Путь Огня будет взращиваться и культивироваться среди Её детей ежедневно, и всё это для того, чтобы ни одна из их душ не была испорчена заботами и тревогами этого мира."
+lack_of_scientists_KIR_desc:0 "Краеугольным камнем этики должно быть что-то или кто-то, возвышающий нас. Основывать свой образ жизни на несгибаемых принципах - значит обеспечить себе благословенные годы, которые наполнятся ещё большим количеством благословений Конкорд. В этом ключе к любому отклонению от этих принципов следует относиться, по крайней мере, с большим подозрением.\n\nВ этом свете Кирия стала свидетельницей конечного состояния системы правых и неправых, отделённой от Конкорд и Верховного Матриарха: междоусобицы, порождённые многочисленными противоречиями и "принципами", которые на самом деле были податливыми оправданиями во имя тщеславного прагматизма и потакания своим желаниям.\n\nМатриарх отказалась терпеть такой непредубеждённый гедонизм, лишённому какой-либо постоянной цели. Путь Огня будет взращиваться и культивироваться среди Её детей ежедневно, и всё это для того, чтобы ни одна из их душ не была испорчена заботами и тревогами этого мира."
 KIR_TRAD_2_B:0 "Гармония между кирином и природой" #something about communal self-sufficiency, de-urbanisation, return to subsistence farming, don't exploit the environment
 KIR_TRAD_2_B_desc:0 "Согласно третьему принципу, все существа должны находиться в мире и гармонии с природой и Конкорд. Сегодня это означает отказ от бездушных машин, корпораций и загрязнения окружающей среды. Вместо этого мы должны снова начать пользоваться своими копытами и магией, чтобы возделывать землю вместе со своей семьёй и соседями, поддерживая себя плодами своего собственного естественного труда."
 harmony_with_nature:0 "Экогармоничное общество"
@@ -3095,15 +3105,15 @@ kirin_NSA.1.d:0 "Джонки перекрыли реку Жёлтого Дер
 kirin_NSA.1.a:0 "Гармония, Свобода, демократия — или Смерть."
 
 kirin_NSA.2.t:0 "Индукция"
-kirin_NSA.2.d:0 "По храму разносился аромат жира, пороха и бесчисленных киринов, сменивший аромат благовоний с тех пор, как Брайт Берн и сотня других молодых солдат штурмовали территорию. Храм был реквизирован в качестве пункта вербовки и обучения, и теперь он был переполнен вооружением, припасами и свежими рекрутами. Над входом висел портрет Отэм Блейз. Этот храм был судьбоносным местом, где она получила образование — подготовилась к своей исторической попытке освободить киринов от Безмолвия. Теперь последователи гармонии приготовились сражаться, чтобы спасти то, чего достиг их лидер, от реакционеров и мистиков Иерократии Винтер Фрост.\n\nРанее этим утром появилась очередь из свежих, нетерпеливых добровольцев, желающих записаться в армию. Они приходили и уходили; а очередь только увеличивалась. — Их просто слишком много! — воскликнул клерк, обращаясь к Брайт Берну. — Скоро нам придётся отказывать им всем.\n\n— Нет, пусть приходят, — ответил генерал. Они пришли после его заявления по радио, которое он нашел время сделать только после нескольких недель работы по созданию функционирующего правительства, которое не было просто солдатами, командующими и реквизирующими то, что им было нужно. Заметив кирина за линией вербовщиков, полупарализованную на каталке, которую катили её друзья, он поспешил к ней. — Мадам, как вас зовут?\n\n— Её зовут Госсамер, сэр, — однако вместо кирина заговорил её друг. — Да, мы уже сказали ей, что она не может присоединиться из-за своего, э-э, 'состояния', но—\n\n— Мэм, вы можете говорить? — Брайт обратился непосредственно к Госсамер, игнорируя её спутников. — Можете ли вы выучить шифрование и устройство радио за неделю? — получив от неё кивок и кирин продолжил, — Скажи своим друзьям, чтобы они пропустили очередь. Внутри у нас есть радиоаппаратура и инвалидные кресла.\n\nУ друзей Госсамер отвисла челюсть, но они быстро пришли в себя, когда сержант приказал им привести новобранца в храм, чтобы она занялась руководствам и приёмникам."
+kirin_NSA.2.d:0 "По храму разносился аромат жира, пороха и бесчисленных киринов, сменивший аромат благовоний с тех пор, как Брайт Берн и сотня других молодых солдат штурмовали территорию. Храм был реквизирован в качестве пункта вербовки и обучения, и теперь он был переполнен вооружением, припасами и свежими рекрутами. Над входом висел портрет Отэм Блейз. Этот храм был судьбоносным местом, где она получила образование — подготовилась к своей исторической попытке освободить киринов от Безмолвия. Теперь последователи гармонии приготовились сражаться, чтобы спасти то, чего достиг их лидер, от реакционеров и мистиков Иерократии Винтер Фрост.\n\nРанее этим утром появилась очередь из свежих, нетерпеливых добровольцев, желающих записаться в армию. Они приходили и уходили; а очередь только увеличивалась. — Их просто слишком много! — воскликнул клерк, обращаясь к Брайт Берну. — Скоро нам придётся отказывать им всем.\n\n— Нет, пусть приходят, — ответил генерал. Они пришли после его заявления по радио, которое он нашел время сделать только после нескольких недель работы по созданию функционирующего правительства, которое не было просто солдатами, командующими и реквизирующими то, что им было нужно. Заметив кирина за линией вербовщиков, полупарализованную на каталке, которую катили её друзья, он поспешил к ней. — Мадам, как вас зовут?\n\n— Её зовут Госсамер, сэр, — однако вместо кирина заговорил её друг. — Да, мы уже сказали ей, что она не может присоединиться из-за своего, э-э, 'состояния', но—\n\n— Мэм, вы можете говорить? — Брайт обратился непосредственно к Госсамер, игнорируя её спутников. — Можете ли вы выучить шифрование и устройство радио за неделю? — получив от неё кивок и кирин продолжил, — Скажи своим друзьям, чтобы они пропустили очередь. Внутри у нас есть радиоаппаратура и инвалидные кресла.\n\nУ друзей Госсамер отвисла челюсть, но они быстро пришли в себя, когда сержант приказал им привести новобранца в храм, чтобы она занялась инструкциями и приёмниками."
 kirin_NSA.2.a:0 "Стремительный прогресс вытесняет старое ради нового."
 
 kirin_NSA.3.t:0 "Из помех..."
-kirin_NSA.3.d:0 "На центральной радиостанции Массикота табло с мерцающими индикаторами стабилизировалось по команде Госсамер. Они меняли цвет с красного на зелёный при повороте ручки. Затем в трубке послышался треск, — Военно-морское командование Северной Кирии, докладывает из Сайси. Массикотцы, а вы храбро держались. Мы, северяне, принимали корабли всего мира в своих гаванях, даже несмотря на Безмолвие. Было бы самоубийством дать идиотам из Киновари вернут нас в те мрачные дни!\n\nПрежде чем она успела должным образом отреагировать, зажёгся другой свет, статические помехи сменились чистым, бодрым голосом кобылы. — Подкрепление из Сорго на подходе, держитесь! Они собираются втоптать нас обратно в грязь, да? Опять превратить крестьян и рабочих в безвольных марионеток, да? Пошли они все! Я не собираюсь снова возвращаться в прошлое!\n\nЕще одна лампочка сигнализировала о ещё одной линии, их первые слова были отрывистыми, затем: — ...ём? Приём! Если вы это слушаете, то мы - Младокиринская партия. Массикот зовёт, и Хризантема отвечает! Винтер Фрост, это воплощение Ноктилюцент Чарм, замышляет приковать всех киринов к трупу Иерократии! Она затыкает нам рты и подвергает цензуре наши умы, чтобы священники и мистики могли растолстеть и разбогатеть за счёт всех остальных! Хватит это терпеть! Позвольте массам руководить собой самим! Не подведи нас, Кирия, ибо мы твои сыновья и дочери... мы скорее умрём за правду, чем будем жить во лжи!\n\nИз этих динамиков вырывалась смесь струнных, перкуссионных и духовых инструментов, натужно сопровождавшая передачи многих небольших радиостанций, представленных созвездием мигающих зелёных индикаторов."
+kirin_NSA.3.d:0 "На центральной радиостанции Массикота табло с мерцающими индикаторами стабилизировалось по команде Госсамер. Они меняли цвет с красного на зелёный при повороте ручки. Затем в трубке послышался треск, — Военно-морское командование Северной Кирии, докладывает из Сайси. Массикотцы, а вы храбро держались. Мы, северяне, принимали корабли всего мира в своих гаванях, даже несмотря на Безмолвие. Было бы самоубийством дать идиотам из Киновари вернут нас в те мрачные дни!\n\nПрежде чем она успела должным образом отреагировать, зажёгся другой свет, статические помехи сменились чистым, бодрым голосом кобылы. — Подкрепление из Сорго на подходе, держитесь! Они собираются втоптать нас обратно в грязь, да? Опять превратить крестьян и рабочих в безвольных марионеток, да? Пошли они все! Я не собираюсь снова возвращаться в прошлое!\n\nЕще одна лампочка сигнализировала о ещё одной линии, их первые слова были отрывистыми, затем: — ...ём? Приём! Если вы это слушаете, то мы - Младокиринская партия. Массикот зовёт, и Хризантема отвечает! Винтер Фрост, это воплощение Ноктилюцент Чарм, замышляет приковать всех киринов к трупу Иерократии! Она затыкает нам рты и подвергает цензуре наши умы, чтобы священники и мистики могли растолстеть и разбогатеть за счёт всех остальных! Хватит это терпеть! Позвольте массам управлять собой самим! Не подведи нас, Кирия, ибо мы твои сыновья и дочери... мы скорее умрём за правду, чем будем жить во лжи!\n\nИз этих динамиков вырывалась смесь струнных, перкуссионных и духовых инструментов, натужно сопровождавшая передачи многих небольших радиостанций, представленных созвездием мигающих зелёных индикаторов."
 kirin_NSA.3.a:0 "...рождается Гармония."
 
 kirin_NSA.30.t:0 "Бунт нечестивых"
-kirin_NSA.30.d:0 "— Сигнал потерян! — объявил о радист, запутавшийся в паутине проводов и разъёмов, когда Вмнтер Фрост ворвалась в приёмопередающую станцию. — Сорго, Хризантема, почти весь север Благоухания...\n\nПока техники возились со своими кнопками и циферблатами, Жрица вслушивался в мерзость, ревущую из приемников. Клятвы в ложной верности предателям в Массикоте, язвительные обличения её режима, установленного Матриархом, песни и речи, наполненные самым гнусным богохульством, какое только можно вообразить...\n\n— Гниль проникла слишком глубоко, — позже она рассказала об этом Верховному Матриарху в её покоях, освещённых тусклым светом свечей и медленно горящими благовониями. — Я предполагала, что невыразимый масштаб страданий, свидетелями которых мы стали — страданий от наших собственных копыт, не меньше — был бы достаточным божественным возмездием за неверие Царства. И всё же Конкорд решила испытать нас ещё раз.\n\nФрост расхаживала по комнате, ощущая, как она превращается в разъярённого нирика. Было бы бесполезно пытаться образумить взбунтовавшуюся толпу, пытаться воззвать к их благочестию; Конкорд уже обрекла их на безнравственные пытки их собственной опалённой натуры. — Матриарх, нельзя вести переговоры с наводнением, как и нельзя торговаться с лесным пожаром. Вы должны осудить этих предателей, изобразить их предателями Конкорд, Матриархата и Пути. Каждого кирина нужно заставить решить, на чьей он стороне: нашей или еретиков.\n\nВинтер заметила смятение в глазах Матриарха. Она задумалась о том, что ей пришлось бы делать, если бы выяснилось, что Рейн Шайн слишком привязалась к Отэм, и её безвольное сострадание и наивность передались и Аватару Конкорд. Но, сделав глубокий вдох, Матриарх только кивнула."
+kirin_NSA.30.d:0 "— Сигнал потерян! — объявил о радист, запутавшийся в паутине проводов и разъёмов, когда Винтер Фрост ворвалась в приёмопередающую станцию. — Сорго, Хризантема, почти весь север Благоухания...\n\nПока техники возились со своими кнопками и циферблатами, Жрица вслушивался в мерзость, ревущую из приемников. Клятвы в ложной верности предателям в Массикоте, язвительные обличения её режима, установленного Матриархом, песни и речи, наполненные самым гнусным богохульством, какое только можно вообразить...\n\n— Гниль проникла слишком глубоко, — позже она рассказала об этом Верховному Матриарху в её покоях, освещённых тусклым светом свечей и медленно горящими благовониями. — Я предполагала, что невыразимый масштаб страданий, свидетелями которых мы стали — страданий от наших собственных копыт, не меньше — был бы достаточным божественным возмездием за неверие Царства. И всё же Конкорд решила испытать нас ещё раз.\n\nФрост расхаживала по комнате, ощущая, как она превращается в разъярённого нирика. Было бы бесполезно пытаться образумить взбунтовавшуюся толпу, пытаться воззвать к их благочестию; Конкорд уже обрекла их на безнравственные пытки их собственной опалённой натуры. — Матриарх, нельзя вести переговоры с наводнением, как и нельзя торговаться с лесным пожаром. Вы должны осудить этих предателей, изобразить их предателями Конкорд, Матриархата и Пути. Каждого кирина нужно заставить решить, на чьей он стороне: нашей или еретиков.\n\nВинтер заметила смятение в глазах Матриарха. Она задумалась о том, что ей пришлось бы делать, если бы выяснилось, что Рейн Шайн слишком привязалась к Отэм, и её безвольное сострадание и наивность передались и Аватару Конкорд. Но, сделав глубокий вдох, Матриарх только кивнула."
 kirin_NSA.30.a:0 "Сдавайтесь. Ещё не слишком поздно."
 
 kirin_NSA.4.t:0 "Разделение"
@@ -3119,7 +3129,7 @@ kirin_NSA.6.d:0 "По приказу Винтер Фрост был постро
 kirin_NSA.6.a:0 "Не веря в смерть Безмолвия, Рейн Шайн стояла поражённой."
 
 kirin_NSA.7.t:0 "...Хозяева над всем"
-kirin_NSA.7.d:0 "Вдали от кавалькады произносимых тостов и застолий с чаепитием с делегатами разных регионов, Ферн Флэйр обрела безмятежность в предрассветные часы маленькой фермерской деревушки, затерявшейся на дальнем западе. Повсюду таились рисовые поля, где радостные глаза и рожки сквозь бамбуковые шляпы наблюдали за ней.\n\nОдин дом был очень гостеприимен к ней во время первого визита премьера, поэтому она пришла сюда снова, жуя несвежие спринг-роллы. Два жеребёнка выбежали наружу, услышав шум грузовиков и других машин. — Они что, впервые видят такие механизмы?\n\n— Да, — ответила их мать, тоже принимаясь за еду. — Если честно, мы давно ждали помощи свыше, от таких киринов, как ты. — Её мордочка сморщилась, явно выражая беспокойство. — Но что, если этого недостаточно? Что, если нас с земель снова вытеснят большие корпорации?\n\n— Не бойтесь, мы поможем вам, чего бы этого не стоило. — ответила Ферн, — но даже если вам навредят враги или природа, у нас есть другие варианты. Например, ваши дети могут переехать в город. — Ответив ещё на парочку вопросов премьер продолжила, — Не бойтесь. Теперь правительство на вашей стороне. Вообще... теперь вы даже можете стать его частью.\n\n— Частью правительства? Голосования, выборы... Но ведь за вас никто не голосовал.\n\n— Я часто это слышу. — Флэйр позволила смеху сорваться с её языка. — Миллионы из нас могут проголосовать, но ясно, что нам многое предстоит сделать. Я... не хочу оставить вас неуслышанными, мэм. Когда всё будет сделано, к вам прислушаются. Не только президент... но и тот, кто будет руководить этим районом, регионом, деревней... теперь именно мы станем вашими слугами - без простого народа не было бы Кирии, ради которой можно было бы жить свободно."
+kirin_NSA.7.d:0 "Вдали от кавалькады произносимых тостов и застолий с чаепитием с делегатами разных регионов, Ферн Флэйр обрела безмятежность в предрассветные часы маленькой фермерской деревушки, затерявшейся на дальнем западе. Повсюду таились рисовые поля, где радостные глаза и рожки сквозь бамбуковые шляпы наблюдали за ней.\n\nОдин дом был очень гостеприимен к ней во время первого визита премьера, поэтому она пришла сюда снова, жуя несвежие спринг-роллы. Два жеребёнка выбежали наружу, услышав шум грузовиков и других машин. — Они что, впервые видят такие механизмы?\n\n— Да, — ответила их мать, тоже принимаясь за еду. — Если честно, мы давно ждали помощи свыше, от таких киринов, как ты. — Её мордочка сморщилась, явно выражая беспокойство. — Но что, если этого недостаточно? Что, если нас с земель снова вытеснят большие корпорации?\n\n— Не бойтесь, мы поможем вам, чего бы этого не стоило. — ответила Ферн, — но даже если вам навредят враги или природа, у нас есть другие варианты. Например, ваши дети могут переехать в город. — Ответив ещё на парочку вопросов премьер продолжила, — Не бойтесь. Теперь правительство на вашей стороне. Вообще... теперь вы даже можете стать его частью.\n\n— Частью правительства? Голосования, выборы... Но ведь за вас никто не голосовал.\n\n— Я часто это слышу. — Флэйр позволила смеху сорваться с её языка. — Миллионы из нас могут проголосовать, но ясно, что нам многое предстоит сделать. Я... не хочу оставить вас неуслышанными, мэм. Когда всё будет сделано, к вам прислушаются. Не только президент... но и тот, кто будет управлять этим районом, регионом, деревней... теперь именно мы станем вашими слугами - без простого народа не было бы Кирии, ради которой можно было бы жить свободно."
 kirin_NSA.7.a:0 "Тёплая улыбка, ещё один тёплый блинчик. Факел свободы горит ради будушего."
 
 kirin_NSA.8.t:0 "Письменное заявление генерала Файрторн"
@@ -3140,14 +3150,14 @@ kirin.111.a:0 "Очередное одно чудо науки и магии! Н
 
 kirin.1110.t:0 "Применение фундаментальных принципов"
 kirin.1110.d:0 "Вечером, после того как Рейн Шайн рассказала своим подданным об "Отважном Шторме", двое киринов, прославившихся своей работой на корабле, были приглашены на радиоинтервью, транслируемое по всей стране. Ведущий любезно представил их как Сейджа Снута, ведущего учёного Царства в области геомантии и нумерологии, и доктора Люсент Шайн, известного инженера, обучавшегося в Эквестрии.\n\n— Итак, — начал ведущий, — насколько я понимаю, самый новый и инновационный корабль в мире - это, по сути, результат того, что вы двое случайно столкнулись друг с другом за чашечкой кофе.\n\nСейдж посмеялся, — Я, ну, можно и так сказать, да - мы придумали основной концепт в кафе. Но на самом деле, это результат того, над чем мы некоторое время работали вместе.\n\nДальше продолжил Люсент Шайн. — В плане, это же очень просто, не так ли? Ветер - это просто воздух, устремляющийся в область с более низким давлением. Постройте волшебный двигатель, чтобы самостоятельно создать зону низкого давления, установите этот двигатель на парусное судно, и вы сможете передвигаться, генерируя свой собственный бриз.\n\nВ этот раз смешок Сейджа был более нервным. — Да, на самом деле разработка этого двигателя оказалась довольно сложной задачей, и мы должны поблагодарить наших друзей из "Благоухание Энтерпрайс" за их терпение и финансовую поддержку, но... да. По сути, корабль может генерировать свой собственный ветер, используя волшебный двигатель, установленный в носовой части.\n\nВедущий одобрительно хмыкнул. — Что ж, я ценю, что вы двое не хотите хвастаться, но на самом деле, ваше изобретение считают одним из самых впечатляющих магитехнических прорывов века в любой точке мира! Тысячи киринов упорно трудились, чтобы воплотить эту идею в реальность - мне кажется, это была довольно хорошая идея. И хорошее напоминание для всех, кто слушает нас дома, что Кирия только начинает новый век достижений!"
-kirin.1110.a:0 "Что еще могут создать киринское единство и прогресс?"
+kirin.1110.a:0 "Что ещё могут создать киринское единство и прогресс?"
 
 kirin.112.t:0 "Армия с прошлым и будущим"
 kirin.112.d:0 "Отэм Блейз прибыла в шумное поместье Знамени Лунного Цветка ранним утром - у генерала Файрторн были другие встречи во второй половине дня. Через несколько минут после прибытия премьера в кабинет генерала сопровождал почётный караул, где её уже ждал чай. Как только с любезностями было покончено, кирин перешла непосредственно к делу. Нет смысла пытаться рассыпаться комплиментами перед военными.\n\n— Ты, вероятно, самый знаменитый лидер Знамени в Царстве, — начала Отэм, и Файрторн сразу же её поправила.\n\n— Зинит Блум - самый знамениты генерал Знамени в Царстве. — в ответ Отэм только поморщилась.\n\n— К сожалению, Зенит Блум я не могу доверять, — сказала премьер, — но я знаю, что могу доверять тебе. Твой Лунный Цветок просто великолепен, несмотря ни на что, ты - всё, что когда-либо должны были олицетворять Знамёна. Вот почему мне нужна твоя помощь, чтобы убедиться, что их наследие никогда не умрет. Многие кирины боятся последних военных реформ. Я хочу, чтобы именно ты были во главе этого, чтобы доказать, что мы не отбрасываем их наследие, а продвигаем его вперед. К тому же тебя все любят и готовы слушаться, так что, если ты согласишься на эту идею, я готова назначить тебя новым генералиссимусом Алой армии. У тебя даже появиться красивая униформа!\n\nБлейз при помощи магии открыла свои седельные сумки и левитировала аккуратно сложенную военную форму в эквестрийском стиле, хотя на ней также была шелковая вышивка огненными узорами, что придавало униформе киринский колорит. Файрторн несколько мгновений молчала.\n\n— Для меня это было бы честью, премьер-министр, при условии, что я также сохраню за собой пост матриарха-командующего Знаменем Лунного Цветка. Эти кирины мне как семья. Я не могу оставить их."
 kirin.112.a:0 "Отэм в ответ улыбнулась. — Твоё знамя мы у тебя забирать конечно же не будем."
 
 kirin.113.t:0 "Промышленность в полном расцвете"
-kirin.113.d:0 "Ардент Блум закончил просматривать стопку бумаг на своем столе, и его усмешка становилась всё более заметной по мере того, как он просматривал каждую страницу. Усталый заместитель премьер-министра, сидевшая напротив него, в свою очередь, чувствовал себя всё более неуютно. Дочитав последнюю страницу, Блум вздохнул и закатил глаза. — Итак, меня делают козлом отпущения за всё, что идёт не так с индустриализацией Кирии. — сказал он, и его коллега заметила, что он начинает хмуриться.\n\n— Тебя назначат председателем исполнительного комитета самой могущественной государственной корпорации в Зебрике, дадут всё необходимое финансирование, рабочую силу, позволят организовать собственный исследовательский институт, даже собственную компанию наёмников-\n\nБлум в ответ фыркнул. — Ага, только свободы действий не хватает. Серьёзно, вы могли бы проявить немного больше воображения, а не просто привязывать центральную плановую комиссию к пятилетним планам.\n\nБлум повернулся в кресле, глядя в окно на всё более возвышающийся городской пейзаж Благоухания. — Не пойми меня неправильно, я возьмусь за эту работу. Кирии не помешало бы какое-нибудь грамотное экономическое руководство. Но Утренний Секретариат уже загрузил эту маленькую "комиссию" всей бюрократической волокитой, на которую они только были способны. Так что часть работы я переложу на кого-нибудь другого. И, как я уже сказал, если что-то пойдёт не так, это будет моя вина, а не Секретариата.\n\nБлум фыркнул и пренебрежительно махнул копытом. — Ты можешь идти. Скажи премьер-министру или тому, кто решил назначить меня, что я рад видеть, что для разнообразия во главе бизнеса они решили поставить настоящего предпринимателя.\n\nПосле этого министра выпроводили из кабинета так же быстро, как и пригласили войти." 
+kirin.113.d:0 "Ардент Блум закончил просматривать стопку бумаг на своем столе, и его усмешка становилась всё более заметной по мере того, как он просматривал каждую страницу. Усталый заместитель премьер-министра, сидевшая напротив него, в свою очередь, чувствовал себя всё более неуютно. Дочитав последнюю страницу, Блум вздохнул и закатил глаза. — Итак, меня делают козлом отпущения за всё, что идёт не так с индустриализацией Кирии. — сказал он, и его коллега заметила, что он начинает хмуриться.\n\n— Тебя назначат председателем исполнительного комитета самой могущественной государственной корпорации в Зебрике, дадут всё необходимое финансирование, рабочую силу, позволят организовать собственный исследовательский институт, даже собственную компанию наёмников-\n\nБлум в ответ фыркнул. — Ага, только свободы действий не хватает. Серьёзно, вы могли бы проявить немного больше воображения, а не просто привязывать центральную плановую комиссию к пятилетним планам.\n\nБлум повернулся в кресле, глядя в окно на всё более возвышающийся городской пейзаж Благоухания. — Не пойми меня неправильно, я возьмусь за эту работу. Кирии не помешало бы какое-нибудь грамотное экономическое лидерство. Но Утренний Секретариат уже загрузил эту маленькую "комиссию" всей бюрократической волокитой, на которую они только были способны. Так что часть работы я переложу на кого-нибудь другого. И, как я уже сказал, если что-то пойдёт не так, это будет моя вина, а не Секретариата.\n\nБлум фыркнул и пренебрежительно махнул копытом. — Ты можешь идти. Скажи премьер-министру или тому, кто решил назначить меня, что я рад видеть, что для разнообразия во главе бизнеса они решили поставить настоящего предпринимателя.\n\nПосле этого министра выпроводили из кабинета так же быстро, как и пригласили войти." 
 kirin.113.a:0 "— И кто знает? Возможно, нам повезёт, и что-то реально удастся сделать."
 KIR_event_113_tt:0 "Нам станет доступна £decision_icon_small механика решений §Yкомиссии по планированию развития Царства§!, позволяющей нам §Gстроить новые фабрики и верфи в Кирии§!."
 
@@ -3163,7 +3173,7 @@ kirin.115.a:0 "Старое должно уступить место новом
 ### Crisis Events ###
 
 kirin_pirate.1.t:0 "Налёты пиратов с Рыжего Острова"
-kirin_pirate.1.d:0 "Отэм Блейз бегло просмотрела последний отчёт, прикреплённый к Имперскому Цензусу южного побережья, впоследствии убрав его в сторону. Пока что, она прочла пятнадцать отчётов от имперских администраторов, недавно посещавших побережные города для оценки ситуации в оных. Помимо скучной статистики о численности населения, налогов и анализа местной экономики, там были отчёты об атаках и набегах пиратов. Отэм знала, что на Рыжих островах у пиратов было много влияния. целая армада пиратов, оперирующих из порта в Перламутре. Они часто совершали набеги ради добычи и насильного пополнения экипажа. Важным в отчёте был факт учащения атак пиратов. Редкие нападения на города превратились в регулярные для прибрежных городов. Налёты пиратов становились свирепее и более организованными. Красные паруса пиратских джонок, грабящих кирийские торговые суда, всё чаще стали замечать с берегов великой реки Медоносная. Довольно смелые действия со стороны пиратов, учитывая количество проходящих судов. Отэм это ни разу не нравилось.\n\nПока что пираты грабят только рыбацкие деревни и небольшие прибрежные города, остерегаясь густонаселённых и патрулируемых вод. Нельзя отрицать, что повышенная частота атак является плохим знамением. Налёты пиратов на богатые поселения - дело времени. Государство еле-еле выходит из стагнации после Затишья, не хватало только серии грабежей, дестабилизирующих прибрежную экономику. Надо сделать хоть что нибудь, пока это проблема не вышла из под контроля, иначе от последствий нам не укрыться."
+kirin_pirate.1.d:0 "Отэм Блейз бегло просмотрела последний отчёт, прикреплённый к Имперскому Цензусу южного побережья, впоследствии убрав его в сторону. Пока что, она прочла пятнадцать отчётов от имперских администраторов, недавно посещавших побережные города для оценки ситуации в оных. Помимо скучной статистики о численности населения, налогов и анализа местной экономики, там были отчёты об атаках и набегах пиратов. Отэм знала, что на Рыжих островах у пиратов было много влияния. целая армада пиратов, оперирующих из порта в Перламутре. Они часто совершали набеги ради добычи и насильного пополнения экипажа. Важным в отчёте был факт учащения атак пиратов. Редкие нападения на города превратились в регулярные для прибрежных городов. Налёты пиратов становились свирепее и более организованными. Красные паруса пиратских джонок, грабящих кирийские торговые суда, всё чаще стали замечать с берегов великой реки Медоносная. Довольно смелые действия со стороны пиратов, учитывая количество проходящих судов. Отэм это ни разу не нравилось.\n\nПока что пираты грабят только рыбацкие деревни и небольшие прибрежные города, остерегаясь густонаселённых и патрулируемых вод. Нельзя отрицать, что повышенная частота атак является плохим знамением. Налёты пиратов на богатые поселения - дело времени. Государство еле-еле выходит из стагнации после Безмолвия, не хватало только серии грабежей, дестабилизирующих прибрежную экономику. Надо сделать хоть что нибудь, пока это проблема не вышла из под контроля, иначе от последствий нам не укрыться."
 kirin_pirate.1.a:0 "Мы не можем позволить этим пиратам управлять нашими берегами."
 
 kirin_pirate.2.t:0 "Пираты в Южном Море"
@@ -3175,15 +3185,15 @@ kirin_pirate.3.d:0 "[This.GetNewspaperHeader]Ситуация в Южном Ки
 kirin_pirate.3.a:0 "Головорезы на подлодке? Что дальше? Корсарский линкор?"
 
 kirin_pirate.4.t:0 "Пираты рубят Тик"
-kirin_pirate.4.d:0 "Джейд Лотус была первой из деревни, кто заметил красные паруса пиратских джонок на горизонте.\n\nПод утро она, вместе с остальными рыболовными судами, выплыла из порта Тика, но отделилась от остальных, чтобы проверить ловушки для крабов на востоке от места ловли рыбы. Туда приплыла только маленькая лодка, её больной отец сидел дома, выздоравливая от гриппа, так что пришлось выплывать в одиночку. Красные паруса глумились над Джейд, желавшей вернуться под защиту флота. Даже если бы она распустила паруса и гребла со всей силы, Джейд знала, что не сможет от них оторваться. Она начала готовиться к неизбежному.\n\nОдин из кораблей отбился от остальных, чтобы перехватить её шлюпку, пока остальной флод двигался в сторону Тика. Джейд только могла ужаснуться над надвигающимся кораблём, суровый кирин на борту насмехался над ней. Пираты бросили канаты за борт, один из них свистнул, при виде девушки.— Зачем же делать всё так просто, дамочка?, — один из пиратов окрикнул её. — Будь другом, не сопротивляйся, чтобы мы могли и остальных перехватить.\n\nНапуганная до дрожи, но всё ещё неся дух неповиновения, Джейд схватила магией копьё и направила на одного из пиратов: — Не трогайте меня!, — крикнула она. — П-пожалуйста! У меня ничего нет!\n\n— Да ну. — Не успеп среагировать, два пирата прыгнули на шлюпку, раскачивая её из стороны в сторону и чуть не скинув Джейд за борт. Она ударила одного из них гарпуном, он пират отразил атаку саблей, после чего его напарник ударил девушку по голове. Кобыла застонала и упала, в глазах двоились смотрящие на неё пираты.\n\n— Красивая, не так ли? — подметил жеребец компаньону. — Думаю взять её в Перламутр и сделать своей женой. — он наклонился над Джейд и поднял копытом её лицо, легонько поцеловав её. — Не бойся, деточка. Я позабочусь о тебе дома. Ты получить такие богатства, мы займёмся такой любовью под лунным светом, что тебе больше ничего не захочется. Как звучит?\n\nДжейд не ответила. С финальным вздохом её глаза закатились, тьма поглотила всё."
+kirin_pirate.4.d:0 "Джейд Лотус была первой из деревни, кто заметил красные паруса пиратских джонок на горизонте.\n\nПод утро она, вместе с остальными рыболовными судами, выплыла из порта Тика, но отделилась от остальных, чтобы проверить ловушки для крабов на востоке от места ловли рыбы. Туда приплыла только маленькая лодка, её больной отец сидел дома, выздоравливая от гриппа, так что пришлось выплывать в одиночку. Красные паруса глумились над Джейд, желавшей вернуться под защиту флота. Даже если бы она распустила паруса и гребла со всей силы, Джейд знала, что не сможет от них оторваться. Она начала готовиться к неизбежному.\n\nОдин из кораблей отбился от остальных, чтобы перехватить её шлюпку, пока остальной флод двигался в сторону Тика. Джейд только могла ужаснуться над надвигающимся кораблём, суровый кирин на борту насмехался над ней. Пираты бросили канаты за борт, один из них свистнул, при виде девушки.— Зачем же делать всё так просто, дамочка?, — один из пиратов окрикнул её. — Будь другом, не сопротивляйся, чтобы мы могли и остальных перехватить.\n\nНапуганная до дрожи, но всё ещё неся дух неповиновения, Джейд схватила магией копьё и направила на одного из пиратов: — Не трогайте меня!, — крикнула она. — П-пожалуйста! У меня ничего нет!\n\n— Да ну. — Прежде чем Джейд успела среагировать, два пирата запрыгнули в шлюпку, раскачивая её из стороны в сторону и чуть не скинув Джейд за борт. Она ударила одного из них гарпуном, он пират отразил атаку саблей, после чего его напарник ударил девушку по голове. Кобыла застонала и упала, в глазах двоились смотрящие на неё пираты.\n\n— Красивая, не так ли? — подметил жеребец компаньону. — Думаю взять её в Перламутр и сделать своей женой. — он наклонился над Джейд и поднял копытом её лицо, легонько поцеловав её. — Не бойся, деточка. Я позабочусь о тебе дома. Ты получить такие богатства, мы займёмся такой любовью под лунным светом, что тебе больше ничего не захочется. Как звучит?\n\nДжейд не ответила. С финальным вздохом её глаза закатились, тьма поглотила всё."
 kirin_pirate.4.a:0 "Прости меня, отец..."
 
 kirin_pirate.5.t:0 "Инвестиционные потери"
 kirin_pirate.5.d:0 "Кэндллайт едва мог разглядеть что-то вокруг своего корабля, проплывающего сквозь густой туман. Даже электрическая лампа на носу корабля только слабо отсвечивала во мгле. Настрой экипажа был серьёзен, методичный шум двигателей потихоньку двигал корабль сквозь туман.\n\nОн развернулся к штурману, чесавшего бахрому на нижней гриве, попутно рассматривая карты на мостике.\n— Мы уже проплыли Рыжий остров? — спросил он, пытаясь разобрать проделанный путь на карте. — Там дальше мелководье и кораллы, не хотелось бы о них разбиться. Не говоря о пиратах. Если бы шторм не погнал нас ближе к берегу, я бы с радостью к этому острову ни на метр бы не приближался. Нам столько не платят, чтобы якшаться с пиратами.\n—Нас охраняют морпехи, всё у них современное. — ответил навигатор.\n— В любом случае, мы должны быть рядом с Рыжим, если расчёты верны. Оттуда всё должно пойти по маслу и мы уже в Зеленеющем.\n\nКендллайт открыл свой рот, чтобы ответить, но корабль пошатнулся, будто что-то влетело в борт с металлическим звуком. Сквозь туман пронзился крик. Кэндллайт подбежал к мостику, он увидел киринов, одетых грубые и пропитанные солью одеяния, прыгающих с деревянных судов на палубу корабля. Громогласные мушкеты разразились искрами, заставив мореходов упасть замертво. Пираты отобрали современное оружие и начали стрелять в остальных. С каждой секундной, всё больше и больше пиратов появлялось на его корабле.\n\nКэндллайт побледнел. Он знал, что этот бой был проигран ещё до его начала. Пираты, похоже, нашли его по лампе через туман. Попутный ветер помог подобраться бесшумно. Корабль и весь товар теперь принадлежал им. Кэндллайт не собирался умирать, защищая товар торгового дома Сайси.\n\nОн сразу же формально сдался, когда пираты взяли штурмом его мостик."
 kirin_pirate.5.a:0 "Ещё один корабль пропал в ночи..."
 
-kirin_pirate.6.t:0 "Морской хаос в морях Кирии"
-kirin_pirate.6.d:0 "[This.GetNewspaperHeader]Из-за неконтролируемый природы пиратов, грабящих моря Кирии, количество заграничных грузоперевозок уменьшилось разы, так как ни одна из наций не хочет рисковать жизнями своего экипажа ради торговли с Восточной Зебрике. На данный момент, Царство Кирия не смогла дать значимый отпор этим налётам, другие нации не готовы использовать свой флот ради решения проблемы с пиратами, ссылаясь на другие проблемы, требующие внимания флота. Пираты имеют ужасное  Перед лицом растущего экономического и политического ущерба от неоспоримого контроля пиратов над Восточным морем Кирии, вновь организованное правительство Киринов в Киновари рискует оказаться в нестабильной ситуации внутри страны и под пристальным вниманием зарубежных государств из-за своего бездействия в борьбе с пиратами, фактически передав контроль над своими прибрежными водами и морскими путями пиратам с Рыжего Острова."
+kirin_pirate.6.t:0 "Хаос в морях Кирии"
+kirin_pirate.6.d:0 "[This.GetNewspaperHeader]Из-за неконтролируемый природы пиратов, грабящих моря Кирии, количество заграничных грузоперевозок уменьшилось разы, так как ни одна из наций не хочет рисковать жизнями своего экипажа ради торговли с Восточной Зебрикой. На данный момент Царство Кирия не смогло дать значимый отпор этим налётам, а другие нации не готовы использовать свой флот ради решения проблемы с пиратами, ссылаясь на другие проблемы, требующие внимания флота. Перед лицом растущего экономического и политического ущерба от неоспоримого контроля пиратов над Восточным морем Кирии, вновь организованное правительство в Киновари рискует оказаться в нестабильной ситуации внутри страны и под пристальным вниманием зарубежных государств из-за своего бездействия в борьбе с пиратами, фактически передав контроль над своими прибрежными водами и морскими путями пиратам с Рыжего Острова."
 kirin_pirate.6.a:0 "Моря Кирии принадлежат пиратам Перламутра."
 
 kirin_pirate.7.t:0 "Блокада Медоносной" ##maximum of 7 raids over the 3 1/2 year period
@@ -3260,8 +3270,8 @@ kirin_crisis.16.a:0 "Одна нация, одна валюта. Таэль бу
 kirin_crisis.16.b:0 "Скрипы Сайси способствуют росту нашей экономики. Мы не можем лишать их легитимности из-за гордости."
 
 kirin_crisis.17.t:0 "Большие проблемы в маленькой Кирии"
-kirin_crisis.17.d_1:0 "Отэм Блейз всё ещё не привыкла к формальным военным поклонам генерала, когда она входила в комнату, но у неё было достаточно встреч с Корал Ривер, чтобы постепенно привыкнуть к этому. Сама генерал всегда была доброй и дружелюбной, так что это не беспокоило Отэм, но больше её сбивал с толку тот факт, что теперь она оказалась вовлечённой в брифинги военной разведки. Премьер никогда не думала, что военные будут частично отчитываться перед ней. С другой стороны, то, что она стала правым копытом Верховного Матриарха уже было чудом...\n\n— По большей части в Царстве всё тихо, за исключением нескольких стычек с бандитами на западе, но главная проблема - это Благоухание, — сказала Корал Ривер, стуча по карте Кирии для наглядности. — Военизированное формирование, так называемая "Блестящая Чешуя", развязали настоящую войну против коалиции социалистов и еретиков, нападая даже на мистиков Пути Огня и членов профсоюза. Они популярны среди националистов Царства, и в основном ими руководят репатрианты из диаспоры, что объясняет их идеалы. Эти парамилитаристы, похоже, во всём копируют вингбардийский фашизм — иногда такое ощущение, что они хотят превратить город в Карфин.\n\n— Понятно, значит нам придётся использовать военных для решения этой проблемы. — задумчиво сказала Отэм. — Почему с ними не разобрались ранее?\n\n— Фикл Каррент и НАКП часто использовали этих протофашистов для тайных операций в Благоухании и Рапсодии, — объяснила Корал Ривер. — Да, они ультраправые, в отличии от НАКП, но они не боятся объединяться, когда это необходимо. Так что обычно облавы на "Блестящую Чешую" почти неосуществимы, потому что Фикл Каррент и его союзники всегда помогают им уйти из под ареста. Однако в последнее время между НАКП и парамилитаристами произошёл раскол. Сейчас самый удобный момент для удара по ним... но это мало что даст, так как в Благоухании есть и другие группировки. Устранение протофашистов придаст смелости другим партиям, и они очень быстро заполнят вакуум власти - и это может быть кто угодно, от еретиков Разгорающегося Пламени, до профсоюзных активистов. Да, "Блестящая Чешуя" приносит много проблем, и они, скорее всего, финансируются крупными капиталистами, преследующих прежде всего свои интересны. Но я бы солгала, если бы сказала, что я буду скучать по этим недотеррористам. — Она пожала плечами и, склонив голову, обратилась к Отэм. — В любом случае, решение принимать не мне. Эта ответственность лежит на ваших плечах, премьер-министр."
-kirin_crisis.17.d_2:0 "Отэм Блейз всё ещё не привыкла к формальным военным поклонам генерала, когда она входила в комнату, но у неё было достаточно встреч с Корал Ривер, чтобы постепенно привыкнуть к этому. Сама генерал всегда была доброй и дружелюбной, так что это не беспокоило Отэм, но больше её сбивал с толку тот факт, что теперь она оказалась вовлечённой в брифинги военной разведки. Премьер никогда не думала, что военные будут частично отчитываться перед ней. С другой стороны, то, что она стала правым копытом Верховного Матриарха уже было чудом...\n\n— По большей части в Царстве всё тихо, за исключением нескольких стычек с бандитами на западе, но главная проблема - это Благоухание, — сказала Корал Ривер, стуча по карте Кирии для наглядности. — Военизированное формирование, так называемая "Блестящая Чешуя", развязали настоящую войну против коалиции социалистов и еретиков, нападая даже на мистиков Пути Огня и членов профсоюза. Они популярны среди националистов Царства, и в основном ими руководят репатрианты из диаспоры, что объясняет их идеалы. Эти парамилитаристы, похоже, во всём копируют вингбардийский фашизм — иногда такое ощущение, что они хотят превратить город в Карфин.\n\n— Понятно, значит нам придётся использовать военных для решения этой проблемы. — задумчиво сказала Отэм. — Почему с ними не разобрались ранее?\n\n— Фикл Каррент и НАКП часто использовали этих протофашистов для тайных операций в Благоухании и Рапсодии, — объяснила Корал Ривер. — Да, они ультраправые, в отличии от НАКП, но они не боятся объединяться, когда это необходимо. Так что обычно облавы на "Блестящую Чешую" почти неосуществимы, потому что Фикл Каррент и его союзники всегда помогают им уйти из под ареста. Однако в последнее время между НАКП и парамилитаристами произошёл раскол. Сейчас самый удобный момент для удара по ним... но это мало что даст, так как в Благоухании есть и другие группировки. Устранение протофашистов придаст смелости другим партиям, и они очень быстро заполнят вакуум власти, например сторонники Разгорающегося Пламени - Каскадные Искры. За последние несколько месяцев они стали основным участником конфликта и пользуются огромной популярностью у бедняков города. То, чего им не хватает в финансировании и оборудовании, они восполняют чистой решимостью, и эти левые парамилитаристы не раз побеждали Блестящую Чешую. И те и те приносят много проблем, и они вряд-ли принесут много пользы стране. Но я бы солгала, если бы сказала, что я буду скучать по этим недотеррористам. Тем не менее, как только мы разобьём одну группу, другая заляжет на дно, пока пыль не осядет. — После этого этого брифинга Корал Ривер пожала плечами и, склонив голову, обратилась к Отэм. — В любом случае, решение принимать не мне. Эта ответственность лежит на ваших плечах, премьер-министр."
+kirin_crisis.17.d_1:0 "Отэм Блейз всё ещё не привыкла к формальным военным поклонам генерала, когда она входила в комнату, но у неё было достаточно встреч с Корал Ривер, чтобы постепенно привыкнуть к этому. Сама генерал всегда была доброй и дружелюбной, так что это не беспокоило Отэм, но больше её сбивал с толку тот факт, что теперь она оказалась вовлечённой в брифинги военной разведки. Премьер никогда не думала, что военные будут частично отчитываться перед ней. С другой стороны, то, что она стала правым копытом Верховного Матриарха уже было чудом...\n\n— По большей части в Царстве всё тихо, за исключением нескольких стычек с бандитами на западе, но главная проблема - это Благоухание, — сказала Корал Ривер, стуча по карте Кирии для наглядности. — Военизированное формирование, так называемая "Блестящая Чешуя", развязали настоящую войну против коалиции социалистов и еретиков, нападая даже на мистиков Пути Огня и членов профсоюза. Они популярны среди националистов Царства, и в основном ими управляют репатрианты из диаспоры, что объясняет их идеалы. Эти парамилитаристы, похоже, во всём копируют вингбардийский фашизм — иногда такое ощущение, что они хотят превратить город в Карфин.\n\n— Понятно, значит нам придётся использовать военных для решения этой проблемы. — задумчиво сказала Отэм. — Почему с ними не разобрались ранее?\n\n— Фикл Каррент и НАКП часто использовали этих протофашистов для тайных операций в Благоухании и Рапсодии, — объяснила Корал Ривер. — Да, они ультраправые, в отличии от НАКП, но они не боятся объединяться, когда это необходимо. Так что обычно облавы на "Блестящую Чешую" почти неосуществимы, потому что Фикл Каррент и его союзники всегда помогают им уйти из под ареста. Однако в последнее время между НАКП и парамилитаристами произошёл раскол. Сейчас самый удобный момент для удара по ним... но это мало что даст, так как в Благоухании есть и другие группировки. Устранение протофашистов придаст смелости другим партиям, и они очень быстро заполнят вакуум власти - и это может быть кто угодно, от еретиков Разгорающегося Пламени, до профсоюзных активистов. Да, "Блестящая Чешуя" приносит много проблем, и они, скорее всего, финансируются крупными капиталистами, преследующих прежде всего свои интересны. Но я бы солгала, если бы сказала, что я буду скучать по этим недотеррористам. — Она пожала плечами и, склонив голову, обратилась к Отэм. — В любом случае, решение принимать не мне. Эта ответственность лежит на ваших плечах, премьер-министр."
+kirin_crisis.17.d_2:0 "Отэм Блейз всё ещё не привыкла к формальным военным поклонам генерала, когда она входила в комнату, но у неё было достаточно встреч с Корал Ривер, чтобы постепенно привыкнуть к этому. Сама генерал всегда была доброй и дружелюбной, так что это не беспокоило Отэм, но больше её сбивал с толку тот факт, что теперь она оказалась вовлечённой в брифинги военной разведки. Премьер никогда не думала, что военные будут частично отчитываться перед ней. С другой стороны, то, что она стала правым копытом Верховного Матриарха уже было чудом...\n\n— По большей части в Царстве всё тихо, за исключением нескольких стычек с бандитами на западе, но главная проблема - это Благоухание, — сказала Корал Ривер, стуча по карте Кирии для наглядности. — Военизированное формирование, так называемая "Блестящая Чешуя", развязали настоящую войну против коалиции социалистов и еретиков, нападая даже на мистиков Пути Огня и членов профсоюза. Они популярны среди националистов Царства, и в основном ими управляют репатрианты из диаспоры, что объясняет их идеалы. Эти парамилитаристы, похоже, во всём копируют вингбардийский фашизм — иногда такое ощущение, что они хотят превратить город в Карфин.\n\n— Понятно, значит нам придётся использовать военных для решения этой проблемы. — задумчиво сказала Отэм. — Почему с ними не разобрались ранее?\n\n— Фикл Каррент и НАКП часто использовали этих протофашистов для тайных операций в Благоухании и Рапсодии, — объяснила Корал Ривер. — Да, они ультраправые, в отличии от НАКП, но они не боятся объединяться, когда это необходимо. Так что обычно облавы на "Блестящую Чешую" почти неосуществимы, потому что Фикл Каррент и его союзники всегда помогают им уйти из под ареста. Однако в последнее время между НАКП и парамилитаристами произошёл раскол. Сейчас самый удобный момент для удара по ним... но это мало что даст, так как в Благоухании есть и другие группировки. Устранение протофашистов придаст смелости другим партиям, и они очень быстро заполнят вакуум власти, например сторонники Разгорающегося Пламени - Каскадные Искры. За последние несколько месяцев они стали основным участником конфликта и пользуются огромной популярностью у бедняков города. То, чего им не хватает в финансировании и оборудовании, они восполняют чистой решимостью, и эти левые парамилитаристы не раз побеждали Блестящую Чешую. И те и те приносят много проблем, и они вряд-ли принесут много пользы стране. Но я бы солгала, если бы сказала, что я буду скучать по этим недотеррористам. Тем не менее, как только мы разобьём одну группу, другая заляжет на дно, пока пыль не осядет. — После этого этого брифинга Корал Ривер пожала плечами и, склонив голову, обратилась к Отэм. — В любом случае, решение принимать не мне. Эта ответственность лежит на ваших плечах, премьер-министр."
 kirin_crisis.17.a:0 "Ситуация в Благоухании слишком деликатна, чтобы вмешиваться."
 kirin_crisis.17.b:0 "Блестящая Чешуя должна быть уничтожена, прежде чем она станет ещё сильнее."
 kirin_crisis.17.c:0 "Каскадные Искры являются настоящей угрозой, и мы должны их остановить."
@@ -3302,7 +3312,7 @@ kirin_news.2.t:0 "Плебисцит по северному договору"
 kirin_news.2.d:0 "[This.GetNewspaperHeader]Фикл Каррент, председатель НАКП, обратился сегодня по радио к Царству Кирии, чтобы предложить идею северного договора слушателям по всей стране. Определив, что Благоухание, Рапсодия, Сияние и все города между ними сильно отличаются от южной Кирии. После этого председатель предложил киринам севера объединиться, чтобы защитить свои традиции и автономию от своих собратьев в Киновари. Затем националист объявил, что в интересах создания и продвижения сильного и богатого севера НАКП планирует в ближайшем будущем провести региональный плебисцит, на котором все жители севера смогут проголосовать за то, присоединяться к Благоуханию или нет. Хотя это действие вызвало крики протеста и гнева в столице Царства, неясно, обладает ли Верховная Матриарх Рейн Шайн достаточным политическим влиянием, чтобы остановить голосование."
 kirin_news.2.a:0 "Они предали Киноварь, а теперь хотят забрать и наших верноподданных?"
 kirin_news.2.b:0 "Только объединившись, мы сможем противостоять культурному господству Киновари."
-kirin_news.2.c:0 "Хорошо, пусть еретики и иностранцы переубивают друг друга."
+kirin_news.2.c:0 "Хорошо, пусть еретики и иностранцы перебьют друг друга."
 
 kirin_news.3.t:0 "Рождение северного договора"
 kirin_news.3.d:0 "[This.GetNewspaperHeader]Противоречивый плебисцит по принятию северного договора о самоопределении, масштабного политического референдума НАКП в Благоухании, подошёл к концу сегодня, когда были подсчитаны все голоса. К удивлению Киновари и облегчению националистов, неоспоримое большинство киринов в регионе проголосовало за отделение от Царства Кирия и за присоединение к Совету Северной Кирии в рамках заключения северного договора. Пока кирины севера празднуют на улицах, плебисцит имеет драматические последствия для Киновари. С отделением Провидения от Царства значительная часть промышленной мощи страны исчезла, тем самым лишив правительство ресурсов, необходимых для борьбы с повстанцами на западе. Время покажет, нарушит ли это равновесие в борьбе между Путём Огня и Разгорающемся Пламенем."
@@ -3429,7 +3439,7 @@ kirin_news.21.c:0 "Вот что они получают за отказ вое
 kirin_news.21.e:0 "В Кирии обстановка становится ещё более напряжённой."
 
 kirin_news.22.t:0 "Коллапс триумвирата"
-kirin_news.22.d:0 "[This.GetNewspaperHeader]"Это было похоже на огненный шторм, но еще хуже. Злой, кричащий и с каждой минутой становящийся все ближе." - как один солдат, сражающийся за НАКП, описал хаос на линии фронта в начале этой недели. Триумвират в Киновари погрузился в анархию, а три лидера Винтер Фрост, Райзин Сан и премьер-министр Отэм Блейз начали соперничество за контроль над разрушенным Царством. Попытка государственного переворота в Киновари переросла во вторую гражданскую войну, и некогда объединённые союзные группировки превратились во что-то похожее на государства военачальников-нириков до правления Матриарха, оставляя разрушения везде, где они сражаются. Только националисты остаются в здравом уме, в то время как председатель Фикл Каррент поклялся быть сильным и дать отпор регрессивной волне милитаризма. Ради блага государства можно только молиться, чтобы у него это получилось."
+kirin_news.22.d:0 "[This.GetNewspaperHeader]"Это было похоже на огненный шторм, но ещё хуже. Злой, кричащий и с каждой минутой становящийся все ближе." - как один солдат, сражающийся за НАКП, описал хаос на линии фронта в начале этой недели. Триумвират в Киновари погрузился в анархию, а три лидера Винтер Фрост, Райзин Сан и премьер-министр Отэм Блейз начали соперничество за контроль над разрушенным Царством. Попытка государственного переворота в Киновари переросла во вторую гражданскую войну, и некогда объединённые союзные группировки превратились во что-то похожее на государства военачальников-нириков до правления Матриарха, оставляя разрушения везде, где они сражаются. Только националисты остаются в здравом уме, в то время как председатель Фикл Каррент поклялся быть сильным и дать отпор регрессивной волне милитаризма. Ради блага государства можно только молиться, чтобы у него это получилось."
 kirin_news.22.a:0 "Только мы можем спасти Кирию от этого безумия!"
 kirin_news.22.b:0 "СЖЕЧЬ ВСЁ! УБИТЬ ИХ ВСЕХ!"
 kirin_news.22.c:0 "Мы должны защитить свои границы от этих безумных нириков!"
@@ -3441,14 +3451,14 @@ kirin_news.23.a:0 "Предстоит проделать ещё много ра
 kirin_news.23.b:0 "Угли тлеют, но пламя уже погасло."
 
 kirin_news.24.t:0 "Верховный Матриарх сдаёт Царство"
-kirin_news.24.d:0 "[This.GetNewspaperHeader]К всеобщему удивлению, сегодня Верховный Матриарх Рейн Шайн появилась пере своим народом вместе с председателем НАКП Фикл Каррентом, чтобы заявить о своей поддержке националистов и о передачи им власти. Многие предполагали, что Матриарх отправилась в изгнание или скрывалась, поскольку НАКП медленно отбирала контроль над страной у своих соперников, но после завершения войны она вернулась на свой трон в Киновари. Как и почему, остаётся загадкой для всех, но Рейн Шайн подтвердила свою роль аватара Конкорд в этом мире, хранительницы и защитницы киринского народа, какой всегда были Высшие Матриархи, и заявила, что Фикл Каррент станет новым премьером Царства. Наконец, в заключение своей речи Матриарх извинилась перед народом страны за провал Великого Скачка Вперёд, но пообещала, что при поддержке НАКП она не допустит подобных ошибок в будущем."
+kirin_news.24.d:0 "[This.GetNewspaperHeader]К всеобщему удивлению, сегодня Верховный Матриарх Рейн Шайн появилась пере своим народом вместе с председателем НАКП Фикл Каррентом, чтобы заявить о своей поддержке националистов и о передачи им власти. Многие предполагали, что Матриарх отправилась в изгнание или скрывалась, поскольку НАКП медленно отбирала контроль над страной у своих соперников, но после завершения войны она вернулась на свой трон в Киновари. Как и почему, остаётся загадкой для всех, но Рейн Шайн подтвердила свою роль аватара Конкорд в этом мире, хранительницы и защитницы киринского народа, какой всегда были Верховные Матриархи, и заявила, что Фикл Каррент станет новым премьером Царства. Наконец, в заключение своей речи Матриарх извинилась перед народом страны за провал Великого Скачка Вперёд, но пообещала, что при поддержке НАКП она не допустит подобных ошибок в будущем."
 kirin_news.24.a:0 "Да здравствует Матриарх! Да здравствует Председатель!"
 kirin_news.24.b:0 "Неужели кто-то и правда верит, что она сказала всё это добровольно?"
 
 kirin_news.25.t:0 "Мир между огнями"
-kirin_news.25.d:0 "[This.GetNewspaperHeader]Прошлой ночью было объявлено, что правительство Братской Республики в изгнании согласилось на прекращение огня с Царством Кирия. Силы Матриарха не так давно сумели захватить сердце Братской Республики, после чего её руководство бежало дальше на запад, в горы, где измождённые остатки армии еретиков вторглись в Таунгпау и подавили местное неорганизованное сопротивление Таунгпау в отчаянной попытке заполучить землю и время. В то время как Разгорающееся Пламя теперь правит племенами киринов, лам и альпак, находящимися под военной оккупацией, Царство Кирия, похоже, не заинтересовано в продолжении сражений в горах. Пока царит мир, но время покажет, восстановится ли восстание Райзин Сан или их мечта об освобожденной Кирии умрёт в Таунгпау."
+kirin_news.25.d:0 "[This.GetNewspaperHeader]Прошлой ночью было объявлено, что правительство Братской Республики в изгнании согласилось на прекращение огня с Царством Кирия. Силы Матриарха не так давно сумели захватить сердце Братской Республики, после чего её лидерство бежало дальше на запад, в горы, где измождённые остатки армии еретиков вторглись в Таунгпау и подавили местное неорганизованное сопротивление Таунгпау в отчаянной попытке заполучить землю и время. В то время как Разгорающееся Пламя теперь правит племенами киринов, лам и альпак, находящимися под военной оккупацией, Царство Кирия, похоже, не заинтересовано в продолжении сражений в горах. Пока царит мир, но время покажет, восстановится ли восстание Райзин Сан или их мечта об освобожденной Кирии умрёт в Таунгпау."
 kirin_news.25.a:0 "Мы обязательно вернёмся. Наш огонь разгорится снова."
-kirin_news.25.b:0 "Нет смысла посылать еще больше киринов умирать за Таунгпау."
+kirin_news.25.b:0 "Нет смысла посылать ещё больше киринов умирать за Таунгпау."
 kirin_news.25.c:0 "Судя по всему, Западный фронт наконец-то затих..."
 kirin_news.25.e:0 "Но кто теперь вступится за Таунгпау?"
 
@@ -3563,7 +3573,7 @@ kirin_council.14.a:0 "На карту поставлен весь наш обр
 kirin_council.14.b:0 "Мы будем снисходительны до тех пор, пока они готовы оплатить разницу."
 
 kirin_council.15.t:0 "Единение под властью Конкорд?"
-kirin_council.15.d:0 "Ферн Флэйр редко приходилось решать политические вопросы непосредственно с Верховным Матриархом Рэйн Шайн, однако сложившаяся ситуация требовала этого. Она прибыла во дворец Рейн Шайн, расположенный на земельном участке Отэм, где между измотанной и явно не божественной на вид, собственно, Рейн Шайн, и Винтер Фрост, чьё лицо выдавало разочарование граничащее с яростью, она чувствовала себя как рыба, вытащенная из воды. Однако Отэм требовалось время, чтобы отдохнуть и прийти в себя – стресс от попыток и неудач удержать Кирию вместе на протяжении всего Великого Скачка Вперёд сильно сказался на ней, а из-за изнуряющей головной боли она едва могла стоять прямо более часа кряду. Ферн оставалось лишь надеяться, что со временем её подруге полегчает и та вернётся к своим обязанностям.\n\nОднако время не остановить, и всё ещё оставалось бесчисленное множество кризисов, которые необходимо было разрешить – с участием Отэм или без неё. Текущий из них включал в себя проведение плебисцита в Великом Провидении, организованный тем предателем, Фикл Каррентом, и его сообщниками. Именно он привёл Винтер Фрост в ярость, что отразилось и на сегодняшней встрече.\n— Это безбожное создание пытается отобрать у нас наших преданных граждан! — выпалила Винтер. — Его плебисцит – не более чем незаконная попытка отобрать наши земли и народ. Они пытаются ещё сильнее ослабить нас в нашем и без того нелёгком положении – мы не можем этого допустить.\n\n— Но ведь это демократично, разве нет? — ответила Ферн Флэйр. — Кирины севера всё равно будут голосовать, и даже если Великое Провидение не разделяет наши взгляды и традиции, я очень сомневаюсь, что они массово поддержат отделение от Киновари. Помимо этого, тот факт, что НАКП хотят решить вопрос без кровопролития играет нам на копыта, давая возможности переговоров для затруднения успеха плебисцита.\n\n— Каким образом? — Спросила Рейн Шайн. — Не хотелось бы чтобы даже часть слуг Конкорд отдала свою жизнь за это. Если мы можем разрешить дело мирным путём – мы должны поступить именно так.\n\n— Мы уже обсуждали с НАКП эту проблему, — начала разъяснять Ферн Флэйр. — Если мы согласимся легализовать результаты плебисцита, то сможем вынудить их поставить планку на отделение в 75% голосов для каждой области Великого Провидения. Сделав это, мы также получим возможность начать собственную кампанию, которая позволит убедиться, что они не получат достаточно голосов для преодоления этой планки.\n\n— Нам не о чем разговаривать с предателями, — сказала Винтер, недовольно посмотрев на Ферн, после чего повернулась к Рейн Шайн: — Объявите их действия вне закона и положите конец их ухищрениям прямо здесь и сейчас. Объявите, что мы никогда не примем результаты плебисцита. Только так мы сможем сохранить единство нашего государства."
+kirin_council.15.d:0 "Ферн Флэйр редко приходилось решать политические вопросы непосредственно с Верховным Матриархом Рейн Шайн, однако сложившаяся ситуация требовала этого. Она прибыла во дворец Рейн Шайн, расположенный на земельном участке Отэм, где между измотанной и явно не божественной на вид, собственно, Рейн Шайн, и Винтер Фрост, чьё лицо выдавало разочарование граничащее с яростью, она чувствовала себя как рыба, вытащенная из воды. Однако Отэм требовалось время, чтобы отдохнуть и прийти в себя – стресс от попыток и неудач удержать Кирию вместе на протяжении всего Великого Скачка Вперёд сильно сказался на ней, а из-за изнуряющей головной боли она едва могла стоять прямо более часа кряду. Ферн оставалось лишь надеяться, что со временем её подруге полегчает и та вернётся к своим обязанностям.\n\nОднако время не остановить, и всё ещё оставалось бесчисленное множество кризисов, которые необходимо было разрешить – с участием Отэм или без неё. Текущий из них включал в себя проведение плебисцита в Великом Провидении, организованный тем предателем, Фикл Каррентом, и его сообщниками. Именно он привёл Винтер Фрост в ярость, что отразилось и на сегодняшней встрече.\n— Это безбожное создание пытается отобрать у нас наших преданных граждан! — выпалила Винтер. — Его плебисцит – не более чем незаконная попытка отобрать наши земли и народ. Они пытаются ещё сильнее ослабить нас в нашем и без того нелёгком положении – мы не можем этого допустить.\n\n— Но ведь это демократично, разве нет? — ответила Ферн Флэйр. — Кирины севера всё равно будут голосовать, и даже если Великое Провидение не разделяет наши взгляды и традиции, я очень сомневаюсь, что они массово поддержат отделение от Киновари. Помимо этого, тот факт, что НАКП хотят решить вопрос без кровопролития играет нам на копыта, давая возможности переговоров для затруднения успеха плебисцита.\n\n— Каким образом? — Спросила Рейн Шайн. — Не хотелось бы чтобы даже часть слуг Конкорд отдала свою жизнь за это. Если мы можем разрешить дело мирным путём – мы должны поступить именно так.\n\n— Мы уже обсуждали с НАКП эту проблему, — начала разъяснять Ферн Флэйр. — Если мы согласимся легализовать результаты плебисцита, то сможем вынудить их поставить планку на отделение в 75% голосов для каждой области Великого Провидения. Сделав это, мы также получим возможность начать собственную кампанию, которая позволит убедиться, что они не получат достаточно голосов для преодоления этой планки.\n\n— Нам не о чем разговаривать с предателями, — сказала Винтер, недовольно посмотрев на Ферн, после чего повернулась к Рейн Шайн: — Объявите их действия вне закона и положите конец их ухищрениям прямо здесь и сейчас. Объявите, что мы никогда не примем результаты плебисцита. Только так мы сможем сохранить единство нашего государства."
 kirin_council.15.a:0 "Плебисцит будет разрешено продолжить, но на наших условиях."
 kirin_council.15.b:0 "Плебисцит – это незаконный акт, мы никогда не признаем его результатов."
 
@@ -3577,13 +3587,13 @@ kirin_council.17.a:0 "А не посеяли мы смерть единства?
 
 kirin_council.18.t:0 "Исход плебисцита"
 kirin_council.18.d_1:0 "Час за часом, результаты плебисцита прибывали в Благоухание, проскакивая по линиям телеграфа, построенных по всему Великому Провидению во время Великого Скачка Вперёд, или же по радиостанция по всей Кирии. Час за часом, новости о подавляющем большинстве голосов за отделение по всему северу смягчали страхи членов НАКП, собравшихся вокруг радио, чтобы услышать результаты. Потребовалось три дня, чтобы собрать последние голоса из самых маленьких деревень севера. В некоторых местах голосование балансировало на грани в пользу отделения, но вскоре все было объявлено официально. 80% киринов в Великом Провидении проголосовали за отделение. Единственное, о чём попросила Матриарх, так это о тридцатидневном периоде для бумажной работы насчёт отделения и переброса местных сил правопорядка, после этого север будет под юрисдикцией Благоухания.\n\nУтром новости разошлись по округе, торжествующие кирины вышли на улицы, чтобы отпраздновать, распевая песни. Отделившись от заблудших и самолюбивых киринов из Киновари, разрушивших их род век тому назад, народ Благоухания стал свободным, деля эту свободу с братьями и сёстрами со всего Великого Провидения. По всему северу, кирины организовывали импровизированы парады и праздновали, покуда НАКП объявила целую неделю празднований, отмечая этот день как день независимости Великого Провидения от Киновари. для Фикл Каррента, это была кульминация его упорной борьбы, одна из пиков его карьеры в качестве председателя НАКП. Войдя в обеденный зал, его встретили громогласные аплодисменты киринов, пришедших на пир, на всё том же 88м доме на Площади Хризантемы. Он знал, что его председательство войдёт в историю Кирии."
-kirin_council.18.d_2:0 "Hour by hour, the results of the illegal Plebiscite made their way to Fragrance, zipping along the telegraph lines that had been erected throughout Greater Providence at the onset of the Grand Gallop Onward, or being broadcasted throughout Kiria by radio stations. Hour by hour, overwhelming votes in favor of secession tallied up throughout the north, slowly building up the strength and resiliency of a movement for independence that Vermilion had hoped to suppress. Though success of the Plebiscite balanced on a knife's edge for three days, soon the overwhelming support for secession coming out of Greater Providence proved that Vermilion held no sway over the north, and there was little they could do to cling onto it.\n\nThen the speeches and declarations of secession began to roll in across the radio. Local authorities pledged their allegiance to Fragrance, and those that didn't were chased out of town by the local populations determined to split with Vermilion. Even Rhapsody's Chief Magistrate of the Procurate, Priestess Heavenly Fire, made a brief statement on the radio announcing that the kirin of Rhapsody have spoken, and the city would lead the rest of Greater Providence in joining with Fragrance in the interests of protecting their unique cultural identity, an identity not shared by the kirin along the many branches and tributaries of the Great Mellifluve. Though Vermilion protested, and Matriarch Rain Shine read a statement saying that she and Concord did not recognize the results of the vote, Vermilion made no move to suppress the movement by force. After all, what could they hope to accomplish when popular opinion was so heavily weighted against them?\n\nWhen the news broke the following morning, jubilant kirin took to the streets in celebration, hanging banners, flying flags, and singing songs. Finally separated from the misguided and selfish kirin in Vermilion that had ruined their city a century ago, the kirin of Fragrance were finally free, and finally able to share that freedom with the rest of Greater Providence. All throughout the north, kirin organized impromptu parades and celebrated the final outcome, while the NAKP declared a week of celebration and marked the day as the day of Greater Providence's official independence from Vermilion. For Fickle Current, it was the culmination of a hard-fought struggle, but only the latest high point in his short time as Chairkirin of the NAKP. And when he entered the dining hall to thunderous applause at the feast he organized in 88 Chrysanthemum Plaza, he knew that his tenure as Chairkirin would be one history would remember forever."
-kirin_council.18.d_3:0 "Hour by hour, the results of the illegal Plebiscite made their way to Fragrance, zipping along the telegraph lines that had been erected throughout Greater Providence at the onset of the Grand Gallop Onward, or being broadcasted throughout Kiria by radio stations. But hour by hour, the situation in the NAKP's war room grew more grim and desperate. Sure, it looked like they were likely to score majorities for secession in several states throughout Greater Providence, but not by the margins they had hoped. It seemed that the kirin of the north were hesitant to break with Vermilion, and when all the votes were finished, it became clear that the dreams of the Northern Compact were dead on arrival. Without an overwhelming majority, no states would break with Vermilion and join with Fragrance in its march to the future.\n\nWhile Vermilion crowed in victory, angry hooves were pointed in 88 Chrysanthemum Plaza as the NAKP tried to come to terms with the defeat and find somekirin to blame. Unfortunately for Fickle Current, his position as Chairkirin of the NAKP meant most hooves pointed at him. By the time he angrily stormed out of the NAKP's war room, he was infuriated and embittered, and beginning to feel vulnerable. All the speeches, all the crowds, his visits to Rhapsody and Radiance... how could they have been so impressive in person and come to so little at the polls?\n\nIt would likely take time to find the answer, but that was hardly a comforting thought. Fragrance's dreams of a unified Greater Providence to stand up to Vermilion were over. It was all he could do now to stave off the entropy and hold the city together for as long as he could in the hopes that another opportunity would come Fragrance's way. The Council of North Kiria would survive. Failure was not an option."
-kirin_council.18.d_4:0 "Hour by hour, the results of the illegal Plebiscite made their way to Fragrance, zipping along the telegraph lines that had been erected throughout Greater Providence at the onset of the Grand Gallop Onward, or being broadcasted throughout Kiria by radio stations. But as they trickled in, it became clear that the Plebiscite was far from over. Though the NAKP had secured large margins throughout the north, with many states voting for secession by 65%, 70%, or even 75% in some places, they failed to achieve the overwhelming margins they had hoped for. But those margins didn't mean defeat; the dream of a free Greater Providence was still alive, and Vermilion would struggle to justify continuing to cling onto provinces where three out of every four kirin desired freedom.\n\nWhile Vermilion attempted to claim victory, citing that there were still enough kirin in the north loyal to the Matriarch that it would be heartless to abandon them to Fragrance, the NAKP gathered for an emergency meeting over how to proceed. Fickle Current quickly made the NAKP's official position clear to everykirin present. "We cannot back down now," he stated, slamming a hoof on the table. "Not only did we secure a majority of the votes, we secured a supermajority. Vermilion cannot ignore this, and neither can we. Our only way forward is a simple one: we must be prepared to fight Vermilion to protect the kirin of Greater Providence. We shall give Vermilion one last chance to back down, one final ultimatum to answer. And if still they refuse to yield, then it leaves us with no choice. We shall have war, and the Matriarch will know that it was she who caused blood to be shed."\n\nThere was no deliberation, no discussion amongst party leadership. Within a few minutes, Fickle Current had secured a unanimous vote on issuing Vermilion one final ultimatum. The pieces had been set, and the NAKP had taken its seat at the table. Only time would tell if Vermilion would forfeit or play this dangerous game."
-kirin_council.18.a:0 "Greater Providence is free! We did it!"
-kirin_council.18.b:0 "The kirin of the north have spoken! Vermilion rules us no longer!"
-kirin_council.18.c:0 "Fragrance will survive this setback. We have to!"
-kirin_council.18.d:0 "Vermilion will grant the north freedom, or we will make them bleed!"
+kirin_council.18.d_2:0 "Час за часом, результаты нелегального плебисцита прибывали в Благоухание, проскакивая по линиям телеграфа, построенных по всему Великому Провидению во время Великого Скачка Вперёд, или же по радиостанция по всей Кирии. Час за часом, новости о подавляющем большинстве голосов за отделение севера медленно, но верно питали пылкость и силу движения, которое Киноварь надеялась подавить. Несмотря на то, что успех плебисцита балансировал на грани три дня, подавляющая волна поддержки за отделение прошлась по всему Великому Провидению, доказывая, что Киноварь не правит севером, и ничего с этим они сделать не могут.\n\nРечи и объявления об отделении звучали по радио целый день. Местные власти поклялись в верности Благоуханию, отказавшихся дать присягу местное население погнало из города. Даже Главный Магистрат Прокуратуры, Хэвенли Файр, сделала короткое заявление по радио, сообщая, что кирины всего Великого Провидения преследуют своей целью защиту своей культуры, отличной от многих других на берегах Великой Медоносной. В Киновари данному решению протестовали. Матриарх Рейн Шайн сообщила, что она и Конкорд не признают результатов голосования, однако, действий по подавлению мятежа не последовало. Всё же, что они могут сделать, если народ не на их стороне?\n\nУтром новости разошлись по округе, торжествующие кирины вышли на улицы, чтобы отпраздновать, распевая песни. Отделившись от заблудших и самолюбивых киринов из Киновари, разрушивших их род век тому назад, народ Благоухания стал свободным, деля эту свободу с братьями и сёстрами со всего Великого Провидения. По всему северу, кирины организовывали импровизированы парады и праздновали, покуда НАКП объявила целую неделю празднований, отмечая этот день как день независимости Великого Провидения от Киновари. для Фикл Каррента, это была кульминация его упорной борьбы, одна из пиков его карьеры в качестве председателя НАКП. Войдя в обеденный зал, его встретили громогласные аплодисменты киринов, пришедших на пир, на всё том же 88м доме на Площади Хризантемы. Он знал, что его председательство войдёт в историю Кирии"
+kirin_council.18.d_3:0 "Час за часом, результаты нелегального плебисцита прибывали в Благоухание, проскакивая по линиям телеграфа, построенных по всему Великому Провидению во время Великого Скачка Вперёд, или же по радиостанциям по всей Кирии. Но час за часом, ситуация в конференц-зале НАКП становилась всё мрачнее и отчаяннее. Да, они заработали большинство голосов в некоторых областях Великого Провидения, но не в таких количествах, как ожидалось. Похоже, кирины севера не очень то и хотят разрывать связи с Киноварью, и после подсчёта голосов стало очевидно, что мечты о Северном Договоре были мертвы с самого рождения. Без подавляющего большинства, никто не присоединится к маршу в будущее Благоухания без Киновари.\n\nВ Киновари праздновали победу, злые копыта Благоухания указывали на 88й дом на Площади Хризантемы, пока НАКП пытались смириться с поражением и найти кирина отпущения. К сожалению для Фикл Каррента, его должность председателя НАКП в этом случае не особо ему помогала. Злобно выйдя из конференц-зал, полный ярости Каррент начал чувствовать себя жалким. Все эти речи, толпы, его визиты в Сияние и Рапсодию... как они могли быть так удивлять в живую, но показывать обратное на бумаге? \n\nТолько время может дать ответы, не самая приятная мысль. Мечты Благоухания об едином Великом Провидении мертвы. Все, что он мог сейчас сделать, - это противостоять энтропии и удерживать город как можно дольше в надежде, что Благоуханию представится другая возможность. Совет Северной Кирии выживет. Поражение недопустимо."
+kirin_council.18.d_4:0 "Час за часом, результаты нелегального плебисцита прибывали в Благоухание, проскакивая по линиям телеграфа, построенных по всему Великому Провидению во время Великого Скачка Вперёд, или же по радиостанция по всей Кирии. Но, с подсчётом голосом, становится очевидно, что плебисцит ещё далёк от конца. Хотя НАКП в некоторых областях набрали приличное большинство в районе 65-75% процентов, они не смогли набрать подавляющее большинство, на которое был расчёт, но эти результаты не означают поражение. Мечта о свободном Великом Провидении всё ещё жива. Киновари придётся постараться, чтобы удержать провинции, где 75% киринов желали свободы\n\nПока в столице пытались оправдать свою победу, говоря, что на севере слишком много верных Матриархату подданных, чтобы бросить родину ради Благоухания. Тем временем, в штабе НАКБ было созвано экстренное собрание. Фикл Каррент быстро обозначил свою позицию каждому присутствующему кирину. — Нам нельзя показывать слабость, — сказал он. — Мы не просто набрали нужное количество голосов, мы набрали квалифицированное большинство. Киноварь не может это игнорировать, а мы тем более. Путь вперёд прост: мы должны быть готовы к бою со столицей, чтобы защитить киринов Великого Провидения. Мы поставим им ультиматум, и если они откажутся, у нас не будет выбора, кроме как воевать. Кровь киринов будет на копытах Матриарх.\n\nВ кабинете не было ни раздумий, ни разговоров среди руководства партии. Спустя пару минут, Фикл Каррент убедил киринов безоговорочно проголосовать за последний ультиматум. Фигуры расставлены, НАКП взяли сели за стол. Только время может сказать, согласится ли Киноварь сыграть в смертельную игру."
+kirin_council.18.a:0 "Великое Провидение свободно! Мы сделали это!"
+kirin_council.18.b:0 "Кирины севера сказали всё! Киноварь нам не указ!"
+kirin_council.18.c:0 "Благоухание выживет, любой ценой!"
+kirin_council.18.d:0 "Киноварь даст северу свободу, или польётся кровь!"
 
 kirin_council.19.t:0 "Ультиматум Севера" # квалифицированное большинство это три четверти голосов
 kirin_council.19.d:0 "Телеграмма прибыла за день до посыльного, но прибытие оного из Благоухания развеивает все сомнения о несерьёзности Фикл Каррента и НАКП. Не смотря на то, что Верховный Матриарх Рейн Шайн объявила результаты плебисцита нелегитимными, НАКП всё равно организовали голосование, заработав в нём победу. На деле, конечно, всё сложнее. Хотя сторонники Фикл Каррента набрали квалифицированное большинство на плебисците, оставшаяся часть голосов была против идеи Северного Соглашения, желая сохранить связь с Киноварью. А права этих киринов, хоть они и меньшинство, нужно защищать.\n\nНо может ли Киноварь позволить себе их защиту? На этот вопрос Ферн Флэйр и Рейн Шайн затруднялись ответить, так как на носу висел ультиматум. Конфликт между Райзин Файр на западе сильно растянул фронт Киновари. Хватит ли у них ресурсов и знамён, чтобы дать отпор Карренту и НАКП в случае отказа? А что насчёт тех, кто голосовал за отсоединение? Даже если НАКП проиграют и по Благоуханию пройдутся знамёна Киновари – как это воспримут? Как подавление мятежа или же как вторжение в другую страну? Как они восстановят порядок и интегрируют север в состав Царства, если они завоюют и оккупируют его, как чужую страну?\n\n— Что же делать? — спросила Рейн Шайн у Ферн Флэйр, с болью в голосе. Возможность войны с её подданными ранила её в самое сердце, но Кирия не может позволить себе потерять Сияние и Рапсодию, два важнейших города и индустриальных центра. После такого они никогда не оправятся.\n\nВ тот момент, Ферн Флэйр пожелала, чтобы Отэм Блейз была здесь, и ей не приходилось принимать решение, которое может привести к большим страданиям в Кирии."
@@ -3641,55 +3651,55 @@ kirin_council.30.t:0 "Kiria Refuses Our Gifts"
 kirin_council.30.d:0 "Vermilion officially responded to our offers of providing them equipment and material with a polite declination. Why Vermilion would repudiate our gifts is anykirin's guess, but it likely has to deal with the tense issue surrounding our secession. Premier Autumn Blaze supposedly feels betrayed by our secession from Vermilion's authority, and any recognition of our gift could be seen as tacit recognition of the legitimacy of our independence. Whatever their reasons, Chairkirin Fickle Current has already taken steps to make sure that this equipment doesn't go to waste."
 kirin_council.30.a:0 "At least we've avoided war with Vermilion."
 
-kirin_council.31.t:0 "Trickle Down or Well Up?"
-kirin_council.31.d:0 "Fickle Current considered himself a shrewd businesskirin, but even he had to admit that he wasn't the most skilled at manipulating numbers. The NAKP's chief economist, on the other hoof, was practically a wizard when it came to Fragrance's finances. Dr. Ardent Bloom's office was filled with boxes stuffed with reams of finance records, economy predictions, and more business dealings than one could shake a stick at. He was also certain that countless under the table agreements were written down on paper somewhere in Dr. Bloom's cluttered office, the kind that had the potential to bankrupt even the most powerful of the trading houses. How he kept it all under control was beyond him.\n\nBut he hadn't gone to see the economist just to comment on his office clutter. Instead, he had gone to him for advice. "The legal teams are working on codifying the laws of our independence, and making our statement a reality," Current explained to the doctor, who watched him with polite interest but kept a pen scratching away at a piece of paper with his magic all the while. "But if we're going to proclaim our independence, then we need to do something to make it mean something real to the kirin of Greater Providence. We need to embark on renewed industrialization efforts, pick up the pieces from Vermilion's failed experiment. You know the financial situation of the NAKP better than anykirin. What's your recommendation?"\n\n"Depends on how ambitious you are," Ardent Bloom answered him, and his magic collected a few folders from different boxes around his office. He spread them out before Current, though he continued to talk while Current leafed through their contents. "The free market is a wonderful thing, and it follows the money regardless of where it leads. Industrializing the north will be profitable... eventually. Companies will make safe investments in new industry, and when those labors bear fruit, they'll reinvest it back into the economy. This trickle down effect will achieve a powerful industrial base in time. But, if you're willing to offer them incentives, they'll happily take more risks and speed things up a little. The best way to get a corporation whose sole function is to turn profits for its shareholders to take a risk is to let them do it on somekirin else's credit. Question is... are you willing to give them your letter of credit?""
-kirin_council.31.a:0 "The NAKP will offer incentives to speed things up."
-kirin_council.31.b:0 "We'll get the best return on our investment by staying patient."
-
-kirin_council.32.t:0 "Fragmented Growth"
-kirin_council.32.d:0 "Fickle Current was swiftly growing to loathe puzzles. Assembling a functional state following its severance from the host nation was like trying to assemble a colossal jigsaw puzzle, only to find out that half of the pieces were in another box. It took trial and error to find which pieces matched with each other, but with the additional threat that he could only try so many times before the pieces broke and the picture would forever be tarnished, if it was even completed it all.\n\nHis current issue was one that required a delicate touch and a couple dozen more jigsaw pieces to painstakingly fit into the puzzle. Greater Providence was a patchwork of regions and subdivisions, each with their own government, laws, and civil bodies, shackled to unique cultural quirks and differing economic drivers. Applying one broad policy over such a patchwork of states would likely be beneficial to some and detrimental to others, and the disparity could hamper the effectiveness of the measure at large. Instead, the best way forward was to rely on and encourage the independent growth of these states. The free market would carve out its niches in the north and settle enterprises into regions that best suited their needs and goals. But, as with everything else, such measures would take time.\n\nCurrent frowned as he thought about it. Time was a valuable commodity, maybe even more so than wealth. Doubtless the growth of these patchwork regions could be accelerated with the right incentives to adventurous businesses. But was such an investment wise? Would its return be worth the amount of capital it would take to successfully incentivize the trading houses to develop the north?"
-kirin_council.32.a:0 "You have to spend money to make money!"
-kirin_council.32.b:0 "The states will grow with time and competition, as always."
-
-kirin_council.33.t:0 "Stopping the Bloodletting"
-kirin_council.33.d:0 "Envoys from the city of Fragrance, sent out on behalf of Fickle Current, Chairkirin of the NAKP, arrived in [Root.Capital.GetName], seeking to attempt a diplomatic resolution to end the bloodshed that has engulfed the Realm in the War of the Double Secession. Chairkirin Current is willing to mediate an end to the war in Fragrance, expressing the urgency with which the war needs to be concluded. If the conflict continues to drag on, famine, disease, and anarchy will cripple the Realm, and leave us fighting over a pile of ashes. Is ruling the ruins of Kiria really worth fighting for more than what we already have?\n\nCurrent's envoys have also come prepared with preliminary terms to begin negotiations with. First and foremost, Vermilion and Chrysanthemum will have to recognize the right of the other to exist, and promise not to suppress the rights of followers of The Way of Fire and The Rising Fire in their respective territories. Additionally, a more favorable border will be established between our domains by Vermilion ceding Verdant to Chrysanthemum and the rule of The Rising Fire. In exchange, Rising Sun will protect the rights of free navigation up and down the Great Mellifluve to all nations, and will refrain from attempting to expand her influence beyond the banks of the Great Mellifluve, with the exception of any territory acquired from Vermilion over the course of the war, which she will be allowed to keep. Lastly, the proposed treaty urges each party to make a promise to mediate any future disputes through diplomatic channels and not through the use of force.\n\nThe treaty is an interesting proposal, and offers us a way out of the bloodshed. But it is unlikely to be popular with our people; we have fought for so much, and what we will be settling for is much less than we promised them. But is the price of continuing the war too steep? And how can we trust the other side?"
-kirin_council.33.a:0 "We must accept, for the good of the Realm."
-kirin_council.33.b:0 "We cannot abandon our people to heresy!"
-kirin_council.33.c:0 "We cannot continue to fight, lest we rule over ashes."
-kirin_council.33.e:0 "The Way of Fire must be toppled, no matter what it takes!"
-
-kirin_council.34.t:0 "The Dawn of Tomorrow"
-kirin_council.34.d_1:0 "Fickle Current was up before dawn, and after failing to go back to sleep, he decided to start his day before the sun rose. After eating something light for breakfast, he left his home behind and went for a pre-dawn trot. His path took him down to the sandy shores outside of the city limits, where he was all alone save for scuttling crabs and the crashing of waves against the beaches. Eventually, he stopped and sat down on the sand, his gaze turned toward the east, waiting for the sun to reveal itself on the dark horizon. It gave him time to reflect on all he had accomplished so far as the NAKP's unquestioned chairkirin.\n\nWar had come to Kiria for the first time in centuries; now, it was over. He may have helped escalate it by organizing Fragrance's secession when the Grand Gallop Onward failed, but he had played a decisive role in ending it. The threat posed by the Rising Fire had been largely neutralized, and peace had once more returned to the Realm. And it was thanks to his efforts that it was so; he knew he would be remembered for many, many years because of what he had accomplished.\n\nBut it was not without some chafing and disagreement from within the party. Current had had to cut deals as he could and make compromises to keep much of what he'd gained for Fragrance. Submission to Vermilion as the Viceroyalty of Greater Providence had been seen by many in the party as a stab in the back to the idea of an independent Fragrance, but the reality had been that there was no other choice. Fragrance had been too weak to survive on its own, and only in submission to Vermilion would it be allowed to keep much of the freedom Current had bought it. But the kirin of Greater Providence were still proud of what he had secured for them: pride in their northern identity, pride in its recognition from Vermilion, pride in the safe and predictable future Current had promised them. Their futures would be bright and profitable, and at the end of the day, was that not all that they wanted?\n\nThe sun began to rise, an orange glow on the horizon, slowly growing brighter as the minutes passed. As Current felt its light begin to warm his coat, he allowed himself a smile. In Kiria's hour of darkness, Fragrance had been its beacon of hope and peace. It had positioned itself as an ideal for all kirin nations to model themselves after, a rational and logical nation ruled by reason, not superstition and religious dogma. Perhaps, in the end, that was all that mattered."
-kirin_council.34.d_2:0 "Fickle Current was up before dawn, and after failing to go back to sleep, he decided to start his day before the sun rose. After eating something light for breakfast, he left his home behind and went for a pre-dawn trot. His path took him down to the sandy shores outside of the city limits, where he was all alone save for scuttling crabs and the crashing of waves against the beaches. Eventually, he stopped and sat down on the sand, his gaze turned toward the east, waiting for the sun to reveal itself on the dark horizon. It gave him time to reflect on all he had accomplished so far as the NAKP's unquestioned chairkirin.\n\nWar had come to Kiria for the first time in centuries; now, it was over. He may have helped escalate it by organizing Fragrance's secession when the Grand Gallop Onward failed, but he had played a decisive role in ending it. The threat posed by the Rising Fire had been largely neutralized, and peace had once more returned to the Realm. And it was thanks to his efforts that it was so; he knew he would be remembered for many, many years because of what he had accomplished.\n\nIt had been everything that most members of the party had sought: true independence and the right to self-determination, free from religious superstition and interference. Though Fragrance and the NAKP recognized Matriarch Superior Rain Shine as the one true spiritual and religious leader of kirinkind, she held no legal authority over Fragrance, leaving the north free to pursue its own designs and chart its own course through the waters ahead of it. Some in the NAKP grumbled that they should have gone further, should have taken steps to ensure their dominion over the rest of the Realm, but would such actions really have been worth it? Would it have been worth it to jeopardize their independence for the sake of greed? The kirin of Greater Providence were happy with their independence, and they were proud of what they had done to end the war with the Rising Fire. What more did they need that they did not already have? Their futures would be bright and profitable, and at the end of the day, was that not all that they wanted?\n\nThe sun began to rise, an orange glow on the horizon, slowly growing brighter as the minutes passed. As Current felt its light begin to warm his coat, he allowed himself a smile. In Kiria's hour of darkness, Fragrance had been its beacon of hope and peace. It had positioned itself as an ideal for all kirin nations to model themselves after, a rational and logical nation ruled by reason, not superstition and religious dogma. Perhaps, in the end, that was all that mattered."
-kirin_council.34.d_3:0 "Fickle Current was up before dawn, and after failing to go back to sleep, he decided to start his day before the sun rose. After eating something light for breakfast, he left his home behind and went for a pre-dawn trot. His path took him down to the sandy shores outside of the city limits, where he was all alone save for scuttling crabs and the crashing of waves against the beaches. Eventually, he stopped and sat down on the sand, his gaze turned toward the east, waiting for the sun to reveal itself on the dark horizon. It gave him time to reflect on all he had accomplished so far as the NAKP's unquestioned chairkirin.\n\nWar had come to Kiria for the first time in centuries; now, it was over. He may have helped escalate it by organizing Fragrance's secession when the Grand Gallop Onward failed, but he had played a decisive role in ending it. The threat posed by the Rising Fire had been largely neutralized, and peace had once more returned to the Realm. And it was thanks to his efforts that it was so; he knew he would be remembered for many, many years because of what he had accomplished.\n\nPerhaps it was made all the sweeter by the stunning reversal of Fragrance's fortunes that he had managed to accomplish. Originally positioned as the junior partner to Vermilion, a deal he had brokered by necessity, the success of Action Cerise had been as stunning as it was glorious. The NAKP had complete control over Vermilion, and he had even extracted verbal and written support from Matriarch Superior Rain Shine over the state of affairs, even if he had to carefully leverage what tools he had to coax the statement out of her. Vermilion was squarely under Fragrance's hoof, its military subordinate to the NAKP's command, and the heroics of Greater Providence in ending the war and preserving the Vermilion Realm had won them loyalty from much of the Realm's population. For the kirin of the north, it was everything they could have possibly asked for: their complete independence, their comfort in profitable peace, and the humiliation of the city that had once wronged them so deeply. The future was bright, perhaps as bright as it ever could have been.\n\nThe sun began to rise, an orange glow on the horizon, slowly growing brighter as the minutes passed. As Current felt its light begin to warm his coat, he allowed himself a smile. In Kiria's hour of darkness, Fragrance had risen to the occasion. It had done what was necessary to secure peace, and it had succeeded. There was no kirin alive who could now deny the necessity of its ascendancy."
-kirin_council.34.d_4:0 "Fickle Current was up before dawn, and after failing to go back to sleep, he decided to start his day before the sun rose. After eating something light for breakfast, he left his home behind and went for a pre-dawn trot. His path took him down to the sandy shores outside of the city limits, where he was all alone save for scuttling crabs and the crashing of waves against the beaches. Eventually, he stopped and sat down on the sand, his gaze turned toward the east, waiting for the sun to reveal itself on the dark horizon. It gave him time to reflect on all he had accomplished so far as the NAKP's unquestioned chairkirin.\n\nWar had come to Kiria for the first time in centuries; now, it was over. He may have helped escalate it by organizing Fragrance's secession when the Grand Gallop Onward failed, but he had played a decisive role in ending it. The threat posed by the Rising Fire had been largely neutralized, and peace had once more returned to the Realm. And it was thanks to his efforts that it was so; he knew he would be remembered for many, many years because of what he had accomplished.\n\nPerhaps it was made all the sweeter by the stunning reversal of Fragrance's fortunes that he had managed to accomplish. Originally positioned as a partner paying lip service to the Matriarch and Vermilion, the success of Action Cerise had been as stunning as it was glorious. The NAKP had complete control over Vermilion, and he had even extracted verbal and written support from Matriarch Superior Rain Shine over the state of affairs, even if he had to carefully leverage what tools he had to coax the statement out of her. Vermilion was squarely under Fragrance's hoof, its military subordinate to the NAKP's command, and the heroics of Greater Providence in ending the war and preserving the Vermilion Realm had won them loyalty from much of the Realm's population. For the kirin of the north, it was everything they could have possibly asked for: their complete independence, their comfort in profitable peace, and the humiliation of the city that had once wronged them so deeply. The future was bright, perhaps as bright as it ever could have been.\n\nThe sun began to rise, an orange glow on the horizon, slowly growing brighter as the minutes passed. As Current felt its light begin to warm his coat, he allowed himself a smile. In Kiria's hour of darkness, Fragrance had risen to the occasion. It had done what was necessary to secure peace, and it had succeeded. There was no kirin alive who could now deny the necessity of its ascendancy."
-kirin_council.34.a:0 "Peace at last."
-
-kirin_council.35.t:0 "Teahouse Generals"
-kirin_council.35.d:0 ""Sure, the tactics hypothesized by the Moon Princess would have been revolutionary for their time, but you must admit that Sunshine Dew at least tested hers against her rivals surrounding Verdant."\n\n"Sunshine Dew benefitted from maintaining a clear mind. Nokirin alive questions that she made warfare an art, but the execution of her plans to their successful conclusions was helped along greatly by the impulsive rage of her rivals slipping into the nirik form in the midst of combat..."\n\nCypress Snow took a sip of his matcha tea as he watched two of his old friends debate the skill and accolades of many famous military minds throughout world history. It was nice to have them and many other of his Literati friends together under one roof again, and even better that they could finally do so in Kiria. Many of them had feared that they would not live long enough to see this day; some of them didn't. Those lost friends were dearly missed, but Cypress knew they were with them in spirit. If the Way of Fire mystics were to be believed, they lived on in the primordial spark of the kirin race, returned to the fire from which they were born, and the fire that lived inside the breast of every kirin.\n\nThe topic of conversation had drifted hither and thither throughout the afternoon, though recent events had settled it on military matters. It was no secret that things were tense between the NAKP and the government back in Vermilion; at this point, war was less a question of "if" but "when". He decided to clear his throat and head off any more talk of military matters before it grew heated. "Friends, I am glad to have you all here, although I wish it were under better circumstances," he proclaimed, interrupting the ongoing argument. "We've come from many trots of life: professors, corporate advisors, historians, and many more. And now we're all reunited in service of the NAKP and making Kiria what we've always dreamed it should be. But for now, let's not let our talk linger on the art of war. It is a costly art, after all, and I fear that we shall all grow sick of it entirely too soon.""
-kirin_council.35.a:0 "Let's find something more pleasant to talk about, shall we?"
-
-kirin_council.36.t:0 "Pay to Win"
-kirin_council.36.d:0 ""It's ridiculous, is what it is," Dr. Ardent Bloom remarked, looking at the report Simple Survey had prepared for him. The amount of money that had been flowing into the NAKP's coffers as of late was beyond unexpected.\n\n"You disapprove?" Simple Survey asked, one of his eyebrows climbing higher up his face.\n\n"Not in the slightest," Ardent said, dropping the stack of papers back onto Survey's desk with a wide smile. "Allowing kirin to buy their way out of the conscription lottery was a genius move. Mixing a sense of patriotic duty in contributing to the war chest along with the option to exempt your family from military service has meant war bond purchases have risen over 500% in the past month alone. It's a win-win for both sides: the NAKP gets the money we need to buy guns and continue our armament effort, and our beloved donors get to keep their sons and daughters off of the front lines."\n\n"Indeed," Survey agreed. "I just hope that this doesn't thin the ranks too much."\n\n"Why would it?" Dr. Bloom asked. "It doesn't mean the lottery pulls fewer numbers. It just means that we conscript those who can't or won't donate money to the war effort. The poor fill our armies, and the rich fill our coffers. Nothing wrong with that.""
-kirin_council.36.a:0 "It's a perfect system, really."
-
-kirin_council.37.t:0 "A Message from Radio Free Kiria"
-kirin_council.37.d:0 "Radios all throughout much of the Greater Providence realm sprung to life just after dinnertime, heralding the important message with the usual fanfare played across the airwaves. "Good evening, fillies and gentlecolts throughout our beloved Realm!" the announcer's voice greeted with a crackle of static. "Tonight, we have a very special program for you. Our very own Chairkirin, Fickle Current, will be discussing an important question with Dr. Cypress Snow: what makes a kirin? I won't keep the answer to that question from you, and instead I'll turn the microphone over to the Chairkirin. Chairkirin Current, Dr. Snow, the show's all yours."\n\n"Thank you," Fickle Current said. "So, Dr. Snow. Let's skip the introductions; everykirin listening in now knows who we both are. Let's dive right into the heart of the topic at hoof: what is the nature of the kirin spirit?"\n\n"It's a simple answer with many layers to it," Cypress responded. "The outermost layer is perhaps the easiest for everykirin listening at home to understand: we are Concord's chosen people. We are the keepers of Her will, the custodians of the Primordial Fire that birthed the world. Out of all the creatures that inhabit this world, from ponies to griffons to zebras, it was the kirin species that Concord bestowed Her most powerful gift: our flame, our fury, our passion."\n\n"And yet we have all been taught since we were foals to refrain from using Her gift," Fickle Current countered. "The nirik state is a terrible blight."\n\n"To call it a blight is a misconception, one pushed by The Way of Fire," Cypress said, delivering the counterpoint with practiced ease. "Our fire and fury is a tool, not a curse. It is, however, a dangerous one. An axe is a tool that can kill, but it can also shape and create. So too must we use our passion wisely to create, not destroy. In the late 800s, the Realm was on par with Equestria for technological supremacy, thanks to our investments in steam and clockwork technology, but The Silence cost us a century of valuable time. Imagine what could have been but for misplaced superstition!"\n\n"I can, and I encourage everykirin listening at home to do the same," Current said. "The NAKP is the harbinger of a new future for Kiria, and we all have a part to play to make it a reality. We must cast down the heretical Rising Fire and cleanse the ranks of the Way of Fire of those who bury the Realm in superstition for their own gain. We must strive to unite Kiria under its rule and purge the misguided elements that have held us back for so long. That is our destiny, and I have no doubt that the enlightened kirin of Greater Providence will be the ones that lead the Realm back into the glory we deserve.""
-kirin_council.37.a:0 "Such is our future, and we can make it a reality."
-
-kirin_council.38.t:0 "Buying Rank"
-kirin_council.38.d:0 "Mayflower Bloom didn't know what to expect when she heard that her cousin had become an officer in the Order of the Iron Chrysanthemum, but even Ardent Bloom dressed in full officer's garb standing across from her in the kitchen of her home in Fragrance somehow didn't feel real. "You like it, May?" he asked her, and he smirked as he held out a foreleg to show off the epaulettes on his shoulder.\n\nMayflower suppressed an amused snort and tried to hide the look on her face by turning back to the tea she was preparing for the two of them. "I didn't take you for an army type, Ardent. How in the world did you end up as a... what did you say it was? Brigand-General?"\n\n"Brigadier-General," Ardent clarified with an annoyed growl. "And I'll tell you how. With war on the horizon, the NAKP was looking to make the Order of the Iron Chrysanthemum a more professional force to be the tip of the spear. Yesterday, the Order was just a bunch of street thugs, bandits, and yes, brigands, hastily assembled into a kind of informal police force to do the party's bidding. But now that the Order's putting together the Death's Head Brigade, they needed money to lure some of the best marines the trading houses have to offer into its ranks, and to equip them with the best Griffonian ordnance we could buy. So I made a contribution, and they awarded me with a rank befitting of my gift."\n\n"And how much was that?" Mayflower asked, finally finishing their tea and pouring it into two waiting cups. From everything it sounded like, nokirin was going to listen to somekirin who bought their rank when it came time to fight, least of all Ardent, who was more at home in his spreadsheets and ledgers than he was on the battlefield.\n\n"A little more than a week's worth of pay," Ardent said with a shrug, but he quickly chased it off with a smile. "But this is just the beginning. Right now, the Order has to buy the best from elsewhere, and it needs the money to do that. One day, though, the true patriots of Kiria will produce the best equipment and the best soldiers the world has ever seen!""
-kirin_council.38.a:0 "How nice... Now, would you like to have your tea, cousin?"
-
-kirin_council.39.t:0 "Beggar at the Ball"
-kirin_council.39.d:0 "Fickle Current hurriedly flagged down the cocktail waitress and exchanged his empty glass of champagne for another one, immediately taking a few quick gulps. What was it, his fourth of the night? Fifth? He didn't know, and it was probably better that way. His nerves were fraying, and though he was hardly a heavy drinker, he was reaching for something to help soothe them. After all, he was about to make a very difficult request, and the hit to his reputation would take some time to recover.\n\nHe looked out at all the kirin slowly filing into the grand ballroom of 88 Chrysanthemum Plaza, many of them clutching drinks in their colorful magical auras, and all of them dressed to the nines. They were all members of the pinnacle of modern kirin society, the highest of the Diaspora's high society, and they had all paid 5000 Griffonian idols a head to attend the night's fundraising festivities. And here Current was about to ask them for more.\n\nWhen they had all gathered into the ballroom, Current took the microphone to thank them for their charity and give them all a pat on the back for having the means to afford the exorbitant entrance fee, as he knew all socialite types craved. That part of the speech was easy; then came the hard part. "And now, I'd like to remind everykirin of the reason why we're having this ball tonight, and how much more we all have to give to make our dreams a reality," he said, steeling himself for the inevitable reproachful looks from those gathered before him. "We will soon be finding ourselves in a war, and a very expensive one at that. Suffice it to say, the coffers of the NAKP are simply inadequate for waging war against our foes in Vermilion. Therefore, I regretfully ask of you all if you have anything else you can spare for the war effort, the NAKP will be greatly appreciative of any and all contributions. When the war is won, we will, of course, remember your generosity in the future."\n\nThe scoffs from the gathered kirin and the sniffs of disgust made Current feel like somekirin was pulling his scales off one by one with a pair of pliers, but he did his best to maintain a smile through their murmuring. That was nothing, however, compared, to the words he overhead Silver Silks, heiress to the Sycee Trading House and the single wealthiest kirin present at the party, mutter to her friends. "Begging is quite unbecoming of the Chairkirin, wouldn't you agree? I suppose we should give him what he wants. Elsewise, he may become even more desperate at the next gala, and that just won't do at all."\n\nTheir tittering bit deep, but Current swallowed that embarrassment regardless. If the NAKP didn't get the funds it needed to fight the war, then it was doomed anyway."
-kirin_council.39.a:0 "Wounded pride is nothing if our cause collapses, right?"
-
-kirin_council.40.t:0 "Picking Your Friends"
-kirin_council.40.d:0 "I hate being in debt," Fickle Current announced to Ardent Bloom as he paced in the latter's office. "Business deals are one thing. Debts change with time. They're unpredictable, and you don't know what you're in for when the debt is called." He sighed and shook his head. "But it's a necessary evil, is it not? We need overseas investors, and our contacts in Griffonia are happy to give us funds if we lease them land, property, and resources as collateral. If we lose, we won't have to worry about our creditors in Skyfall or Flowena calling due, but if we win..."\n\n"There is another option that's not with our usual Griffonian contacts," Ardent said, steepling his hooves as he considered whether or not to press forward. But at Current's curious look, he continued. "The Changelings have caught wind of our offer. I don't know how, but when you're dealing with a race of shapeshifting insects, I suppose it only makes sense that they would. They're interested, and they're offering exceedingly generous terms."\n\n"How generous?" Current asked. In his experience, the more generous the terms, the larger the knife hidden behind a creature's back.\n\n"They want the same things as our Griffonian business partners, but they're more interested in property than resources, and they're willing to pay more for it — much more. But..." Here he hesitated, then sighed and continued. "They're negotiating through Main Hive Industries, their largest industrial conglomerate. It's all run through one bug named Finicus Vesali, and I'll warn you, he's no slouch when it comes to the negotiating table. He probably knows how to cut a deal as well as you do, Current. Long story short, I don't trust them."\n\n"And to make a short story slightly longer?" Current asked, raising an eyebrow.\n\n"Well, the Changelings, unlike Skyfall or Flowena, have the means to collect if we don't pay up," Bloom said. "And they want land more than anything else. You'd think an industrial powerhouse like them would want resources above anything else. Something's fishy, and I don't like it... but at the end of the day, it's your call.""
-kirin_council.40.a:0 "Generous terms from the Changelings are to our advantage."
-kirin_council.40.b:0 "It's better to cut a deal with somegriffon who can't hurt you should we break it."
-KIR_council_focus_5c_40b_tt:0 "\nUpon our §Yvictory§! in the §Ycivil war§!:"
+kirin_council.31.t:0 "Возможность ускориться"
+kirin_council.31.d:0 "Фикл Каррент считал себя довольно сносным бизнескирином, но даже он должен был признать, что у него плохо получалось работать с цифрами. Главный экономист НАКП, с другой стороны, был настоящим волшебником - так мастерски распределять финансы Благоухания мог только этот кирин. Офис доктора Ардент Блума был забит коробками с финансовыми отчётами, экономическими прогнозами и целой кучей записей о всяческих сделках. Вполне вероятно, что здесь же где-то завалялся список всех махинаций, проводившихся в тайне от правительства, способных ударить даже по самым влиятельным торговым домам. Как он за всем этим следит? Этого не понимал никто. Возможно даже сам Блум.\n\nОднако Каррент пришёл не для того, чтобы смотреть на беспорядок. Фикл пришёл за советом. — Юристы составляют законы для нашей страны, превращая обещания НАКП в реальность. — объяснил лидер националистов доктору, держа магией листок бумаги и ручку. — Если мы собираемся объявить о независимости, значит нам надо что-то предоставить киринам Великого Провидения. Мы решили закончить индустриализацию на остатках провалившегося эксперимента Киновари. Ситуацию в НАКП ты понимаешь, как никто другой. Что посоветуешь?\n\n— Зависит от твоих амбиций. — ответил Карренту Ардент Блум, доставая папки из различных коробок. Он разложил их перед кирином. — Свободный рынок - это штука прекрасная, и она постоянно следует за деньгами. Индустриализация севера принесёт прибыль... со временем. Компании будут делать безопасные инвестиции в новый промышленный сектор, а когда эти самые инвестиции дадут плоды, они тут же вложат их в нашу экономику. Вскоре, у нас появится мощная индустриальная база, но, если их немного мотивировать, они с радостью пойдут на риски и ускорят процесс. Лучший способ заставить корпорацию, единственной функцией которой является получение прибыли для своих акционеров, пойти на риск - это позволить ей сделать это за чужой счет. Таким образом, всё, что вам нужно - раздать им кредиты."
+kirin_council.31.a:0 "Пора мотивировать предпринимателей ускорить процесс индустриализации."
+kirin_council.31.b:0 "Оставаясь терпеливыми, мы получим максимальную отдачу от наших инвестиций."
+
+kirin_council.32.t:0 "Разрозненный Рост Фрагментированный рост"
+kirin_council.32.d:0 "Фикл Каррент начал ненавидеть головоломки. Создание функционирующего государства с отделением от Кирии было сродни сборке огромного пазла по кусочкам, вот только сейчас, пройдя уже половину пути, кирин понял, что половина кусочков лежат в другой коробке. Путём проб и ошибок он подбирал подходящие части, соединяя и меняя их местами, зная, что с каждой попыткой кусок головоломки может просто сломаться - а если это произойдёт, то он никогда уже не сможет увидеть полную картину.\n\nЕго нынешние проблемы требовали должного отношения и пары сотен частиц пазла. Великое Провидение было подобно грубно сшитому полотну из регионов, каждый со своими законами, обычаями и государственными аппаратами. Если использовать одну политику на всех, то рада будет лишь часть, и всё это навредит общей эффективности правительства. Всё же, лучшим способом являлось позволить этим регионам расти независимо друг от друга. Свободный рынок сам создаст ниши на севере и приведёт предпринимателей в лучшие регионы, но это всё требует времени.\n\nКаррент тяжело вздохнул. Время было бесценным ресурсом. Несомненно, рост провинций может быть ускорен при правильном стимулировании предпринимательской деятельности. Но разумны ли такие инвестиции? Будет ли отдача от них стоить того капитала, который потребуется для успешного стимулирования торговых домов к освоению севера?"
+kirin_council.32.a:0 "Чтобы получать деньги — надо тратить деньги!"
+kirin_council.32.b:0 "Регионы сами смогут добиться необходимого роста экономики."
+
+kirin_council.33.t:0 "Шанс остановить кровопролитие"
+kirin_council.33.d:0 "Послы из Благоухания, посланные по поручению Фикл Каррента, председателя НАКП, прибыли в [Root.Capital.GetName] для дипломатического решения гражданской войны, чтобы закончить кровопролитие, поглотившее Кирию. Председатель националистов был готов к переговорам, высказав желание побыстрее принести мир в Царство. В конце-концов, имеет ли эта война смысл, если в конечном итоге победитель будет править руинами?\n\nПослы Каррента также подготовили предварительные условия для переговоров. Сперва, Киноварь и Хризантема должны признать права на существование друг друга и пообещать не подавлять права последователей Пути Огня и Разгорающегося Пламени в своих регионах. К тому же, будет установлена более благоприятная граница для двух государств: Зеленеющий перейдёт управление Хризантемы, однако взамен, Райзин Сан пообещает защитить права народа на свободу передвижения по Медоносной и не будет распространять своё влияние на территориях другого государства, за исключением захваченных во время конфликта. Наконец, обе стороны должны дать обещание, что будущие конфликты они будут решать между собой с помощью дипломатов, без применения силы.\n\nЭтот договор является довольно интересным предложением для окончания конфликта, но народу он точно не понравится. Они так долго сражались и как итог получат меньше, чем рассчитывали. Оправдана ли цена войны? Можем ли мы доверять другой стороне?"
+kirin_council.33.a:0 "Мы должны принять его, на благо Царства."
+kirin_council.33.b:0 "Мы не можем отдать свой народ в копыта ереси!"
+kirin_council.33.c:0 "Мы должны закончить бой, если не хотим править пустошью."
+kirin_council.33.e:0 "Путь Огня надо свергнуть не смотря ни на что!"
+
+kirin_council.34.t:0 "Рассвет завтрашнего дня"
+kirin_council.34.d_1:0 "Фикл Каррент проснулся перед рассветом, и после того, как ему не удалось снова заснуть, он решил начать свой день до восхода солнца. Съев что-то лёгкое на завтрак, он покинул свой дом и отправился на предрассветную пробежку. Его путь привел кирина к песчаному побережью за чертой города, где он был совсем один, если не считать снующих крабов и грохота волн о берег. В конце концов председатель остановился и сел на песок, устремив взгляд на восток, ожидая, когда солнце покажется на темном горизонте. Это дало ему время поразмыслить обо всем, чего он достиг на посту бесспорного лидера НАКП.\n\nВ первые за столетия, в Кирию пришла кровавая война; и теперь она закончилась. Да, возможно, сам Каррент способствовал эскалации конфликта, организовав отделение Благоухания, когда Великий Скачок Вперёд потерпел неудачу, но сейчас он сыграл решающую роль в его прекращении. Угроза, исходившая от Райзин Сан, была в значительной степени нейтрализована, и в Царстве вновь воцарился мир. Фикл знал, что его будут помнить ещё много-много лет как великого миротворца.\n\nОднако некоторые кирины внутри партии были недовольны. Карренту приходилось заключать сделки и идти на компромиссы, чтобы сохранить большую часть того, что он урвал для Севера. Подчинение Киновари как наместнику Великого Провидения было воспринято большинством местных как удар в спину идее независимого Благоухания, но реальность заключалась в том, что другого выбора просто не было. Провидение было слишком слабым, чтобы жить самостоятельно, и только подчиняясь Матриарху, региону было позволено сохранить большую часть свободы, которую он получил благодаря Карренту. Но даже сейчас у киринов Севера есть великое наследие: гордость за свою самобытность, равные отношения с Киноварью, безопасное и предсказуемое будущее. Их будущее было бы светлым и прибыльным, и, в конце концов, разве это не все, чего они хотели?\n\nСолнце начало подниматься, оранжевое зарево на горизонте медленно разгоралось с каждой минутой. Когда Фикл почувствовал, что свет начинает согревать его пальто, он позволил себе улыбнуться. В мрачный час Кирии Благоухание станет её маяком надежды и покоя. Север стал идеалом для подражания всем киринам - рациональная и логичная нация, управляемая разумом, а не суевериями и религиозными догмами. Возможно, в конце концов, только это и имело значение."
+kirin_council.34.d_2:0 "Фикл Каррент проснулся перед рассветом, и после того, как ему не удалось снова заснуть, он решил начать свой день до восхода солнца. Съев что-то лёгкое на завтрак, он покинул свой дом и отправился на предрассветную пробежку. Его путь привел кирина к песчаному побережью за чертой города, где он был совсем один, если не считать снующих крабов и грохота волн о берег. В конце концов председатель остановился и сел на песок, устремив взгляд на восток, ожидая, когда солнце покажется на темном горизонте. Это дало ему время поразмыслить обо всем, чего он достиг на посту бесспорного лидера НАКП.\n\nВ первые за столетия, в Кирию пришла кровавая война; и теперь она закончилась. Да, возможно, сам Каррент способствовал эскалации конфликта, организовав отделение Благоухания, когда Великий Скачок Вперёд потерпел неудачу, но сейчас он сыграл решающую роль в его прекращении. Угроза, исходившая от Райзин Сан, была в значительной степени нейтрализована, и в Царстве вновь воцарился мир. Фикл знал, что его будут помнить ещё много-много лет как великого миротворца.\n\nЭто было всё, к чему стремилось большинство членов партии: настоящая независимость и право на самоопределение, свобода от религиозных предрассудков и вмешательства. Хотя Благоухание и НАКП признали Верховного Матриарха Рейн Шайн единственным истинным духовным и религиозным лидером всех киринов, она не имела юридической власти над Благоуханием, предоставляя Северу свободу следовать своим собственным планам и прокладывать свой собственный курс. Некоторые в НАКП ворчали, что им следовало пойти дальше, и захватить всё Царство, но действительно ли оно стоили того? Стоило ли рисковать своей независимостью ради жадности? Кирины Великого Провидения были довольны своей свободой и гордились тем, что они сделали, чтобы положить конец войне с Райзин Сан. Что ещё им было нужно, чего у них ещё не было? Их будущее было бы светлым и прибыльным, и, в конце концов, разве это не всё, чего они хотели?\n\nСолнце начало подниматься, оранжевое зарево на горизонте медленно разгоралось с каждой минутой. Когда Фикл почувствовал, что свет начинает согревать его пальто, он позволил себе улыбнуться. В мрачный час Кирии Благоухание станет её маяком надежды и покоя. Север стал идеалом для подражания всем киринам - рациональная и логичная нация, управляемая разумом, а не суевериями и религиозными догмами. Возможно, в конце концов, только это и имело значение."
+kirin_council.34.d_3:0 "Фикл Каррент проснулся перед рассветом, и после того, как ему не удалось снова заснуть, он решил начать свой день до восхода солнца. Съев что-то лёгкое на завтрак, он покинул свой дом и отправился на предрассветную пробежку. Его путь привел кирина к песчаному побережью за чертой города, где он был совсем один, если не считать снующих крабов и грохота волн о берег. В конце концов председатель остановился и сел на песок, устремив взгляд на восток, ожидая, когда солнце покажется на темном горизонте. Это дало ему время поразмыслить обо всем, чего он достиг на посту бесспорного лидера НАКП.\n\nВ первые за столетия, в Кирию пришла кровавая война; и теперь она закончилась. Да, возможно, сам Каррент способствовал эскалации конфликта, организовав отделение Благоухания, когда Великий Скачок Вперёд потерпел неудачу, но сейчас он сыграл решающую роль в его прекращении. Угроза, исходившая от Райзин Сан, была в значительной степени нейтрализована, и в Царстве вновь воцарился мир. Фикл знал, что его будут помнить ещё много-много лет как великого миротворца.\n\nВозможно, благодаря ошеломляющему повороту судьбы Благоухания, которого удалось добиться Карренту, делало эту победу слаще. Первоначально позиционируемый как зависимый партнёр Киновари, в сделке, посредником в которой он был по необходимости, успех Интервенция НАКП была столь же ошеломляющим, сколь и великолепной. НАКП полностью контролировала Киноварь, и он даже добился устной и письменной поддержки от Верховного Матриарха Рейн Шайн... Даже если ему пришлось тщательно использовать все имеющиеся у него инструменты, чтобы вытянуть из неё это заявление. Киноварь находился прямо в копытах Благоухания, его военные подчинялись командованию НАКП, и героизм Великого Провидения в прекращении войны и сохранении Царства, завоевал им лояльность большей части населения Кирии. Для киринов севера это было всё, о чём они только могли мечтать: полная независимость, комфорт с выгодным миром и унижение города, который когда-то причинил им такую глубокую обиду. Будущее было светлым, возможно, самым лучшим.\n\nСолнце начало подниматься, оранжевое зарево на горизонте медленно разгоралось с каждой минутой. Когда Фикл почувствовал, что свет начинает согревать его пальто, он позволил себе улыбнуться. В мрачный час Кирии Благоухание оказалось на высоте положения. Оно сделало всё необходимое для обеспечения мира, и НАКП это удалось. Не было ни одного живого кирина, который мог бы теперь отрицать необходимость господства Севера."
+kirin_council.34.d_4:0 "Фикл Каррент проснулся перед рассветом, и после того, как ему не удалось снова заснуть, он решил начать свой день до восхода солнца. Съев что-то лёгкое на завтрак, он покинул свой дом и отправился на предрассветную пробежку. Его путь привел кирина к песчаному побережью за чертой города, где он был совсем один, если не считать снующих крабов и грохота волн о берег. В конце концов председатель остановился и сел на песок, устремив взгляд на восток, ожидая, когда солнце покажется на темном горизонте. Это дало ему время поразмыслить обо всем, чего он достиг на посту бесспорного лидера НАКП.\n\nВ первые за столетия, в Кирию пришла кровавая война; и теперь она закончилась. Да, возможно, сам Каррент способствовал эскалации конфликта, организовав отделение Благоухания, когда Великий Скачок Вперёд потерпел неудачу, но сейчас он сыграл решающую роль в его прекращении. Угроза, исходившая от Райзин Сан, была в значительной степени нейтрализована, и в Царстве вновь воцарился мир. Фикл знал, что его будут помнить ещё много-много лет как великого миротворца.\n\nВозможно, благодаря ошеломляющему повороту судьбы Благоухания, которого удалось добиться Карренту, делало эту победу слаще. Первоначально позиционируемый как зависимый партнёр Киновари, в сделке, посредником в которой он был по необходимости, успех Интервенция НАКП была столь же ошеломляющим, сколь и великолепной. НАКП полностью контролировала Киноварь, и он даже добился устной и письменной поддержки от Верховного Матриарха Рейн Шайн... Даже если ему пришлось тщательно использовать все имеющиеся у него инструменты, чтобы вытянуть из неё это заявление. Киноварь находилась прямо в копытах Благоухания, его военные подчинялись командованию НАКП, и героизм Великого Провидения в прекращении войны и сохранении Царства завоевал им лояльность большей части населения Кирии. Для киринов севера это было всё, о чём они только могли мечтать: полная независимость, комфорт с выгодным миром и унижение города, который когда-то причинил им такую глубокую обиду. Будущее было светлым, возможно, самым лучшим.\n\nСолнце начало подниматься, оранжевое зарево на горизонте медленно разгоралось с каждой минутой. Когда Фикл почувствовал, что свет начинает согревать его пальто, он позволил себе улыбнуться. В мрачный час Кирии Благоухание оказалось на высоте положения. Оно сделало всё необходимое для обеспечения мира, и НАКП это удалось. Не было ни одного живого кирина, который мог бы теперь отрицать необходимость господства Севера."
+kirin_council.34.a:0 "Мир наконец настал."
+
+kirin_council.35.t:0 "Чайные Генералы"
+kirin_council.35.d:0 "— Конечно, тактики, предлагаемые Мун Принцесс, были бы революционными для своего времени, но ты должен признать, что Сайншайн Дью опробовала свои против врагов, окружающих Зеленеющий.\n\n— Саншайн Дью помог чистый разум. Никто не может усомниться в том, что она превратила войну в искусство, но исполнение её планов было в разы облегчено импульсивными оппонентами, становящимися нириками посреди боя...\n\nСайпресс Сноу выпил чая маття, смотря на дебаты своих старых друзей о навыках и заслугах многих знаменитых генералов и умов. Было приятно снова встретиться под одной крышей с такой группой эрудитов, и ещё приятнее было то, что встретились они в Кирии. Многие боялись, что не доживут до этого дня, и некоторые офицеры и правда умерли. Их долго оплакивали, но Сайпресс знал, что они всё ещё с ними. Если верить мистикам Пути Огня, они жили на первозданной искре киринов, вернулись в пламя, из которого они родились. Этот огонь жил в сердце каждого.\n\nТемы для разговора целый день менялись как перчатки, но недавние события заострили разговор на военных вопросах. Не секрет, что между НАКП и правительством в Киновари отношения были напряжёнными. Все чувствовали, что скоро начнётся конфликт с Матриархом, но никто не мог понять "когда" это произойдёт. Он прочистил горло и решил приостановить разговоры о войнах, пока атмосфера не накалилась. — Друзья, как я рад, что мы здесь все сегодня собрались, хотя хотелось бы, чтобы встреча произошла в более благоприятных условиях. — заявил он, перебивая спор. — Мы прискакали из разных дорог жизни: профессора, советники, историки... И теперь мы снова вместе, ради дела НАКП, радии Кирии мечты, но сейчас, давайте не дадим нашему диалогу оставить осадок на искусстве войны, оно, всё же, дорогое. Боюсь, меня уже эти размышления надоели."
+kirin_council.35.a:0 "Может, найдём тему поинтересней?"
+
+kirin_council.36.t:0 "Купи себе победу"
+kirin_council.36.d:0 "— Это просто невероятно. — ответил доктор Ардент Блум, рассматривая отчёт, подготовленный Симпл Сёрви. В последнее время, к всеобщему удивлению, казна НАКП просто переполнилась деньгами.\n\n— Вы недовольны? — спросил Симпл Сёрви, приподняв бровь.\n\n— Ничуть нет. — ответил Ардент, с широкой улыбкой сбросив кучу бумаг на стол Сёрви. — Дать киринам возможность легально откупиться от призыва было просто гениально. Так смешать патриотический долг и пополнение бюджета... такая возможность спасти свою семью от войны увеличило покупки военных облигаций на 500% за последний месяц. А главное мы все в выигрыше: НАКП получает деньги на покупку оружия, а наши щедрые доноры не увидят своих сыновей и дочерей на фронту.\n\n— Действительно. — согласился Симпл. — Я только надеюсь, что новобранцев от этого не уменьшится.\n\n— Я думаю, что в этом плане  нас всё в порядке — ответил Блум. — Без лотереи богатые скорее всего просто окупались бы взятками. А так мы вербуем тех, кто не может или не хочет давать нам денег. Бедняки пополняют армию, богачи — казну. Тут нет ничего такого."
+kirin_council.36.a:0 ""Это идеальная система."
+
+kirin_council.37.t:0 "Сообщение от Радио Свободной Кирии"
+kirin_council.37.d:0 "Сразу после обеда ожили радиоприёмники по всей территории Великого Провидения, возвестив о важном сообщении привычными фанфарами, звучащими из динамиков. — Добрый вечер, кобылки и жеребцы нашего любимого Царства! — Раздался голос диктора, сопровождаемый треском помех. — Сегодня у нас особая программа. Сам наш председатель Фикл Каррент обсудит с доктором Сайпрессом Сноу важный вопрос: что делает кирина кирином? Я не буду скрывать от вас ответ на этот вопрос и передам микрофон нашим гостям. Председатель Каррент, доктор Сноу, можете приступать.\n\n— Спасибо, — сказал Фикл Каррент. — Итак, доктор Сноу. Давайте обойдёмся без вступлений: все, слушающие нас, уже знают, кто мы такие. Давайте сразу перейдём к сути вопроса: какова природа духа кирина?\n\n— Это простой ответ, имеющий множество слоёв, — ответил Сайпресс. — Внешний слой, пожалуй, самый простой для понимания каждым кирином, что слушает нас: мы - избранный народ Конкорд. Мы - хранители Её воли, смотрители Первородного Пламени, породившего этот мир. Этот мир населяет множество существ - от пони до грифонов и зебр - но именно киринам Конкорд передала Свой самый могучий дар: наше пламя, нашу ярость, нашу страсть.\n\n— И всё же нас с детства учили воздерживаться от использования Её дара, — возразил Фикл Каррент, — Превращение в нирика - это страшное проклятие.\n\n— Называть это проклятием - значит поверить в заблуждение, навязанное Путём Огня, — Сайпресс опровергнул это давно отработанным контраргументом, — Наши огонь и ярость - это инструмент, а не проклятие, хоть и опасное. Топор - это инструмент, который может как убивать, так и творить. Поэтому и мы должны разумно использовать нашу страсть, чтобы созидать, а не разрушать. В конце 800-х годов Царство не отставало от Эквестрии по технологическому развитию благодаря нашим инвестициям в паровые технологии и заводные механизмы, но Безмолвие отняло у нас целое столетие драгоценного времени. Представьте себе, какой была бы сегодняшняя Кирия, если бы не это ошибочное суеверие!\n\n— Я могу представить, и я призываю всех киринов, слушающих нас, сделать то же самое, — сказал Каррент. — НАКП - предвестница нового будущего Кирии, и мы все должны сыграть свою роль в его приближении. Мы должны низвергнуть еретическое Разгорающееся Пламя и очистить ряды Пути Огня от тех, кто готов похоронить Царство под суевериями ради собственной выгоды. Мы должны стремиться объединить Кирию под своей властью и освободить её от тех заблуждений, которые так долго сдерживали нас. Такова наша судьба, и я не сомневаюсь, что просвещенные кирины Великого Провидения станут теми, кто приведут Царство к заслуженной славе."
+kirin_council.37.a:0 "Таково наше будущее, и мы можем сделать его реальностью."
+
+kirin_council.38.t:0 "Покупка звания"
+kirin_council.38.d:0 "Мейфлауэр Блум не знала, чего ожидать, когда узнала, что её кузен стал офицером Ордена Железной Хризантемы. Но даже когда Ардент Блум в полном офицерском облачении стоял напротив неё на кухне её дома в Благоухании, это по-прежнему не ощущалось реальным. — Нравится, Мей? — спросил он и ухмыльнулся, вытянув переднюю ногу, чтобы продемонстрировать погоны на плече.\n\nМейфлауэр подавила смешок и попыталась скрыть выражение своего лица, вернувшись к чаю, который она готовила для них двоих. — Я и не думала, что тебя интересует карьера в армии, Ардент. Как ты стал... как там оно было? Генералом-буканьером?\n\n— Бригадным генералом, — уточнил Ардент с раздражённым рычанием — Вот что я расскажу тебе. В условиях надвигающейся войны НАКП стремилась превратить Орден Железной Хризантемы в более профессиональную силу, способную стать острием копья. Ещё вчера Орден был просто кучкой уличных головорезов, бандитов и, да, прочих преступников, наспех собранных в некое подобие неофициальной полиции для выполнения поручений партии. Но теперь, когда Орден собирает воедино Бригаду Головы Смерти, ему понадобились деньги, чтобы привлечь в свои ряды лучших морпехов, которых могут предложить торговые дома, и оснастить их наилучшим грифоньим снаряжением, которое мы можем купить. Я внёс свой вклад, и мне присвоили звание, подобающее моим инвестициям.\n\n— И сколько же ты потратил? — Спросила Мейфлауэр, заканчивая приготовление чая и разливая его по ожидающим чашкам. Судя по всему, никто не собирался прислушиваться в военных делах к кирину, кто купил себе звание. И уж тем более к Арденту, для которого таблицы и бухгалтерские книги были куда милее поля боя.\n\n— Чуть больше недельной зарплаты, — Ардент сказал, пожав плечами, а потом снова улыбнулся. — Но это лишь начало. Сейчас Ордену приходится закупать лучшее снаряжение в других странах, и на это нужны деньги. Но однажды истинные патриоты Кирии создадут своё снаряжение и подготовят своих солдат, которые будут лучше всего, что может предложить мир!"
+kirin_council.38.a:0 "— Как мило... Не хочешь ли выпить чаю, кузен?"
+
+kirin_council.39.t:0 "Попрошайка на балу"
+kirin_council.39.d:0 "Фикл Каррент торопливо подозвал официантку, чтобы та поменяла пустой бокал шампанского на полный. И тут же сделал несколько быстрых глотков. Это был уже четвёртый бокал за вечер? Или пятый? Он не знал, и, наверное, так было лучше. Нервы были на пределе, и, хотя Фикл не был любителем крепких напитков, ему хотелось хоть как-то расслабиться. Ведь ему предстояло обратиться с очень непростой просьбой, а удар по репутации потребует некоторого времени для восстановления.\n\nОн окинул взглядом всех киринов, что медленно входивших в большой бальный зал в здании номер 88 на Площади Хризантемы. Многие из одетых по высшему разряду гостей держали магией напитки. Все они были представителями верхушки современного киринского общества, высшего света диаспоры. И все эти кирины заплатили по 5000 грифоньих идолов, чтобы присутствовать на этом ночном празднике по сбору средств. И вот Каррент собирался попросить их о ещё большем.\n\nКогда все собрались в бальном зале, Каррент взял микрофон, чтобы поблагодарить собравшихся за благотворительность и за то, что у них есть средства, чтобы позволить себе непомерную плату за вход, чего, как он знал, жаждали все любители светского общества. Эта часть речи была лёгкой, а вот дальше начиналось самое сложное. — А сейчас я хотел бы напомнить всем киринам о том, почему мы собрались сегодня на этом балу и сколько ещё нам всем предстоит отдать, чтобы наши мечты стали реальностью, — сказал он, приготовившись к неизбежным укоризненным взглядам со стороны собравшихся. — Скоро мы окажемся втянутыми в войну, причем очень недешёвую. Достаточно сказать, что средств НАКП просто не хватает для ведения войны с нашими врагами в Киновари. Поэтому я с сожалением прошу всех вас постараться выделить ещё средств на военные нужды. НАКП будет очень признательна за любой вклад. А после победы, мы, конечно, не забудем о вашей щедрости.\n\nФикл слышал насмешки и выражающее отвращение фырканье собравшихся киринов и ему казалось, как будто кто-то щипцами срывает с него одну чешуйку за другой, но он изо всех сил старался сохранять улыбку, несмотря их бормотание. Однако это было ничто по сравнению со словами, которые пробормотала своим друзьям Сильвер Силкс, наследница торгового дома Сайси и самая богатая из присутствующих на вечеринке киринов. — Попрошайничество не подобает председателю, верно? Полагаю, мы должны дать ему то, что он хочет. Иначе на следующем гала-концерте он может впасть в ещё большее отчаяние, а это нам совсем ни к чему.\n\nИх колкости глубоко запали в душу, но Каррент проглотил своё смущение. Если НАКП не получит средств, необходимых для ведения войны, то они всё равно будут обречены."
+kirin_council.39.a:0 "Уязвленная гордость - ничто, если всё наше дело рухнет, верно?"
+
+kirin_council.40.t:0 "Выбор друзей"
+kirin_council.40.d:0 "— Ненавижу быть в долгу, — Фикл Каррент заявил Арденту Блуму, шагая взад-вперёд по его кабинету. — Деловые сделки - это одно. А вот долги меняются со временем. Они непредсказуемы, и ты не знаешь как тебя заставят расплатиться. — Он вздохнул и покачал головой. — Но это необходимое зло, не так ли? Нам нужны зарубежные инвесторы, и наши контакты в Грифонии с радостью дадут нам средства, если мы предоставим им землю, имущество и ресурсы в качестве залога. Если мы проиграем, нам не придётся беспокоиться о том, что наши кредиторы в Скайфоле или Фловене потребуют выплаты долга, но если мы выиграем...\n\n— Есть ещё один вариант, не связанный с нашими обычными грифоньими контактами, — сказал Ардент, ставя копыта домиком и раздумывая, продолжать ли эту тему. Но, заметив любопытный взгляд Каррента, он продолжил. — Чейнджлинги пронюхали о нашем предложении. Не знаю как, но когда имеешь дело с расой насекомых-перевёртышей, то это вполне логично. Они заинтересованы и предлагают очень щедрые условия.\n\n— Насколько? — Спросил Каррент. Из своего опыта он знал, что чем щедрее условия, тем больше нож, спрятанный за спиной.\n\n— Они хотят того же, что и наши грифоньи деловые партнеры, но их больше интересует собственность, чем ресурсы, и они готовы платить за нее больше - куда больше. Но... — Здесь он замешкался, затем вздохнул и продолжил. — Они ведут переговоры через Мейн Хайв Индастриз, свой крупнейший промышленный конгломерат. Всем этим заправляет один жук по имени Финикус Весали, и, предупреждаю тебя, он очень хорош в переговорах. Он не хуже тебя, Каррент, умеет заключать сделки. Короче говоря, я им не доверяю.\n\n— А не настолько короче? — Спросил Каррент, приподнимая бровь.\n\n— Ну, у чейнджлингов, в отличие от Скайфола или Фловены, есть возможности взыскать средства, если мы не заплатим, — сказал Блум. — И больше всего им нужна земля. Логично думать, что для промышленной державы вроде них ресурсы важнее всего остального. Что-то тут не так, и мне это не нравится... но решать всё же тебе."
+kirin_council.40.a:0 "Щедрые условия чейнджлингов нам выгодны."
+kirin_council.40.b:0 "Лучше заключить сделку с грифонами, которые не придут по наши души, если мы её нарушим."
+KIR_council_focus_5c_40b_tt:0 "\nПосле нашей §Yпобеды§! в §Yгражданской войне§!:"
 
 kirin_council.41.t:0 "In Bed with the Bugs"
 kirin_council.41.d:0 "There was very little that Dr. Ardent Bloom liked about the creature sitting across the table from him. Sure, it resembled an equine, but the insectoid facsimile created an 'almost but not quite' appearance of a pony or kirin that it bothered him. But even moreso than his appearance was his shrewd intelligence and clever wit, forcing Ardent to use every scrap of resourcefulness and experience to keep up with the deal-cutting businessbug.\n\n"You can drop out at any time, and we'll terminate the contract," Finicus Vesali said to him, and not for the first time, turning those words into a threat pressuring Ardent to do the opposite and uphold the deal as agreed upon. "But of course, we'll have to resolve all the clauses in our agreement. The NAKP will be held responsible for any damages to the equipment we're supplying to your factories, and it will be held accountable should any equipment produced here find its way onto the other side of a changeling battlefield. I think you'll agree that it's only fair to say that Kirin-made guns produced with Changeling-leased equipment taking Changeling lives on the field of battle is a messy can of worms that nocreature wants to open. Oh, and we maintain that we Changeling Queendom has the right to demand the immediate return of any and all equipment loaned to the NAKP for the duration of the contract. I hope this is all agreeable to you, Dr. Bloom?"\n\n"Yes, it is," Dr. Bloom managed through gritted teeth. He knew what was in the contract, so nothing Finicus said to him was a surprise or a lie, but having it read aloud to him made the walls of the box the Changleings were putting the NAKP all the more apparent. "Is there anything else, Herr Vesali?"\n\n"One last thing," and at this, Finicus smiled and set the pen held aloft in his magic down on the table. "The Foreign Office of the Changeling Heer asked me to convey a message while in Fragrance, so here I am, conveying it. In accordance with the secret treaties Vesalipolis has negotiated with Fragrance, the Queendom will be contributing an expeditionary force to support the NAKP's near-term combat activities. Of course, it goes without saying that the Korps will be commissioned as a 'non-state actor force' via the Liaison Office and its operating expenses covered in part by the NAKP. Now, if that's all in order... I believe we are finished here, unless you have anything to add, Dr. Bloom?""
@@ -3763,7 +3773,7 @@ kirin_council.55.a:0 "The Corporation shall be the government's will."
 kirin_council.55.b:0 "The Corporation shall be the government's custodian."
 
 kirin_council.56.t:0 "Voting for the Vote"
-kirin_council.56.d:0 "Silver Silks yawned and idly twirled her cigarette holder in her magic, watching the smoke trail from the end as some NAKP peon named Simple Survey or something like that prattled off on something about voting rights. Silver genuinely wished she was anywhere but here; the stallion speaking had a terribly grating voice, and this meeting was the type of thing she would usually delegate somekirin else to attend in her place. But when the NAKP had summoned representatives from all the corporations to attend to discuss the matter, Silver's advisor had suggested that she attend the meeting in person in case it was important. But all Simple Survey had done was make some kind of half-baked lesson in the values of democracy and suffrage in the Empire, and Silver was bored. She'd need to find a new advisor after she got home and fired the old one for suggesting she attend this boring meeting.\n\n"And now, to the meat of the matter," Survey said, and Silver sighed in relief and pointed her ears up to at least take in the crux of the matter that she'd wasted her day on. "The NAKP values democracy, of course. When done correctly, and under the guidance of a benevolent state apparatus, the private sector, and the mature leadership of the national Party, democracy facilitates and enshrines the principles conductive to commercial-esque competition in a free marketplace of ideas, engendering an incentive for political organizations to provide the best value service to stakeholder-electors. Thusly, the Party, in its wisdom, and to achieve this vision of a harmonic and stable democratic system of governance, will implement limited electoral reforms to allow stakeholders from all sections of society to determine Kiria's political direction.\n\n"How will we accomplish this?" Survey continued, and  a slide projector clicked over to a set of bullet points. "The executive council has come up with two proposals, which we will vote on. The first is an electoral system wherein propertied individuals and entities will be able to cast votes proportional to the total value of their assets. This will encompass corporations, landowners, and those other propertied stakeholders in society. There is also an alternative: the so-called "suffragette lottery" model, wherein kirin purchase "franchise shares". There is a lottery that determines which 30% of the shares will become actual votes. Don't be put off by the utter radicalness of this proposal, good friends; of course, corporations can purchase franchise shares en masse, but the marginal element of randomness is supposed to act as an equalizer."\n\n"Good, good, can we get on with it, though?" Silver asked, finally exhausted enough by the meeting to raise her voice and force a vote. The entire ordeal mattered little to her; as the wealthiest kirin in the Realm, she knew her voice was the loudest no matter how the NAKP pitched its sham democracy."
+kirin_council.56.d:0 "Silver Silks yawned and idly twirled her cigarette holder in her magic, watching the smoke trail from the end as some NAKP peon named Simple Survey or something like that prattled off on something about voting rights. Silver genuinely wished she was anywhere but here; the stallion speaking had a terribly grating voice, and this meeting was the type of thing she would usually delegate somekirin else to attend in her place. But when the NAKP had summoned representatives from all the corporations to attend to discuss the matter, Silver's advisor had suggested that she attend the meeting in person in case it was important. But all Simple Survey had done was make some kind of half-baked lesson in the values of democracy and suffrage in the Empire, and Silver was bored. She'd need to find a new advisor after she got home and fired the old one for suggesting she attend this boring meeting.\n\n"And now, to the meat of the matter," Survey said, and Silver sighed in relief and pointed her ears up to at least take in the crux of the matter that she'd wasted her day on. "The NAKP values democracy, of course. When done correctly, and under the guidance of a benevolent state apparatus, the private sector, and the mature leadership of the national Party, democracy facilitates and enshrines the principles conductive to commercial-esque competition in a free marketplace of ideas, engendering an incentive for political organizations to provide the best value service to stakeholder-electors. Thusly, the Party, in its wisdom, and to achieve this vision of a harmonic and stable democratic system of governance, will implement limited electoral reforms to allow stakeholders from all sections of society to determine Kiria's political direction.\n\n"How will we accomplish this?" Survey continued, and a slide projector clicked over to a set of bullet points. "The executive council has come up with two proposals, which we will vote on. The first is an electoral system wherein propertied individuals and entities will be able to cast votes proportional to the total value of their assets. This will encompass corporations, landowners, and those other propertied stakeholders in society. There is also an alternative: the so-called "suffragette lottery" model, wherein kirin purchase "franchise shares". There is a lottery that determines which 30% of the shares will become actual votes. Don't be put off by the utter radicalness of this proposal, good friends; of course, corporations can purchase franchise shares en masse, but the marginal element of randomness is supposed to act as an equalizer."\n\n"Good, good, can we get on with it, though?" Silver asked, finally exhausted enough by the meeting to raise her voice and force a vote. The entire ordeal mattered little to her; as the wealthiest kirin in the Realm, she knew her voice was the loudest no matter how the NAKP pitched its sham democracy."
 kirin_council.56.a:0 "Let everykirin's voice be weighted by the size of her assets."
 kirin_council.56.b:0 "Let everykirin's voice be weighted by the number of tickets she holds."
 
@@ -3940,7 +3950,7 @@ kirin_council.88.d:0 "For the attention of Operationsdirektorin Cheli Cerae,\n\n
 kirin_council.88.a:0 "Music to my ears!"
 
 kirin_council.89.t:0 "Preparation" ##Part 1/2
-kirin_council.89.d:0 ""Enough is enough," Cheli Cerae's low voice reverberated throughout the room where she stood surrounded by her loyal infiltrators. "Three organised threats still remain to our rule over this city: the Fragrance New Realm Party led by Maple Dew, the MSWPK led by Hawthorn Blaze, and finally, Fragrance's own civilian government led by [ROOT.GetLeader], who has proven to be quite recalcitrant and uncooperative."\n\n"Despite being our nominal puppet, he remains independent-minded, and from what our spies in his staff report, still harbours fantastical notions of overthrowing changeling rule and restoring the NAKP to power." At this, several of the assembled agents chucked, and Cheli herself smirked.\n\n"Ahem. To this end, he has reached out to the NRP and MSWPK. Which, conveniently enough, has allowed our infiltrators to infiltrate those organisations as well, since his personal staff is so thoroughly saturated with our changelings."\n\n"Which brings us to the Liquidation Operation." Cheli levitated a pointer to the photos of Maple Dew, Hawthorn Blaze, and [ROOT.GetLeader] pinned to the wall behind her. "Our objective is to bring these malcontents under control once and for all. Unteragent Biroi, Unteragent Phantine, Unteragent Orusso, each of you will be crucial to this operation's success.  Do you all understand your assignments?"\n\nUnteragent Tohmax Phantine took a breath and nodded in response. He knew Hawthorn Blaze: he had studied the kirin's every movement for months. He was ready. Tohmax looked around and saw similar affirmations from his fellow agents. They all had faith in Cheli, and she had faith in them; the time had come to prove that faith was not misplaced."
+kirin_council.89.d:0 ""Enough is enough," Cheli Cerae's low voice reverberated throughout the room where she stood surrounded by her loyal infiltrators. "Three organised threats still remain to our rule over this city: the Fragrance New Realm Party led by Maple Dew, the MSWPK led by Hawthorn Blaze, and finally, Fragrance's own civilian government led by [ROOT.GetLeader], who has proven to be quite recalcitrant and uncooperative."\n\n"Despite being our nominal puppet, he remains independent-minded, and from what our spies in his staff report, still harbours fantastical notions of overthrowing changeling rule and restoring the NAKP to power." At this, several of the assembled agents chucked, and Cheli herself smirked.\n\n"Ahem. To this end, he has reached out to the NRP and MSWPK. Which, conveniently enough, has allowed our infiltrators to infiltrate those organisations as well, since his personal staff is so thoroughly saturated with our changelings."\n\n"Which brings us to the Liquidation Operation." Cheli levitated a pointer to the photos of Maple Dew, Hawthorn Blaze, and [ROOT.GetLeader] pinned to the wall behind her. "Our objective is to bring these malcontents under control once and for all. Unteragent Biroi, Unteragent Phantine, Unteragent Orusso, each of you will be crucial to this operation's success. Do you all understand your assignments?"\n\nUnteragent Tohmax Phantine took a breath and nodded in response. He knew Hawthorn Blaze: he had studied the kirin's every movement for months. He was ready. Tohmax looked around and saw similar affirmations from his fellow agents. They all had faith in Cheli, and she had faith in them; the time had come to prove that faith was not misplaced."
 kirin_council.89.a:0 "Commence the operation!"
 KIS_event_89_tt:0 "The §OInfils.-kommando Ost-Zebrika§! will §Gliquidate§! all §Ropposition§! to §CChangeling rule§! over §YFragrance§!."
 
@@ -3986,7 +3996,7 @@ kirin_council.96.a:0 "This stinks of a changeling plot!"
 kirin_council.96.b:0 "Just as planned."
 
 kirin_council.960.t:0 "Interlude" #FRV only
-kirin_council.960.d:0 ""Look alive, soldiers! Our moment has arrived." Oberst-Infiltrator Ichneumion Orax addressed the drones packed together before him. He levitated a pointer toward the map of Hyacinth on the wall behind hum, a sharp tapping sound cutting through the low hum of the projector. "Here's the game plan: invade Hyacinth first to secure the city, and a hoofhold in Kiria." The projector image changed to reflect the changeling plan of attack, black arrows stretching from the sea to the heart of the city. "That is the most important aspect of our mission - to secure a hoofhold in Kiria. We must secure the city first, before the kirin can recapture it." His gruff voice conveyed a palpable sense of urgency.\n\n"Speed is key." Orax stomped a hoof for emphasis. "This invasion is a race against the clock!" He wore a stern expression for a long moment, making the troops anxious, before breaking into a small grin. "The good news is the way has been paved for us, we can thank the infiltrators already in Hyacinth for that. We have accurate intelligence on the details of Hyacinth's coastal fortifications, including which ones are left." The pirate onslaught had done considerable damage to the city's defences.\n\n"Our second objective is Auburn Isle. The kirin navy is weak, so it's unlikely they'll get there before us." Orax made a gesture with his hoof, and the image behind him changed to a photo of the Isle. "Once we control Hyacinth, we can use it as a base for a nice, leisurely naval invasion of Auburn Isle, which will be an almost guaranteed victory." His forecast drew quizzical looks from some of the soldiers.  Wouldn't taking the Isle be difficult? Orax's face broke into a confident smile. "I have a hunch Crimson Line's defences won't be very formidable. But don't worry about that. Just do your jobs, and it'll all work out splendidly.""
+kirin_council.960.d:0 ""Look alive, soldiers! Our moment has arrived." Oberst-Infiltrator Ichneumion Orax addressed the drones packed together before him. He levitated a pointer toward the map of Hyacinth on the wall behind hum, a sharp tapping sound cutting through the low hum of the projector. "Here's the game plan: invade Hyacinth first to secure the city, and a hoofhold in Kiria." The projector image changed to reflect the changeling plan of attack, black arrows stretching from the sea to the heart of the city. "That is the most important aspect of our mission - to secure a hoofhold in Kiria. We must secure the city first, before the kirin can recapture it." His gruff voice conveyed a palpable sense of urgency.\n\n"Speed is key." Orax stomped a hoof for emphasis. "This invasion is a race against the clock!" He wore a stern expression for a long moment, making the troops anxious, before breaking into a small grin. "The good news is the way has been paved for us, we can thank the infiltrators already in Hyacinth for that. We have accurate intelligence on the details of Hyacinth's coastal fortifications, including which ones are left." The pirate onslaught had done considerable damage to the city's defences.\n\n"Our second objective is Auburn Isle. The kirin navy is weak, so it's unlikely they'll get there before us." Orax made a gesture with his hoof, and the image behind him changed to a photo of the Isle. "Once we control Hyacinth, we can use it as a base for a nice, leisurely naval invasion of Auburn Isle, which will be an almost guaranteed victory." His forecast drew quizzical looks from some of the soldiers. Wouldn't taking the Isle be difficult? Orax's face broke into a confident smile. "I have a hunch Crimson Line's defences won't be very formidable. But don't worry about that. Just do your jobs, and it'll all work out splendidly.""
 kirin_council.960.a:0 "Order will be restored!"
 
 kirin_council.97.t:0 "A New Pirate Queen?" 
@@ -4052,7 +4062,7 @@ kirin_council.110.d:0 ""Proud kirin, do not sit idly by while your glorious home
 kirin_council.110.a:0 "Manipulating the masses is just too easy."
 
 kirin_council.111.t:0 "Armaments and Agitators"
-kirin_council.111.d:0 "On a warm and sunny afternoon, a nondescript flat bottomed barge made its way down a gently flowing river. An excited crowd of kirin had gathered at the wharf where this boat would unload its cargo, chattering hopefully. Lately, trucks and barges filled with guns had been flowing into the Providence Demesne, and there seemed to be no end in sight. The weapons were to arm the Society to Pierce the Veil and the anti-changeling movement it led.\n\nAfter the barge docked, the crowd wasted no time off-loading its precious cargo. Inside were weapons of all kinds: swords, spears, outdated lever-action rifles, Hindian breech-loaders, sabres, and antiquated Griffonian cannon. They were no match for truly modern military hardware, but for a bunch of enthusiastic amateurs that didn't matter. The kirin were eager to get their hooves on whatever they could.\n\nA grizzled kirin emerged from the barge, grabbing the crowd's attention. "Everykirin, I have an announcement, a message from our Society's leaders!"  He smiled internally, knowing that those leaders were in fact changeling infiltrators like himself. "They have declared the formation of the Righteous Realm Army, tasked with the divine mission to reconquer Fragrance from the foreign imperialist pests and restore it to the Kirian fold and Concord's loving embrace. We will squash the bugs!" The now-armed mob cheered wildly, firing their guns into the air in a frenzy."
+kirin_council.111.d:0 "On a warm and sunny afternoon, a nondescript flat bottomed barge made its way down a gently flowing river. An excited crowd of kirin had gathered at the wharf where this boat would unload its cargo, chattering hopefully. Lately, trucks and barges filled with guns had been flowing into the Providence Demesne, and there seemed to be no end in sight. The weapons were to arm the Society to Pierce the Veil and the anti-changeling movement it led.\n\nAfter the barge docked, the crowd wasted no time off-loading its precious cargo. Inside were weapons of all kinds: swords, spears, outdated lever-action rifles, Hindian breech-loaders, sabres, and antiquated Griffonian cannon. They were no match for truly modern military hardware, but for a bunch of enthusiastic amateurs that didn't matter. The kirin were eager to get their hooves on whatever they could.\n\nA grizzled kirin emerged from the barge, grabbing the crowd's attention. "Everykirin, I have an announcement, a message from our Society's leaders!" He smiled internally, knowing that those leaders were in fact changeling infiltrators like himself. "They have declared the formation of the Righteous Realm Army, tasked with the divine mission to reconquer Fragrance from the foreign imperialist pests and restore it to the Kirian fold and Concord's loving embrace. We will squash the bugs!" The now-armed mob cheered wildly, firing their guns into the air in a frenzy."
 kirin_council.111.a:0 "Enjoy your presents, fools."
 
 kirin_council.112.t:0 "The Righteous Rebellion"
@@ -4132,7 +4142,7 @@ kirin_council.506.d:0 ""Start it," Fickle Current said as soon as he sat down in
 kirin_council.506.a:0 "We're standing on the brink of a war between two VasCorps."
 
 kirin_council.507.t:0 "Corporate War"
-kirin_council.507.d:0 "The ExecCo was in turmoil, and Fickle Current had been up since dawn pulling his mane out.\n\nThere was no more pretense to the game anymore: earlier that week, the Sycee Trading House and the All-Kiria Artificers' Guild had formally declared the beginning of 'hostile business relations' with each other, immediately followed by clashes and open combat between the two VasCorp's private security arms in the fields of the Vespertine Valley. In Sycee's holdings from the Comely Cape to the Peaks of Peril, and in the Guild's demesne from their Massicot headquarters to the southeastern coastlands, the two VasCorps had locked down their territory, rallied their private armies, and set all their industry and subsidiaries to produce equipment and materiel for a war at full bore. Even in Vermilion, the rumbling of distant artillery was difficult to ignore.\n\nThe problems did not stop there; no, they were only the beginning. The war was already undercutting the NAKP's authority over the Realm, as banners that would normally be supplied to the Imperial Kirian Army by the Guild and Sycee had instead defected to their parent corporations and both sides refused to engage in dialogue with the ExecCo while there was still 'unfinished business' to be dealt with. On top of that, a consortium of the VasCorps led by the Sorghum Foundry had unilaterally declared that they would keep the conflict out of the heartlands of the Realm, and established the Mellifluve Delta Authority that would answer to the consortium's board, not the ExecCo. On top of that, local NAKP governors and commanders of Civil Defense in the western reaches of the Realm had declared the Government for Peace and Security in the West, effectively establishing a western governorate independent of the party's control. In the blink of an eye, Fickle Current found his hold on the Realm effectively quartered with nothing more than lip service from its constituents to assure him of their loyalty.\n\nBut to Current, that was not the worst part. The worst came  when the ExecCo preemptively vetoed any attempts by the state to intervene in what was happening, citing Article 12 of the Imperial Code and stressing that the state must not interfere in intercorporate affairs without the consent of all the corporate parties involved. Even his own board was in revolt against him, and there was nothing Current could do to rein them in. And with the situation as volatile as it was, there was nothing he could do but sit and wait and pray that he could find a solution before the Realm's nationalist-corporatist experiment went up in flames."
+kirin_council.507.d:0 "The ExecCo was in turmoil, and Fickle Current had been up since dawn pulling his mane out.\n\nThere was no more pretense to the game anymore: earlier that week, the Sycee Trading House and the All-Kiria Artificers' Guild had formally declared the beginning of 'hostile business relations' with each other, immediately followed by clashes and open combat between the two VasCorp's private security arms in the fields of the Vespertine Valley. In Sycee's holdings from the Comely Cape to the Peaks of Peril, and in the Guild's demesne from their Massicot headquarters to the southeastern coastlands, the two VasCorps had locked down their territory, rallied their private armies, and set all their industry and subsidiaries to produce equipment and materiel for a war at full bore. Even in Vermilion, the rumbling of distant artillery was difficult to ignore.\n\nThe problems did not stop there; no, they were only the beginning. The war was already undercutting the NAKP's authority over the Realm, as banners that would normally be supplied to the Imperial Kirian Army by the Guild and Sycee had instead defected to their parent corporations and both sides refused to engage in dialogue with the ExecCo while there was still 'unfinished business' to be dealt with. On top of that, a consortium of the VasCorps led by the Sorghum Foundry had unilaterally declared that they would keep the conflict out of the heartlands of the Realm, and established the Mellifluve Delta Authority that would answer to the consortium's board, not the ExecCo. On top of that, local NAKP governors and commanders of Civil Defense in the western reaches of the Realm had declared the Government for Peace and Security in the West, effectively establishing a western governorate independent of the party's control. In the blink of an eye, Fickle Current found his hold on the Realm effectively quartered with nothing more than lip service from its constituents to assure him of their loyalty.\n\nBut to Current, that was not the worst part. The worst came when the ExecCo preemptively vetoed any attempts by the state to intervene in what was happening, citing Article 12 of the Imperial Code and stressing that the state must not interfere in intercorporate affairs without the consent of all the corporate parties involved. Even his own board was in revolt against him, and there was nothing Current could do to rein them in. And with the situation as volatile as it was, there was nothing he could do but sit and wait and pray that he could find a solution before the Realm's nationalist-corporatist experiment went up in flames."
 kirin_council.507.a:0 "We have to find a way to put a stop to this infighting!"
 KIS_sycee_guild_corporate_dispute_tt:0 "Commences the §RKirian Corporate War§! between the §YSycee Trading House of Kiria§! and the §YAll-Kiria Artificers' Guild§!.\n\n"
 KIS_CORPORATE_WAR_disable_revoke_milacc_tt:0 "§RThe §YCorporate War§! knows no borders.§!"
@@ -4495,7 +4505,7 @@ kirin_republic.24.d:0 "Hallowed Saber peered up from knee-deep water and through
 kirin_republic.24.a:0 "The explosion was heard for miles, and the guns fell silent."
 
 kirin_republic.25.t:0 "Look What the Tide Washed In"
-kirin_republic.25.d:0 "Rising Sun looked at the figure prostrate before her, gagged and bound in chains and hemp rope. A mare in soldier's garb stood over the prisoner, chest puffed up with pride. "First Priestess Sun, may I present to you: the pirate queen Roaring Fire, having turned to banditry after the destruction of her fleet, captured two weeks ago by the loyal soldiers of the Republic in the Noctilucent Forest, where the last of her brigands were destroyed. May Concord, in her divine wisdom, have mercy on her soul."\n\n"How the mighty have fallen," Rising Sun quietly mused to herself. Long had she known about the pirates of Nacre sailing under Roaring Fire's banner. For years they had menaced the riverine trade that sailed out of Verdant, or what little remained of it throughout the Silence, abducting and slaughtering helpless foals of Concord for their own pleasure and gain. She wanted nothing more than to smite the pirate before her, to strike her head from her shoulders with a sword and toss her body in the river, but cold logic stopped her. While executing Roaring Fire would be helpful to add to her image as a protector of kirin everywhere, the pirate queen was a skilled warrior and could be a useful tool.\n\nA plan formed in her head, and she stepped forward, signaling to the soldier to yank Roaring Fire's mane back to force the pirate to look her in the eyes. "Roaring Fire, menace of the seas, terror on water. I should have you killed for your many crimes, but Concord is merciful. She will not discard what can still be of use to Her glory, and so it is with you. Thus, I offer you a choice; prostrate yourself before me as Her messenger and fight in the name of the Roaring Fire, or prepare your spark to be returned to the Primordial Fire in Her care."\n\nRoaring Fire glared up at Rising Sun, fixing her with a dreadfully baleful look, and for a moment, Rising Sun wondered whether the pirate queen would be defiant to the last. But reason won out in the end, and the pirate slowly bowed before Rising Sun. Nodding in approval, Rising Sun turned to the soldier. "Bring her to her cell to rest and eat up. She will need to be strong to serve our Goddess."\n\nAs the two kirin left, Rising Sun turned aside to where Dayspring Rose stood behind her. "You will accompany the pirate," she told her faithful acolyte. "You are the brightest and best of our young leadership, but you lack experience in the field. This will be a valuable lesson. Study its teachings closely, and one day you will be ready to lead the Rising Fire just as I have.""
+kirin_republic.25.d:0 "Rising Sun looked at the figure prostrate before her, gagged and bound in chains and hemp rope. A mare in soldier's garb stood over the prisoner, chest puffed up with pride. "First Priestess Sun, may I present to you: the pirate queen Roaring Fire, having turned to banditry after the destruction of her fleet, captured two weeks ago by the loyal soldiers of the Republic in the Noctilucent Forest, where the last of her brigands were destroyed. May Concord, in her divine wisdom, have mercy on her soul."\n\n"How the mighty have fallen," Rising Sun quietly mused to herself. Long had she known about the pirates of Nacre sailing under Roaring Fire's banner. For years they had menaced the riverine trade that sailed out of Verdant, or what little remained of it throughout the Silence, abducting and slaughtering helpless foals of Concord for their own pleasure and gain. She wanted nothing more than to smite the pirate before her, to strike her head from her shoulders with a sword and toss her body in the river, but cold logic stopped her. While executing Roaring Fire would be helpful to add to her image as a protector of kirin everywhere, the pirate queen was a skilled warrior and could be a useful tool.\n\nA plan formed in her head, and she stepped forward, signaling to the soldier to yank Roaring Fire's mane back to force the pirate to look her in the eyes. "Roaring Fire, menace of the seas, terror on water. I should have you killed for your many crimes, but Concord is merciful. She will not discard what can still be of use to Her glory, and so it is with you. Thus, I offer you a choice; prostrate yourself before me as Her messenger and fight in the name of the Rising Fire, or prepare your spark to be returned to the Primordial Fire in Her care."\n\nRoaring Fire glared up at Rising Sun, fixing her with a dreadfully baleful look, and for a moment, Rising Sun wondered whether the pirate queen would be defiant to the last. But reason won out in the end, and the pirate slowly bowed before Rising Sun. Nodding in approval, Rising Sun turned to the soldier. "Bring her to her cell to rest and eat up. She will need to be strong to serve our Goddess."\n\nAs the two kirin left, Rising Sun turned aside to where Dayspring Rose stood behind her. "You will accompany the pirate," she told her faithful acolyte. "You are the brightest and best of our young leadership, but you lack experience in the field. This will be a valuable lesson. Study its teachings closely, and one day you will be ready to lead the Rising Fire just as I have.""
 kirin_republic.25.a:0 ""I serve the Rising Fire, Priestess""
 
 kirin_republic.26.t:0 "Concord's Loyal Servant"
@@ -4606,7 +4616,7 @@ KIC_event_45a_tt:0 "Decision £decision_icon_small §YProselytise the Faith§!:\
 kirin_republic.45.b:0 "The First Priestess has her beliefs, and the preachers their own. Isn't that how it works?"
 
 kirin_republic.46.t:0 "You Get What You Deserve"
-kirin_republic.46.d:0 ""The Order of the Iron Chrysanthemum was mostly smashed and scattered to the winds, but there are still a few diehard partisans out there looting and raiding. If you hear gunshots, don't be alarmed. And in a little bit, maybe you'll understand."\n\nDayspring Rose cocked her head at that odd warning, but nevertheless she followed the younger stallion past the razorwire-topped fences set up around the camp. She had set out to Greater Providence that day on the invitation of Flash Pan, one of Kindling Flash's students and friends, and the young stallion had proven himself both chatty and full of conviction and idealism. Dayspring appreciated both of those traits, but as the pair passed by the bannerkirin guarding the camp, she wondered where that fervor would take them.\n\nShe didn't have to wait long to find out. They were barely a hundred yards from the gate when Flash Pan stopped and gestured at the dirty squalor and filth surrounding them, and the emaciated kirin huddled together in whatever shelter they could find from the harsh noon sun. "Did you know things were this bad?" Flash Pan asked her. "This internment camp for the NAKP partisans and collaborators is more like a death camp. The prisoners here are given no medication, offered no sanitation, and only scraps of old and moldy food. And for what? Because Iron Chrysanthemum partisans keep attacking our patrols?" He stomped his hoof down in frustration. "This is cruel and collective punishment! I thought we were supposed to be better than this! Liberators, not tyrants! Why does the First Priestess let this cruelty continue?"\n\nDayspring looked at the skeletal kirin huddled together, and a frown placed heavy weights on the corners of her muzzle. "It's not that simple," she said in a low voice as she regarded the foreigners who were once her enemy on the battlefield. "The populace here despise us. They're clinging to the promises the foreigners gave them, of building a utopia for them on the backs of our slave labor. They support the NAKP partisans, and until they do, they have to be punished for it. Only when they stop clinging to the lie the NAKP fed them and realize that they stand to prosper from working with us and not against us, then the misery can hopefully end." She closed her eyes for a moment before adding, "I fought in the war. I know how brutal and vicious things got. Entire towns in the west no longer exist because of the fighting. These kirin should consider themselves lucky that the same hasn't befallen them."\n\nFlash Pan regarded her with a scrutinizing glare before abruptly turning away. "Only a monster thinks monstrosities are acceptable if they happen to somecreature else.""
+kirin_republic.46.d:0 ""The Order of the Iron Chrysanthemum was mostly smashed and scattered to the winds, but there are still a few diehard partisans out there looting and raiding. If you hear gunshots, don't be alarmed. And in a little bit, maybe you'll understand."\n\nDayspring Rose cocked her head at that odd warning, but nevertheless she followed the younger stallion past the razorwire-topped fences set up around the camp. She had set out to Greater Providence that day on the invitation of Flash Pan, one of Kindling Flash's students and friends, and the young stallion had proven himself both chatty and full of conviction and idealism. Dayspring appreciated both of those traits, but as the pair passed by the bannerkirin guarding the camp, she wondered where that fervor would take them.\n\nShe didn't have to wait long to find out. They were barely a hundred yards from the gate when Flash Pan stopped and gestured at the dirty squalor and filth surrounding them, and the emaciated kirin huddled together in whatever shelter they could find from the harsh noon sun. "Did you know things were this bad?" Flash Pan asked her. "This prison for the NAKP partisans and collaborators is more like a dumping ground. The prisoners here are given no medication, offered no sanitation, and only scraps of old and moldy food. And for what? Because Iron Chrysanthemum partisans keep attacking our patrols?" He stomped his hoof down in frustration. "This is cruel and collective punishment! I thought we were supposed to be better than this! Liberators, not tyrants! Why does the First Priestess let this cruelty continue?"\n\nDayspring looked at the skeletal kirin huddled together, and a frown placed heavy weights on the corners of her muzzle. "It's not that simple," she said in a low voice as she regarded the foreigners who were once her enemy on the battlefield. "The populace here despise us. They're clinging to the promises the foreigners gave them, of building a utopia for them on the backs of our slave labor. They support the NAKP partisans, and until they do, they have to be punished for it. Only when they stop clinging to the lie the NAKP fed them and realize that they stand to prosper from working with us and not against us, then the misery can hopefully end." She closed her eyes for a moment before adding, "I fought in the war. I know how brutal and vicious things got. Entire towns in the west no longer exist because of the fighting. These kirin should consider themselves lucky that the same hasn't befallen them."\n\nFlash Pan regarded her with a scrutinizing glare before abruptly turning away. "Only a monster thinks monstrosities are acceptable if they happen to somecreature else.""
 kirin_republic.46.a:0 ""I am not a monster. I am only a realist.""
 
 kirin_republic.111.t:0 "No Easy Answers"
@@ -4896,7 +4906,7 @@ kirin_republic.109.d:0 "The Fragrancese held a lot of pain behind their smiles,
 kirin_republic.109.a:0 ""Don't they ever just... spend time alone?""
 
 kirin_republic.1091.t:0 "With Open Hearts, And Calloused Hooves"
-kirin_republic.1091.d:0 "Hoo'fran woke up this morning to a note asking him to go to a special interview about how he was adjusting to the city. He was even excused from a work assignment for it, so it must've been important. He headed straight there. One of the teachers, Laverbreeze, was waiting for him on the grounds. He taught a few classes on fishing and biology, which made sense, because everyone knew he was a fisherkirin before he got injured during the war.\n\n"Hello! We can get right to it - some students are saying you don't think you fit in here, and I wanted to ask about that."  Hoo'fran made a point not to look at his teachers' scarred, crippled leg. \n\n"W-well, I... everything here feels strange. I don't want to be disrespectful, you've all been so nice to us..." Hoo'fran trailed off, but Laverbreeze gestured for him to continue. "The cherries are too sour, and I don't like how incense smells, and - I just don't think I'm ever going to get used to kirin things, and, and-"\n\nThis time, the teacher cut him off. "You know, I had to change how I lived, too. I didn't have to get used to incense or sour cherries, but I did have to start a whole new life after I got hurt. I miss the sea, the way I think you miss home. The sea was home, for me." Laverbreeze trailed off, and took a deep breath, before picking back up. "You know what's important? That we've both been trying. You work hard in your lessons, you've made good friends, and you spend so much time working in that greenhouse. Volunteering after work assignments are over, even! You know that we donate all the extra food to a local hospital?" Hoo'fran shook his head. "You've been putting in the work thinking that you have to pay Fragrance back for taking you in. But folks doing that kind of work is why we could take you in at all. You're a model citizen, Hoo'fran. Fragrance is better for having you."\n\n"
+kirin_republic.1091.d:0 "Hoo'fran woke up this morning to a note asking him to go to a special interview about how he was adjusting to the city. He was even excused from a work assignment for it, so it must've been important. He headed straight there. One of the teachers, Laverbreeze, was waiting for him on the grounds. He taught a few classes on fishing and biology, which made sense, because everyone knew he was a fisherkirin before he got injured during the war.\n\n"Hello! We can get right to it - some students are saying you don't think you fit in here, and I wanted to ask about that." Hoo'fran made a point not to look at his teachers' scarred, crippled leg. \n\n"W-well, I... everything here feels strange. I don't want to be disrespectful, you've all been so nice to us..." Hoo'fran trailed off, but Laverbreeze gestured for him to continue. "The cherries are too sour, and I don't like how incense smells, and - I just don't think I'm ever going to get used to kirin things, and, and-"\n\nThis time, the teacher cut him off. "You know, I had to change how I lived, too. I didn't have to get used to incense or sour cherries, but I did have to start a whole new life after I got hurt. I miss the sea, the way I think you miss home. The sea was home, for me." Laverbreeze trailed off, and took a deep breath, before picking back up. "You know what's important? That we've both been trying. You work hard in your lessons, you've made good friends, and you spend so much time working in that greenhouse. Volunteering after work assignments are over, even! You know that we donate all the extra food to a local hospital?" Hoo'fran shook his head. "You've been putting in the work thinking that you have to pay Fragrance back for taking you in. But folks doing that kind of work is why we could take you in at all. You're a model citizen, Hoo'fran. Fragrance is better for having you."\n\n"
 kirin_republic.1091.a:0 "Being a kirin doesn't make one Fragrancese. Doing right by their comrades, does."
 
 kirin_republic.110.t:0 "A Tree, The Sea, And You, And Me" 
@@ -4908,23 +4918,23 @@ kirin_republic.1101.d:0 ""The Chair recognizes delegate Lychee. Delegate, for wh
 kirin_republic.1101.a:0 "Lychee sulked for a while... and then proposed a successful motion to start a swimming club."
 
 kirin_republic.112.t:0 "Blood In The Mellifluve"
-kirin_republic.112.d:0 "Rising Sun had ever paid homage to the poor kirin of Verdant, the first brave souls who had defied the Way of Fire to strike out their own way during the Silence. And though the center of the Rising Fire's energies had long shifted north to Chrysanthemum, Verdant enjoyed a pleasant, if largely forgotten, existence under their rule. Many had left to fight under Rising Sun's banners, those still home rejoiced in their newfound freedom, and the news from the front was triumphant and revolutionary. Perhaps Rising Sun was a bit self-aggrandizing, but such things can be forgiven in triumphant heroes of faith.\n\nPropaganda, however, does not hide the refuse of Kiria, which floats down the mighty Mellifluve and bobs through Verdant on the way to the sea. And the joyous mood in Verdant had long since soured as burnt timbers, toppled wagons, bloodied clothing, and an unceasing stream of corpses became caught in the foundations of the City of Stilts.\n\nWhen the messengers from Fragrance came to Verdant and told of the brutality of Rising Sun's forces, they found a city already simmering. The next morning, the Rising Fire's garrison found their barracks besieged by a furious mob of fisherkirin and firebrand preachers: those still true to the harmonic beginnings of their faith."
-kirin_republic.112.a:0 "If Chrysanthemum has stumbled into darkness, then Verdant will bear harmony's torch."
+kirin_republic.112.d:0 "Rising Sun had ever paid homage to the poor kirin of Verdant, the first brave souls who had defied the Way of Fire to strike out their own way during the Silence. And though the center of the Rising Fire's energies had long shifted north to [KIC.Capital.GetName], Verdant enjoyed a pleasant, if largely forgotten, existence under their rule. Many had left to fight under Rising Sun's banners, those still home rejoiced in their newfound freedom, and the news from the front was triumphant and revolutionary. Perhaps Rising Sun was a bit self-aggrandizing, but such things can be forgiven in triumphant heroes of faith.\n\nPropaganda, however, does not hide the refuse of Kiria, which floats down the mighty Mellifluve and bobs through Verdant on the way to the sea. And the joyous mood in Verdant had long since soured as burnt timbers, toppled wagons, bloodied clothing, and an unceasing stream of corpses became caught in the foundations of the City of Stilts.\n\nWhen the messengers from Fragrance came to Verdant and told of the brutality of Rising Sun's forces, they found a city already simmering. The next morning, the Rising Fire's garrison found their barracks besieged by a furious mob of fisherkirin and firebrand preachers: those still true to the harmonic beginnings of their faith."
+kirin_republic.112.a:0 "If [KIC.Capital.GetName] has stumbled into darkness, then Verdant will bear harmony's torch."
 
 kirin_republic.113.t:0 "So Long As There Is Peace And Plenty"
-kirin_republic.113.d:0 "Kindling Flash was in Sorghum when the call for help from Fragrance arrived. The Fragrancese messengers with their saddlebags loaded with photos and leaflets had proof enough of their wild claims - the Incarnadine Soldiery were engaged in a campaign that made Kindling Flash's stomach churn just to think of it. He'd seen the pictures of the cruelties that Rising Fire soldiers - doubtless some from right here in Sorghum! - had inflicted onto their victims.\n\nDid Rising Sun know? He had known now for a long time that there was only greed for power in her heart, but the things the Fragrancese were saying, whole villages vanishing in the night, corpses defiled... were these her orders? Or was this simply a matter of the soldiery being overzealous, far from the watchful eye of Chrysanthemum? He sent a telegram to the capital, reporting what he had seen, demanding an explanation, and while he awaited the reply, he spread the word of these abuses through the city, knowing what he might have to do.\n\nWhen a train from Chrysanthemum disgorged a contingent of Incarnadine Soldiery proclaiming the warrant for his arrest, there was no choice. So Kindling sparked a blaze, and in the fashion of Fragrance, there was a glorious day of revolution in Sorghum. Now the better-than-thou rumblings in Providence would have to stop - for the West was standing up against Chrysanthemum, too."
+kirin_republic.113.d:0 "Kindling Flash was in Sorghum when the call for help from Fragrance arrived. The Fragrancese messengers with their saddlebags loaded with photos and leaflets had proof enough of their wild claims - the Incarnadine Soldiery were engaged in a campaign that made Kindling Flash's stomach churn just to think of it. He'd seen the pictures of the cruelties that Rising Fire soldiers - doubtless some from right here in Sorghum! - had inflicted onto their victims.\n\nDid Rising Sun know? He had known now for a long time that there was only greed for power in her heart, but the things the Fragrancese were saying, whole villages vanishing in the night, corpses defiled... were these her orders? Or was this simply a matter of the soldiery being overzealous, far from the watchful eye of [KIC.Capital.GetName]? He sent a telegram to the capital, reporting what he had seen, demanding an explanation, and while he awaited the reply, he spread the word of these abuses through the city, knowing what he might have to do.\n\nWhen a train from [KIC.Capital.GetName] disgorged a contingent of Incarnadine Soldiery proclaiming the warrant for his arrest, there was no choice. So Kindling sparked a blaze, and in the fashion of Fragrance, there was a glorious day of revolution in Sorghum. Now the better-than-thou rumblings in Providence would have to stop - for the West was standing up against [KIC.Capital.GetName], too."
 kirin_republic.113.a:0 "We'll show her a hundred-day campaign - right to her throne."
 
 kirin_republic.114.t:0 "What We Rightfully Stole"
-kirin_republic.114.d:0 "There was nothing that the kirin from Fragrance were preaching that General [SBC.GetLeader] had not already heard before. She'd read the reports, back when she still cared. When being a general of the Republic had meant something more than signing stacks of death warrants for 'reactionaries' she knew well were mostly innocent peasants.\n\nShe was true to the path of the Rising Fire. These revolutionaries from Fragrance had little to tell her that she would listen to. But what did linger on her mind was something from her time closer to the frontlines.\n\nAs she had lead the Rising Fire's forces to victory over Vermilion, many rich kirins' treasures had been requisitioned and shipped back behind the lines. For redistribution, of course, but now that she thought about it, she'd never heard of much ending up redistributed. There must be stashes of plundered riches squirreled away around Chrysanthemum for Rising Sun's personal enjoyment. Stashes which [SBC.GetLeader] had stolen for her.\n\nWhen the Fragrancese had come, she spotted her chance, and immediately begun to plan. There was an obvious spot - the hill-country north of Chrysanthemum. And an obvious mission.\n\n[SBC.GetLeader] had strict orders to redistribute wealth to the nation. Well. Now she'd found who was hoarding it."
+kirin_republic.114.d:0 "There was nothing that the kirin from Fragrance were preaching that General [SBC.GetLeader] had not already heard before. She'd read the reports, back when she still cared. When being a general of the Republic had meant something more than signing stacks of death warrants for 'reactionaries' she knew well were mostly innocent peasants.\n\nShe was true to the path of the Rising Fire. These revolutionaries from Fragrance had little to tell her that she would listen to. But what did linger on her mind was something from her time closer to the frontlines.\n\nAs she had lead the Rising Fire's forces to victory over Vermilion, many rich kirins' treasures had been requisitioned and shipped back behind the lines. For redistribution, of course, but now that she thought about it, she'd never heard of much ending up redistributed. There must be stashes of plundered riches squirreled away around [KIC.Capital.GetName] for Rising Sun's personal enjoyment. Stashes which [SBC.GetLeader] had stolen for her.\n\nWhen the Fragrancese had come, she spotted her chance, and immediately begun to plan. There was an obvious spot - the hill-country north of Chrysanthemum. And an obvious mission.\n\n[SBC.GetLeader] had strict orders to redistribute wealth to the nation. Well. Now she'd found who was hoarding it."
 kirin_republic.114.a:0 "In the name of Concord, Sun - your money, or your life."
 
 kirin_republic.115.t:0 "The Old Guard In A New Fight"
-kirin_republic.115.d:0 "Revolutionary Fragrance's heroic tale, regardless of whether the news was triumphant or tragic, made Silver Thatch grit his teeth anytime he heard it. He remembered well the day his city had exploded into chaos, rebelling against Rising Sun. He had been her reluctant supporter, then. Seeing what had happened on the streets that day, he was no more. But Fragrance was too small to win, too weak, too reactionary at its heart - and more importantly, his pride was too strong to fight alongside what he had condemned at birth.\n\nWhich is why Thatch found himself with a band of Marksist die-hards in the dappled woods south of Massicot, drawing up plans. They'd cut deals with all the local resistance members, they'd carefully gathered their forces while Chrysanthemum's eye was on Fragrance and the north. But the annoying missives from Fragrance were right - if there was a time to strike, it was now.\n\nThatch looked over his plans. Barracks to storm, bridges to blow, depots to burn, junctions to block. They had to strike hard, make themselves look like a threat to Massicot, to draw the Rising Fire's attention. His old training came back to him. A guerrilla war in the countryside. Hit and run. Living among the peasantry. His fellow party faithful, many themselves fled from Fragrance, stood gathered around, waiting for his leadership."
+kirin_republic.115.d:0 "Revolutionary Fragrance's heroic tale, regardless of whether the news was triumphant or tragic, made Silver Thatch grit his teeth anytime he heard it. He remembered well the day his city had exploded into chaos, rebelling against Rising Sun. He had been her reluctant supporter, then. Seeing what had happened on the streets that day, he was no more. But Fragrance was too small to win, too weak, too reactionary at its heart - and more importantly, his pride was too strong to fight alongside what he had condemned at birth.\n\nWhich is why Thatch found himself with a band of Marksist die-hards in the dappled woods south of Massicot, drawing up plans. They'd cut deals with all the local resistance members, they'd carefully gathered their forces while Rising Sun's eye was on Fragrance and the north. But the annoying missives from Fragrance were right - if there was a time to strike, it was now.\n\nThatch looked over his plans. Barracks to storm, bridges to blow, depots to burn, junctions to block. They had to strike hard, make themselves look like a threat to Massicot, to draw the Rising Fire's attention. His old training came back to him. A guerrilla war in the countryside. Hit and run. Living among the peasantry. His fellow party faithful, many themselves fled from Fragrance, stood gathered around, waiting for his leadership."
 kirin_republic.115.a:0 ""It's now or never, kirin. Pull every trigger we've got.""
 
 kirin_republic.116.t:0 "A Little Treason By The Sea"
-kirin_republic.116.d:0 "Ember Wane stood at the wharves of Hyacinth, watching ships bobbing in the harbor and the distant, hazy outline of Auburn Isle on the horizon. Today was the day.\n\nThere were pawns still out of place on the board, kirin not yet swayed who should have been. His thicket of contacts from his days as Vermilion's spymaster was much thinned these past few years. He wasn't sure exactly what he was about to do, who he was about to declare for - but one thing was certain. The Rising Fire had to go.\n\nThere was no Realm to restore now, the Matriarchate was destroyed. Someone, he was unsure who, would deliver a stable Kiria, given enough time. He had been preparing these southern provinces, ready to deliver them to the right kirin, one who could restore peace - but there was no time to pick the perfect candidate. Fragrance was rallying Kiria to its cause, and the Rising Fire were stretched thin with revolt and revolution on every hoof. If Rising Sun was to fall - and she had to fall - then Wane had to act now.\n\nOne stroke of his pen, one code word, one missive handed off to the bannerkirin standing behind him. By the end of the afternoon, the Banner of the Covered Cage had sprung their traps, and the Rising Fire's lackeys from Teak to Basalt found themselves betrayed by bribed garrisons and blackmailed commanders."
+kirin_republic.116.d:0 "Ember Wane stood at the wharves of Hyacinth, watching ships bobbing in the harbor and the distant, hazy outline of Auburn Isle on the horizon. Today was the day.\n\nThere were pawns still out of place on the board, kirin not yet swayed who should have been. His thicket of contacts from his days as Vermilion's spymaster was much thinned these past few years. He wasn't sure exactly what he was about to do, who he was about to declare for - but one thing was certain. The Rising Fire had to go.\n\nThere was no Realm to restore now, the Matriarchate was destroyed. Someone, he was unsure who, would deliver a stable Kiria, given enough time. He had been preparing these southern provinces, ready to deliver them to the right kirin, one who could restore peace - but there was no time to pick the perfect candidate. Fragrance was rallying Kiria to its cause, and the Rising Fire were stretched thin with revolt and revolution on every hoof. If Rising Sun was to fall - and she had to fall - then Wane had to act now.\n\nOne stroke of his pen, one code word, one missive hoofed off to the bannerkirin standing behind him. By the end of the afternoon, the Banner of the Covered Cage had sprung their traps, and the Rising Fire's lackeys from Teak to Basalt found themselves betrayed by bribed garrisons and blackmailed commanders."
 kirin_republic.116.a:0 "The South, for now, was theirs."
 
 kirin_republic.117.t:0 "The Small Matter Of Payroll"
@@ -4936,7 +4946,7 @@ kirin_republic.118.d:0 "Not a Realm, she had said, but a Republic, a Kiria of th
 kirin_republic.118.a:0 "The good student does as their master says, not as they do."
 
 kirin_republic.119.t:0 "The Sun Sets In The West"
-kirin_republic.119.d:0 "Matriarch-Protector Rising Sun appeared to be missing this morning, following a thorough search of the entire capital. Auspiciously, her disappearance comes on the tail of triumphant celebrations by the Fragrancese revolutionaries - reports of red banners fluttering over Vermilion confirm that the rebels secured full control over the ancient capital of the old Realm.\n\nThe Fraternal Republic, meanwhile, is all but shattered.\n\nWith rebellion in provinces once considered bastions of Chrysanthemum's power and the Fragrancese revolution overrunning the heart of Kiria, Rising Sun's flame has been snuffed out. The moment that the general public learned of the Matriarch-Protector's disappearance, a wave of defections, surrenders, and other high-ranking disappearances destroyed whatever was left. In the wake of this apparent abdication, whatever provincial or popular authorities remain are quickly pledging themselves to the victorious revolutionaries. Fragrance's authorities were quick to announce a radical new vision for a Second Kirian Republic, one with the absolute self-determination of the provinces as its highest ideal."
+kirin_republic.119.d:0 "Matriarch-Protector Rising Sun appeared to be missing this morning, following a thorough search of the entire capital. Auspiciously, her disappearance comes on the tail of triumphant celebrations by the Fragrancese revolutionaries - reports of red banners fluttering over Vermilion confirm that the rebels secured full control over the ancient capital of the old Realm.\n\nThe Fraternal Republic, meanwhile, is all but shattered.\n\nWith rebellion in provinces once considered bastions of the Rising Fire's power and the Fragrancese revolution overrunning the heart of Kiria, Rising Sun's flame has been snuffed out. The moment that the general public learned of the Matriarch-Protector's disappearance, a wave of defections, surrenders, and other high-ranking disappearances destroyed whatever was left. In the wake of this apparent abdication, whatever provincial or popular authorities remain are quickly pledging themselves to the victorious revolutionaries. Fragrance's authorities were quick to announce a radical new vision for a Second Kirian Republic, one with the absolute self-determination of the provinces as its highest ideal."
 kirin_republic.119.a:0 "Kiria has deposed its last Matriarch."
 
 kirin_republic.200.t:0 "A Revolution Homecoming"
@@ -4954,7 +4964,7 @@ KIR_republic_202_tt:0 "Unlocks §YNew Foci§! for the §Cdemocratization§! of 
 KIC_democratic_ending_flag:0 "Rising Sun has relinquished power."
 
 kirin_republic.203.t:0 "The Faint Fragrance of Forgiveness"
-kirin_republic.203.d:0 "Dayspring blew faintly on the ink drying on the sheet of parchment paper to help it along, then paused to consider her words. Though the characters would be transcribed  by printing presses and dispersed across the Realm through telegraph, she gave what would soon become an executive order in the vein of the imperial decrees of the Matriarchs the attention to detail and polish it deserved before presenting it to Rising Sun for her signature. Though, she decided, it wasn't the parchment itself as the reason why she gave it such attention, but the message it contained.\n\nWith Rising Sun's announcement that the democratization of Kiria had finally begun, one of the first and loudest new movements that finally felt safe and confident enough to make its voice heard was to grant amnesty to the Fragrancese Revolutionaries. Though the kirin of Fragrance had been put down and forced under strict military occupation by the Incarnadine Soldiery for daring to oppose the Rising Fire, many agreed that it was time to loosen the reins and extend a hoof in forgiveness. Prison camps would be emptied, the military garrison in the city reduced to a skeleton crew, and delegates from both Vermilion and Fragrance would meet to discuss terms on autonomy and freedom that would dictate the latter's relationship to the former as a member of the Republic. Even though they had lost their revolt, it seemed like the kirin of Fragrance got what they wanted in the end.\n\nDayspring paused as she thought that over. No, the revolt had not lost. They fought for what they believed in, and even though it had been squashed, they had established their position with blood, and when Vermilion invited them back to the negotiating table, they had a clear and strong hoof to play. Perhaps the Fragrancese struggle of death and destruction mirrored the Rising Fire's in a way nokirin thought possible at the time... though of course, it would need to be seen in practice to be believed.\n\nHumming, Dayspring rolled up the scroll and set off to find Rising Sun for her signature."
+kirin_republic.203.d:0 "Dayspring blew faintly on the ink drying on the sheet of parchment paper to help it along, then paused to consider her words. Though the characters would be transcribed by printing presses and dispersed across the Realm through telegraph, she gave what would soon become an executive order in the vein of the imperial decrees of the Matriarchs the attention to detail and polish it deserved before presenting it to Rising Sun for her signature. Though, she decided, it wasn't the parchment itself as the reason why she gave it such attention, but the message it contained.\n\nWith Rising Sun's announcement that the democratization of Kiria had finally begun, one of the first and loudest new movements that finally felt safe and confident enough to make its voice heard was to grant amnesty to the Fragrancese Revolutionaries. Though the kirin of Fragrance had been put down and forced under strict military occupation by the Incarnadine Soldiery for daring to oppose the Rising Fire, many agreed that it was time to loosen the reins and extend a hoof in forgiveness. Prison camps would be emptied, the military garrison in the city reduced to a skeleton crew, and delegates from both Vermilion and Fragrance would meet to discuss terms on autonomy and freedom that would dictate the latter's relationship to the former as a member of the Republic. Even though they had lost their revolt, it seemed like the kirin of Fragrance got what they wanted in the end.\n\nDayspring paused as she thought that over. No, the revolt had not lost. They fought for what they believed in, and even though it had been squashed, they had established their position with blood, and when Vermilion invited them back to the negotiating table, they had a clear and strong hoof to play. Perhaps the Fragrancese struggle of death and destruction mirrored the Rising Fire's in a way nokirin thought possible at the time... though of course, it would need to be seen in practice to be believed.\n\nHumming, Dayspring rolled up the scroll and set off to find Rising Sun for her signature."
 kirin_republic.203.a:0 "Did anykirin really lose when both sides got what they wanted in the end?"
 
 kirin_republic.204.t:0 "Taking the Politics out of Prisons"
@@ -4985,6 +4995,7 @@ kirin_republic.209.d:0 "[This.GetNewspaperHeader]As the polls close and the ball
 kirin_republic.209.a:0 "Best of luck to our sisters in Blossom!"
 
 KIC_authoritarian_ending_flag:0 "Rising Sun reigns supreme."
+KIC_8_hundred_days_campaign_completed_flag:0 "All eight Hundred Day Campaigns have been completed."
 
 kirin_republic.300.t:0 "The Zenith of the Sun"
 kirin_republic.300.d:0 "Rising Sun stood in the Verdigris Rotunda, surrounded by powerful kirin from all across the Realm. Leaders of the Incarnadine Soldiery and the most influential members of the Rising Fire looked on in awe, and perhaps some apprehension, as Rising Sun stood before them dressed in fiery, flowing robes. She wasted little time before launching forward with her address, feeling completely confident and in control of the air she commanded. "The time has come for radical changes," she announced to them all, her piercing, burning gaze sweeping over the gathered kirin one by one. "The republic is an unsteady, dangerous thing. Everywhere we look, heretics, hedonists, and foreign infiltrators turn the tools of democracy against us. Every loophole in the law is exploited, and insidious agents tie knots in our faith. If our work is to continue, if we are to keep what we have gained, this cannot happen any longer."\n\nHer audience listened in enraptured silence, and the corners of Rising's lips curved upwards. They were true believers, she could tell. Zealous and loyal. "Tomorrow, I will assume the mantle of Supreme Matriarch of Kiria. The Rising Fire has flourished under my guidance; when I merge the responsibilities as head of our faith with those of the head of state, the Realm will grow stronger than ever before. Where the republic was weak, the Realm of the Kirin under my guidance will be eternal and infallible. I shall bring freedom and prosperity to all kirin, regardless of where they are, as Concord demands it. The Incarnadine Soldiery will be my bow, and they shall let fly the arrow of Concord's justice at our enemies, wherever they may be. The Banner Jurisdictions shall be my voice, and they shall let it be heard with absolute clarity throughout the Realm."\n\nThen she swept her eyes over the crowd once more. "And you all shall be my foals, those who will build the Realm with me. As you once bowed before the Matriarch Superior, kneel before me as your Supreme Matriarch. Your loyalty will be rewarded, and your flames will grow brighter than ever before. Let me know now if I should nurture them or snuff them out.""
@@ -5169,21 +5180,21 @@ KIR_era_of_harmony_0_desc:0 ""
 KIR_era_of_harmony_1:0 "Лучезарное процветание, эра гармонии"
 KIR_era_of_harmony_1_desc:0 ""
 KIR_EoH_1:0 "Национальная служба борьбы с Огнём"
-KIR_EoH_2:0 "Standard-Bearers of the Constitution"
-KIR_EoH_3:0 "Proportional Warfare Doctrine"
-KIR_EoH_4:0 "North Coast Mariculture"
-KIS_CFR_debuff_1:0 "Loss of Fragrance"
-KIS_CFR_debuff_2:0 "Army in Tatters"
-KIR_ongoing_crisis:0 "Ongoing Crisis"
-KIR_clockworks_buff:0 "Sunrise Clockworks"
+KIR_EoH_2:0 "Знаменосцы Конституции"
+KIR_EoH_3:0 "Доктрина пропорциональной войны"
+KIR_EoH_4:0 "Прибрежные мануфактуры Севера"
+KIS_CFR_debuff_1:0 "Потеря Благоухания"
+KIS_CFR_debuff_2:0 "Уничтоженная армия"
+KIR_ongoing_crisis:0 "Продолжающийся кризис"
+KIR_clockworks_buff:0 "Механизмы Восхода"
 
 KIR_sixty_divisions_plan:0 "The 60-Divisions Plan"
 
-KIS_prison_factories_decision:0 "Establish Prison Factory in [FROM.GetName]"
-KIS_prison_factories_decision_desc:0 "Per the Indentured Service Compensation Scheme, the proper amount of use of force (specified in Article 8) in the facilitation of labour management is to be administered to all employees (which, for the purposes of this legal summary, mean all employees under the Indentured Service Compensation Scheme). Said employees must also be provided with sufficient housing as well as the means to live decently, which include but are not limited to access to food and water, proper ventilation systems, and routine medical check-ups. To comply with N-R-K 489, employees that have garnered a need for labour through embezzlement, tax evasion, copyright violation, or other Class-4 financial crimes will be monitored for potential nirik transformations, with the state reserving the right to enact preventative measures in pursuit of this goal. Following the General Provisions of the Indentured Service Compensation Scheme, the fair treatment of employees will be as follows..."
-KIS_prison_factory_state_modifier:0 "Prison Factory"
-KIS_prison_factory_country_modifier:0 "Prison Factories"
-KIS_prison_factory_modifier_tt:0 "Gain Modifier §YPrison Factory§! in §Y[FROM.GetName]§!:\n    Local Available Resources: §G+20%§!\n    Local Construction Speed: §G+20%§!\n(@KIS§YEmpire of Kiria§!):\n£prod_eff Production Efficiency Growth: §G+0.50%§!\n"
+KIS_prison_factories_decision:0 "Создать тюремную фабрику в [FROM.GetName]"
+KIS_prison_factories_decision_desc:0 "В соответствии со схемой компенсации за службу по контракту, надлежащий объём применения силы (указанный в статье 8) для облегчения организации труда должен применяться ко всем работникам (что, для целей настоящего юридического резюме, означает всех работников, подпадающих под Схему компенсации за службу по контракту). Указанные сотрудники также должны быть обеспечены достаточным жильем, а также средствами для достойной жизни, которые включают, но не ограничиваются ими, доступ к пище и воде, надлежащие системы вентиляции и регулярные медицинские осмотры. В соответствии с Н-К-З 489 предприниматели, у которых возникла потребность в рабочей силе в результате растраты, уклонения от уплаты налогов, нарушения авторских прав или других финансовых преступлений класса 4, будут определены виновными в превращении в нирика, при этом государство оставляет за собой право принимать превентивные меры для сохранения правосудия. В соответствии с общими положениями Системы компенсации за услуги по контракту справедливое отношение к сотрудникам будет следующим..."
+KIS_prison_factory_state_modifier:0 "Тюремная фабрика"
+KIS_prison_factory_country_modifier:0 "Тюремные фабрики"
+KIS_prison_factory_modifier_tt:0 "Будет получен модификатор §Yтюремная фабрика§! в §Y[FROM.GetName]§!:\n    Добыча ресурсов в регионе: §G+20%§!\n    Скорость строительства в регионе: §G+20%§!\n(@KIS§YИмперия Кирия§!):\n£prod_eff Рост эффективности производства: §G+0.50%§!\n"
 KIR_empire_focus_3b_tt:0 "\nUnlocks Decision £decision_icon_small §YEstablish Prison Factories§!, which increases §YLocal Available Resources§! and §YLocal Construction Speed§! in selected states, and grants a dynamic bonus to £prod_eff §YProduction Efficiency Growth§!."
 KIS_prison_factory_state_modifier_tt:0 "\n(@KIS§YEmpire of Kiria§!):\n£prod_eff Production Efficiency Growth: §G+0.50%§!\n\nThis modifier is §YAdditive§! per number of §YPrison Factories§!, and is capped at a maximum of §Y20.00%§!."
 modifier_army_sub_unit_category_DUMMY_MODIFIER_FOR_KIS_PRISON_FACTORY:0 "The Current Overall Modifier to Production Efficiency Growth is"
@@ -5223,12 +5234,12 @@ KIS_paid_tribute:0 "Paid Tribute"
 
 ### Advisors ###
 KIR_pol_1:0 "Отэм Блейз"
-KIR_pol_1_desc:0 "Отэм Блейз никогда не суждено было подняться так высоко - она была всего лишь дочерью бедных фермеров в Массикоте. Хотя изначально Отэм была обречена на те же трудности и скудное существование, что и её родители, семье Блейз удалось устроить свою дочь в храм Конкорд в Массикоте в возрасте семи лет, где она проучилась пять лет, прежде чем бросить учёбу и вернуться на семейную ферму. Однако за эти пять лет Отэм научилась читать и писать, могла считать и, возможно, самое главное, изучать и интерпретировать наставления богини огня Конкорд в религиозных текстах. Хотя она никогда бы не использовала этот особый навык на службе Пути Огня, кирин превосходно использовала свою власть над словами как меч для атаки и щит для защиты, что позволило ей использовать это умение как инструмент, чтобы проложить свой собственный жизненный путь. Хотя изначально Отэм стремилась писать мюзиклы, пьесы и даже заставляющие задуматься комедийные разборы застойной жизни киринов во времена Безмолвия, это сослужило ей лучшую службу в 1006 году, когда делегация Эквестрии забрела в Массикот.\n\nБучи единственным кирином в городе, знавшим язык двух пони - пониш - благодаря своей учебе, Блейз смогла направить двух иностранцев по имени Флаттершай и Эпплджек, в Киноварь, где они попытались войти в контакт с Верховным Матриархом Кирии, Рейн Шайн, и установить дипломатические отношения с Эквестрией. Благодаря её усилиям этого удалось добиться, и Отэм в конечном счёте завязала тесную дружбу с Рейн Шайн. Эта дружба позволила дочери фермеров стать первым премьером Верховного Матриарха, и теперь она стремится руководить общекиринским Пленумом за национальное возрождение в качестве его непоколебимого и полного энтузиазма лидера. Добьется ли она успеха, покажет время.\n\n§YАвтор портрета:§! Twotail813"
+KIR_pol_1_desc:0 "Отэм Блейз никогда не суждено было подняться так высоко - она была всего лишь дочерью бедных фермеров в Массикоте. Хотя изначально Отэм была обречена на те же трудности и скудное существование, что и её родители, семье Блейз удалось устроить свою дочь в храм Конкорд в Массикоте в возрасте семи лет, где она проучилась пять лет, прежде чем бросить учёбу и вернуться на семейную ферму. Однако за эти пять лет Отэм научилась читать и писать, могла считать и, возможно, самое главное, изучать и интерпретировать наставления богини огня Конкорд в религиозных текстах. Хотя она никогда бы не использовала этот особый навык на службе Пути Огня, кирин превосходно использовала свою власть над словами как меч для атаки и щит для защиты, что позволило ей использовать это умение как инструмент, чтобы проложить свой собственный жизненный путь. Хотя изначально Отэм стремилась писать мюзиклы, пьесы и даже заставляющие задуматься комедийные разборы застойной жизни киринов во времена Безмолвия, это сослужило ей лучшую службу в 1006 году, когда делегация Эквестрии забрела в Массикот.\n\nБучи единственным кирином в городе, знавшим язык двух пони - пониш - благодаря своей учебе, Блейз смогла направить двух иностранцев по имени Флаттершай и Эпплджек, в Киноварь, где они попытались войти в контакт с Верховным Матриархом Кирии, Рейн Шайн, и установить дипломатические отношения с Эквестрией. Благодаря её усилиям этого удалось добиться, и Отэм в конечном счёте завязала тесную дружбу с Рейн Шайн. Эта дружба позволила дочери фермеров стать первым премьером Верховного Матриарха, и теперь она стремится управлять общекиринским Пленумом за национальное возрождение в качестве его непоколебимого и полного энтузиазма лидера. Добьется ли она успеха, покажет время.\n\n§YАвтор портрета:§! Twotail813"
 KIR_pol_1_sick_tt:0 "Отэм Блейз заболела"
 KIR_pol_2:0 "Фикл Каррент"
-KIR_pol_2_desc:0 "Несмотря на своё возвышение в Кирии, Фикл Каррент не был рождён в Царстве. Скорее всего, он родился в Скайфоле, куда его семья бежала от сокрушительного экономического коллапса, обрушившегося на Кирию, когда в начале 10-го века было введено Безмолвие. Именно туда, в Скайфол, переехал Торговый дом Сайси, один из сильнейших торговых конгломератов Царства до Безмолвия. Точно известно, что семья Каррента имела тесные связи с этим торговым домом, что сделало их чрезвычайно богатыми. Благодаря этим деньгам Фикл смог позволить себе престижное образование в Йельском университете, где его лично обучал Сайпресс Сноу, ещё один представитель киринской диаспоры и её выдающийся писатель. Под руководством Сноу кирин научился оттачивать свою деловую хватку и проницательность, которые ещё сослужат ему хорошую службу в качестве успешного предпринимателя, а позже и как естественному представителю деловых интересов возвращающейся диаспоры киринов во время Великого Скачка Вперёд.\n\nТолько в конце 1006 года Фикл Каррент впервые ступил копытом в Благоухание, город своих предков, когда по всему Царству Безмолвие начало отступать. Помня рассказы о том, как неумелость и суеверия Киновари однажды вынудили его семью отправиться в изгнание и едва не разорили их, предприниматель вскоре решил стать защитником киринов, потерявших всё, приложить все усилия, чтобы по-настоящему модернизировать Кирию и вывести её на уровень Скайфола и всей западной Грифонии. В его концепции ничем не ограниченный капитализм идёт в порядке вещей, поскольку колеса прогресса в такой отсталой стране можно было бы повернуть только с помощью огромных инвестиций в это государство. Если бы Кирия когда-нибудь захотела по-настоящему присоединиться к современному миру в качестве функциональной нации потребует почти невообразимого уровня инвестиций, а поэтому Каррент готов сделать всё возможное, чтобы сделать нацию привлекательной для разного рода богачей.\n\n§YАвтор портрета:§! Twotail813"
+KIR_pol_2_desc:0 "Несмотря на своё возвышение в Кирии, Фикл Каррент не был рождён в Царстве. Скорее всего, он родился в Скайфоле, куда его семья бежала от сокрушительного экономического коллапса, обрушившегося на Кирию, когда в начале 10-го века было введено Безмолвие. Именно туда, в Скайфол, переехал Торговый дом Сайси, один из сильнейших торговых конгломератов Царства до Безмолвия. Точно известно, что семья Каррента имела тесные связи с этим торговым домом, что сделало их чрезвычайно богатыми. Благодаря этим деньгам Фикл смог позволить себе престижное образование в Йельском университете, где его лично обучал Сайпресс Сноу, ещё один представитель киринской диаспоры и её выдающийся писатель. Под наставничеством Сноу кирин научился оттачивать свою деловую хватку и проницательность, которые ещё сослужат ему хорошую службу в качестве успешного предпринимателя, а позже и как естественному представителю деловых интересов возвращающейся диаспоры киринов во время Великого Скачка Вперёд.\n\nТолько в конце 1006 года Фикл Каррент впервые ступил копытом в Благоухание, город своих предков, когда по всему Царству Безмолвие начало отступать. Помня рассказы о том, как неумелость и суеверия Киновари однажды вынудили его семью отправиться в изгнание и едва не разорили их, предприниматель вскоре решил стать защитником киринов, потерявших всё, приложить все усилия, чтобы по-настоящему модернизировать Кирию и вывести её на уровень Скайфола и всей западной Грифонии. В его концепции ничем не ограниченный капитализм идёт в порядке вещей, поскольку колеса прогресса в такой отсталой стране можно было бы повернуть только с помощью огромных инвестиций в это государство. Если бы Кирия когда-нибудь захотела по-настоящему присоединиться к современному миру в качестве функциональной нации потребует почти невообразимого уровня инвестиций, а поэтому Каррент готов сделать всё возможное, чтобы сделать нацию привлекательной для разного рода богачей.\n\n§YАвтор портрета:§! Twotail813"
 KIR_pol_3:0 "Винтер Фрост"
-KIR_pol_3_desc:0 "Родившаяся в горном городе-монастыре Агате, Винтер Фрост с момента своего рождения была окружена религиозным и мистическим пылом Пути Огня. Став старше, юная киринша быстро обнаружила, что глубоко увлечена любовью и божественным руководством, которыми богиня огня Конкорд благословила свой народ, и поэтому Винтер посвятила всю свою жизнь пониманию наставлений Конкорд и обмену ими с остальными существами Царства. Регулярно проводя много тёмных зимних утренних часов в медитации на высочайших вершинах священного горного хребта, окружавшего Киноварь, преданность Винтер Фрост вскоре была вознаграждена, когда она была выбрана отправиться в столицу и продолжить своё служение Конкорд, служа самому Верховному Матриарху Рейн Шайн. Таким образом, уроженица Агаты стала одной из немногих киринов, лично встречавшихся и взаимодействовавших с матриархом-затворником до того, как закончилось Безмолвие. Поэтому она очень привязалась к Рейн Шайн наряду с её неистовой преданностью Пути Огня. Это также привело к тому, что киринша стала любимицей Матриарха, и к тому времени, когда Безмолвие было официально отменено, Винтер Фрост была самой влиятельной жрицей Киновари.\n\nПо мере того как Безмолвие уступает место новой эре политики в Киновари, Винтер Фрост становится самым громким критиком безрассудной модернизации и служит надёжной опорой для очень религиозных киринов, регулярно выступая против предложений, законопроектов и декретов, которые, по её мнению, угрожают святости божественных наставлений Конкорд. В то время как Пленум стремится найти новые ответы на вызовы модернизации, Винтер Фрост работает над тем, чтобы вернуть Кирию к её корням - твёрдой вере и непоколебимой преданности Конкорд и Пути Огня, хотя она также и пытается найти ответы на проблему модернизации Кирии в религиозных учениях страны.\n\n§YАвтор портрета:§! Twotail813"
+KIR_pol_3_desc:0 "Родившаяся в горном городе-монастыре Агате, Винтер Фрост с момента своего рождения была окружена религиозным и мистическим пылом Пути Огня. Став старше, юная киринша быстро обнаружила, что глубоко увлечена любовью и божественными указаниями, которыми богиня огня Конкорд благословила свой народ, и поэтому Винтер посвятила всю свою жизнь пониманию наставлений Конкорд и обмену ими с остальными существами Царства. Регулярно проводя много тёмных зимних утренних часов в медитации на высочайших вершинах священного горного хребта, окружавшего Киноварь, преданность Винтер Фрост вскоре была вознаграждена, когда она была выбрана отправиться в столицу и продолжить своё служение Конкорд, служа самому Верховному Матриарху Рейн Шайн. Таким образом, уроженка Агаты стала одной из немногих киринов, лично встречавшихся и взаимодействовавших с матриархом-затворником до того, как закончилось Безмолвие. Поэтому она очень привязалась к Рейн Шайн наряду с её неистовой преданностью Пути Огня. Это также привело к тому, что киринша стала любимицей Матриарха, и к тому времени, когда Безмолвие было официально отменено, Винтер Фрост была самой влиятельной жрицей Киновари.\n\nПо мере того как Безмолвие уступает место новой эре политики в Киновари, Винтер Фрост становится самым громким критиком безрассудной модернизации и служит надёжной опорой для очень религиозных киринов, регулярно выступая против предложений, законопроектов и декретов, которые, по её мнению, угрожают святости божественных наставлений Конкорд. В то время как Пленум стремится найти новые ответы на вызовы модернизации, Винтер Фрост работает над тем, чтобы вернуть Кирию к её корням - твёрдой вере и непоколебимой преданности Конкорд и Пути Огня, хотя она также и пытается найти ответы на проблему модернизации Кирии в религиозных учениях страны.\n\n§YАвтор портрета:§! Twotail813"
 KIR_pol_4:0 "Райзин Сан"
 KIR_pol_4_desc:0 "О кобыле, которая называет себя Райзин Сан, известно не так уж много, а то, что известно, в лучшем случае рисует лишь смутную картину. По её собственному признанию, киринша родилась в Хризантеме и училась, чтобы стать жрицей Пути Огня. Но даже будучи жрицей, кобыла часто считалась своими сверстниками слишком умной слишком хитрой. Райзин Сан регулярно спорила со своими старшими жрецами о достоинствах и недостатках строгого соблюдения указов Верховного Матриарха, ибо всё, что они приносили, - это страдания и разорение народу Кирии, отчего регулярно подвергалась за это наказаниям. Так как киринша была слишком умна для того образа жизни, который она выбрала, Райзин Сан зашла в разочаровывающий теологический тупик в решении проблем, связанных с Кирией.\n\nПонимая, что она никогда не продвинется как жрица Пути Огня, Райзин Сан спустилась по Медоносной, где в конечном счете оказалась в Зеленеющем в возрасте 20 лет. Оказавшись там, она быстро поняла, что это место явно процветает, в отличии от Хризантемы. Безмолвие всё ещё царило над городом, но многие местные островные общины сформировали свои собственные кооперативные коммуны, которые работали вместе на благо всех, не нарушая ни одного из указов Матриарха. Кроме того, не было жесткой религиозной структуры, доминировавшей в повседневной жизни городских киринов, только индивидуальное общение между среднестатистическими киринами и Конкорд, с духовными лидерами, помогающими своим последователям продвигаться к их собственным откровениям. Райзин Сан быстро погрузилась в эти верования и в мгновение ока поднялась на вершину этой новой секты Пути Огня. Назвав свою секту "Разгорающееся Пламя", киринша вернулась в Хризантему, чтобы распространять своё новое учение среди обитателей запада, и совершила множество визитов в города и мастерские вокруг Кирии, прежде чем в конечном итоге оказалась в Киновари, где родился Великий Скачок Вперёд. Тут Райзин Сан хочет вывести своё учение на новый уровень национальной осведомленности.\n\n§YАвтор портрета:§! Twotail813"
 KIR_cypress_snow:0 "Сайпресс Сноу"
@@ -5236,7 +5247,7 @@ KIR_cypress_snow_desc:0 "Будучи выдающимся интеллекту
 KIR_pol_6:0 "Роарин Файр"
 KIR_pol_6_desc:0 "Королева пиратов, известная как Роарин Файр, привыкла совершать невозможное. Родившаяся в бедной рыбацкой семье в Перламутре на контролируемом пиратами Рыжем Острове, киринша присоединилась к своей первой пиратской экспедиции в возрасте 11 лет и никогда не оглядывалась назад. По мере того как она набиралась опыта, пираты по всему острову уважали её за бесстрашную браваду и острый ум. К тому времени, когда ей исполнилось 19, она была капитаном собственного корабля и с помощью дипломатии и хитроумных интриг начала сколачивать коалицию пиратов и тем самым собрала небольшую флотилию. Именно с этими преимуществами в одну роковую ночь 997 года она выманила предыдущего фактического лидера пиратов и его корабль из бухты и набросилась на кирина со свирепостью, о которой местные до сих пор рассказывают в Перламутре. В то время как пушечный огонь пробивал деревянные корпуса обеих джонок, Роарин Файр спустилась по канату и бросилась на вражеский корабль, где в жестокой демонстрации крови и смерти она рубила пирата за пиратом, пока, наконец, не нашла и не одолела вражеского капитана. Когда на следующее утро киринша вернулась в Перламутр с тем пиратом в цепях, она укрепила свою легенду и заслужила преданность разбойников и буканьеров, считавших Рыжий Остров своим домом.\n\nБлагодаря её хитрости пиратам Рыжего острова удалось пережить новую эпоху смерти Безмолвия. После успешных переговоров с Фикл Каррентом о присоединении его сил к её пиратской армаде, служащей в качестве флота наёмников, Роарин Файр спасла свой дом от разрушения возрождающимся Царством Кирия и спасла своих пиратов от виселицы. Теперь, стоя на переднем крае дивного нового мира, головорезы Рыжего острова непоколебимо преданы своей королеве, и Роарин Файр полна решимости не подвести их.\n\n§YАвтор портрета:§! Twotail813"
 KIR_ember_wane:0 "Эмбер Уэйн"
-KIR_ember_wane_desc:0 "Состарившийся, покрытый шрамами и закалённый временем и опытом семидесятилетний командир Знамени "Крытой клетки" - грозный кирин. Родившийся в одном из подпольных лагерей Знамени в горах, окружающих Киноварь, Эмбер Уэйн — кирин, полностью преданный миссии последнего Знамени Ноктилюцент Чарм - поддерживать и защищать Безмолвие любой ценой. Обученный с детства обычаям воина-знаменосца, Эмбер Уэйн сменил свою мать, которая также была командующим Знаменем, в возрасте сорока пяти лет и на пике своего расцвета, возглавив своих солдат. После этого он провёл множество кампаний по всей Кирии, подавляя тех отступников и еретиков, что осмелились нарушить Безмолвие. Под руководством генерала Знамя "Крытой клетки" защищало Царство от внутренних и внешних угроз.\n\nКогда Верховный Матриарх Рейн Шайн объявила об окончании Безмолвия, Знамя "Крытой клетки" прекратило свою деятельность по всей Кирии и вернулось на свои родные базы в горах Киновари. Их миссия по выполнению последнего указа Ноктилюцент Чарм теперь выполнена, и Знамя и её командир теперь ищут новую цель — служить режиму Рейн Шайн любым доступным им способом. Но будут ли остальные жители Кирии так же благосклонно относиться к этому? Те, кто видел многочисленные шрамы Эмбера Уэйна, размышляют об их происхождении: некоторые говорят, что он получил их, сражаясь с пиратами при защите одной рыбацкой деревни. Другие утверждают, что он получил их в результате уничтожения секты Санрайз, чьи големы и паровые гаубицы не смогли помешать армии генерала уничтожить всех жителей города. Независимо от того, что обычные кирины думают о нём и его Знамени, Эмбер Уэйн станет влиятельным игроком в головокружительном развитии Царства Кирии в ближайшие годы.\n\n§YАвтор портрета:§! Neither"
+KIR_ember_wane_desc:0 "Состарившийся, покрытый шрамами и закалённый временем и опытом семидесятилетний командир Знамени "Крытой клетки" - грозный кирин. Родившийся в одном из подпольных лагерей Знамени в горах, окружающих Киноварь, Эмбер Уэйн — кирин, полностью преданный миссии последнего Знамени Ноктилюцент Чарм - поддерживать и защищать Безмолвие любой ценой. Обученный с детства обычаям воина-знаменосца, Эмбер Уэйн сменил свою мать, которая также была командующим Знаменем, в возрасте сорока пяти лет и на пике своего расцвета, возглавив своих солдат. После этого он провёл множество кампаний по всей Кирии, подавляя тех отступников и еретиков, что осмелились нарушить Безмолвие. Под началом генерала Знамя "Крытой клетки" защищало Царство от внутренних и внешних угроз.\n\nКогда Верховный Матриарх Рейн Шайн объявила об окончании Безмолвия, Знамя "Крытой клетки" прекратило свою деятельность по всей Кирии и вернулось на свои родные базы в горах Киновари. Их миссия по выполнению последнего указа Ноктилюцент Чарм теперь выполнена, и Знамя и её командир теперь ищут новую цель — служить режиму Рейн Шайн любым доступным им способом. Но будут ли остальные жители Кирии так же благосклонно относиться к этому? Те, кто видел многочисленные шрамы Эмбера Уэйна, размышляют об их происхождении: некоторые говорят, что он получил их, сражаясь с пиратами при защите одной рыбацкой деревни. Другие утверждают, что он получил их в результате уничтожения секты Санрайз, чьи големы и паровые гаубицы не смогли помешать армии генерала уничтожить всех жителей города. Независимо от того, что обычные кирины думают о нём и его Знамени, Эмбер Уэйн станет влиятельным игроком в головокружительном развитии Царства Кирии в ближайшие годы.\n\n§YАвтор портрета:§! Neither"
 KIR_zenith_bloom:0 "Зенит Блум"
 KIR_zenith_bloom_desc:0 "§LЗенит Блум - амбициозная и целеустремленная матриарх-командующая Знамени Звёздного Тельца. Она происходит из одной семей, чьи знаменосцы массово предложили свои услуги Лотосовой Короне во время Безмолвия. Ей около 30 лет, но она уже является одной из самых влиятельных кобыл в Кирии. Она воплощает в себе власть и престиж в тройном размере: как член исполнительного совета НАКП, как матриарх-командующая одного из самых крупных и выдающихся Знамён Кирии и как генеральный директор концерна "Таурус".\n\n§YАвтор портрета:§! Scroup§!"
 KIR_ardent_bloom:0 "Ардент Блум"
@@ -5263,14 +5274,14 @@ KIR_fern_flare_desc:0 "Задолго до того, как Отэм стала
 NSA_fern_flare_desc:0 "Дорога к настоящей свободе была вымощена багровым цветом: кровью Брайт Бёрна и десятков тысяч других душ. Таким масштабам убийств, с благими намерениями или нет, нет места в исцеляющейся, восстанавливающейся Кирии. Именно здесь Ферн Флэйр вступает на сцену.\n\nФерн родилась в Массикоте и была давней подругой детства бывшего имперского премьера Отэм Блейз,и когда та была приглашена в правительство, последовала за кирином. После этого Флэйр помогала Отэм, пока Великий скачок вперёд не потерпел крушение и Блейз не ушла из политики. Вслед за бывшим премьером Ферн была назначена исполняющей обязанности премьера, работая с невероятной скоростью, чтобы удержать Кирию на плаву. Окончание гражданской войны обещало конец её бедам; изгнание из ПзЦГ и смерть всего, ради чего Отэм и её друзья усердно трудились, пошли на пользу Ферн.\n\nПриглашённая присоединиться к клике Брайт Бёрна, она вернулась в Массикот, когда новая стандартная армия начала свою кампанию по национальному восстановлению, пытаясь помочь каждому кирину, от высшего до низшего звена, с соглашением, что после победы именно Ферн Флэйр возглавит страну в качестве первого президента.\n\nПервой задачей Ферн на посту президента является перестройка всего государственного устройства Кирии. Будь то во всей республике или в отдаленной горной деревне, каждый лидер должен обладать мандатом своих граждан. Могут потребоваться месяцы или даже годы, чтобы добиться достаточного прогресса; но это нормально: даже с учётом всех её недостатков, Кирия совершила гигантский скачок к свободе.\n\nКогда у Ферн появляется возможность, она несомненно отправится домой навестить свою старую подругу.\n\n§YАвтор портрета:§! Kajko"
 KIR_fern_flare_designer_available:0 "Ферн Флэйр доступна"
 KIR_mahogany:0 "Махогани Блейз"
-KIR_mahogany_desc:0 "Являясь потомком мистика, сбежавшего из Кирии с наступлением Безмолвия, Махогани Блейз вырос в Эквестрии в семье, стремившейся привить кирину Путь Огня и его ценности, хотя и полагавшей, что Высший Матриарх Ноктилюцент Чари совершила ошибку, закрыв от внешнего мира свою родину. Будучи жеребёнком, он выразил желание стать мистиком, как и его прадед, который иммигрировал в Эквестрию, однако возможностей служить Конкорд и вести благожелательный образ жизни в стране пони было немного. Вскоре, в конце 1000-х, Блейз поступил в школу дружбы, центр, где существа всех видов могли взаимодействовать друг с другом и учиться чему-то у своих ровесников.\n\nОднако в принцессе Селестии и в том, во что её маленькие пони верили и что они делали, Махогани Блейз нашёл новую интерпретацию Конкорд. В отличие от того, чему учила Ноктилюцент Чарм, в эквестрийском подходе к модернизации были заложены принципы гармонии. Иерархии и классы не должны были противопоставляться друг другу или полностью устраняться; скорее, они открывали новые возможности для сотрудничества и великого возвышения каждого пони и существа. Услышать, как основные идеи Принцессы Селестии соблюдаются и на фабриках и в офисах, и как те, у кого есть большая поддержка, поддерживают тех, у кого её нет, было чудом для Махогани, на которое способна только сама Конкорд.\n\nОднажды Блейз намеревался вернуться на Родину, чтобы начать свою карьеру мистика, услышав о конце Безмолвия (отвергая шутки друзей о том, насколько он похож на Верховного Матриарха Рейн Шайн), однако гражданская война ускорила его планы. Махогани было невыносимо слышать о миллионах киринов, разорванных на части как корпорациями НАКП, так и мстительными поджигателями Райзин Файр. После долгих переговоров с семьёй и профессором Эпплджек о возвращении домой, Махогани Блейз всё же стал начинающим дипломатом, готовым показать всем киринам божественную гармонию, которая есть Конкорд, и её путь.\n\n§YАвтор портрета:§! Twotail813"
-COC_pretender_mahogany_blaze:0 "Махагони Блейз"
+KIR_mahogany_desc:0 "Являясь потомком мистика, сбежавшего из Кирии с наступлением Безмолвия, Махогани Блейз вырос в Эквестрии в семье, стремившейся привить кирину Путь Огня и его ценности, хотя и полагавшей, что Верховный Матриарх Ноктилюцент Чарм совершила ошибку, закрыв от внешнего мира свою родину. Будучи жеребёнком, он выразил желание стать мистиком, как и его прадед, который иммигрировал в Эквестрию, однако возможностей служить Конкорд и вести благожелательный образ жизни в стране пони было немного. Вскоре, в конце 1000-х, Блейз поступил в школу дружбы, центр, где существа всех видов могли взаимодействовать друг с другом и учиться чему-то у своих ровесников.\n\nОднако в принцессе Селестии и в том, во что её маленькие пони верили и что они делали, Махогани Блейз нашёл новую интерпретацию Конкорд. В отличие от того, чему учила Ноктилюцент Чарм, в эквестрийском подходе к модернизации были заложены принципы гармонии. Иерархии и классы не должны были противопоставляться друг другу или полностью устраняться; скорее, они открывали новые возможности для сотрудничества и великого возвышения каждого пони и существа. Услышать, как основные идеи Принцессы Селестии соблюдаются и на фабриках и в офисах, и как те, у кого есть большая поддержка, поддерживают тех, у кого её нет, было чудом для Махогани, на которое способна только сама Конкорд.\n\nОднажды Блейз намеревался вернуться на Родину, чтобы начать свою карьеру мистика, услышав о конце Безмолвия (отвергая шутки друзей о том, насколько он похож на Верховного Матриарха Рейн Шайн), однако гражданская война ускорила его планы. Махогани было невыносимо слышать о миллионах киринов, разорванных на части как корпорациями НАКП, так и мстительными поджигателями Райзин Файр. После долгих переговоров с семьёй и профессором Эпплджек о возвращении домой, Махогани Блейз всё же стал начинающим дипломатом, готовым показать всем киринам божественную гармонию, которая есть Конкорд, и её путь.\n\n§YАвтор портрета:§! Twotail813"
+COC_pretender_mahogany_blaze:0 "Махогани Блейз"
 KIR_COC_mahogany_tranquil_light:0 "Трэнклин Лайт"
-KIR_COC_mahogany_tranquil_light_desc:0 "Если вы посетите Царство Конкорд, а затем отправитесь в Киноварь, вы обнаружите, что его Матриарха там нет, потому что он находится в другом месте, где кирины нуждаются в нем больше всего.\n\nВ то время как Махогани Блейз вырос в Эквестрии и стал учеником Школы Дружбы, пламя гражданской войны, разжигаемое яростью киринов, втянуло его в битву за душу Кирии. Первоначально он был основным игроком премьера Отэм Блейз и ПзЦГ, но ему пришлось отступить на запад, когда гармонисты потерпели неудачу.\n\nТам его затем заберут те, кто впоследствии станут "Детьми Конкорд", и он станет их лидером, получив прозвище "Алый претендент". Его путешествия по сельской местности потребовали от него провозглашения как радикальной формы правления, так и создания радикальной версии Пути Огня, перемежаемой митингами призывающимися бороться с силами Царства. Но позже он перестал притворяться: Махогани заручился поддержкой киринов, усталых и угнетённых, видящих в нём первого великого кирина, не считающего себя лучше них, а являющимся их родственной душой, божественным пламенем вдохновения.\n\nТеперь Махагони Блейз с королевским именем "Трэнклин Лайт" путешествует по всему Царству, оказывая помощь тем, кто в ней больше всего нуждается. Окончательно порвав с Алой династией, бывший гармонист, осознающий временный характер своего правления, отменит корону через смерть или отставку, чтобы Царство перешло в Общность. Для бывшего Царства Кирия, наконец, пришло время выйти на свет.\n\n§YАвтор портрета:§! Twotail813"
-COC_pretender_mahogany_blaze_desc:0 "Не желая, чтобы его жизнь оборвалась, один начинающий мистик бежал в Эквестрию с наступлением Безмолвия, чтобы начать всё заново и переоценить природу Конкорд. К тому времени, когда подрос его правнук Махогани Блейз, семья пришла к единодушному мнению, что Верховный Матриарх в Кирии действительно допустил ошибку.\n\nСам Махогани до недавнего времени ни разу не ступал копытом на родную землю, хотя родители учили его истории киринского рода, включая эру Безмолвия, всегда с надеждой, что однажды этот кошмар закончится и они смогут вернуться домой. Кирину не потребовалось много времени, чтобы твёрдо решить вернуться в Кирию мистиком, хотя и с особенностями эквестрийца, поэтому в конце 1000-х годов он поступил в Школу Дружбы, набрав высокие баллы как в традиционной академической среде, так и в обучении дружбе, несмотря на свою застенчивость.\n\nНо радость от окончания Безмолвия вскоре была уничтожена пожаром войны. Когда Махогани закончил учёбу в Школе Дружбы, его происхождение стало слишком сильным, чтобы его игнорировать, поэтому с благословения своей семьи он отправился в Царство Рейн Шайн, связав свою судьбу с премьером Отэм Блейз, пока её дело не сгорело дотла после победы националистов. Он избежал поимки вместе с коллегой-гармонистом Брайтом Бёрном, и вскоре дуэту потребовалось много времени, чтобы присоединиться к растущему движению на дальнем западе со штаб-квартирой в Сорго, где он стал лидером того, что впоследствии стало Детьми Конкорд. Поскольку слишком многие кирины отмечали его сходство с матриархом Супериор Рэйншайн, он последовал их совету и стал звать себя "Алый претендент", чтобы стать объединяющей фигурой их движения. Для рабочих, крестьян и солдат он будет их общим героем, их верным Патриархом.\n\nА остальное определит уже история.\n\n§YАвтор портрета:§! Twotail813"
+KIR_COC_mahogany_tranquil_light_desc:0 "Если вы посетите Королевство Конкорд, а затем отправитесь в Киноварь, вы обнаружите, что его короля там нет, потому что он находится в другом месте, где кирины нуждаются в нем больше всего.\n\nВ то время как Махогани Блейз вырос в Эквестрии и стал учеником Школы Дружбы, пламя гражданской войны, разжигаемое яростью киринов, втянуло его в битву за душу Кирии. Первоначально он был основным игроком премьера Отэм Блейз и ПзЦГ, но ему пришлось отступить на запад, когда гармонисты потерпели неудачу.\n\nТам его затем заберут те, кто впоследствии станут "Детьми Конкорд", и он станет их лидером, получив прозвище "Алый претендент". Его путешествия по сельской местности потребовали от него провозглашения как радикальной формы правления, так и создания радикальной версии Пути Огня, перемежаемой митингами призывающимися бороться с силами Царства. Но позже он перестал притворяться: Махогани заручился поддержкой киринов, усталых и угнетённых, видящих в нём первого великого кирина, не считающего себя лучше них, а являющимся их родственной душой, божественным пламенем вдохновения.\n\nТеперь Махогани Блейз с королевским именем "Трэнклин Лайт" путешествует по всему Царству, оказывая помощь тем, кто в ней больше всего нуждается. Окончательно порвав с Алой династией, бывший гармонист, осознающий временный характер своего правления, отменит корону через смерть или отставку, чтобы Царство перешло в Общность. Для бывшего Царства Кирия, наконец, пришло время выйти на свет.\n\n§YАвтор портрета:§! Twotail813"
+COC_pretender_mahogany_blaze_desc:0 "Не желая, чтобы его жизнь оборвалась, один начинающий мистик бежал в Эквестрию с наступлением Безмолвия, чтобы начать всё заново и переоценить природу Конкорд. К тому времени, когда подрос его правнук Махогани Блейз, семья пришла к единодушному мнению, что Верховный Матриарх в Кирии действительно допустила ошибку. Сам Махогани до недавнего времени ни разу не ступал копытом на родную землю, хотя родители учили его истории киринского рода, включая эру Безмолвия, в надежде, что однажды этот кошмар закончится и они смогут вернуться домой.\n\nВ процессе обучения он изучил литературу, в которой к принцессе Селестии относились как к некому божеству. Вскоре он соединил эти идеи с Путём Огня, считая Селестию не истинным аватаром Конкорд, а её малым проявлением. Своего рода Верховным Матриархом, если бы первыми существами мира были пони, а не кирины. Поэтому в конце нулевых годов Махогани поступил в Школу Дружбы, которая дала ему немало пищи для размышлений, поскольку его обоснование ценности дружбы имело неэквестрийскую, кирийскую основу. Кирин уникально понимал гармонию всех существ и поэтому блестяще сдал все предметы.\n\nНо радость от окончания Безмолвия вскоре была уничтожена пожаром войны. Когда Махогани закончил учёбу в Школе Дружбы, зов родины стал слишком силён, чтобы его игнорировать, поэтому с благословения своей семьи он отправился в Царство Рейн Шайн, связав свою судьбу с премьером Отэм Блейз, пока её дело не сгорело дотла после победы националистов. Он избежал поимки вместе с коллегой-гармонистом Брайтом Бёрном, и вскоре дуэту потребовалось много времени, чтобы присоединиться к растущему движению на дальнем западе со штаб-квартирой в Сорго, где он стал лидером того, что впоследствии стало Детьми Конкорд. Поскольку слишком многие кирины отмечали его сходство с матриархом Рейн Шайн, он последовал их совету и стал звать себя "Алый претендент", чтобы стать объединяющей фигурой их движения. Для рабочих, крестьян и солдат он будет их общим героем, их верным Патриархом.\n\nА остальное определит уже история.\n\n§YАвтор портрета:§! Twotail813"
 COC_pretender_mahogany_blaze_modifier_tt:0 "Алый претендент\n(@KIS §YАлая Империя Кирия§!): Бонус к прорыву против страны: §G+5.0%§!"
 COC_common_senate:0 "Общий сенат"
-COC_common_senate_desc:0 ""Никогда не руководить, всегда помогать." - официальный девиз общего сената, за который все проголосовали.\n\nВозникший из пепла революции, порождённой мучительными страданиями простых киринов, Общий сенат - это собрание национальных представителей, собирающихся в постоянно меняющихся местах для голосования по насущным вопросам сегодняшнего дня. У национальных представителей нет фиксированных сроков полномочий; они могут длиться всю жизнь, если они являются исключительными представителями, или они могут длиться всего несколько дней благодаря местным референдумам об отзыве в случае чрезвычайной ситуации.\n\nОднако более мелкие детали этих национальных вопросов полностью не решаются в национальной ассамблее, а, скорее, доводятся до сведения всех компетентных органов общесельской ассамблеи. Это также работает и наоборот: референдумы, проводимые в одной деревне, могут, если прогнозируется их значительное расширение, стать вопросом для голосования в национальном собрании.\n\nМежду общенациональными и сельскими собраниями находятся различные уровни собраний, от ассамблеи городов до региональной ассамблеи и ассамблеи двух или трёх регионов (или того, что обычно называют "суперрегиональной ассамблеей", которая может менять регионы в зависимости от их единства по какому-либо вопросу).\n\n§YАвтор портрета:§! Caspy"
+COC_common_senate_desc:0 ""Никогда не возглавлять, всегда помогать." - официальный девиз общего сената, за который все проголосовали.\n\nВозникший из пепла революции, порождённой мучительными страданиями простых киринов, Общий сенат - это собрание национальных представителей, собирающихся в постоянно меняющихся местах для голосования по насущным вопросам сегодняшнего дня. У национальных представителей нет фиксированных сроков полномочий; они могут длиться всю жизнь, если они являются исключительными представителями, или они могут длиться всего несколько дней благодаря местным референдумам об отзыве в случае чрезвычайной ситуации.\n\nОднако более мелкие детали этих национальных вопросов полностью не решаются в национальной ассамблее, а, скорее, доводятся до сведения всех компетентных органов общесельской ассамблеи. Это также работает и наоборот: референдумы, проводимые в одной деревне, могут, если прогнозируется их значительное расширение, стать вопросом для голосования в национальном собрании.\n\nМежду общенациональными и сельскими собраниями находятся различные уровни собраний, от ассамблеи городов до региональной ассамблеи и ассамблеи двух или трёх регионов (или того, что обычно называют "суперрегиональной ассамблеей", которая может менять регионы в зависимости от их единства по какому-либо вопросу).\n\n§YАвтор портрета:§! Caspy"
 KIC_pol_1:0 "Эмеральд Брайт"
 KIC_pol_2:0 "Брэкен Скорч"
 KIC_army_chief_1:0 "Чиффон Глоу"
@@ -5279,7 +5290,7 @@ KIC_navy_chief_1:0 "Персиммон Смоук"
 KIC_theorist_1:0 "Сэйдж Снут"
 KIR_army_chief_4:0 "Лэмбент Синдер"
 KIR_army_chief_5:0 "Бёрнишд Стэнчион"
-KIR_rain_shine_figurehead:0 "Рэйн Шайн"
+KIR_rain_shine_figurehead:0 "Рейн Шайн"
 KIR_rain_shine_figurehead_desc:0 "Для среднестатистического кирина не так уж много изменилось в отношении Верховного Матриарха Рейн Шайн: она была и останется аватаром Конкорд в этом смертном измерении, и она будет выполнять свои религиозные обязанности в Пути Огня. Но НАКП взяла на себя все остальные обязанности, управляя страной от своего имени."
 KIR_adv_17:0 "Роки Валанш"
 KIR_adv_17_desc:0 "§YАвтор портрета:§! Leo the Unicorn"
@@ -5292,7 +5303,7 @@ KIR_fleethoof:0 "Флизхуф"
 KIR_fleethoof_available:0 "Флизхуф доступен"
 KIR_bright_burn:0 "Брайт Бёрн"
 KIR_bright_burn_desc:0 "У Брайт Бёрна могла бы быть спокойная жизнь в волшебной стране дружбы, свободной от репрессивного Безмолвия. Однако он отказался от самодовольного существования вместо карьеры в армии Эквестрии, движимый желанием помочь пони, позволившим его родителям поселиться здесь.\n\nПоэтому, когда до кирина дошли новости об окончании Безмолвия, в чём Кирии помогли два элемента Гармонии, он, не теряя времени, вернулся в Царство, чтобы посеять гармонию среди своих борющихся собратьев. Да, его родина - нищий бардак, но он может это исправить, и уроки военного дела, которые он получил в Кантерлоте, очень пригодятся здесь. В мире, где так много существ не могут бороться за свои собственные права, он сделает это ради них.\n\nГоре тому, кто осмелится встать на пути свободы, ибо его будет ждать Брайт Бёрн!\n\n§YАвтор портрета:§! NotoriousNostalgia"
-NSA_bright_burn_desc:0 "Родившийся в семье киринских иммигрантов недалеко от Кантерлота, Брайт Бёрн получил множество знаний, а также передаваемых из поколения в поколение историй о бедах Безмолвия. По сравнению с его родиной Эквестрия была воплощением мечты, надёжным убежищем от губительной ошибки Матриарха.\n\nЭтого было недостаточно, чтобы прожить остаток своих дней в безопасности и комфорте. Когда родители кирина убедили Брайта считать себя "одним из счастливчиков", которым удалось избежать Безмолвия, это подтолкнуло его к странно продуктивному бунтарству: он поклялся окончить королевский университет Кантерлота и стать частью королевской гвардии, хотя бы для того, чтобы оплатить неосязаемый долг перед страной, подарившей ему и его семье такую хорошую жизнь.\n\nЗатем, по приказу Рейн Шайн Безмолвие было отменено, благодаря новому имперскому премьер-министру, подружившимуся с Элементами Гармонии. После этого Брайт поспешил в Кирию, чтобы помочь своим сородичам в качестве военного офицера, поддерживающего ПзЦГ.\n\nОн яростно сражался за Царство во время первой гражданской войны, но затем наткнулся на препятствие: Винтер Фрост. Под её руководством Безмолвие отступало дюйм за дюймом, и он был здесь, чтобы стать свидетелем того, как она забирает жизнь у тех, кому повезло меньше, чем ему. Поняв, что мирного решения не существует Брайт заметил, что многими молодыми кадетами и офицерами в родном городе Отэм и за его пределами всё ещё двигал важнейший долг. Однако множество киринов - сотни, если не тысячи, не могли обрести свободу, перед лицом всепожирающего государственного аппарата.\n\nВ открытом бунте против Киновари Брайт Бёрн готов окончательно избавиться от Безмолвия. Угнетателей киринов ждёт лишь пули и кровь, а всех остальных - яркий свет свободы!\n\n§YАвтор портрета:§! NotoriousNostalgia"
+NSA_bright_burn_desc:0 "Родившийся в семье киринских иммигрантов недалеко от Кантерлота, Брайт Бёрн получил множество знаний, а также передаваемых из поколения в поколение историй о бедах Безмолвия. По сравнению с его родиной Эквестрия была воплощением мечты, надёжным убежищем от губительной ошибки Матриарха.\n\nЭтого было недостаточно, чтобы прожить остаток своих дней в безопасности и комфорте. Когда родители кирина убедили Брайта считать себя "одним из счастливчиков", которым удалось избежать Безмолвия, это подтолкнуло его к странно продуктивному бунтарству: он поклялся окончить королевский университет Кантерлота и стать частью королевской гвардии, хотя бы для того, чтобы оплатить неосязаемый долг перед страной, подарившей ему и его семье такую хорошую жизнь.\n\nЗатем, по приказу Рейн Шайн Безмолвие было отменено, благодаря новому имперскому премьер-министру, подружившимуся с Элементами Гармонии. После этого Брайт поспешил в Кирию, чтобы помочь своим сородичам в качестве военного офицера, поддерживающего ПзЦГ.\n\nОн яростно сражался за Царство во время первой гражданской войны, но затем наткнулся на препятствие: Винтер Фрост. Под её лидерством Безмолвие отступало дюйм за дюймом, и он был здесь, чтобы стать свидетелем того, как она забирает жизнь у тех, кому повезло меньше, чем ему. Поняв, что мирного решения не существует Брайт заметил, что многими молодыми кадетами и офицерами в родном городе Отэм и за его пределами всё ещё двигал важнейший долг. Однако множество киринов - сотни, если не тысячи, не могли обрести свободу, перед лицом всепожирающего государственного аппарата.\n\nВ открытом бунте против Киновари Брайт Бёрн готов окончательно избавиться от Безмолвия. Угнетателей киринов ждёт лишь пули и кровь, а всех остальных - яркий свет свободы!\n\n§YАвтор портрета:§! NotoriousNostalgia"
 NSA_bright_burn_peace_desc:0 "Очень часто, как противники, так и его друзья спорили с Брайтом, иногда даже дрались с ним, махали ему копытами и рогами. "Почему мы остановились!?" кричали они. "Есть ещё сотни тысяч киринов, которых нужно спасти!"\n\nБоль от незаконченных дел остаётся. Бёрн проделал долгий путь из своей приёмной страны Эквестрии, чтобы помочь Кирии восстановиться после Безмолвия, при полной поддержке Отэм Блейз и её партии.\n\nНо, как и все хорошие солдаты, он ненавидел проливать кровь киринов без необходимости. Первая гражданская война научила его этому уроку - нельзя убивать невинных; то, что он был звездой второй, навсегда закрепило эту мысль в голове Брайта. Что такое освобождение, если Винтер Фрост в конечном итоге бросил бы на него десятки крестьян умирать от клинков их освободителей?\n\nОднакое не всё так безнадежно. Половина Кирии теперь находится в копытах простых киринов, и, несмотря на свой пост временного президента, Бёрн по мере сил путешествует к нуждающимся и угнетённым и часто бывает на пограничных заставах, чтобы лично приветствовать беженцев с севера. С Ферн Флэйр и остальными членами ПзЦГ, поддерживающими его, он надеется, что однажды и остальная часть Кирии увидит свет.\n\nА если этого никогда не произойдёт? Брайт Бёрн уверен, что если он построит настоящую республики, кирины сами придут к нему.\n\n§YАвтор портрета:§! NotoriousNostalgia"
 KIR_bright_burn_advisor_available:0 "Брайт Бёрн доступен"
 KIR_autumn_harvest:0 "Отэм Харвест"
@@ -5388,7 +5399,7 @@ KIR_massicot_academy:0 "Военная школа Массикота"
 KIR_massicot_academy_desc:0 "Ещё до того, как наступило Безмолвие, ещё даже до рождения Иридисент Доу, шла война. Кирины, столь уязвимые перед капризами своих эмоций, были, пожалуй, особенно увлечены кровавыми забавами боя. На берегах Медоносной этот древний народ обучал своих детей искусству сражений, где лучшие воины своего города-государства, приходили сюда детьми, а выходили умелыми солдатами. Говорят, что новобранцев заставляли прыгать в ледяную воду зимой в качестве ритуала посвящения. Эти молодые жеребята либо доказывали свою силу, либо их утаскивало течением в ледяные глубины, откуда они уже никогда не возвращались.\n\nПо мере того, как Кирия объединялась, а время шло, это древнее тренировочное поле превратилось в полноценную академию, которая превращала молодежь региона в лучших генералов Верховного матриарха. Выпускники Массикота одним своим появлением вызывали как зависть, так и восхищение, пока Ноктилюцент Чарм не начала выпускать свои декреты. Безмолвие превратила школу в прославленный музей, терпеливо ожидающий дня своего воскрешения, когда её священные залы могут снова наполниться учениками, жаждущими кровопролития."
 
 KIR_cog_plow_bull_co:0 "Концерн Торуса"
-KIR_cog_plow_bull_co_desc:0 "Концерн Торуса - это новый игрок в промышленной гонке Кирии, впервые зарегистрированный в Скайфоле в 998 году Ардентом Блумом и его сестрой: Зенити Блум, матриархом-командующим Знамени Звёздного Тельца. Являясь современным промышленным конгломератом, концерн скупил заводы и шахты по всей Кирии для производства как современных промышленных товаров, таких как автомобили и тракторы, так и военного оружия. Хотя концерн нередко слишком жесток к своим работникам, стремление его руководства к модернизации и индустриализации Кирии нельзя игнорировать.\n\nТакже известно, что у концерна есть тесные связи с национальной ассоциацией киринских патриотов. Ардент Блум - главный экономист националистов, а Зенит Блум и вовсе не скрывает своего личного участия в менее чем пикантной деятельности Ордена Железной хризантемы - военизированной организации НАКП и, как утверждают некоторые, сети контрабандистов. Но если оставить в стороне политику, Торус проявил интерес к разработке киринских танков и брони, при условии, что именно они будут их производить."
+KIR_cog_plow_bull_co_desc:0 "Концерн Торуса - это новый игрок в промышленной гонке Кирии, впервые зарегистрированный в Скайфоле в 998 году Ардентом Блумом и его сестрой: Зенити Блум, матриархом-командующим Знамени Звёздного Тельца. Являясь современным промышленным конгломератом, концерн скупил заводы и шахты по всей Кирии для производства как современных промышленных товаров, таких как автомобили и тракторы, так и военного оружия. Хотя концерн нередко слишком жесток к своим работникам, стремление его лидерства к модернизации и индустриализации Кирии нельзя игнорировать.\n\nТакже известно, что у концерна есть тесные связи с национальной ассоциацией киринских патриотов. Ардент Блум - главный экономист националистов, а Зенит Блум и вовсе не скрывает своего личного участия в менее чем пикантной деятельности Ордена Железной хризантемы - военизированной организации НАКП и, как утверждают некоторые, сети контрабандистов. Но если оставить в стороне политику, Торус проявил интерес к разработке киринских танков и брони, при условии, что именно они будут их производить."
 
 KIR_crane_heavy_industries:0 "Крейн Хэви Индастриз"
 KIR_crane_heavy_industries_desc:0 "Коммерческим предприятием, которое наиболее ярко представляет Крейн Хэви Индастриз в глазах общественности, является их производство лёгких самолётов, для которого компания выиграла множество контрактов на закупки у правительства Киновари. Крейн чередует скромные ухаживания с ожесточённой коммерческой конкуренцией с национальной ассоциацией патриотов Кирина за её частные инициативы по модернизации — напряжённые, капризные и непостоянные отношения, раздражающих местных журналистов.\n\nЭту корпорацию мало заботят мирские дела Царства, за исключением тех, что касаются его самого современного и коммерчески перспективного предприятия - того, что производит самолёты. Но если кто-то ударит по этому отростку капитала, вскоре может обрушиться вся структура."
@@ -5580,7 +5591,7 @@ KIR_modify_wrsf1_tt:0 "Поддержка войны: §G+5.00%§!"
 KIR_modify_ogmsif_tt:0 "Мнение при одинаковой идеологии: §G+10.0%§!"
 KIR_modify_icd1_tt:0 "Производительность верфей: §G+5.00%§!"
 KIR_modify_icf1_tt:0 "Объем заводского производства: §G+5.00%§!"
-KIR_modify_localresources1_tt:0 "Эффективность добычи ресурсов: §G+5.00%§!"
+KIR_modify_localresources1_tt:0 "Эффективность увеличения ресурсов: §G+5.00%§!"
 KIS_reconcile_focus_9_tt:0 "Будет открыто решение £decision_icon_small §YМассикотский мир§!, позволяющее нам §Yразделить Кирию§! и закончить §Yгражданскую войну§!."
 KIS_event_33_peace_yes_tt:0 "Мы примем §Yмассикотский мир§!!"
 KIS_modify_mil2civ_tt:0 "Скорость конверсии военного завода в гражданскую фабрику: §G-10.00%§!"
@@ -5618,7 +5629,7 @@ KIR_modify_decryption_factor_tt:0 "Decryption: §G+5.00%§!"
 KIR_modify_encryption_factor_tt:0 "Encryption: §G+5.00%§!"
 KIR_council_mil_focus_5_tt:0 "Org. Loss when Moving: §G-5.00%§!\nArmy Organization Regain: §G+5.00%§!\nTerrain Penalty Reduction: §G+5.00%§!\nEntrenchment Speed: §G+5.00%§!\nReconnaissance: §G+5.00%§!"
 KIR_council_mil_focus_6_tt:0 "Two §YLight Armour Regiments§! will be formed and deployed:\n  - No. 1 Armour Regiment 'North Steel'\n  - No. 2 Armour Regiment 'North Wind'"
-KIS_event_47a_tt:0 "All Infantry & Mot/Mech:\n   River\n     Attack: §G+10%§!§W\n     Movement: §G+10%§!§W\n   Amphibious\n     Attack: §G+10%§!§W\n     Movement: §G+10%§!§W"
+KIS_event_47a_tt:0 "Вся пехота & Мот/Мех:\n   Река\n     Атака: §G+10%§!§W\n     Движение: §G+10%§!§W\n   Амфибии\n     Атака: §G+10%§!§W\n     Движение: §G+10%§!§W"
 KIS_event_47b_tt:0 "The §Y40-width§! Marine '§YBlack Band§!' §YAmphibious Assault Brigade§! will be formed and deployed in §Y[Root.Capital.GetName]§!."
 KIS_event_48_tt:0 "The formerly-Feathesian §YO Type§! Submarine '§YDolfijn§!' has been recovered, and is being restored."
 KIR_roaring_fire_admiral:0 "§YRoaring Fire§! (with traits §YBold§!, §YBlockade Runner§!, §YConcealment Expert§!) becomes an Admiral.\n"
@@ -5732,9 +5743,9 @@ KIR_silence_organisation2_tt:0 "Организация дивизии: §G+15.0%
 KIR_silence_minimumtraining2_tt:0 "Минимальный уровень обучения: §G-20%§!"
 KIR_silence_experience1_tt:0 "Прирост опыта армии: §G+10.0%§!"
 KIR_silence_experience2_tt:0 "Прирост опыта армии: §G+20.0%§!"
-KIR_silence_consumergoods_tt:0 "Фабрики, производящие товары народного потребления: §Y-5%§!"
-KIR_silence_consumergoods1_tt:0 "Фабрики, производящие товары народного потребления: §Y-3%§!"
-KIR_silence_consumergoods2_tt:0 "Фабрики, производящие товары народного потребления: §Y-2%§!"
+KIR_silence_consumergoods_tt:0 "Фабрики, производящие товары народного потребления: §Y-10%§!"
+KIR_silence_consumergoods1_tt:0 "Фабрики, производящие товары народного потребления: §Y-6%§!"
+KIR_silence_consumergoods2_tt:0 "Фабрики, производящие товары народного потребления: §Y-4%§!"
 KIR_silence_general_cost1_tt:0 "Стоимость командира: §G-25.0%§!"
 KIR_silence_planning1_tt:0 "Скорость планирования: §G+25.0%§!"
 KIR_silence_planning2_tt:0 "Скорость планирования: §G+10.0%§!"
@@ -5851,10 +5862,10 @@ KIC_pp_50_truck_150_tooltip:0 "It costs [This.KICGetTrucknPP] to take this decis
 KIC_pp_50_truck_150:0 "£GFX_truck_text  §Y150§! £pol_power  §Y50§!"
 KIC_pp_50_truck_150_blocked:0 "£GFX_truck_text  §R150§! £pol_power  §R50§!"
 
-KIC_fortress_chrysanthemum:0 "Fortress Chrysanthemum"
-KIC_chrysanthemum_bunker:0 "The Chrysanthemum Earthworks"
-KIC_chrysanthemum_bunker_desc:0 "The Incarnadine Soldiery garrison of Chrysanthemum will conscript local residents as labourers to build earthworks defending the capital of the Fraternal Republic."
-KIC_milfac_use:0 "Military Production Retooling"
+KIC_fortress_chrysanthemum:0 "Крепость Хризантема"
+KIC_chrysanthemum_bunker:0 "Бункеры и доты Хризантемы"
+KIC_chrysanthemum_bunker_desc:0 "Военный гарнизон Инкарнадина в Хризантеме призовёт местных жителей в качестве чернорабочих для строительства земляных укреплений, защищающих столицу Братской Республики."
+KIC_milfac_use:0 "Переоснащение военного производства"
 
 KIC_roaring_fire_category:0 "The Matriarch-Protector's Attack Dog"
 KIC_roaring_fire_category_desc:0 "Dayspring Rose, §Ypersonal protégé§! to First Priestess §ORising Sun§!, has lived a relatively sheltered life by her mentor's side. If Dayspring Rose is to eventually assume the roles and responsibilities as the First Priestess's §Yright-hoof mare§! that Rising Sun is grooming her to become, she must venture forth into the wartorn landscape that is Kiria to §Oprove her mettle§! against the §Rmyriad enemies§! of the Republic and the Revolution."
@@ -5913,7 +5924,7 @@ KIR_republic_focus_BH_5B_tt:0 "Base Terrain Penalty Reduction: §G+5.0%§!\nBase
 
 ### KIR Civil War Stuff ###
 KIR_civil_war_government:0 "Осаждённая династия"
-KIR_civil_war_government_desc:0 "Хотя Царство оставалось целым и невредимым на протяжении всего Безмолвия, всё большее число киринов стало критиковать правление и идеологию алой династии, поэтому, когда Великий Скачок Вперёд дал им привилегию открыто оспаривать Верховного Матриарха, несостоятельность 3½-летнего плана привела к широкому распространению противостоянию Рейн Шайн и её премьеру.\n\nДаже лоялисты считают, что Рэйн Шайн, сама того не ведая, подвергла опасности своих подданных. Но с другой стороны, её солдаты вместе с союзниками из-за рубежа неустанно сражаются за Царство, чтобы восстановить доброжелательную волю Конкорд по всей Кирии."
+KIR_civil_war_government_desc:0 "Хотя Царство оставалось целым и невредимым на протяжении всего Безмолвия, всё большее число киринов стало критиковать правление и идеологию алой династии, поэтому, когда Великий Скачок Вперёд дал им привилегию открыто оспаривать Верховного Матриарха, несостоятельность 3½-летнего плана привела к широкому распространению противостоянию Рейн Шайн и её премьеру.\n\nДаже лоялисты считают, что Рейн Шайн, сама того не ведая, подвергла опасности своих подданных. Но с другой стороны, её солдаты вместе с союзниками из-за рубежа неустанно сражаются за Царство, чтобы восстановить доброжелательную волю Конкорд по всей Кирии."
 KIR_civil_war_government_running_battle:0 "Осаждённая династия"
 KIR_civil_war_government_resolute_defence:0 "Осаждённая династия"
 KIR_civil_war_way_of_fire:0 "Пламя решительности"
@@ -5954,7 +5965,7 @@ KIR_civil_war_focus_4e_tt:0 "Будут сформированы и развер
 KIR_aureolin_forts_line1:0 "Подход к Ауреолину"
 KIR_aureolin_forts_line1_desc:0 "Будут сформированы укрепления на южной границе Страта, препятствуя любому продвижению к Ауреолину ещё до того, как оно начнется."
 KIR_aureolin_forts_line:0 "Монастырский редут"
-KIR_aureolin_forts_line_desc:0 "Будут сформированы укрепления в районах, окружающих Ауреолин, чтобы великий монастырь не попал не в те руки."
+KIR_aureolin_forts_line_desc:0 "Будут сформированы укрепления в районах, окружающих Ауреолин, чтобы великий монастырь не попал не в те копыта."
 
 KIR_gain_rising_fire_modifier_tt:0 "Будет получен динамический модификатор: §YРазгорающееся Пламя§!, дающий динамические §Yполитические§!, §Yвоенные§! и §Yэкономические§! бонусы."
 KIR_civil_war_rising_fire:0 "Разгорающееся Пламя"
@@ -6060,7 +6071,7 @@ KIR_GREAT_LEAP_DECISION_TITLE_2:0 "§OВозрождение Киновари§!
 KIR_GREAT_LEAP_DECISION_TITLE_3:0 "§CЛучезарное процветание§!"
 KIR_GREAT_LEAP_DECISION_TITLE_2_FOCUS:0 "Возрождение Киновари"
 KIR_GREAT_LEAP_DECISION_TITLE_3_FOCUS:0 "Возрождение Киновари"
-KIR_GREAT_LEAP_DECISION_TITLE_2_FOCUS_DESC:0 "Кирия объединилась против Севера и победила вероломную НАКП, чтобы вернуть Провидение в лоно Царства. Пришло время избавиться от шрамов гражданской войны и возобновить программу модернизации и либерализации, руководствуясь идеалами гармонии и справедливости, за сохранение которых кирины так упорно боролись."
+KIR_GREAT_LEAP_DECISION_TITLE_2_FOCUS_DESC:0 "Кирия объединилась против Севера и победила вероломную НАКП, чтобы вернуть Провидение в лоно Царства. Пришло время избавиться от шрамов гражданской войны и возобновить программу модернизации и либерализации, беря за пример идеалы гармонии и справедливости, за сохранение которых кирины так упорно боролись."
 KIR_GREAT_LEAP_DECISION_TITLE_3_FOCUS_DESC:0 "Великий Скачок Вперёд увенчался успехом, несмотря ни на что. Премьер Отэм Блейз за несколько коротких лет добилась невероятного промышленного и технологического прогресса, наверстав всё потерянное время из-за Безмолвия. Пришло время официально объявить о начале новой эры для новой Кирии: эры лучезарного процветания!"
 KIR_GREAT_LEAP_DECISION_DESC_A1:0 "Детище премьер-министра §YОтэм Блейз§!, §Y3½-летний план§!, признанный слишком амбициозным даже его самыми ярыми сторонниками, должен наверстать упущенный за столетие прогресс и преобразовать"
 KIR_GREAT_LEAP_DECISION_DESC_B1:0 "§YЦарство Кирию§! в полностью индустриализированное государство к концу 1011 года. Этот план является краеугольным камнем §YВсекирийского пленума по национальному возрождению§! - собрания лучших и ярчайших представителей Кирии, созванного в Киновари по приказу §YРейн Шайн§!, чтобы вывести страну из §RБезмолвия§!. Поддерживаемая Эквестрией, финансируемая богатствами возвращающейся киринской диаспоры, подпитываемая возрождающимся пламенем патриотизма и движимая неукротимой волей народа, Отэм Блейз верит, что План может увенчаться успехом — но только в том случае, если Пленум научится работать сообща, направляя свою энергию на достижение их общей цели - создание сильной и независимой Кирии."
@@ -6104,9 +6115,9 @@ KIR_northern_rail_desc:0 "Железные дороги позволят нам
 KIR_investigate_incendiaries_decision:0 "Изучить поджигателей"
 KIR_investigate_incendiaries_decision_desc:0 "Верховный Матриарх Рейн Шайн хочет, чтобы мы изучили Поджигателей поподробнее, прежде чем решим, как лучше с ними поступить. Отчёт об их деятельности в Царстве будет составлен и передан премьер-министру, чтобы та могла представить соответствующие рекомендации."
 KIR_stab_decision_A:0 "Принять просителей"
-KIR_stab_decision_A_desc:0 "На протяжении всего Безмолвия Алый Двор был закрыт для киринов Царства, и существ, видевших Верховного Матриарха во плоти, было всего десяток. Поскольку Безмолвие закончилось, Верховный Матриарх Рейн Шайн решила 70-дневные регулярные открытые слушания, где заявители могли бы видеть её и высказывать своё мнение. Сам факт того, что мы увидели божественную правительницу Кирии и позволили ей выслушать их проблемы, в значительной степени восстановил веру нашего народа в намерения Матриарха и её веру в успех Великого скачка вперёд."
+KIR_stab_decision_A_desc:0 "На протяжении всего Безмолвия Алый Двор был закрыт для киринов Царства, и существ, видевших Верховного Матриарха во плоти, было всего десяток. Поскольку Безмолвие закончилось, Верховный Матриарх Рейн Шайн решила проводить 70-дневные регулярные открытые слушания, где заявители могли бы видеть её и высказывать своё мнение. Сам факт того, что мы увидели божественную правительницу Кирии и позволили ей выслушать их проблемы, в значительной степени восстановил веру нашего народа в намерения Матриарха и её веру в успех Великого скачка вперёд."
 KIR_stab_decision_B:0 "Ответить на письма"
-KIR_stab_decision_B_desc:0 "Хотя не каждый кирин может отправиться в Киноварь, чтобы лично встретиться с Верховным Матриархом Рейн Шайн, создание службы связи дало возможность заинтересованным существам по всему Царству отправлять письма ко Алому двору, которые затем передаются ей. Таким образом, все, даже кирины на окраинах нашей страны могут почувствовать, что их голоса лично слышит Матриарх и, в свою очередь, сама Конкорд."
+KIR_stab_decision_B_desc:0 "Хотя не каждый кирин может отправиться в Киноварь, чтобы лично встретиться с Верховным Матриархом Рейн Шайн, создание службы связи дало возможность заинтересованным существам по всему Царству отправлять письма к Алому двору, которые затем передаются ей. Таким образом, все, даже кирины на окраинах нашей страны могут почувствовать, что их голоса лично слышит Матриарх и, в свою очередь, сама Конкорд."
 KIR_stab_decision_1:0 "Укрепить Путь Огня"
 KIR_stab_decision_1_desc:0 "Столетия назад Путь Огня объединил народ киринов так, как никогда прежде не удавалось ни одному военачальнику или дипломату. Наша вера в Конкорд и её божественный аватар, Верховного Матриарха, позволяет нам объединиться как мирной нации и отвергнуть насильственные побуждения нириков. Однако в эти пугающие новые времена вера в Путь Огня угасает, особенно после сурового застоя Безмолвия. Мы должны приложить все усилия, чтобы напомнить своим подданным по всему Царству об учениях и принципах Пути Огня, если мы хотим поддерживать мир и стабильность в стране.\n\n§WЦена £pol_power §Yполитической власти§! для этого £decision_icon_small §Yрешения§! будет увеличиваться на §R+25%§! каждый раз, когда вы его выбираете.§!"
 KIR_stab_decision_2:0 "Кампания живописи и культуры"
@@ -6138,7 +6149,7 @@ KIR_EQS_factories_deal_desc:0 "Гиацинтовое соглашение ст
 KIR_complete_modernisation_decision:0 "Объявить триумф модернизации"
 KIR_complete_modernisation_decision_desc:0 "Это была трудная задача, выполненная деликатно, на головокружительной скорости, но, несмотря ни на что, кирины победили Безмолвие с высоко поднятыми головами. Установив идеальный баланс между стремлениями к техноиндустриализации и мечтами всех киринов Царства, мы вернёмся на мировую арену титанами, принимая пути современности на наших условиях.\n\nНаш день настал! Кирия просыпается!"
 KIR_complete_modernisation_decision_tt:0 "По крайне мере §Yдвадцать§! (§Y20§!) фокусов в §Y[KIR_GREAT_LEAP_DECISION_GET_FOCUS_TITLE]§! фокусной ветке было завершено."
-KIR_KoNRAD_decision:0 "Expand KoNRAD's Powers"
+KIR_KoNRAD_decision:0 "Расширить власть УпРРКН"
 KIR_KoNRAD_decision_desc:0 ""
 KIR_KoNRAD_decision_tt:0 "Увеличивает §Yмаксимальное количество ресурсов§! производимых гражданскими фабриками или же нефтеперерабатывающими заводами на §G+1§!.\n"
 KIR_BoE_decision:0 "Объявить сезон выборов"
@@ -6156,6 +6167,7 @@ KIR_Industry_WK:0 "Индустриализировать Западную Ки
 KIR_Industry_WK_req_tt:0 "Каждый регион в §YЗападной Кирии§! (§YЗападные территории§! и §Y[926.GetName]§!) имеет хотя бы §Y1 гражданскую фабрику§!"
 KIR_Industry_Literacy:0 "Кампания обучения письму и чтению"
 KIR_Industry_Science:0 "Кампания обучения наукам и инновациям"
+KIR_toggle_diet_auto_renew_turn_on:0 "§CПереключить§! £decision_icon_small решение §YВключить автоматический повторный выбор действующей партии§! на §Gперевыбор выбор§! §Yправящей партии§! в провинциальном парламенте по окончании срока её полномочий."
 KIR_toggle_diet_auto_renew_on:0 "Включить автоматический повторный выбор действующей партии"
 KIR_toggle_diet_auto_renew_on_tt:0 "По истечении срока полномочий §Yправящей партии§! в провинциальном парламенте, она будет §Gавтоматически выбрана§! на следующий срок.\n"
 KIR_toggle_diet_auto_renew_off:0 "Выключить автоматический повторный выбор действующей партии"
@@ -6311,7 +6323,7 @@ KIS_invest_nav_dock_cost_tt_blocked:0 "£GFX_sycee_text  [?KIS.KIS_invest_nav_do
 KIS_invest_nav_dock_cost_tt_tooltip:0 "Это решение стоит [This.KISGetNavInvestCost] золотых монет."
 
 KIS_northern_compact_plebiscite_category:0 "Кампания за принятие северного соглашения"
-KIS_northern_compact_plebiscite_category_desc:0 "Пока §OКиноварь§! ведёт войну против §YРазгорающегося Пламени§! на западе, национальная ассоциация киринских патриотов, управляемая §Y[KIS.GetName]§!, начинает кампанию по объединению всей Северной Кирии под доброжелательным и дальновидным руководством партии и §Yпредседателя Фикл Каррента§!. В штаб-квартире Ассоциации разрабатывается амбициозный геополитический гамбит — декларация §Cсеверного соглашения§! об объединении регионов Северной Кирии под управлением националистов.\n\n§GСредний уровень§! народной поддержки северного соглашения:"
+KIS_northern_compact_plebiscite_category_desc:0 "Пока §OКиноварь§! ведёт войну против §YРазгорающегося Пламени§! на западе, национальная ассоциация киринских патриотов, управляемая §Y[KIS.GetName]§!, начинает кампанию по объединению всей Северной Кирии под доброжелательным и дальновидным лидерством партии и §Yпредседателя Фикл Каррента§!. В штаб-квартире Ассоциации разрабатывается амбициозный геополитический гамбит — декларация §Cсеверного соглашения§! об объединении регионов Северной Кирии под управлением националистов.\n\n§GСредний уровень§! народной поддержки северного соглашения:"
 KIS_northern_compact_plebiscite_category_progress_bar_tt:0 "Поддержка населения в регионах:\n\nБлагоухание: [?KIS.KIS_plebiscite_fragrance_support_var|%Y0],\nМиловидный Мыс: [?KIS.KIS_plebiscite_comely_cape_support_var|%Y0],\nПроцветающая лощина: [?KIS.KIS_plebiscite_prosperous_dell_support_var|%Y0],\nРапсодия: [?KIS.KIS_plebiscite_rhapsody_support_var|%Y0],\nСияние: [?KIS.KIS_plebiscite_radiance_support_var|%Y0],\nИзумрудное Побережье: [?KIS.KIS_plebiscite_viridian_coast_support_var|%Y0],\nАбрикосовая Лощина: [?KIS.KIS_plebiscite_apricot_glen_support_var|%Y0],\nВесенняя поляна: [?KIS.KIS_plebiscite_verdant_fields_support_var|%Y0]."
 
 KIR_plebiscite_fickle_current_tour:0 "Тур по Великому Провидению"
@@ -6357,11 +6369,11 @@ KIS_pleb_support_10_to_30:0 "§Y10-30%§!"
 KIS_pleb_support_5_to_40:0 "§Y5%-40%§!"
 
 KIR_plebiscite_counter_canvassing_effort:0 "Кампания по борьбе с агитацией"
-KIR_plebiscite_counter_canvassing_effort_desc:0 "Фикл Каррент и НАКП агитируют север отделиться из-за его культурного отличия от Киновари и его территорий. Однако они игнорируют чудо самой Кирии, огромных её размеров и разнообразия и уникальности киринов, удерживаемых вместе Путём Огня, Высшим Матриархом и единством вида. Таким образом, передача этого искреннего послания о единстве во имя Великого Провидения будет иметь решающее значение для сохранения единства Царства.\n\n§WСредний уровень §Yнародной поддержки§! §Yсеверного соглашения§! сейчас составляет §Y[?KIS.KIS_plebiscite_average_popular_support|0]%§!.§!"
+KIR_plebiscite_counter_canvassing_effort_desc:0 "Фикл Каррент и НАКП агитируют север отделиться из-за его культурного отличия от Киновари и его территорий. Однако они игнорируют чудо самой Кирии, огромных её размеров и разнообразия и уникальности киринов, удерживаемых вместе Путём Огня, Верховным Матриархом и единством вида. Таким образом, передача этого искреннего послания о единстве во имя Великого Провидения будет иметь решающее значение для сохранения единства Царства.\n\n§WСредний уровень §Yнародной поддержки§! §Yсеверного соглашения§! сейчас составляет §Y[?KIS.KIS_plebiscite_average_popular_support|0]%§!.§!"
 KIR_plebiscite_counter_canvassing_effort_tt:0 "Каждую неделю, поддержка §Yсеверного соглашения§! в §YРапсодии§!, §YИзумрудном Береге§!, §YСиянии§!, §YАбрикосовой Лощине§!, и §YВесенней Поляне§! будет снижаться на §G-1%§!."
 
 KIR_plebiscite_rain_shine_tour:0 "Тур по севере"
-KIR_plebiscite_rain_shine_tour_desc:0 "Независимо от количества идеологических и теоретических разногласий, возникающих у киринов севера с ней, Рэйн Шайн по-прежнему является их верховным Матриархом и воплощением Конкорд в такой же степени, как и у любого другого существа. Она лично встретиться с жителями Провидения, наконец покинув свой дворец, чтобы благословить их. Быть может тогда, они решат остаться в составе Царства..."
+KIR_plebiscite_rain_shine_tour_desc:0 "Независимо от количества идеологических и теоретических разногласий, возникающих у киринов севера с ней, Рейн Шайн по-прежнему является их верховным Матриархом и воплощением Конкорд в такой же степени, как и у любого другого существа. Она лично встретиться с жителями Провидения, наконец покинув свой дворец, чтобы благословить их. Быть может тогда, они решат остаться в составе Царства..."
 KIR_plebiscite_rain_shine_tour_tt:0 "Поддержка §Yсеверного соглашения§! в §YРапсодии§!, §YИзумрудном Береге§!, §YСиянии§!, §YАбрикосовой Лощине§!, и §YВесенней Поляне§! снизится га §G-10%§!.\n"
 
 KIS_peace_of_massicot_decision:0 "Массикотский мир"
@@ -6558,16 +6570,16 @@ KIR_righteous_hoof_banner:0 "The Banner of the Righteous Hoof"
 KIR_righteous_hoof_banner_desc:0 "The Banner of the Righteous Hoof are the noble warriors tasked with bringing Concord's Light to the southlands. The zebras of Talarayi are a religious and devoted group, and deeply fear the so-called "Thunder Tiger" that lies within the temple. Under orders from the Kirian government, the Golden Temple is mostly left alone to prevent invoking the anger of the locals and their "guardian," but all other temples in the city area have been converted to temples to Concord, and mystics have swarmed the south, trying to draw any connection possible between Concord and the gods of the region, assigning Concord to the spirit of fire and of life. Regardless of their successes or failures, the members of this Banner are all religiously devout, and while corporations have influence over the Banner and the region, the mystics of the way of fire hold sway in this holy land."
 KIR_righteous_hoof_banner_TRAIT:0 "The Saviors of the South"
 
-KIR_form_vanguard_division_1:0 "Form the No. 1 Imperial Vanguard Division"
-KIR_form_vanguard_division_2:0 "Form the No. 2 Imperial Vanguard Division"
-KIR_form_vanguard_division_3:0 "No. 88 Armored Banner '§Yof the Rolling Thunder§!'"
-KIR_form_marine_division:0 "No. 108 Naval Banner '§Yof the Divine Wind§!'"
-KIR_raise_new_vanguard_division_tt:0 "A new £nato_unit_infantry_icon_small  §HImperial Vanguard§! Division will be formed with 10 §HKirin Vanguard§! battalions and §HArtillery§!, §HRecon§! and §HArtificer§! support companies."
-KIR_raise_armored_vanguard_division_tt:0 "Forms and Deploys the No. 88 Armored Banner '§Yof the Rolling Thunder§!', with 10 §HKirin Vanguard§! battalions, 5 §HMedium Tank§! battalions and §HArtillery§!, §HRecon§! and §HArtificer§! support companies.\n"
-KIR_raise_marine_division_tt:0 "Forms and Deploys the No. 108 Naval Banner '§Yof the Divine Wind§!' with 10 §HMarine§! battalions, 5 §HAmphibious Tank§! battalions and §HArtillery§!, §HRecon§! and §HArtificer§! support companies.\n"
-KIR_form_parachute_ranger_division:0 "No. 808 Airborne Banner '§Yof the Raging Easterly§!'"
-KIR_raise_parachute_ranger_division:0 "Forms and Deploys the No. 808 Airborne Banner '§Yof the Raging Easterly§!', with 15 §HParatroopers§! battalions and §HArtillery§!, §HRecon§! and §HArtificer§! support companies.\n"
-KIR_modern_conscription_tt:0 "The §HThousand Banners System§! Conscription Law may now be changed.\n"
+KIR_form_vanguard_division_1:0 "Сформировать 1-ую Имперскую Авангвардскую дивизию"
+KIR_form_vanguard_division_2:0 "Сформировать 2-ую Имперскую Авангвардскую дивизию"
+KIR_form_vanguard_division_3:0 "Танковое Знамя No. 88 '§YРаскатистый Гром§!'"
+KIR_form_marine_division:0 "Морское Знамя No. 108 '§YБожественный Ветер§!'"
+KIR_raise_new_vanguard_division_tt:0 "Новая дивизия £nato_unit_infantry_icon_small  §HИмперских Авангвардов§! будет сформирована с 10 батальонами §Hкиринских авангвардов§!, а также с §Hподдержкой артиллерии§!, §Hразведротой§! и §Hинженерной ротой§!."
+KIR_raise_armored_vanguard_division_tt:0 "Будет сформировано и развёрнуто танковое Знамя No. 88 '§YРаскатистый Гром§!', с 10 батальонами §Hавангвардов§!, 5 батальонами §Hсредних танков§! а также с §Hподдержкой артиллерии§!, §Hразведротой§! и §Hсапёрной ротой§!.\n"
+KIR_raise_marine_division_tt:0 "Будет сформировано и развёрнуто морское Знамя No. 108 '§YБожественный Ветер§!' с 10 батальонами §Hморской пехоты§!, 5 батальонами §Hтанков-амфибий§!, а также с §Hподдержкой артиллерии§!, §Hразведротой§! и §Hсапёрной ротой§!.\n"
+KIR_form_parachute_ranger_division:0 "Воздушно-десантное Знамя No. 808 '§YСвирепого Востока§!'"
+KIR_raise_parachute_ranger_division:0 "Будет сформировано и развёрнуто воздушно-десантное Знамя No. 808 '§YСвирепого Востока§!', с 15 батальонами §HВДВ§!, а также с §Hподдержкой артиллерии§!, §Hразведротой§! и §Hсапёрной ротой§!.\n"
+KIR_modern_conscription_tt:0 "Закон о призыве §HСистема тысячи Знамён§! теперь можно изменить.\n"
 
 ### Children of Concord ###
 COC_peasant_army:0 "Peasant Army"
@@ -6664,7 +6676,7 @@ COC_dayspring_4b:0 "Embrace the Conflagration"
 COC_dayspring_4b_desc:0 "Conflagration is Celestia's alternative personality -- fury, destruction, rage, and above all, power. But unlike a tyrant, Conflagration is a protector who uses her power to shield those she cares for from suffering. We too must learn to channel Conflagration's power, her righteous fury, and use it to fight for a freer future."
 COC_kindling_4a:0 "Paddy Field Guerillas"
 COC_kindling_4a_desc:0 "As the struggle for freedom drags on, we have to ask more and more of our freedom fighters in the field. It is not enough to merely fight the NAKP in the open; we need to operate behind their lines, no matter the danger. Sacrifices must be made, and when every mile of ground is a battlefield, even deep behind enemy lines, we will have to make a lot of sacrifices."
-COC_kindling_4a_tt:0 "Unlocks £decision_icon_small §YGuerilla Strike§! Decisions, which inflicts §YOrganisation§! and §YStrength§! Damage to §Renemy divisions§! in selected states."
+COC_kindling_4a_tt:0 "Нам станут доступны решения £decision_icon_small §Yпартизанские удары§!, негативно влияющие на §Yорганизацию§! и §Yпрочность§! §Rврага§! в выбранных регионах."
 COC_guerilla_strike_decision:0 "Guerilla Strike in [From.GetName]"
 COC_guerilla_strike_decision_desc:0 "[From.GetName] is being used by the NAKP to supply their troops with equipment and keep their forces in the field at peak fighting strength. Guerilla strikes on vulnerable targets in the area will significantly weaken the fighting capabilities of any divisions stationed in its borders."
 COC_guerilla_strike_cost:0 "£command_power  §Y10§! £manpower_icon  §Y1500§!"
@@ -6679,11 +6691,11 @@ COC_finale:0 "We Are Free"
 COC_finale_desc:0 "Through great struggle and sacrifice, we have achieved what many claimed impossible. We have forged a Kiria free from the NAKP's tyrannical and oppressive rule. But now that the fighting is done, what next? How will we use our success in wartime to shape a successful Kiria during peace?"
 COC_uprising_tt:0 "Peasant Uprising"
 
-KIS_strategic_denial_doctrine:0 "Devastate [From.GetName]"
-KIS_strategic_denial_doctrine_desc:0 "[From.GetName] is a haven for rebels and partisans, supplying them with equipment, food, and fresh bodies. For that, they must suffer the consequences. [FROM.GetName] will be rendered inhospitable, denying the rebels anything they could use to sustain the fight against us."
-KIS_strategic_denial_modifier:0 "Scorched Earth"
-KIS_strategic_denial_doctrine_unlock_tt:0 "Unlocks £decision_icon_small §YStrategic Denial§! Decisions, which executes §Rscorched earth§! operations in selected states."
-KIS_COC_corporate_aid:0 "Corporate Supplies"
+KIS_strategic_denial_doctrine:0 "Опустошить регион [From.GetName]"
+KIS_strategic_denial_doctrine_desc:0 "[From.GetName] - это прибежище повстанцев и партизан, снабжающее их снаряжением, продовольствием и свежими рекрутами. За это они должны понести наказание. [FROM.GetName] больше не сможет поддерживать наших врагов."
+KIS_strategic_denial_modifier:0 "Выжженная земля"
+KIS_strategic_denial_doctrine_unlock_tt:0 "Нам станут доступны решения £decision_icon_small §YВыжженная земля§!, которое позволяет проводить операцию §Rвыжженная земля§! в выбранных регионах."
+KIS_COC_corporate_aid:0 "Корпоративные припасы"
 
 ### Techs ###
 KIR_anti_bandit_doctrine:0 "Антибандитская доктрина"
@@ -6888,8 +6900,8 @@ CFR_fascism_name_long:0 "Мейн Хайв Индастриз - Ост-Зебр
 CFR_fascism_name:0 "МХИ"
 CFR_fascism_name_A_long:0 "Хайвсколониаламт Ной Оления"
 CFR_fascism_name_A:0 "Хайвсколониаламт"
-CFR_fascism_name_B_long:0 "Высшее Командование Ост-Зебрики"
-CFR_fascism_name_B:0 "Высшее Командование ОЗ"
+CFR_fascism_name_B_long:0 "Верховное Командование Ост-Зебрики"
+CFR_fascism_name_B:0 "Верховное Командование ОЗ"
 
 KIR_neutrality_bloc_party:0 "ФНдУЦ"
 KIR_neutrality_bloc_party_long:0 "Форум неприсоединения для улучшения Царства"
@@ -6909,7 +6921,7 @@ KIR_cannot_leave_united_front_conditional:0 "Мы не сможем выйти 
 KIR_FAIL_FACTION:0 "Коалиция защиты Царства"
 KIS_FAIL_FACTION:0 "Патриотический революционный альянс"
 KIC_FAIL_FACTION:0 "Союз освобождения Кирии"
-FRV_SECOND_REPUBLIC:0 "Вторая киринская республика"
+FRV_SECOND_REPUBLIC:0 "Вторая кирийская республика"
 FRV_LEAGUE_FOR_A_SECOND_REPUBLIC:0 "Комитет второй республики"
 FRV_kirin_confederacy_member:0 "Мы являемся государством-членом, входящим в состав §Yвторой киринской республики§!."
 ZAI_KIR_TRI:0 "Тройка Зай-Кир"
@@ -6974,7 +6986,7 @@ LMB_KIR_DEF:0 "Алое Вице-королевство Ламбета"
 LMB_KIR_ADJ:0 "Ламбетск"
 KIS_KIR:0 "Вице-королевство Провидения"
 KIS_KIR_DEF:0 "Алое Вице-королевство Великого Провидения"
-KIS_KIR_ADJ:0 "Провиденск"
+KIS_KIR_ADJ:0 "Провиденческ"
 KIS_AUB_KIR:0 "ИМЭЗ Южной Кирии"
 KIS_AUB_KIR_DEF:0 "Исключительная Морская Экономическая Зона Южной Кирии"
 KIS_AUB_KIR_ADJ:0 "Кирийск"
@@ -7031,12 +7043,12 @@ CFR_HKH:0 "Хайвс-Колони Ной Оления"
 CFR_HKH_DEF:0 "Протекторат Хайвс-Колони Ной Оления"
 CFR_HKH_ADJ:0 "Зебрикано-чейнджлингск"
 CFR_PSZ:0 "Морской Протекторат Дальнего Юга и Зебридов"
-CFR_PSZ_DEF:0 "Маринепротекторат Фернзюд унд ди Цебриден"
+CFR_PSZ_DEF:0 "Маринепротекторат Фернзюд унд ди Зебриден"
 CFR_PSZ_ADJ:0 "Зебрикано-чейнджлингск"
 CFR_MHI:0 "Холдинги Восточной Зебрики МХИ"
 CFR_MHI_DEF:0 "Мейн Хайв Индастриз Ост-Зебрика Холдинг-Гезельшафт"
 CFR_MHI_ADJ:0 "Зебрикано-чейнджлингск"
-CFR_SKZ:0 "Шуцкорпс Цуйд-Цебриканше"
+CFR_SKZ:0 "Шуцкорпс Зюйд-Зебриканше"
 CFR_SKZ_DEF:0 "Южно-Зебриканский Чейнджлингско-Грифоний Корпус Защиты"
 CFR_SKZ_ADJ:0 "Южно-Зебриканск"
 CFR_VPD:0 "Феспиде-Корпс Милитергренце"
@@ -7184,82 +7196,82 @@ HOC:0 "ОБГ Гиацинт"
 HOC_DEF:0 "Открытый Береговой Город Гиацинт" # Так-то Прибрежный Город, но тогда аббревиатура выходит ОПГ, что вызывает не те ассоциации
 HOC_ADJ:0 "Гиацинтов"
 
-FRV_council_leader:0 "Revolutionary Council"
-FRV_council_leader_desc:0 "§YPortrait by:§! Caspy §Y&§! Egil"
-FRV_council_leader_fragrance_assembly:0 "Fragrance Assembly"
-FRV_council_leader_fragrance_assembly_desc:0 "§YPortrait by:§! Tofkov"
-FRV_council_leader_committee:0 "Federative Committee"
-FRV_council_leader_committee_desc:0 "§YPortrait by:§! Caspy"
-FRV_adv_0:0 "Brown Beurré"
-FRV_adv_0_desc:0 "A well-travelled mare from Aquila, Brown Beurré was less interested in pursuing the lofty liberal ideals of Aquileia's revolutionaries than she was in meeting and writing about the common creatures in all of the far-flung ports she visited. Taking up her pen, she became a travel journalist, catching ships to cities all across southern Griffonia, and eventually Zebrica. She might stay a few weeks or months, doing odd jobs and living with the lower classes while writing about their struggles and publishing her stories wherever she could.\n\nIn late 1006, when the news began to trickle out that Matriarch Superior Rain Shine had broken Kiria's long Silence, Brown Beurré eagerly sought passage aboard one of the first ships cautiously making their way to the reopened port of Fragrance.\n\nWhat she found shocked her. The common kirin in Fragrance was destitute, the city itself a shell of its former fame as the pearl of Kiria's north. And though Fickle Current and the NAKP never stopped talking about standing up for Fragrance's interests, Brown Beurré saw things a different way.\n\nLong hours, in dangerous factories, for pitiful pay, under the baton of some industrialist's foremare – that was a story that she had seen before, in a dozen other cities. But she arrived in Fragrance while Kiria was reckoning with itself, trying to decide what kind of country it wanted to be. Even more inspiring were the charity and hospitality of the city's lower classes, who despite having almost nothing, were always ready to share. She resolved to stay in Fragrance and do what she could to nudge the country in a better direction for the burgeoning masses of the growing city.\n\nShe put her pen to work, calling attention to the appalling treatment and living conditions of many of Fragrance's poorest, and though the NAKP often tried to shut her down, she found her ways of slipping through their hooves each time.\n\nNow, she finds herself thrust into a revolution that she had no small part in stoking but was totally unprepared for. With the city in revolt, her loyal readers are now manning the barricades and fighting for everything that she had urged them to stand up for – and though she has never held a rifle, Beurré knows that she owes a duty to this city, the first place in her life she truly feels might be her home."
-FRV_adv_1:0 "Paper Brush"
-FRV_adv_2:0 "Melon Pan"
-FRV_adv_3:0 "Gael Gingernape"
-FRV_adv_3_available:0 "Unlocked Gael Gingernape"
-FRV_adv_4:0 "Pomelo"
-FRV_adv_5:0 "Winter Flame"
-FRV_adv_6:0 "Arbutus"
-FRV_adv_7:0 "Deep Glade"
-FRV_adv_8:0 "Hartshorn"
-FRV_adv_8_available:0 "Unlocked Hartshorn"
-FRV_adv_9:0 "Sparkling Brook"
-FRV_adv_10:0 "Maple Burn"
-FRV_adv_11:0 "Thyme Bloom"
-FRV_adv_11_desc:0 "Upon searching deeper into the family ties of Thyme Bloom, the Revolutionary Council has discovered her links to the Crane Corporation and its Mallow family. It seems Thyme was born into the Mallow family, but married into the Bloom family, and deliberately attempted to conceal her heritage when trying to work with us. Is this because she feels ashamed of her family? Is this because of Crane's former association with the NAKP? The Council can't be sure. All we know is Crane may now have a "fold" in our revolution, or maybe they always did."
-FRV_adv_11_available:0 "Unlocked Thyme Bloom"
-FRV_adv_12:0 "Summer Spice"
-
-KIR_FRV_uprising_modifier_tooltip:0 "Fragrance in Revolt"
-KIR_FRV_uprising_modifier:0 "Fragrance in Revolt"
+FRV_council_leader:0 "Революционный совет"
+FRV_council_leader_desc:0 "§YАвторы портрета:§! Caspy §Y&§! Egil"
+FRV_council_leader_fragrance_assembly:0 "Ассамблея Благоухания"
+FRV_council_leader_fragrance_assembly_desc:0 "§YАвтор портрета:§! Tofkov"
+FRV_council_leader_committee:0 "Федеративный комитет"
+FRV_council_leader_committee_desc:0 "§YАвторы портрета:§! Caspy"
+FRV_adv_0:0 "Браун Берре"
+FRV_adv_0_desc:0 "Браун Берре родом из Аквелии. Она немало путешествовала,  но не чтобы преследовать либеральные идеалы аквелийских революционеров, а для того, чтобы встречать простых существ в различных далёких портах и писать о них. Взявшись за перо, Берре стала журналисткой-путешественницей. Она посещала по морю многие города южной Грифонии, а затем и Зебрики. Она могла оставаться в порту по нескольку недель или месяцев, подрабатывая там и живя среди низших слоев населения. Берре писала о трудностях этих бедных существ и публиковала свои рассказы везде, где только могла.\n\nВ конце 1006 года, когда стало известно, что матриарх Рейн Шайн начала отменять указы Безмолвия, Браун Берре с нетерпением стала искать место на борту одного из первых кораблей, что осторожно направлялись в сторону вновь открытого порта Благоухание.\n\nТо, что она обнаружила, повергло её в шок. Простые кирины в Благоухании нищенствовали, а сам город едва ли был похож на былую жемчужину севера Кирии. И хотя Фикл Каррент и НАКП не переставали говорить о том, что отстаивают интересы Благоухания, Браун Берре считала иначе.\n\nДолгие часы работы на опасных заводах за жалкие гроши под палкой надсмотрщика - такую историю она уже видела в десятках других городов. Но она приехала в Благоухание как раз в то время, когда Кирия пыталась решить, какой страной она хочет быть. Ещё больше Берре вдохновляли благотворительность и гостеприимство городских низов, которые, не имея почти ничего, всегда были готовы поделиться. Она решила остаться в Благоухании и сделать всё возможное, чтобы направить страну на тот путь, что улучшит положение населения этого растущего города.\n\nОна пустила в ход своё перо, привлекая внимание к ужасающему обращению и условиям жизни многих бедняков Благоухания. И хотя НАКП часто пыталась заткнуть её, Берре каждый раз находила способы ускользнуть из их копыт.\n\nТеперь она оказалась втянута в революцию, в разжигании которой она приняла определённое участие, но к которой оказалась совершенно не готова. Город охвачен восстанием, её верные читатели стоят на баррикадах и борются за всё, за что она призывала их выступать. И хотя Берре никогда не держала в копытах винтовку, кобыла знает, что она обязана выполнить долг перед этим городом - первым местом в её жизни, которое она действительно считает своим домом."
+FRV_adv_1:0 "Пэйпер Браш"
+FRV_adv_2:0 "Мэлон Пэн"
+FRV_adv_3:0 "Гейл Джинджернайп"
+FRV_adv_3_available:0 "Гейл Джинджернайп доступен"
+FRV_adv_4:0 "Помело"
+FRV_adv_5:0 "Винтер Флейм"
+FRV_adv_6:0 "Арбутус"
+FRV_adv_7:0 "Дип Глейд"
+FRV_adv_8:0 "Хартшорн"
+FRV_adv_8_available:0 "Хартшорн доступен"
+FRV_adv_9:0 "Спарклинг Бук"
+FRV_adv_10:0 "Мэйпл Бёрн"
+FRV_adv_11:0 "Тим Блум"
+FRV_adv_11_desc:0 "Изучив семейные связи Тим Блум, Революционный Совет обнаружил её связи с корпорацией Крейн и семьей Мэллоу. Похоже, что Тим родилась в семье Мэллоу, но вышла замуж за Блума и намеренно попыталась скрыть своё происхождение, когда попыталась работать с нами. Потому что она стыдится своей семьи? Или это связано с тем, что Крейн ранее сотрудничал с НАКП? Совет не знает точного ответа. Мы знаем лишь то, у Крейна теперь может быть "своя киринша" в нашей революции."
+FRV_adv_11_available:0 "Тим Блум доступна"
+FRV_adv_12:0 "Саммер Спайс"
+
+KIR_FRV_uprising_modifier_tooltip:0 "Революция в Благоухании"
+KIR_FRV_uprising_modifier:0 "Революция в Благоухании"
 #KIR_FRV_uprising_modifier_desc:0 ""
-Fragrance_Land_Forts_Modifier:0 "§YFragrance§! Land Forts"
-FRV_bunkers_tt:0 "\nOnce the §YFragrance in Revolt§! modifier is removed, §Rthe land forts will be removed as well.§!"
-KIR_FRV_uprising_modifier_duration_1_tt:0 "Increase duration of '§HFragrance in Revolt§!' by §Y10§! days."
-KIR_FRV_uprising_modifier_duration_2_tt:0 "Increase duration of '§HFragrance in Revolt§!' by §Y75§! days."
-KIR_FRV_uprising_modifier_duration_A_tt:0 "§RDecrease§! duration of '§HFragrance in Revolt§!' by §R7§! days."
+Fragrance_Land_Forts_Modifier:0 "Наземные бункеры §YБлагоухания§!"
+FRV_bunkers_tt:0 "\nКак только модификатор §YРеволюция в Благоухании§! будет удалён, §Rвместе с ним будут удалены и наземные бункеры.§!"
+KIR_FRV_uprising_modifier_duration_1_tt:0 "Увеличит длительность '§HРеволюции в Благоухании§!' на §Y10§! дней."
+KIR_FRV_uprising_modifier_duration_2_tt:0 "Увеличит длительность '§HРеволюции в Благоухании§!' на §Y75§! days."
+KIR_FRV_uprising_modifier_duration_A_tt:0 "§RПонизит§! длительность '§HРеволюции в Благоухании§!' на §R7§! дней."
 
-KIR_FRV_upheaval_modifier:0 "Social Upheaval"
+KIR_FRV_upheaval_modifier:0 "Социальные потрясения"
 #KIR_FRV_upheaval_modifier_desc:0 ""
-KIR_FRV_upheaval_modifier1:0 "Social Transformation"
+KIR_FRV_upheaval_modifier1:0 "Социальные изменения"
 #KIR_FRV_upheaval_modifier1_desc:0 ""
-KIR_FRV_upheaval_modifier_name:0 "Social [GetUpheavalModifierName]"
-GetUpheavalModifierName0:0 "Upheaval"
-GetUpheavalModifierName1:0 "Transformation"
-KIC_FRV_revolt:0 "The Fragrancese Threat"
-KIC_FRV_revolt_modifier:0 "\n  - Surrender Limit"
-KIC_FRV_revolt_desc:0 "Revolutionary Fragrance, a uprising not of the right or by exiled elites of the old regime but from the left and the grassroots, poses a more significant and existential threat to Rising Fire rule over Kiria than any NAKP or Autumnal resurgence."
-FRV_rouse_support_decision:0 "Fragrancese Emissaries"
-FRV_rouse_support_decision_desc:0 "We will dispatch Fragrancese Emissaries to [FROM.GetName] to spread the word of our revolt against the tyranny of the Rising Fire, whose censorship must never be allowed to bury the truth!"
-FRV_rouse_support_decision_tt:0 "Unlocks Decision £decision_icon_small §YSet Up a Regional Assembly§! in [FROM.GetName], which §Gturns it into a core state§!."
-FRV_support_for_fragrance_modifier:0 "Pro-Fragrancese Sentiment"
+KIR_FRV_upheaval_modifier_name:0 "Социальные [GetUpheavalModifierName]"
+GetUpheavalModifierName0:0 "потрясения"
+GetUpheavalModifierName1:0 "изменения"
+KIC_FRV_revolt:0 "Угроза Благоухания"
+KIC_FRV_revolt_modifier:0 "\n  - Лимит капитуляции"
+KIC_FRV_revolt_desc:0 "В революционном Благоухании восстали не правые и не изгнанная элита старого режима. Там бунтуют левые и самые низы общества, но их мятеж представляет собой куда более существенную и экзистенциальную угрозу для власти Разоряющегося Пламени над Кирией, чем НАКП или сторонники Отэм."
+FRV_rouse_support_decision:0 "Эмиссары Благоухания"
+FRV_rouse_support_decision_desc:0 "Мы отправим эмиссаров Благоухания в регион [FROM.GetName], чтобы распространить информацию о нашем восстании против тирании Разоряющегося Пламени, чьей цензуре мы не позволим похоронить правду!"
+FRV_rouse_support_decision_tt:0 "Разблокирует решение £decision_icon_small §YСоздать региональную ассамблею§! в регионе [FROM.GetName], что §Gнационализирует его§!."
+FRV_support_for_fragrance_modifier:0 "Поддержка Благоухания"
 #FRV_support_for_fragrance_modifier_desc:0 ""
-FRV_add_core_decision:0 "Set Up a Regional Assembly"
-FRV_add_core_decision_desc:0 "Our emissaries will help the local kirin of [FROM.GetName] to set up a Regional Assembly for their own self-governance and self-defence."
-FRV_join_faction_decision:0 "Join the [FROM.GetFactionName]"
-FRV_join_faction_decision_desc:0 "Request to join the faction of [FROM.GetName]."
-FRV_regain_modifier:0 "The Revolution Secure"
+FRV_add_core_decision:0 "Создать региональную ассамблею"
+FRV_add_core_decision_desc:0 "Наши эмиссары помогут киринам региона [FROM.GetName] создать местную ассамблею для самоуправления и самообороны."
+FRV_join_faction_decision:0 "Присоединиться к альянсу [FROM.GetFactionName]"
+FRV_join_faction_decision_desc:0 "Отправить запрос на вступление в альянс [FROM.GetName]."
+FRV_regain_modifier:0 "Революция в безопасности"
 #FRV_regain_modifier_desc:0 ""
-FRV_regain_modifier_req_tt:0 "[FRV.GetNameDefCap] controls at least §Yfive§! (§Y5§!) states across §YNorth Kiria§! and §YGreater Providence§!."
-KIR_FRV_revolution_modifier:0 "Revolutionary Fragrance"
+FRV_regain_modifier_req_tt:0 "[FRV.GetNameDefCap] контролирует как минимум §Yпять§! (§Y5§!) регионов в §YСеверной Кирии§! и §YВеликом Провидении§!."
+KIR_FRV_revolution_modifier:0 "Революционное Благоухание"
 KIR_FRV_revolution_modifier_desc:0 ""
-FRV_local_supplies:0 "Abundant Supplies"
+FRV_local_supplies:0 "Обильные запасы"
 #FRV_local_supplies_desc:0 ""
-FRV_army_civic:0 "The Army Civic"
+FRV_army_civic:0 "Гражданская армия"
 #FRV_army_civic_desc:0 ""
-FRV_embargoed:0 "The Vermilion Embargo"
+FRV_embargoed:0 "Эмбарго Киновари"
 #FRV_embargoed_desc:0 ""
-FRV_reconcile_with_contumacy:0 "Reconcile with the Contumacy"
-FRV_reconcile_with_contumacy_desc:0 "The tyrant Rising Sun is gone. Dear brethren, let go of your fury and sorrow, and rejoin your fellow kirin as citizens of the new and free Kiria."
-FRV_sound_the_call:0 "Sound the Call of Revolution"
-FRV_sound_the_call_tt:0 "The downtrodden and the defiant, the repressed and the recalcitrant, the commonkirin and the true revolutionaries, will §Yrise up across Kiria§! to §Ooverthrow§! the §Rtyrant Rising Sun!§!\n"
-FRV_sound_the_call_req:0 "Has at least §Ythree§! (§Y3§!) core states or has dispatched §OFragrancese Emissaries§! to at least §Yfive§! (§Y5§!) states."
-FRV_raise_militias:0 "Raise Volunteer Militias"
-FRV_raise_militias_tt:0 "Two Brigades of §Y[FROM.GetName] Volunteer Militia§! will be formed and deployed.\n"
-
-FRV_TB1_tt:0 "The Minutiae of Resistance"
-FRV_TB2_tt:0 "The Minutiae of Freedom"
-FRV_TB3_tt:0 "What Is to Be Done?"
-FRV_TB4_tt:0 "The Post-Revolutionary Future"
+FRV_reconcile_with_contumacy:0 "Примириться с Непокорностью"
+FRV_reconcile_with_contumacy_desc:0 "Тиранши Райзин Сан больше нет. Братья и сёстры, отпустите свою ярость и печаль и присоединитесь к своим собратьям-киринам как граждане новой и свободной Кирии."
+FRV_sound_the_call:0 "Призыв революции"
+FRV_sound_the_call_tt:0 "Угнетенные и дерзкие, репрессированные и непокорные, простые кирины и настоящие революционеры, §Yвосстаньте по всей кирии§!, чтобы §Oсвергнуть§! §Rтираншу Райзин Сан!§!\n"
+FRV_sound_the_call_req:0 "Есть как минимум §Yтри§! (§Y3§!) национальных региона или §Oэмиссары Благоухания§! отправлен в как минимум §Yпять§! (§Y5§!) регионов."
+FRV_raise_militias:0 "Сформировать добровольческое ополчение"
+FRV_raise_militias_tt:0 "Будет сформировано и развёрнуто две бригады §Yдобровольческого ополчения из региона [FROM.GetName]§!.\n"
+
+FRV_TB1_tt:0 "Детали сопротивления"
+FRV_TB2_tt:0 "Детали свободы"
+FRV_TB3_tt:0 "Что должно быть сделано?"
+FRV_TB4_tt:0 "Послереволюционное будущее"
 
 FRV_Focus_1:0 "Вооружённые гражданские"
 FRV_Focus_1_desc:0 "Наш первоначальный успех был обусловлен пылом, внезапностью и немалой долей везения. Нам нужно перегруппироваться, подвести итоги и сформировать несколько боеспособных соединений киринов, готовых сражаться."
@@ -7272,21 +7284,21 @@ FRV_Focus_4_desc:0 "Благоухание - самый многонациона
 FRV_Focus_5:0 "Кому нужна полиция?"
 FRV_Focus_5_desc:0 "Силы бывшей полиции Благоухания вооружены и обучены, но до сих пор не задействованы. Создание бригады из полицейских могло бы укрепить фронт, но это наверняка разозлит некоторых наиболее радикально настроенных делегатов Совета."
 FRV_Focus_6:0 "Порождение партии"
-FRV_Focus_6_desc:0 "Организованной защитой Благоухания управляет бывший командующий НАКП Альпенштрайн. Она очень опытна, но рано или поздно нам придётся столкнуться с её... сомнительными убеждениями."
+FRV_Focus_6_desc:0 "Организованной защитой Благоухания управляет бывшая командующая НАКП Альпенштрайн. Она очень опытна, но рано или поздно нам придётся столкнуться с её... сомнительными убеждениями."
 FRV_Focus_7:0 "Ковчеги Благоухания"
 FRV_Focus_7_desc:0 "Тысячи беженцев пытаются сбежать из Благоухания морем, но ситуация в гавани превращается в хаос. Нужно что-то делать, иначе начнётся давка."
 FRV_Focus_8:0 "Революция в отдельно взятом городе?"
-FRV_Focus_8_desc:0 "Некоторые в Совете считают, что положение Благоухания безнадёжно без помощи из вне и предлагают нам призвать остальные владения Провидения присоединиться к нашей революции. Конечно, это не бесспорный вопрос..."
+FRV_Focus_8_desc:0 "Некоторые в Совете считают, что положение Благоухания безнадёжно без помощи извне и предлагают нам призвать остальные владения Провидения присоединиться к нашей революции. Конечно, это не бесспорный вопрос..."
 FRV_Focus_9:0 "Конфисковать банковские активы"
 FRV_Focus_9_desc:0 "НАКП оставила в городе довольно много золота. При правильном подходе оно могло бы послужить на благо революции, но политика, связанная с этой неожиданной прибылью, должна быть, мягко говоря, деликатной."
 FRV_Focus_10:0 "Упразднить Магистратуру"
-FRV_Focus_10_desc:0 "Слишком долго священнослужители Благоухания угнетали, корыстничали и вероломствовали. Пришло время Совету осудить тех, кто потратил свою жизнь на осуждение Благоухания."
+FRV_Focus_10_desc:0 "Слишком долго священнослужители Благоухания угнетали, копили богатства и сотрудничали с властями. Пришло время Совету вынести приговор тем, кто всю свою жизнь судил Благоухание."
 FRV_Focus_11:0 "Разорвать цепи"
 FRV_Focus_11_desc:0 "Мы провозгласили себя независимыми, но что значит независимость? Подтолкнув Революционный Совет к формализации и закреплению прав, за которые мы боремся, было бы легче сплотиться вокруг нашего дела."
 FRV_Focus_12:0 "Военные советы"
 FRV_Focus_12_desc:0 "Становится очевидным, что войскам действительно нужны офицеры. Революционный Совет должен поощрять выборы командиров в подразделениях и оказывать поддержку этим новым военачальникам Благоухания."
 FRV_Focus_13:0 "Знай своего врага"
-FRV_Focus_13_desc:0 "Захваченные пленные Разгорающегося Пламени ненавистны в Благоухании, и мы берём их всё больше. Совет должен решить, что мы собираемся делать с пехотинцами Райзин Сан, или толпа решит за нас."
+FRV_Focus_13_desc:0 "Захваченных пленных Разгорающегося Пламени ненавидят в Благоухании, и мы берём их всё больше. Совет должен решить, что мы собираемся делать с пехотинцами Райзин Сан, или толпа решит за нас."
 FRV_Focus_14:0 "Средства производства"
 FRV_Focus_14_desc:0 "Наша военная экономика лежит в руинах и Революционный Совет полон решимости всё исправить. Но должны ли мы провести коллективизацию, или полагаться на то, что осталось от корпораций, оставленных НАКП?"
 FRV_Focus_15:0 "Новые общины" ##Economic Collectivisation
@@ -7302,7 +7314,7 @@ FRV_Focus_178_desc:0 "Мы завоевали свою свободу, но зн
 FRV_Focus_178_tt:0 "\nРазблокирует £decision_icon_small решения по §Yприсоединению к альянсам§! возглавляемым §Cгармонистскими§! или §Rкоммунистическими§! странами."
 FRV_Focus_18:0 "Перемирие между Севером и Югом"
 FRV_Focus_18_desc:0 "По сути, наша борьба связана с древним разделением между Великим Провидением и остальной Кирией. Мы надеемся, что наши недавние успехи на поле боя заставили Разгорающееся Пламя поверить в то, что предоставить нам независимость будет проще, чем пытаться завоевать регион."
-FRV_Focus_19:0 "Всекиринский Союз"
+FRV_Focus_19:0 "Всекирийский Союз"
 FRV_Focus_19_desc:0 "Взяв под контроль все основные населённые пункты старого Царства, мы сможем окончательно положить конец сомнительным заявлениям Райзин Сан о построении коммунизма в Кирии. С её поражением мы сможем начать внедрять подлинные социалистические принципы по всей стране."
 FRV_all_kirian_cities_req_tt:0 "[ROOT.GetNameDefCap] контролирует §Yвсе §Yвосемь§! (§Y8§!) основных городов Кирии§!."
 FRV_Focus_19a:0 "Власть провинциям"
@@ -7313,42 +7325,42 @@ FRV_Focus_19b_desc:0 "Возможно, в конечном счёте это б
 FRV_Focus_19b_tt:0 "\n@KIC §YКиндлинг Флэш§!, §YДейспринг Роуз§!, §YЭмбер Глоу§!, §YКорал Ривер§!, §YЦитронелла Блейз§!, §YФайри Азалия§! и §YСэйдж Снут§! присоединятся к государству [ROOT.GetFlag] [ROOT.GetNameDef]."
 FRV_Focus_20:0 "Хвост виляет собакой"
 FRV_Focus_20_desc:0 "Довольно вялых высказываний об автономии провинций. Демонтаж Киринского государства, предоставление провинциям максимально возможной свободы и правление конфедерацией региональных правительств - это единственное средство профилактики тирании."
-FRV_Focus_20_tt:0 "Мы заложим §YВторую Киринскую Республику§!, состоящую из [?KIRGetKSRConstituents|0Y] входящих в состав государств-членов во главе с §Y[ROOT.GetNameDef]§!:\n  - £FRK_flag Братская Республика Кирия\n  - £CHY_flag Правительства Хризантемы\n  - £RHP_flag Прокуратуры Рапсодии\n  - £CAP_flag Правительства Сайси\n  - £PAT_flag Армии тракта Нижнего Провидения\n  - £RAD_flag Коммуны рабочих, солдат и матросов Сияния\n  - £SGM_flag Революционного штаба Центральной Кирии\n  - £SRM_flag Шторма Алой Реки\n  - £PRB_flag Знамени Красного Пролетариата\n  - £NWL_flag Лиги Юго-Восточных провинций\n  - £VER_flag Небесного мандата Зеленеющего\n  - £UKP_flag Союза крестьян Кирии\n  - £SBC_flag Братья меча Конкорд"
-FRV_KSR_BSM_tt:0 "  - £BSM_flag  Supervisorate of Blossom"
-FRV_KSR_CRZ_tt:0 "  - £CRZ_flag  Federal Kirin's Republic of Zaikiria"
-FRV_KSR_MCR_tt:0 "  - £MCR_flag  Madrepore Council Republic"
-FRV_KSR_MCT_tt:0 "  - £MCT_flag  Monastic Commune of Taungpau"
-FRV_whole_again_broke_again:0 "The §YKirian Second Republic§! has been formed with §Y18§! constituent member-states."
-FRV_forces_withdraw:0 "All [FRV.GetAdjective] forces in Kiria will §Ywithdraw§! to Fragrance." ##14 is a highly inauspicious number
-FRV_forces_withdraw_GP_NK:0 "If the peace negotiations are successful, all [FRV.GetAdjective] forces in southern Kiria will §Ywithdraw§! to Fragrance."
-FRV_regain_modifier_ask_for_peace_tt:0 "We will enter §Ypeace negotiations§! with [KIC.GetFlag] §R[KIC.GetNameDef]§!. Our goal will be §Ythe independence of Fragrance from Kiria§!, and §Yan end to the war§!."
-FRV_regain_modifier_ask_for_peace_tt_GP_NK:0 "We will enter §Ypeace negotiations§! with [KIC.GetFlag] §R[KIC.GetNameDef]§!. Our goal will be §Ythe independence of North Kiria and Greater Providence from [KIC.GetNameDef]§!, and §Yan end to the war§!."
-FRV_Focus_21:0 "A Federation of Councils"
-FRV_Focus_21_desc:0 "Socialism and harmony must permeate every facet of our lives, from the plenary chamber to the dinner table. We all share the same fate, so we must all share in the privilege of choosing it and the work of realizing it."
-FRV_Focus_22:0 "Universal Declaration of Creatures' Rights"
-FRV_Focus_22_desc:0 "We will tolerate no intolerance, and shun only those who shun their comrades. In no uncertain terms, we will lay out our manifesto for the absolute equality of all creatures and our intention to fight for it."
-FRV_Focus_23:0 "Revive Fragrancese Industry"
-FRV_Focus_23_desc:0 "Our beloved Fragrance has been brutalized by a century of neglect and a decade of conflict. But we will rebuild it as a shining example of a modern workers' city, the new industrial capital of not just Kiria but Zebrica!"
-FRV_Focus_23_tt:0 "\nEvery §Yforty§! (§Y40§!) days, for §Y365§! days:"
+FRV_Focus_20_tt:0 "Мы заложим §YВторую Кирийскую Республику§!, состоящую из [?KIRGetKSRConstituents|0Y] входящих в состав государств-членов во главе с §Y[ROOT.GetNameDef]§!:\n  - £FRK_flag Братская Республика Кирия\n  - £CHY_flag Правительство Хризантемы\n  - £RHP_flag Прокуратура Рапсодии\n  - £CAP_flag Правительство Сайси\n  - £PAT_flag Армия тракта Нижнего Провидения\n  - £RAD_flag Коммуна рабочих, солдат и матросов Сияния\n  - £SGM_flag Революционный штаб Центральной Кирии\n  - £SRM_flag Шторм Алой Реки\n  - £PRB_flag Красное Знамя Пролетариата\n  - £NWL_flag Лига Юго-Восточных провинций\n  - £VER_flag Небесный мандата Зеленеющего\n  - £UKP_flag Союз крестьян Кирии\n  - £SBC_flag Братья меча Конкорд"
+FRV_KSR_BSM_tt:0 "  - £BSM_flag  Супервизорство Бутона"
+FRV_KSR_CRZ_tt:0 "  - £CRZ_flag  Федеративная Народная Республика Зайкирия"
+FRV_KSR_MCR_tt:0 "  - £MCR_flag  Советская Республика Звёздчатого Коралла"
+FRV_KSR_MCT_tt:0 "  - £MCT_flag  Монастырская Коммуна Таунгпау"
+FRV_whole_again_broke_again:0 "§YВторая Кирийская Республика§! была сформирована с §Y18§! входящими в неё государствами-членами."
+FRV_forces_withdraw:0 "Все [FRV.GetAdjective]ие силы в Кирии будут §Yотозваны§! в Благоухание." ##14 is a highly inauspicious number
+FRV_forces_withdraw_GP_NK:0 "Если мирные переговоры пройдут успешно, все [FRV.GetAdjective]ие силы в южной Кирии будут Yотозваны§! в Благоухание."
+FRV_regain_modifier_ask_for_peace_tt:0 "Мы начнём §Yпереговоры о мире§! с государством [KIC.GetFlag] §R[KIC.GetNameDef]§!. Наши цели: §Yнезависимость Благоухания от Кирии§! и §Yпрекращение войны§!."
+FRV_regain_modifier_ask_for_peace_tt_GP_NK:0 "Мы начнём §Yпереговоры о мире§! с государством [KIC.GetFlag] §R[KIC.GetNameDef]§!. Наши цели: §Yнезависимость Северной Кирии и Великого Провидения от государства [KIC.GetNameDef]§! и §Yпрекращение войны§!."
+FRV_Focus_21:0 "Федерация Советов"
+FRV_Focus_21_desc:0 "Социализм и гармония должны пронизывать все стороны нашей жизни - от пленарного заседания до обеденного стола. У всех нас одна судьба, и поэтому мы должны разделить привилегию её выбора и труд по её реализации."
+FRV_Focus_22:0 "Всеобщая декларация прав существ"
+FRV_Focus_22_desc:0 "Нетолерантность неприемлема и будем нетерпимы лишь к тем, кто сами сторонятся своих товарищей. Мы недвусмысленно изложим эти взгляды в нашем манифесте абсолютного равенства всех существ, а также заявим о намерении бороться за него."
+FRV_Focus_23:0 "Возродить промышленность Благоухания"
+FRV_Focus_23_desc:0 "Наше любимое Благоухание пострадало от столетнего запустения и десятилетнего конфликта. Но мы восстановим его и сделаем ярким примером современного рабочего города, новой промышленной столицы не только Кирии, но и всей Зебрики!"
+FRV_Focus_23_tt:0 "\nКаждые §Yсорок§! (§Y40§!) дней в течение §Y365§! дней:"
 FRV_Focus_23_0:0 "\n  "
-FRV_Focus_23_1:0 "On day §Y40§!, §Y160§!, and §Y280§!:"
-FRV_Focus_23_2:0 "On day §Y80§!, §Y200§!, and §Y320§!:"
-FRV_Focus_23_3:0 "On day §Y120§!, §Y240§!, and §Y360§!:"
-FRV_Focus_23a:0 "A Safe Haven for Science and Culture"
-FRV_Focus_23a_desc:0 "Kirian religion and politics have shackled science and stifled culture for centuries, but no more. We will create a society where innovation is encouraged, not feared, and where great thinkers are free to dream."
-FRV_Focus_212:0 "Bolster the Army Civic"
-FRV_Focus_212_desc:0 "The legacy of the Army Civic as the core of our revolution will never be forgotten. Our unique experiences during the fight for independence can be the foundation for a innovative and uniquely adaptive modern military."
-FRV_Focus_612:0 "Free Forces of Liberty"
-FRV_Focus_612_desc:0 "What revolutionary is content to let tyranny reign on foreign shores? We will make expeditionary operations a core tenet of the Army Civic's organization and fight the good fight wherever we are needed."
-FRV_Focus_721:0 "Mother of Exiles"
-FRV_Focus_721_desc:0 "Even in the aftermath of our war, we are more fortunate than many. The oppressed and destitute will be welcome here, and they can share in our community and our project to build a better society."
-FRV_Focus_831:0 "Strides Towards Communism"
-FRV_Focus_831_desc:0 "After all we have been through, the economics of socialism seem almost an afterthought, but at last we find ourselves in a position to fully unleash the productive power of liberated workers for the good of society."
-
-KIR_FRV_END_SCREEN_TITLE:0 "The Time of Cherry Blossoms"
-KIR_FRV_END_SCREEN_POEM:0 "The falling crimson\nLitterfall; not forlorn, but\nA boon for spring bloom" ##落紅...
-KIR_FRV_END_SCREEN_CREDIT:0 "§LArtwork by Rari§!"
-KIR_FRV_END_SCREEN_BUTTON_TT:0 "We'll be back"
+FRV_Focus_23_1:0 "На §Y40§!-ой, §Y160§!-ый и §Y280§!-ый день:"
+FRV_Focus_23_2:0 "На §Y80§!-ый, §Y200§!-ый и §Y320§!-ый день:"
+FRV_Focus_23_3:0 "На §Y120§!-ый, §Y240§!-ой и §Y360§!-ый день:"
+FRV_Focus_23a:0 "Прибежище науки и культуры"
+FRV_Focus_23a_desc:0 "Кирийская религия и политика веками сковывали науку и подавляли культуру, но этому пришёл конец. Мы создадим общество, где инновации без страха поощряются, и где великие мыслители могут свободно мечтать."
+FRV_Focus_212:0 "Усилить гражданскую армию"
+FRV_Focus_212_desc:0 "Наследие гражданской армии как ядра нашей революции никогда не будет забыто. Наш уникальный опыт борьбы за независимость может стать основой для создания инновационных и уникально гибких современных вооруженных сил."
+FRV_Focus_612:0 "Вольные силы свободы"
+FRV_Focus_612_desc:0 "Какой революционер позволит тирании воцариться на чужих берегах? Мы сделаем добровольческие операции основным принципом организации гражданской армии и будем сражаться за правое дело везде, где мы нужны."
+FRV_Focus_721:0 "Мать изгнанников"
+FRV_Focus_721_desc:0 "Даже после войны мы понимаем, что нам повезло куда больше, чем многим другим. Угнетённым и обездоленным у нас будут рады, и они смогут поучаствовать в жизни нашей общины и в нашем проекте построения лучшего общества."
+FRV_Focus_831:0 "Движение к коммунизму"
+FRV_Focus_831_desc:0 "После всего пережитого экономика социализма кажется практически второстепенной задачей, но наконец-то мы можем полностью высвободить производительную силу освобожденных рабочих на благо общества."
+
+KIR_FRV_END_SCREEN_TITLE:0 "Время цветения вишни"
+KIR_FRV_END_SCREEN_POEM:0 "Падающий багрянец\nЛиственная подстилка, что станет\nБлагодатью для весеннего цветения" ##落紅...
+KIR_FRV_END_SCREEN_CREDIT:0 "§LРисунок авторства Rari§!"
+KIR_FRV_END_SCREEN_BUTTON_TT:0 "Мы вернёмся"
 
 ### CHN FRV Ideas ###
 KIR_CFR_mandate:0 "The Changeling Ost-Zebrikan Mandate"
@@ -8187,10 +8199,10 @@ KIR_rain_shine:0 "Рейн Шайн"
 KIR_rain_shine_desc:0 "§YДата и место рождения§!: 2 Апреля 945 года, Киноварь\n\n§YБиография:§! Верховный матриарх Рейн Шайн всю свою жизнь поддерживала имперские указы, приведшие к стагнации и упадку культуры и общества Царства Кирия, и ни разу даже подумать не могла, что станет именно той, кто покончит с ним. Указы были изданы её матерью, верховным матриархом Ноктилюцент Чарм, в 902 году, а когда она ушла в 971-ом — Рейн Шайн клялась над прахом, что будет придерживаться её политики, и посвятит жизнь изучению Пути Огня и огненной богини Конкорд, во славу и спасение Кирии.\n\nТем не менее, в 1006 году, в изолированную нацию неожиданно явилась дипломатическая миссия из Эквестрии, и достигла дворца Рейн Шайн в Киновари. Именно здесь два носителя Элементов Гармонии, Эпплджек и Флаттершай, заявили, что видели киринов, живших в бедности по всему царству, что стало результатом политики Безмолвия. Пускай оно и эффективно предотвращало появление нириков, с ним было необходимо покончить ради блага всего рода киринов. Пони предложили помощь Эквестрии в поднятии нации с колен на копыта, и Рейн Шайн, изолированная от своих подданных в царском дворце и отстранённая от их положения, осознала, что продолжение Безмолвия в конечном счёте лишь навлечёт на нацию великую беду. Пусть она и клялась вести политику матери, когда матриарх осознала ужасную цену, что её народ может заплатить за это, то согласилась отменить указы своего предка, и навсегда покончить с этим ужасом.\n\nИ вот теперь, с окончанием поддержания политики Безмолвия в Кирии, Рейн Шайн поклялась исправить ошибки её матери, и привести род Киринов в современное и светлое будущее. К сожалению, но после 60-ти лет уединения в Киновари может оказаться, что авторитет Рейн Шайн далеко не так силён, как у её матери сотню лет назад...\n\n§YАвтор портрета:§! Twotail813"
 
 KIR_winter_frost:0 "Винтер Фрост"
-KIR_winter_frost_desc:0 "§YРождена§!: 29 декабря 966 в Агате\n\n§YБиография:§!: Родившаяся в горном городе-монастыре Агате, Винтер Фрост с момента своего рождения была окружена религиозным и мистическим пылом Пути Огня. Став старше, юная кирин быстро обнаружила, что глубоко увлечена любовью и божественным руководством, которыми богиня огня Конкорд благословила свой народ, и поэтому Винтер посвятила всю свою жизнь изучению религиозных учений и обмену ими с простым народом. Регулярно проводя много тёмных зимних утренних часов в медитации на высочайших вершинах священного горного хребта, окружавшего Киноварь, преданность Винтер Фрост вскоре была вознаграждена, когда она была выбрана отправиться в столицу страны и продолжить своё служение Конкорд, работаю с самим Верховным Матриархом Рейн Шайн. Таким образом, Винтер стала одним из немногих киринов, лично видевшим Матриарха-затворника до отмены Безмолвия, и после долго общения Винтер Фрост стала хорошим другом своему правителю, наряду с её неистовой преданностью Пути Огня. Такая преданность привела к тому, что она стала любимицей Рейн Шайн, и к тому времени, когда Безмолвие было официально отменено, Винтер Фрост была самой влиятельной жрицей в Киновари.\n\nКогда Безмолвие уступило место новой эре политики Киновари, Винтер Фрост стала самым громким критиком безрассудной модернизации и стала надежной опорой для религиозных киринов, регулярно выступая против предложений, законопроектов и декретов, которые, по её мнению, угрожали святости божественного наставления Конкорд. Когда Кирия погрузилась в гражданскую войну в результате того, что её протесты были проигнорированы, Винтер Фрост вскоре заменила неумелого и наивного премьера Отэм Блейз на посту самого важного советника Матриарха. Теперь жрица работает над тем, чтобы вернуть Кирию к её корням - твёрдой вере и непоколебимой преданности Конкорд и Пути Огня, желая найти ответы на проблему модернизации страны в наставлениях Конкорд.\n\n§YАвтор портрета:§! Twotail813"
+KIR_winter_frost_desc:0 "§YРождена§!: 29 декабря 966 в Агате\n\n§YБиография:§!: Родившаяся в горном городе-монастыре Агате, Винтер Фрост с момента своего рождения была окружена религиозным и мистическим пылом Пути Огня. Став старше, юная кирин быстро обнаружила, что глубоко увлечена любовью и божественными указаниями, которыми богиня огня Конкорд благословила свой народ, и поэтому Винтер посвятила всю свою жизнь изучению религиозных учений и обмену ими с простым народом. Регулярно проводя много тёмных зимних утренних часов в медитации на высочайших вершинах священного горного хребта, окружавшего Киноварь, преданность Винтер Фрост вскоре была вознаграждена, когда она была выбрана отправиться в столицу страны и продолжить своё служение Конкорд, работаю с самим Верховным Матриархом Рейн Шайн. Таким образом, Винтер стала одним из немногих киринов, лично видевшим Матриарха-затворника до отмены Безмолвия, и после долго общения Винтер Фрост стала хорошим другом своему правителю, наряду с её неистовой преданностью Пути Огня. Такая преданность привела к тому, что она стала любимицей Рейн Шайн, и к тому времени, когда Безмолвие было официально отменено, Винтер Фрост была самой влиятельной жрицей в Киновари.\n\nКогда Безмолвие уступило место новой эре политики Киновари, Винтер Фрост стала самым громким критиком безрассудной модернизации и стала надежной опорой для религиозных киринов, регулярно выступая против предложений, законопроектов и декретов, которые, по её мнению, угрожали святости божественного наставления Конкорд. Когда Кирия погрузилась в гражданскую войну в результате того, что её протесты были проигнорированы, Винтер Фрост вскоре заменила неумелого и наивного премьера Отэм Блейз на посту самого важного советника Матриарха. Теперь жрица работает над тем, чтобы вернуть Кирию к её корням - твёрдой вере и непоколебимой преданности Конкорд и Пути Огня, желая найти ответы на проблему модернизации страны в наставлениях Конкорд.\n\n§YАвтор портрета:§! Twotail813"
 
 KIR_fickle_current:0 "Фикл Каррент"
-KIR_fickle_current_desc:0 "§YРождён§!: 11 октября 953 в Скайфоле\n\n§YБиография:§!: Несмотря на то, что Фикл Каррент теперь является лидером Кирии, Фикл Каррент не был рожден в Царстве. Скорее всего, он родился в Скайфоле, куда его семья бежала от сокрушительного экономического коллапса, обрушившегося на Кирию, в начале 10-го века с принятием Безмолвия. Именно туда, в Скайфол, переехал торговый дом Сайси, один из сильнейших торговых конгломератов Царства, и семья Каррента имела тесные связи с корпорацией, сделавших их чрезвычайно богатыми. Благодаря всем деньгам, которым обладала его семья, Каррент смог позволить себе престижное образование в Йельском университете, где его лично обучал Сайпресс Сноу, ещё один представитель киринской диаспоры и её выдающийся писатель. Под руководством Сноу Фикл научился оттачивать свою деловую хватку и проницательность, которые сослужили ему хорошую службу в качестве успешного предпринимателя, после чего тот стал идеальным кандидатом на место председателя НАКП во время Великого Скачка Вперёд в Кирии.\n\nТолько в конце 1006 года Фикл Каррент впервые увидел Благоухание, город своих предков, когда по страна наконец-то освободилась от Безмолвия. Помня рассказы о том, как неумелость и суеверия Киновари однажды вынудили его семью отправиться в изгнание и едва не разорили их, Каррент вскоре решил стать защитником киринов, потерявших всё, и по-настоящему модернизировать Кирию, сделав её даже лучше Скайфола и всей западной Грифонии. Председатель НАКП считает, что Царству необходим ничем не ограниченный капитализм, поскольку колёса прогресса в такой отсталой стране можно было бы повернуть только с помощью огромных инвестиций. Если бы Кирия когда-нибудь захотела по-настоящему присоединиться к современному миру в качестве функциональной нации, это потребовало бы почти невообразимого количества денег и усилий, а потому Каррент решил сделать всё возможное, чтобы сделать нацию достаточно привлекательной для богатых.\n\n§YАвтор портрета:§! Twotail813"
+KIR_fickle_current_desc:0 "§YРождён§!: 11 октября 953 в Скайфоле\n\n§YБиография:§!: Несмотря на то, что Фикл Каррент теперь является лидером Кирии, Фикл Каррент не был рожден в Царстве. Скорее всего, он родился в Скайфоле, куда его семья бежала от сокрушительного экономического коллапса, обрушившегося на Кирию, в начале 10-го века с принятием Безмолвия. Именно туда, в Скайфол, переехал торговый дом Сайси, один из сильнейших торговых конгломератов Царства, и семья Каррента имела тесные связи с корпорацией, сделавших их чрезвычайно богатыми. Благодаря всем деньгам, которым обладала его семья, Каррент смог позволить себе престижное образование в Йельском университете, где его лично обучал Сайпресс Сноу, ещё один представитель киринской диаспоры и её выдающийся писатель. Под наставничеством Сноу Фикл научился оттачивать свою деловую хватку и проницательность, которые сослужили ему хорошую службу в качестве успешного предпринимателя, после чего тот стал идеальным кандидатом на место председателя НАКП во время Великого Скачка Вперёд в Кирии.\n\nТолько в конце 1006 года Фикл Каррент впервые увидел Благоухание, город своих предков, когда по страна наконец-то освободилась от Безмолвия. Помня рассказы о том, как неумелость и суеверия Киновари однажды вынудили его семью отправиться в изгнание и едва не разорили их, Каррент вскоре решил стать защитником киринов, потерявших всё, и по-настоящему модернизировать Кирию, сделав её даже лучше Скайфола и всей западной Грифонии. Председатель НАКП считает, что Царству необходим ничем не ограниченный капитализм, поскольку колёса прогресса в такой отсталой стране можно было бы повернуть только с помощью огромных инвестиций. Если бы Кирия когда-нибудь захотела по-настоящему присоединиться к современному миру в качестве функциональной нации, это потребовало бы почти невообразимого количества денег и усилий, а потому Каррент решил сделать всё возможное, чтобы сделать нацию достаточно привлекательной для богатых.\n\n§YАвтор портрета:§! Twotail813"
 
 KIR_autumn_blaze:0 "Отэм Блейз"
 KIR_autumn_blaze_desc:0 "§YРождена§!: 20 сентября 977 в Массикоте\n\n§YБиография:§!: Отэм Блейз никогда не суждено было подняться так высоко - она была всего лишь дочерью бедных фермеров в Массикоте. Хотя изначально Отэм была обречена на те же трудности и скудное существование, что и её родители, семье Блейз удалось устроить свою дочь в храм Конкорд в Массикоте в возрасте семи лет, где она проучилась пять лет, прежде чем бросить учёбу и вернуться на семейную ферму. Однако за эти пять лет Отэм научилась читать и писать, могла считать и, возможно, самое главное, изучать и интерпретировать наставления богини огня Конкорд в религиозных текстах. Хотя она никогда бы не использовала этот особый навык на службе Пути Огня, кирин превосходно использовала свою власть над словами как меч для атаки и щит для защиты, что позволило ей использовать это умение как инструмент, чтобы проложить свой собственный жизненный путь. Изначально Отэм стремилась писать мюзиклы, пьесы и даже заставляющие задуматься комедийные разборы застойной жизни киринов во времена Безмолвия, это сослужило ей лучшую службу в 1006 году, когда делегация Эквестрии забрела в Массикот.\n\nБучи единственным кирином в городе, знавшим язык двух пони - пониш - благодаря своей учебе, Блейз смогла направить двух иностранцев по имени Флаттершай и Эпплджек, в Киноварь, где они попытались войти контакт с Верховным Матриархом Кирии, Рейн Шайн, и установить дипломатические отношения с Эквестрией. Благодаря её усилиям этого удалось добиться, и Отэм в конечном счёте завязала тесную дружбу с Рейн Шайн. Эта дружба позволила дочери фермеров стать первым премьером Верховного Матриарха, и успешно управлять всекиринском пленумом за национального возрождения будучи стойким и полным энтузиазма лидером.\n\nТеперь, когда её единомышленники-гармонисты надёжно контролируют Кирию, Отэм может снова расширить своё влияние, усвоив много тяжёлых уроков. Держа страну в своих копытах, премьер стремится примирить традиционалистское и теократическое прошлое страны с видением современной гармоничной нации, такой как Эквестрия. И только время покажет, добьётся ли она успеха.\n\n§YАвтор портрета:§! Twotail813"
diff --git a/localisation/russian/country_KXN_l_russian.yml b/localisation/russian/country_KXN_l_russian.yml
index 5ee3586c933..87137fbaadf 100644
--- a/localisation/russian/country_KXN_l_russian.yml
+++ b/localisation/russian/country_KXN_l_russian.yml
@@ -6,4 +6,9 @@ lan_kir_placeholder.1.a:0 "Зайкирия будет единой!"
 
 lan_kir_placeholder.2.t:0 "Покорение Кирии"
 lan_kir_placeholder.2.d:0 "Царство Кирия, родина наших предков, погрязло в упадке и коррупции. Настало время для нас выступить в поход на Киноварь и спасти наших киринских братьев от самих себя, чтобы восстановить законное правление Верховного Матриарха, которой помогают и советуют её верные знамёна."
-lan_kir_placeholder.2.a:0 "Сироты Безмолвия возвращаются домой."
\ No newline at end of file
+lan_kir_placeholder.2.a:0 "Сироты Безмолвия возвращаются домой."
+
+lan_kir_placeholder.100.t:0 "[FROM.GetNameDefCap] угрожает войной!"
+lan_kir_placeholder.100.d:0 "[FROM.GetNameDefCap] наращивает число войск на нашей границе. Мы должны подготовиться к защите от их вторжения!"
+lan_kir_placeholder.100.a:0 "К оружию!"
+lan_kir_placeholder_100_tt:0 "Даст цель войны §Yаннексия§! против государства §Y[ROOT.GetNameDef]§!."
\ No newline at end of file
diff --git a/localisation/russian/country_LNS_l_russian.yml b/localisation/russian/country_LNS_l_russian.yml
index b987478edca..bb5dfa686b4 100644
--- a/localisation/russian/country_LNS_l_russian.yml
+++ b/localisation/russian/country_LNS_l_russian.yml
@@ -2108,7 +2108,7 @@ starry_dead:0 "Старри Найт погибла"
 LSC_national_transformation:0 "Создание судьбы"
 LSC_interspecies_study_groups_tooltip:0 "Изменить §YСоздание судьбы§! на\nТемпы исследований: §G+5.00%§!\n"
 LSC_full_employment_tooltip:0 "Изменить §YСоздание судьбы§! на\n£prod_eff_cap  Макс. эффективность производства: §G+10.00%§!\nОбъем заводского производства: §G+10.00%§!"
-LSC_pantheon_construction_tooltip:0 "Изменить §YСоздание судьбы§! на\nПоддержка войны: §G+10.00%§!\nФабрики, производящие товары народного потребления: §Y-5%§!"
+LSC_pantheon_construction_tooltip:0 "Изменить §YСоздание судьбы§! на\nПоддержка войны: §G+10.00%§!\nФабрики, производящие товары народного потребления: §Y-10%§!"
 LSC_language_reconstruction_tooltip:0 "Изменить §YСоздание судьбы§! на\nПоддержка войны: §G+10.00%§!\nФактор военнообязанного населения: §G+10%§!"
 LSC_vadeiva_cult_tooltip:0 "Изменить §YСоздание судьбы§! на\nПрирост политической власти: §G+5%§!\nСкорость восстановления дивизии: §G+10.0%§!"
 LSC_forced_integration_tooltip:0 "Изменить §YСоздание судьбы§! на\nФактор военнообязанного населения: §G+10%§!\n"
diff --git a/localisation/russian/country_LSP_l_russian.yml b/localisation/russian/country_LSP_l_russian.yml
index 5b6724e7a88..ebb4ba55808 100644
--- a/localisation/russian/country_LSP_l_russian.yml
+++ b/localisation/russian/country_LSP_l_russian.yml
@@ -1025,7 +1025,7 @@
  LSP_the_republic_left_desc:0 "Социал-демократы, несмотря на все помехи и препятствия, теперь доминирующая фракция. Реформы, а не революция!"
  LSP_stay_with_socialists:0 "Пусть цветут тысячи красных цветов"
  LSP_stay_with_socialists_desc:0 "Хотя правые идеи искушают нас, мы сердцем понимаем правильность социализма. Мы не всегда можем сходиться во взглядах с иными социалистами, но мы должны держаться вместе."
- LSP_volunteer_bonus:0 "Бонусы для волонтеров"
+ LSP_volunteer_bonus:0 "Бонусы для добровольцев"
  LSP_volunteer_bonus_desc:0 "Мы должны признать, что не все пони думают в первую очередь про идеологию при подаче документов в армию. Некоторые могут даже отказаться от службы. Но многих могут переубедить деньги, еда или прочие бонусы для солдат."
  LSP_befriend_vasily:0 "Поговорить с Василием"
  LSP_befriend_vasily_desc:0 "Несмотря на наши идеологические различия, Василий всегда был тем пони, с которым можно поговорить. Конечно, он не откажется поделиться сырьём и экспертами?"
diff --git a/localisation/russian/country_MIT_l_russian.yml b/localisation/russian/country_MIT_l_russian.yml
index dbb62263e49..62396b05218 100644
--- a/localisation/russian/country_MIT_l_russian.yml
+++ b/localisation/russian/country_MIT_l_russian.yml
@@ -626,6 +626,7 @@
  MIT_socalist_minotaurs:0 "Социалистические Минотавры"
  MIT_align_pact_opinion:0 "Астерионо-Вингбардийское Примирение"
  MIT_SIC_commie_faction:0 "Конкордат Свободных Наций"
+ MIT_amtank_designer:0 "Конструктор танков-амфибий" 
  
  MIT_has_completed_mic_focus:0 "Если фокус '§YРасширить Военно-Промышленный Комплекс§!' выполнен:\n"
  
diff --git a/localisation/russian/country_NCH_l_russian.yml b/localisation/russian/country_NCH_l_russian.yml
index 47d07b12421..9848cd078a8 100644
--- a/localisation/russian/country_NCH_l_russian.yml
+++ b/localisation/russian/country_NCH_l_russian.yml
@@ -148,7 +148,7 @@
  NCH_establish_a_schooling_system_desc:0 "Справившись с проблемой массовой безграмотности, теперь мы можем обсудить работу по стандартизации образования вместе с нашими мудрецами и старейшинами. Поскольку имеются значительные расхождения во мнениях, это будет трудной задачей."
 
  NCH_literacy_volunteer_brigades:0 "Добровольческие отряды ликбеза"
- NCH_literacy_volunteer_brigades_desc:0 "Чейнджлинги Гринклифа долгое время оставались безграмотными, дошло до того что это стало причиной застоя в социальном развитии. Набор грамотных волонтеров для обучения других - лучший способ преодолеть эту проблему."
+ NCH_literacy_volunteer_brigades_desc:0 "Чейнджлинги Гринклифа долгое время оставались безграмотными, дошло до того что это стало причиной застоя в социальном развитии. Набор грамотных добровольцев для обучения других - лучший способ преодолеть эту проблему."
 
  NCH_found_the_elder_academy:0 "Основать Королевскую Академию"
  NCH_found_the_elder_academy_desc:0 "Построив нормальную базовую образовательную систему, Гринклиф готов к созданию первого высшего учебного заведения. Несмотря на то что это заведение будет не таким престижным, оно будет прекрасно функционировать."
diff --git a/localisation/russian/country_NMS_l_russian.yml b/localisation/russian/country_NMS_l_russian.yml
index 10e4c971706..d15fa37c6ff 100644
--- a/localisation/russian/country_NMS_l_russian.yml
+++ b/localisation/russian/country_NMS_l_russian.yml
@@ -551,7 +551,7 @@ supporters.27.d:0 "Сильвер Мун часто задавался вопр
 supporters.27.a:0 "Мы приветствуем наших блудных собратьев."
 
 supporters.28.t:0 "Сбор говорящих с Луной"
-supporters.28.d:0 "Тихий шепот звучал на небольшой поляне к югу от Балтимейра. Это некогда почитаемое место было известно племенам Лунной Песни как озеро Луны, а теперь иностранные пони называют его Дасквеем. Члены конклава, ставшие новым правительством юго-востока, чуть больше недели назад отправили «Ночных бегунов» во многие южные племена цинакатлей, прося, чтобы их Говорящие с Луной покинули свои дома ради встречи, которая не проводилась уже несколько поколений. Сегодня поляна была полна фестралов, которые, наконец, снова встретились для обсуждения важных вопросов. Новое время скоро наступит для юго-востока. Время войны, но и мира. Время из конфликта, но и роста. Время смерти, но и жизни. Конклав Говорящих с Луной возьмёт власть в свои копыта и поведёт наши племена в современный мир, как и Говорящих с Луной далёкого прошлого. Но сначала, прежде чем такие вещи станут возможными, Конклав должен прийти к согласию. Они должны определить путь своего народа в будущее, раз они снова правят джунглями."
+supporters.28.d:0 "Тихий шепот звучал на небольшой поляне к югу от Балтимейра. Это некогда почитаемое место было известно племенам Лунной Песни как озеро Луны, а теперь иностранные пони называют его Дасквеем. Члены конклава, ставшие новым правительством юго-востока, чуть больше недели назад отправили «Ночных бегунов» во многие южные племена цинакатлей, прося, чтобы их Говорящие с Луной покинули свои дома ради встречи, которая не проводилась уже несколько поколений. Сегодня поляна была полна фестралов, которые, наконец, снова встретились для обсуждения важных вопросов. Новое время скоро наступит для юго-востока. Время войны, но и мира. Время конфликта, но и роста. Время смерти, но и жизни. Конклав Говорящих с Луной возьмёт власть в свои копыта и поведёт наши племена в современный мир, как и Говорящие с Луной далёкого прошлого. Но сначала, прежде чем такие вещи станут возможными, Конклав должен прийти к согласию. Они должны определить путь своего народа в будущее, раз они снова правят джунглями."
 supporters.28.a:0 "Каким же будет их вердикт?"
 
 supporters.29.t:0 "Тлатоани"
@@ -567,7 +567,7 @@ supporters.31.d:0 "Социалисты одновременно чужды и 
 supporters.31.a:0 "Он действительно очень любит кукурузу."
 
 supporters.32.t:0 "Новый курс"
-supporters.32.d:0 "Смирение - одна из самых сложных вещей, которым нужно научиться. Сложно спуститься с высот, отказаться от власти и встать как равный среди окружающих... Это может показаться унизительным, но всё же это путь, который мы должны наметить.\n\nКонклав Говорящих с Луной высказался, постановив, что не-фестралы этих земель больше не будут рассматриваться как не привилегированные. Луна одинаково ярко сияет для нас всех, и все жители этих земель попадают под её благословение. Возможно, мы думали, что мы чисты, но мы бросили вызов Луне, разобравшись с некоторыми из её детей ради общего блага. Потому что на этих землях все равны под луной."
+supporters.32.d:0 "Смирение - одна из самых сложных вещей, которым нужно научиться. Сложно спуститься с высот, отказаться от власти и стать равным среди окружающих... Это может показаться унизительным, но всё же это путь, который мы должны наметить.\n\nКонклав Говорящих с Луной высказался, постановив, что не-фестралы этих земель больше не будут рассматриваться как не привилегированные. Луна одинаково ярко сияет для нас всех, и все жители этих земель попадают под её благословение. Возможно, мы думали, что мы чисты, но мы бросили вызов Луне, разобравшись с некоторыми из её детей ради общего блага. Потому что на этих землях все равны под луной."
 supporters.32.a:0 "Теперь мы все равны!"
 
 supporters.33.t:0 "Урса"
diff --git a/localisation/russian/country_OLE_l_russian.yml b/localisation/russian/country_OLE_l_russian.yml
index 47c5213dbba..ca333f1bf36 100644
--- a/localisation/russian/country_OLE_l_russian.yml
+++ b/localisation/russian/country_OLE_l_russian.yml
@@ -78,7 +78,7 @@ OLE_Velvetist_Economic_Plan_desc:0 "Её Величество считает, ч
 OLE_encourage_free_thought:0 "Свобода слова"
 OLE_encourage_free_thought_desc:0 "При Короле Йохане, государственные школы и университеты были подавлены, создавая в Олении большую "утечку мозгов". Больше этого не будет - каждый олень теперь может свободно выражать свои собственные мнения и идеи, если они не причиняют вреда другим, и каждый олень будет иметь свободный доступ к образованию."
 OLE_New_Olenian_Youth:0 "Молодёжь Олении"
-OLE_New_Olenian_Youth_desc:0 "Законная королева восстановлена на троне, а простые олени настолько верят в неё, что начали объединять свои силы в радостном энтузиазме. Они называют себя «Голубые рога», а некоторые даже красят свои рога, чтобы походить на королеву. Мы не можем сказать «нет» этим волонтерам!"
+OLE_New_Olenian_Youth_desc:0 "Законная королева восстановлена на троне, а простые олени настолько верят в неё, что начали объединять свои силы в радостном энтузиазме. Они называют себя «Голубые рога», а некоторые даже красят свои рога, чтобы походить на королеву. Мы не можем сказать «нет» этим добровольцам!"
 OLE_Harmonist_Propaganda:0 "Продвигать гармонию"
 OLE_Harmonist_Propaganda_desc:0 "Королева Вельвет давно влюбилась в эквестрийский образ жизни. Их идеи гармонии сблизят всех оленей и заложат прочную основу для будущего страны. У каждого оленя есть сила внутри, которая поможет им быть как можно лучше, а гармония только поспособствует этому."
 OLE_Urban_Reform:0 "Планирование наших городов"
diff --git a/localisation/russian/country_PLB_l_russian.yml b/localisation/russian/country_PLB_l_russian.yml
index 81e738cd878..931ebd9735d 100644
--- a/localisation/russian/country_PLB_l_russian.yml
+++ b/localisation/russian/country_PLB_l_russian.yml
@@ -64,6 +64,7 @@ PLB_religious_mystic:0 "Архишаман Вёльва"
 PLB_falangist:0 "Аскр из клана Вольсунгр"
 PLB_monarchist_guy:0 "Типпа из клана Вольсунгр"
 PLB_queen_guard:0 "Карапас Грозный"
+PLB_queen_guard_desc:0 "§YДата рождения§!: 12 марта 936 года\n§YЗвание§!:Командир корпуса северного фронта\n§YБиография§!:Карапас родился в семье, имеющей неплохие связи в Дитрисиуме. И когда Карапас вырос и вступил в армию, благодаря этим связям ему досталась должность командира. Карапас служил во время кампаний против фанатиков-оленей в 962 году и против улья Вракса в 971, заслужив репутацию жестокого командира, презирающего слабость и одержимого желанием участвовать в труднейших сражениях в самых ужасных условиях. Он продолжая сражаться, несмотря на кислотные ожоги. Благодаря этому Карапас был приглашён в королевскую гвардию Кризалис, где быстро поднялся по карьерной лестнице.\n\nОднако звезда Карапаса так и не взошла, несмотря на сформировавшееся вокруг него ядро сторонников. Он часто конфликтовал с другими командирами по вопросам внешней политики. Карапас мало заботился о геополитике по добыче любви, ограничивая собственное потребление, чтобы закалить себя. А о покорении эквестрийцев он заботился ещё меньше. По мнению Карапаса чейнджлинги должны либо доминировать на севере, либо драться с более врагами, что более жестоки и сильны чем пони. Однако для большинства командиров и королев это было похоже на бред сумасшедшего. Бред, который вместе с неудачей 1002 года настолько разгневал Кризалис, что она изгнала Карапаса, назначив на безвестную должность возле Сорифа и задвинув на второй план его последователей. Это привело к ещё большему росту влияния Ласина Кардо и сторонников.\n\nОднако Карапас нашёл признание и даже дружбу у изгнанных из своих кланов медведей, которые бежали в земли чейнджлингов после кампаний Пау Веллингтона. Он уважал их воинственную культуру, а они восхищались его "замороженной душой". И когда Бьорнлинг отправился на восток, Карапас вызвался присоединиться к нему. И пока Кризалис и Ласин заблуждаются, считая его старым дряхлым лоялистом, просто наблюдающий за Северным Протекторатом, злоба Карапаса сильна, кровь холодна от восстанавливающих препаратов, а верен он исключительно северу."
 PLB_queen_guard_alt:0 "Стернит Благородный"
 PLB_lorke_of_scyfling:0 "Лорк из клана Скифлинг"
 PLB_yuri_of_the_south:0 "Юрий с юга"
@@ -112,8 +113,7 @@ PLB_NP_schizo_builds:0 "Изменит §YБезумный медведь на 
 PLB_NP_schizo_army:0 "Изменит §YБезумный медведь на воле§! следующим образом:\nАтака армии: §G+5%§!\nСкорость восстановления армии: §G+10%§!"
 PLB_NP_schizo_bad:0 "Изменит §YБезумный медведь на воле§! следующим образом:\nЕжемесячный прирост населения: §R-5%§!"
 
-
-
+PLB_jagers_elite_tt:0 "Активирует технологию: §YЭлита элит§!? которая даёт:!\n\nСпецназ:\nПрочность: §G+3%§!\nПрорыв: §G+15%§!\nПротивопехотная атака: §G+15%§!\nПротивотанковая атака: §G+15%§!\nОборона: §G+15%§!\n\nОднако спецназ отныне будет требовать:\nВремя подготовки: §R+5%§!\n§R30 дополнительных§! единиц пехотного снаряжения на батальон\n§R5 дополнительных§! единиц снаряжения поддержки на батальон"
 
 ### Focus Trees ###
 polar_bear_focus:0 "Стартовое древо фокусов"
@@ -2160,13 +2160,13 @@ PLB_eastern_key_lake_debacle:0 "Конфликт на востоке"
 PLB_eastern_key_lake_debacle_desc:0 "Ключ-Озеро раньше принадлежало Йорику и его клану - они давно завоевали себе его, разбив местные кланы и изгнав их. Однако череда позорных неудач даже на исконных землях Скифлингов дала возможность военачальникам Онлартира оспорить это требование. И деспоту Торбену пришло время решить, кто прав."
 
 PLB_scyfling_key_lake:0 "Озеро достаётся Йорику"
-PLB_scyfling_key_lake_desc:0 "Именно Йорик сокрушил кланы, объединившееся с чейнджлингами. Именно он изгнал их в проклятые земли вокруг Сорита. И именно Йорик возглавляет Великий Клан. Даже если хаос второй войны за объединение лишил их способности удерживать землю на какое-то время, это их законное завоевание!"
+PLB_scyfling_key_lake_desc:0 "Именно Йорик сокрушил кланы, объединившееся с чейнджлингами. Именно он изгнал их в проклятые земли вокруг Сорифа. И именно Йорик возглавляет Великий Клан. Даже если хаос второй войны за объединение лишил их способности удерживать землю на какое-то время, это их законное завоевание!"
 
 PLB_crystal_extraction_near_key_lake:0 "Богатства Ключ-Озера"
 PLB_crystal_extraction_near_key_lake_desc:0 "Большая часть медведей не имеет никаких ценных ресурсов вокруг Ключ-Озера. Эти земли богаты кристаллами и золотом, а это материалы для слабых. Однако Йорик поговорил с грифонами на эту тему и узнал, почему они ценят такие ресурсы. Таким образом именно он сможет использовать эти богатства на пользу государству."
 
 PLB_channel_key_lake_magic_through_worship:0 "Потенциал Ключ-Озера"
-PLB_channel_key_lake_magic_through_worship_desc:0 "Говорят, что по ту сторону Ключ-Озера чейнджлинги Сорита экспериментируют с магией, чтобы стать могущественнее. Мы тоже стремимся к большей власти, однако больше нас интересует возвращение того, что принадлежало нам по праву. Йорик утверждает, что нам поможет тайная мощь Ключ-Озера."
+PLB_channel_key_lake_magic_through_worship_desc:0 "Говорят, что по ту сторону Ключ-Озера чейнджлинги Сорифа экспериментируют с магией, чтобы стать могущественнее. Мы тоже стремимся к большей власти, однако больше нас интересует возвращение того, что принадлежало нам по праву. Йорик утверждает, что нам поможет тайная мощь Ключ-Озера."
 
 PLB_warlord_key_lake:0 "Новые хозяева озера"
 PLB_warlord_key_lake_desc:0 "Да, Йорик завоевал себе Ключ-Озеро. И он является хорошим другом Торбена. Однако, к сожалению, он доказал свою неспособность управлять чем либо за пределами своих собственных земель. Ключ-Озеро нуждается в новых хозяевах. Кланы Онлартира, возможно, не самые амбициозные или обладающие богатым воображением правители, но, судя по всему, это именно то, что нужно этому региону."
@@ -4087,6 +4087,7 @@ northern_protectorate.52.t:0 "Свободная журналистика"
 northern_protectorate.52.d:0 "Яра привычно для недавних времён начала утро с чашки хорошего чая, небольшой порции любви, которую теперь продавали на каждом углу вместо того чтобы выдавать как паёк, и газеты. Такая роскошь после долгих лет жесткого нормирования под власть Кризалис казалась нереальной и сюрреалистичной, но похоже, что новый режим мог доставать богатства из ниоткуда.\n\nНовые газеты тоже были диковинкой, а так называемая "свободная" журналистика была гораздо интереснее пропаганды Кризалис. Статьи и репортажи рассказывали о восстановительных работах, об охоте на верных Кризалис партизан, о всё ещё продолжающихся судебных процессах над теми, кто совершил преступления против гармонии. Однако не всё было так серьёзно: несколько страниц было посвящено придворным сплетням и обзорам моды. Яра быстро пролистала их, перейдя на последнюю страницу газеты — там показывали результаты матча по рестлингу с медведями, и она поставила неплохую сумму на какого-то дикаря с гор.\n\nИ тут её взгляд зацепился за статью под заголовком "Отсутствие демилитаризации в Эквестрии демонстрирует провал гармонии? — Армейские эксперты разошлись во мнениях". Это было... что-то новенькое? Ничего подобного раньше не публиковалось. В статье несколько военных экспертов из Эквуса и Грифонии делились своими мнениями об армии Эквестрии и отсутствии признаков демилитаризации, несмотря на множество союзных ей режимов. Никто не говорил о планах аликорнов, но Яра не могла отделаться от ощущения, что это опасно для чейнджлингов и угрожает её новому процветанию.\n\nПодобные статьи выходили почти каждый день, в них рассказывалось об экономике, политике, армии. В статьях не говорилось об опасности со стороны Эквестрии или аликорнов, но нельзя было отделаться от ощущения, что они были готовы вот-вот что-то предпринять... Яра говорила об этом со своими друзьями, коллегами, семьёй, и все они чувствовали то же самое, как будто наступает какой-то "перелом". Как будто пони что-то замышляют... И все они помнили, что во время войны, до того как Эксувия сделала свой ход, пони были готовы идти на столицу..."
 northern_protectorate.52.a:0 "Мы были слишком наивны, надеясь, что они оставят нас в покое."
 
+
 northern_protectorate.53.t:0 "Колени, что склоняются перед новой королевой"
 northern_protectorate.53.d:0 "Предатели захватили его в бесконечном аду, которым был Вракс. Они издевались над ним, били его, держали в каком-то забытом богами помещении, пока он не ослабел от холода и отсутствия пайка, чтобы сопротивляться. Было очень неприятно ломаться от такой мелочи, но в этом холоде было что-то злобное, что-то коварное, словно он был живым и мог ненавидеть. И вот теперь он предстал перед архипредателем Карапасом и какой-то мерзостью в виде чёрного медведя с горящими фиолетовыми глазами, которые, судя по всему, готовились осудить его...\n\n— Ласин Кардо, во всём своём неживом величии. Насколько известно миру, твоё тело было найдено под гусеницами тяжёлого танка. — У Ласина не было желания отвечать на злорадные фразы предателя-Карапаса. — Я бы, конечно, с удовольствием перегрыз тебе шею и сожрал твою плоть, но у королевы другие планы. Мы можем помиловать тебя и вернуть тебе генеральское звание, но ты будешь сражаться за нас.\n\nНа столе лежали документы: его новая личность, основанная на каком-то погибшем добровольце-гармонисте, предыстория того, почему он сражался и получил повышение, список высших офицеров, перешедших на его сторону ещё до него, и "Азбука первозданной доктрины". И тут до него дошёл истинный смысл всего этого. Ласин почувствовал, как ярость растопила лед, сковавший его сердце. Он оскалил зубы на Карапаса, который лишь усмехнулся, обнажив собственные отвратительные клыки.\n\n— Я не предам великую королеву ради изменнического сброда и варваров вроде вас всех! — Он закричал и попытался напасть, укусить, но тут его окутала темнота...\n\n— Тогда ты погибнешь, как червяк. Из-за королевы, которая сбежала из своего королевства... — Реальность исчезла, он видел только эти ненавистные фиолетовые глаза. Ласин почувствовал, что его череп схватили стальные когти. — ... Услышь мой голос, паразит. Если тебе предлагают пощаду, власть и месть, ты смиряешься и соглашаешься. Ещё одно ничтожное действие, подобающее ребёнку, а не взрослому, и я поглощу твой разум и стану кукловодом твоей плоти, так что ты будешь сражаться за нас живым или мёртвым.\n\nИ тут к нему вернулось зрение: он увидел ухмыляющегося Карапаса и эти ненавистные фиолетовые глаза, которые предложили ему выбрать тип собственного рабства."
 northern_protectorate.53.a:0 "Он задрожал и принял предложение. Как и десятки до него..."
@@ -4356,6 +4357,9 @@ PLB_exuvia_changelingia_fascism_ADJ:0 "Чейнджлингско-медвеж"
 PLB_exu_equus_fascism:0 "Титаническое Царство Эквуса"
 PLB_exu_equus_fascism_DEF:0 "Титаническое Царство Эквуса"
 PLB_exu_equus_fascism_ADJ:0 "Эквуск"
+PLB_wild_hunt:0 "Великое Царство Диких Земель"
+PLB_wild_hunt_ADJ:0 "Великое Царство Диких Земель"
+PLB_wild_hunt_DEF:0 "Дик"
 
 PLB_juche_desc:0 "Идеология сельвстендигет, которую иногда переводят как самодостаточность, это вера в то, что массы не могут саморегулироваться, а должны управлять «Великим Вождём», который является вдохновителем рабочего класса. Великий Вождь лишён изъянов и никогда не допускает ошибок, всегда доброжелателен и всегда мудро правит массами. Армия является величайшим из всех учреждений, управляемых Великим Вождём."
 
@@ -4843,7 +4847,14 @@ POLAR_AXIS:0 "Полярная Ось"
  exu_war:0 "\n§9Разжечь войну в небесах§!"
  PLB_exuvia_unifier:0 "Первозданная правительница"
  
- 
+PLB_jagers_research:0 "Программа подготовки королевских гвардейцев"
+PLB_jagers2:0 "Улучшение батальона егерей II"
+PLB_jagers3:0 "Улучшение батальона егерей III"
+PLB_jagers4:0 "Улучшение батальона егерей IV"
+PLB_jagers5:0 "Улучшение батальона егерей V"
+PLB_jagers_armored:0 "Облачить их в северную сталь"
+PLB_jagers_elite:0 "Превратить гвардию северной королевы в элиту среди элит"
+
 
 
 PLB_remove_illiteracy:0 "Покончить с неграмотностью"
diff --git a/localisation/russian/country_RCT_l_russian.yml b/localisation/russian/country_RCT_l_russian.yml
index 84bf52707e1..3e3b9709eda 100644
--- a/localisation/russian/country_RCT_l_russian.yml
+++ b/localisation/russian/country_RCT_l_russian.yml
@@ -1487,7 +1487,7 @@
  RCT_infantry_equipment_1_desc:0 "Эра винтовок заканчивается. ХорС в рамках программы по «тихому перевооружению» получил немало средств на разработку новой стандартной винтовки для армии республики, чтобы постепенно ликвидировать мешанину из случайных, личных, устаревших и самодельных образцов оружия, которыми мы сейчас вооружаем солдат."
  RCT_infantry_equipment_2:0 "ХорС Продакт VHS2"
  RCT_infantry_equipment_2_short:0 "VHS2"
- RCT_infantry_equipment_2_desc:0 "Когда международные «волонтеры» прибыли в Лонгсворд, они привезли с собой свои винтовки VHS1. Хотя они хорошо служили им в битвах при Харсингнене и Варене, они не могли поддерживать постоянное ведения огня во время движения. ХорС отреагировал на жалобы Генерального штаба, использовав VHS1 в качестве базы для разработки первого пистолета-пулемёта VHS2."
+ RCT_infantry_equipment_2_desc:0 "Когда международные «добровольцы» прибыли в Лонгсворд, они привезли с собой свои винтовки VHS1. Хотя они хорошо служили им в битвах при Хаарсингнене и Варене, они не могли поддерживать постоянное ведения огня во время движения. ХорС отреагировал на жалобы Генерального штаба, использовав VHS1 в качестве базы для разработки первого пистолета-пулемёта VHS2."
  RCT_infantry_equipment_3:0 "ХорС Продакт VHS3"
  RCT_infantry_equipment_3_short:0 "VHS3"
  RCT_infantry_equipment_3_desc: "Эквестрия в осаде, так что программа технологического обмена всё чаще стала использовался для эвакуации ценных технологий, чтобы те не попали в дырявые копыта чейнджлингов, что позволило Республике получить доступ к этим технологиям. VHS3, являющийся смесью речных и эквестрийских технологий, является самой распространенной винтовкой в республике в этом десятилетии."
diff --git a/localisation/russian/country_ROA_l_russian.yml b/localisation/russian/country_ROA_l_russian.yml
index 8be2fec042b..1230dc26e10 100644
--- a/localisation/russian/country_ROA_l_russian.yml
+++ b/localisation/russian/country_ROA_l_russian.yml
@@ -12,12 +12,12 @@ roam_placeholder.3.t:0 "Покорение государства [ZOO.GetName]"
 roam_placeholder.3.d:0 "Время пришло.\n\nМы завоюем государство [ZOO.GetNameDef] для государства [ROOT.GetNameDef].\n\nДа здравствует [ROOT.GetNameDef]!"
 roam_placeholder.3.a:0 "Мы растопчем их!"
 
-roam_placeholder.4.t:0 "Покорение государства [TAI.GetName] and [MEL.GetName]"
-roam_placeholder.4.d:0 "Время пришло.\n\nМы завоюем государство [TAI.GetName] and [MEL.GetName] для государства [ROOT.GetNameDef].\n\nДа здравствует [ROOT.GetNameDef]!"
+roam_placeholder.4.t:0 "Покорение государств [TAI.GetName] и [MEL.GetName]"
+roam_placeholder.4.d:0 "Время пришло.\n\nМы завоюем государства [TAI.GetName] и [MEL.GetName] для государства [ROOT.GetNameDef].\n\nДа здравствует [ROOT.GetNameDef]!"
 roam_placeholder.4.a:0 "Мы растопчем их!"
 
-roam_placeholder.5.t:0 "Покорение государства [IST.GetName] and [IDO.GetName]"
-roam_placeholder.5.d:0 "Время пришло.\n\nМы завоюем государство [IST.GetName] and [IDO.GetName] для государства [ROOT.GetNameDef].\n\nДа здравствует [ROOT.GetNameDef]!"
+roam_placeholder.5.t:0 "Покорение государств [IST.GetName] и [IDO.GetName]"
+roam_placeholder.5.d:0 "Время пришло.\n\nМы завоюем государства [IST.GetName] и [IDO.GetName] для государства [ROOT.GetNameDef].\n\nДа здравствует [ROOT.GetNameDef]!"
 roam_placeholder.5.a:0 "Мы растопчем их!"
 
 roam_placeholder.6.t:0 "Покорение государства [DEL.GetName]"
@@ -26,4 +26,9 @@ roam_placeholder.6.a:0 "Мы растопчем их!"
 
 roam_placeholder.7.t:0 "Покорение Кирии"
 roam_placeholder.7.d:0 "Время пришло.\n\nМы завоюем Кирию для государства [ROOT.GetNameDef].\n\nДа здравствует [ROOT.GetNameDef]!"
-roam_placeholder.7.a:0 "Мы растопчем их!"
\ No newline at end of file
+roam_placeholder.7.a:0 "Мы растопчем их!"
+
+roam_placeholder.100.t:0 "[FROM.GetNameDefCap] угрожает войной!"
+roam_placeholder.100.d:0 "[FROM.GetNameDefCap] наращивает число войск на нашей границе. Мы должны подготовиться к защите от их вторжения!"
+roam_placeholder.100.a:0 "К оружию!"
+roam_placeholder_100_tt:0 "Даст цель войны §Yаннексия§! против государства §Y[ROOT.GetNameDef]§!."
\ No newline at end of file
diff --git a/localisation/russian/country_SCS_l_russian.yml b/localisation/russian/country_SCS_l_russian.yml
index 13e64d9cf72..c6374e2035f 100644
--- a/localisation/russian/country_SCS_l_russian.yml
+++ b/localisation/russian/country_SCS_l_russian.yml
@@ -948,7 +948,7 @@
  scs.56.c:0 "Они просто бредят, игнорировать их."
  
  scs.57.t:0 "Пушки Юга"
- scs.57.d:0 "Юг - это абсолютный беспорядок, связанный с уступками, гражданскими беспорядками и частными войнами самых мелких пони. В некотором смысле, юг превратился в пародию на борьбу прошлых веков до объединения племён. Единственное место, приближающееся к мирному, - это Конфедераты, которые до сих пор казались довольными тем, что они сидели у своих границ и занимались своими предательскими делами.\n\nНо удивительно, что они обратились к нам с предложением оружия и материалов, и даже несколько волонтеров! Честно говоря, никто не уверен, как к этому относиться. Они так хотели уйти, но вот они, с подарками в копыте. Во всяком случае, кажется, что в тёмные времена пони всё ещё могут сплотиться."
+ scs.57.d:0 "Юг объял хаос, вызванный отделением, гражданскими беспорядками и частными войнами. В некотором смысле, юг превратился в пародию на борьбу прошлых веков до объединения племён. Единственное место, где сохраняется что-то похожее на мир - это территория конфедерации. Эти пони до сих пор казались довольными тем, что они сидели у своих границ и занимались своими предательскими делами.\n\nВесьма удивительно, но они обратились к нам с предложением оружия и материалов, и даже добровольцев! Честно говоря, никто не уверен, как к этому относиться. Они так хотели уйти, но вот они, с подарками в копытах. Во всяком случае, кажется, что в тёмные времена пони всё ещё могут сплотиться."
  scs.57.a:0 "Как заботливо. Однако они всё ещё сепаратисты." 
 
  scs.58.t:0 "Роялистская благотворительность"
@@ -966,7 +966,7 @@
  scs.60.a:0 "Отправить под суд этих пони."
  scs.60.b:0 "Они все просто разговаривают."
 
- scs.61.t:0 "Южные волонтеры"
+ scs.61.t:0 "Южные добровольцы"
  scs.61.d:0 "Пони, хлынувшие через эквестрийскую границу из Конфедерации, наконец, соединились с эквестрийской армией и были назначены на различные части фронта. Хотя многие в Кантерлоте и за его пределами немного сомнительны, никто не может отрицать их пыл. Эти "Фланчардские бригады" ценятся на вес золота как средство повышения боевого духа."
  scs.61.a:0 "Интересно."
 
diff --git a/localisation/russian/country_SRS_l_russian.yml b/localisation/russian/country_SRS_l_russian.yml
index 6e86e85e03b..9c2b9ccecba 100644
--- a/localisation/russian/country_SRS_l_russian.yml
+++ b/localisation/russian/country_SRS_l_russian.yml
@@ -446,7 +446,7 @@ the_revolutionary_decree_of_the_skynavian_socialist_republic_threat:0 "Рево
 SRS_offer_repeats_in_two_weeks:0 "Это событие появится снова через §Yдве недели§!."
 SRS_form_romau_peoples_legion:0 "§YНародный Легион Ромау§! прибудет в Скайнавию и присоединится к нам в революционной борьбе."
 SRS_form_wingbardy_volunteer_brigade:0 "\nТри формации §YВингбардийских социалистических волонтёров§! будут сформированы и развернуты."
-SRS_form_longsword_ponies_brigade:0 "\nДве бригады §YПони волонтеров§! из Лонгсворда прибудут в Скайнавию."
+SRS_form_longsword_ponies_brigade:0 "\nДве бригады §YПони-добровольцев§! из Лонгсворда прибудут в Скайнавию."
 SRS_unlocks_decisions_to_invite_others:0 "Разблокирует решения пригласить §Yдругие социалистические страны§! в §RИнтернационал§!."
 SRS_northern_war_has_been_resolved:0 "§RСеверная война§! была §Yзавершена§!."
 SRS_our_neighbours_have_been_liberated:0 "§YНаши соседи§! были §Rосвобождены§!."
diff --git a/localisation/russian/country_STW_l_russian.yml b/localisation/russian/country_STW_l_russian.yml
index edcb976e5aa..ae657af5e97 100644
--- a/localisation/russian/country_STW_l_russian.yml
+++ b/localisation/russian/country_STW_l_russian.yml
@@ -289,8 +289,8 @@
  STW_bomb_it_to_shit_focus_desc:0 "В случае войны наша армия, вполне вероятно, окажется в обороне от огромных сухопутных сил имперской армии. Тем не менее, разработка бомбардировщиков дальнего радиуса действия могла бы стать выгодным средством нападения на Грифенхейм и другие имперские центры."
  STW_plane_developement:0 "Смерть свыше"
  STW_plane_developement_desc:0 "Концепция ужасающей бомбардировки до сих пор дает многим в нашем верховном командовании повод дрожать. Тем не менее, по мере того, как реальность современной войны становится все более очевидной, гражданское население враждебных стран доказало свою эффективность в производстве военных материалов. Мы должны отказать противнику в таком имуществе."
- STW_anti_planes_bullets:0 "Волонтерский корпус ВВС"
- STW_anti_planes_bullets_desc:0 "По всей стране наше правительство устанавливает сотни зенитных орудий, которые защитят наши города и промышленные парки от угрозы воздушной бомбардировки. Тем не менее, наше гражданское население должно прислушаться к призыву и присоединиться к Волонтерскому Корпусу ВВС, что укомплектует эти орудия, когда раздастся сигнал тревоги."
+ STW_anti_planes_bullets:0 "Добровольческий корпус ВВС"
+ STW_anti_planes_bullets_desc:0 "По всей стране наше правительство устанавливает сотни зенитных орудий, которые защитят наши города и промышленные парки от угрозы воздушной бомбардировки. Тем не менее, наше гражданское население должно прислушаться к призыву и присоединиться к Добровольческому Корпусу ВВС, что укомплектует эти орудия, когда раздастся сигнал тревоги."
  STW_close_air_support:0 "Воздушный штурм"
  STW_close_air_support_desc:0 "Разработка нового класса самолетов, которые небольшие, маневренные и оснащены пушками и легкими бомбами, была бы весьма полезной. Они смогут разрушать боевые формирования противника и обеспечивать надежные средства для нападения на опорные пункты и бронетехнику."
  STW_more_fields:0 "Модернизировать летные поля"
diff --git a/localisation/russian/country_TAL_l_russian.yml b/localisation/russian/country_TAL_l_russian.yml
index dbbd7605f94..24a2a9417dd 100644
--- a/localisation/russian/country_TAL_l_russian.yml
+++ b/localisation/russian/country_TAL_l_russian.yml
@@ -1444,10 +1444,10 @@ TAL_new_gen_8:0 "§RАтака§!: §Y2§!\n§YОборона§!: §Y2§!\n§GП
 TAL_lrn_guards:0 "Две дивизии §YТалузских Стражей§! сформируются в Талононте.\n"
 TAL_lrn_knights:0 "Две дивизии §YТалузских Рыцарей§! сформируются в Талононте.\n"
 TAL_pc_militia:0 "Шесть дивизий §YОполченцев§! будут подняты по всей Талузе.\n"
-TAL_pl_volunteers:0 "Три дивизии §YВолонтеров§! будут сформированы в Талононте.\n"
+TAL_pl_volunteers:0 "Три дивизии §YДобровольцев§! будут сформированы в Талононте.\n"
 TAL_flt_guards:0 "Четыре дивизий §YСтражи§! будут сформированы в Талононте.\n"
 TAL_pc_militia_middle:0 "Три дивизии §YОполченцев§! будут подняты по всей Талузе.\n"
-TAL_pl_volunteer_middle:0 "Одна дивизия §YВолонтеров§! будут сформированы в Талононте.\n"
+TAL_pl_volunteer_middle:0 "Одна дивизия §YДобровольцев§! будет сформирована в Талононте.\n"
 TAL_mountaineer_divs:0 "Три дивизии §YГорно-стрелковых войск§! будут сформированы в Талононте.\n"
 TAL_knights_divs:0 "Три §YРыцарских§! дивизий будут сформированы в Талононте.\n"
 TAL_unlock_to_invite_more:0 "После завершения откроются §YРешения§! чтобы пригласить союзников."
diff --git a/localisation/russian/country_TBK_l_russian.yml b/localisation/russian/country_TBK_l_russian.yml
index e6488dc13fd..44763052b54 100644
--- a/localisation/russian/country_TBK_l_russian.yml
+++ b/localisation/russian/country_TBK_l_russian.yml
@@ -472,7 +472,7 @@ TBK_vasile_schools_desc: "Хотя формально это государст
 TBK_criminal_universities: "Азбука бизнеса"
 TBK_criminal_universities_desc: "Знаете, что было бы разумно? Научить наших малышей, как вести бизнес в этом страшном мире. Если они хотят добиться больших успехов, им придётся делать все правильно и внедрять инновации на постоянно меняющемся рынке идей и взяток. Надеюсь, они смогут расплатиться с долгами своих родителей!"
 
-TBK_vasile_economic_empire: "Традат Инкорпорейтэд"
+TBK_vasile_economic_empire: "Традат Инкорпорейтед"
 TBK_vasile_economic_empire_desc: "Знаете, что лучше, чем быть главой государства? Быть главой государства и иметь собственную корпорацию, которая настолько глубоко вплетена в формирование бюджета этого государства, что тебя никогда не смогут выкинуть". Эта идея почти вызвала слезы на глазах президента, или, по крайней мере, мы должны предположить, что это так. За такие слухи вас могут расстрелять."
 
 TBK_vasile_gun_industry: "Калибр .303 Традат"
@@ -750,7 +750,7 @@ TBK_vasile_principles:0 "Четыре И успеха"
 TBK_vasile_principles_desc:0 "Недавно один известный репортёр спросил президента, в чем секрет его успеха. После долгой паузы Василе сель Традат ответил, что все сводится к его четырём основным принципам, четырём И успеха: расшИряй, эксплуатИруй, унИчтожай и, самое главное, веселИсь."
 
 TBK_truly_free_republic:0 "Единственная в мире свободная республика"
-TBK_truly_free_republic_desc:0 "Все республики мира называют себя бастионами свободы, но на самом деле они ограничивают истинную свободу и сковывают новаторов своей страны. Те, кто двигает вперёд экономику, просто будучи лучше других, - вот кто должен быть наделён властью! В Тобуке все по-другому; любой, обладающий умением, хитростью и волей, может добиться большого успеха.!"
+TBK_truly_free_republic_desc:0 "Все республики мира называют себя бастионами свободы, но на самом деле они ограничивают истинную свободу и сковывают новаторов своей страны. Те, кто двигает вперёд экономику, просто будучи лучше других, - вот кто должен быть наделён властью! В Тобуке все по-другому; любой, обладающий умением, хитростью и волей, может добиться большого успеха!"
 
 TBK_king_of_corruption:0 "Король коррупции"
 TBK_king_of_corruption_desc:0 "Не секрет, что слово Василе - закон, даже если он просто президент и "технически" подчиняется народу. Каждый гражданин, преступник и наёмник знает, что если президент говорит, что нужно дать денег, то единственный правильный ответ - спросить: - Сколько? - "
@@ -2487,7 +2487,7 @@ tobuck_start.13.d:0 "Моей возлюбленной через море,\n\n
 tobuck_start.13.a:0 "Со всей моей любовью,\n- Пи"
 
 tobuck_start.14.t:0 "Наши мечты стали явью"
-tobuck_start.14.d:0 "Моей возлюбленной через море,\n\nВ этом письме я позволю себе немного похвалить себя. Я очень горжусь причиной, по которой пишу это письмо. С тех пор, как я в последний раз брал перо в копыта наше новообретённое богатство снова пропорционально выросло, и моё пребывание в Зебрике в качестве государственного служащего подходит к концу.\n\nКогда я вернусь домой, я был бы признателен, если бы мне не задавали вопросов о моем пребывании в Тобуке; главным образом потому, что теперь я хочу вообще избегать мира политики. Я надеюсь, что, несмотря на моё короткое пребывание там, они вспоминают меня с любовью. Хотя, как я уже сказал, я хотел бы не задумываться об этой стране, если это возможно. Я провёл так много времени вдали от тебя, Мэйфлауэр. Я проводил здесь каждую свободную минуту своего времени, мечтая оказаться дома с тобой и нашими малышами. Я буду дома раньше, чем ты успеешь снова пожаловаться на моё отсутствие, обещаю.\n\nС богатством, которое я здесь накопил, мы сможем жить как настоящие аристократы после моего возвращения. У нас будут самые красивые дома, лучшая одежда и еда, а для Поппи и Акации - самые лучшие места в самых престижных школах. Вам больше никогда в жизни не придётся работать, даже если солнце и луна перестанут освещать мир.\n\nВ этом письме я клянусь вам, что за моё отсутствие и за то, что я сосредоточен на своей работе, мне больше никогда не понадобится совершать такую экспедицию, как эта. Мне жаль, что я оставил тебя одну заботиться о наших малышах, и, возможно, я никогда не смогу вернуть год с нашими малышами, который я потерял, но когда я вернусь, я больше никогда не потеряю ни минуты времени с вами. Я знаю, ты понимаешь, почему я должен был это сделать, ради семьи; но я всё равно хотел бы, чтобы у меня был другой выбор.\n\nВ любом случае, я скоро напишу тебе о дате моего возвращения в Эквестрию. Я жду этого так же сильно, как и вы все, и я привезу самые лучшие подарки, какие только смогу найти."
+tobuck_start.14.d:0 "Моей возлюбленной через море,\n\nВ этом письме я позволю себе немного похвалить себя. Я очень горжусь причиной, по которой пишу это письмо. С тех пор, как я в последний раз брал перо в копыта наше новообретённое богатство снова пропорционально выросло, и моё пребывание в Зебрике в качестве государственного служащего подходит к концу.\n\nКогда я вернусь домой, я был бы признателен, если бы мне не задавали вопросов о моем пребывании в Тобуке; главным образом потому, что теперь я хочу вообще избегать мира политики. Я надеюсь, что, несмотря на моё короткое пребывание там, они вспоминают меня с любовью. Хотя, как я уже сказал, я хотел бы не задумываться об этой стране, если это возможно. Я провёл так много времени вдали от тебя, Мейфлауэр. Я проводил здесь каждую свободную минуту своего времени, мечтая оказаться дома с тобой и нашими малышами. Я буду дома раньше, чем ты успеешь снова пожаловаться на моё отсутствие, обещаю.\n\nС богатством, которое я здесь накопил, мы сможем жить как настоящие аристократы после моего возвращения. У нас будут самые красивые дома, лучшая одежда и еда, а для Поппи и Акации - самые лучшие места в самых престижных школах. Вам больше никогда в жизни не придётся работать, даже если солнце и луна перестанут освещать мир.\n\nВ этом письме я клянусь вам, что за моё отсутствие и за то, что я сосредоточен на своей работе, мне больше никогда не понадобится совершать такую экспедицию, как эта. Мне жаль, что я оставил тебя одну заботиться о наших малышах, и, возможно, я никогда не смогу вернуть год с нашими малышами, который я потерял, но когда я вернусь, я больше никогда не потеряю ни минуты времени с вами. Я знаю, ты понимаешь, почему я должен был это сделать, ради семьи; но я всё равно хотел бы, чтобы у меня был другой выбор.\n\nВ любом случае, я скоро напишу тебе о дате моего возвращения в Эквестрию. Я жду этого так же сильно, как и вы все, и я привезу самые лучшие подарки, какие только смогу найти."
 tobuck_start.14.a:0 "Со всей моей любовью,\n- Пи"
 
 tobuck_start.15.t:0 "Отправление"
@@ -2499,23 +2499,23 @@ tobuck_start.16.d:0 "Всё пошло совсем не по плану.\n\nВ
 tobuck_start.16.a:0 "А у них будет явно много забот."
 
 tobuck_start.17.t:0 "Домой с пустыми копытами"
-tobuck_start.17.d:0 "Тартар, что Пи должен был им сказать? Он был вдали от дома так долго, что его жеребята уже могли начать забывать, как он вообще выглядит, и ему почти нечего было показать.\n\nШутер стоял недалеко от дома своей семьи около полуночи, неся чемодан с теми немногими вещами, которые у него были. Ему так сильно хотелось постучать в дверь, что это буквально приносило физическую боль, но впервые за долгое время бывший оружейный барон испугался. Его жена и жеребята ждали того момента, когда он наконец вернётся домой, они понимали, почему ему пришлось уехать, но от этого перспектива вернуться с таким малым запасом денег не делала ситуацию лучше. Радость на их лицах была бы настоящей, но таким же реальным был бы и огромный долг и тот факт, что они всё ещё не могли позволить себе отправить Акацию и Поппи в школу.\n\nПони в тёмном пальто медленно опустился на ступеньки перед входом в квартиру и вздохнул. Копыто, которое он неуверенно протянул к дверной ручке, теперь твёрдо стояло на полу. Что Пи должен сказать? Что он может сделать, кроме как извиниться и пообещать, что в следующий раз всё получится? Что Шутер вообще тут делал? Да, он вернулся домой, но теперь всё, что ему остаётся, так это просто сказать своей семье, что он всё испортил и что его не будет ещё один год? А ведь к этому времени его жеребята уже вырастут.\n\nНа какое-то время бывший торговец оружием уткнулся мордой в куртку и просто сидел, пытаясь и по большей части безуспешно переварить всё это. Он был ужасным бизнеспони и отвратительным отцом.\n\nКак раз в тот момент, когда он поднимался, входная дверь медленно открылась изнутри. — "Сэр, я боюсь, что-" — Мэйфлауэр Бед на секунду замерла, когда увидела лицо своего мужа, — "П-Пи? Слава Селестии, я... О, я так по тебе скучала!"\n\nЕё неуверенное выражение лица быстро сменилось радостны шоком, когда она стащила своего мужа со ступенек и втащила его внутрь. Мэйфлауэр едва могла сдерживаться, в одно мгновение рассеяв все опасения Шутера.\n\n— "Мэй... мне жаль, я не смог-""
+tobuck_start.17.d:0 "Тартар, что Пи должен был им сказать? Он был вдали от дома так долго, что его жеребята уже могли начать забывать, как он вообще выглядит, и ему почти нечего было показать.\n\nШутер стоял недалеко от дома своей семьи около полуночи, неся чемодан с теми немногими вещами, которые у него были. Ему так сильно хотелось постучать в дверь, что это буквально приносило физическую боль, но впервые за долгое время бывший оружейный барон испугался. Его жена и жеребята ждали того момента, когда он наконец вернётся домой, они понимали, почему ему пришлось уехать, но от этого перспектива вернуться с таким малым запасом денег не делала ситуацию лучше. Радость на их лицах была бы настоящей, но таким же реальным был бы и огромный долг и тот факт, что они всё ещё не могли позволить себе отправить Акацию и Поппи в школу.\n\nПони в тёмном пальто медленно опустился на ступеньки перед входом в квартиру и вздохнул. Копыто, которое он неуверенно протянул к дверной ручке, теперь твёрдо стояло на полу. Что Пи должен сказать? Что он может сделать, кроме как извиниться и пообещать, что в следующий раз всё получится? Что Шутер вообще тут делал? Да, он вернулся домой, но теперь всё, что ему остаётся, так это просто сказать своей семье, что он всё испортил и что его не будет ещё один год? А ведь к этому времени его жеребята уже вырастут.\n\nНа какое-то время бывший торговец оружием уткнулся мордой в куртку и просто сидел, пытаясь и по большей части безуспешно переварить всё это. Он был ужасным бизнеспони и отвратительным отцом.\n\nКак раз в тот момент, когда он поднимался, входная дверь медленно открылась изнутри. — "Сэр, я боюсь, что-" — Мейфлауэр Бед на секунду замерла, когда увидела лицо своего мужа, — "П-Пи? Слава Селестии, я... О, я так по тебе скучала!"\n\nЕё неуверенное выражение лица быстро сменилось радостны шоком, когда она стащила своего мужа со ступенек и втащила его внутрь. Мейфлауэр едва могла сдерживаться, в одно мгновение рассеяв все опасения Шутера.\n\n— "Мэй... мне жаль, я не смог-""
 tobuck_start.17.a:0 ""Тише... всё в порядке. Я понимаю. Всё будет хорошо.""
 
 tobuck_start.18.t:0 "Душа в спокойствии"
-tobuck_start.18.d:0 "Была середина дня, солнце палило вовсю, но Пи Шутер всё ещё нервничал. Несмотря на то, что он провёл много времени на другом конце света, было накоплено достаточно денег только для того, чтобы содержать их семью на самом базовом уровне. Вероятно, они могли бы расплатиться со своими унаследованными долгами, средств на которые, как он надеялся, будет достаточно.\n\nПрогуливаясь по деревенскому рынку по дороге к дому, несколько знакомых узнали бывшего оружейного барона и помахали ему копытом или спросили, где он был. Обычно ответом было, что Пи был ‘в деловой поездке’ или вообще ‘занимался семейными делами’ продолжая бежать рысью. Он был просто слишком сильно сосредоточен на других вещах, чтобы должным образом реагировать.\n\nВ конце концов Шутер остановился и объяснил постепенно растущей группе старых друзей, — "Мне очень жаль, парни, но я должен вернуться домой и увидеть Мэйфлауэр. Она не видела меня дольше, чем вы, ребята."\n\nНа это толпа сразу же замолчала, несколько раз кивнула Пи и высказав слова одобрения вернулась в свои палатки и дома. Бывший оружейный барон скучал по тем временам, когда все знали, кто он такой, и ценили его за то, что он был очень порядочным пони.\n\nК удивлению Пи, семья уже ждала его.\n\n— "Папа! Пааапааа!" — крикнула Акация, бросаясь к нему.\n\nВскоре за ней последовала Поппи, и жеребцы врезались в него, чуть не сбив с ног своего отца. — "Мы так по тебе скучали..."\n\n— "Я тоже скучал по вам." — ухитрился он ответить, сделав всё возможное, чтобы обнять их обоих, улыбаясь Мэйфлауэр, которая направлялась к семье, наконец единой."
+tobuck_start.18.d:0 "Была середина дня, солнце палило вовсю, но Пи Шутер всё ещё нервничал. Несмотря на то, что он провёл много времени на другом конце света, было накоплено достаточно денег только для того, чтобы содержать их семью на самом базовом уровне. Вероятно, они могли бы расплатиться со своими унаследованными долгами, средств на которые, как он надеялся, будет достаточно.\n\nПрогуливаясь по деревенскому рынку по дороге к дому, несколько знакомых узнали бывшего оружейного барона и помахали ему копытом или спросили, где он был. Обычно ответом было, что Пи был ‘в деловой поездке’ или вообще ‘занимался семейными делами’ продолжая бежать рысью. Он был просто слишком сильно сосредоточен на других вещах, чтобы должным образом реагировать.\n\nВ конце концов Шутер остановился и объяснил постепенно растущей группе старых друзей, — "Мне очень жаль, парни, но я должен вернуться домой и увидеть Мейфлауэр. Она не видела меня дольше, чем вы, ребята."\n\nНа это толпа сразу же замолчала, несколько раз кивнула Пи и высказав слова одобрения вернулась в свои палатки и дома. Бывший оружейный барон скучал по тем временам, когда все знали, кто он такой, и ценили его за то, что он был очень порядочным пони.\n\nК удивлению Пи, семья уже ждала его.\n\n— "Папа! Пааапааа!" — крикнула Акация, бросаясь к нему.\n\nВскоре за ней последовала Поппи, и жеребцы врезались в него, чуть не сбив с ног своего отца. — "Мы так по тебе скучали..."\n\n— "Я тоже скучал по вам." — ухитрился он ответить, сделав всё возможное, чтобы обнять их обоих, улыбаясь Мейфлауэр, которая направлялась к семье, наконец единой."
 tobuck_start.18.a:0 ""Я так по вам по всем скучал.""
 
 tobuck_start.19.t:0 "Хорошо выполненная работа"
-tobuck_start.19.d:0 "— "Знаешь, я хотел вернуться с большей суммой денег." — тихо признался Пи Шутер, сделав глоток дорогого виски.\n\nМэйфлауэр Бед повернулась, чтобы посмотреть на своего мужа, явно не удивившись его словам. — "Ты правда думал, что сможешь получить ещё больше денег, не так ли? После погашения долга, оставленного нам моим отцом, после оплаты их обучения, ты всё ещё хочешь вернуться туда и попробовать ещё раз?"\n\nСидя рядом друг с другом на диване, они повернулись, чтобы посмотреть, как их жеребята играют с новыми игрушками, подаренными им Пи. Теперь они были счастливы и уверены в своей жизни и будущем, но их отец всё ещё жалел, что не мог дать им больше за то, что он так долго отсутствовал. Шутер уже не увидел так много моментов из их жеребячьего детства, пока трудился, просто чтобы дать им всем шанс на лучшую жизнь.\n\nОн вздохнул и уютно устроился на пальто жены, слегка нахмурившись. — "Наверное. В смысле, я стал счастливее, наши дети стали счастливее, и - я надеюсь - ты тоже; но я чувствую, что мог бы сделать больше за то время, что провёл вдали от дома. Я мог бы оплатить им учёбу в лучшей школе, мы могли бы даже переехать. Может быть, я мог бы получить столько денег, чтобы нам вовсе не пришлось работать."\n\nОна кивнула и обхватила копытом своего мужа, время от времени поглядывая на Акацию и Поппи, чтобы убедиться, что они не делают ничего слишком глупого. — "Может быть, но сейчас ты дома. И мы счастливы за то, что ты сделал, независимо от того, мог ты заработать больше или нет. У наших малышей теперь есть шанс пробиться в высшее общество, и мы можем уйти на пенсию раньше большинства. И всё это благодаря тебе. Мы свободны жить своей жизнью благодаря тебе."\n\nНекоторое время они оба сидели молча, пока Пи размышлял про себя, обдумывая свои собственные чувства. Он действительно сделал много - возможно, достаточно, - и теперь не имело значения, сделал ли он всё, что мог, или нет."
+tobuck_start.19.d:0 "— "Знаешь, я хотел вернуться с большей суммой денег." — тихо признался Пи Шутер, сделав глоток дорогого виски.\n\nМейфлауэр Бед повернулась, чтобы посмотреть на своего мужа, явно не удивившись его словам. — "Ты правда думал, что сможешь получить ещё больше денег, не так ли? После погашения долга, оставленного нам моим отцом, после оплаты их обучения, ты всё ещё хочешь вернуться туда и попробовать ещё раз?"\n\nСидя рядом друг с другом на диване, они повернулись, чтобы посмотреть, как их жеребята играют с новыми игрушками, подаренными им Пи. Теперь они были счастливы и уверены в своей жизни и будущем, но их отец всё ещё жалел, что не мог дать им больше за то, что он так долго отсутствовал. Шутер уже не увидел так много моментов из их жеребячьего детства, пока трудился, просто чтобы дать им всем шанс на лучшую жизнь.\n\nОн вздохнул и уютно устроился на пальто жены, слегка нахмурившись. — "Наверное. В смысле, я стал счастливее, наши дети стали счастливее, и - я надеюсь - ты тоже; но я чувствую, что мог бы сделать больше за то время, что провёл вдали от дома. Я мог бы оплатить им учёбу в лучшей школе, мы могли бы даже переехать. Может быть, я мог бы получить столько денег, чтобы нам вовсе не пришлось работать."\n\nОна кивнула и обхватила копытом своего мужа, время от времени поглядывая на Акацию и Поппи, чтобы убедиться, что они не делают ничего слишком глупого. — "Может быть, но сейчас ты дома. И мы счастливы за то, что ты сделал, независимо от того, мог ты заработать больше или нет. У наших малышей теперь есть шанс пробиться в высшее общество, и мы можем уйти на пенсию раньше большинства. И всё это благодаря тебе. Мы свободны жить своей жизнью благодаря тебе."\n\nНекоторое время они оба сидели молча, пока Пи размышлял про себя, обдумывая свои собственные чувства. Он действительно сделал много - возможно, достаточно, - и теперь не имело значения, сделал ли он всё, что мог, или нет."
 tobuck_start.19.a:0 ""Знаешь, я люблю тебя, Мэй""
 
 tobuck_start.20.t:0 "Все заботы исчезли"
-tobuck_start.20.d:0 "— "Тебе так сильно хотелось тащить нас сюда? Еда в этом заведении стоит больше, чем я зарабатываю за неделю!" — жаловалась Мэйфлауэр, скорее шутя, нежели чем из-за настоящего недовольства.\n\nПи Шутер повернулся и посмотрел на свою жену с тёплой улыбкой, — "Да. Я хотел показать тебе, что больше не нужно беспокоиться о деньгах. Очевидно, что мы не можем жить совсем уж в роскоши, но можем позволить себе время от времени посещать модные рестораны, подобные этому. Более того, у нас наконец-то появилась возможность переехать в более красивый дом и обходиться тем, что у нас есть. Ты вообще можешь уволиться с работы завтра, если хочешь."\n\nОна усмехнулась, затем покачала головой. — "Если бы я ушел с работы, мне было бы безумно скучно, и ты это знаешь. Хотя... Может быть, я могу поискать какую-нибудь более комфортную работу или, я бы даже сказала, приносящую удовольствие в первую очередь."\n\nСупружеская пара тепло улыбнулась друг другу, и Пи наклонился, чтобы поцеловать жену в щёку. Однако безмятежность момента была быстро нарушена, когда их жеребята прибежали из буфета со всевозможными блюдами, которые они никогда раньше не пробовали. Акация чуть не уронила большую вазу с редкими цветами, а Поппи уже испортила своё лучшее платье соусом для спагетти.\n\nПоставив тарелку на стол и внезапно осознав свою ошибку, жеребёнок ахнула и посмотрела на Мэйфлауэр так, словно она только что обрекла их всех на гибель. — "П-прости, мама, Я не хотела испачкать твоё платье, я случайно!"\n\nКак раз в тот момент, когда кобылка вздохнула, думая о цене одежды, Пи обхватил копытом её бочок и улыбнулся. — "Все в порядке, милая, мы можем купить тебе новое прямо сейчас. Постарайся не портить свою одежду в будущем, хорошо? И помни - неудачи это не конец света.""
+tobuck_start.20.d:0 "— "Тебе так сильно хотелось тащить нас сюда? Еда в этом заведении стоит больше, чем я зарабатываю за неделю!" — жаловалась Мейфлауэр, скорее шутя, нежели чем из-за настоящего недовольства.\n\nПи Шутер повернулся и посмотрел на свою жену с тёплой улыбкой, — "Да. Я хотел показать тебе, что больше не нужно беспокоиться о деньгах. Очевидно, что мы не можем жить совсем уж в роскоши, но можем позволить себе время от времени посещать модные рестораны, подобные этому. Более того, у нас наконец-то появилась возможность переехать в более красивый дом и обходиться тем, что у нас есть. Ты вообще можешь уволиться с работы завтра, если хочешь."\n\nОна усмехнулась, затем покачала головой. — "Если бы я ушел с работы, мне было бы безумно скучно, и ты это знаешь. Хотя... Может быть, я могу поискать какую-нибудь более комфортную работу или, я бы даже сказала, приносящую удовольствие в первую очередь."\n\nСупружеская пара тепло улыбнулась друг другу, и Пи наклонился, чтобы поцеловать жену в щёку. Однако безмятежность момента была быстро нарушена, когда их жеребята прибежали из буфета со всевозможными блюдами, которые они никогда раньше не пробовали. Акация чуть не уронила большую вазу с редкими цветами, а Поппи уже испортила своё лучшее платье соусом для спагетти.\n\nПоставив тарелку на стол и внезапно осознав свою ошибку, жеребёнок ахнула и посмотрела на Мейфлауэр так, словно она только что обрекла их всех на гибель. — "П-прости, мама, Я не хотела испачкать твоё платье, я случайно!"\n\nКак раз в тот момент, когда кобылка вздохнула, думая о цене одежды, Пи обхватил копытом её бочок и улыбнулся. — "Все в порядке, милая, мы можем купить тебе новое прямо сейчас. Постарайся не портить свою одежду в будущем, хорошо? И помни - неудачи это не конец света.""
 tobuck_start.20.a:0 "Отчаяние кобылки в одно мгновение превратилось в радость."
 
 tobuck_start.21.t:0 "Деньги - не проблема"
-tobuck_start.21.d:0 "Было немного странно, что они были одни в этой поездке, учитывая, что здешний особняк был чем-то вроде местной достопримечательности из-за своей истории, но Пи, скорее всего, просто заполнил другие места в туре, заплатив за них. Также было необычным то, что, дворецкий водил их будто по купленному дому, и показывал все комнаты, которые обычно не допускались к публичному просмотру, но деньги всегда позволяли добиться большей части привилегий.\n\n— "...а это, как вы можете догадаться, одна из спален для жеребят. Как вы можете видеть, она оформлена в приятном деревенском стиле, но, тем не менее, в комнате можно установить множество современных удобств..."\n\nПока пони экстраполировал дальше, Мэйфлауэр повернулась к мужу и заговорила шепотом. — "Мне кажется, или он говорит так, будто мы собираемся купить это место? Скорее даже так, как будто мы уже владеем им? Я конечно не жалуюсь, но... это немного странно для тура, не так ли?"\n\n— "Да, думаю это немного странно, по крайне мере для экскурсии." — ответил Пи с улыбкой на лице.\n\nВ этот момент его жена остановилась как вкопанная с широко раскрытыми глазами, и все пони повернулись, обратив внимание на неё. "Оооо нееет... нет, нет, нет, нет, нет, ты же не сделал этого; серьёзно?"\n\n— "Что-то не так, мэм? Ремонт вам не по вкусу?" — спросил дворецкий, переводя взгляд с одного супруга на другого со своей собственной понимающей улыбкой.\n\nАкация и Поппи уставились тупым взглядом на Пи, потом на Мэйфлауэр, потом снова на Пи. Что происходит? Случилось ли что-то ужасное или произошло что-то прекрасное? Иногда взрослых пони было трудно понять.\n\n— "Если вы думаете, что я купил это поместье без необходимости в ипотеке или каком-либо кредите, то да; это именно то, что я сделал. И прежде чем вы двое спросите, да, это означает, что вы можете прыгать на кроватях. Матрасы в любом случае нуждаются в тестировании." — ответил он, издав лёгкий смешок и ласково подтолкнув Акацию к её новой кроватке с балдахином.\n\nДворецкий сам не смог удержаться от лёгкого смеха, наблюдая, как малыши переглянулись и побежали к кроватям, только сейчас поняв, к чему была вся эта экскурсия. Мэйфлауэр тем временем подошла к своему мужу с почти неразборчивым взглядом, прежде чем наклонилась поближе и запечатлела глубокий поцелуй на его губах."
+tobuck_start.21.d:0 "Было немного странно, что они были одни в этой поездке, учитывая, что здешний особняк был чем-то вроде местной достопримечательности из-за своей истории, но Пи, скорее всего, просто заполнил другие места в туре, заплатив за них. Также было необычным то, что, дворецкий водил их будто по купленному дому, и показывал все комнаты, которые обычно не допускались к публичному просмотру, но деньги всегда позволяли добиться большей части привилегий.\n\n— "...а это, как вы можете догадаться, одна из спален для жеребят. Как вы можете видеть, она оформлена в приятном деревенском стиле, но, тем не менее, в комнате можно установить множество современных удобств..."\n\nПока пони экстраполировал дальше, Мейфлауэр повернулась к мужу и заговорила шепотом. — "Мне кажется, или он говорит так, будто мы собираемся купить это место? Скорее даже так, как будто мы уже владеем им? Я конечно не жалуюсь, но... это немного странно для тура, не так ли?"\n\n— "Да, думаю это немного странно, по крайне мере для экскурсии." — ответил Пи с улыбкой на лице.\n\nВ этот момент его жена остановилась как вкопанная с широко раскрытыми глазами, и все пони повернулись, обратив внимание на неё. "Оооо нееет... нет, нет, нет, нет, нет, ты же не сделал этого; серьёзно?"\n\n— "Что-то не так, мэм? Ремонт вам не по вкусу?" — спросил дворецкий, переводя взгляд с одного супруга на другого со своей собственной понимающей улыбкой.\n\nАкация и Поппи уставились тупым взглядом на Пи, потом на Мейфлауэр, потом снова на Пи. Что происходит? Случилось ли что-то ужасное или произошло что-то прекрасное? Иногда взрослых пони было трудно понять.\n\n— "Если вы думаете, что я купил это поместье без необходимости в ипотеке или каком-либо кредите, то да; это именно то, что я сделал. И прежде чем вы двое спросите, да, это означает, что вы можете прыгать на кроватях. Матрасы в любом случае нуждаются в тестировании." — ответил он, издав лёгкий смешок и ласково подтолкнув Акацию к её новой кроватке с балдахином.\n\nДворецкий сам не смог удержаться от лёгкого смеха, наблюдая, как малыши переглянулись и побежали к кроватям, только сейчас поняв, к чему была вся эта экскурсия. Мейфлауэр тем временем подошла к своему мужу с почти неразборчивым взглядом, прежде чем наклонилась поближе и запечатлела глубокий поцелуй на его губах."
 tobuck_start.21.a:0 ""Я когда-нибудь говорил тебе, как сильно я люблю тебя, пирожочек?""
 
 tobuck_start.22.t:0 "Военачальники захватывают власть"
@@ -2592,7 +2592,7 @@ tobuck_start.35.a:0 "Он надеялся, что оно того стоило.
 ### Vasile events
 
 tobuck_vasile.1.t:0 "Экстра, экстра!"
-tobuck_vasile.1.d:0 " — Всем срочно читать! У нас есть последние новости, друзья! Пи Шутер, имя, которое едва известно, отвечает за все! Приходите за газетами сюда! — трубила уличная торговка, уже опустошившая свои запасы на этот день.\n\nМногие пони по понятным причинам были потрясены тем, что они читали. Как будто концепция республики сама по себе была недостаточно плоха, теперь они узнали, что всё это было фикцией от начала и до конца! По крайней мере, никто не удивился тому, что президентом легко манипулировать, учитывая, что он почти всегда был подвыпившим; но тот факт, что такое ожидалось, был отвратителен сам по себе. Что в Тартаре делает республика, если она не управлется на благо народа?\n\nЗа пределами кафе два старых друга общались и делились новостями. Они оба были раздражены, хотя и не совсем потрясены случившимся.\n\nКобыла с коричневой шерстью ворчала, отпивая слишком горячий чай. — Ну, я, например, теперь скажу: — Я же тебе говорила. — Гиггл был имбецилом, он никак не мог управлять этим местом; хотя, признаться, я не думала, что его помощь была бы настолько... ну, преступной, я полагаю. —\n\nЖеребец, сидящий напротив, сгибал крылья и медленно кивал, испуская вздох разочарования. — Да, ты меня понял. Что-то подсказывает мне, что ты не удовлетворишься тем, что хоть раз был прав.\n\n— Туше. — Она быстро добавила с ухмылкой.\n\n — Что мне кажется странным, так это то, что, несмотря на очевидную власть практически во всем, республика не рухнула. Этот грифон просто вошел и все уладил, понимаешь? Я не думаю, что государство может так просто избавиться от коррупции. — Пегас в ответ усмехнулся.\n\nЕго друг поднял бровь, явно удивленный тем, что он посчитал очевидным наблюдением. — Хм. Я не подумал об этом... — "
+tobuck_vasile.1.d:0 " — Всем срочно читать! У нас есть последние новости, друзья! Пи Шутер, имя, которое едва известно, отвечает за все! Приходите за газетами сюда! — трубила уличная торговка, уже опустошившая свои запасы на этот день.\n\nМногие пони по понятным причинам были потрясены тем, что они читали. Как будто концепция республики сама по себе была недостаточно плоха, теперь они узнали, что всё это было фикцией от начала и до конца! По крайней мере, никто не удивился тому, что президентом легко манипулировать, учитывая, что он почти всегда был подвыпившим; но тот факт, что такое ожидалось, был отвратителен сам по себе. Что в Тартаре делает республика, если она не управляется на благо народа?\n\nЗа пределами кафе два старых друга общались и делились новостями. Они оба были раздражены, хотя и не совсем потрясены случившимся.\n\nКобыла с коричневой шерстью ворчала, отпивая слишком горячий чай. — Ну, я, например, теперь скажу: — Я же тебе говорила. — Гиггл был имбецилом, он никак не мог управлять этим местом; хотя, признаться, я не думала, что его помощь была бы настолько... ну, преступной, я полагаю. —\n\nЖеребец, сидящий напротив, сгибал крылья и медленно кивал, испуская вздох разочарования. — Да, ты меня понял. Что-то подсказывает мне, что ты не удовлетворишься тем, что хоть раз был прав.\n\n— Туше. — Она быстро добавила с ухмылкой.\n\n — Что мне кажется странным, так это то, что, несмотря на очевидную власть практически во всем, республика не рухнула. Этот грифон просто вошел и все уладил, понимаешь? Я не думаю, что государство может так просто избавиться от коррупции. — Пегас в ответ усмехнулся.\n\nЕго друг поднял бровь, явно удивленный тем, что он посчитал очевидным наблюдением. — Хм. Я не подумал об этом... — "
 tobuck_vasile.1.a:0 "— ...По крайней мере, мы точно знаем, что Пи был угрозой, верно? — "
 
 tobuck_vasile.2.t:0 "Заключительные размышления"
@@ -2607,7 +2607,7 @@ tobuck_vasile.3.d:0 "Халфпенни Хафф хмыкнула, вздохн
 tobuck_vasile.3.a:0 "Работа, конечно, не давала им покоя."
 
 tobuck_vasile.4.t:0 "Верховенство закона"
-tobuck_vasile.4.d:0 " — Кобылы и джентекольты присяжные, боюсь, что улики действительно говорят сами за себя. У нас есть несколько дел, касающихся растраты государственных средств и подрыва президентской власти. — \n\nКроме этих слов Туф Барк почти ничего не помнила. Она знала, что все доказательства были подделаны, но ничего не могла сделать, чтобы доказать, что они были созданы недобросовестно или приписаны ей, если в документах была хоть крупица реальности. По правде говоря, она знала о некоторых существах, которые занимались не слишком приятными делами, и большинство из них можно было связать с Василе; именно поэтому она и стала мишенью.\n\nОна, вероятно, была одной из единственных по-настоящему невинных пони, оставшихся там, если принять во внимание все обстоятельства; но в этом не было ничего удивительного. Некоторые государственные служащие, которых она знала довольно хорошо, сами, предположительно, находились в тюрьме для проведения испытаний, подобных тому, через которые прошла она.\n\nСидящий напротив нее другой заключенный, которого вывозили из столицы, улыбнулся. — Так за что это тебя, а? По-моему, ты не очень похожа на преступника, а может, ты нечто большее, чем кажешься.\n\nВзглянув на огромных размеров зебру, сидящую перед ней, Таф чуть не подавилась собственным языком. — Растраты, налоговое мошенничество, фальсификация выборов и так далее. — \n\n — По мне, ты обычный политик. — Он предложил с легким смешком. — Эх, прости. Это ведь дело всей твоей жизни, не так ли? Многообещающая карьера, я прав? — \n\nНа это Туф Барк просто кивнула. Все было стерто в одном подстроенном судебном процессе, в котором её выставили дурой и идиоткой за то, чего она даже не совершала. Теперь ей предстояло провести следующее десятилетие или два в тюрьме.."
+tobuck_vasile.4.d:0 " — Кобылы и джентлькольты присяжные, боюсь, что улики действительно говорят сами за себя. У нас есть несколько дел, касающихся растраты государственных средств и подрыва президентской власти. — \n\nКроме этих слов Туф Барк почти ничего не помнила. Она знала, что все доказательства были подделаны, но ничего не могла сделать, чтобы доказать, что они были созданы недобросовестно или приписаны ей, если в документах была хоть крупица реальности. По правде говоря, она знала о некоторых существах, которые занимались не слишком приятными делами, и большинство из них можно было связать с Василе; именно поэтому она и стала мишенью.\n\nОна, вероятно, была одной из единственных по-настоящему невинных пони, оставшихся там, если принять во внимание все обстоятельства; но в этом не было ничего удивительного. Некоторые государственные служащие, которых она знала довольно хорошо, сами, предположительно, находились в тюрьме для проведения испытаний, подобных тому, через которые прошла она.\n\nСидящий напротив нее другой заключенный, которого вывозили из столицы, улыбнулся. — Так за что это тебя, а? По-моему, ты не очень похожа на преступника, а может, ты нечто большее, чем кажешься.\n\nВзглянув на огромных размеров зебру, сидящую перед ней, Таф чуть не подавилась собственным языком. — Растраты, налоговое мошенничество, фальсификация выборов и так далее. — \n\n — По мне, ты обычный политик. — Он предложил с легким смешком. — Эх, прости. Это ведь дело всей твоей жизни, не так ли? Многообещающая карьера, я прав? — \n\nНа это Туф Барк просто кивнула. Все было стерто в одном подстроенном судебном процессе, в котором её выставили дурой и идиоткой за то, чего она даже не совершала. Теперь ей предстояло провести следующее десятилетие или два в тюрьме.."
 tobuck_vasile.4.a:0 "Василе был судьей, присяжным и палачом."
 
 tobuck_vasile.5.t:0 "Старые методы"
@@ -2637,7 +2637,7 @@ tobuck_vasile.10.d:0 "Как они могли отказаться от пре
 tobuck_vasile.10.a:0 " — Отлично. Цена отвлечёт меня от мыслей об этих идиотах. — "
 
 tobuck_vasile.11.t:0 "Кем был Пи Шутер?"
-tobuck_vasile.11.d:0 "Что это был за день.\n\nСемнадцать обвинительных приговоров и ещё одна партия потенциальных преступников, на которых завтра также может быть заведено дело. Парочка вышла на свободу, скорее из-за отсутствия улик, чем из-за чего-то ещё, но Квик Слэм не отличался снисходительностью в суде.\n\nПоследнее дело сегодняшнего дня было самым крупным, но оно же было и таким, в котором его решение имело наименьшее значение. В конце концов, они не могли просто отправится в Эквестрию и увезти пони на другой континент; по крайней мере, без нарушения целого ряда законов. Приговор, конечно, будет обвинительным, это не вызывало сомнений, учитывая доказанные улики и множество возможных дополнительных преступлений, которые оставались неприкосновенными, но вряд ли он видел, что из этого что-то выйдет.\n\nДав им, по общему признанию, короткое время на размышление, судья обратился к присяжным. — Встаньте, пожалуйста, старшина присяжных. Присяжные вынесли единогласный вердикт? — \n\nМолодая зебра стояла с озабоченным выражением лица. — Так и есть, ваша честь. Однако, учитывая характер этого процесса и нынешнее местонахождение подсудимого, препятствующее его наказанию; присяжные единогласно приняли решение о дополнительных действиях для суда помимо объявления вердикта. — \n\nКвик дёрнул ухом, понимая, к чему все идёт и насколько это может быть опасно для Василе. Он был здесь по просьбе президента, и разрешить такую просьбу было опасно, но и отказ в надлежащей правовой процедуре мог вызвать бурю.\n\nЕдинорог неуверенно кивнул, шаркнув копытами. — Представь свой вердикт, а впоследствии и своё предложение суду. — \n\n — Мы, присяжные, единогласно решаем, что Пи Штуер виновен в совершенных им преступлениях. Кроме того, мы предлагаем направить официальное дипломатическое требование в Эквестрию, чтобы его перевели и судили здесь. — пояснила Зебра.\n\nВ этот момент - зная, что он должен согласиться ради своей карьеры - Квик Слэм знал, что Василе убьёт его. — Предложение принимается, присяжные благодарят и расходятся. Суд объявляется закрытым. — "
+tobuck_vasile.11.d:0 "Что это был за день.\n\nСемнадцать обвинительных приговоров и ещё одна партия потенциальных преступников, на которых завтра также может быть заведено дело. Парочка вышла на свободу, скорее из-за отсутствия улик, чем из-за чего-то ещё, но Квик Слэм не отличался снисходительностью в суде.\n\nПоследнее дело сегодняшнего дня было самым крупным, но оно же было и таким, в котором его решение имело наименьшее значение. В конце концов, они не могли просто отправится в Эквестрию и увезти пони на другой континент; по крайней мере, без нарушения целого ряда законов. Приговор, конечно, будет обвинительным, это не вызывало сомнений, учитывая доказанные улики и множество возможных дополнительных преступлений, которые оставались неприкосновенными, но вряд ли он видел, что из этого что-то выйдет.\n\nДав им, по общему признанию, короткое время на размышление, судья обратился к присяжным. — Встаньте, пожалуйста, старшина присяжных. Присяжные вынесли единогласный вердикт? — \n\nМолодая зебра стояла с озабоченным выражением лица. — Так и есть, ваша честь. Однако, учитывая характер этого процесса и нынешнее местонахождение подсудимого, препятствующее его наказанию; присяжные единогласно приняли решение о дополнительных действиях для суда помимо объявления вердикта. — \n\nКвик дёрнул ухом, понимая, к чему все идёт и насколько это может быть опасно для Василе. Он был здесь по просьбе президента, и разрешить такую просьбу было опасно, но и отказ в надлежащей правовой процедуре мог вызвать бурю.\n\nЕдинорог неуверенно кивнул, шаркнув копытами. — Представь свой вердикт, а впоследствии и своё предложение суду. — \n\n — Мы, присяжные, единогласно решаем, что Пи Шутер виновен в совершенных им преступлениях. Кроме того, мы предлагаем направить официальное дипломатическое требование в Эквестрию, чтобы его перевели и судили здесь. — пояснила Зебра.\n\nВ этот момент - зная, что он должен согласиться ради своей карьеры - Квик Слэм знал, что Василе убьёт его. — Предложение принимается, присяжные благодарят и расходятся. Суд объявляется закрытым. — "
 tobuck_vasile.11.a:0 "Аплодисменты сделали плохое предчувствие более терпимым."
 
 tobuck_vasile.12.t:0 "Официальный запрос от Тобука"
@@ -3756,7 +3756,7 @@ tobuck_alesia.29.d:0 "— Поменьше аренды, побольше зар
 tobuck_alesia.29.a:0 "Жадность — вот что погубило Северяну."
 
 tobuck_alesia.30.t:0 "На Гала-вечере"
-tobuck_alesia.30.d:0 "Её копыто уже изрядно устало от множества предложенных ей копытотрясений. Генералы, вельможи, промышленники и все остальные, кого они сочли достаточно важными для приглашения, уже успели утомить по крайней мере один из её придатков. Это не предвещало ничего хорошего для вечера в целом.\n\nПожилой пони, бывший северянский военный, судя по всему, внезапно отвлёк её внимание от двери. — Ваше Величество, у меня не было возможности как следует представиться по дороге сюда! Меня зовут Пётр Лучников; вот, у меня для вас подарок.\n\nНесмотря на ограничения по оружию, он принёс шпагу, вероятно, спрятав её каким-то образом под плащом. Окружавшие их стражники уже спешили арестовать его, когда он подал оружие Царице, снял ножны и предложил оружие в знак верности. Прежде чем они успели схватить его, Алесия подняла копыто и приказала им подождать, даже позволив себе посмеяться над абсурдностью его поступка.\n\nОна взяла оружие, осмотрела его, сняла ножны и передала обратно. — Ваше предложение любезно и принято, однако я должна спросить, почему вы решили полностью проигнорировать наше правило о запрете оружия на территории? В ваших интересах было быть арестованным?\n\n— Я считаю, что такое правило совершенно излишне. Почему я, или любой другой ваш верный подданный, должен поднимать оружие на свою госпожу? — риторически спросил он, вставая с поклона.\n\nЕё Величество не удержалась и рассмеялась во второй раз, прежде чем махнуть копытом стражникам."
+tobuck_alesia.30.d:0 "Её копыто уже изрядно устало от множества предложенных ей копытопожатий. Генералы, вельможи, промышленники и все остальные, кого они сочли достаточно важными для приглашения, уже успели утомить по крайней мере один из её придатков. Это не предвещало ничего хорошего для вечера в целом.\n\nПожилой пони, бывший северянский военный, судя по всему, внезапно отвлёк её внимание от двери. — Ваше Величество, у меня не было возможности как следует представиться по дороге сюда! Меня зовут Пётр Лучников; вот, у меня для вас подарок.\n\nНесмотря на ограничения по оружию, он принёс шпагу, вероятно, спрятав её каким-то образом под плащом. Окружавшие их стражники уже спешили арестовать его, когда он подал оружие Царице, снял ножны и предложил оружие в знак верности. Прежде чем они успели схватить его, Алесия подняла копыто и приказала им подождать, даже позволив себе посмеяться над абсурдностью его поступка.\n\nОна взяла оружие, осмотрела его, сняла ножны и передала обратно. — Ваше предложение любезно и принято, однако я должна спросить, почему вы решили полностью проигнорировать наше правило о запрете оружия на территории? В ваших интересах было быть арестованным?\n\n— Я считаю, что такое правило совершенно излишне. Почему я, или любой другой ваш верный подданный, должен поднимать оружие на свою госпожу? — риторически спросил он, вставая с поклона.\n\nЕё Величество не удержалась и рассмеялась во второй раз, прежде чем махнуть копытом стражникам."
 tobuck_alesia.30.a:0 "— Пётр, сегодня ты будешь обедать за моим столом!"
 
 tobuck_alesia.31.t:0 "Наша новая родина"
@@ -3926,7 +3926,7 @@ TBK_third_rule_tp:0 "Завершение этого фокуса §Rуберё
 TBK_third_rule_requirement_tp:0 "Должно быть хотя бы £infequip_text §Y5%§! §gзапасов оружия.§!"
 TBK_set_alesia_dominant:0 "§RАлесия Снежная теперь самый сильный военачальник.§!"
 TBK_failure_operation_tp:0 "Завершение этого фокуса §Gперезапустит§! £decision_icon_small §Yподозрения военачальников§!, но §Rударит§! по всем дивизиям §Cнаёмников§!."
-TBK_provoke_battles_tp:0 "Завершение этого фокуса снизит £decision_icon_small §Cподозрения военачальников§! на §Y45§! дней!"
+TBK_provoke_battles_tp:0 "Завершение этого фокуса снизит срок £decision_icon_small §Cподозрения военачальников§! на §Y45§! дней!"
 
 TBK_explain_bonus_money_tp:0 "Открывает доступ к £decision_icon_small §Yрешениям§!, позволяющим тратить деньги на §Gразличные улучшения страны.§!"
 
@@ -6157,7 +6157,7 @@ wallnut_post_desc:0 "§YРождён§!: 29 Мая 980 в Фёрстпорте\n
 
 baragzen_desc:0 "§YРождён§!: 8-ого Июля 975 в Заммаре\n\n§YБиография§!: Барагзен - изгнанный дворянин, родом из Варзены, сейчас живущий в Тобуке с мечтами однажды вернуться на родину. Большая часть его ранней жизни была проведена за получением образования при дворе, и в привыкании к своей роли наследника главы династии Леопардов, как его учил Васиим, его отец. Большинство, казалось, думали, что семью так долго держали в стороне от правления, что они больше не имели особого веса в стране, и отец Барагзена, по-видимому, согласился с этой участью.\n\nСтав старше, молодой зебра начал медленно отходить от династической политики простого смирения, и вместо этого начал готовиться к "неизбежному" возвращению своей семьи к власти. Когда его отец скончался, он стал главой семьи без особого сопротивления или радости; его мать, Раания, попыталась убедить сына отказаться от своих мечтаний о восхождении на трон, что привело к ожесточенной ссоре. Не имея поддержки даже среди своих ближайших родственников, Барагзен сбежал, прихватив большую часть семейной казны.\n\nТак он — и значительная сумма богатств, которую мятежный дворянин смог вывезти контрабандой — оказался в Тобуке, который был очагом нестабильности и конфликтов как во время, так и после правления Короля Шторма. Там Барагзен собрал небольшую частную армию, которая быстро росла по мере того, как его слава и мастерство становились широко известными в кругах наёмников. Его успех был отчасти обусловлен талантом, который Леопард приобрёл в военной академии до своего изгнания, но это было также возможно благодаря абсолютной преданности, которую он прививал своим солдатам. Барагзен относился к ним с уважением и достоинством, даже зайдя так далеко, что однажды сам вступил в бой, когда его силы были в меньшинстве, и командовал ими с поля боя.\n\nВо время упадка власти Короля Шторма и создания Тобука, Пи Шутер нанял изгнанника, по сути, для того, чтобы убедиться, что он не сможет причинить никаких неприятностей власти оружейного барона. Теперь Барагзен процветает как военачальник, командуя нерегулярными, но дисциплинированными войсками. Он всё ещё надеется вернуться в Варзену и вернуть себе трон, но только время и немного удачи покажут, сможет ли он осуществить эту мечту.\n\n§YАвтор портрета§!: Egil"
 
-baragzen_post_desc:0 "§YРождён§!: 8-ого Июля 975 в Заммаре\n\n§YБиография§!: Барагзен - изгнанный дворянин, родом из Варзены, сейчас живущий в Тобуке с мечтами однажды восстановить границы Империи. Большая часть его ранней жизни была проведена за получением образования при дворе, и в привыкании к своей роли наследника главы династии Леопардов, как его учил Васиим, его отец. Большинство, казалось, думали, что семью так долго держали в стороне от правления, что они больше не имели особого веса в стране, и отец Барагзена, по-видимому, согласился с этой участью.\n\nСтав старше, молодой зебра начал медленно отходить от династической политики простого смирения, и вместо этого начал готовиться к "неизбежному" возвращению своей семьи к власти. Когда его отец скончался, он стал главой семьи без особого сопротивления или радости; его мать, Раания, попыталась убедить сына отказаться от своих мечтаний о восхождении на трон, что привело к ожесточенной ссоре. Не имея поддержки даже среди своих ближайших родственников, Барагзен сбежал, прихватив большую часть семейной казны.\n\nТак он — и значительная сумма богатств, которую мятежный дворянин смог вывезти контрабандой — оказался в Тобуке, который был очагом нестабильности и конфликтов как во время, так и после правления Короля Шторма. Там Барагзен собрал небольшую частную армию, которая быстро росла по мере того, как его слава и мастерство становились широко известными в кругах наёмников. Его успех был отчасти обусловлен талантом, который Леопард приобрёл в военной академии до своего изгнания, но это было также возможно благодаря абсолютной преданности, которую он прививал своим солдатам. Барагзен относился к ним с уважением и достоинством, даже зайдя так далеко, что однажды сам вступил в бой, когда его силы были в меньшинстве, и командовал ими с поля боя.\n\nВо время упадка власти Короля Штормов и создания Тобука, Пи Шутер нанял изгнанника, по сути, для того, чтобы убедиться, что он не сможет причинить никаких неприятностей власти оружейного барона. Теперь Барагзен вернулся на свою родину, чтобы снова безраздельно править недавно основанной Нео-Хазруменской Империей, к большому неудовольствию тех, кто боиться его.\n\n§YАвтор портрета§!: Egil"
+baragzen_post_desc:0 "§YРождён§!: 8-ого Июля 975 в Заммаре\n\n§YБиография§!: Барагзен - изгнанный дворянин, родом из Варзены, сейчас живущий в Тобуке с мечтами однажды восстановить границы Империи. Большая часть его ранней жизни была проведена за получением образования при дворе, и в привыкании к своей роли наследника главы династии Леопардов, как его учил Васиим, его отец. Большинство, казалось, думали, что семью так долго держали в стороне от правления, что они больше не имели особого веса в стране, и отец Барагзена, по-видимому, согласился с этой участью.\n\nСтав старше, молодой зебра начал медленно отходить от династической политики простого смирения, и вместо этого начал готовиться к "неизбежному" возвращению своей семьи к власти. Когда его отец скончался, он стал главой семьи без особого сопротивления или радости; его мать, Раания, попыталась убедить сына отказаться от своих мечтаний о восхождении на трон, что привело к ожесточенной ссоре. Не имея поддержки даже среди своих ближайших родственников, Барагзен сбежал, прихватив большую часть семейной казны.\n\nТак он — и значительная сумма богатств, которую мятежный дворянин смог вывезти контрабандой — оказался в Тобуке, который был очагом нестабильности и конфликтов как во время, так и после правления Короля Шторма. Там Барагзен собрал небольшую частную армию, которая быстро росла по мере того, как его слава и мастерство становились широко известными в кругах наёмников. Его успех был отчасти обусловлен талантом, который Леопард приобрёл в военной академии до своего изгнания, но это было также возможно благодаря абсолютной преданности, которую он прививал своим солдатам. Барагзен относился к ним с уважением и достоинством, даже зайдя так далеко, что однажды сам вступил в бой, когда его силы были в меньшинстве, и командовал ими с поля боя.\n\nВо время упадка власти Короля Штормов и создания Тобука, Пи Шутер нанял изгнанника, по сути, для того, чтобы убедиться, что он не сможет причинить никаких неприятностей власти оружейного барона. Теперь Барагзен вернулся на свою родину, чтобы снова безраздельно править недавно основанной Нео-Хазруменской Империей, к большому неудовольствию тех, кто боится его.\n\n§YАвтор портрета§!: Egil"
 
 matanzal_toddler_desc:0 "§YРождена§!: 18 ноября 997 в Михарзехире\n\n§YБиография§!: Матанзал родилась в небогатой дворянской семье из Михарзехира после того, как её мать Лина стала близкой подругой Барагзена в первые месяцы его изгнания. Как только её отец начал по-настоящему приближаться к своей цели вернуть королевство, это был лишь вопрос времени, когда кобылу и её мать попросят переехать куда-нибудь в более приятное место по приказу Барагзена.\n\nПосле того, как они получили признание, было вполне естественно, что медленно растущая группа друзей начала рассматривать Матанзал как потенциальную наследницу трона; если её отец успешно вернет его себе. Благодаря этому и интеллекту её матери быстро стало очевидно, что она будет сильной соперницей наряду со своим сводным братом Заалханни.\n\n§YАвтор портрета§!: Printik"
 
diff --git a/localisation/russian/country_TRO_l_russian.yml b/localisation/russian/country_TRO_l_russian.yml
index ec183719e4e..3013972271c 100644
--- a/localisation/russian/country_TRO_l_russian.yml
+++ b/localisation/russian/country_TRO_l_russian.yml
@@ -513,7 +513,7 @@ trotkart_colthage.43.d: "В кабинете было тихо, в воздух
 trotkart_colthage.43.a: "Это неправильно."
 
 trotkart_colthage.44.t: "Миля и акр"
-trotkart_colthage.44.d: "— Ваша почта, сэр. — Дворецкий поставил серебряный поднос на стол рядом с кофе и овсянкой. В то утро для патриция были мастерски составлены два письма. Он сразу понял, что одно из них было приглашением в дом мэра на очередной ланч; такие письма появлялись два раза в неделю, и хозяин особняка даже намеревался однажды пойти туда.\nВторое письмо он поднял и бегло просмотрел; адрес, написанный от руки, подпись. Он аккуратно разрезал его ножом и вынул содержимое, поправляя очки.\n\n"Дорогой Филосир\nМой долг сообщить вам, что, проанализировав ваши активы в том виде, в каком они были зарегистрированы, мы обнаружили расхождения в ваших отчетах. Это было подтверждено после детального обследования местной области в отношении земельных владений, зарегистрированных в местных ведомствах.\n\nС помощью этих проверок было обнаружено, что вы не задекларировали 60% своих активов. Чтобы прояснить этот вопрос и избавить вас от беспокойства по поводу того, что эти владения считаются монополией на сельское хозяйство в регионе - о чем, мы уверены, вы не знали, – государство должно начать официальную конфискацию этой земли. К тому времени, когда это письмо дойдет до вас, процесс должен быть завершен, и я уверен, что с ваших плеч свалится большой груз.\n\nНадеюсь, что это письмо застанет вас в добром здравии.\n\nАзизелькарт."\n\nПисьмо выскользнуло у него из-под копыта и упало в масло."
+trotkart_colthage.44.d: "— Ваша почта, сэр. — Дворецкий поставил серебряный поднос на стол рядом с кофе и овсянкой. В то утро для патриция были мастерски составлены два письма. Он сразу понял, что одно из них было приглашением в дом мэра на очередной ланч; такие письма появлялись два раза в неделю, и хозяин особняка даже намеревался однажды пойти туда.\nВторое письмо он поднял и бегло просмотрел; адрес, написанный, а не напечатанный, и подпись. Он аккуратно разрезал его ножом и вынул содержимое, поправляя очки.\n\n"Дорогой Филосир\nМой долг сообщить вам, что, проанализировав ваши активы в том виде, в каком они были зарегистрированы, мы обнаружили расхождения в ваших отчетах. Это было подтверждено после детального обследования местной области в отношении земельных владений, зарегистрированных в местных ведомствах.\n\nС помощью этих проверок было обнаружено, что вы не задекларировали 60% своих активов. Чтобы прояснить этот вопрос и избавить вас от беспокойства по поводу того, что эти владения считаются монополией на сельское хозяйство в регионе - о чем, мы уверены, вы не знали, – государство должно начать официальную конфискацию этой земли. К тому времени, когда это письмо дойдет до вас, процесс должен быть завершен, и я уверен, что с ваших плеч свалится большой груз.\n\nНадеюсь, что это письмо застанет вас в добром здравии.\n\nАзизелькарт."\n\nПисьмо выскользнуло у него из-под копыта и упало в масло."
 trotkart_colthage.44.a: "Это возмутительно! Это несправедливо!"
 
 trotkart_colthage.45.t: "Дела семейные"
@@ -1050,7 +1050,7 @@ TRO_CTH_gain_30_points_tp: "Мы §Gзаработаем§! 30 §Yочков§!
 TRO_CTH_disappear_tp: "§RЭтот национальный дух исчезнет, если мы когда-нибудь будем воевать с Кольтфагеном или если Кольтфаген перестанет быть независимым§!"
 TRO_CTH_disappear_2_tp: "§RЭтот национальный дух исчезнет, если мы когда-нибудь начнём войну против Гиппогрифии или если Гиппогрифия перестанет быть независимой§!"
 TRO_CTH_disappear_3_tp: "§RЭтот национальный дух исчезнет, если мы когда-нибудь начнём войну против Хироптерры или если Хироптерра перестанет быть независимой§!"
-TRO_CTH_gerzanomics_tp: "§GЗавершение§! этого §Cфокуса§! даст нам различные §Yбонусы§! в зависимости от того, сколько очков нам удалось набрать во время §gвеликой игры§!:\n - Получив §Y1§! - §Y25§! Награды за очки: Без вознаграждения\n - Получив §Y25§! - §Y50§! Награды за очки:\n      Получает §YЭкономическое чудо§! которое предоставляет: (Ежемесячное население: §G+15.0%§!, Фабрики народного потребления §Y-5.0§!, £prod_eff_cap Эффективность производства: §G+10.00%§!, Производительность фабрик: §G+10.00%§!, Производительность верфей: §G+10.00%§!) на §Y730§! дней\n - Получив §Y50§! - §Y75§! Награды за очки:\n      Получает §YЭкономическое чудо§! которое предоставляет: (Ежемесячное население: §G+15.0%§!, Фабрики народного потребления §Y-5.0§!, £prod_eff_cap Эффективность производства: §G+10.00%§!, Производительность фабрик: §G+10.00%§!, Производительность верфей: §G+10.00%§!) на §Y1095§! дней\n      (§YКаждая национальная провинция§!):\n         Добавляет §G1§! Ячейку для строительства\n         Добавляет §Y1 Гражданскую фабрику§!\n - Получив §Y75§! - §Y100§! Награды за очки:\n      Получает §YЭкономическое чудо§! которое предоставляет: (Ежемесячное население: §G+15.0%§!, Фабрики народного потребления §Y-5.0§!, £prod_eff_cap Эффективность производства: §G+10.00%§!, Производительность фабрик: §G+10.00%§!, Производительность верфей: §G+10.00%§!) на §Y1460§! дней\n      (§YКаждая национальная провинция§!):\n         Добавляет §G2§! ячейки для строительства\n         Добавляет §Y1 Гражданскую фабрику§!\n         Добавляет §Y1 Военный завод§!\nПримечание: Как только этот §Cфокус§! будет §Rзавершён§! механика §gВеликой игры§! будет навсегда §Rзаблокирована§!\n"
+TRO_CTH_gerzanomics_tp: "§GЗавершение§! этого §Cфокуса§! даст нам различные §Yбонусы§! в зависимости от того, сколько очков нам удалось набрать во время §gвеликой игры§!:\n - Получив §Y1§! - §Y25§! Награды за очки: Без вознаграждения\n - Получив §Y25§! - §Y50§! Награды за очки:\n      Получает §YЭкономическое чудо§! которое предоставляет: (Ежемесячное население: §G+15.0%§!, Фабрики народного потребления §Y-10.0§!, £prod_eff_cap Эффективность производства: §G+10.00%§!, Производительность фабрик: §G+10.00%§!, Производительность верфей: §G+10.00%§!) на §Y730§! дней\n - Получив §Y50§! - §Y75§! Награды за очки:\n      Получает §YЭкономическое чудо§! которое предоставляет: (Ежемесячное население: §G+15.0%§!, Фабрики народного потребления §Y-10.0§!, £prod_eff_cap Эффективность производства: §G+10.00%§!, Производительность фабрик: §G+10.00%§!, Производительность верфей: §G+10.00%§!) на §Y1095§! дней\n      (§YКаждая национальная провинция§!):\n         Добавляет §G1§! Ячейку для строительства\n         Добавляет §Y1 Гражданскую фабрику§!\n - Получив §Y75§! - §Y100§! Награды за очки:\n      Получает §YЭкономическое чудо§! которое предоставляет: (Ежемесячное население: §G+15.0%§!, Фабрики народного потребления §Y-10.0§!, £prod_eff_cap Эффективность производства: §G+10.00%§!, Производительность фабрик: §G+10.00%§!, Производительность верфей: §G+10.00%§!) на §Y1460§! дней\n      (§YКаждая национальная провинция§!):\n         Добавляет §G2§! ячейки для строительства\n         Добавляет §Y1 Гражданскую фабрику§!\n         Добавляет §Y1 Военный завод§!\nПримечание: Как только этот §Cфокус§! будет §Rзавершён§! механика §gВеликой игры§! будет навсегда §Rзаблокирована§!\n"
 TRO_CTH_the_end_tp: "§gСпасибо за прохождение ещё одного из многочисленных путей Кольтфагена - теперь, пожалуйста, идите играть за что-нибудь более интересное, например, за Гиппогрифию.§!\n\n"
 
 ### Party Names ###
@@ -1188,7 +1188,7 @@ TRO_CTH_drugs_zurumilki_dynmod: "Влияние §RСемьи Зурумилки
 TRO_CTH_drugs_abizaal_dynmod: "Влияние §0Синдиката Абизаал§!"
 
 TRO_CTH_drugs_dealings_with_the_cartels: "Сделки с картелями"
-TRO_CTH_drugs_dealings_with_the_cartels_desc: "§W(§OСиндикат Тигр§!):\nСтабильность: [?TRO_drugs_national_tiger_dynmod_array^0|+=2%]\nФактор военнообязанного населения: [?TRO_drugs_national_tiger_dynmod_array^1|+=2%]\nЭффективность производства: [?TRO_drugs_national_tiger_dynmod_array^2|+=2%]\nДальность снабжения: [?TRO_drugs_national_tiger_dynmod_array^3|+=2%]\n\n(§CБратство Зага§!):\nТемпы исследований: [?TRO_drugs_national_zaga_dynmod_array^0|+=2%]\n§YГражданские фабрики§! скорость строительства: [?TRO_drugs_national_zaga_dynmod_array^1|+=2%]\nПоддержка войны: [?TRO_drugs_national_zaga_dynmod_array^2|+=2%]\n\n(§gСиндикат Запса§!):\nОборона дивизии на национальной территории: [?TRO_drugs_national_zapsa_dynmod_array^0|+=2%]\nПроизводительность верфей: [?TRO_drugs_national_zapsa_dynmod_array^1|+=2%]\nФактор мнения о торговых сделках: [?TRO_drugs_national_zapsa_dynmod_array^2|+=2%]\n\n(§RСемья Зурумилки§!):\nЕженедельная стабильность: [?TRO_drugs_national_zurumilki_dynmod_array^0|+=2%]\nЭффективность добычи ресурсов: [?TRO_drugs_national_zurumilki_dynmod_array^1|+=2%]\nФабрики потребительских товаров: [?TRO_drugs_national_zurumilki_dynmod_array^2|Y=2%]\n\n(§0Синдикат Абизаал§!):\nЕжедневный прирост политической власти: [?TRO_drugs_national_abizaal_dynmod_array^0|+=2]\nСинтетическая нефть: [?TRO_drugs_national_abizaal_dynmod_array^1|+=2%]\nЕжемесячная численность населения: [?TRO_drugs_national_abizaal_dynmod_array^2|+=2%]\nФактор военнообязанного населения: [?TRO_drugs_national_abizaal_dynmod_array^3|Y=2%]§!\n\n§YСильный и дружественный§! картель получит следующие §Rотрицательные дебаффы§!, в отличие от §Yслабого противостоящего картеля§! который получит следующие §Gпозитивные баффы§!. Исходя из наших отношений с §Yпятью картелями§!, применяются следующие бонусы:§W\nПрирост политической власти: [?TRO_drugs_national_pp_factor|+=2%]\nСтабильность: [?TRO_drugs_national_stab_factor|+=2%]§!"
+TRO_CTH_drugs_dealings_with_the_cartels_desc: "§W(§OСиндикат Тигр§!):\nСтабильность: [?TRO_drugs_national_tiger_dynmod_array^0|+=2%]\nФактор военнообязанного населения: [?TRO_drugs_national_tiger_dynmod_array^1|+=2%]\nЭффективность производства: [?TRO_drugs_national_tiger_dynmod_array^2|+=2%]\nДальность снабжения: [?TRO_drugs_national_tiger_dynmod_array^3|+=2%]\n\n(§CБратство Зага§!):\nТемпы исследований: [?TRO_drugs_national_zaga_dynmod_array^0|+=2%]\n§YГражданские фабрики§! скорость строительства: [?TRO_drugs_national_zaga_dynmod_array^1|+=2%]\nПоддержка войны: [?TRO_drugs_national_zaga_dynmod_array^2|+=2%]\n\n(§gСиндикат Запса§!):\nОборона дивизии на национальной территории: [?TRO_drugs_national_zapsa_dynmod_array^0|+=2%]\nПроизводительность верфей: [?TRO_drugs_national_zapsa_dynmod_array^1|+=2%]\nФактор мнения о торговых сделках: [?TRO_drugs_national_zapsa_dynmod_array^2|+=2%]\n\n(§RСемья Зурумилки§!):\nЕженедельная стабильность: [?TRO_drugs_national_zurumilki_dynmod_array^0|+=2%]\nЭффективность увеличения ресурсов: [?TRO_drugs_national_zurumilki_dynmod_array^1|+=2%]\nФабрики потребительских товаров: [?TRO_drugs_national_zurumilki_dynmod_array^2|Y=2%]\n\n(§0Синдикат Абизаал§!):\nЕжедневный прирост политической власти: [?TRO_drugs_national_abizaal_dynmod_array^0|+=2]\nСинтетическая нефть: [?TRO_drugs_national_abizaal_dynmod_array^1|+=2%]\nЕжемесячная численность населения: [?TRO_drugs_national_abizaal_dynmod_array^2|+=2%]\nФактор военнообязанного населения: [?TRO_drugs_national_abizaal_dynmod_array^3|Y=2%]§!\n\n§YСильный и дружественный§! картель получит следующие §Rотрицательные дебаффы§!, в отличие от §Yслабого противостоящего картеля§! который получит следующие §Gпозитивные баффы§!. Исходя из наших отношений с §Yпятью картелями§!, применяются следующие бонусы:§W\nПрирост политической власти: [?TRO_drugs_national_pp_factor|+=2%]\nСтабильность: [?TRO_drugs_national_stab_factor|+=2%]§!"
 
 TRO_CTH_drugs_national_tiger_dynmod: "Влияние на §OСиндикат Тигр§!"
 TRO_CTH_drugs_national_zaga_dynmod: "Влияние на §CБратство Зага§!"
diff --git a/localisation/russian/country_VED_l_russian.yml b/localisation/russian/country_VED_l_russian.yml
index a8a73557b51..7c3a07e0496 100644
--- a/localisation/russian/country_VED_l_russian.yml
+++ b/localisation/russian/country_VED_l_russian.yml
@@ -499,7 +499,7 @@
  VED_Princess_hos_TT:0 "§YПринцесса Скёльдсвард§! получит:\n    "
  VED_Level_Up_Combat_tt:0 "Увеличение уровня навыков"
  VED_Level_Up_Statecraft_tt:0 "Увеличение различных модификаторов лидера страны"
- VED_No_Charity_Teaching_Trait_tt:0 "§YПринцесса Скёльдсвард Холодная§!\n      - Фабрики потребительских товаров: §Y-2%§!\n"
+ VED_No_Charity_Teaching_Trait_tt:0 "§YПринцесса Скёльдсвард Холодная§!\n      - Фабрики потребительских товаров: §Y-4%§!\n"
  VED_Learn_From_Reformer_Prince_tt:0 "§YОбучение у Ликлиг§!\n      - Фактор военнообязанного населения: §G+5%§!\n      - Стабильность: §G+5%§!"
  VED_Learn_From_Fascist_Prince_tt:0 "§YОбучение у Ондски§!\n      - Поддержка войны: §G+10%§!"
  VED_Learn_From_Welfare_tt:0 "§YФокус на социальном обеспечении§!\n      - Фактор военнообязанного населения: §G+5%§!\n      - Стабильность: §G+5%§!"
diff --git a/localisation/russian/country_WIN_l_russian.yml b/localisation/russian/country_WIN_l_russian.yml
index de921346e5e..30952fc1b69 100644
--- a/localisation/russian/country_WIN_l_russian.yml
+++ b/localisation/russian/country_WIN_l_russian.yml
@@ -1348,11 +1348,11 @@ WIN_legation_benefactor_tp:0 "§RМы - благодетель Винггард
 WIN_legation_benefactor_2_tp:0 "§RОни - благодетель Винггардена§!"
 
 WIN_game_over_tp:0 "§RВинггарден полностью рухнет и будет аннексирован Гиппогрифией. Не расстраивайтесь, ведь вы поступили правильно, положив конец этому псевдоколониальному кошмару! Разве вы не счастливы?§!\n\n"
-WIN_the_wingbardian_takeover_tp:0 "§rВингбардия получила контроль над городом Винггарденом.!§!\n\n"
+WIN_the_wingbardian_takeover_tp:0 "§rВингбардия получила контроль над городом Винггарденом!§!\n\n"
 WIN_blackwings_tp:0 "В §gВинггардене§! появятся две дивизии §YЧернокрылых§! с §gшириной фронта§! §Y8§!\n\n"
-WIN_the_chiropterran_takeover_tp:0 "§2Хироптерра получила контроль над городом Винггарденом.!§!\n\n"
+WIN_the_chiropterran_takeover_tp:0 "§2Хироптерра получила контроль над городом Винггарденом!§!\n\n"
 WIN_expeditionary_force_tp:0 "В §gВинггардене§! появится одна дивизия §YХироптеррского экспедиционного корпуса§! с §gшириной фронта§! §Y20§!\n\n"
-WIN_the_colthaginian_takeover_tp:0 "§gКольтфаген получил контроль над городом Винггарденом.!§!\n\n"
+WIN_the_colthaginian_takeover_tp:0 "§gКольтфаген получил контроль над городом Винггарденом!§!\n\n"
 WIN_coffee_bean_stats_tp:0 "§RНавык атаки§!: §Y1§!\n§YНавык обороны§!: §Y4§!\n§CНавык планирования§!: §Y4§!\n§GНавык логистики§!: §Y2§!\n§gЧерты§!: §WЗлоупотребление наркотиками§!, §WЯркий полководец§!, §WМедийная знаменитость§!, §WАвантюрист§!\n\n"
 WIN_bean_security_tp:0 "В §gВинггардене§! появятся две дивизии §YБин Секьюрити§! с §gшириной фронта§! §Y15§!\n\n"
 WIN_the_free_city_tp:0 "§gВольный Город Винггарден был официально создан!§!\n\n"
diff --git a/localisation/russian/country_YAK_l_russian.yml b/localisation/russian/country_YAK_l_russian.yml
index 97270da714b..9ac2ebb3227 100644
--- a/localisation/russian/country_YAK_l_russian.yml
+++ b/localisation/russian/country_YAK_l_russian.yml
@@ -600,7 +600,7 @@
  
  YAK_educated_society_desc:0 "Учения одного из наших величайших мудрецов были восстановлены полностью и почти полностью переведены на современный язык. Давайте заставим путь яков работать на нас."
  
- YAK_modern_factories:0 "Обновление мастерские"
+ YAK_modern_factories:0 "Обновление мастерских"
  
  YAK_modern_factories_desc:0 "Путь яков - это нечто большее, чем просто КРУШИТЬ всё и всех. Традиции важны для хорошего яка. Но мы можем быть хорошими, традиционными яками с настоящими фабриками и дорогами."
  
diff --git a/localisation/russian/country_YAL_l_russian.yml b/localisation/russian/country_YAL_l_russian.yml
index 4eb688f910a..e5b93185748 100644
--- a/localisation/russian/country_YAL_l_russian.yml
+++ b/localisation/russian/country_YAL_l_russian.yml
@@ -2179,8 +2179,9 @@
  YAL_melinda_rotkreuz:0 "Мелинда Роткройц"
  AL_Melinda_Rotkreuz_desc:0 "§YДата рождения§!: 30 апреля 980 года, Ассельт\n§YРанг§!: Übersicht-Kamerad\n§YБиография§!: Даже в юности у Мелинды Роткройц были проблемы с управлением гневом. Бесчисленное количество раз она начинала драки со своими учителями, которые мирились с её выходками только из-за удивительно высокого интеллекта Мелинды и родителей-торговцев, щедро оплачивающих их услуги.\nВ надежде, что знаменитые университеты Йеля несколько укротят гнев Мелинды, её родители отправили свою дочь учиться в Сайрусвал на 18-й день рождения, не приняв во внимание радикализм профессоров университета. Там, под влиянием таких профессоров, как Эрих Мюхшнабель, Мелинда начала направлять свою ненависть на капиталистическую систему, и даже начала презирать своих родителей за то, что они злоупотребляли своим богатством ради неё. Она была одним из первых грифонов, присоединившихся к Эриху после озвучивания плана революции. Мелинда лично помогала планировать операции и даже приобретать оружие. Удивительно, но во время многих сражений, таких как осада Гамии и Брумы, она показала лидерские таланты, ведя своих товарищей в бой и подпитывая их своей яростью.\nХотя пламя поглотило старый порядок, а красно-чёрные знамена революции развевались высоко по всему Йелю, Мелинда всё ещё не была удовлетворена. Несмотря на то, что военной иерархии не было места в будущем для нового Йеля, всё ещё была потребность в тех, кто должен вести грифонов в бой. Хайнц Фезерхофф, в настоящее время отвечающий за защиту коммун, ввёл новую роль: Übersicht-Kamerad. И Мелинда Роткройц стала первой, кто получил её."
  YAL_Wurst_Cervelat:0 "Вурст Сервелат"
- YAL_Wurst_Cervelat_desc:0 "§YДата рождения§!: 4-го февраля 967 года в Гринбэке\n§YДолжность§!: Партийный лидер НДПГ\n§YБиография§!: Сервелат любит поесть."
+ YAL_Wurst_Cervelat_desc:0 "§YДата рождения§!: 4 февраля 967 года в Гринбэке\n§YДолжность§!: Партийный лидер НДПГ\n§YБиография§!: Сервелат любит поесть."
  YAL_tommykay:0 "Томас Кесселкло"
+ YAL_tommykay_desc:0 "§YДата рождения:§! 13 сентября 979 года в Мидденхейме\n§YЗвание:§! Недавно получивший повышение вахмистр \n§YБиография:§! Многие генералы Империи, которые родом не из Йеля, были шокированы тем, что простой гарнизонный гауптман вроде Томаса смог получить звание вахмистра без каких-либо военных достижений. И они сохраняли своё недовольство до тех пор, пока их не пригласили на профессиональные военные игры, на которых они сразились с Томасом. Голоса недовольных смолкли после замечательной победы Томаса в военных играх над самим полевым маршалом Бронзтейлом, что открыло молодому грифону возможность продемонстрировать свою "превосходную тактику и манёвры" на настоящем поле боя. Этот горделивый и самоуверенный новичок готов встретиться с настоящим врагом в реальной жизни. "
 
  YAL_tank_development:0 "Программы развития танков"
  YAL_tank_development_desc:0 "Мы должны оставаться на передовой механизированной войны, если хотим выжить. Новые программы развития позволят нашим танкам превосходить все остальные."
diff --git a/localisation/russian/country_ZAR_l_russian.yml b/localisation/russian/country_ZAR_l_russian.yml
index 7f364038ba4..93c22f37245 100644
--- a/localisation/russian/country_ZAR_l_russian.yml
+++ b/localisation/russian/country_ZAR_l_russian.yml
@@ -300,7 +300,7 @@
 
  ZAR_trans_zebharan_project_participation_tt:0 "Мы заплатим §YЗарантии§! сумму, необходимую для соединения нас с §Yтрансзебхарской железной дорогой§!! Когда §YЗарантия§! закончит её постройку, мы получим §Yнациональный дух§! §Cтрансзебхарская железная дорога§!. Он будет §Cулучшаться§! если больше §Yстран§! присоединяться к проекту."
  ZAR_trans_zebharan_project_added_modifier_tt:0 "§Yтрансзебхарская железная дорога§! будет улучшена:"
- ZAR_trans_zebharan_project_added_new_nation_tt:0 "  Товары народного потребления: §Y-0.5%§!\n  Эффективность производства: §G+2%§!\n\n §YСтрана-партнёр§! также §Cполучит§! этот §Yнациональный дух§!!\n"
+ ZAR_trans_zebharan_project_added_new_nation_tt:0 "  Товары народного потребления: §Y-1%§!\n  Эффективность производства: §G+2%§!\n\n §YСтрана-партнёр§! также §Cполучит§! этот §Yнациональный дух§!!\n"
 
  ZAR_socialist_rebellion_swap_tt:0 "§YВыбрав этот вариант, вы будете играть за зарантийских повстанцев!§!"
 
@@ -376,31 +376,31 @@
 
  ZAR_empire_core_BAT:0 "Реформация Хироптерры"
  ZAR_empire_core_BAT_desc:0 ""
- ZAR_empire_core_BAT_tt:0 "[ZAR_EMPIRE_Core_scripted_loc_start] §YГегемон Северной Зебрики§! [ZAR_EMPIRE_Core_scripted_loc_end]\n  Ежедневный прирост политической власти: §G+0.08§!\n  Фактор военнообязанного населения: §G+2%§!\n  Товары народного потребления: §Y-1.0%§!\n  производительность фабрик: §G+2.00%§!\n\n[ZAR_EMPIRE_Core_scripted_loc_start] §YЯдро Зарантийской Империи§! в наших §Yземлях§! [ZAR_EMPIRE_Core_scripted_loc_end]\n  Максимальное число фабрик в регионе: §G+8%§!\n  Местная скорость строительства: §G+2%§!\n\nМы интегрируем §YХироптерру§! в §YЗарантийскую Империю§!. Их территории станут нашими §Cнациональными§! §YФестралы§! получат номинальную автономию в виде реформированного §Cвоенного округа§!.\n\nВсе §Yих регионы§!, §Cставшие нашими национальными§!, получат следующие §Yмодификаторы§!:\n§YЗемля Имперских лунных легионов§!:\n  Максимальное число фабрик в регионе: §R-10%§!\n  Призывное население: §R-10.00%§!\n  Местная скорость строительства: §R-10%§!\n"
+ ZAR_empire_core_BAT_tt:0 "[ZAR_EMPIRE_Core_scripted_loc_start] §YГегемон Северной Зебрики§! [ZAR_EMPIRE_Core_scripted_loc_end]\n  Ежедневный прирост политической власти: §G+0.08§!\n  Фактор военнообязанного населения: §G+2%§!\n  Товары народного потребления: §Y-2%§!\n  производительность фабрик: §G+2.00%§!\n\n[ZAR_EMPIRE_Core_scripted_loc_start] §YЯдро Зарантийской Империи§! в наших §Yземлях§! [ZAR_EMPIRE_Core_scripted_loc_end]\n  Максимальное число фабрик в регионе: §G+8%§!\n  Местная скорость строительства: §G+2%§!\n\nМы интегрируем §YХироптерру§! в §YЗарантийскую Империю§!. Их территории станут нашими §Cнациональными§! §YФестралы§! получат номинальную автономию в виде реформированного §Cвоенного округа§!.\n\nВсе §Yих регионы§!, §Cставшие нашими национальными§!, получат следующие §Yмодификаторы§!:\n§YЗемля Имперских лунных легионов§!:\n  Максимальное число фабрик в регионе: §R-10%§!\n  Призывное население: §R-10.00%§!\n  Местная скорость строительства: §R-10%§!\n"
 
  ZAR_empire_core_WAR:0 "Подчинение Варзены"
  ZAR_empire_core_WAR_desc:0 ""
- ZAR_empire_core_WAR_tt:0 "[ZAR_EMPIRE_Core_scripted_loc_start] §YГегмон Северной Зебрики§!, [ZAR_EMPIRE_Core_scripted_loc_end]\n  Ежедневный прирост политической власти: §G+0.05§!\n  Фактор военнообязанного населения: §G+1%§!\n  Товары народного потребления: §Y-0.5%§!\n  Производительность фабрик: §G+1.50%§!\n\n[ZAR_EMPIRE_Core_scripted_loc_start] §YЯдро Зарантийской Империи§! в наших §Yземлях§! [ZAR_EMPIRE_Core_scripted_loc_end]\n  Максимальное число фабрик в регионе: §G+3%§!\n  Местная скорость строительства: §G+1.5%§!\n\nМы интегрируем §YВарзену§! в §YЗарантийскую Империю§!. Их территории станут нашими §Cнациональными§!, но они станут полу-автономным §Rвоенным§! §Yвассалом§! §YИмперии§! Их земля будет использоваться для добычи ресурсов, и мы получим наёмных слуг для §Yядра Зарантийской Империи§!.\n\nВсе §Yих регионы§!, §Cставшие нашими национальными§!, получат следующие §Yмодификаторы§!:\n§YВассал Зарантийской Империи§!:\n  Эффективность добычи ресурсов: §G+25.00%§!\n  Максимальное число фабрик в регионе: §R-30%§!\n  Призывное население: §R-85.00%§!\n  Местная скорость строительства: §R-30%§!\n"
+ ZAR_empire_core_WAR_tt:0 "[ZAR_EMPIRE_Core_scripted_loc_start] §YГегмон Северной Зебрики§!, [ZAR_EMPIRE_Core_scripted_loc_end]\n  Ежедневный прирост политической власти: §G+0.05§!\n  Фактор военнообязанного населения: §G+1%§!\n  Товары народного потребления: §Y-1%§!\n  Производительность фабрик: §G+1.50%§!\n\n[ZAR_EMPIRE_Core_scripted_loc_start] §YЯдро Зарантийской Империи§! в наших §Yземлях§! [ZAR_EMPIRE_Core_scripted_loc_end]\n  Максимальное число фабрик в регионе: §G+3%§!\n  Местная скорость строительства: §G+1.5%§!\n\nМы интегрируем §YВарзену§! в §YЗарантийскую Империю§!. Их территории станут нашими §Cнациональными§!, но они станут полу-автономным §Rвоенным§! §Yвассалом§! §YИмперии§! Их земля будет использоваться для добычи ресурсов, и мы получим наёмных слуг для §Yядра Зарантийской Империи§!.\n\nВсе §Yих регионы§!, §Cставшие нашими национальными§!, получат следующие §Yмодификаторы§!:\n§YВассал Зарантийской Империи§!:\n  Эффективность увеличения ресурсов: §G+25.00%§!\n  Максимальное число фабрик в регионе: §R-30%§!\n  Призывное население: §R-85.00%§!\n  Местная скорость строительства: §R-30%§!\n"
 
  ZAR_empire_core_ZUM:0 "Новая хозяйка Зумидии"
  ZAR_empire_core_ZUM_desc:0 ""
- ZAR_empire_core_ZUM_tt:0 "[ZAR_EMPIRE_Core_scripted_loc_start] §YГегмон Северной Зебрики§!, [ZAR_EMPIRE_Core_scripted_loc_end]\n  Ежедневный прирост политической власти: §G+0.05§!\n  Фактор военнообязанного населения: §G+1%§!\n  Товары народного потребления: §Y-0.5%§!\n  Производительность фабрик: §G+1.50%§!\n\n[ZAR_EMPIRE_Core_scripted_loc_start] §YЯдро Зарантийской Империи§! в наших §Yземлях§! [ZAR_EMPIRE_Core_scripted_loc_end]\n  Максимальное число фабрик в регионе: §G+3%§!\n  Местная скорость строительства: §G+1.5%§!\n\nМы интегрируем §YЗумидию§! в §YЗарантийскую Империю§!. Их территории станут нашими §Cнациональными§!, но они станут полу-автономным §Rвоенным§! §Yвассалом§! §YИмперии§! Их земля будет использоваться для добычи ресурсов, и мы получим наёмных слуг для §Yядра Зарантийской Империи§!.\n\nВсе §Yих регионы§!, §Cставшие нашими национальными§!, получат следующие §Yмодификаторы§!:\n§YВассал Зарантийской Империи§!:\n  Эффективность добычи ресурсов: §G+25.00%§!\n  Максимальное число фабрик в регионе: §R-30%§!\n  Призывное население: §R-85.00%§!\n  Местная скорость строительства: §R-30%§!\n"
+ ZAR_empire_core_ZUM_tt:0 "[ZAR_EMPIRE_Core_scripted_loc_start] §YГегмон Северной Зебрики§!, [ZAR_EMPIRE_Core_scripted_loc_end]\n  Ежедневный прирост политической власти: §G+0.05§!\n  Фактор военнообязанного населения: §G+1%§!\n  Товары народного потребления: §Y-1%§!\n  Производительность фабрик: §G+1.50%§!\n\n[ZAR_EMPIRE_Core_scripted_loc_start] §YЯдро Зарантийской Империи§! в наших §Yземлях§! [ZAR_EMPIRE_Core_scripted_loc_end]\n  Максимальное число фабрик в регионе: §G+3%§!\n  Местная скорость строительства: §G+1.5%§!\n\nМы интегрируем §YЗумидию§! в §YЗарантийскую Империю§!. Их территории станут нашими §Cнациональными§!, но они станут полу-автономным §Rвоенным§! §Yвассалом§! §YИмперии§! Их земля будет использоваться для добычи ресурсов, и мы получим наёмных слуг для §Yядра Зарантийской Империи§!.\n\nВсе §Yих регионы§!, §Cставшие нашими национальными§!, получат следующие §Yмодификаторы§!:\n§YВассал Зарантийской Империи§!:\n  Эффективность увеличения ресурсов: §G+25.00%§!\n  Максимальное число фабрик в регионе: §R-30%§!\n  Призывное население: §R-85.00%§!\n  Местная скорость строительства: §R-30%§!\n"
 
  ZAR_empire_core_CGI:0 "Новый Хан для Кваггатая"
  ZAR_empire_core_CGI_desc:0 ""
- ZAR_empire_core_CGI_tt:0 "[ZAR_EMPIRE_Core_scripted_loc_start] §YГегмон Северной Зебрики§!, [ZAR_EMPIRE_Core_scripted_loc_end]\n  Ежедневный прирост политической власти: §G+0.10§!\n  Фактор военнообязанного населения: §G+2%§!\n  Товары народного потребления: §Y-1.0%§!\n  Производительность фабрик: §G+3.00%§!\n\n[ZAR_EMPIRE_Core_scripted_loc_start] §YЯдро Зарантийской Империи§! в наших §Yземлях§! [ZAR_EMPIRE_Core_scripted_loc_end]\n  Максимальное число фабрик в регионе: §G+10%§!\n  Местная скорость строительства: §G+3%§!\n\nМы интегрируем §YКваггатай§! в §YЗарантийскую Империю§!. Их территории станут нашими §Cнациональными§!, но они станут полу-автономным §Rвоенным§! §Yвассалом§! §YИмперии§! Их земля будет использоваться для добычи ресурсов, и мы получим наёмных слуг для §Yядра Зарантийской Империи§!.\n\nЕсли нам принадлежат §YЗрумчи§! или §YКольтдар§! и они ещё не §Cнациональные§!, они также станут таковыми.\nЭто также модифицирует §YГегмон Северной Зебрики§!, добавив:\n  Ежедневный прирост политической: §G+0.05§!\n  Фактор военнообязанного населения: §G+1%§!\n  Товары народного потребления: §Y-0.5%§!\n  Производительность фабрик: §G+1.50%§!\nА также улучшит  §YЯдро Зарантийской Империи§! в наших §Yземлях§!:\n  Максимальное число фабрик в регионе: §G+3%§!\n  Местная скорость строительства: §G+1.5%§!\n\nВсе §Yих регионы§!, §Cставшие нашими национальными§!, получат следующие §Yмодификаторы§!:\n§YВассал Зарантийской Империи§!:\n  Эффективность добычи ресурсов: §G+25.00%§!\n  Максимальное число фабрик в регионе: §R-30%§!\n  Призывное население: §R-85.00%§!\n  Местная скорость строительства: §R-30%§!\n"
+ ZAR_empire_core_CGI_tt:0 "[ZAR_EMPIRE_Core_scripted_loc_start] §YГегмон Северной Зебрики§!, [ZAR_EMPIRE_Core_scripted_loc_end]\n  Ежедневный прирост политической власти: §G+0.10§!\n  Фактор военнообязанного населения: §G+2%§!\n  Товары народного потребления: §Y-2%§!\n  Производительность фабрик: §G+3.00%§!\n\n[ZAR_EMPIRE_Core_scripted_loc_start] §YЯдро Зарантийской Империи§! в наших §Yземлях§! [ZAR_EMPIRE_Core_scripted_loc_end]\n  Максимальное число фабрик в регионе: §G+10%§!\n  Местная скорость строительства: §G+3%§!\n\nМы интегрируем §YКваггатай§! в §YЗарантийскую Империю§!. Их территории станут нашими §Cнациональными§!, но они станут полу-автономным §Rвоенным§! §Yвассалом§! §YИмперии§! Их земля будет использоваться для добычи ресурсов, и мы получим наёмных слуг для §Yядра Зарантийской Империи§!.\n\nЕсли нам принадлежат §YЗрумчи§! или §YКольтдар§! и они ещё не §Cнациональные§!, они также станут таковыми.\nЭто также модифицирует §YГегмон Северной Зебрики§!, добавив:\n  Ежедневный прирост политической: §G+0.05§!\n  Фактор военнообязанного населения: §G+1%§!\n  Товары народного потребления: §Y-1%§!\n  Производительность фабрик: §G+1.50%§!\nА также улучшит  §YЯдро Зарантийской Империи§! в наших §Yземлях§!:\n  Максимальное число фабрик в регионе: §G+3%§!\n  Местная скорость строительства: §G+1.5%§!\n\nВсе §Yих регионы§!, §Cставшие нашими национальными§!, получат следующие §Yмодификаторы§!:\n§YВассал Зарантийской Империи§!:\n  Эффективность увеличения ресурсов: §G+25.00%§!\n  Максимальное число фабрик в регионе: §R-30%§!\n  Призывное население: §R-85.00%§!\n  Местная скорость строительства: §R-30%§!\n"
 
  ZAR_empire_core_CTH:0 "Раздел Кольтфагена"
  ZAR_empire_core_CTH_desc:0 ""
- ZAR_empire_core_CTH_tt:0 "[ZAR_EMPIRE_Core_scripted_loc_start] §YГегмон Северной Зебрики§!, [ZAR_EMPIRE_Core_scripted_loc_end]\n  Ежедневный прирост политической власти: §G+0.12§!\n  Фактор военнообязанного населения: §G+2%§!\n  Товары народного потребления: §Y-1.0%§!\n  Производительность фабрик: §G+4.00%§!\n\n[ZAR_EMPIRE_Core_scripted_loc_start] §YЯдро Зарантийской Империи§! в наших §Yземлях§! [ZAR_EMPIRE_Core_scripted_loc_end]\n  Максимальное число фабрик в регионе: §G+15%§!\n  Местная скорость строительства: §G+4%§!\n\nМы интегрируем §YКольтфаген§! в §YЗарантийскую Империю§!. Их территории станут нашими §Cнациональными§!, но они станут полу-автономным §Rвоенным§! §Yвассалом§! §YИмперии§! Их земля будет использоваться для добычи ресурсов, и мы получим наёмных слуг для §Yядра Зарантийской Империи§!.\n\nЕсли нам принадлежат §YЗрумчи§! или §YКольтдар§! и они ещё не §Cнациональные§!, они также станут таковыми.\nЭто также модифицирует §YГегмон Северной Зебрики§!, добавив:\n  Ежедневный прирост политической: §G+0.05§!\n  Фактор военнообязанного населения: §G+1%§!\n  Товары народного потребления: §Y-0.5%§!\n  Производительность фабрик: §G+1.50%§!\nА также улучшит  §YЯдро Зарантийской Империи§! в наших §Yземлях§!:\n  Максимальное число фабрик в регионе: §G+3%§!\n  Местная скорость строительства: §G+1.5%§!\n\nВсе §Yих регионы§!, §Cставшие нашими национальными§!, получат следующие §Yмодификаторы§!:\n§YВассал Зарантийской Империи§!:\n  Эффективность добычи ресурсов: §G+25.00%§!\n  Максимальное число фабрик в регионе: §R-30%§!\n  Призывное население: §R-85.00%§!\n  Местная скорость строительства: §R-30%§!\n"
+ ZAR_empire_core_CTH_tt:0 "[ZAR_EMPIRE_Core_scripted_loc_start] §YГегмон Северной Зебрики§!, [ZAR_EMPIRE_Core_scripted_loc_end]\n  Ежедневный прирост политической власти: §G+0.12§!\n  Фактор военнообязанного населения: §G+2%§!\n  Товары народного потребления: §Y-2%§!\n  Производительность фабрик: §G+4.00%§!\n\n[ZAR_EMPIRE_Core_scripted_loc_start] §YЯдро Зарантийской Империи§! в наших §Yземлях§! [ZAR_EMPIRE_Core_scripted_loc_end]\n  Максимальное число фабрик в регионе: §G+15%§!\n  Местная скорость строительства: §G+4%§!\n\nМы интегрируем §YКольтфаген§! в §YЗарантийскую Империю§!. Их территории станут нашими §Cнациональными§!, но они станут полу-автономным §Rвоенным§! §Yвассалом§! §YИмперии§! Их земля будет использоваться для добычи ресурсов, и мы получим наёмных слуг для §Yядра Зарантийской Империи§!.\n\nЕсли нам принадлежат §YЗрумчи§! или §YКольтдар§! и они ещё не §Cнациональные§!, они также станут таковыми.\nЭто также модифицирует §YГегмон Северной Зебрики§!, добавив:\n  Ежедневный прирост политической: §G+0.05§!\n  Фактор военнообязанного населения: §G+1%§!\n  Товары народного потребления: §Y-1%§!\n  Производительность фабрик: §G+1.50%§!\nА также улучшит  §YЯдро Зарантийской Империи§! в наших §Yземлях§!:\n  Максимальное число фабрик в регионе: §G+3%§!\n  Местная скорость строительства: §G+1.5%§!\n\nВсе §Yих регионы§!, §Cставшие нашими национальными§!, получат следующие §Yмодификаторы§!:\n§YВассал Зарантийской Империи§!:\n  Эффективность увеличения ресурсов: §G+25.00%§!\n  Максимальное число фабрик в регионе: §R-30%§!\n  Призывное население: §R-85.00%§!\n  Местная скорость строительства: §R-30%§!\n"
 
  ZAR_empire_core_CVA:0 "Запугивание Кольтвы"
  ZAR_empire_core_CVA_desc:0 ""
- ZAR_empire_core_CVA_tt:0 "[ZAR_EMPIRE_Core_scripted_loc_start] §YГегмон Северной Зебрики§!, [ZAR_EMPIRE_Core_scripted_loc_end]\n  Ежедневный прирост политической власти: §G+0.05§!\n  Фактор военнообязанного населения: §G+1%§!\n  Товары народного потребления: §Y-0.5%§!\n  Производительность фабрик: §G+1.50%§!\n\n[ZAR_EMPIRE_Core_scripted_loc_start] §YЯдро Зарантийской Империи§! в наших §Yземлях§! [ZAR_EMPIRE_Core_scripted_loc_end]\n  Максимальное число фабрик в регионе: §G+3%§!\n  Местная скорость строительства: §G+1.5%§!\n\nМы интегрируем §YКольтву§! в §YЗарантийскую Империю§!. Их территории станут нашими §Cнациональными§!, но они станут полу-автономным §Rвоенным§! §Yвассалом§! §YИмперии§!. Их земля будет использоваться для добычи ресурсов, и мы получим наёмных слуг для §Yядра Зарантийской Империи§!.\n\nВсе §Yих регионы§!, §Cставшие нашими национальными§!, получат следующие §Yмодификаторы§!:\n§YВассал Зарантийской Империи§!:\n  Эффективность добычи ресурсов: §G+25.00%§!\n  Максимальное число фабрик в регионе: §R-30%§!\n  Призывное население: §R-85.00%§!\n  Местная скорость строительства: §R-30%§!\n"
+ ZAR_empire_core_CVA_tt:0 "[ZAR_EMPIRE_Core_scripted_loc_start] §YГегмон Северной Зебрики§!, [ZAR_EMPIRE_Core_scripted_loc_end]\n  Ежедневный прирост политической власти: §G+0.05§!\n  Фактор военнообязанного населения: §G+1%§!\n  Товары народного потребления: §Y-1%§!\n  Производительность фабрик: §G+1.50%§!\n\n[ZAR_EMPIRE_Core_scripted_loc_start] §YЯдро Зарантийской Империи§! в наших §Yземлях§! [ZAR_EMPIRE_Core_scripted_loc_end]\n  Максимальное число фабрик в регионе: §G+3%§!\n  Местная скорость строительства: §G+1.5%§!\n\nМы интегрируем §YКольтву§! в §YЗарантийскую Империю§!. Их территории станут нашими §Cнациональными§!, но они станут полу-автономным §Rвоенным§! §Yвассалом§! §YИмперии§!. Их земля будет использоваться для добычи ресурсов, и мы получим наёмных слуг для §Yядра Зарантийской Империи§!.\n\nВсе §Yих регионы§!, §Cставшие нашими национальными§!, получат следующие §Yмодификаторы§!:\n§YВассал Зарантийской Империи§!:\n  Эффективность увеличения ресурсов: §G+25.00%§!\n  Максимальное число фабрик в регионе: §R-30%§!\n  Призывное население: §R-85.00%§!\n  Местная скорость строительства: §R-30%§!\n"
 
  ZAR_empire_core_kar_alpaka:0 "Покорение Кар-Альпаки"
  ZAR_empire_core_kar_alpaka_desc:0 ""
- ZAR_empire_core_kar_alpaka_tt:0 "Мы интегрируем §YКар-альпаку§! в §YЗарантийскую Империю§!. Их территории станут нашими §Cнациональными§!, и они станут частью §YКольтванского Вассала§! §YИмперии§!. Их земля будет использоваться для добычи ресурсов, и мы получим наёмных слуг для §Yядра Зарантийской Империи§!.\n\n§Yих регионы§!, §Cставшие нашими национальными§!, получат следующие §Yмодификаторы§!:\n§YВассал Зарантийской Империи§!:\n  Эффективность добычи ресурсов: §G+25.00%§!\n  Максимальное число фабрик в регионе: §R-30%§!\n  Призывное население: §R-85.00%§!\n  Местная скорость строительства: §R-30%§!\n"
+ ZAR_empire_core_kar_alpaka_tt:0 "Мы интегрируем §YКар-альпаку§! в §YЗарантийскую Империю§!. Их территории станут нашими §Cнациональными§!, и они станут частью §YКольтванского Вассала§! §YИмперии§!. Их земля будет использоваться для добычи ресурсов, и мы получим наёмных слуг для §Yядра Зарантийской Империи§!.\n\n§Yих регионы§!, §Cставшие нашими национальными§!, получат следующие §Yмодификаторы§!:\n§YВассал Зарантийской Империи§!:\n  Эффективность увеличения ресурсов: §G+25.00%§!\n  Максимальное число фабрик в регионе: §R-30%§!\n  Призывное население: §R-85.00%§!\n  Местная скорость строительства: §R-30%§!\n"
 
  ZAR_zarantian_vassal:0 "Вассал Зарантийской Империи"
 
diff --git a/localisation/russian/eaw_decisions_l_russian.yml b/localisation/russian/eaw_decisions_l_russian.yml
index 9d832a79cea..65013498d56 100644
--- a/localisation/russian/eaw_decisions_l_russian.yml
+++ b/localisation/russian/eaw_decisions_l_russian.yml
@@ -20,6 +20,9 @@ ban_neutral_party_desc:0 "Традиционалистские и монархи
 ban_neutrality_party_tt:1 "Изменение популярности нейтралитета: §G-§![?Root.party_popularity@neutrality|%0G].\n"
 anti_neutral_raids:0 "Антитрадиционалистские рейды"
 anti_neutral_raids_desc:0 "Мы должны расправиться с традиционалистскими и монархистскими элементами в нашей стране ради долгосрочной внутренней стабильности. Их влияние слишком велико и потенциально может стать проблемой для правительства."
+seize_some_trucks_woo:0 "Реквизировать гражданский автотранспорт"
+seize_some_trucks_woo_desc:0 "Коммерческие автомобильные компании обладают существенным влиянием на нашу инфраструктуру. В условиях надвигающейся войны мы имеем право реквизировать технику для государственного пользования."
+
 
 ## RESOURCE PROSPECTS ####
 develop_baltimare_aluminium:0 "Алюминиевый завод Балтимейра"
diff --git a/localisation/russian/eaw_difficulty_l_russian.yml b/localisation/russian/eaw_difficulty_l_russian.yml
index 07b6476ca0f..805395c922f 100644
--- a/localisation/russian/eaw_difficulty_l_russian.yml
+++ b/localisation/russian/eaw_difficulty_l_russian.yml
@@ -21,6 +21,9 @@
  custom_diff_strong_HIP:0 "Усилить Гиппогрифию"
  custom_diff_strong_BAT:0 "Усилить Хироптерру"
  custom_diff_strong_CTH:0 "Усилить Кольтфагенскую Республику"
+ custom_diff_strong_ROA:0 "Усилить Роамский Кайзерат"
+ custom_diff_strong_TSV:0 "Усилить Талонсвааль Републик"
+ custom_diff_strong_KXN:0 "Усилить Милитархию Лан Кир"
  custom_diff_strong_KIR:0 "Усилить Царство Кирия"
  custom_diff_strong_KIS:0 "Усилить Совет Северной Кирии"
  custom_diff_strong_KIC:0 "Усилить Республику Кирия"
\ No newline at end of file
diff --git a/localisation/russian/eaw_generic_techs_l_russian.yml b/localisation/russian/eaw_generic_techs_l_russian.yml
index 99dd9cbdb74..b4582300c2e 100644
--- a/localisation/russian/eaw_generic_techs_l_russian.yml
+++ b/localisation/russian/eaw_generic_techs_l_russian.yml
@@ -133,7 +133,6 @@
  cat_strategic_destruction:0 "Доктрина стратегического разрушения" #for BAR_air_strat_dest
  category_mechanical:0 "Механические батальоны"
  category_motmech:0 "Моторизованная/механизированная пехота"
- category_engineer:0 "Инженеры"
  category_scout_plane:0 "Самолёты-разведчики"
  category_magical:0 "Все магические батальоны"
  TITLE_GENERIC_SOCIETY_MAGIC_SUBTITLE:0 "ОБЩЕСТВО"
diff --git a/localisation/russian/eaw_griffon_generic_l_russian.yml b/localisation/russian/eaw_griffon_generic_l_russian.yml
index dc2d4b39a10..1da2a1ae2ed 100644
--- a/localisation/russian/eaw_griffon_generic_l_russian.yml
+++ b/localisation/russian/eaw_griffon_generic_l_russian.yml
@@ -16,7 +16,7 @@ griffon_land_reform_desc:0 "Землей в наших границах в на
 griffon_five_year_plan:0 "Пятилетка"
 griffon_five_year_plan_desc:0 "Важным столпом социализма является плановая экономика. Создав пятилетний план для роста нашей экономики, мы сможем в долгосрочной перспективе значительно улучшить наши производственные возможности."
 griffon_spread_the_revolution:0 "Распространение революции"
-griffon_spread_the_revolution_desc:0 "Мы, возможно, смогли построить социалистическую утопию, но многие грифоны все ещё страдают под гнётом капитализма. Отправляя волонтеров в страны, сражающихся с империалистами, мы сможем бороться с угнетением где бы оно ни проявлялось."
+griffon_spread_the_revolution_desc:0 "Мы, возможно, смогли построить социалистическую утопию, но многие грифоны все ещё страдают под гнётом капитализма. Отправляя добровольцев в страны, сражающихся с империалистами, мы сможем бороться с угнетением где бы оно ни проявлялось."
 griffon_fight_to_the_last:0 "Биться до последнего грифона"
 griffon_fight_to_the_last_desc:0 "Наши национальные границы должны соблюдаться любой ценой. Любая внешняя сила, пытающаяся подорвать наш суверенитет, столкнется со всей мощью нашей армии. И если произойдёт наш самый худший кошмар, мы убедимся, что каждый грифон готов умереть, защищая свою родину."
 griffon_ideological_though:0 "Идеологическое мышление"
diff --git a/localisation/russian/eaw_military_industrial_organization_l_russian.yml b/localisation/russian/eaw_military_industrial_organization_l_russian.yml
new file mode 100644
index 00000000000..c9c31b3defb
--- /dev/null
+++ b/localisation/russian/eaw_military_industrial_organization_l_russian.yml
@@ -0,0 +1,142 @@
+l_russian:
+
+###################################################################################################
+#### Code and UX localization
+###################################################################################################
+
+
+
+
+########  #######  ##     ## #### ########  ##     ## ######## ##    ## ########     ######   ########   #######  ##     ## ########   ######  
+##       ##     ## ##     ##  ##  ##     ## ###   ### ##       ###   ##    ##       ##    ##  ##     ## ##     ## ##     ## ##     ## ##    ## 
+##       ##     ## ##     ##  ##  ##     ## #### #### ##       ####  ##    ##       ##        ##     ## ##     ## ##     ## ##     ## ##       
+######   ##     ## ##     ##  ##  ########  ## ### ## ######   ## ## ##    ##       ##   #### ########  ##     ## ##     ## ########   ######  
+##       ##  ## ## ##     ##  ##  ##        ##     ## ##       ##  ####    ##       ##    ##  ##   ##   ##     ## ##     ## ##              ## 
+##       ##    ##  ##     ##  ##  ##        ##     ## ##       ##   ###    ##       ##    ##  ##    ##  ##     ## ##     ## ##        ##    ## 
+########  ##### ##  #######  #### ##        ##     ## ######## ##    ##    ##        ######   ##     ##  #######   #######  ##         ######  
+
+
+mio_cat_eq_all_amphibious_tank: "Танки-амфибии"
+mio_cat_eq_all_main_battle_tank: "Средние танки и основные боевые танки"
+mio_cat_eq_all_super_heavy_tank: "Тяжелые танки и сверхтяжелые танки" 
+
+
+##     ## ########    ###    ########  ######## ########   ######  
+##     ## ##         ## ##   ##     ## ##       ##     ## ##    ## 
+##     ## ##        ##   ##  ##     ## ##       ##     ## ##       
+######### ######   ##     ## ##     ## ######   ########   ######  
+##     ## ##       ######### ##     ## ##       ##   ##         ## 
+##     ## ##       ##     ## ##     ## ##       ##    ##  ##    ## 
+##     ## ######## ##     ## ########  ######## ##     ##  ######  
+
+#######################
+##### MIO HEADERS #####
+#######################
+
+
+
+
+
+########   #######  ##       ####  ######  #### ########  ######  
+##     ## ##     ## ##        ##  ##    ##  ##  ##       ##    ## 
+##     ## ##     ## ##        ##  ##        ##  ##       ##       
+########  ##     ## ##        ##  ##        ##  ######    ######  
+##        ##     ## ##        ##  ##        ##  ##             ## 
+##        ##     ## ##        ##  ##    ##  ##  ##       ##    ## 
+##         #######  ######## ####  ######  #### ########  ######  
+
+
+mio_policy_HIP_land_flechette_rifles: "Модели игольчатых винтовок"
+mio_policy_HIP_land_caseless_rifles: "Модели безгильзовых винтовок"
+
+
+#   #  ##   ###  ##  ###       ##   ##  #  # #  # ### ###  ### ###  ## 
+## ## #  #    # #  # #  #     #  # #  # #  # ## #  #  #  #  #  #   #   
+# # # ####    # #  # ###      #    #  # #  # # ##  #  ###   #  ##   #  
+#   # #  # #  # #  # #  #     #  # #  # #  # #  #  #  #  #  #  #     # 
+#   # #  #  ##   ##  #  #      ##   ##   ##  #  #  #  #  # ### ### ##  
+
+OLE_mio_trait_german_landsverk_tech_exchange:0 "Чейнджлингско-оленийский обмен технологиями"
+
+
+ ######   ######## ##    ## ######## ########  ####  ######   ######  
+##    ##  ##       ###   ## ##       ##     ##  ##  ##    ## ##    ## 
+##        ##       ####  ## ##       ##     ##  ##  ##       ##       
+##   #### ######   ## ## ## ######   ########   ##  ##        ######  
+##    ##  ##       ##  #### ##       ##   ##    ##  ##             ## 
+##    ##  ##       ##   ### ##       ##    ##   ##  ##    ## ##    ## 
+ ######   ######## ##    ## ######## ##     ## ####  ######   ######  
+
+generic_mio_initial_trait_magical_designer:0 "Производитель магического оружия"
+
+###  ##  #  # # #     #   # ###  ##       ##  ###   ##  #  # ### ### #   # ###  ###  ## 
+ #  #  # ## # # #     ## ##  #  #  #     #  # #  # #  # #  # #    #   # #  #  # #   #   
+ #  #### # ## ##      # # #  #  #  #     #### ###  #    #### ##   #    #   ###  ##   #  
+ #  #  # #  # # #     #   #  #  #  #     #  # #  # #  # #  # #    #    #   #    #     # 
+ #  #  # #  # # #     #   # ###  ##      #  # #  #  ##  #  # ###  #    #   #    ### ##  
+
+
+#############################
+##### MAIN BATTLE PLANT #####
+#############################
+
+generic_main_battle_tank_organization: "Производитель основных боевых танков"
+generic_mio_initial_trait_main_battle_tank_designer: "Конструктор основных боевых танков"
+generic_mio_trait_mbt_all_round_cupola: "Интеграция турбокомпрессоров"
+generic_mio_trait_mbt_simplified_turret_design: "Оборудование для дуговой сварки"
+generic_mio_trait_mbt_specialist_shells: "Стабилизация сабель и плавников"
+generic_mio_trait_mbt_improved_gun_metallurgy: "Ранние расточные электроприводы"
+generic_mio_trait_mbt_armor_steel_working: "Компьютеризированная система управления производством"
+generic_mio_trait_mbt_spaced_armor: "Схемы брони с предельным углом наклона"
+generic_mio_trait_mbt_crew_survival_layout: "Разделение внутренних отсеков"
+generic_mio_trait_mbt_sloped_side_armor: "Экспериментальные системы ночного видения"
+generic_mio_trait_mbt_truck_engines: "Испытания системы с двумя двигателями"
+generic_mio_trait_mbt_aircraft_engines: "Испытания газотурбинных двигателей"
+generic_mio_trait_mbt_improved_suspension: "Гидропневматическая подвеска"
+generic_mio_trait_mbt_advanced_shells: "Расширение возможностей огневой поддержки"
+generic_mio_trait_mbt_power_traverse:0 "Вспомогательный траверсный насос"
+
+#############################
+##### SUPER HEAVY PLANT #####
+#############################
+generic_super_heavy_tank_organization: "Производитель сверхтяжелых танков"
+generic_mio_initial_trait_super_heavy_tank_designer: "Конструктор сверхтяжелых танков"
+generic_mio_trait_sht_double_tracks: "Сдвоенные гусеницы"
+generic_mio_trait_sht_one_piece_hull_side_coverings: "Высокопрочные сплавы"
+generic_mio_trait_sht_simplified_transmission_system: "Выделенные траншеи для обслуживания"
+generic_mio_trait_sht_improved_engine_output: "Перепрофилирование авиационных двигателей"
+generic_mio_trait_sht_sloping_armor: "Философия мобильного бункера"
+generic_mio_trait_sht_improved_crew_ergonomics: "Стеллажи для дымовых снарядов"
+generic_mio_trait_sht_reinforced_construction: "Высокоточная сварка"
+generic_mio_trait_sht_fully_cast_turret: "Схема бронирования с пикообразной передней частью"
+generic_mio_trait_sht_commander_cupola: "Дополнительные пулеметные гнёзда"
+generic_mio_trait_sht_simplified_layout: "Заводское оборудование повышенной прочности"
+generic_mio_trait_sht_high_explosive_shells: "Дополнительные орудия огневой поддержки"
+generic_mio_trait_sht_apcr_hvap_shells: "Орудия, созданные для разрушения"
+
+
+
+ ## #  # ### ###      #   # ###  ##       ##  ###   ##  #  # ### ### #   # ###  ###  ## 
+#   #  #  #  #  #     ## ##  #  #  #     #  # #  # #  # #  # #    #   # #  #  # #   #   
+ #  ####  #  ###      # # #  #  #  #     #### ###  #    #### ##   #    #   ###  ##   #  
+  # #  #  #  #        #   #  #  #  #     #  # #  # #  # #  # #    #    #   #    #     # 
+##  #  # ### #        #   # ###  ##      #  # #  #  ##  #  # ###  #    #   #    ### ##  
+
+
+ ##  ### ###   ##  ###   ##  ### ###     #   # ###  ##       ##  ###   ##  #  # ### ### #   # ###  ###  ## 
+#  #  #  #  # #  # #  # #  # #    #      ## ##  #  #  #     #  # #  # #  # #  # #    #   # #  #  # #   #   
+####  #  ###  #    ###  #### ##   #      # # #  #  #  #     #### ###  #    #### ##   #    #   ###  ##   #  
+#  #  #  #  # #  # #  # #  # #    #      #   #  #  #  #     #  # #  # #  # #  # #    #    #   #    #     # 
+#  # ### #  #  ##  #  # #  # #    #      #   # ###  ##      #  # #  #  ##  #  # ###  #    #   #    ### ##  
+
+
+#   #  ##  ### ### ###  ### ### #       #   # ###  ##       ##  ###   ##  #  # ### ### #   # ###  ###  ## 
+## ## #  #  #  #   #  #  #  #   #       ## ##  #  #  #     #  # #  # #  # #  # #    #   # #  #  # #   #   
+# # # ####  #  ##  ###   #  ##  #       # # #  #  #  #     #### ###  #    #### ##   #    #   ###  ##   #  
+#   # #  #  #  #   #  #  #  #   #       #   #  #  #  #     #  # #  # #  # #  # #    #    #   #    #     # 
+#   # #  #  #  ### #  # ### ### ###     #   # ###  ##      #  # #  #  ##  #  # ###  #    #   #    ### ##  
+
+
+DEBUG_generic_refurbishment_repair_organization: "$generic_refurbishment_repair_organization$"
+DEBUG_generic_super_heavy_tank_organization: "$generic_super_heavy_tank_organization$"
+DEBUG_generic_main_battle_tank_organization: "$generic_main_battle_tank_organization$"
diff --git a/localisation/russian/eaw_plane_designer_l_russian.yml b/localisation/russian/eaw_plane_designer_l_russian.yml
index 4c0abaea006..f8ac3c27827 100644
--- a/localisation/russian/eaw_plane_designer_l_russian.yml
+++ b/localisation/russian/eaw_plane_designer_l_russian.yml
@@ -19,6 +19,9 @@
  fast_jet_engine_6x:0 "6 сверхзвуковых реактивных двигателей"
  fast_jet_engine_6x_desc:0 "Шесть двигателей благодаря обогащённому бором высокоэнергетическому топливу могут обеспечить самолёту поразительную скорость, хотя они дороги в производстве и расходуют много горючего. Кроме того, они занимают столько же места, сколько 8 обычных реактивных двигателей, поэтому для их установки требуется более крупный корпус."
 
+ torpedo_mounting_4:0 "Крепления для современных торпед"
+ torpedo_mounting_4_desc:0 "Жесткие крепления, закрепленные пд фюзеляжем, позволят установить современные, более смертоносные торпеды. Это позвлит самолету наносить более эффективные удары по вражеским кораблям."
+
  rocket_engine_4:0 "Кристальный двигатель I"
  rocket_engine_4_desc:0 "Этот двигатель похож на ракетный, но использует жидкие кристаллы в качестве источника энергии. Это значительно увеличивает производительность, но требует доступа к этому редкому ресурсу."
  rocket_engine_5:0 "Кристальный двигатель II"
@@ -36,6 +39,10 @@
  aircraft_cannon_4_2x_desc:0 "Огневая мощь этих пушек сравнима с ракетой "воздух-воздух", так что мало что может выдержать попадания из них."
  guided_air_to_surface_missile:0 "Управляемая ракета "воздух-поверхность""
  guided_air_to_surface_missile_desc:0 "Эта ракета является одним из первых настоящих высокоточных видов оружия класса "воздух-поверхность"."
+ cannon_defense_turret_2:0 "Современная орудийная защитная турель"
+ cannon_defense_turret_2_desc:0 "Дальнейшаая модернизация, направленная на повышение скорострельности, делает любые попытки нападения на самолет практически бесперспективными. Компьютеризированные системы наведения позволят разнести в клочья даже современные истребители."
+ cannon_defense_turret_2_2x:0 "2 современных орудийных защитных турели"
+ cannon_defense_turret_2_2x_desc:0 "Две современных пушки способны разорвать в клочья почти всё, что попытается навредить самолету. Очень немногие способны пережить попытку нападения на эту летающую крепость."
  guided_air_to_air_missile:0 "Управляемая ракета "воздух-воздух""
  guided_air_to_air_missile_desc:0 "Эта новая ракета с тепловым или радиолокационным наведением представляет серьезную угрозу для самолётов."
  nuclear_air_to_air_rocket:0 "Неуправляемая ядерная ракета "воздух-воздух""
@@ -90,10 +97,10 @@
 
  hardpoints:0 "Узлы подвески вооружения"
  hardpoints_desc:0 "Несмотря на то, что специализация самолётов для выполнения определенных задач даёт много преимуществ, универсальность является важным фактором при проектировании самолётов. Концепция узлов подвески вооружения проста: обеспечить платформу, на которую можно установить любой вид оружия, не снижая при этом эффективность самолёта. К удивлению и раздражению ветеранов воздушных дуэлей, эта инновация оказалась невероятно эффективной."
- aa_cannon_3:0 "Усовершенствованные авиационные пушки"
- aa_cannon_3_desc:0 "Основным недостатком старых авиационных пушек была низкая кучность стрельбы, что затрудняло ведение огня по маневренным противникам. Этот недостаток был в значительной степени устранен с внедрением усовершенствованных пушек, которые даже могут обстреливать наземные цели, хотя результаты этого всё ещё неоднозначны."
- aa_cannon_4:0 "Современные авиационные пушки"
- aa_cannon_4_desc:0 "Использование нескольких стволов в стиле старых орудий Катлинга позволяет добиться поистине поразительной скорострельности даже при стрельбе 20-мм снарядами. Реактивные двигатели обеспечивают достаточное количество электроэнергии для вращения ствола в полёте. Кроме того, эти пушки эффективнее работают по наземным целям."
+ aa_cannon_4:0 "Усовершенствованные авиационные пушки"
+ aa_cannon_4_desc:0 "Основным недостатком старых авиационных пушек была низкая кучность стрельбы, что затрудняло ведение огня по маневренным противникам. Этот недостаток был в значительной степени устранен с внедрением усовершенствованных пушек, которые даже могут обстреливать наземные цели, хотя результаты этого всё ещё неоднозначны."
+ aa_cannon_5:0 "Современные авиационные пушки"
+ aa_cannon_5_desc:0 "Использование нескольких стволов в стиле старых орудий Катлинга позволяет добиться поистине поразительной скорострельности даже при стрельбе 20-мм снарядами. Реактивные двигатели обеспечивают достаточное количество электроэнергии для вращения ствола в полёте. Кроме того, эти пушки эффективнее работают по наземным целям."
  tank_buster_3:0 "Противотанковая пушка III"
  tank_buster_3_desc:0 "Использование огневой мощи самолётных пушек против наземных целей было ограничено их точностью. Для таких задач требовались особо опытные пилоты и отсутствие вражеской ПВО. Но теперь это изменилось, поскольку скорострельность новейших пушек успешно компенсирует общую неточность стрельбы."
  electronic_countermeasures:0 "Противоракетные контрмеры"
@@ -110,6 +117,9 @@
  modern_large_airframe_2_desc:0 "$large_plane_airframe_5_desc$"
 
 
+ air_torpedoe_4:0 "Современные авиационные торпеды"
+ air_torpedoe_4_desc:0 "Намного более мощные торпеды с компьютерным наведением значительно повышают эффективность воздушных атак по наводным целям противника."
+
  small_plane_cas_airframe_5:0 "Современный корпус штурмовика"
  small_plane_naval_bomber_airframe_5:0 "Современный корпус палубного морского бомбардировщика"
  cv_small_plane_cas_airframe_5:0 "Современный корпус палубного штурмовика"
diff --git a/localisation/russian/eaw_research_l_russian.yml b/localisation/russian/eaw_research_l_russian.yml
index df7d67d927c..aecd4fc1627 100644
--- a/localisation/russian/eaw_research_l_russian.yml
+++ b/localisation/russian/eaw_research_l_russian.yml
@@ -486,6 +486,22 @@
  JET_FIGHTER_DOCTRINES_TITLE:0 "Теория реактивных истребителей"
  JET_FIGHTER_DOCTRINES_DESC:0 "Прогресс в разработке двигателей, радаров и ракет навсегда изменит наш подход к воздушному бою."
 
+ RACIAL_SPECFORCE_DOCTRINE_LABEL:0 "Расовые спецвойска"
+ RACIAL_SPECFORCE_DOCTRINE_DESC:0 "Хотя современное оружие и тактики распространились повсеместно, нельзя забывать и особенности нашего вида."
+ racial_specforce_start:0 "Поднять наших лучших"
+ racial_specforce_start_desc:0 "Эволюция традиционных методов ведения войны и вооружения показали эффективность введения в структуру командования молодых офицеров, открытых для инноваций. Неудивительно, что специальные подразделения нашего вида сохраняют свои боевые роли, и именно поэтому мы выделили больше ресурсов на проведение реформ наших дивизий. "
+ racial_specforce_left1:0 "Интеграция командных структур"
+ racial_specforce_left1_desc:0 "В прошлом взаимодействие наших наиболее ценных подразделений было весьма проблематичным, что снижало их боевую эффективность. Мы не можем и дальше допускать столкновений интересов в погоне за званиями и должностями, поскольку это подрывает эффективность армии. Мы должны выработать выработать кристально четкую структуру командования."
+ racial_specforce_right1:0 "Непрерывный огонь"
+ racial_specforce_right1_desc:0 "Хотя массированный пехотный огонь обычно считается неэффективным против самолетов, основной недостаток подобного метода - низкая точность простых солдат, находящихся под угрозой. Можно отметить, что наиболее стойкие и подготовленные солдаты гораздо лучше действуют в условиях воздушного превосходства врага, поэтому мы продолжим развитие техники залпового огня в качестве дополнительной меры противовоздушной обороны наших войск."
+ racial_specforce_left2:0 "Особые стратегии фортификации"
+ racial_specforce_left2_desc:0 "Хотя наша пехота и обучена возведению укреплений на поле боя, их фортификационные способности ограничены носимым снаряжением и отсутствием должной подготоки. Специальные войска, обученные по современным стандартам, смогут создавать уникальные фортификационные сети, которые позволят застать противника врасплох и обратить его в бегство."
+ racial_specforce_right2:0 "Поддержка бронетехники"
+ racial_specforce_right2_desc:0 "Высокая боевая эффективность танков не раскрывается в полной степени в случае, если они действуют совместно с нашими специалными войсками. Разработанные модификации наиболее распространенных моделей позволят удовлетворить потребности спецподразделений в тяжелой технике, полностью удовлетворяя их требованиям и не снижая боевую эффективность."
+ racial_specforce_final:0 "Гордость вида"
+ racial_specforce_final_desc:0 "Хотя некоторые и сторонятся от ответственности представлять лучших из своего рода, однако это не относится к нашим доблестным бойцам спецвойск. Они - гордость вида, а их выдающиеся боевые качества - лишь подтверждение звания лучших из лучших."
+
+
 
  #Doesn't display when adding as tech, so added here
  early_ship_hull_light:0 "Эскадренный миноносец" 
diff --git a/localisation/russian/eaw_resistance_l_russian.yml b/localisation/russian/eaw_resistance_l_russian.yml
index 1cefec65f76..0b107d56815 100644
--- a/localisation/russian/eaw_resistance_l_russian.yml
+++ b/localisation/russian/eaw_resistance_l_russian.yml
@@ -1,8 +1,27 @@
 l_russian:
-integration_occupation:0 "Интеграция (только для некоторых стран)"
+integration_occupation:0 "Интеграция"
+integration_occupation_desc:0 "§YТолько для некоторых стран.§!"
 compliance_40_core:0 "Полная интеграция"
 add_to_ROOT_potential_original_cores_TT:0 "Может стать национальной территорией государства [Root.GetName] с помощью оккупационного закона §YИнтеграция§!, если средний уровень §Hподчинения§! оккупированных регионов достигнет §H40%§!."
 add_to_ROOT_potential_cores_TT:0 "Может стать национальной территорией государства [Root.GetName] с помощью оккупационного закона §YИнтеграция§!, если средний уровень §Hподчинения§! оккупированных регионов достигнет §H40%§!."
 resistance_boosted:0 "Сопротивление уже усилено"
 add_to_PREV_potential_original_cores_TT:0 "Может стать национальной территорией государства [Prev.GetName] с помощью оккупационного закона §YИнтеграция§!, если средний уровень §Hподчинения§! оккупированных регионов достигнет §H40%§!."
-add_to_PREV_potential_cores_TT:0 "Может стать национальной территорией государства [Prev.GetName] с помощью оккупационного закона §YИнтеграция§!, если средний уровень §Hподчинения§! оккупированных регионов достигнет §H40%§!."
\ No newline at end of file
+add_to_PREV_potential_cores_TT:0 "Может стать национальной территорией государства [Prev.GetName] с помощью оккупационного закона §YИнтеграция§!, если средний уровень §Hподчинения§! оккупированных регионов достигнет §H40%§!."
+
+forced_labor_occupation_improved_EaW_tt:0 "\nОккупационный закон §Y«$forced_labor_occupation$»§! изменится на: \n $MODIFIER_RESISTANCE_DECAY$: §G+40%§! \n $MODIFIER_RESISTANCE_GROWTH$: §G-40%§! \n $MODIFIER_LOCAL_RESOURCES$: §G+10%§! \n $MODIFIER_LOCAL_FACTORIES$: §G+10%§! \n $MODIFIER_ATTRITION_FOR_CONTROLLER$: §G-25%§! \n Шанс подрыва добычи ресурсов: §G-5%§! \n Длительность подрыва добычи ресурсов: §G-15%§! \n $MODIFIER_COMPLIANCE_GAIN_ADD$: §G+0.030%§! \n"
+
+harsh_quotas_occupation_improved_EaW_tt:0 "\nОккупационный закон §Y«$harsh_quotas_occupation$»§! изменится на: \n $MODIFIER_RESISTANCE_DECAY$: §G+40%§! \n $MODIFIER_RESISTANCE_GROWTH$: §G-40%§! \n $MODIFIER_RESISTANCE_DAMAGE_TO_GARRISONS$: §G-20%§! \n $MODIFIER_LOCAL_RESOURCES$: §G+15%§! \n $MODIFIER_LOCAL_FACTORIES$: §G+15%§! \n $MODIFIER_LOCAL_SUPPLIES_FOR_CONTROLLER$: §G+25%§! \n Шанс саботажа на гражданской фабрике: §G-5%§! \n Шанс саботажа на военном заводе: §G-5%§! \n $MODIFIER_COMPLIANCE_GAIN_ADD$: §G+0.030%§! \n"
+
+forced_labor_occupation_improved_EaW:1 "$forced_labor_occupation$"
+harsh_quotas_occupation_improved_EaW:1 "$harsh_quotas_occupation$"
+
+resource_sabotage_improved_EaW_decrease_tooltip:0 "  Шанс подрыва добычи ресурсов: §G-30%§!\n  Длительность подрыва добычи ресурсов: §G-40%§!"
+factory_sabotage_improved_EaW_decrease_tooltip:0 "  Шанс саботажа на гражданской фабрике: §G-30%§!\n  Шанс саботажа на военном заводе: §G-30%§!"
+
+#these are used for comparison
+resource_sabotage_improved_EaW_decrease_tooltip_ADDED:0 "  Шанс подрыва добычи ресурсов: §G-30%§! (§G-30%§!)\n  Длительность подрыва добычи ресурсов: §G-40%§! (§G-40%§!)"
+factory_sabotage_improved_EaW_decrease_tooltip_ADDED:0 "  Шанс саботажа на гражданской фабрике: §G-30%§! (§G-30%§!)\n  Шанс саботажа на военном заводе: §G-30%§! (§G-30%§!)"
+resource_sabotage_improved_EaW_decrease_tooltip_REMOVED:0 "  Шанс подрыва добычи ресурсов: §H+0%§! (§R+30%§!)\n  Длительность подрыва добычи ресурсов: §H+0%§! (§R+40%§!)"
+factory_sabotage_improved_EaW_decrease_tooltip_REMOVED:0 "  Шанс саботажа на гражданской фабрике: §H+0%§! (§R+30%§!)\n  Шанс саботажа на военном заводе: §H+0%§! (§R+30%§!)"
+resource_sabotage_improved_EaW_decrease_tooltip_UNCHANGED:0 "  Шанс подрыва добычи ресурсов: §G-30%§! (§H+0%§!)\n  Длительность подрыва добычи ресурсов: §G-40%§! (§H+0%§!)"
+factory_sabotage_improved_EaW_decrease_tooltip_UNCHANGED:0 "  Шанс саботажа на гражданской фабрике: §G-30%§! (§H+0%§!)\n  Шанс саботажа на военном заводе: §G-30%§! (§H+0%§!)"
\ No newline at end of file
diff --git a/localisation/russian/eaw_riverfed_l_russian.yml b/localisation/russian/eaw_riverfed_l_russian.yml
index b23afaa1a95..d32bc258532 100644
--- a/localisation/russian/eaw_riverfed_l_russian.yml
+++ b/localisation/russian/eaw_riverfed_l_russian.yml
@@ -268,7 +268,14 @@
  
  #### TOOLTIPS ####
  RIV_rdc_rail_projects_tt:0 "§YКаждая подконтрольная национальная провинция§! с инфраструктурой меньше 5 получит §Y1 инфраструктуру§!.\n"
- RIV_eastern_transport_fund_tt:0 "Все те, кто финансирует РСК, получат выгоду с этого.\n"
+ RIV_found_the_rec_tt:0 "Все остальные участники Речной Коалиции и Стального Сообщества будут приглашены в Речное Экономическое Общество.\n"
+ RIV_social_fund_tt:0 "Все остальные участники Речного Экономического Общества получат выгоду с этого.\n"
+ RIV_river_parliament_tt:0 "Все участники Речного Фонда Социального Развития будут приглашены в Речной Парламент.\n"
+ RIV_the_rivbit_tt:0 "Все участники Речного Центрального Банка получат приглашение принять Ривбит.\n"
+ RIV_free_movement_tt:0 "Все участники Речного Парламента будут приглашены принять участие в формировании Зоны Свободного Перемещения.\n"
+ RIV_the_river_union_tt:0 "Участники, ратифицировавшие все предыдущие договоры, будут приглашены принять участие в формировании Речного Союза.\n"
+ RIV_river_army_tt:0 "Все участники Речного Союза будут приглашены приглашены принять участие в формировании Речной Армии\n"
+ RIV_river_government_tt:0 "Все участники Речного Союза будут приглашены принять участие в формировании Объединённого Речного Правительства\n"
  RIV_fed_race_plus_tt:0 "Повышает на §G1§! Вашу позицию в §Yгонке за формирование Федерации§!.\n"
  RIV_fed_race_minus1_tt:0 "Понижает Вашу позицию в §Yгонке за формирование Федерации§! на §R1§!.\n"
  RIV_fed_race_minus3_tt:0 "Понижает Вашу позицию в §Yгонке за формирование Федерации§! на §R3§!.\n"
diff --git a/localisation/russian/eaw_state_lore_l_russian.yml b/localisation/russian/eaw_state_lore_l_russian.yml
index f2625294f5c..5e54cdf7e21 100644
--- a/localisation/russian/eaw_state_lore_l_russian.yml
+++ b/localisation/russian/eaw_state_lore_l_russian.yml
@@ -391,7 +391,7 @@ state_lore_text_container_state_description_1069:0 "§YЧетвёртый§! п
 
 state_lore_text_container_state_name_short_1081:0 "Хризантема"
 state_lore_text_container_state_name_1081:0 "§YЗападный часовой§!:"
-state_lore_text_container_state_description_1081:0 "Питаемый водами, стекающими с гор §YПепельной Долины§!, город §YХризантема§! является самой западной городской провинцией §YЦарства§!. Западная часть Кирии слабо населена по сравнению с густонаселённым востоком и этот регион исторически был в некотором роде захолустьем, изолированным от шума и суеты восточного сердца династии. Даже в бурные века, предшествовавшие объединению Кирии, Хризантема избежала наихудших проявлений кровопролития и насилия, характерных для всего царства, поскольку в западной сельской местности было мало городов и поселений, и поэтому организованные конфликты между различными общинами киринов возникали редко.\n\nВ те времена поселение Хризантема служило неофициальным центром речной торговли вдоль западных притоков Великой Медоносной. Хризантема, тогда всего лишь малонаселённая рыбацкая деревушка, со временем разрасталась, поскольку летом туда массово съезжались фермеры и ремесленники, чтобы продать свои товары речным торговцам. Разумеется, такое количество киринов, съезжающихся в один город, нередко приводило к §Rвспышкам гнева§!, но непостоянство места сбора и его временные постройки хорошо переносили §Rтрансформации нириков§!, и ежегодные события проходили без особых проблем.\n\nХризантема стала настоящим городом только после того, как сюда пришёл Путь Огня, позволивший общинам киринов основать более крупные и постоянные поселения вдоль реки, а учение и догматы богини огня §GКонкорд§! послужили средством подавления нириков и способствовали интеграции близлежащих сельских общин в город. С тех пор Хризантема служит объединяющим центром, связывающим сельские западные поселения с властью и указами §ОАлой династии§, и её влияние распространяется даже на самые изолированные поселения запада.\n\nОднако §RБезмолвие§! фактически отделило город от столицы и остальной части царства. Хризантема, оставшаяся теперь одиноким центром религиозной власти на западе, отчаянно пыталась поддерживать связи с городами, расположенными дальше по Великой Медоносной, поскольку население сокращалось и кирины начали возвращаться в соседние общины. Город мог бы и вовсе исчезнуть, если бы не оживление религиозных проповедей и пыл, распространяемые §YЗеленеющим§!, где образовалась секта Пути Огня, известная как §CРазгорающееся Пламя§!. В новых учениях, обещавших совместить декреты Безмолвия с эгалитарными коммуналистскими идеалами, лидеры Хризантемы обрели надежду на то, что им удастся не допустить угасания своего города. Хризантема начала распространять учение Разгорающегося Пламени среди окружающих её сельских общин, и благодаря их усилиям секта прочно укоренилась в западном регионе.\n\nОднако с окончанием Безмолвия грядёт расплата между Путём Огня на востоке и Разгорающемся Пламенем на западе. Только время покажет, сможет ли Хризантема примириться с Киноварью и вновь стать центром имперской власти на западе, или же она попытается распространить учения секты по всей Великой Медоносной, что может навсегда изменить общество киринов.\n"
+state_lore_text_container_state_description_1081:0 "Питаемый водами, стекающими с гор §YПепельной Долины§!, город §YХризантема§! является самой западной городской провинцией §YЦарства§!. Западная часть Кирии слабо населена по сравнению с густонаселённым востоком и этот регион исторически был в некотором роде захолустьем, изолированным от шума и суеты восточного сердца династии. Даже в бурные века, предшествовавшие объединению Кирии, Хризантема избежала наихудших проявлений кровопролития и насилия, характерных для всего царства, поскольку в западной сельской местности было мало городов и поселений, и поэтому организованные конфликты между различными общинами киринов возникали редко.\n\nВ те времена поселение Хризантема служило неофициальным центром речной торговли вдоль западных притоков Великой Медоносной. Хризантема, тогда всего лишь малонаселённая рыбацкая деревушка, со временем разрасталась, поскольку летом туда массово съезжались фермеры и ремесленники, чтобы продать свои товары речным торговцам. Разумеется, такое количество киринов, съезжающихся в один город, нередко приводило к §Rвспышкам гнева§!, но непостоянство места сбора и его временные постройки хорошо переносили §Rтрансформации нириков§!, и ежегодные события проходили без особых проблем.\n\nХризантема стала настоящим городом только после того, как сюда пришёл Путь Огня, позволивший общинам киринов основать более крупные и постоянные поселения вдоль реки, а учение и догматы богини огня §GКонкорд§! послужили средством подавления нириков и способствовали интеграции близлежащих сельских общин в город. С тех пор Хризантема служит объединяющим центром, связывающим сельские западные поселения с властью и указами §OАлой династии§, и её влияние распространяется даже на самые изолированные поселения запада.\n\nОднако §RБезмолвие§! фактически отделило город от столицы и остальной части царства. Хризантема, оставшаяся теперь одиноким центром религиозной власти на западе, отчаянно пыталась поддерживать связи с городами, расположенными дальше по Великой Медоносной, поскольку население сокращалось и кирины начали возвращаться в соседние общины. Город мог бы и вовсе исчезнуть, если бы не оживление религиозных проповедей и пыл, распространяемые §YЗеленеющим§!, где образовалась секта Пути Огня, известная как §CРазгорающееся Пламя§!. В новых учениях, обещавших совместить декреты Безмолвия с эгалитарными коммуналистскими идеалами, лидеры Хризантемы обрели надежду на то, что им удастся не допустить угасания своего города. Хризантема начала распространять учение Разгорающегося Пламени среди окружающих её сельских общин, и благодаря их усилиям секта прочно укоренилась в западном регионе.\n\nОднако с окончанием Безмолвия грядёт расплата между Путём Огня на востоке и Разгорающемся Пламенем на западе. Только время покажет, сможет ли Хризантема примириться с Киноварью и вновь стать центром имперской власти на западе, или же она попытается распространить учения секты по всей Великой Медоносной, что может навсегда изменить общество киринов.\n"
 
 state_lore_text_container_state_name_short_1065:0 "Рыжий остров"
 state_lore_text_container_state_name_1065:0 "§YПиратская гавань§!:"
@@ -404,7 +404,7 @@ state_lore_text_container_state_description_817:0 "Город §YСияние§!
 
 state_lore_text_container_state_name_short_1054:0 "Лотус"
 state_lore_text_container_state_name_1054:0 "§YЦитадель Короны Лотоса§!:"
-state_lore_text_container_state_description_1054:0 "В центре этого великого города Зайкирии возвышается §СЦитадель Лотоса§! — древнее сооружение, веками служившее крепостью-монастырем для жрецов Южного Пути Огня. В её центре находится §ОСвятилище Пламенного Лотоса§! — небольшой алтарь с нефритовой шкатулкой, в которой хранится вечно горящий цветок лотоса — доказательство божественной воли Конкорд. Вокруг этого священного места вырос монастырь, а для защиты этого религиозного центра и хранящейся в нём искры были выстроены мощные стены и выкопаны глубокие рвы. Вскоре комплекс перерос свое первое кольцо обороны, и пришлось возводить ещё одно. Так повторялось §Yтри раза§!, причем каждое кольцо укреплений представляло собой очередную эпоху в истории города. В соответствии с волей Конкорд эти священные кольца напоминали §Pлепестки цветка лотоса§!, показывая, что пылающий цветок всегда будет священным сердцем города.\n\nЕсли кирины на севере в конце концов смогли объединиться под влиянием учений §CПути Огня§!, то различные города-государства §YЗайкирии§! ещё долгое время оставались раздробленными и враждебными друг другу, даже когда религия §GКонкорд§! начала проникать на юг. Из этих городов-государств §YЛотос§! и §YБутон§! были двумя самыми сильными и часто использовали более мелкие города-государства в региональных §Rнепрямых войнах§! чтобы не допустить слишком резкого усиления власти и влияния друг друга. Эпоха воюющих государств была приостановлена около 800 года, когда влияние §ОАлой династии§! превратило эти государства в полуавтономные протектораты. Но внезапный приход §RБезмолвия§! покончил с влиянием матриарха в §Yюжной Кирии§!. Лишившись объединяющей силы, города-государства Зайкирия вновь раскололось и устроили войны.\n\nПосле установления Безмолвия значительная часть §Gинтеллектуалов и капиталистов§! из царства Матриарха сбежала в Лотус, чтобы найти новый дом среди земель, которые свободны от деспотичной политики Киновари. Эта группа образованных киринов стала инструментом, который пригодился военачальнику из Лотоса по имени §GСиндер Темпест§! для расширения и укрепления своей власти над регионом. Заняв Цитадель и включив этих образованных киринов в состав своего двора, Синдер Темпест начал долгую кампанию, подчиняя по очереди каждый из городов-государств Зайкирии, пока, наконец, не захватил давнего соперника Лотоса — Бутон.\n\nСиндер Темпест вернулся в Лотос с трофеями из завоеваний и провозгласил себя королем Сен Киня и §CНосителем Короны Лотоса§!. Лотос стал столицей его нового королевства, и в честь своих достижений Синдер ниспроверг верования Южного Пути Огня и объявил себя божественным правителем, подобным верховному матриарху. Утвердив свою божественную власть, Синдер использовал Южный Путь как инструмент для поддержания социального контроля над своим новым королевством, дабы оно не распалось после его смерти.\n\nВ настоящее время Лотос остается резиденцией Королевства Сен Кинь, хотя его влияние и власть над остальной частью региона начинают ослабевать, поскольку города-государства вновь §Rагитируют за независимость§!. А поскольку Безмолвие в Кирии закончилась и царство §Yпробуждается ото сна§!, Носителю Короны Лотоса придется действовать осторожно, чтобы сохранить превосходство Лотоса над остальной Зайкирией... и свою собственную независимость от возрождающегося Алого Царства.\n"
+state_lore_text_container_state_description_1054:0 "В центре этого великого города Зайкирии возвышается §CЦитадель Лотоса§! — древнее сооружение, веками служившее крепостью-монастырем для жрецов Южного Пути Огня. В её центре находится §OСвятилище Пламенного Лотоса§! — небольшой алтарь с нефритовой шкатулкой, в которой хранится вечно горящий цветок лотоса — доказательство божественной воли Конкорд. Вокруг этого священного места вырос монастырь, а для защиты этого религиозного центра и хранящейся в нём искры были выстроены мощные стены и выкопаны глубокие рвы. Вскоре комплекс перерос свое первое кольцо обороны, и пришлось возводить ещё одно. Так повторялось §Yтри раза§!, причем каждое кольцо укреплений представляло собой очередную эпоху в истории города. В соответствии с волей Конкорд эти священные кольца напоминали §Pлепестки цветка лотоса§!, показывая, что пылающий цветок всегда будет священным сердцем города.\n\nЕсли кирины на севере в конце концов смогли объединиться под влиянием учений §CПути Огня§!, то различные города-государства §YЗайкирии§! ещё долгое время оставались раздробленными и враждебными друг другу, даже когда религия §GКонкорд§! начала проникать на юг. Из этих городов-государств §YЛотос§! и §YБутон§! были двумя самыми сильными и часто использовали более мелкие города-государства в региональных §Rнепрямых войнах§! чтобы не допустить слишком резкого усиления власти и влияния друг друга. Эпоха воюющих государств была приостановлена около 800 года, когда влияние §OАлой династии§! превратило эти государства в полуавтономные протектораты. Но внезапный приход §RБезмолвия§! покончил с влиянием матриарха в §Yюжной Кирии§!. Лишившись объединяющей силы, города-государства Зайкирия вновь раскололось и устроили войны.\n\nПосле установления Безмолвия значительная часть §Gинтеллектуалов и капиталистов§! из царства Матриарха сбежала в Лотус, чтобы найти новый дом среди земель, которые свободны от деспотичной политики Киновари. Эта группа образованных киринов стала инструментом, который пригодился военачальнику из Лотоса по имени §GСиндер Темпест§! для расширения и укрепления своей власти над регионом. Заняв Цитадель и включив этих образованных киринов в состав своего двора, Синдер Темпест начал долгую кампанию, подчиняя по очереди каждый из городов-государств Зайкирии, пока, наконец, не захватил давнего соперника Лотоса — Бутон.\n\nСиндер Темпест вернулся в Лотос с трофеями из завоеваний и провозгласил себя королем Сен Киня и §CНосителем Короны Лотоса§!. Лотос стал столицей его нового королевства, и в честь своих достижений Синдер ниспроверг верования Южного Пути Огня и объявил себя божественным правителем, подобным верховному матриарху. Утвердив свою божественную власть, Синдер использовал Южный Путь как инструмент для поддержания социального контроля над своим новым королевством, дабы оно не распалось после его смерти.\n\nВ настоящее время Лотос остается резиденцией Королевства Сен Кинь, хотя его влияние и власть над остальной частью региона начинают ослабевать, поскольку города-государства вновь §Rагитируют за независимость§!. А поскольку Безмолвие в Кирии закончилась и царство §Yпробуждается ото сна§!, Носителю Короны Лотоса придется действовать осторожно, чтобы сохранить превосходство Лотоса над остальной Зайкирией... и свою собственную независимость от возрождающегося Алого Царства.\n"
 
 state_lore_text_container_state_name_short_1058:0 "Бутон"
 state_lore_text_container_state_name_1058:0 "§YДинастический оплот§!:"
@@ -412,7 +412,7 @@ state_lore_text_container_state_description_1058:0 "Город-государс
 
 state_lore_text_container_state_name_short_1083:0 "Звёздчатый Коралл"
 state_lore_text_container_state_name_1083:0 "§YМетрополис на Мейрконге§!:"
-state_lore_text_container_state_description_1083:0 "В тёмные времена, предшествовавшие §Yобъединению§! под властью §OПути Огня§! и §Cматриархов§!, Кирия была страной анархии, войн и разрухи. Региональные военачальники и мелкие тираны правили множеством непрерывно враждующих вотчин. Именно из этих мест, полных страха и слёз, на юг, к малонаселённой §Gгранице Зайкирии§! устремились потоки киринского крестьянства.\n\nНа северном берегу §Cреки Мейрконг§! в начале 6 века было основано самое дальнее киринское поселение на юге Зайкирии. Беженцы из Кирии основали поселения по всей Зайкирии, но выгодное расположение Звёздчатого Коралла в устье реки Мейрконг привлекло значительный приток киринских иммигрантов.\n\nХотя поселения киринов на территории §PХамрина§! отказались от любой формы центрального правительства, чтобы сохранить суверенитет каждого поселения, неформальные силы торговли, коммерции и обмена населением привели к тому, что Звёздчатый Коралл стал §Yдоминировать над более мелкими внутренними государствами§! в экономическом, культурном и политическом плане. Хотя поселения, входящие в Лигу Хамрина, содержат свои постоянные армии, обеспечивая тем самым значительную степень автономии и самоуправления, именно Звёздчатый Коралл является главной силой Лиги.\n\nБлагодаря местоположению Звёздчатый Коралл стал основным местом межкультурного обмена между киринскими поселенцами и §Yкоренными зебрами дальнего юга§!. Даже после объединения Кирии город избежал всеохватывающего влияния Пути Огня. Легенда о §RГромовом Тигре§! — могущественном, непостижимом и слишком реальном для мистического создания божестве, охраняющем §YЗолотой храм§! — вдохновляла киринов Хамрина на то, чтобы своими силами примириться с состоянием §Онирика§!.\n\nКирины Хамрина интерпретировали истории о зебрах, которые нападали на потенциальных грабителей или расхитителей гробниц в приступе §Rярости§! как одержимость §RГромовым Тигром§!, дабы представить себе превращение в §Oнирика§! как нечто вызванное духовными или мистическими силами, неподвластными обычным киринам. В отличие от §CПути Огня§!, который клеймил превращение в нирика и подвергал остракизму оступившихся, хамринская §PСекта Южного Сияния§! терпимо относились к киринам, обратившимся в нирика, считая, что они не виноваты в потере контроля над собой. Но утверждая, что кирин, ставший нириком, обязан возместить ущерб пострадавшим из-за этой оплошности.\n\nАвторитет доктрины Секты Южного Сияния привёл к тому, что она стала играть роль арбитра и третейского судьи в спорах, первоначально связанных с превращением в нириков, но со временем её компетенция расширилась до вопросов гражданского права, коммерции и культуры. Хотя §Yиндустриализация Хамрина§! и появление класса капиталистов и торговцев в конечном итоге мирно положили конец монополии Секты на политическую власть, жрецы и мистики Южного Сияния и сегодня представляют собой влиятельную группу интересов в регионе.\n\nВ городе полно причалов, пристаней и верфей. Штаб-квартира торгового флота расположена в самом центре мегаполиса, рядом с §LБастионом Фонаря§!, где хранятся архивы и располагается бюрократический аппарат Южного Сияния. В Коралле находится §GСейм Хамринской Лиги§!, что делает его фактической столицей Лиги. На окраине мегаполиса располагается §RКалигинозная тюрьма§!, где каторжным трудом пытаются искупить свою вину те, кто стал нириком и не смог заплатить штраф за этот поступок.\n"
+state_lore_text_container_state_description_1083:0 "В тёмные времена, предшествовавшие §Yобъединению§! под властью §OПути Огня§! и §Cматриархов§!, Кирия была страной анархии, войн и разрухи. Региональные военачальники и мелкие тираны правили множеством непрерывно враждующих вотчин. Именно из этих мест, полных страха и слёз, на юг, к малонаселённой §Gгранице Зайкирии§! устремились потоки киринского крестьянства.\n\nНа северном берегу §Cреки Мейрконг§! в начале 6 века было основано самое дальнее киринское поселение на юге Зайкирии. Беженцы из Кирии основали поселения по всей Зайкирии, но выгодное расположение Звёздчатого Коралла в устье реки Мейрконг привлекло значительный приток киринских иммигрантов.\n\nХотя поселения киринов на территории §PХамрина§! отказались от любой формы центрального правительства, чтобы сохранить суверенитет каждого поселения, неформальные силы торговли, коммерции и обмена населением привели к тому, что Звёздчатый Коралл стал §Yдоминировать над более мелкими внутренними государствами§! в экономическом, культурном и политическом плане. Хотя поселения, входящие в Лигу Хамрина, содержат свои постоянные армии, обеспечивая тем самым значительную степень автономии и самоуправления, именно Звёздчатый Коралл является главной силой Лиги.\n\nБлагодаря местоположению Звёздчатый Коралл стал основным местом межкультурного обмена между киринскими поселенцами и §Yкоренными зебрами дальнего юга§!. Даже после объединения Кирии город избежал всеохватывающего влияния Пути Огня. Легенда о §RГромовом Тигре§! — могущественном, непостижимом и слишком реальном для мистического создания божестве, охраняющем §YЗолотой храм§! — вдохновляла киринов Хамрина на то, чтобы своими силами примириться с состоянием §Oнирика§!.\n\nКирины Хамрина интерпретировали истории о зебрах, которые нападали на потенциальных грабителей или расхитителей гробниц в приступе §Rярости§! как одержимость §RГромовым Тигром§!, дабы представить себе превращение в §Oнирика§! как нечто вызванное духовными или мистическими силами, неподвластными обычным киринам. В отличие от §CПути Огня§!, который клеймил превращение в нирика и подвергал остракизму оступившихся, хамринская §PСекта Южного Сияния§! терпимо относились к киринам, обратившимся в нирика, считая, что они не виноваты в потере контроля над собой. Но утверждая, что кирин, ставший нириком, обязан возместить ущерб пострадавшим из-за этой оплошности.\n\nАвторитет доктрины Секты Южного Сияния привёл к тому, что она стала играть роль арбитра и третейского судьи в спорах, первоначально связанных с превращением в нириков, но со временем её компетенция расширилась до вопросов гражданского права, коммерции и культуры. Хотя §Yиндустриализация Хамрина§! и появление класса капиталистов и торговцев в конечном итоге мирно положили конец монополии Секты на политическую власть, жрецы и мистики Южного Сияния и сегодня представляют собой влиятельную группу интересов в регионе.\n\nВ городе полно причалов, пристаней и верфей. Штаб-квартира торгового флота расположена в самом центре мегаполиса, рядом с §LБастионом Фонаря§!, где хранятся архивы и располагается бюрократический аппарат Южного Сияния. В Коралле находится §GСейм Хамринской Лиги§!, что делает его фактической столицей Лиги. На окраине мегаполиса располагается §RКалигинозная тюрьма§!, где каторжным трудом пытаются искупить свою вину те, кто стал нириком и не смог заплатить штраф за этот поступок.\n"
 
 state_lore_text_container_state_name_short_366:0 "Талононте"
 state_lore_text_container_state_name_366:0 "§YДревний Бастион§!:"
diff --git a/localisation/russian/eaw_tank_modules_l_russian.yml b/localisation/russian/eaw_tank_modules_l_russian.yml
index 26783300302..f04e48b9151 100644
--- a/localisation/russian/eaw_tank_modules_l_russian.yml
+++ b/localisation/russian/eaw_tank_modules_l_russian.yml
@@ -1,8 +1,11 @@
 l_russian:
 
  EQ_MOD_CAT_tank_special_module_stabilizer_TITLE:0 "Стабилизатор"
+EQ_MOD_CAT_tank_special_module_maintenance_TITLE:0 "Облегченное техобслуживание"
  EQ_MOD_CAT_tank_special_module_skirts_TITLE:0 "Бронеюбки"
- EQ_MOD_CAT_tank_magic_cannon_TITLE:0 "Магические орудия"
+ EQ_MOD_CAT_tank_magic_cannon_light_TITLE:0 "Лёгкие магические орудия"
+ EQ_MOD_CAT_tank_magic_cannon_medium_TITLE:0 "Средние магические орудия"
+ EQ_MOD_CAT_tank_magic_cannon_heavy_TITLE:0 "Тяжёлые магические орудия"
 
  ### EQUIPMENT MODULES ###
  armor_skirts_2:0 "Гибридные сетчатые бронеюбки"
@@ -22,6 +25,9 @@
  tank_hydropneumatic_suspension:0 "Гидропневматическая подвеска"
  tank_hydropneumatic_suspension_desc:0 "Эта продвинутая система использует смесь из газов и жидкостей для обеспечения высочайшего комфорта при езде, высокой манёвренности на пересеченной местности и скорости, не усложняя при этом обслуживание. За все эти преимущества приходится платить значительно более высокой стоимостью производства."
 
+ easy_maintenance_2:0 "Облегченное техническое обслуживание"
+ easy_maintenance_2_desc:0 "Добавив в танк больше люков и запчастей, а так же в целом оптимизировав конструкцию, мы повысим ремонтопригодность танка в полевых условиях."
+
  tank_magic_auto_cannon:0 "Автоматическая маг-пушка"
  tank_magic_auto_cannon_desc:0 "Эта автоматическая пушка является адаптацией магического пехотного оружия и способна наносить чудовищный урон небронированным целям. Небольшой калибр орудия ограничивает его эффективность против брони."
  tank_magic_auto_cannon_2:0 "Продвинутая автоматическая маг-пушка"
@@ -58,7 +64,16 @@
  tank_anti_air_cannon_4_desc:0 "Скорострельная автоматическая пушка, предназначенная для поражения самолетов. Она также может похвастать ограниченным потенциалом в качестве орудия огневой поддержки против наземных целей."
  tank_anti_air_cannon_5:0 "Современное зенитное орудие"
  tank_anti_air_cannon_5_desc:0 "Скорострельная автоматическая пушка, предназначенная для поражения самолетов. Она также может похвастать ограниченным потенциалом в качестве орудия огневой поддержки против наземных целей."
-
+ tank_heavy_anti_air_cannon:0 "2 базовых зенитных орудия"
+ tank_heavy_anti_air_cannon_desc:0 "Удвоение огневой мощи увеличивает эффективность борьбы с авиацией, но повышает стоимость производства и должно быть установлено на более крупном танке."
+ tank_heavy_anti_air_cannon_2:0 "2 улучшенных зенитных орудия"
+ tank_heavy_anti_air_cannon_2_desc:0 "Удвоение огневой мощи увеличивает эффективность борьбы с авиацией, но повышает стоимость производства и должно быть установлено на более крупном танке."
+ tank_heavy_anti_air_cannon_3:0 "2 модернизированных зенитных орудия"
+ tank_heavy_anti_air_cannon_3_desc:0 "Удвоение огневой мощи увеличивает эффективность борьбы с авиацией, но повышает стоимость производства и должно быть установлено на более крупном танке."
+ tank_heavy_anti_air_cannon_4:0 "2 полусовременных зенитных орудия"
+ tank_heavy_anti_air_cannon_4_desc:0 "Удвоение огневой мощи увеличивает эффективность борьбы с авиацией, но повышает стоимость производства и должно быть установлено на более крупном танке."
+ tank_heavy_anti_air_cannon_5:0 "2 современных зенитных орудия"
+ tank_heavy_anti_air_cannon_5_desc:0 "Удвоение огневой мощи увеличивает эффективность борьбы с авиацией, но повышает стоимость производства и должно быть установлено на более крупном танке."
 
 
  tank_medium_cannon_3:0 "Усовершенствованная средняя пушка"
@@ -123,6 +138,8 @@
  modern_tank_chassis_2_desc:0 "Самые первые основные боевые танки не были лишены проблем и часто испытывали трудности со скоростью или броней. Уроки, извлечённые из эксплуатации этих машин, проложили путь к созданию настоящего универсального танка."
  modern_tank_chassis_3:0 "Шасси ОБТ 2-го поколения"
  modern_tank_chassis_3_desc:0 "Совершенная броня, умная электроника, мощные двигатели и даже потенциал новой композитной брони и гидропневматической подвески - всё это делает данные танки невероятно мощными и универсальными"
+ modern_tank_chassis_2_short:0 "ОБТ 1-го поколения"
+ modern_tank_chassis_3_short:0 "ОБТ 2-го поколения"
  modern_tank_artillery_chassis_2:0 "Современная САУ 1-го поколения"
  modern_tank_artillery_chassis_3:0 "Современная САУ 2-го поколения"
  modern_tank_destroyer_chassis_2:0 "Современная ПТ-установка 1-го поколения"
@@ -132,8 +149,12 @@
 
  super_heavy_tank_chassis_b:0 "Улучшенное шасси сверхтяжёлого танка"
  super_heavy_tank_chassis_c:0 "Продвинутое шасси сверхтяжёлого танка"
+ super_heavy_tank_chassis_b_short:0 "1020 Super-Heavy"
+ super_heavy_tank_chassis_c_short:0 "1026 Super-Heavy"
  super_heavy_tank_chassis_2:0 "Улучшенное шасси сверхтяжёлого танка"
  super_heavy_tank_chassis_3:0 "Продвинутое шасси сверхтяжёлого танка"
+ super_heavy_tank_chassis_2_short:0 "Улучшенный сверхтяжёлый танк"
+ super_heavy_tank_chassis_3_short:0 "Продвинутый сверхтяжёлый танк"
 
  super_heavy_tank_chassis_2_desc:0 "Эти танки являются чудовищами на гусеницах, вооруженные крупнокалиберными бетонобойными орудиями и защищенные несколькими слоями укрепленной брони. Однако даже самые современные двигатели и сдвоенные шасси не могут позволить им с лёгкостью преодолевать болота, а форсировать реки приходится под шноркелем."
  super_heavy_tank_chassis_3_desc:0 "Более эффективные гусеницы позволяют этим сверхтяжёлым танкам успешно конкурировать с другими машинами на современном поле боя. Крупнокалиберные противобункерные пушки и несколько слоев усиленной брони делают их практически непобедимыми в честном бою. Хотя эти машины, вероятно, никогда не смогут полностью превзойти основные боевые танки из-за своей понизившейся универсальности, разрушительная огневая мощь сверхтяжёлых танков найдёт себе нишу в наших войсках."
diff --git a/localisation/russian/eaw_unit_l_russian.yml b/localisation/russian/eaw_unit_l_russian.yml
index d2fb201acc8..ba8e2ba69ec 100644
--- a/localisation/russian/eaw_unit_l_russian.yml
+++ b/localisation/russian/eaw_unit_l_russian.yml
@@ -2,6 +2,7 @@
  category_heavy_infantry:0 "Пехота"
  category_magical_infantry:0 "Магическая пехота"
  #category_special_forces:0 "Спецназ"# moved to replace folder
+ category_racial_special_forces:0 "Расовые спецвойска"
  tech_unicorn_company:0 "Рота единорогов"
  tech_unicorn_company2:0 "Рота единорогов II"
  tech_unicorn_company3:0 "Рота единорогов III"
diff --git a/localisation/russian/eaw_welcomescreen_l_russian.yml b/localisation/russian/eaw_welcomescreen_l_russian.yml
index 49c2dff17ae..0f799c5696c 100644
--- a/localisation/russian/eaw_welcomescreen_l_russian.yml
+++ b/localisation/russian/eaw_welcomescreen_l_russian.yml
@@ -234,7 +234,7 @@
  EAW_WS_KIS_desc:0 "С рассветом по всему великолепному портовому §YБлагоуханию§! начали звонить колокола. Их громкая какофония эхом разносилась по всему городу, отражаясь от корпусов кораблей и двигаясь над водами Киринского моря. Кирины на улицах города начали останавливаться и оглядываться по сторонам, а после присоединяться к растущей на глазах толпе. Вскоре они достигли места назначения: площади Хризантем, 88 - штаб-квартиры Национальной Ассоциации Киринских Патриотов. Зрители, выгнув шеи, разглядывали бесчисленные ряды красных рогов и силовиков в строгой форме, стоящих по периметру сцены. Сцена была большой, величественной, но явно собранной в спешке. И пока толпа наблюдала за происходящим, один кирин в хорошо выутюженном костюме вышел вперёд и занял трибуну перед собравшимися.\n\n§YПредседатель Фикл Каррент§! окинул взглядом привлечённую звоном колоколов толпу, пришедшую послушать его речь. Перед ним стояло не менее четырех, а может быть и пяти тысяч киринов, остальные наблюдали за происходящим из окон близлежащих зданий. Он прикоснулся к записям речи в кармане пальто, которые наспех набросал утром , чтобы напомнить себе их содержание, и, когда толпа затихла, начал читать свою речь по памяти.\n\n— Кирины Благоухания, — начал он, обводя взглядом толпу. — Сегодня важный день в истории нашего любимого города. Вряд ли мне нужно напоминать кому-либо из вас о том, как пострадало Благоухание во время §RБезмолвия§! сотню лет назад и как отсталая политика Киновари едва не задушила жизнь в нашем процветающем торговом городке. Когда Безмолвие окончилось и начался §GВеликий Скачок Вперёд§!, я осмелился поверить, как и многие из нас, вернувшихся из изгнания со всех уголков мира, что всё изменится. Перемены действительно произошли, но никто не может с уверенностью сказать, к добру это было или к худу.\n\nОн хмуро посмотрел на толпу, проецируя часть своих эмоций на собравшихся вокруг него. — Кирины Благоухания, Великий Скачок Вперёд провалился. В этом стоит винить §Cзакостенелые духовные догмы§!, §Rбогохульную революцию§! и §Oабсолютную некомпетентность§! тех, кто возглавлял этот проект. Благоухание уже знало путь к миру и процветанию, но наш голос был заглушен невежеством и суевериями. И теперь, когда в Киновари начинает рушиться карточный домик, должны ли мы поклясться в вечной верности режиму, который способствовал всем этим провалам?\n\n— Нет, — сказал Каррент, топнув копытом. — Благоухание достаточно настрадалось под властью Киновари. Пора покончить с этим! Мы не разделим судьбу нашего §Yменьшего брата§!. Киноварь больше не будет властвовать над нами. У нас есть все необходимые инструменты для достижения успеха и больше мы не будем делиться ими с теми, кто не знает, как правильно их использовать. Пришло время Благоуханию стать самостоятельным. Пришло время киринам севера, киринам §GВеликого Провидения§!, заявить о своей независимости, к которой мы так долго стремились!\n\n— Пришло время порвать с Киноварью и сделать то, что не смогли сделать наши неумелые лидеры: начать в Кирии §Gновую эру современности и процветания!§!"
  
  EAW_WS_KIC:0 "[Root.GetNameDef] - Раздувая пламя"
- EAW_WS_KIC_desc:0 "Под огненным закатом воды Великой реки Медоносная окрасились §Rалым цветом§!.\n\nВ §YХризантеме§!, Западном Страже царства, кирины проливали кровь друг друга. В то утро сотни, если не тысячи бедных киринов взялись за оружие и выступили против лояльного Киновари гарнизона, намереваясь изгнать этих киринов из города и захватить его во имя §OРайзин Файр§!. Однако солдаты оказали сопротивление. Кирины из Киновари были вооружены винтовками, крестьяне - вилами, косами, лопатами и прочими орудиями труда, но гарнизон составлял сорок солдат против четырёх тысяч восставших. И хотя при штурме казарм погибло бесчисленное множество крестьян, когда у защитников закончились боеприпасы, их полностью перебили. Именно тогда гнев Райзин Файр достиг точки кипения.\n\n§YРайзин Файр§! наблюдала с берега Медоносной за тем, как бесчисленных священников, мистиков и других зажиточных киринов вытаскивали из домов и отправляли на берег реки. В прошлой жизни она знала многих из этих киринов, спорила с ними о теологии, просила милостыню для бедных, но получала отказ из-за их равнодушия или гордости. Теперь же они умоляли о пощаде, когда их вели к берегу, но это было тщетно. С ними расправлялись по очереди, а тела бросали в воды реки. Когда всё закончилось, последователи Райзин Сан собрались вокруг, чтобы послушать её речь.\n\n— Теперь пути назад нет, — Райзин Сан предупредила крестьян, чьи сельскохозяйственные инструменты были окрашены в красный цвет. — Мы приступили к великому освобождению Кирии от расточительных гедонистов из §CПути Огня§!. Их неудачи привели царство на порог гибели, и всем нам пришлось расплачиваться за это. Но даже когда мы страдали, они истолковывали наши страдания как §Oволю Конкорд!§! Но разве Конкорд не благосклонная богиня? Неужели она не любит своих жеребят, которым доверила последнюю искру §YПервородного Пламени?§! Зачем она хочет, чтобы мы страдали, если она нас любит?\n\n— Истина проста: это не её воля, — продолжила говорить Райзин Сан и свет, отражаясь от багровых вод Медоносной, окутал её красным сиянием. — Нам лгали, мои верные кирины, лгали коррумпированные лидеры, желающие нажиться на наших страданиях! Даже сейчас они приглашают в страну иностранцев, чтобы те помогали угнетать нас. Они удерживают в заложниках нашего любимого §GВерховного Матриарха§! за стенами Киновари, извращая аватара Конкорд в угоду своей жадной алчности!\n\nТолпа издала резкий рёв, полный гнева и неодобрения, а Райзин Сан умело им воспользовалась. — Но мы, Разгорающееся Пламя, не потерпим этого! Мы станем истинным спасением Кирии! Только мы сможем спасти то, что осталось от нашего дома и нашей религии, от тех, кто жаждет их уничтожить! Только мы сможем дойти до Киновари и освободить верховного матриарха от тех, кто использует её как марионетку в своих целях!\n\n— И только у нас есть силы сделать то, что должно быть сделано: бороться до последней капли крови в наших бьющихся сердцах до тех пор, пока §YКирия не станет чистой вновь!"
+ EAW_WS_KIC_desc:0 "Под огненным закатом воды Великой реки Медоносная окрасились §Rалым цветом§!.\n\nВ §YХризантеме§!, Западном Страже царства, кирины проливали кровь друг друга. В то утро сотни, если не тысячи бедных киринов взялись за оружие и выступили против лояльного Киновари гарнизона, намереваясь изгнать этих киринов из города и захватить его во имя §OРайзин Файр§!. Однако солдаты оказали сопротивление. Кирины из Киновари были вооружены винтовками, крестьяне - вилами, косами, лопатами и прочими орудиями труда, но гарнизон составлял сорок солдат против четырёх тысяч восставших. И хотя при штурме казарм погибло бесчисленное множество крестьян, когда у защитников закончились боеприпасы, их полностью перебили. Именно тогда гнев Райзин Файр достиг точки кипения.\n\n§YРайзин Файр§! наблюдала с берега Медоносной за тем, как бесчисленных священников, мистиков и других зажиточных киринов вытаскивали из домов и отправляли на берег реки. В прошлой жизни она знала многих из этих киринов, спорила с ними о теологии, просила милостыню для бедных, но получала отказ из-за их равнодушия или гордости. Теперь же они умоляли о пощаде, когда их вели к берегу, но это было тщетно. С ними расправлялись по очереди, а тела бросали в воды реки. Когда всё закончилось, последователи Райзин Сан собрались вокруг, чтобы послушать её речь.\n\n— Теперь пути назад нет, — Райзин Сан предупредила крестьян, чьи сельскохозяйственные инструменты были окрашены в красный цвет. — Мы приступили к великому освобождению Кирии от расточительных гедонистов из §CПути Огня§!. Их неудачи привели царство на порог гибели, и всем нам пришлось расплачиваться за это. Но даже когда мы страдали, они истолковывали наши страдания как §Oволю Конкорд!§! Но разве Конкорд не благосклонная богиня? Неужели она не любит своих жеребят, которым доверила последнюю искру §YПервородного Пламени?§! Зачем она хочет, чтобы мы страдали, если она нас любит?\n\n— Истина проста: это не её воля, — продолжила говорить Райзин Сан и свет, отражаясь от багровых вод Медоносной, окутал её красным сиянием. — Нам лгали, мои верные кирины, лгали коррумпированные лидеры, желающие нажиться на наших страданиях! Даже сейчас они приглашают в страну иностранцев, чтобы те помогали угнетать нас. Они удерживают в заложниках нашего любимого §GВерховного Матриарха§! за стенами Киновари, извращая аватара Конкорд в угоду своей жадной алчности!\n\nТолпа издала резкий рёв, полный гнева и неодобрения, а Райзин Сан умело им воспользовалась. — Но мы, Разгорающееся Пламя, не потерпим этого! Мы станем истинным спасением Кирии! Только мы сможем спасти то, что осталось от нашего дома и нашей религии, от тех, кто жаждет их уничтожить! Только мы сможем дойти до Киновари и освободить верховного матриарха от тех, кто использует её как марионетку в своих целях!\n\n— И только у нас есть силы сделать то, что должно быть сделано: бороться до последней капли крови в наших бьющихся сердцах до тех пор, пока §YКирия не станет чистой вновь§!"
   
  EAW_WS_KXN:0 "[Root.GetNameDef] - Сила через ярость"
  EAW_WS_KXN_desc:0 "До наступления §RБезмолвия§! нынешний Лан Кир входил в состав §YКомандорства Зайкирия§! — вассала §YАлой Династии§!. В Лан Кире регулярно происходили сражения между киринами и зебрами. Поэтому это был важный и престижный форпост, §Yнесмотря на отсутствие экономической или политической ценности§!. Благодаря постоянным стычкам §GЗнамёна§!, отправленные на защиту границ Лан Кира, считались одними из самых способных подразделений в Кирии.\n\nС наступлением §RБезмолвия§! Командорство стало убежищем для беглецов от §Rрегресса§!. Когда региональные сепаратисты подняли открытое восстание против Командорства, Знамёна Зайкирии не смогли восстановить порядок, и весь регион §Rобъял хаос§!. Некоторым Знамёнам удалось отступить в §Yлеса пограничья§!, где они пытались перегруппироваться. Но помощи из Кирии не последовало. В последнем приказе, переданном через свечу драконьего огня, §Rпорицалась§! неспособность Знамён сохранить контроль над Командорством и им предписывалось вернуться в Кирию.\n\nПредательство Киновари вызвало гнев в рядах солдат и в результате остатки Знамён распались из-за волны дезертирства, бандитизма и §Rпревращений в нириков§!. Имперский комиссар §CСаммер Сторм§! заявил, что Знамёна больше не будут подчиняться §Rдиктату Киновари§!. Если Кирия не поможет им восстановить порядок, §Yтогда они сделают это сами§!. Это провозглашение подняло боевой дух в рядах, восстановило видимость порядка и дисциплины и положило начало государству Лан Кир с Саммер Стормом во главе.\n\nВ течение двадцати лет Лан Кир находился под фактической военной оккупацией Двадцати Знамён, но в итоге голод, истощение и §Rукрепление государств-преемников§! в §YСен Кине§! и §YХамрине§! сделали восстановление Командорства практически невозможным. После гибели Саммер Сторма во время набега на Зеблу, §CЛонг Даск§! — дочь Саммер Сторма, сплотила оставшихся киринов Знамён. Вскоре Лан Кир превратился в §Yоколосовременное национальное государство§!, представляющее собой стратократию на основе структур §CЗнамён§!. Внутри Знамён возникла грубая военная §Yдемократия§!, где решения по важным вопросам определялись голосованием, а количество голосов отдельного знаменосца увеличивалось с ростом §Yвыслуги лет и воинского звания§!. С течением времени функции военной диктатуры §Y постепенно передавались бюрократическим институтам§!, а уроженцы Лан Кира вливались в состав Знамён в качестве вспомогательного персонала и §Yсолдат§! — причём последняя категория §Gполноценно принималась в систему Знамён§!. В течение правления Лонг Даск происходил медленный, но неуклонный §Yдемографический сдвиг§!, в результате которого потомки первоначальных Знаменосцев и уроженцы Лан Кира постепенно становились единым народом.\n\nСпустя сто лет по Зайкирии ходят слухи о том, что в Кирии наступил §Yконец Безмолвию§!. Лан Кир же переживает кризис, вызванный ростом населения. В условиях нехватки пахотных земель и отсутствия технологий, промышленности и торговли для восполнения дефицита продовольствия государство вынуждено полагаться на набеги на соседние страны, чтобы прокормить население. Всё большее число командиров Знамен начинают выражать §Yпрокирийские симпатии§!. Одни хотят воссоединиться со старой родиной, другие призывают к повторному завоеванию Зайкирии. Лонг Даск состарилась и стала немощной, и от её преемника будет зависеть будущее Лан Кира."
@@ -248,7 +248,7 @@
  EAW_WS_TAL_desc:0 "В Южной Грифонии между великими королевствами §YАквелией§! и §YВингбардией§!, лежит древнее царство §GТалуза§!, богатая историей и природными красотами, а также доступом к западному заливу для торговли. Горные хребты делали землю очень защищенной от внешних угроз.\n\nПоселения первых жителей датируются 1000 годом ДИЛ, а история Талузы начинается с §Cзавоеваний Арантигоса§! в 620 году ДИЛ. Арантигос пожаловал землю своему племяннику, §CМарко Талоностре§!, и поручил ему править вместо него.\n\nИмея ограниченные ресурсы, Талоностра построил цепь горных крепостей для защиты от других пост-Арантигских королевств, самым грозным из которых оказалась §RКарфиния§!, начавшая серию завоеваний на южных территориях в 566 году ДИЛ. §RКарфинская Империя§! предприняла 3 неудачных вторжения в Талонсию, каждый раз проигрывая.\n\nНесмотря на победы, огромные богатства страны истощились. В 535 году ДИЛ Талонсия примиряется с Карфином, продолжая поддерживать свою оборонительную линию, гордо нося титул §G"Хранитель Юга"§!, дарованный Талоностре самим Арантигосом.\n\nНа протяжении II века ДИЛ Талонсия начала распадаться. Хотя армия оставалась верной Талоностре, хватка Талононте ослабевала. Похоронный звон раздался после убийства §CКороля Маруса Талонского§! в 34 ДИЛ. Королевство прекратило свое существование. Далее следовала жестокая война за престолонаследие, мелкий лорд победил и провозгласил себя §CГерцогом Талононте§!.\n\nРождение §YКоролевства Аквелии§! в течение II века ПИЛ вызвало резкий рост торговли в западном заливе, принеся пользу региону и смешав талонсцев с вингбардийцами. Со временем земля стала называться вингбардийским именем — §GТалуза§!. Сама Талуза оставалась политически разобщенной до 602 года, пока §CДжованни I, Герцогу Талонсии§!, не была завещана корона Наварро после смерти §CГерцога Эммануила IV§!. Он объединил две короны в одну: в §GГерцогство Талузу§!.\n\nКогда §OГровер I из Грифонстоуна§!, благословленный §OИдолом Борея§!, завоевал Вингбардию в 706 году и приблизился к Фолино, §CГерцог Франческо VI§! сам преклонил колено, сделав Талузу вассалом §OИмперии Грифонов§!. Уже тогда вингбардийские горнодобывающие компании добывали §Yогромные залежи угля§! под Талузским нагорьем.\n\nВ 972 году Вингбардия отделилась от Империи, §CГерцог Джованни III§! последовал примеру и присоединился к новому §GКарфинскому Пакту§!. Одно из важных положений Пакта давало право для вингбарийдцев продолжать добычу в Талузе: печально известная §RУгольная статья§!, которую осмеяли почти все талузцы. Талуза учредила §YНациональный Парламент§!, но он, подобно вингбардийскому, оказался неэффективным.\n\nГерцог Джованни III умер во сне в 992 году, и наследником стала его вспыльчивая дочь §CДжиневра§!. Самый известный момент из времён её правления — §RВеликая Забастовка 1003 года§! — тысячи рабочих маршировали по улицам Талононте, призывая к справедливости. Парламент ничего не мог сделать. Герцогиня ворвалась в здание Парламента с криками: "Lo giuro su Boreas, se voi bastardi non fate qualcosa, appenderò ognuno di voi in piazza!". На следующий день, Парламент уже принял резолюцию, вследствие которой рабочие получили чуть более высокую заработную плату, сокращенный рабочий день и некоторые меры защиты.\n\nВ связи с приближением выборов в этом году, Премьер-Министру §CМарко Палтори§! и нынешнему либеральному правительству придется упорно бороться, чтобы сохранить свои позиции. Жесткая борьба близится..."
 
  EAW_WS_CTH:0 "[Root.GetNameDef] - Потрёпанная гордость Зоникии"
- EAW_WS_CTH_desc:0 "Легенды гласят, что город §gКольтфаген§! (Кольт-Хадаст на зоникийском) был основан в 1742 году ДИЛ §Yкоролевой Зидо§!, которая была изгнана своим отцом из города Зур. Но на самом деле он, скорее всего, был основан зоникийскими колонистами с запада, которые в то время основали множество других городов вроде Гиппона и Зебинопа. В последующие века меркантильная зоникийская цивилизация распространялась, росла и процветала. Вскоре Кольтфаген стал гегемоном Северной Зебрики и одной из великих империй древнего мира.\n\nНо у Кольтфагена был конкурент по ту сторону Среднего моря - §RКарфиния§!. Вскоре после того, как Кольтфаген основал колонию §YНовый Кольтфаген§! на острове Скарлет, в 552 году ДИЛ разразилась война. Несмотря на первоначальное преимущество на море, Кольтфаген в конечном итоге проиграл и был вынужден уступить свои заморские колонии. Это было началом конца. В 490 году ДИЛ карфинцы §Rразграбили и разрушили§! Кольтфаген, и остатки павшей империи были аннексированы Зуром.\n\nПосле восстановления независимости в 15 ДИЛ Кольтфаген попытался вновь возродить своё господство, но так и не достиг высот предков. В 521 ПИЛ полчища §Rкваггатайцев§! обрушились на Зоникию, и Кольтфаген снова потерял свою свободу. Это был §Lтёмный век§! Зоникии, так как ханы Кваггатая требовали дани и поработили тысячи.\n\nНо трудности закалили зоникийцев. В 825 году ПИЛ, через 300 лет после падения Гиппона, Зинузель Зидалид, жрец города Зои, начал §Gвосстание§! против кваггатайцев. Он заявил, что все зоникийские зебры должны быть свободными под единым знаменем. Его восстание вдохновило сопротивление по всему северному побережью. В течение десяти лет вся Зоникия была освобождена, а в Кваггатае началась гражданская война. Однако мечты о единой нации были разрушены, поскольку Варзена и Зумидия отказались присоединиться к ней. Вскоре была основана §GКольтфагенская Республика§!. Возник конфликт между §gфедералистами§! и §Oцентралистами§!, но после короткой гражданской войны последние победили.\n\nВ 975 ПИЛ §YЗамилькар Зарка§! стал суфритом. Он превратил республику в олигархическую диктатуру и нанял влиятельную группу ученых - §CНаучную клику§! - для помощи в управлении нацией. Они сумели начать индустриализацию, но за это пришлось продать немало собственности иностранным инвесторам. Замилькар также заключил договор о дружбе и взаимной поддержке с наследником их давнего врага - §YВингбардией§!.\n\nНо в начале нового тысячелетия случилось вторжение §CКороля Шторма§!. Армия Кольтфагена была уничтожена, Замилькар погиб, а его сыновья бежали в горы, чтобы вести партизанскую войну против захватчиков. Большая часть богатств нации была захвачена, а модернизация остановлена. Но уже через несколько месяцев Король Шторм был убит в §Yбитве при Эйн-Тротгуре§! силами §CГиппогрифии§!. Сенат Кольтфагена избрал нового суфрита - §YЗалателя Зарку§! - сына Замилькара.\n\nКольтфаген снова свободен, но страдает от внутренних беспорядков. Фракции борются за поддержку суфрита, а восстановленная армия состоит из ненадёжных наемников. Беспорядки происходят на западе и востоке, так как §Yконституционалисты§! и §Rкольтванцы§! выступают против диктатуры суфрита. Кваггатай возрождается на юге, захватив §YКольтдар§! во время хаоса после смерти Кроля Шторма. Сможет ли Залатель Зарка решить эти проблемы, или Кольтфаген снова падёт?"
+ EAW_WS_CTH_desc:0 "Легенды гласят, что город §gКольтфаген§! (Кольт-Хадаст на зоникийском) был основан в 1742 году ДИЛ §Yкоролевой Зидо§!, которая была изгнана своим отцом из города Зур. Но на самом деле он, скорее всего, был основан зоникийскими колонистами с запада, которые в то время основали множество других городов вроде Гиппона и Зебинопа. В последующие века меркантильная зоникийская цивилизация распространялась, росла и процветала. Вскоре Кольтфаген стал гегемоном Северной Зебрики и одной из великих империй древнего мира.\n\nНо у Кольтфагена был конкурент по ту сторону Среднего моря - §RКарфиния§!. Вскоре после того, как Кольтфаген основал колонию §YНовый Кольтфаген§! на острове Скарлет, в 552 году ДИЛ разразилась война. Несмотря на первоначальное преимущество на море, Кольтфаген в конечном итоге проиграл и был вынужден уступить свои заморские колонии. Это было началом конца. В 490 году ДИЛ карфинцы §Rразграбили и разрушили§! Кольтфаген, и остатки павшей империи были аннексированы Зуром.\n\nПосле восстановления независимости в 15 ДИЛ Кольтфаген попытался вновь возродить своё господство, но так и не достиг высот предков. В 521 ПИЛ полчища §Rкваггатайцев§! обрушились на Зоникию, и Кольтфаген снова потерял свою свободу. Это был §Lтёмный век§! Зоникии, так как ханы Кваггатая требовали дани и поработили тысячи.\n\nНо трудности закалили зоникийцев. В 825 году ПИЛ, через 300 лет после падения Гиппона, Зинузель Зидалид, жрец города Зои, начал §Gвосстание§! против кваггатайцев. Он заявил, что все зоникийские зебры должны быть свободными под единым знаменем. Его восстание вдохновило сопротивление по всему северному побережью. В течение десяти лет вся Зоникия была освобождена, а в Кваггатае началась гражданская война. Однако мечты о единой нации были разрушены, поскольку Варзена и Зумидия отказались присоединиться к ней. Вскоре была основана §GКольтфагенская Республика§!. Возник конфликт между §gфедералистами§! и §Oцентралистами§!, но после короткой гражданской войны последние победили.\n\nВ 975 ПИЛ §YЗамилькар Зарка§! стал суфритом. Он превратил республику в олигархическую диктатуру и нанял влиятельную группу ученых - §CНаучную клику§! - для помощи в управлении нацией. Они сумели начать индустриализацию, но за это пришлось продать немало собственности иностранным инвесторам. Замилькар также заключил договор о дружбе и взаимной поддержке с наследником их давнего врага - §YВингбардией§!.\n\nНо в начале нового тысячелетия случилось вторжение §CКороля Шторма§!. Армия Кольтфагена была уничтожена, Замилькар погиб, а его сыновья бежали в горы, чтобы вести партизанскую войну против захватчиков. Большая часть богатств нации была захвачена, а модернизация остановлена. Но уже через несколько месяцев Король Шторм был убит в §Yбитве при Эйн-Тротгуре§! силами §CГиппогрифии§!. Сенат Кольтфагена избрал нового суфрита - §YЗалателя Зарку§! - сына Замилькара.\n\nКольтфаген снова свободен, но страдает от внутренних беспорядков. Фракции борются за поддержку суфрита, а восстановленная армия состоит из ненадёжных наемников. Беспорядки происходят на западе и востоке, так как §Yконституционалисты§! и §Rкольтванцы§! выступают против диктатуры суфрита. Кваггатай возрождается на юге, захватив §YКольтдар§! во время хаоса после смерти Короля Шторма. Сможет ли Залатель Зарка решить эти проблемы, или Кольтфаген снова падёт?"
  EAW_WS_HIP:0 "[Root.GetNameDef] - Гора и море"
  EAW_WS_HIP_desc:0 "По легенде §YГора Арис§! и §YСиквестрия§! были созданы богом неба Аном и морской богиней Тиамат вместе с §Yжемчужиной трансформации§!, которая позволяла гиппогрифам и морским пони перемещаться между двумя царствами. На протяжении веков оба королевства процветали, сначала под контролем королей-жрецов, а затем под властью §Gкоролевской династии Ново§!, которая свергла королей-жрецов в 523 году ПИЛ, когда те стали эгоистичными и жадными, пожелав заполучить полный контроль над §Yжемчужиной§!.\n\nНовая династия заложила две столицы: одну на горе Арис, другую - в Сиквестрии. И при этом монарх перемещал свой двор между столицами каждые шесть месяцев. Также в стране установилась форма §Gабсолютистской гармонии§!, вдохновлённая примером принцессы Селестии.\n\nИ так было на протяжении многих поколений. Изменения были редкими и происходили постепенно. Даже §Yпромышленная революция§!, что началась во время правления короля Скайланса и его дочери §YКоролевы Ново§!, медленно давала свои плоды.\n\nКонечно, Гиппогрифия не могла вечно оставаться в стороне от §Rхаоса§! мира. Когда армии §RКороля Шторма§! нацелились на Северную Зебрику, королева Ново, прислушавшись к королевскому советнику §YРафт Вуду§!, использовала жемчужину трансформации, чтобы эвакуировать население горы Арис в Сиквестрию.\n\nДва года, проведенные под волнами, были тяжелыми для гиппогрифов, вынужденных выживать в форме морских пони. Многие гиппогрифы, вынужденные покинуть свои дома, тайно называли королеву Ново §Rтираншей§! и §Yтрусихой§!. Родная дочь королевы §Yпринцесса Скайстар§! выступала за возвращение на поверхность и противостояние §Rкоролю Шторму§!. Но лишь после вмешательства §GНосителей Элементов§! Ново отправила армию гиппогрифов против войск короля Шторма в Эйн-Тротгуре.\n\nБитва при Эйн-Тротгуре изменила ход истории. Армии короля Шторма были захвачены врасплох, их дирижабли были уничтожены самолётами гиппогрифов, а флагман был сбит знаменитым пилотом-асом §3Крэк Лайтнингом§!. Сам §Rкороль Шторм§! был убит своим лейтенантом после того, как §Yпринцесса Скайстар§! и §GНосители Элементов§! пробились мимо его свиты.\n\n§RКороль Шторм§! причинил множество разрушений соседям гиппогрифов, пока те прятались под водой. Увидев это, многие гиппогрифы заявили, что больше никогда не будут прятаться. Тем временем многие морские пони считают недавние события доказательством того, что гиппогрифам следует избегать варваров из внешнего мира.\n\nКоролева Ново уволила §YРафт Вуда§! и разделила §Yжемчужину трансформации§! на миллионы мелких осколков, отказавшись от власти, которую так долго удерживала монархия: теперь любой гиппогриф или морской пони мог трансформироваться по своему желанию. Она также послала свою племянницу §YСильверстрим§! изучать дружбу в Эквестрии и создала §Yмандат по восстановлению§! и §Yзону беженцев§! в королевстве зебр §YЗумидия§!, чтобы предотвратить анархию в этом государстве после того, как §RКороль Шторм§! §Rубил§! короля этой нации и опустошил эти земли своими армиями.\n\nТеперь Гиппогрифия стоит на распутье. Останутся ли они верны §Gгармонии§! или отвергнут монархию в пользу §3новых идеалов§!? Станут ли они активным игроком на мировой арене или снова вернутся к изоляции?"
  EAW_WS_TBK:0 "[Root.GetNameDef] - Чистый лист"
diff --git a/localisation/russian/eaw_zebra_generic_l_russian.yml b/localisation/russian/eaw_zebra_generic_l_russian.yml
index c7cf6b72b7a..9645055847f 100644
--- a/localisation/russian/eaw_zebra_generic_l_russian.yml
+++ b/localisation/russian/eaw_zebra_generic_l_russian.yml
@@ -16,7 +16,7 @@ zebra_land_reform_desc:0 "Землей в наших границах в нас
 zebra_five_year_plan:0 "Пятилетка"
 zebra_five_year_plan_desc:0 "Важным столпом социализма является плановая экономика. Создав пятилетний план для роста нашей экономики, мы сможем в долгосрочной перспективе значительно улучшить наши производственные возможности."
 zebra_spread_the_revolution:0 "Распространение революции"
-zebra_spread_the_revolution_desc:0 "Мы, возможно, смогли построить социалистическую утопию, но многие всё ещё страдают под гнётом капитализма. Отправляя волонтеров в страны, сражающихся с империалистами, мы сможем бороться с угнетением где бы оно ни проявлялось."
+zebra_spread_the_revolution_desc:0 "Мы, возможно, смогли построить социалистическую утопию, но многие всё ещё страдают под гнётом капитализма. Отправляя добровольцев в страны, сражающихся с империалистами, мы сможем бороться с угнетением где бы оно ни проявлялось."
 zebra_fight_to_the_last:0 "Биться до последнего"
 zebra_fight_to_the_last_desc:0 "Наши национальные границы должны соблюдаться любой ценой. Любая внешняя сила, пытающаяся подорвать наш суверенитет, столкнется со всей мощью нашей армии. И если произойдёт наш самый худший кошмар, мы убедимся, что каждый готов умереть, защищая свою родину."
 zebra_ideological_though:0 "Идеологическое мышление"
diff --git a/localisation/russian/victory_points_l_russian.yml b/localisation/russian/victory_points_l_russian.yml
index d9b0293ae15..5f255bba423 100644
--- a/localisation/russian/victory_points_l_russian.yml
+++ b/localisation/russian/victory_points_l_russian.yml
@@ -141,7 +141,7 @@
  VICTORY_POINTS_8106:0 "Ассельт"
  VICTORY_POINTS_4742:0 "Грисляйн"
  VICTORY_POINTS_6482:0 "Эйндлем"
- VICTORY_POINTS_12903:0 "Голдмайр"
+ VICTORY_POINTS_11002:0 "Голдмайр"
  VICTORY_POINTS_4367:0 "Квоптия"
  VICTORY_POINTS_12436:0 "Твельт"
  VICTORY_POINTS_874:0 "Солнечные Поля"
@@ -809,4 +809,7 @@
  VICTORY_POINTS_2333:0 "Фростеберг"
  VICTORY_POINTS_8059:0 "Ростлунда"
  VICTORY_POINTS_10198:0 "Норданборг"
+ VICTORY_POINTS_1117:0 "Скаллинг"
+ VICTORY_POINTS_12609:0 "Старая Сосна"
+ VICTORY_POINTS_1446:0 "Гейздейл"
  
\ No newline at end of file
diff --git a/map/supply_nodes.txt b/map/supply_nodes.txt
index 6855b8694b5..cfea99d3515 100644
--- a/map/supply_nodes.txt
+++ b/map/supply_nodes.txt
@@ -55,6 +55,7 @@
 1 1036 
 1 1086 
 1 1114 
+1 1117
 1 1118 
 1 1142 
 1 1159 
@@ -71,6 +72,7 @@
 1 1383 
 1 1410 
 1 1427 
+1 1446
 1 1464 
 1 1543 
 1 1554 
@@ -97,6 +99,7 @@
 1 2108 
 1 2154 
 1 2156 
+1 2175
 1 2179 
 1 2225 
 1 2232 
@@ -167,6 +170,7 @@
 1 4143 
 1 4157 
 1 4167 
+1 4188
 1 4190 
 1 4205 
 1 4206 
@@ -438,6 +442,7 @@
 1 10934 
 1 10981 
 1 10993 
+1 11002
 1 11011 
 1 11023 
 1 11037 
@@ -527,7 +532,9 @@
 1 12523 
 1 12546 
 1 12594 
+1 12609
 1 12610 
+1 12626
 1 12645 
 1 12691 
 1 12705 
@@ -540,7 +547,6 @@
 1 12802 
 1 12867 
 1 12882 
-1 12903 
 1 12927 
 1 12943 
 1 12990 
diff --git a/music/aat_songs.txt b/music/aat_songs.txt
new file mode 100644
index 00000000000..aa2aebae96e
--- /dev/null
+++ b/music/aat_songs.txt
@@ -0,0 +1,74 @@
+
+music_station = "base_music"
+
+music = {
+	song = "a_scandinavian_summer_suite"
+
+	chance = {
+		factor = 1
+	}
+}
+
+music = {
+	song = "attention_swedish_tattoo"
+
+	chance = {
+		factor = 1
+	}
+}
+
+music = {
+	song = "danish_song_of_liberation"
+
+	chance = {
+		factor = 1
+	}
+}
+
+music = {
+	song = "heroes_of_rjukan_extended"
+
+	chance = {
+		factor = 1
+	}
+}
+
+music = {
+	song = "north_star_solidarity"
+
+	chance = {
+		factor = 1
+	}
+}
+
+music = {
+	song = "norwegian_resistance"
+
+	chance = {
+		factor = 1
+	}
+}
+
+music = {
+	song = "rising_tension"
+
+	chance = {
+		factor = 1
+	}
+}
+
+music = {
+	song = "swedish_solicitude"
+
+	chance = {
+		factor = 1
+	}
+}
+
+music = {
+	song = "the_winter_war"
+
+	chance = {
+		factor = 1
+	}
+}
\ No newline at end of file
diff --git a/music/aat_songs_bonus.txt b/music/aat_songs_bonus.txt
new file mode 100644
index 00000000000..3236c1b873d
--- /dev/null
+++ b/music/aat_songs_bonus.txt
@@ -0,0 +1,13 @@
+
+music_station = "base_music"
+
+music = {
+	song = "sakkijarven_polkka"
+	chance = {
+		factor = 1
+		modifier = {
+			factor = 10
+			original_tag = OLE
+		}
+	}
+}
diff --git a/portraits/eaw_portraits.txt b/portraits/eaw_portraits.txt
index c6d1c72c1b4..72d7cfd3652 100644
--- a/portraits/eaw_portraits.txt
+++ b/portraits/eaw_portraits.txt
@@ -1363,8 +1363,18 @@ FAT = {
 			"GFX_portrait_FAT_generic_land_male_20"
 		}
 		female = {
-			"GFX_portrait_griffon_generic_land_5"
-			"GFX_portrait_griffon_generic_land_6"
+			"GFX_portrait_FAT_generic_land_female_1"
+			"GFX_portrait_FAT_generic_land_female_2"
+			"GFX_portrait_FAT_generic_land_female_3"
+			"GFX_portrait_FAT_generic_land_female_4"
+			"GFX_portrait_FAT_generic_land_female_5"
+			"GFX_portrait_FAT_generic_land_female_6"
+			"GFX_portrait_FAT_generic_land_female_7"
+			"GFX_portrait_FAT_generic_land_female_8"
+			"GFX_portrait_FAT_generic_land_female_9"
+			"GFX_portrait_FAT_generic_land_female_10"
+			"GFX_portrait_FAT_generic_land_female_11"
+			"GFX_portrait_FAT_generic_land_female_12"
 		}
 	}
 }
@@ -1393,8 +1403,18 @@ FAW = {
 			"GFX_portrait_FAT_generic_land_male_20"
 		}
 		female = {
-			"GFX_portrait_griffon_generic_land_5"
-			"GFX_portrait_griffon_generic_land_6"
+			"GFX_portrait_FAT_generic_land_female_1"
+			"GFX_portrait_FAT_generic_land_female_2"
+			"GFX_portrait_FAT_generic_land_female_3"
+			"GFX_portrait_FAT_generic_land_female_4"
+			"GFX_portrait_FAT_generic_land_female_5"
+			"GFX_portrait_FAT_generic_land_female_6"
+			"GFX_portrait_FAT_generic_land_female_7"
+			"GFX_portrait_FAT_generic_land_female_8"
+			"GFX_portrait_FAT_generic_land_female_9"
+			"GFX_portrait_FAT_generic_land_female_10"
+			"GFX_portrait_FAT_generic_land_female_11"
+			"GFX_portrait_FAT_generic_land_female_12"
 		}
 	}
 }