diff --git a/additional_credits.txt b/additional_credits.txt
index ce823f2c8..fce47d478 100644
--- a/additional_credits.txt
+++ b/additional_credits.txt
@@ -13,11 +13,11 @@ Dark-Realm of Gondor flag by LordBojangles (https://www.deviantart.com/lordbojan
 
 Most generic portraits are generated using Midjourney (midjourney.com)
 
-People who helped with the focus tree icons and flags:
+People who helped with the focus tree icons, national spirits and flags:
 - Arnadex (discord name)
 - Walther (discord name)
 - Soviet_Cyber (discord name)
-
+- yeoudal (discord name)
 
 Bag End artwork (loading screen) by Tummi (Vladimir Stana) (https://www.artstation.com/artwork/lVrbez)
 Lothlorien artwork (loading screens) by Tummi (Vladimir Stana) (https://www.artstation.com/artwork/0nJZbY)
diff --git a/common/characters/ANG.txt b/common/characters/ANG.txt
index 06cb6d748..4812ec331 100644
--- a/common/characters/ANG.txt
+++ b/common/characters/ANG.txt
@@ -264,6 +264,8 @@ characters={
 		}
 	}
 
+	#Nazguls
+
 	ANG_Witch_king = {
 		name="Witch King"
 		portraits={
@@ -271,8 +273,31 @@ characters={
 				large="GFX_portrait_mordor_witch"
 				small="GFX_idea_portrait_mordor_witch"
 			}
-			civilian={
-				large="GFX_portrait_mordor_witch"
+		}
+		field_marshal={
+			traits = { offensive_doctrine }
+			skill=3
+			attack_skill=4
+			defense_skill=4
+			planning_skill=3
+			logistics_skill=4
+			legacy_id=-1
+			visible = {
+				has_completed_focus = ANG_recall_the_nazguls
+				NOT = { has_global_flag = fs_ring_destroyed }
+			}
+		}
+		advisor = {
+			idea_token = ANG_Witch_king
+			slot = chief_advisor 
+			cost = 150
+			traits = { lord_of_the_nazgul }
+			available = {
+				always = yes
+			}
+			visible = {
+				has_completed_focus = ANG_recall_the_nazguls
+				NOT = { has_global_flag = fs_ring_destroyed }
 			}
 		}
 	}
@@ -285,6 +310,29 @@ characters={
 				small="GFX_idea_portrait_mordor_khamul"
 			}
 		}
+		corps_commander={
+			traits = { desert_fox swamp_fox }
+			skill=4
+			attack_skill = 3
+			defense_skill = 4
+			planning_skill = 2
+			logistics_skill = 3
+			legacy_id=-1
+			visible = {
+				has_completed_focus = ANG_recall_the_nazguls
+				NOT = { has_global_flag = fs_ring_destroyed }
+			}
+		}
+		advisor = {
+			idea_token = ANG_Khamul
+			slot = political_advisor 
+			cost = 150
+			traits = { shadow_of_the_east }
+			visible = {
+				has_completed_focus = ANG_recall_the_nazguls
+				NOT = { has_global_flag = fs_ring_destroyed }
+			}
+		}
 	}
 
 	ANG_Uvantha = {
@@ -295,6 +343,30 @@ characters={
 				small="GFX_idea_portrait_mordor_uvantha"
 			}
 		}
+		advisor={
+			idea_token = ANG_Uvantha
+			slot = political_advisor
+			traits  = {
+				prince_of_terror
+			}
+			visible = {
+				has_completed_focus = ANG_recall_the_nazguls
+				NOT = { has_global_flag = fs_ring_destroyed }
+			}
+		}
+		corps_commander={
+			traits = { hill_fighter }
+			skill = 3
+			attack_skill = 2
+			defense_skill = 2
+			planning_skill = 4
+			logistics_skill = 3
+			legacy_id=-1
+			visible = {
+				has_completed_focus = ANG_recall_the_nazguls
+				NOT = { has_global_flag = fs_ring_destroyed }
+			}
+		}
 	}
 
 	ANG_Hoarmurath = {
@@ -305,6 +377,30 @@ characters={
 				small="GFX_idea_portrait_mordor_hoarmurath"
 			}
 		}
+		advisor={
+			idea_token = ANG_Hoarmurath
+			slot = political_advisor
+			traits  = {
+				ideological_crusader
+			}
+			visible = {
+				has_completed_focus = ANG_recall_the_nazguls
+				NOT = { has_global_flag = fs_ring_destroyed }
+			}
+		}
+		corps_commander={
+			traits = { ranger panzer_leader }
+			skill = 3
+			attack_skill = 2
+			defense_skill = 2
+			planning_skill = 1
+			logistics_skill = 3
+			legacy_id=-1
+			visible = {
+				has_completed_focus = ANG_recall_the_nazguls
+				NOT = { has_global_flag = fs_ring_destroyed }
+			}
+		}
 	}
 
 	ANG_Dwar = {
@@ -315,6 +411,34 @@ characters={
 				small="GFX_idea_portrait_mordor_dwar"
 			}
 		}
+		advisor={
+			idea_token = ANG_Dwar
+			slot = army_chief
+			cost = 150
+			traits = {
+				experienced_general
+			}
+			visible = {
+				has_completed_focus = ANG_recall_the_nazguls
+				NOT = { has_global_flag = fs_ring_destroyed }
+			}
+			ai_will_do = {
+				factor = 1
+			}
+		}
+		corps_commander={
+			traits = { trait_engineer }
+			skill = 3
+			attack_skill = 1
+			defense_skill = 2
+			planning_skill = 3
+			logistics_skill = 2
+			legacy_id=-1
+			visible = {
+				has_completed_focus = ANG_recall_the_nazguls
+				NOT = { has_global_flag = fs_ring_destroyed }
+			}
+		}
 	}
 
 	ANG_Adunaphel = {
@@ -325,6 +449,29 @@ characters={
 				small="GFX_idea_portrait_mordor_adunaphel"
 			}
 		}
+		corps_commander={
+			traits = { winter_specialist }
+			skill = 2
+			attack_skill = 1
+			defense_skill = 3
+			planning_skill = 3
+			logistics_skill = 2
+			legacy_id=-1
+			visible = {
+				has_completed_focus = ANG_recall_the_nazguls
+				NOT = { has_global_flag = fs_ring_destroyed }
+			}
+		}
+		advisor = {
+			idea_token = ANG_Adunaphel
+			slot = army_chief 
+			cost = 150
+			traits = { army_chief_entrenchment_1 }
+			visible = {
+				has_completed_focus = ANG_recall_the_nazguls
+				NOT = { has_global_flag = fs_ring_destroyed }
+			}
+		}
 	}
 
 	ANG_Akhorahil = {
@@ -335,6 +482,29 @@ characters={
 				small="GFX_idea_portrait_mordor_akhorahil"
 			}
 		}
+		corps_commander={
+			traits = { naval_invader }
+			skill = 2
+			attack_skill = 1
+			defense_skill = 2
+			planning_skill = 3
+			logistics_skill = 3
+			legacy_id=-1
+			visible = {
+				has_completed_focus = ANG_recall_the_nazguls
+				NOT = { has_global_flag = fs_ring_destroyed }
+			}
+		}
+		advisor = {
+			idea_token = ANG_Akhorahil
+			slot = army_chief 
+			cost = 150
+			traits = { army_chief_maneuver_1 }
+			visible = {
+				has_completed_focus = ANG_recall_the_nazguls
+				NOT = { has_global_flag = fs_ring_destroyed }
+			}
+		}
 	}
 
 	ANG_Ji_Indur = {
@@ -345,6 +515,29 @@ characters={
 				small="GFX_idea_portrait_mordor_indur"
 			}
 		}
+		corps_commander={
+			traits = { jungle_rat }
+			skill = 2
+			attack_skill = 1
+			defense_skill = 1
+			planning_skill = 2
+			logistics_skill = 4
+			legacy_id=-1
+			visible = {
+				has_completed_focus = ANG_recall_the_nazguls
+				NOT = { has_global_flag = fs_ring_destroyed }
+			}
+		}
+		advisor = {
+			idea_token = ANG_Ji_Indur
+			slot = army_chief 
+			cost = 150
+			traits = { army_chief_planning_1 }
+			visible = {
+				has_completed_focus = ANG_recall_the_nazguls
+				NOT = { has_global_flag = fs_ring_destroyed }
+			}
+		}
 	}
 
 	ANG_Ren = {
@@ -355,5 +548,28 @@ characters={
 				small="GFX_idea_portrait_mordor_ren"
 			}
 		}
+		corps_commander={
+			traits = { bearer_of_artillery }
+			skill = 2
+			attack_skill = 1
+			defense_skill = 2
+			planning_skill = 4
+			logistics_skill = 2
+			legacy_id=-1
+			visible = {
+				has_completed_focus = ANG_recall_the_nazguls
+				NOT = { has_global_flag = fs_ring_destroyed }
+			}
+		}
+		advisor = {
+			idea_token = ANG_Ren
+			slot = high_command
+			cost = 150
+			traits = { ring_catcher }
+			visible = {
+				has_completed_focus = ANG_recall_the_nazguls
+				NOT = { has_global_flag = fs_ring_destroyed }
+			}
+		}
 	}
 }
