diff --git a/src/common/ai_equipment/vnr_battleships.txt b/src/common/ai_equipment/vnr_battleships.txt
deleted file mode 100755
index eb96aa9..0000000
--- a/src/common/ai_equipment/vnr_battleships.txt
+++ /dev/null
@@ -1,323 +0,0 @@
-naval_capital_battleship = {
-	category = naval
-	#available_for = {}
-	#blocked_for = {}
-	roles = { vnr_naval_capital_bb }
-	priority = { base = 10 }
-
-	capital_battleship_1924 = {
-		name = vnr_bb_1924
-		role_icon_index = 3
-
-		priority = {
-			base = 10
-			modifier = { factor = 0.1 has_tech = interwar_ship_hull_heavy }
-			modifier = { factor = 0 expert_ai_style = yes }
-		}
-
-		target_variant = {
-			match_value = 2000.0
-
-			type = vnr_ship_hull_heavy_2
-			modules = {
-				fixed_ship_battery_slot = ship_heavy_battery
-				fixed_ship_anti_air_slot = ship_anti_air
-				fixed_ship_fire_control_system_slot = ship_fire_control_system
-				fixed_ship_radar_slot = ship_mast
-				fixed_ship_engine_slot = { upgrade = current any_of = { heavy_ship_engine_2 heavy_ship_engine_1 } }
-				fixed_ship_secondaries_slot = ship_secondaries
-				fixed_ship_armor_slot = { upgrade = current any_of = { ship_armor_bb_2 ship_armor_bb_1 } }
-				fixed_ship_armor_scheme_slot = { upgrade = current any_of = { ship_scheme_all_or_nothing ship_scheme_mixed ship_scheme_incremental_post_jutland ship_scheme_incremental } }
-				fixed_ship_torpedo_defense_system_slot = { upgrade = current any_of = { torpedo_belt torpedo_bulge } }
-				fixed_ship_airplane_launcher_slot = ship_airplane_launcher
-				fixed_ship_extra_secondaries_slot = { any_of = { heavy_miscellaneous generic_miscellaneous } }
-				front_1_custom_slot = ship_heavy_battery
-				mid_1_custom_slot = ship_secondaries
-				mid_2_custom_slot = ship_anti_air
-				rear_1_custom_slot = ship_heavy_battery
-				rear_2_custom_slot = ship_heavy_battery
-			}
-		}
-	}
-
-	capital_battleship_1936 = {
-		name = vnr_bb_1936
-		role_icon_index = 3
-
-		priority = {
-			base = 20
-			modifier = { factor = 0.1 has_tech = improved_ship_hull_heavy }
-			modifier = { factor = 0 expert_ai_style = yes }
-		}
-
-		target_variant = {
-			match_value = 3000.0
-
-			type = vnr_ship_hull_heavy_3
-			modules = {
-				fixed_ship_battery_slot = ship_heavy_battery
-				fixed_ship_anti_air_slot = ship_anti_air
-				fixed_ship_fire_control_system_slot = ship_fire_control_system
-				fixed_ship_radar_slot = ship_mast
-				fixed_ship_engine_slot = { upgrade = current any_of = { heavy_ship_engine_3 heavy_ship_engine_2 heavy_ship_engine_1 } }
-				fixed_ship_secondaries_slot = ship_secondaries
-				fixed_ship_armor_slot = { upgrade = current any_of = { ship_armor_bb_2 ship_armor_bb_1 } }
-				fixed_ship_armor_scheme_slot = { upgrade = current any_of = { ship_scheme_all_or_nothing ship_scheme_mixed ship_scheme_incremental_post_jutland ship_scheme_incremental } }
-				fixed_ship_torpedo_defense_system_slot = { upgrade = current any_of = { torpedo_belt_enhanced torpedo_belt torpedo_bulge } }
-				fixed_ship_airplane_launcher_slot = ship_airplane_launcher
-				fixed_ship_extra_secondaries_slot = { any_of = { heavy_miscellaneous generic_miscellaneous } }
-				front_1_custom_slot = ship_heavy_battery
-				mid_1_custom_slot = ship_secondaries
-				mid_2_custom_slot = ship_anti_air
-				rear_1_custom_slot = ship_heavy_battery
-				rear_2_custom_slot = ship_heavy_battery
-			}
-		}
-	}
-
-	capital_battleship_1940 = {
-		name = vnr_bb_1940
-		role_icon_index = 1
-
-		priority = {
-			base = 50
-			modifier = { factor = 0.1 has_tech = advanced_ship_hull_heavy }
-			modifier = { factor = 0 expert_ai_style = yes }
-		}
-
-		target_variant = {
-			match_value = 3500.0
-
-			type = vnr_ship_hull_heavy_4
-			modules = {
-				fixed_ship_battery_slot = { any_of = { ship_heavy_battery_triple ship_super_heavy_battery } }
-				fixed_ship_anti_air_slot = ship_anti_air
-				fixed_ship_fire_control_system_slot = ship_fire_control_system
-				fixed_ship_radar_slot = ship_radar
-				fixed_ship_engine_slot = { upgrade = current any_of = { heavy_ship_engine_4 heavy_ship_engine_3 heavy_ship_engine_2 heavy_ship_engine_1 } }
-				fixed_ship_secondaries_slot = ship_dp_secondaries
-				fixed_ship_armor_slot = { any_of = { ship_armor_bb_3 ship_armor_bb_2 ship_armor_bb_1 } }
-				fixed_ship_airplane_launcher_slot = ship_airplane_launcher
-				fixed_ship_armor_scheme_slot = { upgrade = current any_of = { ship_scheme_all_or_nothing_armor_box ship_scheme_all_or_nothing ship_scheme_mixed ship_scheme_incremental } }
-				fixed_ship_torpedo_defense_system_slot = { upgrade = current any_of = { torpedo_belt_enhanced torpedo_belt torpedo_bulge } }
-				fixed_ship_extra_secondaries_slot = { any_of = { heavy_miscellaneous generic_miscellaneous } }
-				front_1_custom_slot = { any_of = { ship_heavy_battery_triple ship_super_heavy_battery } }
-				mid_1_custom_slot = ship_secondaries
-				mid_2_custom_slot = ship_anti_air
-				mid_3_custom_slot = ship_dp_secondaries
-				rear_1_custom_slot = { any_of = { ship_heavy_battery_triple ship_super_heavy_battery } }
-				rear_2_custom_slot = { any_of = { ship_heavy_battery_triple ship_super_heavy_battery } }
-			}
-		}
-	}
-	capital_battleship_1944 = {
-		name = vnr_bb_1944
-		role_icon_index = 1
-
-		priority = {
-			base = 0
-			modifier = { add = 100 has_tech = advanced_ship_hull_heavy }
-			modifier = { factor = 0.1 has_global_flag = naval_tech_1945 }
-			modifier = { factor = 0 expert_ai_style = yes }
-		}
-
-		target_variant = {
-			match_value = 5000.0
-
-			type = vnr_ship_hull_heavy_5
-			modules = {
-				fixed_ship_battery_slot = { any_of = { ship_heavy_battery_triple ship_super_heavy_battery } }
-				fixed_ship_anti_air_slot = ship_anti_air
-				fixed_ship_fire_control_system_slot = ship_fire_control_system
-				fixed_ship_radar_slot = ship_radar
-				fixed_ship_engine_slot = { upgrade = current any_of = { heavy_ship_engine_5 heavy_ship_engine_4 heavy_ship_engine_3 heavy_ship_engine_2 heavy_ship_engine_1 } }
-				fixed_ship_secondaries_slot = ship_dp_secondaries
-				fixed_ship_armor_slot = { any_of = { ship_armor_bb_4 ship_armor_bb_3 ship_armor_bb_2 ship_armor_bb_1 } }
-				fixed_ship_airplane_launcher_slot = ship_airplane_launcher
-				fixed_ship_armor_scheme_slot = { upgrade = current any_of = { ship_scheme_all_or_nothing_armor_box ship_scheme_all_or_nothing ship_scheme_mixed ship_scheme_incremental } }
-				fixed_ship_torpedo_defense_system_slot = { upgrade = current any_of = { torpedo_belt_enhanced torpedo_belt torpedo_bulge } }
-				fixed_ship_extra_secondaries_slot = { any_of = { heavy_miscellaneous generic_miscellaneous } }
-				front_1_custom_slot = { any_of = { ship_heavy_battery_triple ship_super_heavy_battery } }
-				mid_1_custom_slot = ship_dp_secondaries
-				mid_2_custom_slot = ship_anti_air
-				mid_3_custom_slot = ship_dp_secondaries
-				rear_1_custom_slot = { any_of = { ship_heavy_battery_triple ship_super_heavy_battery } }
-				rear_2_custom_slot = { any_of = { ship_heavy_battery_triple ship_super_heavy_battery } }
-			}
-		}
-	}
-
-	capital_battleship_1946 = {
-		name = vnr_bb_1946
-		role_icon_index = 57
-
-		priority = {
-			base = 0
-			modifier = { add = 100 has_global_flag = naval_tech_1945 }
-			modifier = { factor = 0 expert_ai_style = yes }
-		}
-
-		target_variant = {
-			match_value = 5500.0
-
-			type = vnr_ship_hull_heavy_5
-			modules = {
-				fixed_ship_battery_slot = { any_of = { ship_heavy_battery_triple ship_super_heavy_battery } }
-				fixed_ship_anti_air_slot = ship_missile_aa
-				fixed_ship_fire_control_system_slot = ship_fire_control_system
-				fixed_ship_radar_slot = ship_radar
-				fixed_ship_engine_slot = { any_of = { heavy_ship_engine_4_gas heavy_ship_engine_nuclear } }
-				fixed_ship_secondaries_slot = ship_dp_secondaries
-				fixed_ship_armor_slot = { any_of = { ship_armor_bb_4 ship_armor_bb_3 ship_armor_bb_2 ship_armor_bb_1 } }
-				fixed_ship_airplane_launcher_slot = ship_airplane_launcher
-				fixed_ship_armor_scheme_slot = { upgrade = current any_of = { ship_scheme_all_or_nothing_armor_box ship_scheme_all_or_nothing ship_scheme_mixed ship_scheme_incremental } }
-				fixed_ship_torpedo_defense_system_slot = { upgrade = current any_of = { torpedo_belt_enhanced torpedo_belt torpedo_bulge } }
-				fixed_ship_extra_secondaries_slot = { any_of = { heavy_miscellaneous generic_miscellaneous } }
-				front_1_custom_slot = { any_of = { ship_heavy_battery_triple ship_super_heavy_battery } }
-				mid_1_custom_slot = ship_dp_secondaries
-				mid_2_custom_slot = ship_missile_1
-				mid_3_custom_slot = ship_dp_secondaries
-				rear_1_custom_slot = { any_of = { ship_heavy_battery_triple ship_super_heavy_battery } }
-				rear_2_custom_slot = ship_missile_aa
-			}
-		}
-	}
-
-	capital_battleship_shbb = {
-		name = vnr_shbb_1936
-		role_icon_index = 7
-
-		priority = {
-			base = 0
-			modifier = { add = 50 tag = CHY }
-			modifier = { factor = 0 has_navy_size = { unit = SH_battleship size > 4 } }
-			modifier = { factor = 0 expert_ai_style = yes }
-		}
-
-		target_variant = {
-			match_value = 2500.0
-
-			type = vnr_ship_hull_super_heavy_1
-			modules = {
-				fixed_ship_battery_slot = ship_super_heavy_battery_triple
-				fixed_ship_anti_air_slot = ship_anti_air
-				fixed_ship_fire_control_system_slot = ship_fire_control_system
-				fixed_ship_radar_slot = ship_mast
-				fixed_ship_engine_slot = { upgrade = current any_of = { super_heavy_ship_engine_3 super_heavy_ship_engine_2 super_heavy_ship_engine_1 } }
-				fixed_ship_secondaries_slot = ship_secondaries
-				fixed_ship_armor_slot = { upgrade = current any_of = { ship_armor_shbb_2 ship_armor_shbb } }
-				fixed_ship_armor_scheme_slot = { upgrade = current any_of = { ship_scheme_all_or_nothing ship_scheme_mixed ship_scheme_incremental_post_jutland ship_scheme_incremental } }
-				fixed_ship_torpedo_defense_system_slot = { upgrade = current any_of = { torpedo_belt_enhanced torpedo_belt torpedo_bulge } }
-				fixed_ship_airplane_launcher_slot = ship_airplane_launcher
-				fixed_ship_extra_secondaries_slot = { any_of = { heavy_miscellaneous generic_miscellaneous } }
-				front_1_custom_slot = ship_super_heavy_battery_triple
-				mid_1_custom_slot = ship_secondaries
-				mid_2_custom_slot = ship_anti_air
-				mid_3_custom_slot = ship_secondaries
-				rear_1_custom_slot = ship_super_heavy_battery_triple
-			}
-		}
-	}
-
-
-
-	# expert AI
-	capital_battleship_1936_expert = {
-		name = vnr_bb_1936_expert
-		role_icon_index = 3
-
-		priority = {
-			base = 20
-			modifier = { factor = 0.1 has_tech = improved_ship_hull_heavy }
-			modifier = { factor = 0 expert_ai_style = no }
-		}
-
-		target_variant = {
-			match_value = 3000.0
-
-			type = vnr_ship_hull_heavy_3
-			modules = {
-				fixed_ship_battery_slot = ship_heavy_battery_triple
-				fixed_ship_anti_air_slot = ship_anti_air
-				fixed_ship_fire_control_system_slot = ship_fire_control_system
-				fixed_ship_radar_slot = { any_of = { ship_radar ship_mast } }
-				fixed_ship_engine_slot = { upgrade = current any_of = { heavy_ship_engine_3 heavy_ship_engine_2 heavy_ship_engine_1 } }
-				fixed_ship_secondaries_slot = ship_dp_secondaries
-				fixed_ship_armor_slot = { upgrade > current any_of = { ship_armor_bb_3 ship_armor_bb_2 ship_armor_bb_1 } }
-				fixed_ship_armor_scheme_slot = { upgrade > current any_of = { ship_scheme_all_or_nothing ship_scheme_mixed ship_scheme_incremental_post_jutland ship_scheme_incremental } }
-				fixed_ship_torpedo_defense_system_slot = { upgrade > current any_of = { torpedo_belt_enhanced torpedo_belt torpedo_bulge } }
-				front_1_custom_slot = ship_heavy_battery_triple
-				mid_1_custom_slot = ship_anti_air
-				mid_2_custom_slot = ship_anti_air
-				rear_1_custom_slot = ship_heavy_battery_triple
-			}
-		}
-	}
-	capital_battleship_1940_expert = {
-		name = vnr_bb_1940_expert
-		role_icon_index = 1
-
-		priority = {
-			base = 50
-			modifier = { factor = 0.1 has_tech = advanced_ship_hull_heavy }
-			modifier = { factor = 0 expert_ai_style = no }
-		}
-
-		target_variant = {
-			match_value = 3500.0
-
-			type = vnr_ship_hull_heavy_4
-			modules = {
-				fixed_ship_battery_slot = ship_heavy_battery_triple
-				fixed_ship_anti_air_slot = ship_anti_air
-				fixed_ship_fire_control_system_slot = ship_fire_control_system
-				fixed_ship_radar_slot = ship_radar
-				fixed_ship_engine_slot = { upgrade > current any_of = { heavy_ship_engine_5 heavy_ship_engine_4 heavy_ship_engine_3 heavy_ship_engine_2 heavy_ship_engine_1 } }
-				fixed_ship_secondaries_slot = ship_dp_secondaries
-				fixed_ship_armor_slot = { upgrade > current any_of = { ship_armor_bb_4 ship_armor_bb_3 ship_armor_bb_2 ship_armor_bb_1 } }
-				fixed_ship_armor_scheme_slot = { upgrade > current any_of = { ship_scheme_all_or_nothing_armor_box ship_scheme_all_or_nothing ship_scheme_mixed ship_scheme_incremental } }
-				fixed_ship_torpedo_defense_system_slot = { upgrade > current any_of = { torpedo_belt_enhanced torpedo_belt torpedo_bulge } }
-				front_1_custom_slot = ship_heavy_battery_triple
-				mid_1_custom_slot = ship_anti_air
-				mid_2_custom_slot = ship_anti_air
-				rear_1_custom_slot = ship_heavy_battery_triple
-				rear_2_custom_slot = ship_heavy_battery_triple
-			}
-		}
-	}
-	capital_battleship_1944_expert = {
-		name = vnr_bb_1944_expert
-		role_icon_index = 1
-
-		priority = {
-			base = 0
-			modifier = { add = 100 has_tech = advanced_ship_hull_heavy }
-			modifier = { factor = 0.1 has_global_flag = naval_tech_1945 }
-			modifier = { factor = 0 expert_ai_style = no }
-		}
-
-		target_variant = {
-			match_value = 5000.0
-
-			type = vnr_ship_hull_heavy_5
-			modules = {
-				fixed_ship_battery_slot = ship_heavy_battery_triple
-				fixed_ship_anti_air_slot = ship_anti_air
-				fixed_ship_fire_control_system_slot = ship_fire_control_system
-				fixed_ship_radar_slot = ship_radar
-				fixed_ship_engine_slot = { upgrade > current any_of = { heavy_ship_engine_5 heavy_ship_engine_4 heavy_ship_engine_3 heavy_ship_engine_2 heavy_ship_engine_1 } }
-				fixed_ship_secondaries_slot = ship_dp_secondaries
-				fixed_ship_armor_slot = { upgrade > current any_of = { ship_armor_bb_4 ship_armor_bb_3 ship_armor_bb_2 ship_armor_bb_1 } }
-				fixed_ship_armor_scheme_slot = { upgrade > current any_of = { ship_scheme_all_or_nothing_armor_box ship_scheme_all_or_nothing ship_scheme_mixed ship_scheme_incremental } }
-				fixed_ship_torpedo_defense_system_slot = { upgrade > current any_of = { torpedo_belt_enhanced torpedo_belt torpedo_bulge } }
-				fixed_ship_extra_secondaries_slot = ship_super_heavy_weight_shell
-				front_1_custom_slot = ship_heavy_battery_triple
-				mid_1_custom_slot = ship_anti_air
-				mid_2_custom_slot = ship_anti_air
-				rear_1_custom_slot = ship_heavy_battery_triple
-				rear_2_custom_slot = ship_heavy_battery_triple
-			}
-		}
-	}
-}
-
diff --git a/src/common/ai_strategy/az_naval_production.txt b/src/common/ai_strategy/az_naval_production.txt
deleted file mode 100755
index e4ff3e1..0000000
--- a/src/common/ai_strategy/az_naval_production.txt
+++ /dev/null
@@ -1,958 +0,0 @@
-BFL_vnr_naval_role_ratios_historical = {
-    allowed = {
-		original_tag = BFL
-	}
-	enable = {
-		has_dlc = "Man the Guns"
-	}
-
-	abort_when_not_enabled = yes
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_capital_bb
-		value = 10
-	}
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_capital_bc
-		value = -100
-	}
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_carrier
-		value = -10
-	}
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_submarine
-		value = -10
-	}
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_screen
-		value = 150
-	}
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_cruiser_light
-		value = 30
-	}
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_cruiser_heavy
-		value = -15
-	}
-
-	ai_strategy = {
-		type = unit_ratio
-		id = convoy
-		value = 1
-	}
-
-	ai_strategy = {
-		type = equipment_production_min_factories
-		id = convoy
-		value = 1
-	}
-}
-
-BLI_vnr_naval_role_ratios_historical = {
-    allowed = {
-		original_tag = BLI
-	}
-	enable = {
-		has_dlc = "Man the Guns"
-	}
-
-	abort_when_not_enabled = yes
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_capital_bb
-		value = 10
-	}
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_capital_bc
-		value = -100
-	}
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_carrier
-		value = -5
-	}
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_submarine
-		value = -10
-	}
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_screen
-		value = 150
-	}
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_cruiser_light
-		value = 30
-	}
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_cruiser_heavy
-		value = -15
-	}
-
-	ai_strategy = {
-		type = unit_ratio
-		id = convoy
-		value = 1
-	}
-
-	ai_strategy = {
-		type = equipment_production_min_factories
-		id = convoy
-		value = 1
-	}
-}
-
-
-BYG_vnr_naval_role_ratios_historical = {
-    allowed = {
-		original_tag = BYG
-	}
-	enable = {
-		has_dlc = "Man the Guns"
-	}
-
-	abort_when_not_enabled = yes
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_capital_bb
-		value = 10
-	}
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_capital_bc
-		value = -100
-	}
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_carrier
-		value = 10
-	}
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_submarine
-		value = -10
-	}
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_screen
-		value = 150
-	}
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_cruiser_light
-		value = 30
-	}
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_cruiser_heavy
-		value = -15
-	}
-
-	ai_strategy = {
-		type = unit_ratio
-		id = cv_vnr_naval_bomber
-		value = 1
-	}	
-	
-	ai_strategy = {
-		type = unit_ratio
-		id = cv_fighter
-		value = 1
-	}
-
-	ai_strategy = {
-		type = equipment_production_factor
-		id = cv_fighter
-		value = 1
-	}
-	
-	ai_strategy = {
-		type = equipment_production_factor
-		id = cv_vnr_naval_bomber
-		value = 1
-	}
-
-	ai_strategy = {
-		type = unit_ratio
-		id = convoy
-		value = 1
-	}
-
-	ai_strategy = {
-		type = equipment_production_min_factories
-		id = convoy
-		value = 1
-	}
-}
-
-
-CHY_vnr_naval_role_ratios_historical = {
-    allowed = {
-		original_tag = CHY
-	}
-	enable = {
-		has_dlc = "Man the Guns"
-	}
-
-	abort_when_not_enabled = yes
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_capital_bb
-		value = 5
-	}
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_capital_shbb
-		value = 5
-	}
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_capital_bc
-		value = -100
-	}
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_carrier
-		value = 10
-	}
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_submarine
-		value = -10
-	}
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_screen
-		value = 150
-	}
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_cruiser_light
-		value = 30
-	}
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_cruiser_heavy
-		value = -15
-	}
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_cruiser_heavy
-		value = -15
-	}
-
-	ai_strategy = {
-		type = unit_ratio
-		id = cv_vnr_naval_bomber
-		value = 1
-	}	
-	
-	ai_strategy = {
-		type = unit_ratio
-		id = cv_fighter
-		value = 1
-	}
-
-	ai_strategy = {
-		type = equipment_production_factor
-		id = cv_fighter
-		value = 1
-	}
-
-	ai_strategy = {
-		type = unit_ratio
-		id = convoy
-		value = 1
-	}
-
-	ai_strategy = {
-		type = equipment_production_min_factories
-		id = convoy
-		value = 1
-	}
-}
-
-
-DH1_vnr_naval_role_ratios_historical_strong = {
-    allowed = {
-		original_tag = DH1
-	}
-	enable = {
-		has_dlc = "Man the Guns"
-		num_of_vnr_naval_factories > 4
-	}
-
-	abort_when_not_enabled = yes
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_capital_bb
-		value = 10
-	}
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_capital_bc
-		value = -100
-	}
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_carrier
-		value = -10
-	}
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_submarine
-		value = -10
-	}
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_screen
-		value = 60
-	}
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_cruiser_light
-		value = 30
-	}
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_cruiser_heavy
-		value = -15
-	}
-
-	ai_strategy = {
-		type = unit_ratio
-		id = convoy
-		value = 1
-	}
-
-	ai_strategy = {
-		type = equipment_production_min_factories
-		id = convoy
-		value = 1
-	}
-}
-
-DH1_vnr_naval_role_ratios_historical_week = {
-    allowed = {
-		original_tag = DH1
-	}
-	enable = {
-		has_dlc = "Man the Guns"
-		num_of_vnr_naval_factories < 5
-	}
-
-	abort_when_not_enabled = yes
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_capital_bb
-		value = -100
-	}
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_capital_bc
-		value = -100
-	}
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_carrier
-		value = -10
-	}
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_submarine
-		value = -10
-	}
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_screen
-		value = 150
-	}
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_cruiser_light
-		value = 30
-	}
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_cruiser_heavy
-		value = -15
-	}
-
-	ai_strategy = {
-		type = unit_ratio
-		id = convoy
-		value = 1
-	}
-
-	ai_strategy = {
-		type = equipment_production_min_factories
-		id = convoy
-		value = 1
-	}
-}
-
-
-DOH_vnr_naval_role_ratios_historical_strong = {
-    allowed = {
-		original_tag = DOH
-	}
-	enable = {
-		has_dlc = "Man the Guns"
-		num_of_vnr_naval_factories > 30
-	}
-
-	abort_when_not_enabled = yes
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_capital_bb
-		value = 10
-	}
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_capital_bc
-		value = -100
-	}
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_carrier
-		value = -10
-	}
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_submarine
-		value = -10
-	}
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_screen
-		value = 60
-	}
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_cruiser_light
-		value = 30
-	}
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_cruiser_heavy
-		value = -15
-	}
-
-	ai_strategy = {
-		type = unit_ratio
-		id = convoy
-		value = 1
-	}
-
-	ai_strategy = {
-		type = equipment_production_min_factories
-		id = convoy
-		value = 1
-	}
-}
-
-DOH_vnr_naval_role_ratios_historical_week = {
-    allowed = {
-		original_tag = DOH
-	}
-	enable = {
-		has_dlc = "Man the Guns"
-		num_of_vnr_naval_factories < 30
-	}
-
-	abort_when_not_enabled = yes
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_capital_bb
-		value = -100
-	}
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_capital_bc
-		value = -100
-	}
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_carrier
-		value = -10
-	}
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_submarine
-		value = -10
-	}
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_screen
-		value = 150
-	}
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_cruiser_light
-		value = 30
-	}
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_cruiser_heavy
-		value = -15
-	}
-
-	ai_strategy = {
-		type = unit_ratio
-		id = convoy
-		value = 1
-	}
-
-	ai_strategy = {
-		type = equipment_production_min_factories
-		id = convoy
-		value = 1
-	}
-}
-
-
-HUJ_vnr_naval_role_ratios_historical = {
-    allowed = {
-		original_tag = HUJ
-	}
-	enable = {
-		has_dlc = "Man the Guns"
-	}
-
-	abort_when_not_enabled = yes
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_capital_bb
-		value = 10
-	}
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_capital_bc
-		value = -100
-	}
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_carrier
-		value = 10
-	}
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_submarine
-		value = -10
-	}
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_screen
-		value = 150
-	}
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_cruiser_light
-		value = 30
-	}
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_cruiser_heavy
-		value = -15
-	}
-
-	ai_strategy = {
-		type = unit_ratio
-		id = cv_vnr_naval_bomber
-		value = 1
-	}	
-	
-	ai_strategy = {
-		type = unit_ratio
-		id = cv_fighter
-		value = 1
-	}
-
-	ai_strategy = {
-		type = equipment_production_factor
-		id = cv_fighter
-		value = 1
-	}
-	
-	ai_strategy = {
-		type = equipment_production_factor
-		id = cv_vnr_naval_bomber
-		value = 1
-	}
-
-	ai_strategy = {
-		type = unit_ratio
-		id = convoy
-		value = 1
-	}
-
-	ai_strategy = {
-		type = equipment_production_min_factories
-		id = convoy
-		value = 1
-	}
-}
-
-
-SAD_vnr_naval_role_ratios_historical = {
-    allowed = {
-		original_tag = SAD
-	}
-	enable = {
-		has_dlc = "Man the Guns"
-	}
-
-	abort_when_not_enabled = yes
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_capital_bb
-		value = 10
-	}
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_capital_bc
-		value = -100
-	}
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_carrier
-		value = -10
-	}
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_submarine
-		value = -10
-	}
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_screen
-		value = 150
-	}
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_cruiser_light
-		value = 30
-	}
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_cruiser_heavy
-		value = -15
-	}
-
-	ai_strategy = {
-		type = unit_ratio
-		id = convoy
-		value = 1
-	}
-
-	ai_strategy = {
-		type = equipment_production_min_factories
-		id = convoy
-		value = 1
-	}
-}
-
-
-SIR_vnr_naval_role_ratios_historical = {
-    allowed = {
-		original_tag = SIR
-	}
-	enable = {
-		has_dlc = "Man the Guns"
-	}
-
-	abort_when_not_enabled = yes
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_capital_bb
-		value = 10
-	}
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_capital_bc
-		value = -100
-	}
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_carrier
-		value = 10
-	}
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_submarine
-		value = -10
-	}
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_screen
-		value = 150
-	}
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_cruiser_light
-		value = 30
-	}
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_cruiser_heavy
-		value = -15
-	}
-
-	ai_strategy = {
-		type = unit_ratio
-		id = cv_vnr_naval_bomber
-		value = 1
-	}	
-	
-	ai_strategy = {
-		type = unit_ratio
-		id = cv_fighter
-		value = 1
-	}
-
-	ai_strategy = {
-		type = equipment_production_factor
-		id = cv_fighter
-		value = 1
-	}
-	
-	ai_strategy = {
-		type = equipment_production_factor
-		id = cv_vnr_naval_bomber
-		value = 1
-	}
-
-	ai_strategy = {
-		type = unit_ratio
-		id = convoy
-		value = 1
-	}
-
-	ai_strategy = {
-		type = equipment_production_min_factories
-		id = convoy
-		value = 1
-	}
-}
-
-
-TIX_vnr_naval_role_ratios_historical = {
-    allowed = {
-		original_tag = TIX
-	}
-	enable = {
-		has_dlc = "Man the Guns"
-	}
-
-	abort_when_not_enabled = yes
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_capital_bb
-		value = 10
-	}
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_capital_bc
-		value = -100
-	}
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_carrier
-		value = -10
-	}
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_submarine
-		value = -30
-	}
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_screen
-		value = 150
-	}
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_cruiser_light
-		value = 30
-	}
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_cruiser_heavy
-		value = -15
-	}
-
-	ai_strategy = {
-		type = unit_ratio
-		id = convoy
-		value = 1
-	}
-
-	ai_strategy = {
-		type = equipment_production_min_factories
-		id = convoy
-		value = 1
-	}
-}
-
-YUW_vnr_naval_role_ratios_historical = {
-    allowed = {
-		original_tag = YUW
-	}
-	enable = {
-		has_dlc = "Man the Guns"
-	}
-
-	abort_when_not_enabled = yes
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_capital_bb
-		value = 10
-	}
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_capital_bc
-		value = -100
-	}
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_carrier
-		value = -10
-	}
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_submarine
-		value = -10
-	}
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_screen
-		value = 150
-	}
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_cruiser_light
-		value = 30
-	}
-
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_cruiser_heavy
-		value = -15
-	}
-
-	ai_strategy = {
-		type = unit_ratio
-		id = convoy
-		value = 1
-	}
-
-	ai_strategy = {
-		type = equipment_production_min_factories
-		id = convoy
-		value = 1
-	}
-}
\ No newline at end of file
diff --git a/src/common/ai_strategy/naval_production.txt b/src/common/ai_strategy/naval_production.txt
index 8410830..bb25ccd 100755
--- a/src/common/ai_strategy/naval_production.txt
+++ b/src/common/ai_strategy/naval_production.txt
@@ -160,6 +160,8 @@ naval_unit_role_ratios_minors_coastal = {
 			tag = YUW
 			tag = BYG
 			tag = BFL
+			tag = DOH
+			tag = DH1
 		}
 	}
 	enable = { 
@@ -194,6 +196,8 @@ naval_unit_role_ratios_minors_defensive = {
 			tag = YUW
 			tag = BYG
 			tag = BFL
+			tag = DOH
+			tag = DH1
 		}
 	}
 	enable = { 
@@ -240,6 +244,8 @@ naval_unit_role_ratios_minors_offensive = {
 			tag = YUW
 			tag = BYG
 			tag = BFL
+			tag = DOH
+			tag = DH1
 		}
 	}
 	enable = { 
@@ -292,6 +298,8 @@ naval_unit_role_ratios_minors_global = {
 			tag = YUW
 			tag = BYG
 			tag = BFL
+			tag = DOH
+			tag = DH1
 		}
 	}
 	enable = { 
@@ -432,6 +440,7 @@ naval_unit_role_ratios_GER_atwar = {
 	}
 	enable = {
 		has_war_with = HUJ
+		num_of_naval_factories < 35
 	}
 	abort_when_not_enabled = yes
 	
@@ -460,6 +469,54 @@ naval_unit_role_ratios_GER_atwar = {
 	}
 }
 
