diff --git a/common/character_interactions/00_marriage_interactions.txt b/common/character_interactions/00_marriage_interactions.txt
index 62a5dfb5..a27e8af3 100644
--- a/common/character_interactions/00_marriage_interactions.txt
+++ b/common/character_interactions/00_marriage_interactions.txt
@@ -3224,7 +3224,7 @@ offer_concubine = {
 			}
 		}
 		scope:recipient = {
-			#NOT = { government_has_flag = government_is_herder }
+			NOT = { government_has_flag = government_is_herder }
 			allowed_concubines = yes
 			is_adult = yes
 		}
diff --git a/common/culture/cultures/NEOW_hispanic.txt b/common/culture/cultures/NEOW_hispanic.txt
index 724557fd..3a93559a 100644
--- a/common/culture/cultures/NEOW_hispanic.txt
+++ b/common/culture/cultures/NEOW_hispanic.txt
@@ -108,7 +108,6 @@ balearic  = { #Balear
 		tradition_forbearing
 		tradition_city_keepers
 		tradition_fishermen
-		tradition_republican_legacy
 	}
 
 	
@@ -352,35 +351,6 @@ NEOW_andalusian = { #Andalûh
 	}
 }
 
-canarian = { #Andalûh
-	color = { 221 239 89 }
-
-	ethos = ethos_courtly
-	heritage = heritage_hispanic
-	language = language_hispanophonic
-	martial_custom = martial_custom_male_only
-	head_determination = head_determination_domain	
-	traditions = {
-		tradition_swords_for_hire
-		tradition_seafaring
-		tradition_zealous_people
-		tradition_astute_diplomats
-		tradition_talent_acquisition
-	}
-
-	name_list = name_list_castilian
-	house_coa_frame = house_frame_19
-	house_coa_mask_offset = { 0.0 0.025 }
-	house_coa_mask_scale = { 0.95 0.95 }		
-	coa_gfx = { castilian_coa_gfx iberian_group_coa_gfx western_coa_gfx }
-	building_gfx = { iberian_building_gfx }
-	clothing_gfx = { iberian_christian_clothing_gfx western_clothing_gfx }
-	unit_gfx = { iberian_christian_unit_gfx }
-	
-	ethnicities = {
-		10 = mediterranean
-	}
-}
 portuguese = { #Português
 	color = { 65 102 10 }
 
diff --git a/common/decisions/dlc_decisions/mpo/mpo_decisions.txt b/common/decisions/dlc_decisions/mpo/mpo_decisions.txt
index 75792d69..7a24c9aa 100644
--- a/common/decisions/dlc_decisions/mpo/mpo_decisions.txt
+++ b/common/decisions/dlc_decisions/mpo/mpo_decisions.txt
@@ -6953,6 +6953,7 @@ become_nomadic_decision = {
 		capital_county = {
 			any_county_situation = {
 				OR = {
+					situation:the_great_steppe ?= this
 					situation:game_rule_extra_nomads_arabs ?= this
 					situation:game_rule_extra_nomads_sami ?= this
 					situation:game_rule_extra_nomads_tibet ?= this
diff --git a/common/game_rules/NEOW_game_rules.txt b/common/game_rules/NEOW_game_rules.txt
deleted file mode 100644
index ae500847..00000000
--- a/common/game_rules/NEOW_game_rules.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-disable_achievements = {
-    categories = {
-        game_modes
-    }
-
-    default = achievements_disabled
-
-    achievements_enabled = {}
-    achievements_disabled = { flag = blocks_achievements }
-}
\ No newline at end of file
diff --git a/common/religion/holy_sites/00_holy_sites.txt b/common/religion/holy_sites/00_holy_sites.txt
index 702a9c73..d2a5226d 100644
--- a/common/religion/holy_sites/00_holy_sites.txt
+++ b/common/religion/holy_sites/00_holy_sites.txt
@@ -501,62 +501,6 @@ reims = {
 	}
 }
 
-# pantheonic
-
-grenoble = {
-	county = c_isere
-	barony = b_grenoble
-	
-	character_modifier = {
-		name = holy_site_grenoble_effect_name
-		religious_vassal_opinion = 5
-		sway_scheme_phase_duration_add = minor_scheme_phase_duration_bonus_value
-	}
-}
-
-arras = {
-	county = c_boulogne
-	barony = b_aire
-	
-	character_modifier = {
-		name = holy_site_arras_effect_name
-		development_growth_factor = 0.1
-		stewardship = 1
-	}
-}
-
-berlin = {
-	county = c_berlin
-	barony = b_berlin
-
-	character_modifier = {
-		name = holy_site_berlin_effect_name
-		martial = 1
-		hard_casualty_modifier = -0.1
-	}
-}
-
-trier = {
-	county = c_trier
-	barony = b_trier
-	
-	character_modifier = {
-		name = holy_site_trier_effect_name
-		cultural_head_fascination_mult = 0.05
-		monthly_county_control_growth_factor = 0.05
-	}
-}
-
-capua = {
-	county = c_caserta
-	barony = b_aversa
-	
-	character_modifier = {
-		defender_advantage = 5
-		diplomacy = 1
-	}
-}
-
 # Catholic
 
 seville = {
diff --git a/common/religion/religions/NEOW_pantheonic.txt b/common/religion/religions/NEOW_pantheonic.txt
index 6dad734a..b30e7df9 100644
--- a/common/religion/religions/NEOW_pantheonic.txt
+++ b/common/religion/religions/NEOW_pantheonic.txt
@@ -230,12 +230,13 @@
 
 			# religious_head = k_papal_state
 
+			#placeholder holy sites
 			holy_site = paris
 			holy_site = provence
 			holy_site = bordeaux
 			holy_site = rome
-			holy_site = grenoble
-			holy_site = athens
+			holy_site = kent
+			#holy_site = segrada_familia
 			
 			#Special Tolerance | placeholder
 			#doctrine = special_doctrine_ecumenical_christian
@@ -260,12 +261,13 @@
 
 			# religious_head = k_papal_state
 
-			holy_site = paris
-			holy_site = provence
-			holy_site = arras
+			#placeholder holy sites
+			holy_site = jerusalem
 			holy_site = rome
-			holy_site = grenoble
-			holy_site = athens
+			holy_site = cologne
+			holy_site = santiago
+			holy_site = kent
+			#holy_site = segrada_familia
 			
 			#Special Tolerance | placeholder
 			#doctrine = special_doctrine_ecumenical_christian
@@ -292,12 +294,14 @@
 			color = { 127 12 50 }
 			icon = communard
 			
-			holy_site = paris
-			holy_site = provence
-			holy_site = lyon
-			holy_site = berlin
-			holy_site = trier
-			holy_site = capua
+			# religious_head = k_papal_state
+			#placeholder holy sites
+			holy_site = jerusalem
+			holy_site = rome
+			holy_site = cologne
+			holy_site = santiago
+			holy_site = kent
+			#holy_site = segrada_familia
 			
 			#Special Tolerance | placeholder
 			#doctrine = special_doctrine_ecumenical_christian
diff --git a/common/succession_election/04_saxon_elective.txt b/common/succession_election/04_saxon_elective.txt
index 4f0332a9..425022ff 100644
--- a/common/succession_election/04_saxon_elective.txt
+++ b/common/succession_election/04_saxon_elective.txt
@@ -63,7 +63,7 @@ saxon_elective = { #Farmer Elective
 		add = {
 			type = title_dejure_vassals
 			limit = {
-				target_is_liege_or_above = scope:holder #All de jure vassals, no matter the tier, sub-vassals included.
+				is_vassal_of = scope:holder #All direct de jure vassals, no matter the tier.
 				is_adult = yes
 				NOT = { has_trait = incapable }
 			}
@@ -78,7 +78,7 @@ saxon_elective = { #Farmer Elective
 		add = {
 			type = holder_direct_vassals
 			limit = {
-				target_is_liege_or_above = scope:holder #All de jure vassals, no matter the tier, sub-vassals included.
+				is_vassal_of = scope:holder #All direct de jure vassals, no matter the tier.
 				is_adult = yes
 				NOT = { has_trait = incapable }
 			}
@@ -115,7 +115,7 @@ saxon_elective = { #Farmer Elective
 		add = {
 			type = title_dejure_vassals
 			limit = {
-				target_is_liege_or_above = scope:holder #All de jure vassals, no matter the tier, sub-vassals included.
+				is_vassal_of = scope:holder #Only Powerful, direct, de jure vassals are potential candidates.
 				feudal_elective_potential_landed_candidate_trigger = yes
 				government_has_flag = government_is_prepublic
 				OR = {
@@ -145,7 +145,7 @@ saxon_elective = { #Farmer Elective
 		add = {
 			type = holder_direct_vassals
 			limit = {
-				target_is_liege_or_above = scope:holder #All de jure vassals, no matter the tier, sub-vassals included.
+				is_vassal_of = scope:holder #Only Powerful, direct, de jure vassals are potential candidates.
 				government_has_flag = government_is_prepublic
 				OR = {
 					culture = {
@@ -162,7 +162,7 @@ saxon_elective = { #Farmer Elective
 			limit = {
 				OR = {
 					is_courtier_of = scope:holder
-					target_is_liege_or_above = scope:holder #All de jure vassals, no matter the tier, sub-vassals included.
+					is_vassal_of = scope:holder #All direct de jure vassals, no matter the tier.
 				}
 				OR = {
 					culture = {
@@ -242,7 +242,7 @@ urban_elective = { #Urban Elective
 		add = {
 			type = title_dejure_vassals
 			limit = {
-				target_is_liege_or_above = scope:holder #All de jure vassals, no matter the tier, sub-vassals included.
+				is_vassal_of = scope:holder #All direct de jure vassals, no matter the tier.
 				is_adult = yes
 				NOT = { has_trait = incapable }
 			}
@@ -257,7 +257,7 @@ urban_elective = { #Urban Elective
 		add = {
 			type = holder_direct_vassals
 			limit = {
-				target_is_liege_or_above = scope:holder #All de jure vassals, no matter the tier, sub-vassals included.
+				is_vassal_of = scope:holder #All direct de jure vassals, no matter the tier.
 				is_adult = yes
 				NOT = { has_trait = incapable }
 			}
@@ -294,7 +294,7 @@ urban_elective = { #Urban Elective
 		add = {
 			type = title_dejure_vassals
 			limit = {
-				target_is_liege_or_above = scope:holder #All de jure vassals, no matter the tier, sub-vassals included.
+				is_vassal_of = scope:holder #Only Powerful, direct, de jure vassals are potential candidates.
 				feudal_elective_potential_landed_candidate_trigger = yes
 				government_has_flag = government_is_urepublic
 				OR = {
@@ -324,7 +324,7 @@ urban_elective = { #Urban Elective
 		add = {
 			type = holder_direct_vassals
 			limit = {
-				target_is_liege_or_above = scope:holder #All de jure vassals, no matter the tier, sub-vassals included.
+				is_vassal_of = scope:holder #Only Powerful, direct, de jure vassals are potential candidates.
 				government_has_flag = government_is_urepublic
 				OR = {
 					culture = {
@@ -341,7 +341,7 @@ urban_elective = { #Urban Elective
 			limit = {
 				OR = {
 					is_courtier_of = scope:holder
-					target_is_liege_or_above = scope:holder #All de jure vassals, no matter the tier, sub-vassals included.
+					is_vassal_of = scope:holder #All direct de jure vassals, no matter the tier.
 				}
 				OR = {
 					culture = {
diff --git a/descriptor.mod b/descriptor.mod
index 78fd8aad..7b92963b 100644
--- a/descriptor.mod
+++ b/descriptor.mod
@@ -2,7 +2,7 @@ version="0.0.1"
 tags={
 	"Total Overhaul"
 }
-name="N3OW Dev"
+name="N3OW"
 replace_path="common/landed_titles"
 replace_path="common/religion/religions"
 replace_path="history/characters"
diff --git a/events/NEOW_dynamic_titles_events.txt b/events/NEOW_dynamic_titles_events.txt
index ad78e65d..85a5ee03 100644
--- a/events/NEOW_dynamic_titles_events.txt
+++ b/events/NEOW_dynamic_titles_events.txt
@@ -119,15 +119,4 @@ NEOW_dynamic_titles.0012 = {
 			set_color_from_title = title:d_ile_de_france
 		}
 	}
-}
-
-#Holder for various dynamic titles in the future, this is for "<capital> Union"s
-#NEOW_dynamic_titles.0013 = {
-#	hidden = yes
-#
-#	immediate = {
-#		title:e_france = {
-#			set_title_name_dynamic = capital_union_key
-#		}
-#	}
-#}
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/gfx/map/map_object_data/activities.txt b/gfx/map/map_object_data/activities.txt
index c5e23769..0c7e6825 100644
--- a/gfx/map/map_object_data/activities.txt
+++ b/gfx/map/map_object_data/activities.txt
@@ -12751,7 +12751,7 @@
 		}
 		{
 			id=2533
-			position={ 1516.819702 0.000000 2711.761719 }
+			position={ 1529.751099 0.000000 2732.711182 }
 			rotation={ -0.000000 -0.393849 -0.000000 0.919175 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -52141,7 +52141,7 @@
 		}
 		{
 			id=9773
-			position={ 1673.694458 0.000000 3337.175781 }
+			position={ 6404.000000 0.000000 2404.000000 }
 			rotation={ 0.000000 0.994552 0.000000 0.104239 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
diff --git a/gfx/map/map_object_data/building_locators.txt b/gfx/map/map_object_data/building_locators.txt
index c4c7a5fa..f86a538d 100644
--- a/gfx/map/map_object_data/building_locators.txt
+++ b/gfx/map/map_object_data/building_locators.txt
@@ -12709,7 +12709,7 @@
 		}
 		{
 			id=2533
-			position={ 1518.146240 0.000000 2706.135986 }
+			position={ 1531.077637 0.000000 2727.085449 }
 			rotation={ -0.000000 -0.643420 -0.000000 0.765513 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -52075,7 +52075,7 @@
 		}
 		{
 			id=9773
-			position={ 1674.379028 0.000000 3344.573242 }
+			position={ 6268.937500 0.000000 2215.756836 }
 			rotation={ 0.000000 0.994552 0.000000 0.104239 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
diff --git a/gfx/map/map_object_data/combat_locators.txt b/gfx/map/map_object_data/combat_locators.txt
index 4e5baf77..53120bee 100644
--- a/gfx/map/map_object_data/combat_locators.txt
+++ b/gfx/map/map_object_data/combat_locators.txt
@@ -14431,7 +14431,7 @@
 		}
 		{
 			id=2533
-			position={ 1519.803467 0.000000 2702.891846 }
+			position={ 1532.734863 0.000000 2723.841309 }
 			rotation={ -0.000000 0.676115 -0.000000 0.736796 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -56287,7 +56287,7 @@
 		}
 		{
 			id=9773
-			position={ 1679.180908 0.000000 3347.038574 }
+			position={ 6419.000000 0.000000 2394.000000 }
 			rotation={ 0.000000 -0.894427 0.000000 0.447214 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
diff --git a/gfx/map/map_object_data/player_stack_locators.txt b/gfx/map/map_object_data/player_stack_locators.txt
index 4e1c050e..f7d78c72 100644
--- a/gfx/map/map_object_data/player_stack_locators.txt
+++ b/gfx/map/map_object_data/player_stack_locators.txt
@@ -14431,7 +14431,7 @@
 		}
 		{
 			id=2533
-			position={ 1526.068604 0.000000 2707.050537 }
+			position={ 1539.000000 0.000000 2728.000000 }
 			rotation={ -0.000000 -0.216440 -0.000000 0.976296 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -56287,7 +56287,7 @@
 		}
 		{
 			id=9773
-			position={ 1677.752319 0.000000 3346.013428 }
+			position={ 6410.000000 0.000000 2405.000000 }
 			rotation={ 0.000000 0.994552 0.000000 0.104239 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
diff --git a/gfx/map/map_object_data/siege_locators.txt b/gfx/map/map_object_data/siege_locators.txt
index 2b928167..f7fdb524 100644
--- a/gfx/map/map_object_data/siege_locators.txt
+++ b/gfx/map/map_object_data/siege_locators.txt
@@ -12757,7 +12757,7 @@
 		}
 		{
 			id=2533
-			position={ 1524.068604 0.000000 2700.050537 }
+			position={ 1537.000000 0.000000 2721.000000 }
 			rotation={ 0.000000 0.923880 0.000000 -0.382684 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -53317,7 +53317,7 @@
 		}
 		{
 			id=9773
-			position={ 1674.646240 0.000000 3354.322754 }
+			position={ 6412.000000 0.000000 2410.000000 }
 			rotation={ 0.000000 -0.049814 0.000000 0.998759 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
diff --git a/gfx/map/map_object_data/special_building_locators.txt b/gfx/map/map_object_data/special_building_locators.txt
index 5810a7a6..a368f932 100644
--- a/gfx/map/map_object_data/special_building_locators.txt
+++ b/gfx/map/map_object_data/special_building_locators.txt
@@ -52003,7 +52003,7 @@
 		}
 		{
 			id=9769
-			position={ 1656.496582 0.000000 3322.191162 }
+			position={ 6419.000000 0.000000 2452.000000 }
 			rotation={ -0.000000 -0.822384 -0.000000 -0.568933 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
diff --git a/gfx/map/surround_map/surround_mask.dds b/gfx/map/surround_map/surround_mask.dds
index ed2c6cfc..fb25a8dd 100755
--- a/gfx/map/surround_map/surround_mask.dds
+++ b/gfx/map/surround_map/surround_mask.dds
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:90b041c2cf0036c7886ca250cf99587bacb14cd070b9a6adab9d75f642397c53
-size 11184976
+oid sha256:8f7dbedfb0c03f572c6b1ef1820eb264ee254b1ab03efa5759a9c63081fe974d
+size 33554560
diff --git a/history/provinces/e_iberia.txt b/history/provinces/e_iberia.txt
index ed9b021e..7a664902 100644
--- a/history/provinces/e_iberia.txt
+++ b/history/provinces/e_iberia.txt
@@ -1422,7 +1422,7 @@
 ##d_canarias
 ###c_canarias
 8713 = {
-	culture = canarian
+	culture = atlantannach
 	religion = iberian
 	holding = castle_holding
 }
@@ -1431,7 +1431,7 @@
 }
 ###c_fuerteventura
 8714 = {
-	culture = canarian
+	culture = atlantannach
 	religion = iberian
 	holding = castle_holding
 }
diff --git a/localization/english/replace/culture/zz_NEOW_cultures_l_english.yml b/localization/english/replace/culture/zz_NEOW_cultures_l_english.yml
index 841c03cb..3bcc22e0 100644
--- a/localization/english/replace/culture/zz_NEOW_cultures_l_english.yml
+++ b/localization/english/replace/culture/zz_NEOW_cultures_l_english.yml
@@ -184,9 +184,6 @@
  NEOW_andalusian:0 "Andalûh"
  NEOW_andalusian_collective_noun:0 "Andalusian"
  NEOW_andalusian_prefix:0 "Andaluso"
- canarian:0 "Canario"
- canarian_collective_noun:0 "Canario"
- canarian_prefix:0 "Canario"
  andorra:0 "Andorrà"
  andorra_collective_noun:0 "Andorran"
  andorra_prefix:0 "Andorrano"
diff --git a/localization/english/replace/religion/zz_NEOW_holy_sites_l_english.yml b/localization/english/replace/religion/zz_NEOW_holy_sites_l_english.yml
index 90dbe045..9ccefefa 100644
--- a/localization/english/replace/religion/zz_NEOW_holy_sites_l_english.yml
+++ b/localization/english/replace/religion/zz_NEOW_holy_sites_l_english.yml
@@ -28,14 +28,14 @@
  holy_site_verdun_name:0 "Verdun"
  holy_site_verdun_effect_name:0 "From [holy_site|E] #weak ($holy_site_verdun_name$)#!"
 
-#PANTHEONIC
+#ORLEANIST
  holy_site_reims_name:0 "Reims"
  holy_site_reims_effect_name:0 "From [holy_site|E] #weak ($holy_site_reims_name$)#!"
  
  holy_site_orleans_name:0 "Orleans"
  holy_site_orleans_effect_name:0 "From [holy_site|E] #weak ($holy_site_orleans_name$)#!"
  
- holy_site_domremy_name:0 "Domrémy"
+ holy_site_domremy_name:0 "Domremy"
  holy_site_domremy_effect_name:0 "From [holy_site|E] #weak ($holy_site_domremy_name$)#!"
  
  holy_site_rouen_name:0 "Rouen"
@@ -44,21 +44,6 @@
  holy_site_avignon_name:0 "Avignon"
  holy_site_avignon_effect_name:0 "From [holy_site|E] #weak ($holy_site_avignon_name$)#!"
  
- holy_site_grenoble_name:0 "Grenoble"
- holy_site_grenoble_effect_name:0 "From [holy_site|E] #weak ($holy_site_grenoble_name$)#!"
- 
- holy_site_arras_name:0 "Arras"
- holy_site_arras_effect_name:0 "From [holy_site|E] #weak ($holy_site_arras_name$)#!"
- 
- holy_site_berlin_name:0 "Berlin"
- holy_site_berlin_effect_name:0 "From [holy_site|E] #weak ($holy_site_berlin_name$)#!"
- 
- holy_site_trier_name:0 "Trier"
- holy_site_trier_effect_name:0 "From [holy_site|E] #weak ($holy_site_trier_name$)#!"
- 
- holy_site_capua_name:0 "Capua"
- holy_site_capua_effect_name:0 "From [holy_site|E] #weak ($holy_site_capua_name$)#!"
- 
 #CATHOLIC
  holy_site_lourdes_name:0 "Lourdes"
  holy_site_lourdes_effect_name:0 "From [holy_site|E] #weak ($holy_site_lourdes_name$)#!"
@@ -259,6 +244,4 @@
  holy_site_kyffhauser_name:0 "Kyffhauser"		
  holy_site_leipzig_name:0 "Leipzig"
  holy_site_bremen_name:0 "Bremen"	
- holy_site_neuschwanstein_name:0 "Neuschwanstein"
- 
- 
\ No newline at end of file
+ holy_site_neuschwanstein_name:0 "Neuschwanstein"
\ No newline at end of file
diff --git a/localization/english/replace/titles_l_english.yml b/localization/english/replace/titles_l_english.yml
index 26689581..79332825 100644
--- a/localization/english/replace/titles_l_english.yml
+++ b/localization/english/replace/titles_l_english.yml
@@ -7015,7 +7015,6 @@
  b_licata:0 "Licata"
  b_lice:0 "Lice"
  b_lichtberg:0 "Rohrbach"
- b_lichtenberg:0 "Lichtenberg"
  b_lichtenfels:0 "Lichtenfels"
  b_lichtensteig:0 "Lichtensteig"
  b_lida:0 "Lida"
@@ -8638,7 +8637,6 @@
  b_panjway:0 "Panjway"
  b_pankak:0 "Pankak"
  b_pankot:0 "Pankot"
- b_pankow:0 "Pankow"
  b_panna:0 "Panna"
  b_pannagallu:0 "Pannagallu"
  b_panticapea:0 "Panticapea"
@@ -18183,7 +18181,6 @@
  b_inzer:0 "Inzer"
  b_bielaya:0 "Bielaya"
  b_prigoro_tabynsk:0 "Prigoro Tabynsk"
- b_prignitz:0 "Prignitz"
  b_uiska:0 "Uiska"
  b_yumanova:0 "Yumanova"
  b_ust-katav:0 "Ust-Katav"
@@ -25529,9 +25526,4 @@
  c_gibraltar:0 "Gibraltar"
  c_gibraltar_adj:0 "Gibraltarian" 
  d_gibraltar:0 "Gibraltar"
- d_gibraltar_adj:0 "Gibraltarian"  
-
-
- ### Event stuff related to titles
-
- capital_union_key:0 "[Concatenate(ROOT.Char.GetCapitalLocation.GetNameNoTooltip, ' Union')]"
\ No newline at end of file
+ d_gibraltar_adj:0 "Gibraltarian"  
\ No newline at end of file
diff --git a/map_data/adjacencies.csv b/map_data/adjacencies.csv
index a3232832..b798eb5d 100644
--- a/map_data/adjacencies.csv
+++ b/map_data/adjacencies.csv
@@ -16,22 +16,22 @@ From;To;Type;Through;start_x;start_y;stop_x;stop_y;Comment
 1707;8;sea;693;820;3869;830;3881;Thurso-Kirkwall
 1711;1692;sea;696;680;3753;686;3751;Glenfinnan-Skye
 #IBERIA
-1748;1840;river_large;3250;536;2241;-1;-1;Faor-Huelva
-1834;1835;river_large;3252;570;2347;-1;-1;Merida-Badajoz
-9769;4682;sea;954;657;2155;658;2142;Gibraltar-Sabta 
-1984;1995;river_large;3253;687;2270;-1;-1;Puente Genil-Cordoba
-1981;1841;river_large;3253;619;2244;-1;-1;Seville-Camas
+1748;1839;river_large;3250;536;2241;-1;-1;Faor-Ayamonte
+1833;1835;river_large;3252;570;2347;-1;-1;Zalaca-Badajoz
+1845;4682;sea;954;657;2155;658;2142;Algeciras-Sabta
+1979;1995;river_large;3253;687;2270;-1;-1;Cabra-Cordoba
+1981;1993;river_large;3253;619;2244;-1;-1;Seville-Triana
 #FRANCE
-2016;2066;river_large;3247;1202;2655;-1;-1;Nimes-Arles
+2016;2017;river_large;3247;1202;2655;-1;-1;Nimes-Arles
 2142;2144;river_large;3224;901;2785;-1;-1;Bordeaux-Blaye
-2261;2268;river_large;3227;922;2964;-1;-1;Saumur-Bauge
+2261;2267;river_large;3227;922;2964;-1;-1;Saumur-Angers
 2175;2179;river_large;3234;992;3130;-1;-1;Harcourt-Rouen
 2151;2152;river_large;3226;-1;-1;-1;-1;Rais-Nantes
 2332;2181;river_large;3236;1034;3089;-1;-1;Montfort-Mantes
 2333;2357;river_large;3236;-1;-1;-1;-1;Paris-Saint-Denis
 #GERMANY
 2113;2401;sea;3230;1190;3307;1185;3299;Bergen op Zoom-Brielle
-2403;2401;sea;3230;1203;3306;1209;3307;Rotterdam-Brielle
+2402;2401;sea;3230;1203;3306;1209;3307;Dort-Brielle
 2425;2103;river_large;3231;1271;3307;-1;-1;Tiel-Nijmegen
 2101;2677;river_large;3231;1327;3274;-1;-1;Moers-Essen
 2407;2412;sea;973;1237;3405;1244;3415;Aalkmar-Wadeilannen
@@ -40,12 +40,12 @@ From;To;Type;Through;start_x;start_y;stop_x;stop_y;Comment
 2814;2899;river_large;3239;1601;3379;-1;-1;Havelberg-Weben
 #ITALY
 2489;2491;river_large;3245;1513;2746;-1;-1;Roncaglia-Cremona
-2497;2534;river_large;3244;1549;2744;-1;-1;Mantua-Reggio Emilia
-2525;2526;river_large;3243;1610;2737;-1;-1;Rovigo-Codigoro
+2497;2530;river_large;3244;1549;2744;-1;-1;Mantua-Guastalla
+2525;2527;river_large;3243;1610;2737;-1;-1;Rovigo-Ferrara
 2627;2633;sea;8653;1864;2218;1855;2213;Reggio-Messina
 2650;13272;sea;8637;1477;2460;1482;2451;Bonifacio-Arzachena
 #SCANDINAVIA
-55;221;sea;1001;1518;3690;1517;3680;Lindholm-Holstebro
+55;81;sea;1001;1518;3690;1517;3680;Lindholm-Aalborg
 227;228;sea;999;1510;3577;1514;3573;Taulov-Middelfart
 64;67;sea;999;1618;3534;1617;3526;Naestved-Nykobing
 65;69;sea;999;1559;3562;1583;3567;Odense-Slagelse
@@ -53,9 +53,9 @@ From;To;Type;Through;start_x;start_y;stop_x;stop_y;Comment
 67;68;sea;999;1606;3510;1614;3511;Nykobing-Nakskov
 73;433;sea;999;1641;3612;1647;3618;Helsingborg-Helsingora
 180;216;sea;1005;2016;3910;1972;3894;Rauma-Sund
-270;273;sea;986;1541;4130;1551;4128;Nidaros-Forsen
+270;272;sea;986;1541;4130;1551;4128;Nidaros-Hitrar
 307;314;sea;1003;1828;3658;1834;3656;Kalmar-Borgholm
-341;217;sea;1005;1910;3888;1943;3882;Sigtuna-Jomala
+344;217;sea;1005;1910;3888;1943;3882;Osthammar-Jomala
 341;336;sea;959;1900;3836;1900;3827;Sigtuna-Tälje
 257;256;river_large;8559;-1;-1;-1;-1;Mithrhordaland-Sunnhordaland
 262;263;river_large;8558;-1;-1;-1;-1;Stolsheimen-Fjarland
diff --git a/map_data/provinces.png b/map_data/provinces.png
index 4b91995b..5d61c2e2 100644
--- a/map_data/provinces.png
+++ b/map_data/provinces.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:31f46555ebe8b586f662c3c5a0a723db8321ce9719e85e8751922a57b0c6c454
-size 922153
+oid sha256:09cbff213b1057bf5d782aec2fb8d6f538b4962d4986c83e7e0497e75972f7da
+size 3438065