From 237d3f4c78cfc4d5fc1066d34b2a6dc0ef05a6d3 Mon Sep 17 00:00:00 2001
From: edwardtheelbowhigh
 <73761109+edwardtheelbowhigh@users.noreply.github.com>
Date: Wed, 7 Jan 2026 17:30:33 +0000
Subject: [PATCH] Spanish religion stuff, Rhine COnfederation

---
 .../coat_of_arms/01_landed_titles.txt         |  80 ++++++--
 .../coat_of_arms/NEOW_dynasties.txt           | 189 ++++++++++--------
 .../coat_of_arms/NEOW_landed_titles.txt       | 105 +++++++++-
 common/landed_titles/iberia.txt               | 123 ++++++------
 common/landed_titles/religious_titles.txt     |  18 ++
 common/on_action/game_start.txt               |  20 +-
 common/religion/holy_sites/00_holy_sites.txt  |   1 +
 common/religion/religions/NEOW_catholic.txt   |   5 +-
 history/characters/NEOW_e_hispania.txt        |  99 ++++++---
 history/provinces/e_iberia.txt                |  18 +-
 history/titles/k_andalusia.txt                |  43 ++--
 history/titles/k_andorra.txt                  |  23 ---
 history/titles/k_aragon.txt                   |  23 ++-
 history/titles/k_castille.txt                 |  13 +-
 history/titles/k_france.txt                   |  14 +-
 history/titles/k_navarra.txt                  |   3 +-
 history/titles/k_portugal.txt                 |  14 +-
 history/titles/k_relgious_heads.txt           |  71 ++++++-
 history/titles/k_rhineland.txt                |   5 +-
 history/titles/k_spanish_galicia.txt          |  35 ++--
 history/titles/k_switzerland.txt              |  28 +--
 localization/english/titles_l_english.yml     |   6 +-
 22 files changed, 608 insertions(+), 328 deletions(-)