+naval_unit_role_ratios_GER_atwar_many_shipyard = {
+	allowed = {
+		has_dlc = "Man the Guns"
+		tag = TIX
+	}
+	enable = {
+		has_war_with = HUJ
+		num_of_naval_factories > 34
+	}
+	abort_when_not_enabled = yes
+	
+	ai_strategy = {
+		type = role_ratio
+		id = vnr_naval_submarine
+		value = 80
+	}
+
+	ai_strategy = {
+		type = role_ratio
+		id = vnr_naval_screen
+		value = 300
+	}
+
+	ai_strategy = {
+		type = role_ratio
+		id = vnr_naval_cruiser_light
+		value = 50
+	}
+	
+	ai_strategy = {
+		type = role_ratio
+		id = vnr_naval_cruiser_medium
+		value = 30
+	}
+	
+	ai_strategy = {
+		type = role_ratio
+		id = vnr_naval_capital_bb
+		value = 20
+	}
+	
+	ai_strategy = {
+		type = role_ratio
+		id = vnr_naval_carrier
+		value = 20
+	}
+}
+
 naval_unit_role_ratios_GER_atwar_knock_USA = {
 	allowed = {
 		has_dlc = "Man the Guns"
@@ -1787,12 +1844,12 @@ naval_unit_role_ratios_ITA_late_peace = {
 	# allowed = {
 		# has_dlc = "Man the Guns"
 		# OR = {
-			# tag = TIX
-			# tag = YUW
+			# tag = GER
+			# tag = FRA
 			# tag = NFA
-			# tag = HUJ
+			# tag = ENG
 			# tag = GBR
-			# tag = CHY
+			# tag = JAP
 			# tag = CAN
 		# }
 	# }
@@ -1829,19 +1886,19 @@ naval_unit_role_ratios_ITA_late_peace = {
 	# allowed = {
 		# has_dlc = "Man the Guns"
 		# OR = {
-			# tag = TIX
-			# tag = YUW
+			# tag = GER
+			# tag = FRA
 			# tag = NFA
-			# tag = HUJ
+			# tag = ENG
 			# tag = GBR
-			# tag = CHY
-			# tag = BYG
+			# tag = JAP
+			# tag = USA
 			# tag = CSA
 			# tag = TEX
 			# tag = PSA
 			# tag = CAN
 			# tag = RUS
-			# tag = BFL
+			# tag = SOV
 		# }
 	# }
 	# enable = {
@@ -1898,11 +1955,11 @@ naval_unit_role_ratios_ITA_late_peace = {
 	# allowed = {
 		# has_dlc = "Man the Guns"
 		# OR = {
-			# tag = TIX
-			# tag = HUJ
+			# tag = GER
+			# tag = ENG
 			# tag = GBR
-			# tag = CHY
-			# tag = BYG
+			# tag = JAP
+			# tag = USA
 			# tag = CSA
 			# tag = TEX
 			# tag = PSA
@@ -1927,11 +1984,11 @@ naval_unit_role_ratios_ITA_late_peace = {
 	# allowed = {
 		# has_dlc = "Man the Guns"
 		# OR = {
-			# tag = TIX
-			# tag = HUJ
+			# tag = GER
+			# tag = ENG
 			# tag = GBR
-			# tag = CHY
-			# tag = BYG
+			# tag = JAP
+			# tag = USA
 			# tag = CSA
 			# tag = TEX
 			# tag = PSA
@@ -1965,6 +2022,8 @@ we_need_convoys_minors = {
 				tag = BYG
 				tag = SAD
 				tag = BFL
+				tag = DOH
+				tag = DH1
 			}
 		}
 	}
@@ -1988,6 +2047,8 @@ we_need_convoys_majors1 = {
 			tag = BYG
 			tag = SAD
 			tag = BFL
+			tag = DOH
+			tag = DH1
 		}
 	}
 	enable = { stockpile_ratio = { archetype = convoy ratio < 75 } }
@@ -2010,6 +2071,8 @@ we_need_convoys_majors2 = {
 			tag = BYG
 			tag = SAD
 			tag = BFL
+			tag = DOH
+			tag = DH1
 		}
 	}
 	enable = { stockpile_ratio = { archetype = convoy ratio < 125 } }
@@ -2032,6 +2095,8 @@ we_need_convoys_majors3 = {
 			tag = BYG
 			tag = SAD
 			tag = BFL
+			tag = DOH
+			tag = DH1
 		}
 	}
 	enable = { stockpile_ratio = { archetype = convoy ratio > 500 } }
@@ -2047,10 +2112,10 @@ we_need_convoys_majors3 = {
 # we_need_convoys_majors3 = {
 	# allowed = {
 		# OR = {
-			# tag = HUJ
-			# tag = CHY
-			# tag = TIX
-			# tag = BYG
+			# tag = ENG
+			# tag = JAP
+			# tag = GER
+			# tag = USA
 			# tag = CSA
 			# tag = TEX
 			# tag = PSA
@@ -2069,10 +2134,10 @@ we_need_convoys_majors3 = {
 # we_need_convoys_majors4 = {
 	# allowed = {
 		# OR = {
-			# tag = HUJ
-			# tag = CHY
-			# tag = TIX
-			# tag = BYG
+			# tag = ENG
+			# tag = JAP
+			# tag = GER
+			# tag = USA
 			# tag = CSA
 			# tag = TEX
 			# tag = PSA
@@ -2099,6 +2164,8 @@ we_dont_need_convoys_1 = {
 				tag = BYG
 				tag = SAD
 				tag = BFL
+				tag = DOH
+				tag = DH1
 			}
 		}
 	}
@@ -2122,6 +2189,8 @@ we_dont_need_convoys_2 = {
 			tag = BYG
 			tag = SAD
 			tag = BFL
+			tag = DOH
+			tag = DH1
 		}
 	}
 	enable = { stockpile_ratio = { archetype = convoy ratio > 1000 } }