diff --git a/common/country_leader/00_traits.txt b/common/country_leader/00_traits.txt
index b3bba3a15..acbd15c63 100644
--- a/common/country_leader/00_traits.txt
+++ b/common/country_leader/00_traits.txt
@@ -4537,7 +4537,7 @@ leader_traits = {
 	}
 
 	telephone_company = {
-		random= No
+		random= no
 		land_reinforce_rate = 0.02
 		coordination_bonus = 0.04
 		ai_will_do = {
diff --git a/common/decisions/Old_alliances_decisions.txt b/common/decisions/Old_alliances_decisions.txt
index 87ab49240..5cbe07f18 100644
--- a/common/decisions/Old_alliances_decisions.txt
+++ b/common/decisions/Old_alliances_decisions.txt
@@ -17,7 +17,7 @@ BEACON_category = {
 
         available = {
             has_defensive_war = yes
-            
+            has_war_with = MOR
             if = {
                 limit = {
                     tag = GON
diff --git a/common/decisions/_debug_decisions.txt b/common/decisions/_debug_decisions.txt
index 716dac241..0b106da45 100644
--- a/common/decisions/_debug_decisions.txt
+++ b/common/decisions/_debug_decisions.txt
@@ -95,6 +95,18 @@ debug_decisions = {
 		}
 	}
 
+	ring_destroyed = {
+		available = {
+			is_ai = no
+			is_debug = yes
+		}
+		fire_only_once = no
+		cost = 0
+		complete_effect = {
+			ring_destroy_ring = yes
+		}
+	}
+
 	testeroo = {
 		icon = generic_research
 
@@ -219,10 +231,7 @@ debug_decisions = {
 		cost = 0
 		
 		complete_effect = {
-			create_wargoal = {
-				type = annex_everything
-				target = MOR
-			}
+			create_wargoal = { type = annex_everything target = GON }
 		}
 	}
 		
diff --git a/common/decisions/ring_decisions.txt b/common/decisions/ring_decisions.txt
index ae13116e3..94338a066 100644
--- a/common/decisions/ring_decisions.txt
+++ b/common/decisions/ring_decisions.txt
@@ -610,7 +610,22 @@ ring_corruption_decisions_generic = {
 
 			ring_remove_ring = yes
 
-			MOR = { country_event = fs.106 }
+			if = {
+				limit = {
+					MOR = {
+						has_government = belligerent
+					}
+				}
+				MOR = { country_event = fs.106 }
+			} else_if = {
+				limit = {
+					ANG = {
+						has_government = belligerent
+						has_country_flag = ANG_sauron_returned
+					}
+				}
+				ANG = { country_event = fs.108 }
+			}
 		}
 	}
 
diff --git a/common/defines/00_lotr_defines.lua b/common/defines/00_lotr_defines.lua
index 385178d8e..8c328d380 100644
--- a/common/defines/00_lotr_defines.lua
+++ b/common/defines/00_lotr_defines.lua
@@ -45,3 +45,6 @@ NDefines.NProduction.MAX_CIV_FACTORIES_PER_LINE = 12
 NDefines.NDiplomacy.TENSION_NO_CB_WAR = 15							-- Amount of tension generated by a no-CB wargoal : base value 15
 NDefines.NDiplomacy.TENSION_CB_WAR = 10								-- Amount of tension generated by a war with a CB : base value 7
 NDefines.NDiplomacy.TENSION_TIME_SCALE_START_DATE = "3018.1.1.12"	-- Starting at this date, the tension values will be scaled down (will be equal to 1 before that)
+
+-- Better supply from motorization
+NDefines.NSupply.SUPPLY_HUB_FULL_MOTORIZATION_BONUS = 3.0
diff --git a/common/ideas/angmar.txt b/common/ideas/angmar.txt
index 3d7d53cd7..ab7959481 100644
--- a/common/ideas/angmar.txt
+++ b/common/ideas/angmar.txt
@@ -1,6 +1,17 @@
 ideas = {
 
 	country = {
+		ANG_new_leadership = {
+			picture = generic_resistance_fist
+			modifier = {
+				stability_factor = -0.25
+				war_support_factor = -0.25
+				political_power_factor = -0.5
+				army_attack_factor = -0.25
+				army_defence_factor = -0.05
+				belligerent_drift = -0.25
+			}
+		}
 		ANG_civil_unrest = {
 			allowed = {
 				always = no
diff --git a/common/ideas/dorwinion.txt b/common/ideas/dorwinion.txt
index 0027f6815..e9f3494b2 100644
--- a/common/ideas/dorwinion.txt
+++ b/common/ideas/dorwinion.txt
@@ -12,7 +12,7 @@ ideas = {
 
 			removal_cost = -1
 
-			picture = saf_history_of_segregation_2
+			picture = DOR_wine_trade
 
 			modifier = {
 				stability_factor = 0.10
diff --git a/common/ideas/mordor.txt b/common/ideas/mordor.txt
index 78d8b9473..41c1524f7 100644
--- a/common/ideas/mordor.txt
+++ b/common/ideas/mordor.txt
@@ -234,7 +234,7 @@ ideas = {
 				always = yes
 			}
 
-			picture = idea_hun_treaty_of_trianon
+			picture = sauron_eye
 
 			modifier = {
  				decryption_factor = 0.2
diff --git a/common/national_focus/angmar.txt b/common/national_focus/angmar.txt
index 12758abcc..f195e3118 100644
--- a/common/national_focus/angmar.txt
+++ b/common/national_focus/angmar.txt
@@ -2665,173 +2665,8 @@ focus = {
 	prerequisite = { focus = ANG_tell_the_world }
 	cost = 10
 	completion_reward = {
-
-		ANG_Witch_king = {
-			add_field_marshal_role = {
-				traits = { offensive_doctrine }
-				skill=3
-				attack_skill=4
-				defense_skill=4
-				planning_skill=3
-				logistics_skill=4
-			}
-			add_advisor_role = {
-			    advisor = {
-			        idea_token = ANG_Witch_king
-					slot = chief_advisor 
-					cost = 150
-					traits = { lord_of_the_nazgul }
-			    }
-			}
-		}
-
-		ANG_Khamul = {
-			add_corps_commander_role = {
-				traits = { desert_fox swamp_fox }
-				skill=4
-				attack_skill = 3
-				defense_skill = 4
-				planning_skill = 2
-				logistics_skill = 3
-			}
-		}
-
-		ANG_Uvantha = {
-			add_corps_commander_role = {
-				traits = { hill_fighter }
-				skill = 3
-				attack_skill = 2
-				defense_skill = 2
-				planning_skill = 4
-				logistics_skill = 3
-			}
-			add_advisor_role = {
-			    advisor = {
-			        idea_token = ANG_Uvantha
-					slot = political_advisor
-					traits  = {
-						prince_of_terror
-					}
-			    }
-			}
-		}
-
-		ANG_Hoarmurath = {
-			add_corps_commander_role = {
-				traits = { ranger panzer_leader }
-				skill = 3
-				attack_skill = 2
-				defense_skill = 2
-				planning_skill = 1
-				logistics_skill = 3
-			}
-			add_advisor_role = {
-			    advisor = {
-			        idea_token = ANG_Hoarmurath
-					slot = political_advisor
-					traits  = {
-						ideological_crusader
-					}
-			    }
-			}
-		}
-
-		ANG_Dwar = {
-			add_corps_commander_role = {
-				traits = { trait_engineer }
-				skill = 3
-				attack_skill = 1
-				defense_skill = 2
-				planning_skill = 3
-				logistics_skill = 2
-			}
-			add_advisor_role = {
-			    advisor = {
-			        idea_token = ANG_Dwar
-					slot = army_chief
-					cost = 150
-					traits = {
-						experienced_general
-					}
-			    }
-			}
-		}
-
-		ANG_Adunaphel = {
-			add_corps_commander_role = {
-				traits = { winter_specialist }
-				skill = 2
-				attack_skill = 1
-				defense_skill = 3
-				planning_skill = 3
-				logistics_skill = 2
-			}
-			add_advisor_role = {
-			    advisor = {
-			        idea_token = ANG_Adunaphel
-					slot = army_chief 
-					cost = 150
-					traits = { army_chief_entrenchment_1 }
-			    }
-			}
-		}
-
-		ANG_Akhorahil = {
-			add_corps_commander_role = {
-				traits = { naval_invader }
-				skill = 2
-				attack_skill = 1
-				defense_skill = 2
-				planning_skill = 3
-				logistics_skill = 3
-			}
-			add_advisor_role = {
-			    advisor = {
-			        idea_token = ANG_Akhorahil
-					slot = army_chief 
-					cost = 150
-					traits = { army_chief_maneuver_1 }
-			    }
-			}
-		}
-
-		ANG_Ji_Indur = {
-			add_corps_commander_role = {
-				traits = { jungle_rat }
-				skill = 2
-				attack_skill = 1
-				defense_skill = 1
-				planning_skill = 2
-				logistics_skill = 4
-			}
-			add_advisor_role = {
-			    advisor = {
-			        idea_token = ANG_Ji_Indur
-					slot = army_chief 
-					cost = 150
-					traits = { army_chief_planning_1 }
-			    }
-			}
-		}
-
-		ANG_Ren = {
-			add_corps_commander_role = {
-				traits = { bearer_of_artillery }
-				skill = 2
-				attack_skill = 1
-				defense_skill = 2
-				planning_skill = 4
-				logistics_skill = 2
-			}
-			add_advisor_role = {
-			    advisor = {
-			        idea_token = ANG_Ren
-					slot = high_command
-					cost = 150
-					traits = { ring_catcher }
-			    }
-			}
-		}
+		add_named_threat = { threat = 3 name = "Nazguls gathered once more in Angmar" }
+		custom_effect_tooltip = MOR_gather_the_nazgul
 	}
 } 
 
@@ -3025,6 +2860,7 @@ focus = {
 	available_if_capitulated = yes
 	completion_reward = {
 		add_named_threat = { threat = 50 name = "Sauron obtained the ring in Angmar" }
+		set_global_flag = angmar_released_sauron
 		create_country_leader = {
 			name = "Dark Lord Saruon"
 			picture = "gfx/leaders/MOR/Portrait_Mordor_Sauron.dds"
@@ -3035,6 +2871,16 @@ focus = {
 				legacyofmorgoth
 			}
 		}
+		create_field_marshal = {
+			name = "Sauron"
+			picture = "gfx/leaders/MOR/Portrait_Mordor_Sauron.dds"
+			traits = { trickster brilliant_strategist }
+			skill = 8
+			attack_skill = 8
+			defense_skill = 5
+			planning_skill = 5
+			logistics_skill = 5
+		}
 	}
 }
 
diff --git a/common/national_focus/arthedain.txt b/common/national_focus/arthedain.txt
index d301121a5..86bbd9833 100644
--- a/common/national_focus/arthedain.txt
+++ b/common/national_focus/arthedain.txt
@@ -1154,6 +1154,16 @@ focus = {
 	available_if_capitulated = no
 	completion_reward = {
 		create_country_leader = { name = "King Aragorn II" picture = "Portrait_Arthedain_King.dds" expire = "3080.1.1" ideology = protective traits = { patriot_king GON_isildur_heir } }
+		create_field_marshal = {
+			name = "King Aragorn II"
+			picture = "gfx/leaders/ART/Portrait_Arthedain_King.dds"
+			traits = { brilliant_strategist }
+			skill = 8
+			attack_skill = 6
+			defense_skill = 6
+			planning_skill = 7
+			logistics_skill = 7
+		}
 	}
 }
 
diff --git a/common/national_focus/mordor.txt b/common/national_focus/mordor.txt
index 632979aff..842efa43b 100644
--- a/common/national_focus/mordor.txt
+++ b/common/national_focus/mordor.txt
@@ -3164,6 +3164,7 @@ focus = {
 	completion_reward = {
 		retire_character = MOR_sauron_eye
 		add_named_threat = { threat = 50 name = "Sauron obtained the ring" }
+		set_country_flag = MOR_unleashed_sauron
 		create_country_leader = {
 			name = "Sauron"
 			picture = "gfx/leaders/MOR/Portrait_Mordor_Sauron.dds"
@@ -3174,6 +3175,16 @@ focus = {
 				legacyofmorgoth
 			}
 		}
+		create_field_marshal = {
+			name = "Sauron"
+			picture = "gfx/leaders/MOR/Portrait_Mordor_Sauron.dds"
+			traits = { trickster brilliant_strategist }
+			skill = 8
+			attack_skill = 8
+			defense_skill = 5
+			planning_skill = 5
+			logistics_skill = 5
+		}
 	}
 }
 
diff --git a/common/scripted_effects/ring_scripted_effects_common.txt b/common/scripted_effects/ring_scripted_effects_common.txt
index 7795d1406..411adb845 100644
--- a/common/scripted_effects/ring_scripted_effects_common.txt
+++ b/common/scripted_effects/ring_scripted_effects_common.txt
@@ -333,8 +333,20 @@ ring_destroy_ring = {
 	}
 
 	if = {
-		limit = { MOR = { has_government = belligerent } }
+		limit = {
+			MOR = {
+				has_government = belligerent
+			}
+		}
 		MOR = { country_event = { days = 12 id = fs.106 } }
+	} else_if = {
+		limit = {
+			ANG = {
+				has_government = belligerent
+				has_country_flag = ANG_sauron_returned
+			}
+		}
+		ANG = { country_event = { days = 12 id = fs.108 } }
 	}
 
 	set_global_flag = fs_ring_destroyed
diff --git a/events/Dol_Amroth.txt b/events/Dol_Amroth.txt
index d7193fff6..3a9f04a8b 100644
--- a/events/Dol_Amroth.txt
+++ b/events/Dol_Amroth.txt
@@ -60,7 +60,7 @@ country_event = {
 	id = dolamroth.2
 	title = dolamroth.2.t
 	desc = dolamroth.2.d
-	picture = GFX_report_event_paper
+	picture = GFX_report_event_cavalry_knights
 
 	is_triggered_only = yes
 	fire_only_once = yes
diff --git a/events/Isengard.txt b/events/Isengard.txt
index 3dfe723bd..f32b4a928 100644
--- a/events/Isengard.txt
+++ b/events/Isengard.txt
@@ -392,6 +392,21 @@ country_event = {
 
 	option = {
 		name = isengard.10.a
+		ai_chance = {
+			base = 5
+			modifier = {
+				add = 5
+				MOR = { has_same_ideology = yes }
+			}
+			modifier = {
+				add = 5
+				has_non_aggression_pact_with = MOR
+			}
+			modifier = {
+				add = 10
+				strength_ratio = { tag = MOR ratio > 0.75 }
+			}
+		}
 		add_stability = -0.10
 		MOR = {
 			puppet = ISE
@@ -400,6 +415,14 @@ country_event = {
 
 	option = {
 		name = isengard.10.b
+		ai_chance = {
+			base = 25
+			modifier = {
+				add = 5
+				is_in_faction = yes
+				NOT = { is_in_faction_with = MOR }
+			}
+		}
 		add_stability = 0.10
 		add_war_support = 0.10
 		add_popularity = {
diff --git a/events/Old_alliances.txt b/events/Old_alliances.txt
index 45a003ff9..d8995fcbf 100644
--- a/events/Old_alliances.txt
+++ b/events/Old_alliances.txt
@@ -46,11 +46,10 @@ country_event = {
                 has_global_flag = gandalf_allowed_into_rohan
             }
 		}
-        GON = {
-            add_to_war = {
-                targeted_alliance = ROH
-                hostility_reason = beacons_are_lit
-            }
+        add_to_war = {
+            targeted_alliance = GON
+            enemy = MOR
+            hostility_reason = beacons_are_lit
         }
 	}
 
@@ -110,11 +109,11 @@ country_event = {
                 }
             }
 		}
-        ROH = {
-            add_to_war = {
-                targeted_alliance = GON
-                hostility_reason = beacons_are_lit
-            }
+
+        add_to_war = {
+            targeted_alliance = ROH
+            enemy = MOR
+            hostility_reason = beacons_are_lit
         }
 	}
 
diff --git a/events/PoliticalEvents_Referendums.txt b/events/PoliticalEvents_Referendums.txt
index cb450aed8..13cd56ae3 100644
--- a/events/PoliticalEvents_Referendums.txt
+++ b/events/PoliticalEvents_Referendums.txt
@@ -708,48 +708,42 @@ country_event = {
 
 country_event = {
 	id = political.18
-	title = political.18.t
-	desc = political.18.d
-	picture = GFX_report_event_fascist_gathering
 
-	is_triggered_only = yes
+	title = {
+		text = political.18.t_bell
+		trigger = {
+			has_idea_with_trait = superiority_preacher
+		}
+	}
+	title = {
+		text = political.18.t_revo
+		trigger = {
+			has_idea_with_trait = rabble_rouser
+		}
+	}
+	title = {
+		text = political.18.t_coop
+		trigger = {
+			has_idea_with_trait = benevolent_protector
+		}
+	}
+	title = {
+		text = political.18.t_unal
+		trigger = {
+			has_idea_with_trait = cautious_stoicist
+		}
+	}
+	title = political.18.t_gene
 
-	#trigger = {
-	#	belligerent > 0.5
-	#	NOT = { has_government = belligerent }
-	#	NOT = { has_idea = fascist_revolutionaries }
-	#	NOT = { has_idea = reign_of_terror }
-	#	is_puppet = no
-	#	has_civil_war = no
-	#}
+	desc = political.18.d_gene
+	picture = GFX_report_event_negotiations
 
-	#mean_time_to_happen = {
-	#	days = 30
-	#}
-
-	#option = {
-	#	name = political.18.a
-	#	add_political_power = -100
-	#	add_popularity = {
-	#		ideology = belligerent
-	#		popularity = -0.10
-	#	}
-	#	add_timed_idea = {
-	#		idea = fascist_revolutionaries
-	#		days = 365
-	#	}
-	#}
+	is_triggered_only = yes
 
-	#option = {
-	#	name = political.18.b
-	#	add_timed_idea = {
-	#		idea = fascist_revolutionaries
-	#		days = 365
-	#	}
-	#}
+	
 
 	option = {
-		name = political.18.c
+		name = political.18.c_gene
 		if = {
 			limit = { has_idea_with_trait = superiority_preacher }
 			set_politics = { ruling_party = belligerent elections_allowed = no }
diff --git a/events/ring_events.txt b/events/ring_events.txt
index 12d2bb7a6..f05df1c86 100644
--- a/events/ring_events.txt
+++ b/events/ring_events.txt
@@ -201,4 +201,49 @@ country_event = {
 	option = {
 		name = fs.107.a
 	}
+}
+
+
+# Ring destroyed (this runs for Angmar)
+country_event = {
+	id = fs.108
+	title = fs.108.t
+	desc = {
+		text = fs.108.d
+		trigger = { NOT = { has_global_flag = fs_elven_fellowship } }
+	}
+	desc = {
+		text = fs.108.d_elves
+		trigger = { has_global_flag = fs_elven_fellowship }
+	}
+	picture = GFX_report_event_ring
+
+	fire_only_once = yes
+	
+	is_triggered_only = yes
+
+	option = { # Anarchy
+		name = fs.108.a
+		ai_chance = {
+			base = 3
+		}
+		dismantle_faction = yes 
+		kill_country_leader = yes
+		ring_remove_ring = yes
+		ANG = { set_politics = { ruling_party = revolutionary elections_allowed = no } }
+		ANG = { add_popularity = { ideology = revolutionary popularity = 0.5 } }
+		add_timed_idea = { idea = ANG_new_leadership days = 365 }
+	}
+	option = { # Elect a new leader
+		name = fs.108.b
+		ai_chance = {
+			base = 15
+		}
+		kill_country_leader = yes
+		ring_remove_ring = yes
+		hidden_effect = {
+			kill_country_leader = yes
+		}
+		add_timed_idea = { idea = ANG_new_leadership days = 365 }
+	}
 }
\ No newline at end of file
diff --git a/gfx/interface/ideas/national_spirits/DOR/idea_dor_wine_trade.dds b/gfx/interface/ideas/national_spirits/DOR/idea_dor_wine_trade.dds
new file mode 100644
index 000000000..4b4d3bf79
Binary files /dev/null and b/gfx/interface/ideas/national_spirits/DOR/idea_dor_wine_trade.dds differ
diff --git a/history/states/10-Orodriun.txt b/history/states/10-Orodriun.txt
index 385c5b158..46748d007 100644
--- a/history/states/10-Orodriun.txt
+++ b/history/states/10-Orodriun.txt
@@ -25,5 +25,5 @@ state={
 	manpower=500000
 	buildings_max_level_factor=1.000
 	state_category=wasteland
-	local_supplies=0.000
+	local_supplies=1.000
 }
diff --git a/history/states/107-East Harondor.txt b/history/states/107-East Harondor.txt
index 493e32da7..f991e3e8a 100644
--- a/history/states/107-East Harondor.txt	
+++ b/history/states/107-East Harondor.txt	
@@ -33,5 +33,5 @@ state={
 	manpower=5200000
 	buildings_max_level_factor=1.000
 	state_category=town
-	local_supplies=0.000
+	local_supplies=1.000
 }
diff --git a/history/states/109-Haradwaith.txt b/history/states/109-Haradwaith.txt
index 9750f0962..60a72c501 100644
--- a/history/states/109-Haradwaith.txt
+++ b/history/states/109-Haradwaith.txt
@@ -25,5 +25,5 @@ state={
 	manpower=6000000
 	buildings_max_level_factor=1.000
 	state_category=large_city
-	local_supplies=0.000
+	local_supplies=3.000
 }
diff --git a/history/states/11-Sea of Nurnen.txt b/history/states/11-Sea of Nurnen.txt
index 999b83f76..bf323e312 100644
--- a/history/states/11-Sea of Nurnen.txt	
+++ b/history/states/11-Sea of Nurnen.txt	
@@ -26,5 +26,5 @@ state={
 	manpower=4000000
 	buildings_max_level_factor=1.000
 	state_category=metropolis
-	local_supplies=0.000
+	local_supplies=1.000
 }
diff --git a/history/states/12-Barad-Dur.txt b/history/states/12-Barad-Dur.txt
index 745811cac..8ac5e5f7f 100644
--- a/history/states/12-Barad-Dur.txt
+++ b/history/states/12-Barad-Dur.txt
@@ -29,5 +29,5 @@ state={
 	manpower=15000000
 	buildings_max_level_factor=1.000
 	state_category=darkground
-	local_supplies=0.000
+	local_supplies=9.000
 }
diff --git a/history/states/128-Central Rhun.txt b/history/states/128-Central Rhun.txt
index 2405a4442..ef3eabb5a 100644
--- a/history/states/128-Central Rhun.txt	
+++ b/history/states/128-Central Rhun.txt	
@@ -29,5 +29,5 @@ state={
 	manpower=6500000
 	buildings_max_level_factor=1.000
 	state_category=large_city
-	local_supplies=0.000
+	local_supplies=7.000
 }
diff --git a/history/states/13-Belfalas.txt b/history/states/13-Belfalas.txt
index f256090cb..ea33cf844 100644
--- a/history/states/13-Belfalas.txt
+++ b/history/states/13-Belfalas.txt
@@ -30,5 +30,5 @@ state={
 	manpower=1000000
 	buildings_max_level_factor=1.000
 	state_category=large_town
-	local_supplies=0.000
+	local_supplies=1.000
 }
diff --git a/history/states/131-Rhudel.txt b/history/states/131-Rhudel.txt
index 2b90e05d6..a582a8312 100644
--- a/history/states/131-Rhudel.txt
+++ b/history/states/131-Rhudel.txt
@@ -25,5 +25,5 @@ state={
 	manpower=3200000
 	buildings_max_level_factor=1.000
 	state_category=town
-	local_supplies=0.000
+	local_supplies=1.000
 }
diff --git a/history/states/134-East Moria.txt b/history/states/134-East Moria.txt
index f46cc0204..b947eb37d 100644
--- a/history/states/134-East Moria.txt	
+++ b/history/states/134-East Moria.txt	
@@ -30,5 +30,5 @@ state={
 	manpower=500000
 	buildings_max_level_factor=1.000
 	state_category=metropolis
-	local_supplies=0.000
+	local_supplies=1.000
 }
diff --git a/history/states/135-Poros.txt b/history/states/135-Poros.txt
index d687cc30c..b09c3d12d 100644
--- a/history/states/135-Poros.txt
+++ b/history/states/135-Poros.txt
@@ -25,5 +25,5 @@ state={
 	manpower=1000000
 	buildings_max_level_factor=1.000
 	state_category=large_town
-	local_supplies=0.000
+	local_supplies=1.000
 }
diff --git a/history/states/139-South Ered Luin.txt b/history/states/139-South Ered Luin.txt
index ab8adc26f..9e20213f7 100644
--- a/history/states/139-South Ered Luin.txt	
+++ b/history/states/139-South Ered Luin.txt	
@@ -14,5 +14,5 @@ state={
 	manpower=1000000
 	state_category=rural
 	buildings_max_level_factor=1.000
-	local_supplies=0.000
+	local_supplies=1.000
 }
diff --git a/history/states/140-Gulf of Lhun.txt b/history/states/140-Gulf of Lhun.txt
index 86e7779a8..b735b6952 100644
--- a/history/states/140-Gulf of Lhun.txt	
+++ b/history/states/140-Gulf of Lhun.txt	
@@ -24,5 +24,5 @@ state={
 	manpower=2500000
 	state_category=large_city
 	buildings_max_level_factor=1.000
-	local_supplies=0.000
+	local_supplies=1.000
 }
diff --git a/history/states/146-Nenuial.txt b/history/states/146-Nenuial.txt
index 353398687..622041c6b 100644
--- a/history/states/146-Nenuial.txt
+++ b/history/states/146-Nenuial.txt
@@ -24,5 +24,5 @@ state={
 	manpower=1200000
 	buildings_max_level_factor=1.000
 	state_category=city
-	local_supplies=0.000
+	local_supplies=1.000
 }
diff --git a/history/states/148-South Fornost.txt b/history/states/148-South Fornost.txt
index 7b368e863..86e77d7f2 100644
--- a/history/states/148-South Fornost.txt	
+++ b/history/states/148-South Fornost.txt	
@@ -24,5 +24,5 @@ state={
 	manpower=2000000
 	buildings_max_level_factor=1.000
 	state_category=large_city
-	local_supplies=0.000
+	local_supplies=1.000
 }
diff --git a/history/states/149-Bree.txt b/history/states/149-Bree.txt
index 94305877e..18fa9e8f2 100644
--- a/history/states/149-Bree.txt
+++ b/history/states/149-Bree.txt
@@ -21,5 +21,5 @@ state={
 	manpower=1700000
 	buildings_max_level_factor=1.000
 	state_category=large_city
-	local_supplies=0.000
+	local_supplies=1.000
 }
diff --git a/history/states/152-Carn Dum.txt b/history/states/152-Carn Dum.txt
index eebdba1b5..7178efa88 100644
--- a/history/states/152-Carn Dum.txt	
+++ b/history/states/152-Carn Dum.txt	
@@ -27,5 +27,5 @@ state={
 	manpower=2600000
 	buildings_max_level_factor=1.000
 	state_category=large_city
-	local_supplies=0.000
+	local_supplies=6.000
 }
diff --git a/history/states/158-Fords of Isen.txt b/history/states/158-Fords of Isen.txt
index 8e500acb6..46ec03a11 100644
--- a/history/states/158-Fords of Isen.txt	
+++ b/history/states/158-Fords of Isen.txt	
@@ -24,5 +24,5 @@ state={
 	manpower=1000000
 	buildings_max_level_factor=1.000
 	state_category=large_town
-	local_supplies=0.000
+	local_supplies=2.000
 }
diff --git a/history/states/159-Isengard Outskirts.txt b/history/states/159-Isengard Outskirts.txt
index ae6c16564..8a6ab9f8e 100644
--- a/history/states/159-Isengard Outskirts.txt	
+++ b/history/states/159-Isengard Outskirts.txt	
@@ -23,5 +23,5 @@ state={
 	manpower=1000000
 	buildings_max_level_factor=1.000
 	state_category=city
-	local_supplies=0.000
+	local_supplies=1.000
 }
diff --git a/history/states/161-North Entwood.txt b/history/states/161-North Entwood.txt
index c8d20e215..c993e6ae4 100644
--- a/history/states/161-North Entwood.txt	
+++ b/history/states/161-North Entwood.txt	
@@ -23,5 +23,5 @@ state={
 	manpower=750000
 	buildings_max_level_factor=1.000
 	state_category=pastoral
-	local_supplies=0.000
+	local_supplies=1.000
 }
diff --git a/history/states/163-East Anorien.txt b/history/states/163-East Anorien.txt
index bca20fe2a..532626884 100644
--- a/history/states/163-East Anorien.txt	
+++ b/history/states/163-East Anorien.txt	
@@ -34,5 +34,5 @@ state={
 	manpower=9000000
 	buildings_max_level_factor=1.000
 	state_category=megalopolis 
-	local_supplies=0.000
+	local_supplies=12.000
 }
diff --git a/history/states/164-Pelargir.txt b/history/states/164-Pelargir.txt
index cfcb3fa84..9ecd47a85 100644
--- a/history/states/164-Pelargir.txt
+++ b/history/states/164-Pelargir.txt
@@ -23,5 +23,5 @@ state={
 	manpower=3200000
 	buildings_max_level_factor=1.000
 	state_category=city
-	local_supplies=0.000
+	local_supplies=4.000
 }
diff --git a/history/states/167-West Anorien.txt b/history/states/167-West Anorien.txt
index 84f65569f..acfa4299e 100644
--- a/history/states/167-West Anorien.txt	
+++ b/history/states/167-West Anorien.txt	
@@ -17,5 +17,5 @@ state={
 	manpower=1600000
 	buildings_max_level_factor=1.000
 	state_category=city
-	local_supplies=0.000
+	local_supplies=1.000
 }
diff --git a/history/states/169-North Belfalas.txt b/history/states/169-North Belfalas.txt
index 04274b71a..4a74f7d8c 100644
--- a/history/states/169-North Belfalas.txt	
+++ b/history/states/169-North Belfalas.txt	
@@ -23,5 +23,5 @@ state={
 	manpower=1000000
 	buildings_max_level_factor=1.000
 	state_category=town
-	local_supplies=0.000
+	local_supplies=1.000
 }
diff --git a/history/states/17-Lamedon.txt b/history/states/17-Lamedon.txt
index d5ae6a360..627b15c4c 100644
--- a/history/states/17-Lamedon.txt
+++ b/history/states/17-Lamedon.txt
@@ -27,5 +27,5 @@ state={
 	manpower=2000000
 	buildings_max_level_factor=1.000
 	state_category=large_town
-	local_supplies=0.000
+	local_supplies=1.000
 }
diff --git a/history/states/173-Emyn Arnen.txt b/history/states/173-Emyn Arnen.txt
index 69b09e6c2..446b3a1ba 100644
--- a/history/states/173-Emyn Arnen.txt	
+++ b/history/states/173-Emyn Arnen.txt	
@@ -24,5 +24,5 @@ state={
 	manpower=600000
 	buildings_max_level_factor=1.000
 	state_category=large_town
-	local_supplies=0.000
+	local_supplies=1.000
 }
diff --git a/history/states/175-South Ithilien.txt b/history/states/175-South Ithilien.txt
index ba992864e..42e877039 100644
--- a/history/states/175-South Ithilien.txt	
+++ b/history/states/175-South Ithilien.txt	
@@ -21,5 +21,5 @@ state={
 	manpower=800000
 	buildings_max_level_factor=1.000
 	state_category=large_town
-	local_supplies=0.000
+	local_supplies=1.000
 }
diff --git a/history/states/18-Mornan.txt b/history/states/18-Mornan.txt
index 989ff2d5d..05582eca9 100644
--- a/history/states/18-Mornan.txt
+++ b/history/states/18-Mornan.txt
@@ -27,5 +27,5 @@ state={
 	manpower=1400000
 	buildings_max_level_factor=1.000
 	state_category=rural
-	local_supplies=0.000
+	local_supplies=1.000
 }
diff --git a/history/states/183-Edoras.txt b/history/states/183-Edoras.txt
index adc481eb0..66157d162 100644
--- a/history/states/183-Edoras.txt
+++ b/history/states/183-Edoras.txt
@@ -33,5 +33,5 @@ state={
 	manpower=6000000
 	buildings_max_level_factor=1.000
 	state_category=megalopolis
-	local_supplies=0.000
+	local_supplies=9.000
 }
diff --git a/history/states/184-Helm's Deep.txt b/history/states/184-Helm's Deep.txt
index 2fc40f6e3..cd5ef0b38 100644
--- a/history/states/184-Helm's Deep.txt	
+++ b/history/states/184-Helm's Deep.txt	
@@ -31,5 +31,5 @@ state={
 	manpower=3000000
 	buildings_max_level_factor=1.000
 	state_category=metropolis
-	local_supplies=0.000
+	local_supplies=9.000
 }
diff --git a/history/states/185-Harondor.txt b/history/states/185-Harondor.txt
index 77c8e4cbd..13a7addbe 100644
--- a/history/states/185-Harondor.txt
+++ b/history/states/185-Harondor.txt
@@ -20,5 +20,5 @@ state={
 	manpower=5000000
 	buildings_max_level_factor=1.000
 	state_category=city
-	local_supplies=0.000
+	local_supplies=2.000
 }
diff --git a/history/states/186-Isenmouthe.txt b/history/states/186-Isenmouthe.txt
index c8384dc92..00171eecf 100644
--- a/history/states/186-Isenmouthe.txt
+++ b/history/states/186-Isenmouthe.txt
@@ -21,5 +21,5 @@ state={
 	manpower=5000000
 	buildings_max_level_factor=1.000
 	state_category=metropolis
-	local_supplies=0.000
+	local_supplies=10.000
 }
diff --git a/history/states/188-Morgai.txt b/history/states/188-Morgai.txt
index d8d6ae3f2..214e764c2 100644
--- a/history/states/188-Morgai.txt
+++ b/history/states/188-Morgai.txt
@@ -28,5 +28,5 @@ state={
 	manpower=3000000
 	buildings_max_level_factor=1.000
 	state_category=large_city
-	local_supplies=0.000
+	local_supplies=4.000
 }
diff --git a/history/states/189-Plateau of Gorgoroth.txt b/history/states/189-Plateau of Gorgoroth.txt
index 45a556da6..b902ac5f2 100644
--- a/history/states/189-Plateau of Gorgoroth.txt	
+++ b/history/states/189-Plateau of Gorgoroth.txt	
@@ -21,5 +21,5 @@ state={
 	manpower=5000000
 	buildings_max_level_factor=1.000
 	state_category=large_city
-	local_supplies=0.000
+	local_supplies=3.000
 }
diff --git a/history/states/19-Lebennin.txt b/history/states/19-Lebennin.txt
index 77ae1929d..24b2e92fd 100644
--- a/history/states/19-Lebennin.txt
+++ b/history/states/19-Lebennin.txt
@@ -30,5 +30,5 @@ state={
 	manpower=3200000
 	buildings_max_level_factor=1.000
 	state_category=city
-	local_supplies=0.000
+	local_supplies=1.000
 }
diff --git a/history/states/194-West Iron Hills.txt b/history/states/194-West Iron Hills.txt
index c268f47f4..472a39760 100644
--- a/history/states/194-West Iron Hills.txt	
+++ b/history/states/194-West Iron Hills.txt	
@@ -19,5 +19,5 @@ state={
 	manpower=1000000
 	buildings_max_level_factor=1.000
 	state_category=large_city
-	local_supplies=0.000
+	local_supplies=1.000
 }
diff --git a/history/states/2-Udun.txt b/history/states/2-Udun.txt
index a143181fc..ccf5e7e5d 100644
--- a/history/states/2-Udun.txt
+++ b/history/states/2-Udun.txt
@@ -26,5 +26,5 @@ state={
 	manpower=5000000
 	buildings_max_level_factor=1.000
 	state_category=large_city
-	local_supplies=0.000
+	local_supplies=10.000
 }
diff --git a/history/states/200-Bruinen.txt b/history/states/200-Bruinen.txt
index 67923d7d6..4d93d9b57 100644
--- a/history/states/200-Bruinen.txt
+++ b/history/states/200-Bruinen.txt
@@ -19,5 +19,5 @@ state={
 	manpower=800000
 	buildings_max_level_factor=1.000
 	state_category=large_city
-	local_supplies=0.000
+	local_supplies=1.000
 }
diff --git a/history/states/201-Mitheithel.txt b/history/states/201-Mitheithel.txt
index 31a41f19d..da8a6017c 100644
--- a/history/states/201-Mitheithel.txt
+++ b/history/states/201-Mitheithel.txt
@@ -19,5 +19,5 @@ state={
 	manpower=800000
 	buildings_max_level_factor=1.000
 	state_category=large_city
-	local_supplies=0.000
+	local_supplies=1.000
 }
diff --git a/history/states/202-Rivendell Ford.txt b/history/states/202-Rivendell Ford.txt
index 54087a6ee..ee3605e7a 100644
--- a/history/states/202-Rivendell Ford.txt	
+++ b/history/states/202-Rivendell Ford.txt	
@@ -22,5 +22,5 @@ state={
 	manpower=1000000
 	buildings_max_level_factor=1.000
 	state_category=large_city
-	local_supplies=0.000
+	local_supplies=2.000
 }
diff --git a/history/states/205-North Undeep.txt b/history/states/205-North Undeep.txt
index db65baa10..6bdfb99c5 100644
--- a/history/states/205-North Undeep.txt	
+++ b/history/states/205-North Undeep.txt	
@@ -18,5 +18,5 @@ state={
 	manpower=500000
 	buildings_max_level_factor=1.000
 	state_category=pastoral
-	local_supplies=0.000
+	local_supplies=1.000
 }
diff --git a/history/states/21-Lossarnach.txt b/history/states/21-Lossarnach.txt
index 79d16848a..a6a13bfc7 100644
--- a/history/states/21-Lossarnach.txt
+++ b/history/states/21-Lossarnach.txt
@@ -24,5 +24,5 @@ state={
 	manpower=2000000
 	buildings_max_level_factor=1.000
 	state_category=large_city
-	local_supplies=0.000
+	local_supplies=1.000
 }
diff --git a/history/states/211-North Dale.txt b/history/states/211-North Dale.txt
index 5eeacfb0d..54cb44a7c 100644
--- a/history/states/211-North Dale.txt	
+++ b/history/states/211-North Dale.txt	
@@ -20,5 +20,5 @@ state={
 	manpower=500000
 	buildings_max_level_factor=1.000
 	state_category=rural
-	local_supplies=0.000
+	local_supplies=2.000
 }
diff --git a/history/states/212-South Dale Forest.txt b/history/states/212-South Dale Forest.txt
index ef238f58e..06d23dfe9 100644
--- a/history/states/212-South Dale Forest.txt	
+++ b/history/states/212-South Dale Forest.txt	
@@ -18,5 +18,5 @@ state={
 	manpower=500000
 	buildings_max_level_factor=1.000
 	state_category=rural
-	local_supplies=0.000
+	local_supplies=1.000
 }
diff --git a/history/states/22-Ithilien.txt b/history/states/22-Ithilien.txt
index a6a5530ad..2d5054b28 100644
--- a/history/states/22-Ithilien.txt
+++ b/history/states/22-Ithilien.txt
@@ -22,5 +22,5 @@ state={
 	manpower=800000
 	buildings_max_level_factor=1.000
 	state_category=large_city
-	local_supplies=0.000
+	local_supplies=1.000
 }
diff --git a/history/states/222-Cerin Amroth.txt b/history/states/222-Cerin Amroth.txt
index d6c2bd13a..7c337690a 100644
--- a/history/states/222-Cerin Amroth.txt	
+++ b/history/states/222-Cerin Amroth.txt	
@@ -32,5 +32,5 @@ state={
 	manpower=1800000
 	buildings_max_level_factor=1.000
 	state_category=metropolis
-	local_supplies=0.000
+	local_supplies=3.000
 }
diff --git a/history/states/223-Dol Amroth.txt b/history/states/223-Dol Amroth.txt
index ac47eb714..51a504b13 100644
--- a/history/states/223-Dol Amroth.txt	
+++ b/history/states/223-Dol Amroth.txt	
@@ -23,5 +23,5 @@ state={
 	manpower=2000000
 	state_category=large_town
 	buildings_max_level_factor=1.000
-	local_supplies=0.000
+	local_supplies=2.000
 }
diff --git a/history/states/224-Dol Amroth City.txt b/history/states/224-Dol Amroth City.txt
index ff7fe13b4..b89c5ad05 100644
--- a/history/states/224-Dol Amroth City.txt	
+++ b/history/states/224-Dol Amroth City.txt	
@@ -36,5 +36,5 @@ state={
 	manpower=4000000
 	state_category=metropolis
 	buildings_max_level_factor=1.000
-	local_supplies=0.000
+	local_supplies=15.000
 }
diff --git a/history/states/24-Rohan Gap.txt b/history/states/24-Rohan Gap.txt
index 37df1db80..64a5fc5d4 100644
--- a/history/states/24-Rohan Gap.txt	
+++ b/history/states/24-Rohan Gap.txt	
@@ -26,5 +26,5 @@ state={
 	manpower=1500000
 	buildings_max_level_factor=1.000
 	state_category=large_town
-	local_supplies=0.000
+	local_supplies=1.000
 }
diff --git a/history/states/26-Westfold.txt b/history/states/26-Westfold.txt
index 0d30b07ba..178b24428 100644
--- a/history/states/26-Westfold.txt
+++ b/history/states/26-Westfold.txt
@@ -24,5 +24,5 @@ state={
 	manpower=1500000
 	buildings_max_level_factor=1.000
 	state_category=large_town
-	local_supplies=0.000
+	local_supplies=1.000
 }
diff --git a/history/states/28-Westemnet.txt b/history/states/28-Westemnet.txt
index 81b5d87a0..2b744d29d 100644
--- a/history/states/28-Westemnet.txt
+++ b/history/states/28-Westemnet.txt
@@ -24,5 +24,5 @@ state={
 	manpower=1000000
 	buildings_max_level_factor=1.000
 	state_category=large_town
-	local_supplies=0.000
+	local_supplies=1.000
 }
diff --git a/history/states/3-Dark North.txt b/history/states/3-Dark North.txt
index da1396fde..968be28b3 100644
--- a/history/states/3-Dark North.txt	
+++ b/history/states/3-Dark North.txt	
@@ -28,5 +28,5 @@ state={
 	manpower=3000000
 	buildings_max_level_factor=1.000
 	state_category=large_city
-	local_supplies=0.000
+	local_supplies=1.000
 }
diff --git a/history/states/31-Isengard.txt b/history/states/31-Isengard.txt
index b70d6371f..9c74dadfd 100644
--- a/history/states/31-Isengard.txt
+++ b/history/states/31-Isengard.txt
@@ -28,5 +28,5 @@ state={
 	manpower=2000000
 	buildings_max_level_factor=1.000
 	state_category=darkground
-	local_supplies=0.000
+	local_supplies=7.000
 }
diff --git a/history/states/38-The Shire.txt b/history/states/38-The Shire.txt
index 3b2bacd82..bcb8ca412 100644
--- a/history/states/38-The Shire.txt	
+++ b/history/states/38-The Shire.txt	
@@ -24,5 +24,5 @@ state={
 	manpower=575000
 	buildings_max_level_factor=1.000
 	state_category=city
-	local_supplies=0.000
+	local_supplies=1.000
 }
diff --git a/history/states/39-South Arthedain.txt b/history/states/39-South Arthedain.txt
index 31e6c4f76..9c73abeee 100644
--- a/history/states/39-South Arthedain.txt	
+++ b/history/states/39-South Arthedain.txt	
@@ -15,7 +15,7 @@ state={
 
 		}
 		add_core_of = ART
-
+		victory_points = { 3874 3 }
 	}
 
 	provinces={
diff --git a/history/states/4-Ered Lithui.txt b/history/states/4-Ered Lithui.txt
index f3bf3b2c1..56e93235d 100644
--- a/history/states/4-Ered Lithui.txt	
+++ b/history/states/4-Ered Lithui.txt	
@@ -26,5 +26,5 @@ state={
 	manpower=6000000
 	buildings_max_level_factor=1.000
 	state_category=metropolis
-	local_supplies=0.000
+	local_supplies=2.000
 }
diff --git a/history/states/40-Forochel Coast.txt b/history/states/40-Forochel Coast.txt
index d34cf0866..01dfdd086 100644
--- a/history/states/40-Forochel Coast.txt	
+++ b/history/states/40-Forochel Coast.txt	
@@ -17,7 +17,7 @@ state={
 			5648 = { naval_base = 1 }
 		}
 		add_core_of = ART
-
+		victory_points = { 5648 3 }
 	}
 
 	provinces={
diff --git a/history/states/42-North Farthing.txt b/history/states/42-North Farthing.txt
index 5f4c80cfc..82d825a90 100644
--- a/history/states/42-North Farthing.txt	
+++ b/history/states/42-North Farthing.txt	
@@ -34,5 +34,5 @@ state={
 	manpower=1000000
 	buildings_max_level_factor=1.000
 	state_category=city
-	local_supplies=0.000
+	local_supplies=2.000
 }
diff --git a/history/states/43-South Farthing.txt b/history/states/43-South Farthing.txt
index a80b1d656..179868fbe 100644
--- a/history/states/43-South Farthing.txt	
+++ b/history/states/43-South Farthing.txt	
@@ -28,5 +28,5 @@ state={
 	manpower=750000
 	buildings_max_level_factor=1.000
 	state_category=city
-	local_supplies=0.000
+	local_supplies=1.000
 }
diff --git a/history/states/44-East Farthing.txt b/history/states/44-East Farthing.txt
index eeaee9f56..b3577cf69 100644
--- a/history/states/44-East Farthing.txt	
+++ b/history/states/44-East Farthing.txt	
@@ -26,5 +26,5 @@ state={
 	manpower=650000
 	buildings_max_level_factor=1.000
 	state_category=city
-	local_supplies=0.000
+	local_supplies=1.000
 }
diff --git a/history/states/45-Eagle's Head.txt b/history/states/45-Eagle's Head.txt
index 7f7fbf6e6..042bd5201 100644
--- a/history/states/45-Eagle's Head.txt	
+++ b/history/states/45-Eagle's Head.txt	
@@ -14,7 +14,8 @@ state={
 			7806 = { naval_base = 1 }
 			2165 = { naval_base = 3 }
 		}
-
+		victory_points = { 7806 1 }
+		victory_points = { 2165 3 }
 	}
 
 	provinces={
diff --git a/history/states/48-Cardo-Arthedain.txt b/history/states/48-Cardo-Arthedain.txt
index befc8bd0e..995c9f01d 100644
--- a/history/states/48-Cardo-Arthedain.txt
+++ b/history/states/48-Cardo-Arthedain.txt
@@ -11,11 +11,12 @@ state={
 		owner = ART
 		buildings = {
 			infrastructure = 2
-			industrial_complex = 1
+			industrial_complex = 2
 			dockyard = 1
-			1831 = { naval_base = 3 }
-			3026 = { naval_base = 1 }
+			3026 = { naval_base = 3 }
 		}
+		victory_points = { 3026 3 }
+		victory_points = { 311 3 }
 
 	}
 
diff --git a/history/states/51-South Forlindon.txt b/history/states/51-South Forlindon.txt
index 4c084b280..9120af1e5 100644
--- a/history/states/51-South Forlindon.txt	
+++ b/history/states/51-South Forlindon.txt	
@@ -23,5 +23,5 @@ state={
 	manpower=800000
 	buildings_max_level_factor=1.000
 	state_category=town
-	local_supplies=0.000
+	local_supplies=1.000
 }
diff --git a/history/states/54-Mithlond.txt b/history/states/54-Mithlond.txt
index 3c6932e12..e1ebe00a1 100644
--- a/history/states/54-Mithlond.txt
+++ b/history/states/54-Mithlond.txt
@@ -29,5 +29,5 @@ state={
 	manpower=4000000
 	buildings_max_level_factor=1.000
 	state_category=metropolis
-	local_supplies=0.000
+	local_supplies=2.000
 }
diff --git a/history/states/6-Mountains of Shadow.txt b/history/states/6-Mountains of Shadow.txt
index e98e9105d..fc23cc8a3 100644
--- a/history/states/6-Mountains of Shadow.txt	
+++ b/history/states/6-Mountains of Shadow.txt	
@@ -24,5 +24,5 @@ state={
 	manpower=10000000
 	buildings_max_level_factor=1.000
 	state_category=darkground
-	local_supplies=0.000
+	local_supplies=12.000
 }
diff --git a/history/states/60-Angmar.txt b/history/states/60-Angmar.txt
index e4ed54a3b..b509c8788 100644
--- a/history/states/60-Angmar.txt
+++ b/history/states/60-Angmar.txt
@@ -28,5 +28,5 @@ state={
 	manpower=1600000
 	buildings_max_level_factor=1.000
 	state_category=large_town
-	local_supplies=0.000
+	local_supplies=1.000
 }
diff --git a/history/states/61-Mi Gundabad.txt b/history/states/61-Mi Gundabad.txt
index 220c1ab79..09a44e686 100644
--- a/history/states/61-Mi Gundabad.txt	
+++ b/history/states/61-Mi Gundabad.txt	
@@ -29,5 +29,5 @@ state={
 	manpower=1000000
 	buildings_max_level_factor=1.000
 	state_category=large_city
-	local_supplies=0.000
+	local_supplies=2.000
 }
diff --git a/history/states/65-Rivendell.txt b/history/states/65-Rivendell.txt
index 2a1e45b28..23272ad29 100644
--- a/history/states/65-Rivendell.txt
+++ b/history/states/65-Rivendell.txt
@@ -31,5 +31,5 @@ state={
 	manpower=5000000
 	buildings_max_level_factor=1.000
 	state_category=megalopolis
-	local_supplies=0.000
+	local_supplies=11.000
 }
diff --git a/history/states/66-North Eregion.txt b/history/states/66-North Eregion.txt
index 6f6d90a3f..8fb5aafbb 100644
--- a/history/states/66-North Eregion.txt	
+++ b/history/states/66-North Eregion.txt	
@@ -28,5 +28,5 @@ state={
 	manpower=800000
 	buildings_max_level_factor=1.000
 	state_category=large_city
-	local_supplies=0.000
+	local_supplies=1.000
 }
diff --git a/history/states/67-South Eregion.txt b/history/states/67-South Eregion.txt
index 7b423db42..6967b0579 100644
--- a/history/states/67-South Eregion.txt	
+++ b/history/states/67-South Eregion.txt	
@@ -26,5 +26,5 @@ state={
 	manpower=600000
 	buildings_max_level_factor=1.000
 	state_category=large_city
-	local_supplies=0.000
+	local_supplies=1.000
 }
diff --git a/history/states/69-Northern Fells.txt b/history/states/69-Northern Fells.txt
index 60e0a2cfe..ae31d3e2d 100644
--- a/history/states/69-Northern Fells.txt	
+++ b/history/states/69-Northern Fells.txt	
@@ -25,5 +25,5 @@ state={
 	manpower=800000
 	buildings_max_level_factor=1.000
 	state_category=rural
-	local_supplies=0.000
+	local_supplies=1.000
 }
diff --git a/history/states/71-Carrock Vale.txt b/history/states/71-Carrock Vale.txt
index 699db398e..1dde7b821 100644
--- a/history/states/71-Carrock Vale.txt	
+++ b/history/states/71-Carrock Vale.txt	
@@ -27,5 +27,5 @@ state={
 	manpower=1400000
 	buildings_max_level_factor=1.000
 	state_category=rural
-	local_supplies=0.000
+	local_supplies=1.000
 }
diff --git a/history/states/73-Moria.txt b/history/states/73-Moria.txt
index 2a5e95caf..ca35a7463 100644
--- a/history/states/73-Moria.txt
+++ b/history/states/73-Moria.txt
@@ -30,5 +30,5 @@ state={
 	manpower=500000
 	buildings_max_level_factor=1.000
 	state_category=metropolis
-	local_supplies=0.000
+	local_supplies=1.000
 }
diff --git a/history/states/75-Caras Galadhon.txt b/history/states/75-Caras Galadhon.txt
index 9e01ef352..a1d00e3dc 100644
--- a/history/states/75-Caras Galadhon.txt	
+++ b/history/states/75-Caras Galadhon.txt	
@@ -35,5 +35,5 @@ state={
 	manpower=5000000
 	buildings_max_level_factor=1.000
 	state_category=megalopolis
-	local_supplies=0.000
+	local_supplies=8.000
 }
diff --git a/history/states/76-Taur Hith.txt b/history/states/76-Taur Hith.txt
index 0797e35b0..3fa5bde12 100644
--- a/history/states/76-Taur Hith.txt	
+++ b/history/states/76-Taur Hith.txt	
@@ -23,5 +23,5 @@ state={
 	manpower=800000
 	buildings_max_level_factor=1.000
 	state_category=large_city
-	local_supplies=0.000
+	local_supplies=1.000
 }
diff --git a/history/states/8-West Nurn.txt b/history/states/8-West Nurn.txt
index 33d80660f..537aabb64 100644
--- a/history/states/8-West Nurn.txt	
+++ b/history/states/8-West Nurn.txt	
@@ -23,5 +23,5 @@ state={
 	manpower=5000000
 	buildings_max_level_factor=1.000
 	state_category=city
-	local_supplies=0.000
+	local_supplies=1.000
 }
diff --git a/history/states/80-Northern Mirkwood.txt b/history/states/80-Northern Mirkwood.txt
index d9f23cd21..4ad4387c5 100644
--- a/history/states/80-Northern Mirkwood.txt	
+++ b/history/states/80-Northern Mirkwood.txt	
@@ -24,5 +24,5 @@ state={
 	manpower=1000000
 	buildings_max_level_factor=1.000
 	state_category=rural
-	local_supplies=0.000
+	local_supplies=1.000
 }
diff --git a/history/states/81-Thranduils Halls.txt b/history/states/81-Thranduils Halls.txt
index bde9660fd..e800897f3 100644
--- a/history/states/81-Thranduils Halls.txt	
+++ b/history/states/81-Thranduils Halls.txt	
@@ -25,5 +25,5 @@ state={
 	manpower=4600000
 	buildings_max_level_factor=1.000
 	state_category=large_city
-	local_supplies=0.000
+	local_supplies=5.000
 }
diff --git a/history/states/87-Dol Guldur.txt b/history/states/87-Dol Guldur.txt
index 6d4d8cf88..3050dc972 100644
--- a/history/states/87-Dol Guldur.txt	
+++ b/history/states/87-Dol Guldur.txt	
@@ -28,5 +28,5 @@ state={
 	manpower=3000000
 	buildings_max_level_factor=1.000
 	state_category=town
-	local_supplies=0.000
+	local_supplies=4.000
 }
diff --git a/history/states/9-Nurn.txt b/history/states/9-Nurn.txt
index 0643a1f7a..7a8a86a20 100644
--- a/history/states/9-Nurn.txt
+++ b/history/states/9-Nurn.txt
@@ -26,5 +26,5 @@ state={
 	manpower=7000000
 	buildings_max_level_factor=1.000
 	state_category=city
-	local_supplies=0.000
+	local_supplies=5.000
 }
diff --git a/history/states/90-Erebor.txt b/history/states/90-Erebor.txt
index 8e1b6d2e1..e0a60ab7b 100644
--- a/history/states/90-Erebor.txt
+++ b/history/states/90-Erebor.txt
@@ -32,5 +32,5 @@ state={
 	manpower=6000000
 	buildings_max_level_factor=1.000
 	state_category=megalopolis
-	local_supplies=0.000
+	local_supplies=5.000
 }
diff --git a/history/states/93-Iron Hills.txt b/history/states/93-Iron Hills.txt
index 3af2897b8..908cac2a2 100644
--- a/history/states/93-Iron Hills.txt	
+++ b/history/states/93-Iron Hills.txt	
@@ -24,5 +24,5 @@ state={
 	manpower=1000000
 	buildings_max_level_factor=1.000
 	state_category=large_city
-	local_supplies=0.000
+	local_supplies=1.000
 }
diff --git a/history/states/94-Esgaroth.txt b/history/states/94-Esgaroth.txt
index 781a01d5e..970a4d5dd 100644
--- a/history/states/94-Esgaroth.txt
+++ b/history/states/94-Esgaroth.txt
@@ -29,5 +29,5 @@ state={
 	manpower=3000000
 	buildings_max_level_factor=1.000
 	state_category=metropolis
-	local_supplies=0.000
+	local_supplies=7.000
 }
diff --git a/interface/auto_generated/lotr_spirits.gfx b/interface/auto_generated/lotr_spirits.gfx
index edb9f288d..1a59832e6 100644
--- a/interface/auto_generated/lotr_spirits.gfx
+++ b/interface/auto_generated/lotr_spirits.gfx
@@ -340,6 +340,11 @@ spriteTypes = {
         texturefile = "gfx/interface/ideas/national_spirits/MOR/sauron_eye.dds"
     }
 
+    SpriteType = {
+        name = "GFX_idea_DOR_wine_trade"
+        texturefile = "gfx/interface/ideas/national_spirits/DOR/idea_dor_wine_trade.dds"
+    }
+
     spriteType = {
         name = "GFX_idea_generic_abandon_crown"
         texturefile = "gfx/interface/ideas/national_spirits/vanilla/generic_abandon_crown.dds"
diff --git a/interface/frontendmainview.gui b/interface/frontendmainview.gui
index 9ad53dc4b..77eace709 100644
--- a/interface/frontendmainview.gui
+++ b/interface/frontendmainview.gui
@@ -20,6 +20,96 @@ guiTypes = {
 			alwaystransparent = yes
 		}
 
+	}
+
+		containerWindowType = {
+		name = "owned_dlc_item"
+		size = { width = 50 height = 50 }
+
+		buttonType =
+		{
+			position = { x = -230 y = 0 }
+			name ="dlc_button"
+			spriteType = "GFX_frontend_banner_dlc018"
+		}
+
+		iconType = {
+			name = "glowup"
+			position = { x = -50 y = -21 }
+			spriteType = "GFX_spirit_glow"
+			scale = 0.8
+			#hide = yes
+		}
+
+		buttonType = {
+			name = "owned_tick"
+			spriteType = "GFX_BPT_area_defense_setting_tick"
+			position = { x = -6 y = 1 }
+			Orientation = center_left
+			scale = 0.56
+			alwaysTransparent = yes
+			#hide = yes
+		}
+
+		buttonType = {
+			name = "enabled_tick"
+			spriteType = "GFX_general_check"
+			position = { x = 28 y = 24 }
+			Orientation = center_left
+			alwaysTransparent = yes
+		}
+
+	}
+
+	containerWindowType = {
+		name = "unowned_dlc_item"
+		size = { width = 50 height = 50 }
+
+		buttonType =
+		{
+			position = { x = -230 y = 0 }
+			name ="dlc_button"
+			spriteType = "GFX_frontend_banner_dlc018"
+		}
+
+		buttonType = {
+			name = "owned_tick"
+			spriteType = "GFX_BPT_area_defense_setting_tick"
+			position = { x = -6 y = 1 }
+			Orientation = center_left
+			scale = 0.56
+			alwaysTransparent = yes
+			#enabled = no
+		}
+
+		buttonType = {
+			name = "enabled_tick"
+			spriteType = "GFX_general_check"
+			position = { x = 28 y = 24 }
+			Orientation = center_left
+			alwaysTransparent = yes
+		}
+
+	}
+
+	### MAIN MENU PANEL (DLC Ownership) 
+	containerWindowType = {
+		name  ="mainmenu_dlc_ownership"
+		position = { x=5 y =0 }
+		size = { width = 370 height = 528}
+		Orientation = lower_left
+		origo = lower_left
+
+		gridBoxType = {
+			name = "potential_dlc_list"
+			position = { x = 0 y = 0}
+			size = { width = 50 height = 400 }
+			#Orientation = upper_left
+			slotsize = {width=50 height=51 }
+			max_slots_vertical = 1
+			format = "RIGHT"
+		}
+
 	}
 
 	### MAIN MENU PANEL (upperleft)
diff --git a/interface/mapicons.gui b/interface/mapicons.gui
index d36bd77f7..626fac3de 100644
--- a/interface/mapicons.gui
+++ b/interface/mapicons.gui
@@ -694,6 +694,24 @@ guiTypes = {
 		}
 	}
 
+	#### STATE MODIFIER MAP ICON
+
+	containerWindowType = {
+		name = "state_modifier_mapicon"
+		position = { x = 0 y = 0 }
+		size = { width = 0 height = 0 }
+		orientation = center
+
+		gridboxtype = {
+			name = "modifiers_list"
+			position = { x = 0 y = 0 }
+			max_slots_vertical = 1
+			size = { width = 100%% height = 100%% }
+			slotsize = { width = 40 height = 40 }
+			format = "UPPER_LEFT"
+		}
+	}
+
 	#### CONSTRUCTION INFO MAP ICON
 	containerWindowType = {
 		name = "construction_info_mapicon"
diff --git a/localisation/english/0_lotr_core/lotr_ring_events_l_english.yml b/localisation/english/0_lotr_core/lotr_ring_events_l_english.yml
index 185860f20..bee20b170 100644
--- a/localisation/english/0_lotr_core/lotr_ring_events_l_english.yml
+++ b/localisation/english/0_lotr_core/lotr_ring_events_l_english.yml
@@ -32,4 +32,10 @@ fs.106.c:0 "Elect a leader of our own."
 
 fs.107.t:0 "The One Ring's temptations prove irresistible."
 fs.107.d:0 "The One Ring is having a powerful effect on us. So much so, that it's becoming dubious who is controlling who. We must be watchful not to let the Ring corrupt us entirely!"
-fs.107.a:0 "Something must be done"
\ No newline at end of file
+fs.107.a:0 "Something must be done"
+
+fs.108.t:0 "The One Ring has been destroyed."
+fs.108.d:0 "It seems amidst our warmongering two hobbits slipped past and managed to destroy the one ring within the fires of mount doom. The dark Lord Sauron is dead. What is our next course of action?"
+fs.108.d_elves:0 "It seems amidst our warmongering a pack of elves slipped past and managed to destroy the one ring within the fires of mount doom. The dark Lord Sauron is dead. What is our next course of action?"
+fs.108.a:0 "Let the strongest rule."
+fs.108.b:0 "Elect a leader of our own."
\ No newline at end of file
diff --git a/localisation/english/angmar/angmar_ideas_l_english.yml b/localisation/english/angmar/angmar_ideas_l_english.yml
index 76903fc2b..3eefc669d 100644
--- a/localisation/english/angmar/angmar_ideas_l_english.yml
+++ b/localisation/english/angmar/angmar_ideas_l_english.yml
@@ -24,6 +24,7 @@ ANG_orthanc_payment:0 "Gondor Orthanc payment"
 ANG_orc_lead_industry_0:0 "Orc lead industry"
 ANG_orc_lead_industry_1:0 "Orc lead industry"
 ANG_witch_king_cult:0 "Witch King cult"
+ANG_new_leadership:0 "New leadership"
 
 ### Hidden part
 ANG_ANG_the_necromancer:0 "The Necromancer"
diff --git a/localisation/english/dol amroth/dol_amroth_events_l_english.yml b/localisation/english/dol amroth/dol_amroth_events_l_english.yml
new file mode 100644
index 000000000..4ec6ee203
--- /dev/null
+++ b/localisation/english/dol amroth/dol_amroth_events_l_english.yml	
@@ -0,0 +1,10 @@
+l_english:
+##### Event 
+dolamroth.1.t:0 "[From.GetName] denounces Isildurs heritage"
+dolamroth.1.d:0 "[FROM.GetLeader] has denounced Isildurs heritage to the throne of Gondor in a recent press conference. There is only one person that deserves the throne of Gondor and that is their loyal steward."
+dolamroth.1.a:0 "We are loyal to Isildur"
+dolamroth.1.b:0 "We will follow their example"
+
+dolamroth.2.t:0 "[From.GetName] will not stand for this betrayal"
+dolamroth.2.d:0 "[FROM.GetLeader] has said that Dol Amroth belongs to Gondor and if violence has to be used so be it."
+dolamroth.2.a:0 "We will not surrender..."
\ No newline at end of file
diff --git a/localisation/english/dorwinion/dorwinion_ideas_l_english.yml b/localisation/english/dorwinion/dorwinion_ideas_l_english.yml
index 6471fd5f5..0c9b15774 100644
--- a/localisation/english/dorwinion/dorwinion_ideas_l_english.yml
+++ b/localisation/english/dorwinion/dorwinion_ideas_l_english.yml
@@ -1,4 +1,4 @@
 l_english:
 ##General
 DOR_wine_trade:0 "Wine Trade"
-DOR_wine_trade_desc:0 ""
+DOR_wine_trade_desc:0 "Dorwinion biggest product is their high-quality and widely enjoyed wine which even turns the elves drunk."
diff --git a/localisation/english/lothlorien/lothlorien_events_l_english.yml b/localisation/english/lothlorien/lothlorien_events_l_english.yml
index 738450b60..0ac31a26b 100644
--- a/localisation/english/lothlorien/lothlorien_events_l_english.yml
+++ b/localisation/english/lothlorien/lothlorien_events_l_english.yml
@@ -197,7 +197,7 @@ lothlorien.33.b:0 "We will fend the darkness for ourselves. Even from Lórien, i
 #====================
 lothlorien.34.t_declined:0 "[FROM.GetName] refuses"
 lothlorien.34.t_accepted:0 "[FROM.GetName] submits"
-lothlorien.34.d_declined:0 "Outraged at our demands, [FROM.GetLeader] hzas refused to comply with our request of submission. They claim they will fend the darkness off by themselves. Even from Lórien, if they must."
+lothlorien.34.d_declined:0 "Outraged at our demands, [FROM.GetLeader] has refused to comply with our request of submission. They claim they will fend the darkness off by themselves. Even from Lórien, if they must."
 lothlorien.34.d_accepted:0 "[FROM.GetLeader] has seen reason and accepted our demand of a common elven hegemony under the banner of the Golden Wood."
 lothlorien.34.a_declined:0 "Elven lives put to risk, out of sheer vanity..."
 lothlorien.34.a_accepted:0 "Excellent."
diff --git a/localisation/english/replace/events_l_english.yml b/localisation/english/replace/events_l_english.yml
new file mode 100644
index 000000000..5933b359d
--- /dev/null
+++ b/localisation/english/replace/events_l_english.yml
@@ -0,0 +1,10 @@
+l_english:
+ political.18.t_bell:0 "Army Demands Abdication"
+ political.18.t_revo:0 "Peasants Demand Abdication"
+ political.18.t_coop:0 "Guilds Demand Abdication"
+ political.18.t_unal:0 "Court Demands Abdication"
+ political.18.t_gene:0 "Opposition Demands Abdication"
+
+ political.18.d_gene:0 "The rapidly growing [Root.GetAdjective] movement against the current regime has never claimed that they need majority support before they seize power, counting on uniting the nation under their leadership once their rule is established. However, it seems their public support has grown rapidly. Many are now calling for [Root.GetLeader] to abdicate, a request so far disregarded by [Root.GetRulingParty] members.\n\nBut as the current [Root.GetAdjective] regime comes increasingly under mistrust and scrutiny, our opponents may choose the violent struggle as a better path to power."
+
+ political.18.c_gene:0 "If the people want it, then so be it."
\ No newline at end of file
diff --git a/localisation/english/victory_points_l_english.yml b/localisation/english/victory_points_l_english.yml
index 261a73abb..a244beba1 100644
--- a/localisation/english/victory_points_l_english.yml
+++ b/localisation/english/victory_points_l_english.yml
@@ -151,6 +151,13 @@
  VICTORY_POINTS_4828:0 "Khurvasagh Pass"
  VICTORY_POINTS_2367:0 "Celduin-Carnen"
  VICTORY_POINTS_4948:0 "Tarnost"
- VICTORY_POINTS_4948:0 "Tarnost"
  VICTORY_POINTS_3570:0 "Dol Amroth"
- VICTORY_POINTS_4079:0 "Dol Amroth Citadel"
\ No newline at end of file
+ VICTORY_POINTS_4079:0 "Dol Amroth Citadel"
+
+ #Arthedain
+ VICTORY_POINTS_5648:0 "Aldervale"
+ VICTORY_POINTS_7806:0 "Brimstead"
+ VICTORY_POINTS_2165:0 "Corthalas"
+ VICTORY_POINTS_3026:0 "Durnhollow"
+ VICTORY_POINTS_311:0 "Eryndor"
+ VICTORY_POINTS_3874:0 "Fynwold"
\ No newline at end of file
diff --git a/patch_notes.txt b/patch_notes.txt
index e69de29bb..dae71004d 100644
--- a/patch_notes.txt
+++ b/patch_notes.txt
@@ -0,0 +1,30 @@
+General:
+- Increased local supplies in states
+- Fixed the "Beacon are lit" decisions not always working properly
+- Updates some old event localization from Fascisme to Belligerent
+
+Dorwinion:
+- Added new custom icon for the Wine National Spirit (Contribution by yeoudal)
+
+Dol Amroth:
+- Fixed missing localization for events
+
+Mordor:
+- Added Sauron as a general when ring is obtained and Sauron is released
+- Made sure the change of Isengard getting puppeted or refusing is not just up to change
+- Added icon to "Secret Intel"
+
+Arthedain:
+- When Aragorn is growned king he now also becomes a general
+- Added 6 new cities
+
+Angmar:
+- Sauron/Nazguls now also dies when in charge of Angmar
+- Added Sauron as a general when ring is obtained and Sauron is released
+
+General:
+- Fixed localization and image of referendum event
+- Added local supply to several states
+- Significantly increasedd the bonus range you get from setting supply hubs to 'motorized'
+- Allowed several revolutionary countries to create their own factions (Contribution by sealord72)
+
diff --git a/tools/gfx_search/images/spirits/GFX_idea_gon_white_tree.png b/tools/gfx_search/images/spirits/GFX_idea_gon_white_tree.png
index 7bb25b719..826e789d6 100644
Binary files a/tools/gfx_search/images/spirits/GFX_idea_gon_white_tree.png and b/tools/gfx_search/images/spirits/GFX_idea_gon_white_tree.png differ
diff --git a/tools/misc/set_local_supplies.py b/tools/misc/set_local_supplies.py
new file mode 100644
index 000000000..75a3c5b79
--- /dev/null
+++ b/tools/misc/set_local_supplies.py
@@ -0,0 +1,71 @@
+import os
+import re
+import random
+import math  # Import the math module
+
+def lerp(a, b, t):
+    return a + (b - a) * max(0.0, min(1.0, t))
+
+def calculate_new_value(manpower, state_category, provinces, line_count):
+
+    base_value = (manpower / 25000) / (len(provinces)*1.35)
+    
+    # flat modifier
+    category_values = {
+        'wasteland': -999,
+        'enclave': -20,
+        'tiny_island': -999,
+        'pastoral': -10,
+        'small_island': -999,
+        'rural': -8,
+        'town': -5,
+        'large_town': -3,
+        'city': 0,
+        'large_city': 1,
+        'metropolis': 2,
+        'megalopolis': 3,
+        'darkground': 5,
+    }
+    base_value += category_values.get(state_category, 0)  # Default to 0 if category not found
+    
+    # Multiply by factors
+    line_factor = lerp(0.6, 1.35, (line_count - 20) / (40 - 20))
+    random_factor = random.uniform(0.7, 1.3)
+    
+    final_value = base_value * line_factor * random_factor
+    
+    final_value = math.floor(final_value)
+    final_value = float(max(0, min(final_value, 16)))
+    
+    return final_value
+
+def parse_and_update_file(file_path):
+    with open(file_path, 'r+') as file:
+        content = file.read()
+
+        # Extracting values
+        manpower = int(re.search(r'manpower\s*=\s*(\d+)', content).group(1))
+        state_category = re.search(r'state_category\s*=\s*(.*?)', content).group(1)
+        provinces = list(map(int, re.search(r'provinces\s*=\s*\{\s*([\d\s]+)\s*\}', content).group(1).split()))
+
+        # Call the function with extracted values
+        new_value = calculate_new_value(manpower, state_category, provinces, len(file.readlines()))
+
+        # Replace the local_supplies value
+        new_content = re.sub(r'local_supplies\s*=\s*\d*\.?\d*', f'local_supplies={new_value}00', content)
+
+        # Write the updated content back to the file
+        file.seek(0)
+        file.write(new_content)
+        file.truncate()
+
+def update_files_in_directory(directory):
+    for filename in os.listdir(directory):
+        if filename.endswith('.txt'):
+            file_path = os.path.join(directory, filename)
+            parse_and_update_file(file_path)
+            print(f"Updated {filename}")
+
+# Replace 'your_directory_path' with the path to the directory containing your .txt files
+directory_path = r'C:\Users\Kahl\Documents\Paradox Interactive\Hearts of Iron IV\mod\lotr\history\states'
+update_files_in_directory(directory_path)
\ No newline at end of file