diff --git a/common/coat_of_arms/coat_of_arms/01_landed_titles.txt b/common/coat_of_arms/coat_of_arms/01_landed_titles.txt
index 5775cc60..3c70f0f0 100644
--- a/common/coat_of_arms/coat_of_arms/01_landed_titles.txt
+++ b/common/coat_of_arms/coat_of_arms/01_landed_titles.txt
@@ -5460,13 +5460,13 @@ d_lombard_band = {
 	}
 }
 d_navarra = {
-	pattern = "pattern_solid.dds"
-	color1 = "red"
-	color2 = "yellow"
-	colored_emblem = {
-		texture = "ce_chains_no_border.dds"
-		color1 = "yellow"
-		color2 = "yellow"
+	pattern="pattern_solid.dds"
+	color1=red
+	color2=yellow
+	colored_emblem={
+		color1=yellow
+		color2=green
+		texture="ce_chains.dds"
 	}
 }
 d_sardinia = {
@@ -13241,15 +13241,65 @@ d_jamtland = {
 }
 
 d_galicia = {
-	pattern = "pattern_solid.dds"
-	color1 = "blue"
-	color2 = "yellow"
-	colored_emblem = {
-		texture = "ce_chalice.dds"
-		color1 = "yellow"
-		color2 = "yellow"
-		instance = { position = { 0.5 0.45 } scale = { 1.0 1.0 }  }
+	pattern="pattern_solid.dds"
+	color1=blue
+	color2=white
+	colored_emblem={
+		color1=white
+		texture="ce_cross_09.dds"
+		instance={
+			position={ 0.500000 0.140000 }
+			scale={ 0.220000 0.220000 }
+		}
+		instance={
+			position={ 0.2500000 0.20000 }
+			scale={ 0.220000 0.220000 }
+		}
+		instance={
+			position={ 0.7500000 0.20000 }
+			scale={ 0.220000 0.220000 }
+		}
+		instance={
+			position={ 0.2500000 0.45000 }
+			scale={ 0.220000 0.220000 }
+		}
+		instance={
+			position={ 0.7500000 0.45000 }
+			scale={ 0.220000 0.220000 }
+		}
+		instance={
+			position={ 0.2500000 0.70000 }
+			scale={ 0.220000 0.220000 }
+		}
+		instance={
+			position={ 0.7500000 0.70000 }
+			scale={ 0.220000 0.220000 }
+		}
 	}
+
+	colored_emblem={
+		color1=yellow
+		color2=yellow
+		texture="ce_chalice.dds"
+		instance={
+			position={ 0.500000 0.670000 }
+			scale={ 0.610000 0.610000 }
+			depth=2.010000
+		}
+
+	}
+
+	colored_emblem={
+		color1=white
+		texture="ce_circle.dds"
+		instance={
+			position={ 0.500000 0.390000 }
+			scale={ 0.310000 0.310000 }
+			depth=1.010000
+		}
+
+	}
+
 }
 
 d_valencia = {
diff --git a/common/coat_of_arms/coat_of_arms/NEOW_dynasties.txt b/common/coat_of_arms/coat_of_arms/NEOW_dynasties.txt
index 2c27b0c5..006d08ff 100644
--- a/common/coat_of_arms/coat_of_arms/NEOW_dynasties.txt
+++ b/common/coat_of_arms/coat_of_arms/NEOW_dynasties.txt
@@ -6553,6 +6553,35 @@ house_bourbon_naundorff={
 
 }
 
+bourbon_dynasty={
+	pattern="pattern_horizontal_split_01.dds"
+	color1=blue
+	color2=blue
+	color3=red
+	colored_emblem={
+		color1=yellow
+		texture="ce_fleur.dds"
+		instance={
+			position={ 0.500000 0.700000 }
+			scale={ 0.500000 0.500000 }
+		}
+
+		instance={
+			position={ 0.750000 0.300000 }
+			scale={ 0.500000 0.500000 }
+			depth=1.010000
+		}
+
+		instance={
+			position={ 0.250000 0.300000 }
+			scale={ 0.500000 0.500000 }
+			depth=2.010000
+		}
+
+	}
+
+}
+
 
 house_bourbon_anjou={
 	pattern="pattern__solid_designer.dds"
@@ -10221,103 +10250,27 @@ dias_dynasty={
 }
 
 house_jimena = { 
-	pattern="pattern_checkers_02.dds"
-	color1=yellow
-	color2=blue_light
-	color3=red
+	pattern="pattern_horizontal_split_01.dds"
+	color1=blue_light
+	color2=yellow
+	color3=blue
 	colored_emblem={
 		color1=black
 		color2=black
 		color3=white
 		texture="ce_eagle_iberia.dds"
 		instance={
-			position={ 0.250000 0.750000 }
-			scale={ 0.500000 0.500000 }
-		}
-
-		instance={
-			position={ 0.750000 0.250000 }
-			scale={ 0.500000 0.500000 }
-			depth=1.010000
-		}
-
-	}
-
-	colored_emblem={
-		color1=blue_light
-		color2=yellow
-		texture="ce_bendy_08.dds"
-		instance={
-			position={ 0.750000 0.750000 }
-			scale={ 0.500000 0.500000 }
-			depth=2.010000
-		}
-
-	}
-
-	colored_emblem={
-		color1=blue_light
-		color2=yellow
-		texture="ce_bendy_10.dds"
-		instance={
-			position={ 0.250000 0.250000 }
-			scale={ 0.500000 0.500000 }
-			depth=3.010000
-		}
-
-	}
-
-}
-
-
-house_jimena_zaragoza = {
-	pattern="pattern_checkers_02.dds"
-	color1=yellow
-	color2=blue_light
-	color3=black
-	colored_emblem={
-		color1=yellow
-		color2=yellow
-		color3=white
-		texture="ce_lion_rampant_wide_stance_crown.dds"
-		instance={
-			position={ 0.240000 0.800000 }
 			scale={ 0.500000 0.500000 }
 		}
 
 	}
 
 	colored_emblem={
-		color1=black
-		color2=black
-		color3=white
-		texture="ce_eagle_iberia.dds"
+		color1=yellow_light
+		color2=yellow_light
+		texture="ce_shield_02.dds"
 		instance={
-			position={ 0.750000 0.250000 }
-			scale={ 0.500000 0.500000 }
-			depth=2.010000
-		}
-
-	}
-
-	colored_emblem={
-		color1=blue_light
-		color2=yellow
-		texture="ce_bendy_08.dds"
-		instance={
-			position={ 0.250000 0.250000 }
-			scale={ 0.500000 0.500000 }
-			depth=4.010000
-		}
-
-	}
-
-	colored_emblem={
-		color1=red
-		texture="ce_block_02.dds"
-		instance={
-			position={ 0.250000 0.750000 }
-			scale={ 0.500000 0.500000 }
+			scale={ 0.670000 0.670000 }
 			depth=1.010000
 		}
 
@@ -10328,13 +10281,77 @@ house_jimena_zaragoza = {
 		color2=blue_light
 		texture="ce_bendy_08.dds"
 		instance={
-			position={ 0.750000 0.750000 }
-			scale={ 0.500000 0.500000 }
+			depth=2.010000
+		}
+
+	}
+
+}
+
+
+house_jimena_zaragoza = {
+	pattern="pattern_vertical_split_01.dds"
+	color1=red
+	color2=yellow
+	color3=red
+	colored_emblem={
+		color1=red
+		color2=red
+		texture="ce_shield_02.dds"
+		mask = { 1 0 0 }
+		instance={
+			scale={ 0.670000 0.670000 }
+			depth=2.010000
+		}
+
+	}
+
+	colored_emblem={
+		color1=black
+		color2=black
+		color3=white
+		texture="ce_eagle_iberia.dds"
+		instance={
+			position={ 0.640000 0.500000 }
+			scale={ 0.240000 0.510000 }
+		}
+
+	}
+
+	colored_emblem={
+		color1=yellow
+		color2=yellow_light
+		texture="ce_lion_rampant_crown.dds"
+		instance={
+			position={ 0.360000 0.480000 }
+			scale={ 0.240000 0.510000 }
+			depth=1.010000
+		}
+
+	}
+
+	colored_emblem={
+		color1=yellow_light
+		color2=yellow_light
+		texture="ce_shield_02.dds"
+		mask = { 0 2 0 }		
+		instance={
+			scale={ 0.670000 0.670000 }
 			depth=3.010000
 		}
 
 	}
 
+	colored_emblem={
+		color1=yellow
+		color2=blue_light
+		texture="ce_bendy_08.dds"
+		instance={
+			depth=4.010000
+		}
+
+	}
+
 }
 
 quixano_dynasty={
diff --git a/common/coat_of_arms/coat_of_arms/NEOW_landed_titles.txt b/common/coat_of_arms/coat_of_arms/NEOW_landed_titles.txt
index 67b2e3ea..b5b11a8f 100644
--- a/common/coat_of_arms/coat_of_arms/NEOW_landed_titles.txt
+++ b/common/coat_of_arms/coat_of_arms/NEOW_landed_titles.txt
@@ -685,7 +685,7 @@ k_san_marino = {
 }
 
 
-k_andorra = {
+d_andorra = {
 	pattern="pattern_checkers_02.dds"
 	color1=yellow_light
 	color2=red
@@ -3962,23 +3962,39 @@ d_solent={
 
 
 d_la_mancha={
-	pattern="pattern_vertical_split_01.dds"
+	pattern="pattern_checkers_02.dds"
 	color1=red
-	color2=white
-	color3=black
+	color2=black
+	color3=red
 	colored_emblem={
-		color1=yellow
-		color2=blue
-		texture="ce_castle.dds"
+		color1=white
+		texture="ce_block_02.dds"
 		instance={
-			position={ 0.290000 0.450000 }
-			scale={ 0.480000 0.480000 }
+			position={ 1.000000 1.000000 }
+			depth=2.010000
 		}
 
 	}
 
+	colored_emblem={
+		color1=blue
+		texture="ce_block_02.dds"
+		instance={
+			position={ 0.000000 1.000000 }
+			depth=1.010000
+		}
+
+	}
+
+	colored_emblem={
+		color1=yellow
+		texture="ce_star_05.dds"
+	}
+
 }
 
+
+
 k_gondor={
 	custom=yes
 	pattern="pattern__solid_de	signer.dds"
@@ -5258,6 +5274,77 @@ d_anglican_hof={
 
 }
 
+d_iberian_hof ={
+	pattern="pattern_shield_01.dds"
+	color1=yellow
+	color2=black
+	color3=green
+	colored_emblem={
+		color1=yellow
+		color2=black
+		texture="ce_checkers_08.dds"
+		instance={
+			position={ 0.060000 0.500000 }
+			depth=5.010000
+		}
+
+		instance={
+			position={ 0.560000 0.500000 }
+			depth=6.010000
+		}
+
+	}
+
+	colored_emblem={
+		color1=grey
+		texture="ce_circle_mask.dds"
+		instance={
+			position={ 0.500000 0.160000 }
+			scale={ 0.100000 0.100000 }
+			depth=3.010000
+		}
+
+		instance={
+			position={ 0.490000 0.470000 }
+			scale={ 0.380000 0.610000 }
+			depth=4.010000
+		}
+
+	}
+
+	colored_emblem={
+		color1=white
+		texture="ce_mary.dds"
+		instance={
+			position={ 0.480000 0.460000 }
+			scale={ 0.790000 0.790000 }
+		}
+
+	}
+
+	colored_emblem={
+		color1=grey
+		texture="ce_block_02.dds"
+		instance={
+			position={ 0.500000 0.760000 }
+			scale={ 0.370000 0.280000 }
+			depth=2.010000
+		}
+
+	}
+
+	colored_emblem={
+		color1=white
+		texture="ce_jesus_throne.dds"
+		instance={
+			depth=1.010000
+		}
+
+	}
+
+}
+
+
 d_gibraltar={
 	pattern="pattern_horizontal_split_01.dds"
 	color1=white
diff --git a/common/landed_titles/iberia.txt b/common/landed_titles/iberia.txt
index 434c8100..454adeba 100644
--- a/common/landed_titles/iberia.txt
+++ b/common/landed_titles/iberia.txt
@@ -36,53 +36,20 @@ e_iberia = {
 		}
 	}
 
-    k_sevillian_state = {
-        color = { 113 200 226 }
-
-		d_sevillian_state = {
-        	color = { 113 200 226 }
-
-			c_sevilla = {
-				color = { 150 218 21 }
-				#can_be_named_after_dynasty = no
-
-				cultural_names = {
-					name_list_bedouin = cn_isbiliyyah
-					name_list_baranis = cn_isbiliyyah
-					name_list_butr = cn_isbiliyyah
-					name_list_zaghawa = cn_isbiliyyah
-					name_list_levantine = cn_isbiliyyah
-					name_list_egyptian = cn_isbiliyyah
-					name_list_maghrebi = cn_isbiliyyah
-					name_list_andalusian = cn_isbiliyyah
-					name_list_yemeni = cn_isbiliyyah
-				}
-
-				b_sevilla = {
-					province = 1981
-
-					color = { 150 218 21 }
-
-					cultural_names = {
-						name_list_bedouin = cn_isbiliyyah
-						name_list_baranis = cn_isbiliyyah
-						name_list_butr = cn_isbiliyyah
-						name_list_zaghawa = cn_isbiliyyah
-						name_list_levantine = cn_isbiliyyah
-						name_list_egyptian = cn_isbiliyyah
-						name_list_maghrebi = cn_isbiliyyah
-						name_list_andalusian = cn_isbiliyyah
-						name_list_yemeni = cn_isbiliyyah
-					}
-				}
-			}
-		}
-    }
+#  k_sevillian_state = {
+#       color = { 113 200 226 }
+#
+#		d_sevillian_state = {
+#       	color = { 113 200 226 }
+#
+#
+#		}
+#    }
 
 	k_andalusia = {
 		color = { 31 138 40 }
 
-		capital = c_granada # Granada
+		capital = c_sevilla # Granada
 		#can_be_named_after_dynasty = no
 
 		cultural_names = {
@@ -446,7 +413,7 @@ e_iberia = {
 		d_sevilla = {
 			color = { 150 218 21 }
 
-			capital = c_cadiz # Sevilla
+			capital = c_sevilla # Sevilla
 			#can_be_named_after_dynasty = no
 
 			cultural_names = {
@@ -460,36 +427,65 @@ e_iberia = {
 				name_list_andalusian = cn_isbiliyyah
 				name_list_yemeni = cn_isbiliyyah
 			}
-
-			c_almonte = {
+			c_sevilla = {
 				color = { 150 218 21 }
 				#can_be_named_after_dynasty = no
 
-				b_triana = { 
-					province = 1993
+				cultural_names = {
+					name_list_bedouin = cn_isbiliyyah
+					name_list_baranis = cn_isbiliyyah
+					name_list_butr = cn_isbiliyyah
+					name_list_zaghawa = cn_isbiliyyah
+					name_list_levantine = cn_isbiliyyah
+					name_list_egyptian = cn_isbiliyyah
+					name_list_maghrebi = cn_isbiliyyah
+					name_list_andalusian = cn_isbiliyyah
+					name_list_yemeni = cn_isbiliyyah
+				}
+
+				b_sevilla = {
+					province = 1981
 
 					color = { 150 218 21 }
-				}
+
+					cultural_names = {
+						name_list_bedouin = cn_isbiliyyah
+						name_list_baranis = cn_isbiliyyah
+						name_list_butr = cn_isbiliyyah
+						name_list_zaghawa = cn_isbiliyyah
+						name_list_levantine = cn_isbiliyyah
+						name_list_egyptian = cn_isbiliyyah
+						name_list_maghrebi = cn_isbiliyyah
+						name_list_andalusian = cn_isbiliyyah
+						name_list_yemeni = cn_isbiliyyah
+					}
+				}	
 				b_almonte = {
 					province = 1841
 
 					color = { 150 218 21 }
 				}
-				b_carmona = {
-					province = 1980
-
-					color = { 150 218 21 }
-				}
 				b_cantillana = {
 					province = 1994
 
 					color = { 60 180 12 }
 				}
+
+				b_triana = { 
+					province = 1993
+
+					color = { 150 218 21 }
+				}			
+				b_carmona = {
+					province = 1980
+
+					color = { 150 218 21 }
+				}
 				b_moron = {
 					province = 1983
 
 					color = { 130 175 0 }
-				}
+				}				
 			}
 
 			c_cadiz = {
@@ -641,7 +637,7 @@ e_iberia = {
 		d_castilla = {
 			color = { 242 196 12 }
 
-			capital = c_burgos # Burgos
+			capital = c_valladolid # Burgos
 			#can_be_named_after_dynasty = no
 
 			cultural_names = {
@@ -1009,7 +1005,7 @@ e_iberia = {
 		d_toledo = {
 			color = { 204 139 20 }
 
-			capital = c_toledo # Toledo
+			capital = c_madrid # Toledo
 			#can_be_named_after_dynasty = no
 
 			cultural_names = {
@@ -1216,7 +1212,7 @@ e_iberia = {
 		d_la_mancha = {
 			color = { 229 215 57 }
 
-			capital = c_almander # placeholder, figure out what to put it as
+			capital = c_alarcon
 			#can_be_named_after_dynasty = no
 
 			c_calatrava = {
@@ -2142,12 +2138,6 @@ e_iberia = {
 				}
 			}
 		}
-	}
-	k_andorra = {
-		color = { 191 160 9 }
-
-		capital = c_andorra # Andorra
-		#can_be_named_after_dynasty = no
 		d_andorra = {
 			color = { 178 150 8 }
 
@@ -2902,6 +2892,9 @@ e_iberia = {
 
 					color = { 155 245 70 }
 				}
+			}
+			c_moura = {
+				color = { 35 71 35 }			
 				b_moura = {
 					province = 1837
 
@@ -2912,7 +2905,7 @@ e_iberia = {
 
 					color = { 130 180 25 }
 				}
-			}
+			}	
 			c_alto_alentejo = {
 				color = { 22 76 22 }
 
diff --git a/common/landed_titles/religious_titles.txt b/common/landed_titles/religious_titles.txt
index a614b226..6ebf1bdd 100644
--- a/common/landed_titles/religious_titles.txt
+++ b/common/landed_titles/religious_titles.txt
@@ -130,6 +130,24 @@ d_lutheran_hof  = {
 	de_jure_drift_disabled = yes
 }	
 
+d_iberian_hof = {
+	color = { 51 229 76 }
+	definite_form = yes
+	ruler_uses_title_name = no
+	landless = yes
+
+	capital = c_skane
+
+	ai_primary_priority = {
+		add = @always_primary_score
+	}
+
+	destroy_if_invalid_heir = yes
+	no_automatic_claims = yes
+	always_follows_primary_heir = yes
+	de_jure_drift_disabled = yes
+}	
+
 
 k_fashion = { # Kingdom of Fashion from Establish a New Fashion at Court decision
 	color = { 140 45 165 }
diff --git a/common/on_action/game_start.txt b/common/on_action/game_start.txt
index 07ee6388..4053fc84 100644
--- a/common/on_action/game_start.txt
+++ b/common/on_action/game_start.txt
@@ -45,19 +45,14 @@ on_game_start = {
 				title:e_benelux = { set_coa = e_lotharingia }
 			}
 		}
-		title:c_genoa.holder = { 
+		title:d_piedmonte.holder = { 
 			create_confederation = {
 				name = holy_lombard_league
 			}
 			scope:new_confederation = {
-				add_confederation_member = title:c_piacenza.holder 
 				add_confederation_member = title:c_lombardia.holder 
 				add_confederation_member = title:c_cuneo.holder 
-				add_confederation_member = title:d_piedmonte.holder 
-				add_confederation_member = title:c_monferrato.holder 
-				add_confederation_member = title:d_lombardia.holder 
-				add_confederation_member = title:c_pavia.holder 
-				add_confederation_member = title:c_luni.holder 
+				add_confederation_member = title:c_monferrato.holder   
 			}
 		}
 		title:d_york.holder = { 
@@ -87,7 +82,16 @@ on_game_start = {
 				add_confederation_member = title:c_fermanagh.holder 
 				add_confederation_member = title:c_derry.holder 
 			}
-		}			
+		}		
+		title:c_frankfurt.holder = { 
+			create_confederation = {
+				name = rhine_confederacy
+			}
+			scope:new_confederation = {
+				add_confederation_member = title:d_palatinate.holder 
+				add_confederation_member = title:d_trier.holder 
+			}
+		}		
 		# Chinese Song-fashion
 		if = {
 			limit = {
diff --git a/common/religion/holy_sites/00_holy_sites.txt b/common/religion/holy_sites/00_holy_sites.txt
index 97006be6..531f6cfb 100644
--- a/common/religion/holy_sites/00_holy_sites.txt
+++ b/common/religion/holy_sites/00_holy_sites.txt
@@ -408,6 +408,7 @@ lisieux = {
 
 santiago = {
 	county = c_coruna
+	barony = b_santiago
 	
 	character_modifier = {
 		name = holy_site_santiago_effect_name
diff --git a/common/religion/religions/NEOW_catholic.txt b/common/religion/religions/NEOW_catholic.txt
index aed787ea..c2ba3d4c 100644
--- a/common/religion/religions/NEOW_catholic.txt
+++ b/common/religion/religions/NEOW_catholic.txt
@@ -1096,7 +1096,7 @@
 			color = { 163 204 122 }
 			icon = NEOW_iberian
 
-			religious_head = k_papal_state
+			religious_head = d_iberian_hof
 
 			graphical_faith = "catholic_gfx"
 			#placeholder holy sites
@@ -1166,6 +1166,9 @@
 				WaterGodSheHe = CHARACTER_SHEHE_HE
 				WaterGodHerHis = CHARACTER_HERHIS_HIS
 				WaterGodHerHim = CHARACTER_HERHIM_HIM
+				
+				ReligiousHeadName = orthodox_religious_head_title
+				ReligiousHeadTitleName = orthodox_religious_head_title_name						
 			}
 		}
 	}
diff --git a/history/characters/NEOW_e_hispania.txt b/history/characters/NEOW_e_hispania.txt
index 06da069f..fc6c9cd3 100644
--- a/history/characters/NEOW_e_hispania.txt
+++ b/history/characters/NEOW_e_hispania.txt
@@ -36,14 +36,14 @@ hispania0002 = {
 castille_fernando_bourbon = { # Heir to Castille-Leon, Duke of Leon
 	name = "Fernando" 
 	dynasty_house = house_bourbon_anjou
-	religion = "sevillian"
+	religion = "penitente"
 	culture = castilian
 	father = hispania0002
-	trait = shy
+	trait = chaste
 	trait = patient
 	trait = education_learning_4
-	trait = craven
-	trait = hunchbacked
+	trait = diligent
+	#trait = hunchbacked
 	2528.1.17 = {
 		birth = yes
 	}
@@ -59,9 +59,10 @@ hispania0003 = {
 	culture = extremeno
 	trait = education_martial_2
 	trait = ambitious
-	trait = sadistic
+	trait = callous
 	trait = gregarious
 	trait = flexible_leader
+	father = hispania_cortes_hernan_2	
 	2520.4.13 = {
     	birth = yes
 	}
@@ -76,7 +77,7 @@ hispania0003 = {
 hispania0004 = {
 	name = "Mauro"
 	dynasty_house = house_jimena
-	religion = "sevillian"
+	religion = "iberian"
 	culture = galician
 	trait = education_martial_2
 	trait = honest
@@ -101,6 +102,7 @@ hispania0005 = {
 	trait = zealous
 	trait = honest
 	trait = chaste
+	father = hispania_cortes_hernan_1
 	2498.1.1 = {
     	birth = yes
 	}
@@ -232,7 +234,7 @@ thez_the_mighty = {
 hispania0011 = { #King Diego II of Galicia, father Mauro I.
 	name = "Diego"
 	dynasty_house = house_jimena
-	religion = sevillian
+	religion = iberian
 	culture = galician
 	trait = education_martial_3
 	trait = strategist
@@ -251,7 +253,7 @@ hispania0011 = { #King Diego II of Galicia, father Mauro I.
 hispania0012 = { #Son of Mauro I.
 	name = "Pedro"
 	dynasty_house = house_jimena
-	religion = sevillian
+	religion = iberian
 	culture = galician
 	trait = education_martial_4
 	trait = legitimized_bastard
@@ -271,7 +273,7 @@ hispania0012 = { #Son of Mauro I.
 hispania0013 = { #Daughter of Diego II.
 	name = "Catarina"
 	dynasty_house = house_jimena
-	religion = sevillian
+	religion = iberian
 	culture = galician
 	trait = education_intrigue_3
 	trait = legitimized_bastard
@@ -294,7 +296,7 @@ hispania0013 = { #Daughter of Diego II.
 hispania0014 = { #Bastard Son of Diego II. Ex-Count of Zaragoza
 	name = "Enrique"
 	dynasty_house = house_jimena_zaragoza
-	religion = sevillian
+	religion = iberian
 	culture = galician
 	trait = education_diplomacy_4
 	trait = legitimized_bastard
@@ -319,10 +321,9 @@ hispania0015 = { #Count of Zaragoza
 	trait = education_diplomacy_3
 	trait = one_eyed
 	trait = fecund
-	trait = vengeful
+	trait = cynical
 	trait = fickle
 	trait = calm
-	trait = loyal
 	father = hispania0014
 	2530.2.26 = {
     	birth = yes
@@ -469,7 +470,7 @@ hispania0023 = { #Alonso Quixano the lord of la mancha, not related to that luna
 hispania0024 = { #James Boatswain, lord of Gibraltar and tributary of the UK
 	name = "James"
 	dynasty = dynn_britannia_fitsosbern
-	religion = jack_tar
+	religion = victorian
 	culture = llanito
 	trait = greedy
 	trait = diligent
@@ -609,7 +610,7 @@ aragon_diego_salzillo = { # One of the Paladins
 aragon_ponz_sabinanigo = {
 	name = "Ponz"
 	dynasty = sabinanigo_dynasty
-	religion = sevillian
+	religion = "penitente"
 	culture = aragonese
 	trait = honest
 	trait = patient
@@ -712,14 +713,16 @@ castille_garcia_navalucillos = {
 castille_gerardo_castellon = {
 	name = "Gerardo"
 	dynasty = castellon_dynasty
-	religion = sevillian 
+	religion = penitente
 	culture = castilian
 	trait = gregarious
-	trait = fickle
-	trait = compassionate
-	trait = education_martial_1
-	trait = logistician
-	trait = strong
+	trait = calm
+	trait = forgiving
+	trait = rowdy
+	#trait = education_martial_1
+	#trait = logistician
+	trait = physique_good_1
+	disallow_random_traits = yes
 	2542.3.1 = {
 		birth = yes
 	}
@@ -734,7 +737,7 @@ castille_marina_alagon = {
 	culture = castilian
 	female = yes
 	trait = callous
-	trait = greedy
+	trait = cynical
 	trait = calm
 	trait = education_intrigue_1
 	trait = strong
@@ -751,7 +754,7 @@ castille_luis_quiroga = {
 	religion = sevillian 
 	culture = castilian
 	trait = deceitful
-	trait = gluttonous
+	trait = cynical
 	trait = arrogant
 	trait = education_diplomacy_3
 	2534.9.24 = {
@@ -816,7 +819,7 @@ castille_mencia_martin = {
 s_galicia_sanchu_melendez = {
 	name = "Sanchu"
 	dynasty = melendez_dynasty
-	religion = sevillian
+	religion = penitente
 	culture = asturleonese
 	trait = fickle
 	trait = ambitious
@@ -833,7 +836,7 @@ s_galicia_sanchu_melendez = {
 s_galicia_savaricu_estevez = {
 	name = "Savaricu"
 	dynasty = estevez_dynasty
-	religion = corsair
+	religion = sevillian
 	culture = asturleonese
 	trait = wrathful
 	trait = paranoid
@@ -849,7 +852,7 @@ s_galicia_savaricu_estevez = {
 s_galicia_mumadona_ourense = {
 	name = "Mumadona"
 	dynasty = ourense_dynasty
-	religion = sevillian
+	religion = iberian
 	culture = asturleonese
 	female = yes
 	trait = forgiving
@@ -975,4 +978,50 @@ hispania_patrick_cool = {
 	2600.1.1 = {
 		death = yes
 	}
+}
+
+hispania_cortes_hernan_1 = {
+	name = "Hernan"
+	dynasty = cortes_dynasty
+	religion = "sevillian"
+	culture = extremeno
+	trait = education_martial_3
+	2456.1.1 = {
+    	birth = yes
+	}
+	2500.1.1 = {
+    	death = yes
+	}
+}
+
+hispania_cortes_hernan_2 = {
+	name = "Hernan"
+	dynasty = cortes_dynasty
+	religion = "sevillian"
+	culture = extremeno
+	trait = education_martial_3
+	father = hispania_cortes_hernan_1	
+	2486.1.1 = {
+    	birth = yes
+	}
+	2550.1.1 = {
+    	death = yes
+	}
+}
+
+
+hispania_cortes_alonso = {
+	name = "Alonso"
+	dynasty = cortes_dynasty
+	religion = "sevillian"
+	culture = extremeno
+	trait = education_learning_3	
+	father = hispania_cortes_hernan_1		
+	2488.1.1 = {
+    	birth = yes
+	}
+
+	2549.1.1 = {
+    	death = yes
+	}
 }
\ No newline at end of file
diff --git a/history/provinces/e_iberia.txt b/history/provinces/e_iberia.txt
index abdad19d..9fc056cc 100644
--- a/history/provinces/e_iberia.txt
+++ b/history/provinces/e_iberia.txt
@@ -739,7 +739,7 @@
 ###c_zaragoza
 1887 = {
 	culture = visigothic
-	religion = sevillian
+	religion = iberian
 	holding = castle_holding
 	special_building_slot = aljaferia_palace_01
 	800.1.1 = { culture = andalusian }
@@ -1151,7 +1151,7 @@
 ###c_coruna
 1787 = {
 	culture = visigothic
-	religion = sevillian
+	religion = iberian
 	holding = castle_holding
 	98.1.1 = {
 	special_building = tower_of_hercules_01
@@ -1188,7 +1188,7 @@
 ###c_tui
 1781 = {
 	culture = visigothic
-	religion = sevillian
+	religion = iberian
 	holding = castle_holding
 	800.1.1 = { culture = galician }
 }
@@ -1204,7 +1204,7 @@
 ###c_astorga
 1821 = {
 	culture = visigothic
-	religion = sevillian
+	religion = iberian
 	holding = castle_holding
 	800.1.1 = { culture = galician }
 }
@@ -1229,7 +1229,7 @@
 ###c_monterrei
 1800 = {
 	culture = galician
-	religion = sevillian
+	religion = iberian
 	holding = castle_holding
 }
 1818 = {
@@ -1271,7 +1271,7 @@
 ###c_asturias_de_santillana
 1801 = {
 	culture = asturleonese
-	religion = corsair
+	religion = sevillian
 }
 1802 = {
 	holding = city_holding
@@ -1300,10 +1300,10 @@
 ###c_braganza
 1763 = {
 	culture = visigothic
-	religion = sevillian
+	religion = iberian
 	holding = castle_holding
 	800.1.1 = { culture = galician }
-	950.1.1 = { faith = sevillian }
+	950.1.1 = { faith = iberian}
 	1139.7.26 = {
 	culture = portuguese
 	}
@@ -1411,7 +1411,7 @@
 	800.1.1 = { culture = andalusian }
 	1264.1.1 = {
 	culture = portuguese
-	religion = sevillian
+	religion = iberian
 	}
 }
 1750 = {
diff --git a/history/titles/k_andalusia.txt b/history/titles/k_andalusia.txt
index eb367c37..3f45ffe9 100644
--- a/history/titles/k_andalusia.txt
+++ b/history/titles/k_andalusia.txt
@@ -7,6 +7,15 @@ k_andalusia = {
 	}
 }		
 
+d_granada = {
+	2546.1.1 = {
+		holder = hispania0006
+	}
+	2505.1.1 = {
+		change_development_level = 7
+	}
+}	
+
 d_cordoba = {
 	2547.6.14 = {
 		holder = hispania0022
@@ -17,34 +26,14 @@ d_cordoba = {
 c_cadiz = {
 	2550.1.1 = {
 		holder = andalusia_jesus_de_la_torre
-		liege = k_andalusia
+		liege = k_andalusia 
 	}
 }
 
-c_almonte = {
-	2550.1.1 = {
-		holder = andalusia_lain_santibanez
-		liege = k_andalusia
-	}
-}
+#c_almonte = {
+#	2550.1.1 = {
+#		holder = andalusia_lain_santibanez
+#		liege = k_andalusia
+#	}
+#}
 
-c_niebla = {
-	2550.1.1 = {
-		holder = andalusia_manrique_almonte
-		liege = k_andalusia
-	}
-}
-
-d_murcia = {
-	2550.1.1 = {
-		holder = aragon_diego_salzillo
-		liege = k_aragon
-	}
-}	
-
-c_murcia = {
-	2550.1.1 = {
-		holder = aragon_diego_salzillo
-		liege = k_aragon
-	}
-}
diff --git a/history/titles/k_andorra.txt b/history/titles/k_andorra.txt
index 0ed12daa..e69de29b 100644
--- a/history/titles/k_andorra.txt
+++ b/history/titles/k_andorra.txt
@@ -1,23 +0,0 @@
-k_andorra = {
-	2505.1.1 = {
-		change_development_level = 7
-	}
-	2550.1.1 = {
-		holder = hispania0009
-		government = theocracy_government
-	}
-}		
-
-c_pallas = {
-	2550.1.1 = {
-		holder = hispania0010
-		liege = k_andorra
-	}
-}		
-
-c_foix = { # occ
-	2550.1.1 = {
-		holder = france_ferrand_andrieu #Ferrand Andrieu
-		liege = k_andorra
-	}
-}
\ No newline at end of file
diff --git a/history/titles/k_aragon.txt b/history/titles/k_aragon.txt
index d8a7c104..dd3a0001 100644
--- a/history/titles/k_aragon.txt
+++ b/history/titles/k_aragon.txt
@@ -23,12 +23,9 @@ c_zaragoza = {
 	}
 }
 c_fraga = {
-	2541.7.21 = {
-		holder = hispania0014
-	}
 	2550.1.10 = {
-		holder = hispania0015
-		liege = k_aragon
+		holder = aragon_ponz_sabinanigo
+		liege = d_aragon
 	}
 }
 c_alto_aragon = {
@@ -98,4 +95,18 @@ c_iviza = {
 		holder = aragon_ravi_eivissa
 		liege = d_mallorca
 	}
-}
\ No newline at end of file
+}
+
+d_murcia = {
+	2550.1.1 = {
+		holder = aragon_diego_salzillo
+		liege = k_aragon
+	}
+}	
+
+c_murcia = {
+	2550.1.1 = {
+		holder = aragon_diego_salzillo
+		liege = k_aragon
+	}
+}
diff --git a/history/titles/k_castille.txt b/history/titles/k_castille.txt
index 2df4b231..9a6e8e27 100644
--- a/history/titles/k_castille.txt
+++ b/history/titles/k_castille.txt
@@ -2,19 +2,19 @@ k_castille_leon = {
 	2505.1.1 = {
 		change_development_level = 7
 	}
-	2550.1.1 = {
+	2530.1.1 = {
 		holder = hispania0002
 	}
 }
 
 d_la_mancha = {
-	2550.1.1 = { #change to 2526.4.22
+	2526.4.22 = { #change to 2526.4.22
 		holder = hispania0023
 	}
 }
 
 d_leon = {
-	2550.1.1 = {
+	2540.1.1 = {
 		holder = castille_fernando_bourbon
 		liege = k_castille_leon
 	}
@@ -83,6 +83,13 @@ c_cuenca = {
 }
 
 d_badajoz = {
+	2476.1.1 = {
+		holder = hispania_cortes_hernan_1
+	}
+
+	2500.1.1 = {
+		holder = hispania_cortes_hernan_2
+	}
 	2550.1.1 = {
 		holder = hispania0003
 	}
diff --git a/history/titles/k_france.txt b/history/titles/k_france.txt
index 59e2ad02..549a9441 100644
--- a/history/titles/k_france.txt
+++ b/history/titles/k_france.txt
@@ -8,14 +8,14 @@ k_france = {
 	2505.1.1 = {
 		change_development_level = 7
 	}	
-	2527.1.1 = {
-		holder = britannia_cyflymarhyan_islymo #Isylmo Cyflymarhyan
-		liege = e_britannia
+	2429.2.12 = {
+		holder = france_bonaparte_arador
 	}
-	2530.1.1 = {
-		holder = britannia_cyflymarhyan_frydyryk #Frydyryk Cyflymarhyan
-		government = administrative_government
-		liege = e_britannia
+	2479.12.28 = {
+		holder = france_bonaparte_arathorn
+	}
+	2522.12.28 = {
+		holder = france_bonaparte_aragorn #aragorn bonaparte
 	}
 }	
 
diff --git a/history/titles/k_navarra.txt b/history/titles/k_navarra.txt
index 19c36a50..fa3c81d9 100644
--- a/history/titles/k_navarra.txt
+++ b/history/titles/k_navarra.txt
@@ -5,4 +5,5 @@ k_navarra = {
 	2550.1.1 = {
 		holder = hispania0008
 	}
-}		
\ No newline at end of file
+}	
+
diff --git a/history/titles/k_portugal.txt b/history/titles/k_portugal.txt
index 4d5fd4a4..9e121e62 100644
--- a/history/titles/k_portugal.txt
+++ b/history/titles/k_portugal.txt
@@ -7,7 +7,7 @@ k_portugal = {
 	}
 }
 
-k_canarias = {
+d_canarias = {
 	2505.1.1 = {
 		change_development_level = 7
 	}
@@ -29,15 +29,23 @@ d_algarve = {
 	}
 	2554.1.1 = {
 		holder = hispania0019
-		liege = k_andalusia
+		liege = k_portugal
 	}
 }
 c_beja = {
 	2550.1.1 = {
 		holder = portugal_hermigo_coimbra
-		liege = k_andalusia
+		liege = k_portugal
 	}
 }
+
+c_moura = {
+	2550.1.1 = {
+		holder = andalusia_manrique_almonte
+		liege = k_sevillian_papacy
+	}
+}
+
 d_porto = {
 	2550.1.1 = {
 		holder = portugal_vela_aboim
diff --git a/history/titles/k_relgious_heads.txt b/history/titles/k_relgious_heads.txt
index 27497d79..10e46727 100644
--- a/history/titles/k_relgious_heads.txt
+++ b/history/titles/k_relgious_heads.txt
@@ -8,15 +8,9 @@ k_sevillian_papacy = {
 	2550.1.1 = {
 		holder = hispania0005
 	}
-}
+}	
 
-k_sevillian_state = {
-	2550.1.1 = {
-		holder = hispania0005
-	}
-}		
-
-d_sevillian_state = {
+d_sevilla = {
 	2550.1.1 = {
 		holder = hispania0005
 	}
@@ -28,6 +22,36 @@ c_sevilla = {
 	}
 }
 	
+	
+b_triana = {
+	2550.1.1 = {
+		holder = hispania0005	
+	}
+}	
+		
+
+b_carmona = {
+	2550.1.1 = {
+		holder = hispania0005	
+	}
+}	
+
+b_moron = {
+	2550.1.1 = {
+		holder = hispania0005	
+	}
+}	
+	
+	
+	
+c_niebla = {
+	2550.1.1 = {
+		holder = andalusia_manrique_almonte
+		liege = k_sevillian_papacy 
+	}
+}	
+	
+	
 d_united_grand_lodge = {
 	2550.1.1 = {
 		holder = britannia_harhman_alan
@@ -54,6 +78,37 @@ d_lutheran_hof = {
 	}
 }
 
+d_iberian_hof = {
+	2550.1.1 = {
+		holder = hispania0009
+		government = theocracy_government
+	}
+}
+
+d_andorra = {
+	2505.1.1 = {
+		change_development_level = 7
+	}
+	2550.1.1 = {
+		holder = hispania0009
+		government = theocracy_government
+	}
+}		
+
+c_pallas = {
+	2550.1.1 = {
+		holder = hispania0010
+		liege = d_andorra 
+	}
+}		
+
+c_foix = { # occ
+	2550.1.1 = {
+		holder = france_ferrand_andrieu #Ferrand Andrieu
+		liege = d_andorra 
+	}
+}
+
 #d_novelist_high_king = { 
 #	2554.1.1 = {
 #		holder = 0
diff --git a/history/titles/k_rhineland.txt b/history/titles/k_rhineland.txt
index 97ded6d6..8648d660 100644
--- a/history/titles/k_rhineland.txt
+++ b/history/titles/k_rhineland.txt
@@ -53,10 +53,13 @@ c_sundgau = {
 }
 
 d_trier = {
-	2554.1.1 = {
+	2548.1.1 = {
 		holder = germany0009 #Wilhelm Zollern
 		liege = k_lotharingia
 	}
+	2554.1.1 = {
+		liege = none
+	}	
 }
 
 d_lower_lorraine = {
diff --git a/history/titles/k_spanish_galicia.txt b/history/titles/k_spanish_galicia.txt
index 57e6c133..6955da35 100644
--- a/history/titles/k_spanish_galicia.txt
+++ b/history/titles/k_spanish_galicia.txt
@@ -1,4 +1,4 @@
-k_spanish_galicia = {
+d_galicia = {
 	2505.1.1 = {
 		change_development_level = 7
 	}
@@ -12,25 +12,30 @@ k_spanish_galicia = {
 c_monterrei = {
 	2550.1.1 = {
 		holder = s_galicia_mumadona_ourense
-		liege = k_spanish_galicia
-	}
-}
-c_pravia = {
-	2550.1.1 = {
-		holder = s_galicia_sanchu_melendez
-		liege = k_spanish_galicia
-	}
-}
-c_asturias_de_oviedo = {
-	2550.1.1 = {
-		holder = s_galicia_sanchu_melendez
-		liege = k_spanish_galicia
+		liege = d_galicia
 	}
 }
 
+d_asturias = {
+	2550.1.1 = {
+		holder = s_galicia_sanchu_melendez
+	}
+}
+
+c_asturias_de_oviedo = {
+	2550.1.1 = {
+		holder = s_galicia_sanchu_melendez
+	}
+}
+
+c_pravia = {
+	2550.1.1 = {
+		holder = s_galicia_sanchu_melendez
+	}
+}
 
 c_asturias_de_santillana = {
 	2550.1.1 = {
 		holder = s_galicia_savaricu_estevez
 	}
-}
\ No newline at end of file
+}	
diff --git a/history/titles/k_switzerland.txt b/history/titles/k_switzerland.txt
index 493c2db1..90599144 100644
--- a/history/titles/k_switzerland.txt
+++ b/history/titles/k_switzerland.txt
@@ -1,7 +1,7 @@
-k_switzerland = {
+e_alps = {
 	2100.1.1 = {
 		succession_laws = {
-			feudal_elective_succession_law
+			tribal_elective_succession_law
 		}
 	}		
 	2554.1.1 = {
@@ -13,35 +13,35 @@ k_switzerland = {
 d_rhaetia = {
 	2554.1.1 = {
 		holder = alps_liutbert_chur
-		liege = k_switzerland
+		liege = e_alps 
 	}
 }
 
 c_zurich = {
 	2554.1.1 = {
 		holder = alps_markward_tubingen
-		liege = k_switzerland
+		liege = e_alps 
 	}
 }
 
 c_basel = {
 	2554.1.1 = {
 		holder = alps_gottschalk_karnten
-		liege = k_switzerland
+		liege = e_alps 
 	}
 }
 
 d_upper_burgundy = {
 	2554.1.1 = {
 		holder = alps_geraud_estouville #Franz Klosters
-		liege = k_switzerland
+		liege = e_alps 
 	}
 }
 
 c_besancon = {
 	2554.1.1 = {
 		holder = alps_geraud_estouville #Franz Klosters
-		liege = k_switzerland
+		liege = e_alps 
 	}
 	2555.1.1 = { change_development_level = 10 }
 }
@@ -51,14 +51,14 @@ c_besancon = {
 d_lyonnais={
 	2554.1.1={
 		holder=alps_aurengarde_perche #Franz Klosters
-		liege = k_switzerland
+		liege = e_alps 
 	}
 }
 
 c_rhone={
 	2554.1.1={
 		holder=alps_aurengarde_perche #Franz Klosters
-		liege = k_switzerland
+		liege = e_alps 
 	}
 	2555.1.1 = { change_development_level = 20 }
 }
@@ -66,7 +66,7 @@ c_rhone={
 c_loire={
 	2554.1.1={
 		holder=alps_aurengarde_perche #Franz Klosters
-		liege = k_switzerland
+		liege = e_alps 
 	}
 	2555.1.1 = { change_development_level = 13 }
 }
@@ -74,7 +74,7 @@ c_loire={
 c_ain={
 	2554.1.1={
 		holder=alps_aurengarde_perche #Franz Klosters
-		liege = k_switzerland
+		liege = e_alps 
 	}
 	2555.1.1 = { change_development_level = 10 }
 }
@@ -82,14 +82,14 @@ c_ain={
 d_savoie = {
 	2554.1.1 = {
 		holder=alps_fantasio_miejo #Franz Klosters
-		liege = k_switzerland
+		liege = e_alps 
 	}
 }
 
 c_upper_savoy = {
 	2554.1.1 = {
 		holder=alps_fantasio_miejo #Franz Klosters
-		liege = k_switzerland
+		liege = e_alps 
 	}
 	2555.1.1 = { change_development_level = 10 }
 }
@@ -97,7 +97,7 @@ c_upper_savoy = {
 c_savoy = {
 	2554.1.1 = {
 		holder=alps_fantasio_miejo #Franz Klosters
-		liege = k_switzerland
+		liege = e_alps 
 	}
 	2555.1.1 = { change_development_level = 10 }
 }
\ No newline at end of file
diff --git a/localization/english/titles_l_english.yml b/localization/english/titles_l_english.yml
index fc288f9f..d7ce9531 100644
--- a/localization/english/titles_l_english.yml
+++ b/localization/english/titles_l_english.yml
@@ -25374,8 +25374,10 @@
  
  #### Religion ####
  b_bad_ems:0 "Bad Ems"
- d_patriarch_dublin:0 "Patriarch of Armargh"
- d_patriarch_dublin_adj:0 "Patriarchal"
+ d_patriarch_dublin:0 "Patriarch of Ireland"
+ d_patriarch_dublin_adj:0 "Irish Catholic"
+ d_iberian_hof:0 "Patriarch of Iberia"
+ d_iberian_hof_adj:0 "Iberian Catholic" 
  d_anglican_hof:0 "Church of England"
  d_anglican_hof_adj:0 "Anglican" 
  d_lutheran_hof:0 "Archprimacy of Lund"