@@ -2144,6 +2213,8 @@ we_need_screen_1 = {
 			tag = BYG
 			tag = SAD
 			tag = BFL
+			tag = DOH
+			tag = DH1
 		}
 	}
 	enable = { has_navy_size = { size < 50 type = screen_ship archetype = ship_hull_light } }
diff --git a/src/common/decisions/naval_lore.txt b/src/common/decisions/naval_lore.txt
index 255e0e7..e0e1e7e 100755
--- a/src/common/decisions/naval_lore.txt
+++ b/src/common/decisions/naval_lore.txt
@@ -39,7 +39,7 @@ navy_rework_category = {
 		allowed = {
 			OR = {
 				tag = DOH
-				tag = PRC
+				tag = DH1
 			}
 		}
 		complete_effect = { set_global_flag = naval_lore_gui_show }
diff --git a/src/common/ideas/az_vnr_patch_extra_ideas.txt b/src/common/ideas/az_vnr_patch_extra_ideas.txt
index d986ebe..cd34309 100755
--- a/src/common/ideas/az_vnr_patch_extra_ideas.txt
+++ b/src/common/ideas/az_vnr_patch_extra_ideas.txt
@@ -6,15 +6,15 @@ ideas = {
 				always = yes
 			}
 			modifier = {
-				navy_visibility = -0.5
+				navy_visibility = -0.25
 				naval_speed_factor = 0.5
 				repair_speed_factor = 2
-				navy_screen_attack_factor = 2
+				navy_screen_attack_factor = 0.5
 				navy_screen_defence_factor = 2
-				navy_capital_ship_attack_factor = 2
+				navy_capital_ship_attack_factor = 1
 				navy_capital_ship_defence_factor = 2
 				navy_anti_air_attack_factor = 1
-				industrial_capacity_dockyard = 5
+				industrial_capacity_dockyard = 3
 			}
 		}
 	}
diff --git a/src/common/scripted_effects/_add_starting_tech.txt b/src/common/scripted_effects/_add_starting_tech.txt
index 16eb70f..4623d50 100755
--- a/src/common/scripted_effects/_add_starting_tech.txt
+++ b/src/common/scripted_effects/_add_starting_tech.txt
@@ -226,6 +226,7 @@ add_starting_techs = {
             basic_ballast_tank = 1
             cruiser_submarines = 1
             midget_submarines = 1
+            fra_13in_1931 = 1
 
             basic_super_heavy_battery = 1
 			popup = no
diff --git a/src/common/technologies/MTG_naval.txt b/src/common/technologies/MTG_naval.txt
index b6fa894..36fdd74 100755
--- a/src/common/technologies/MTG_naval.txt
+++ b/src/common/technologies/MTG_naval.txt
@@ -303,13 +303,17 @@ technologies = {
 			research_cost_coeff = 1
 		}
 		path = {
-			leads_to_tech = destroyer_hull_improvement
+			leads_to_tech = wave_resistance_design
 			research_cost_coeff = 1
 		}
 		path = {
 			leads_to_tech = modern_sonar
 			research_cost_coeff = 1
 		}
+		path = {
+			leads_to_tech = close_in_area_air_defense
+			research_cost_coeff = 1
+		}
 
 		ai_will_do = {
 			factor = 1
@@ -891,6 +895,10 @@ technologies = {
 		dependencies = {
 			destroyer_missile_upgrade = 1
 		}
+		path = {
+			leads_to_tech = destroyer_hull_improvement
+			research_cost_coeff = 1
+		}
 		
 		ai_will_do = {
 			factor = 1
@@ -908,19 +916,73 @@ technologies = {
 
 	destroyer_hull_improvement = {
 		research_cost = 1
-		start_year = 1950
+		start_year = 1954
 
 		destroyer = {
-			max_strength = 0.15
+			max_strength = 0.25
+			naval_range = 0.2
 		}
 
+		folder = {
+			name = mtgnavalfolder
+			position = { x = 0 y = @1952_module }
+		}
+		
+		ai_will_do = {
+			factor = 2
+		}
+		categories = {
+			dd_tech
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_capital_ship_and_modules
+		}
+	}
+
+	close_in_area_air_defense = {
+		research_cost = 0.8
+		start_year = 1952
+
+		destroyer = {
+			anti_air_attack = 0.2
+		}
+
+		folder = {
+			name = mtgnavalfolder
+			position = { x = 0 y = @1952 }
+		}
+		path = {
+			leads_to_tech = destroyer_hull_improvement
+			research_cost_coeff = 1
+		}
+
+		ai_will_do = {
+			factor = 1
+		}
+		categories = {
+			dd_tech
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_capital_ship_and_modules
+		}
+	}
+
+	wave_resistance_design = {
+		research_cost = 1.25
+		start_year = 1951
+
+		screening_efficiency = 0.15
+		navy_weather_penalty = -0.15
+
 		folder = {
 			name = mtgnavalfolder
 			position = { x = -2 y = @1952 }
 		}
-		
+		path = {
+			leads_to_tech = destroyer_hull_improvement
+			research_cost_coeff = 1
+		}
+
 		ai_will_do = {
-			factor = 2
+			factor = 1
 		}
 		categories = {
 			dd_tech
@@ -945,6 +1007,7 @@ technologies = {
 			cruiser_ship_engine_1
 			ship_airplane_launcher_1
 			ship_hull_cruiser_role_c
+			ship_hull_cruiser_role_pc
 			ship_hull_cruiser_role_ca
 			ship_hull_cruiser_role_ac
 			ship_hull_cruiser_role_cd
@@ -1228,7 +1291,11 @@ technologies = {
 			research_cost_coeff = 1
 		}
 		path = {
-			leads_to_tech = nuclear_reactor_cost_reduction
+			leads_to_tech = nuclear_engine_research
+			research_cost_coeff = 1
+		}
+		path = {
+			leads_to_tech = signal_control
 			research_cost_coeff = 1
 		}
 
@@ -1236,7 +1303,7 @@ technologies = {
 
 		folder = {
 			name = mtgnavalfolder
-			position = { x = 4 y = @1948 }
+			position = { x = 0 y = @1948 }
 		}
 
 		ai_will_do = {
@@ -1266,7 +1333,7 @@ technologies = {
 
 		folder = {
 			name = mtgnavalfolder
-			position = { x = 4 y = @1952_module }
+			position = { x = 1 y = @1952_module }
 		}
 		ai_will_do = {
 			factor = 4
@@ -1299,7 +1366,7 @@ technologies = {
 
 		folder = {
 			name = mtgnavalfolder
-			position = { x = 0 y = @1948_module }
+			position = { x = 4 y = @1948_module }
 		}
 		on_research_complete = {
 			hidden_effect = { add_ideas = vnr_cruiser_cost_2 }
@@ -1328,7 +1395,7 @@ technologies = {
 
 		folder = {
 			name = mtgnavalfolder
-			position = { x = 6 y = @1952 }
+			position = { x = 3 y = @1952 }
 		}
 		ai_will_do = {
 			factor = 2
@@ -1351,8 +1418,63 @@ technologies = {
 
 		folder = {
 			name = mtgnavalfolder
-			position = { x = -2 y = @1948_module }
+			position = { x = -5 y = @1948_module }
 		}
+		path = {
+			leads_to_tech = advanced_radar_finder
+			research_cost_coeff = 1
+		}
+		ai_will_do = {
+			factor = 1
+		}
+
+		categories = {
+			naval_equipment
+			cl_tech
+			ca_tech
+			mio_cat_tech_all_cruiser_and_modules
+		}
+	}
+	signal_control = {
+		navy_visibility = -0.1
+
+		research_cost = 0.8
+		start_year = 1951
+
+		folder = {
+			name = mtgnavalfolder
+			position = { x = -3 y = @1948_module }
+		}
+		path = {
+			leads_to_tech = advanced_radar_finder
+			research_cost_coeff = 1
+		}
+
+		ai_will_do = {
+			factor = 2
+		}
+
+		categories = {
+			naval_equipment
+			cl_tech
+			ca_tech
+			mio_cat_tech_all_cruiser_and_modules
+		}
+	}
+	advanced_radar_finder = {
+		enable_equipment_modules = {
+			ship_radar_finder
+		}
+		naval_enemy_fleet_size_ratio_penalty_factor = 0.2
+
+		research_cost = 1
+		start_year = 1954
+
+		folder = {
+			name = mtgnavalfolder
+			position = { x = -4 y = 29 }
+		}
+
 		ai_will_do = {
 			factor = 1
 		}
@@ -1371,12 +1493,16 @@ technologies = {
 			carrier_ship_engine_nuclear
 			heavy_ship_engine_nuclear
 		}
+		path = {
+			leads_to_tech = nuclear_reactor_cost_reduction
+			research_cost_coeff = 1
+		}
 
 		start_year = 1950
 
 		folder = {
 			name = mtgnavalfolder
-			position = { x = -1 y = 22 }
+			position = { x = -1 y = @1948_module }
 		}
 		dependencies = {
 			nuclear_reactor = 1
@@ -1390,6 +1516,7 @@ technologies = {
 			naval_equipment
 			bb_tech
 			bc_tech
+			ca_tech
 			ship_modules_tech
 			mio_cat_tech_all_capital_ship_and_modules
 		}
@@ -1406,7 +1533,7 @@ technologies = {
 
 		folder = {
 			name = mtgnavalfolder
-			position = { x = 2 y = @1952 }
+			position = { x = -1 y = @1952 }
 		}
 		dependencies = {
 			nuclear_engine_research = 1
@@ -1882,7 +2009,7 @@ technologies = {
 
 		folder = {
 			name = mtgnavalfolder
-			position = { x = 0 y = @1944_module }
+			position = { x = 1 y = 20 }
 		}
 
 		ai_will_do = {
@@ -1897,7 +2024,7 @@ technologies = {
 
 	cruiser_missile_upgrade = {
 		research_cost = 1
-		start_year = 1945
+		start_year = 1946
 		enable_equipment_modules = {
 			ship_hull_cruiser_role_cg
 		}
@@ -1935,7 +2062,7 @@ technologies = {
 
 		folder = {
 			name = mtgnavalfolder
-			position = { x = 1 y = 21 }
+			position = { x = 2 y = 22 }
 		}
 
 		ai_will_do = {
@@ -2392,7 +2519,6 @@ technologies = {
 		}
 		enable_equipment_modules = {
 			heavy_ship_engine_2
-			super_heavy_ship_engine_1
 		}
 
 		path = {
@@ -2455,7 +2581,7 @@ technologies = {
 
 		enable_equipment_modules = {
 			ship_armor_shbb
-			super_heavy_ship_engine_2
+			super_heavy_ship_engine_1
 		}
 
 		research_cost = 1.5
@@ -2465,13 +2591,13 @@ technologies = {
 		ai_will_do = {
 			factor = 0
 			modifier = {
-				tag = CHY
+				tag = JAP
 				add = 5
 			}
 			modifier = {
 				OR = {
-					tag = TIX
-					tag = BFL
+					tag = GER
+					tag = SOV
 				}
 				add = 3
 			}
@@ -2493,6 +2619,7 @@ technologies = {
 		enable_equipment_modules = {
 			heavy_ship_engine_3
 			heavy_ship_engine_2_diesel
+			super_heavy_ship_engine_2
 		}
 		path = {
 			leads_to_tech = improved_ship_hull_heavy
@@ -2628,10 +2755,6 @@ technologies = {
 			leads_to_tech = combat_information_center
 			research_cost_coeff = 1
 		}
-		path = {
-			leads_to_tech = nuclear_engine_research
-			research_cost_coeff = 1
-		}
 		path = {
 			leads_to_tech = modern_ship_hull_cruiser
 			research_cost_coeff = 1
@@ -2727,6 +2850,7 @@ technologies = {
 			position = { x = 1 y = @1932_module }
 		}
 		dependencies = {
+			krupp_cemented_steel = 1
 			basic_heavy_armor = 1
 		}
 
@@ -2763,13 +2887,14 @@ technologies = {
 		xp_research_bonus = 1.25
 		research_cost = 1.25
 		
-		start_year = 1942
+		start_year = 1943
 
 		folder = {
 			name = mtgnavalfolder
 			position = { x = 1 y = @1940_module }
 		}
 		dependencies = {
+			homogeneous_krupp_steel = 1
 			improved_heavy_armor = 1
 		}
 
@@ -3088,6 +3213,7 @@ technologies = {
 
 		enable_equipment_modules = {
 			ship_anti_air_shell
+			ship_anti_air_circle
 		}
 
 		folder = {
@@ -3172,7 +3298,7 @@ technologies = {
 	}
 
 	fuel_tank_upgrade = {
-		research_cost = 1
+		research_cost = 0.5
 		start_year = 1944
 
 		navy_max_range_factor = 0.1
@@ -3229,7 +3355,7 @@ technologies = {
 
 		folder = {
 			name = mtgnavalfolder
-			position = { x = -1 y = @1944_module }
+			position = { x = 1 y = @1944_module }
 		}
 
 		ai_will_do = {
@@ -3256,7 +3382,7 @@ technologies = {
 
 		folder = {
 			name = mtgnavalfolder
-			position = { x = 1 y = @1944_module }
+			position = { x = -1 y = @1944_module }
 		}
 		path = {
 			leads_to_tech = naval_tactical_data_system
@@ -3285,7 +3411,7 @@ technologies = {
 
 		folder = {
 			name = mtgnavalfolder
-			position = { x = 1 y = @1948 }
+			position = { x = -1 y = @1948 }
 		}
 		path = {
 			leads_to_tech = memory_expansion
@@ -3307,6 +3433,10 @@ technologies = {
 			leads_to_tech = electromagnetic_signature_study
 			research_cost_coeff = 1
 		}
+		path = {
+			leads_to_tech = symmetric_key_algorithm
+			research_cost_coeff = 1
+		}
 
 		ai_will_do = {
 			factor = 2
@@ -3321,6 +3451,32 @@ technologies = {
 		}
 	}
 
+	symmetric_key_algorithm = {
+		research_cost = 0.8
+		start_year = 1950
+
+		navy_intel_to_others = -20
+
+		folder = {
+			name = mtgnavalfolder
+			position = { x = 1 y = @1948_module }
+		}
+		dependencies = {
+			advanced_computing_machine = 1
+		}
+
+		ai_will_do = {
+			factor = 1
+		}
+		allow_branch = {
+			has_dlc = "La Resistance"
+		}
+
+		categories = {
+			naval_equipment
+		}
+	}
+
 	memory_expansion = {
 		research_cost = 1.5
 		naval_hit_chance = 0.05
@@ -3330,7 +3486,7 @@ technologies = {
 
 		folder = {
 			name = mtgnavalfolder
-			position = { x = -2 y = @1948_module }
+			position = { x = -4 y = @1948_module }
 		}
 		dependencies = {
 			advanced_computing_machine = 1
@@ -3357,11 +3513,15 @@ technologies = {
 
 		folder = {
 			name = mtgnavalfolder
-			position = { x = 1 y = @1952_module }
+			position = { x = -1 y = @1952 }
 		}
 		dependencies = {
 			phased_array_radar = 1
 		}
+		path = {
+			leads_to_tech = tactical_data_link
+			research_cost_coeff = 1
+		}
 
 		ai_will_do = {
 			factor = 2
@@ -3375,6 +3535,47 @@ technologies = {
 			mio_cat_tech_all_capital_ship_and_modules
 		}
 	}
+	tactical_data_link = {
+		research_cost = 1.5
+		start_year = 1955
+
+		naval_coordination = 0.2
+		navy_org_factor = 0.1
+		navy_visibility = -0.1
+
+		folder = {
+			name = mtgnavalfolder
+			position = { x = -1 y = @1952_module }
+		}
+
+		allow = {
+			NOT = { has_tech = tactical_data_link_for_member }
+		}
+
+		ai_will_do = {
+			factor = 1
+		}
+		categories = {
+			naval_equipment
+			bb_tech
+			bc_tech
+			ship_modules_tech
+			mio_cat_tech_all_capital_ship_and_modules
+		}
+	}
+	tactical_data_link_for_member = {
+		research_cost = 1.5
+		start_year = 1955
+
+		naval_coordination = 0.1
+		navy_org_factor = 0.075
+		navy_visibility = -0.075
+
+		# enabled through decision
+		allow = {
+			always = no
+		}
+	}
 	comprehensive_display_system = {
 		research_cost = 1.2
 		enable_equipment_modules = {
@@ -3385,7 +3586,7 @@ technologies = {
 
 		folder = {
 			name = mtgnavalfolder
-			position = { x = -1 y = @1952 }
+			position = { x = -3 y = @1952 }
 		}
 
 		ai_will_do = {
@@ -3429,7 +3630,8 @@ technologies = {
 	}
 	electromagnetic_signature_study = {
 		research_cost = 2
-		navy_visibility = -0.2
+		navy_visibility = -0.1
+		naval_mines_effect_reduction = 0.1
 		
 		start_year = 1952
 
@@ -3911,7 +4113,6 @@ technologies = {
 			naval_strike_targetting = 0.15
 			air_agility = 0.15
 			maximum_speed = 0.1
-			build_cost_ic = -0.1
 		}
 		
 		folder = {
@@ -4225,6 +4426,10 @@ technologies = {
 			name = mtgnavalfolder
 			position = { x = 0 y = @1948_module }
 		}
+		path = {
+			leads_to_tech = airborne_early_warning
+			research_cost_coeff = 1
+		}
 		
 		ai_will_do = {
 			factor = 1
@@ -4238,7 +4443,7 @@ technologies = {
 	}
 	airborne_early_warning = {
 		research_cost = 1.5
-		start_year = 1948
+		start_year = 1951
 		
 		enable_equipment_modules = {
 			carrier_tracing_unit
@@ -4246,7 +4451,7 @@ technologies = {
 		
 		folder = {
 			name = mtgnavalfolder
-			position = { x = -2 y = @1948_module }
+			position = { x = -1 y = @1952 }
 		}
 		
 		ai_will_do = {
@@ -4302,6 +4507,33 @@ technologies = {
 			mio_cat_tech_all_carrier_and_modules
 		}
 	}
+	luneburg_lens = {
+		research_cost = 1.2
+		start_year = 1952
+
+		carrier = {
+			surface_detection = 0.15
+		}
+		naval_enemy_retreat_chance = -0.1
+
+		folder = {
+			name = mtgnavalfolder
+			position = { x = -2 y = @1948_module }
+		}
+		path = {
+			leads_to_tech = airborne_early_warning
+			research_cost_coeff = 1
+		}
+		ai_will_do = {
+			factor = 3
+		}
+
+		categories = {
+			naval_equipment
+			cv_tech
+			mio_cat_tech_all_carrier_and_modules
+		}
+	}
 
 #			## #  # ###  #   #  ##  ###  ### #  # ###  ##
 #{~._.~}	#   #  # #  # ## ## #  # #  #  #  ## # #   #
@@ -4393,7 +4625,7 @@ technologies = {
 			research_cost_coeff = 1
 		}
 		path = {
-			leads_to_tech = torpedo_computer
+			leads_to_tech = advanced_torpedo_ballistics
 			research_cost_coeff = 1
 		}
 		path = {
@@ -4437,6 +4669,7 @@ technologies = {
 			sub_ship_engine_3
 			pressure_hull_3
 			diving_plane
+			ship_sub_torpedo_computer_1
 		}
 
 		path = {
@@ -4493,6 +4726,7 @@ technologies = {
 		enable_equipment_modules = {
 			sub_ship_engine_4
 			pressure_hull_4
+			ship_sub_torpedo_computer_2
 		}
 		path = {
 			leads_to_tech = improved_submarine_snorkel
@@ -4544,6 +4778,9 @@ technologies = {
 		enable_equipments = {
 			vnr_ship_hull_submarine_5
 		}
+		enable_equipment_modules = {
+			ship_sub_torpedo_computer_3
+		}
 
 		research_cost = 2.0
 
@@ -4745,18 +4982,17 @@ technologies = {
 		}
 	}
 
-	torpedo_computer = {
-		enable_equipment_modules = {
-			ship_sub_torpedo_computer
-		}
-
+	advanced_torpedo_ballistics = {
 		xp_research_type = navy
 		xp_boost_cost = 20
 		xp_research_bonus = 1.50
-		research_cost = 1
+		research_cost = 0.8
 
 		start_year = 1939
 
+		navy_submarine_attack_factor = 0.1
+		naval_torpedo_screen_penetration_factor = 0.1
+
 		folder = {
 			name = mtgnavalfolder
 			position = { x = -2 y = @1932_module }
@@ -5170,7 +5406,7 @@ technologies = {
 		ai_will_do = {
 			factor = 0
 			modifier = {
-				tag = TIX
+				tag = GER
 				add = 2
 			}
 		}
@@ -5290,6 +5526,7 @@ technologies = {
 		enable_equipment_modules = {
 			ship_carrier_armor_heavy
 			ship_deck_space_big
+			ship_ski_jump_ramp
 		}
 		folder = {
 			name = mtgnavalfolder
@@ -5300,7 +5537,7 @@ technologies = {
 			research_cost_coeff = 1
 		}
 		path = {
-			leads_to_tech = airborne_early_warning
+			leads_to_tech = luneburg_lens
 			research_cost_coeff = 1
 		}
 		path = {
@@ -5312,7 +5549,7 @@ technologies = {
 			research_cost_coeff = 1
 		}
 		research_cost = 1.5
-		start_year = 1946
+		start_year = 1948
 		
 		dependencies = {
 			full_armored_carrier = 1
@@ -5371,7 +5608,7 @@ technologies = {
 
 	ship_to_ship_missile = {
 		research_cost = 1.5
-		start_year = 1944
+		start_year = 1945
 		
 		folder = {
 			name = mtgnavalfolder
diff --git a/src/common/technologies/MTG_naval_Support.txt b/src/common/technologies/MTG_naval_Support.txt
index 1ba9966..61b5ea2 100755
--- a/src/common/technologies/MTG_naval_Support.txt
+++ b/src/common/technologies/MTG_naval_Support.txt
@@ -35,6 +35,7 @@ technologies = {
 			ship_heavy_battery_small_1
 			ship_secondaries_1
 			ship_civilian_light_battery_1
+			ship_anti_air_1_h
 			
 			# ship_ap_shell_1
 			# ship_ap_shell_2
@@ -172,6 +173,8 @@ technologies = {
 			dp_light_battery_1
 			dp_light_battery_1_single
 			dp_ship_secondaries_1
+			dp_ship_secondaries_1_bb
+			ship_anti_air_2_h
 		}
 
 
@@ -291,6 +294,7 @@ technologies = {
 		enable_equipment_modules = {
 			ship_light_battery_3
 			ship_light_battery_3_double
+			ship_anti_air_3_h
 		}
 
 		folder = {
@@ -401,6 +405,7 @@ technologies = {
 		enable_equipment_modules = {
 			ship_light_battery_4
 			ship_light_battery_4_double
+			ship_anti_air_4_h
 		}
 
 		on_research_complete = {
@@ -954,6 +959,7 @@ technologies = {
 			dp_light_battery_2
 			dp_light_battery_2_single
 			dp_ship_secondaries_2
+			dp_ship_secondaries_2_bb
 		}
 
 		path = {
@@ -1000,6 +1006,7 @@ technologies = {
 			dp_light_battery_3
 			dp_light_battery_3_single
 			dp_ship_secondaries_3
+			dp_ship_secondaries_3_bb
 		}
 
 		on_research_complete = {
@@ -1046,6 +1053,7 @@ technologies = {
 			dp_light_battery_4
 			dp_light_battery_4_single
 			dp_ship_secondaries_4
+			dp_ship_secondaries_4_bb
 		}
 
 		on_research_complete = {
@@ -1396,7 +1404,7 @@ technologies = {
 		enable_equipment_modules = {
 			ship_torpedo_1
 			torpedo_mounting
-			ship_torpedo_fire_control
+			ship_torpedo_fire_control_1
 			ship_torpedo_bb
 			ship_torpedo_sub_1
 		}
@@ -1442,13 +1450,12 @@ technologies = {
 		xp_research_bonus = 1.50
 		research_cost = 0.5
 
-		start_year = 1936
+		start_year = 1932
 
 		path = {
-			leads_to_tech = homing_torpedo
+			leads_to_tech = oxygen_torpedo
 			research_cost_coeff = 1
 		}
-
 		path = {
 			leads_to_tech = electric_torpedo
 			research_cost_coeff = 1
@@ -1477,7 +1484,7 @@ technologies = {
 
 		folder = {
 			name = mtgnavalsupportfolder
-			position = { x = 2 y = 10 }
+			position = { x = 2 y = 7 }
 		}
 
 		ai_will_do = {
@@ -1540,11 +1547,11 @@ technologies = {
 			position = { x = 2 y = 16 }
 		}
 		path = {
-			leads_to_tech = wire_guided_torpedo
+			leads_to_tech = proximity_detonator
 			research_cost_coeff = 1
 		}
 		path = {
-			leads_to_tech = proximity_detonator
+			leads_to_tech = wire_guided_torpedo
 			research_cost_coeff = 1
 		}
 
@@ -1681,15 +1688,20 @@ technologies = {
 		xp_research_bonus = 1.50
 		research_cost = 0.75
 
-		start_year = 1940
+		start_year = 1936
 
 
 		naval_torpedo_reveal_chance_factor = -0.15
+		
+		path = {
+			leads_to_tech = homing_torpedo
+			research_cost_coeff = 1
+		}
 
-
+		xor = { oxygen_torpedo }
 		folder = {
 			name = mtgnavalsupportfolder
-			position = { x = 3 y = 13 }
+			position = { x = 3 y = 10 }
 		}
 
 		ai_will_do = {
@@ -1713,6 +1725,50 @@ technologies = {
 		}
 	}
 
+	oxygen_torpedo = {
+
+		xp_research_type = navy
+		xp_boost_cost = 20
+		xp_research_bonus = 1.50
+		research_cost = 0.75
+
+		start_year = 1936
+
+
+		naval_torpedo_screen_penetration_factor = 0.1
+		
+		path = {
+			leads_to_tech = homing_torpedo
+			research_cost_coeff = 1
+		}
+
+		xor = { electric_torpedo }
+		folder = {
+			name = mtgnavalsupportfolder
+			position = { x = 1 y = 10 }
+		}
+
+		ai_will_do = {
+			factor = 2
+			modifier = {
+				OR = {
+					tag = JAP
+					tag = USA
+					tag = GER
+				}
+				factor = 5
+			}
+		}
+
+		categories = {
+			naval_equipment
+			ship_modules_tech
+			cat_torpedoes
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_destroyer_and_modules
+		}
+	}
+
 	proximity_detonator = {
 		xp_research_type = navy
 		xp_boost_cost = 20
@@ -1839,6 +1895,7 @@ technologies = {
 		enable_equipment_modules = {
 			ship_torpedo_3
 			ship_torpedo_sub_3
+			ship_torpedo_fire_control_2
 		}
 
 
@@ -1873,6 +1930,7 @@ technologies = {
 		enable_equipment_modules = {
 			ship_torpedo_4
 			ship_torpedo_sub_4
+			ship_torpedo_fire_control_3
 		}
 
 		on_research_complete = {
@@ -1912,6 +1970,7 @@ technologies = {
 		enable_equipment_modules = {
 			ship_torpedo_5
 			ship_torpedo_sub_5
+			ship_torpedo_fire_control_4
 		}
 
 		on_research_complete = {
@@ -2054,7 +2113,7 @@ technologies = {
 #    #  #  # #       #  # #  # #  #  #  #  # #  # #       #   # #    #  #  # #  # #  #   #
 #   ### #  # ###      ##   ##  #  #  #  #  #  ##  ###     #   # ###  #  #  #  ##  ###  ##
 
-#NOTE: FIRE CONTROL SYSTEMS ARE IN ELECTROMECHANICAL HUJINEERING FOLDER!
+#NOTE: FIRE CONTROL SYSTEMS ARE IN ELECTROMECHANICAL ENGINEERING FOLDER!
 
 	fire_control_methods_1 = {
 
diff --git a/src/descriptor.mod b/src/descriptor.mod
index ae72e0a..ebca5bb 100755
--- a/src/descriptor.mod
+++ b/src/descriptor.mod
@@ -8,5 +8,5 @@ dependencies={
 	"AzurLane碧蓝航线：塞壬之灾"
 	"原版海军重置"
 }
-supported_version="1.14.7"
+supported_version="1.14.8"
 remote_file_id="3115864680"
\ No newline at end of file
diff --git a/src/events/ai_ships.txt b/src/events/ai_ships.txt
index 12cf43f..678b352 100755
--- a/src/events/ai_ships.txt
+++ b/src/events/ai_ships.txt
@@ -500,7 +500,7 @@ country_event = {
 					memory_expansion = 1
 					integrated_combat_system = 1
 					comprehensive_display_system = 1
-					recon_drone_1 = 1
+					recon_drones = 1
 					electromagnetic_signature_study = 1
 					airborne_early_warning = 1
 					optical_landing_system = 1