diff --git a/common/culture/name_lists/NEOW_castilian.txt b/common/culture/name_lists/NEOW_castilian.txt
index c89dbd229..367b2081f 100644
--- a/common/culture/name_lists/NEOW_castilian.txt
+++ b/common/culture/name_lists/NEOW_castilian.txt
@@ -374,7 +374,7 @@
 			Inmaculada_spc_Concepci_o_act_n Iris_spc_Mar_i_act_a Isabela Isaura 
 			Joaquina Jorgina Julia_spc_Mar_i_act_a 
 			Libertad Lucy Luz 
-			Mabel Magda Magdalena Mar_i_act_a_spc_Almudena Mar_i_act_a_spc_Asunci_o_act_n Mar_i_act_a_spc_Beatriz Mar_i_act_a_spc_Blanca Mar_i_act_a_spc_Carlota Mar_i_act_a_spc_Carolina Mar_i_act_a_spc_Cinta Mar_i_act_a_spc_Clara Mar_i_act_a_spc_Consuelo Mar_i_act_a_spc_de_spc_la_spc_Cabeza Mar_i_act_a_spc_del_spc_Pino Mar_i_act_a_spc_del_spc_Socorro Mar_i_act_a_spc_Eva Mar_i_act_a_spc_Gloria Mar_i_act_a_spc_Juana Mar_i_act_a_spc_Micaela Mar_i_act_a_spc_Montserrat Mar_i_act_a_spc_Vanesa Mar_i_act_a_spc_Violeta Marcela Marilda Mariola Martha Matilde Mayte Milagrosa 
+			Mabel Magda Magdalena Mar_i_act_a_spc_Almudena Mar_i_act_a_spc_Asunci_o_act_n Mar_i_act_a_spc_Beatriz Mar_i_act_a_spc_Blanca Mar_i_act_a_spc_Carlota Mar_i_act_a_spc_Carolina Mar_i_act_a_spc_Cinta Mar_i_act_a_spc_Clara Mar_i_act_a_spc_Consuelo Mar_i_act_a_spc_de_spc_la_spc_Cabeza Mar_i_act_a_spc_del_spc_Pino Mar_i_act_a_spc_del_spc_Socorro Mar_i_act_a_spc_Eva Mar_i_act_a_spc_Gloria Mar_i_act_a_spc_Juana Mar_i_act_a_spc_Micaela Mar_i_act_a_spc_Montserrat Mar_i_act_a_spc_Vanesa Mar_i_act_a_spc_Violeta Marcela Marilda Mariola Martha Matilde Mayte Menc_i_act_a Milagrosa 
 			Natividad Notburga 
 			Olimpia 
 			Pascuala Paz Piedad Preciada Purificaci_o_act_n 
diff --git a/common/culture/name_lists/NEOW_maronite.txt b/common/culture/name_lists/NEOW_maronite.txt
index ebfa27462..d482f1c66 100644
--- a/common/culture/name_lists/NEOW_maronite.txt
+++ b/common/culture/name_lists/NEOW_maronite.txt
@@ -92,6 +92,7 @@
 		"dynn_Soueif"
 		"dynn_Tabet"
 		"dynn_Tarabay"
+		"dynn_Tayah"
 		"dynn_Zaidan"
 	}
 	
@@ -115,6 +116,7 @@
 		Rafik Rami Raymond Ren_e_act_ Richard Robert Roger Roland 
 		Saadallah Sami Samir Selim Simon Sleiman  
 		Tanios Tarek Tobia 
+		Wadih 
 		Youhanna Youssef 
 		Zakaria Zakhia 
 	}
diff --git a/common/dynasties/NEOW_dynasties.txt b/common/dynasties/NEOW_dynasties.txt
index c74c5be4f..06afbd12b 100644
--- a/common/dynasties/NEOW_dynasties.txt
+++ b/common/dynasties/NEOW_dynasties.txt
@@ -1293,12 +1293,12 @@ ceballos_dynasty = {
 }
 
 aracena_dynasty = {
-	name = dynn_aracena
+	name = dynn_Aracena
 	culture = extremeno
 }
 
 martin_dynasty = {
-	name = dynn_martin
+	name = dynn_Mart_i_act_n
 	culture = extremeno
 }
 
diff --git a/common/landed_titles/mashriq.txt b/common/landed_titles/mashriq.txt
index 99c86687a..6dbb64cd0 100644
--- a/common/landed_titles/mashriq.txt
+++ b/common/landed_titles/mashriq.txt
@@ -665,7 +665,7 @@ e_mashriq = {
 					province = 4842
 
 					color = { 25 150 90 }
-				}					
+				}
 			}				
 			c_upper_khabur = {
 				color = { 25 175 75 }
@@ -926,66 +926,37 @@ e_mashriq = {
 					}
 				}
 			}
-			c_hakkari = {
-				color = { 50 175 80 }
-
-				b_hakkari = {
-					province = 4815
-
-					color = { 50 175 80 }
-				}
-				b_baqirda = {
-					province = 4813
-
-					color = { 50 175 80 }
-				}
-				b_tamanin = {
-					province = 4814
-
-					color = { 50 175 80 }
-				}
-				b_saird = {
-					province = 4816
-
-					color = { 50 175 80 }
-				}				
-			}					
-			c_tall_basma = {
+		}
+		d_mardin = { # Mardin
+			color = { 106 219 101 }
+			capital = c_tall_basma # Mardin
+					
+			c_tall_basma = { # Mardin
 				color = { 90 215 120 }
 
-				b_mardin = {
+				b_mardin = { # Mardin
 					province = 4854
-
 					color = { 25 175 75 }
 				}
-				b_dara = {
+				b_dara = { # Kızıltepe
 					province = 4846
-
 					color = { 25 150 90 }
-				}						
+				}
+				b_hisn_kaifa = { # Midyat
+					province = 4847
+					color = { 90 215 120 }
+				}
+				b_nasibin = { # Nusaybin
+					province = 4845
+					color = { 25 150 90 }
+				}		
 			}
-			c_nasibin = {
+			c_nasibin = { # Batman
 				color = { 40 205 90 }
 
-				b_nasibin = {
-					province = 4845
-
-					color = { 25 150 90 }
-				}
-				b_tall_fafan = {
-					cultural_names = {
-						name_list_NEOW_griko = cn_cattepe
-						name_list_NEOW_greek = cn_cattepe
-						name_list_NEOW_cypriot = cn_cattepe
-						name_list_NEOW_greco_turkish = cn_cattepe
-					}
-
-
-					province = 4857
-
+				b_arzan = { # Batman
+					province = 4858
 					color = { 30 145 110 }
-				}
-				b_arzan = {
 
 					cultural_names = {
 						name_list_NEOW_griko = cn_arzan
@@ -993,21 +964,38 @@ e_mashriq = {
 						name_list_NEOW_cypriot = cn_arzan
 						name_list_NEOW_greco_turkish = cn_arzan
 					}
-					province = 4858
-
-					color = { 30 145 110 }
 				}
-				b_gazirat_ibn_umar = {
+				b_saird = { # Siirt
+					province = 4816
+					color = { 50 175 80 }
+				}
+				b_tall_fafan = { # Pervari
+					province = 4857
+					color = { 30 145 110 }
+					
+					cultural_names = {
+						name_list_NEOW_griko = cn_cattepe
+						name_list_NEOW_greek = cn_cattepe
+						name_list_NEOW_cypriot = cn_cattepe
+						name_list_NEOW_greco_turkish = cn_cattepe
+					}
+				}
+			}
+			c_sirnak = { # Şırnak
+				color = { 78 180 87 }
+				
+				b_baqirda = { # Şırnak
+					province = 4813
+					color = { 50 175 80 }
+				}
+				b_gazirat_ibn_umar = { # Cizre
 					province = 4844
-
 					color = { 25 150 90 }
 				}
-								
-				b_hisn_kaifa = {
-					province = 4847
-
-					color = { 90 215 120 }
-				}					
+				b_tamanin = { # Uludere
+					province = 4814
+					color = { 50 175 80 }
+				}
 			}
 		}
 		d_vaspurakan = {
@@ -1076,7 +1064,16 @@ e_mashriq = {
 
 					color = { 50 175 80 }
 				}				
-			}				
+			}		
+			c_hakkari = {
+				color = { 50 175 80 }
+
+				b_hakkari = {
+					province = 4815
+
+					color = { 50 175 80 }
+				}
+			}		
 			c_apahunik = {
 				color = { 150 65 50 }
 
diff --git a/gfx/coat_of_arms/colored_emblems/NEOW_ce_flame.dds b/gfx/coat_of_arms/colored_emblems/NEOW_ce_flame.dds
index 1805e2fd9..9a1062a02 100644
--- a/gfx/coat_of_arms/colored_emblems/NEOW_ce_flame.dds
+++ b/gfx/coat_of_arms/colored_emblems/NEOW_ce_flame.dds
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:49f94084639879ac1f930b3bbc3e3ce1068a5addae01363816915f01adf9b9c2
-size 262272
+oid sha256:fafdc4a60ae8d4d9489c944046d6bb2e0cc813559028c9c053ab0a79f47c5c7d
+size 87536
diff --git a/gfx/coat_of_arms/colored_emblems/NEOW_ce_flower_star.dds b/gfx/coat_of_arms/colored_emblems/NEOW_ce_flower_star.dds
index 827385322..30fc92851 100644
--- a/gfx/coat_of_arms/colored_emblems/NEOW_ce_flower_star.dds
+++ b/gfx/coat_of_arms/colored_emblems/NEOW_ce_flower_star.dds
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b6f69ab6e59ab997d1809caebc56ae53bbacfbdeb8399019223bf8a3fe72a5f4
-size 262272
+oid sha256:9fe7167f6b76a8b78c79d549adb2228ecc1365410403a96246e99bda60a9d7a3
+size 87536
diff --git a/gfx/coat_of_arms/colored_emblems/NEOW_ce_from_the_founding_of_the_city.dds b/gfx/coat_of_arms/colored_emblems/NEOW_ce_from_the_founding_of_the_city.dds
index 481fe628b..15795a17a 100644
--- a/gfx/coat_of_arms/colored_emblems/NEOW_ce_from_the_founding_of_the_city.dds
+++ b/gfx/coat_of_arms/colored_emblems/NEOW_ce_from_the_founding_of_the_city.dds
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b8c235d82ef135a09d77be0862ce94c4de1dc63e924b90143d2b1ebe2a985cd7
-size 1398228
+oid sha256:772589726645ba0ce6194db6211d1e15a903687a55806e8e17e962f0184efe50
+size 87536
diff --git a/gfx/coat_of_arms/colored_emblems/NEOW_ce_gediminas.dds b/gfx/coat_of_arms/colored_emblems/NEOW_ce_gediminas.dds
index 7ea05c31f..87ef19491 100644
--- a/gfx/coat_of_arms/colored_emblems/NEOW_ce_gediminas.dds
+++ b/gfx/coat_of_arms/colored_emblems/NEOW_ce_gediminas.dds
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e2238f7cda40f5bc466ec053fd55a94cf2a50828a9df1430f8511900ee3ecdd5
-size 262272
+oid sha256:82dc3c911dde013d14a3cb77a14d932ddffecd6554a2d5e5d0d157dc993698da
+size 87536
diff --git a/gfx/coat_of_arms/colored_emblems/NEOW_ce_gondor_crown.dds b/gfx/coat_of_arms/colored_emblems/NEOW_ce_gondor_crown.dds
index 3cbeec0cd..cd939d46d 100644
--- a/gfx/coat_of_arms/colored_emblems/NEOW_ce_gondor_crown.dds
+++ b/gfx/coat_of_arms/colored_emblems/NEOW_ce_gondor_crown.dds
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c6e079dc429efb64638628b941f27966dfa3a3f4ca8ccde7371c9b11032dab17
-size 87508
+oid sha256:f89cd785037518c2666b20ff014d876c2b96e75b7040932de625bd76cc5a63d1
+size 22000
diff --git a/gfx/map/map_object_data/activities.txt b/gfx/map/map_object_data/activities.txt
index aabb460a3..afa172b80 100644
--- a/gfx/map/map_object_data/activities.txt
+++ b/gfx/map/map_object_data/activities.txt
@@ -25789,13 +25789,13 @@
 		}
 		{
 			id=4813
-			position={ 3278.847168 0.000000 2298.511230 }
+			position={ 3291.279053 0.000000 2276.302002 }
 			rotation={ -0.000000 0.362180 -0.000000 0.932108 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=4814
-			position={ 3302.457764 0.000000 2277.596191 }
+			position={ 3333.590332 0.000000 2306.611328 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -25807,7 +25807,7 @@
 		}
 		{
 			id=4816
-			position={ 3275.611084 0.000000 2310.206055 }
+			position={ 3256.738037 0.000000 2310.208740 }
 			rotation={ -0.000000 0.221535 -0.000000 0.975152 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -25975,7 +25975,7 @@
 		}
 		{
 			id=4844
-			position={ 3264.943604 0.000000 2277.516602 }
+			position={ 3258.878906 0.000000 2264.781982 }
 			rotation={ -0.000000 0.260863 -0.000000 0.965376 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -25987,7 +25987,7 @@
 		}
 		{
 			id=4846
-			position={ 3209.906494 0.000000 2242.574219 }
+			position={ 3199.310059 0.000000 2264.195801 }
 			rotation={ -0.000000 -0.452588 -0.000000 0.891720 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -26035,7 +26035,7 @@
 		}
 		{
 			id=4854
-			position={ 3199.532715 0.000000 2268.759033 }
+			position={ 3199.658203 0.000000 2273.044678 }
 			rotation={ -0.000000 0.135719 -0.000000 0.990747 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -26053,13 +26053,13 @@
 		}
 		{
 			id=4857
-			position={ 3226.891113 0.000000 2316.584229 }
+			position={ 3288.519287 0.000000 2308.640869 }
 			rotation={ -0.000000 0.223440 -0.000000 0.974718 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=4858
-			position={ 3248.542236 0.000000 2344.513184 }
+			position={ 3226.888428 0.000000 2310.588867 }
 			rotation={ -0.000000 -0.369196 -0.000000 0.929352 }
 			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 673f89b74..83ef26a1c 100644
--- a/gfx/map/map_object_data/building_locators.txt
+++ b/gfx/map/map_object_data/building_locators.txt
@@ -25759,13 +25759,13 @@
 		}
 		{
 			id=4813
-			position={ 3285.077637 0.000000 2290.085449 }
+			position={ 3285.605469 0.000000 2286.494629 }
 			rotation={ -0.000000 -0.678063 -0.000000 0.735003 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=4814
-			position={ 3308.618652 0.000000 2287.805664 }
+			position={ 3315.708496 0.000000 2287.077637 }
 			rotation={ -0.000000 -0.999903 -0.000000 0.013920 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -25777,8 +25777,8 @@
 		}
 		{
 			id=4816
-			position={ 3271.077637 0.000000 2318.085449 }
-			rotation={ -0.000000 -0.919174 -0.000000 -0.393852 }
+			position={ 3269.665039 0.000000 2320.062744 }
+			rotation={ -0.000000 0.466229 -0.000000 -0.884664 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
@@ -25951,19 +25951,19 @@
 		}
 		{
 			id=4845
-			position={ 3242.077637 0.000000 2256.085449 }
-			rotation={ -0.000000 -0.970935 -0.000000 -0.239343 }
+			position={ 3241.195068 0.000000 2258.164307 }
+			rotation={ -0.000000 -0.981884 -0.000000 -0.189481 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=4846
-			position={ 3201.480957 0.000000 2243.022949 }
-			rotation={ -0.000000 -0.984333 -0.000000 0.176321 }
+			position={ 3193.907227 0.000000 2249.755859 }
+			rotation={ -0.000000 -0.080717 -0.000000 0.996737 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=4847
-			position={ 3236.355469 0.000000 2288.157715 }
+			position={ 3232.755615 0.000000 2287.017822 }
 			rotation={ -0.000000 -0.970503 -0.000000 -0.241090 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -26005,8 +26005,8 @@
 		}
 		{
 			id=4854
-			position={ 3199.077637 0.000000 2261.085449 }
-			rotation={ -0.000000 -0.866951 -0.000000 -0.498394 }
+			position={ 3207.961670 0.000000 2268.219482 }
+			rotation={ -0.000000 -0.597998 -0.000000 -0.801498 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
@@ -26023,14 +26023,14 @@
 		}
 		{
 			id=4857
-			position={ 3234.077637 0.000000 2316.085449 }
-			rotation={ -0.000000 -0.769616 -0.000000 -0.638506 }
+			position={ 3305.548584 0.000000 2317.484131 }
+			rotation={ -0.000000 -0.588733 -0.000000 -0.808326 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=4858
-			position={ 3242.077637 0.000000 2348.085449 }
-			rotation={ -0.000000 -0.450930 -0.000000 -0.892559 }
+			position={ 3233.579102 0.000000 2316.562256 }
+			rotation={ -0.000000 0.643898 -0.000000 -0.765111 }
 			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 3affd489d..5094481e2 100644
--- a/gfx/map/map_object_data/combat_locators.txt
+++ b/gfx/map/map_object_data/combat_locators.txt
@@ -27637,13 +27637,13 @@
 		}
 		{
 			id=4813
-			position={ 3294.000000 0.000000 2291.000000 }
+			position={ 3298.098389 0.000000 2288.729248 }
 			rotation={ -0.000000 -0.760321 -0.000000 0.649547 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=4814
-			position={ 3309.000000 0.000000 2303.000000 }
+			position={ 3315.442139 0.000000 2301.207031 }
 			rotation={ -0.000000 -0.978346 -0.000000 0.206974 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -27655,7 +27655,7 @@
 		}
 		{
 			id=4816
-			position={ 3259.502197 0.000000 2309.200195 }
+			position={ 3264.980225 0.000000 2305.247559 }
 			rotation={ -0.000000 -0.784186 -0.000000 0.620526 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -27823,8 +27823,8 @@
 		}
 		{
 			id=4844
-			position={ 3259.026855 0.000000 2280.793457 }
-			rotation={ -0.000000 0.365165 -0.000000 0.930943 }
+			position={ 3264.015625 0.000000 2281.278076 }
+			rotation={ -0.000000 0.231790 -0.000000 0.972766 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
@@ -27835,7 +27835,7 @@
 		}
 		{
 			id=4846
-			position={ 3212.501465 0.000000 2256.874512 }
+			position={ 3185.352539 0.000000 2268.771484 }
 			rotation={ -0.000000 -0.924900 -0.000000 0.380210 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -27883,7 +27883,7 @@
 		}
 		{
 			id=4854
-			position={ 3190.000000 0.000000 2271.000000 }
+			position={ 3200.850586 0.000000 2284.222412 }
 			rotation={ -0.000000 -0.993487 -0.000000 0.113943 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -27901,13 +27901,13 @@
 		}
 		{
 			id=4857
-			position={ 3251.000000 0.000000 2321.000000 }
-			rotation={ -0.000000 -0.549460 -0.000000 0.835520 }
+			position={ 3285.631592 0.000000 2314.621338 }
+			rotation={ -0.000000 -0.856382 -0.000000 0.516344 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=4858
-			position={ 3248.442383 0.000000 2335.653809 }
+			position={ 3235.581055 0.000000 2338.626221 }
 			rotation={ -0.000000 -0.999868 -0.000000 0.016273 }
 			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 275385bdb..334046e16 100644
--- a/gfx/map/map_object_data/player_stack_locators.txt
+++ b/gfx/map/map_object_data/player_stack_locators.txt
@@ -27637,13 +27637,13 @@
 		}
 		{
 			id=4813
-			position={ 3288.000000 0.000000 2297.000000 }
+			position={ 3290.779053 0.000000 2296.594238 }
 			rotation={ -0.000000 -0.216440 -0.000000 0.976296 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=4814
-			position={ 3315.126709 0.000000 2296.437744 }
+			position={ 3329.650879 0.000000 2296.407959 }
 			rotation={ -0.000000 -0.216440 -0.000000 0.976296 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -27655,7 +27655,7 @@
 		}
 		{
 			id=4816
-			position={ 3277.000000 0.000000 2325.000000 }
+			position={ 3261.059814 0.000000 2327.423584 }
 			rotation={ -0.000000 -0.216440 -0.000000 0.976296 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -27823,7 +27823,7 @@
 		}
 		{
 			id=4844
-			position={ 3271.625488 0.000000 2275.710449 }
+			position={ 3276.808838 0.000000 2276.260254 }
 			rotation={ -0.000000 -0.216440 -0.000000 0.976296 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -27835,7 +27835,7 @@
 		}
 		{
 			id=4846
-			position={ 3210.403320 0.000000 2247.937256 }
+			position={ 3202.129395 0.000000 2254.855957 }
 			rotation={ -0.000000 -0.216440 -0.000000 0.976296 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -27883,7 +27883,7 @@
 		}
 		{
 			id=4854
-			position={ 3206.000000 0.000000 2268.000000 }
+			position={ 3214.997559 0.000000 2260.767822 }
 			rotation={ -0.000000 -0.216440 -0.000000 0.976296 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -27901,13 +27901,13 @@
 		}
 		{
 			id=4857
-			position={ 3241.000000 0.000000 2317.000000 }
+			position={ 3305.542236 0.000000 2308.784912 }
 			rotation={ -0.000000 -0.216440 -0.000000 0.976296 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=4858
-			position={ 3248.000000 0.000000 2355.000000 }
+			position={ 3242.177246 0.000000 2312.011230 }
 			rotation={ -0.000000 -0.216440 -0.000000 0.976296 }
 			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 84a9a6e90..c23ff0402 100644
--- a/gfx/map/map_object_data/siege_locators.txt
+++ b/gfx/map/map_object_data/siege_locators.txt
@@ -25759,13 +25759,13 @@
 		}
 		{
 			id=4813
-			position={ 3277.000000 0.000000 2293.000000 }
+			position={ 3277.527832 0.000000 2289.409180 }
 			rotation={ 0.000000 0.569595 0.000000 0.821926 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=4814
-			position={ 3316.541016 0.000000 2290.720215 }
+			position={ 3323.630859 0.000000 2289.992188 }
 			rotation={ -0.000000 -0.569595 -0.000000 0.821926 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -25777,8 +25777,8 @@
 		}
 		{
 			id=4816
-			position={ 3281.000000 0.000000 2320.000000 }
-			rotation={ -0.000000 -0.633989 -0.000000 0.773342 }
+			position={ 3256.030762 0.000000 2319.341309 }
+			rotation={ -0.000000 -0.720062 -0.000000 -0.693910 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
@@ -25951,19 +25951,19 @@
 		}
 		{
 			id=4845
-			position={ 3233.000000 0.000000 2257.000000 }
-			rotation={ 0.000000 0.666921 0.000000 0.745128 }
+			position={ 3232.070068 0.000000 2258.123047 }
+			rotation={ -0.000000 0.704079 -0.000000 0.710122 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=4846
-			position={ 3207.403320 0.000000 2234.937256 }
-			rotation={ 0.000000 0.948683 0.000000 -0.316228 }
+			position={ 3190.921875 0.000000 2261.831299 }
+			rotation={ -0.000000 -0.063656 -0.000000 -0.997972 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=4847
-			position={ 3243.277832 0.000000 2283.072266 }
+			position={ 3239.677979 0.000000 2281.932373 }
 			rotation={ 0.000000 0.889168 0.000000 -0.457582 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -26005,8 +26005,8 @@
 		}
 		{
 			id=4854
-			position={ 3188.000000 0.000000 2264.000000 }
-			rotation={ 0.000000 0.606994 0.000000 0.794707 }
+			position={ 3203.584717 0.000000 2279.495117 }
+			rotation={ -0.000000 0.241801 -0.000000 0.970326 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
@@ -26023,14 +26023,14 @@
 		}
 		{
 			id=4857
-			position={ 3229.000000 0.000000 2309.000000 }
-			rotation={ 0.000000 0.952296 0.000000 0.305177 }
+			position={ 3296.934814 0.000000 2314.799316 }
+			rotation={ -0.000000 0.847854 -0.000000 0.530231 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=4858
-			position={ 3235.000000 0.000000 2342.000000 }
-			rotation={ 0.000000 0.908513 0.000000 0.417857 }
+			position={ 3236.238525 0.000000 2330.250488 }
+			rotation={ -0.000000 -0.027674 -0.000000 0.999617 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
diff --git a/history/characters/NEOW_e_hispania.txt b/history/characters/NEOW_e_hispania.txt
index 94f6ebce4..e8173d044 100644
--- a/history/characters/NEOW_e_hispania.txt
+++ b/history/characters/NEOW_e_hispania.txt
@@ -909,7 +909,7 @@ castille_cristina_ceballos = {
 	}
 }
 castille_arias_aracena = {
-	name = "Arias"
+	name = "Arturo"
 	dynasty = aracena_dynasty
 	religion = sevillian
 	culture = extremeno
@@ -925,7 +925,7 @@ castille_arias_aracena = {
 	}
 }
 castille_mencia_martin = {
-	name = "Mencín"
+	name = "Menc_i_act_a"
 	dynasty = martin_dynasty
 	religion = sevillian
 	culture = extremeno
diff --git a/history/provinces/e_mashriq.txt b/history/provinces/e_mashriq.txt
index c0cbf2eba..cee097e64 100644
--- a/history/provinces/e_mashriq.txt
+++ b/history/provinces/e_mashriq.txt
@@ -69,6 +69,46 @@
 4872 = {	# Birecik
 	holding = none
 }
+##d_mardin/Mardin ###################################
+###c_tall_basma/Mardin
+4854 = {	# Mardin
+	culture = kurd
+	religion = majlisi
+	holding = castle_holding
+}
+4846 = {	# Kızıltepe
+	holding = city_holding
+}
+4847 = {	# Midyat
+	holding = church_holding
+}
+4845 = {	# Nusaybin
+	holding = none
+}
+###c_nasibin/Batman
+4858 = {	# Batman
+	culture = kurd
+	religion = majlisi
+	holding = castle_holding
+}
+4816 = {	# Siirt
+	holding = church_holding
+}
+4857 = {	# Pervari
+	holding = none
+}
+###c_sirnak/Şırnak
+4813 = {	# Şırnak
+	culture = kurd
+	religion = majlisi
+	holding = castle_holding
+}
+4844 = {	# Cizre
+	holding = city_holding
+}
+4814 = {	# Uludere
+	holding = none
+}
 #custom
 
 # 4810 - BARTULLA
@@ -95,28 +135,6 @@
 	religion = majlisi
 }
 
-# 4813 - BAQIRDA
-4813 = {	# 4813 - Baqirda
-	
-	# Misc
-	culture = kurd
-	religion = armenian_apostolic
-	
-	# History
-
-}
-
-# 4814 - TAMANIN
-4814 = {	# 4814 - Tamanin
-	
-	# Misc
-	culture = kurd
-	religion = armenian_apostolic
-	
-	# History
-
-}
-
 # 4815 - HAKKARI
 4815 = {	# Misc
 	culture = kurd
@@ -127,17 +145,6 @@
 
 }
 
-# 4816 - SA'IRD
-4816 = {	# 4816 - Sa'ird
-	
-	# Misc
-	culture = kurd
-	religion = armenian_apostolic
-	
-	# History
-
-}
-
 # 4817 - JUZA
 4817 = {	# 4817 - Juza
 	
@@ -214,20 +221,6 @@
 	religion = chaldean 
 }
 
-# 4845 - NASIBIN
-4845 = {	# Misc
-	culture = kurd
-	religion = majlisi
-}
-
-# 4846 - DARA
-4846 = {	# 4846 - Dara
-	
-	# Misc
-	culture = kurd
-	religion = armenian_apostolic
-}
-
 # 4848 - SINJAR
 4848 = {	#Misc
 	culture = kurd
@@ -269,17 +262,6 @@
 
 }
 
-# 4854 - MARDIN
-4854 = {	# 4854 - Mardin
-	
-	#Misc
-	culture = syrian
-	religion = majlisi
-	
-	# History
-
-}
-
 # 4873 - TALL_AMMAR
 4873 = {	# 4873 - Tall_Ammar
 	
diff --git a/localization/english/replace/dynasties/NEOW_dynasty_names_l_english.yml b/localization/english/replace/dynasties/NEOW_dynasty_names_l_english.yml
index c4ff71415..15fdbd2fb 100644
--- a/localization/english/replace/dynasties/NEOW_dynasty_names_l_english.yml
+++ b/localization/english/replace/dynasties/NEOW_dynasty_names_l_english.yml
@@ -7535,3 +7535,5 @@
  dynn_Sleiman:0 "Sleiman"
  dynn_Tabet:0 "Tabet"
  dynn_Tarabay:0 "Tarabay"
+ dynn_Tayah:0 "Tayah"
+ dynn_Aracena:0 "Aracena"
diff --git a/localization/english/replace/dynasties/zz_NEOW_dynasty_names_l_english.yml b/localization/english/replace/dynasties/zz_NEOW_dynasty_names_l_english.yml
index 7f2d989fd..88f4e4c0b 100644
--- a/localization/english/replace/dynasties/zz_NEOW_dynasty_names_l_english.yml
+++ b/localization/english/replace/dynasties/zz_NEOW_dynasty_names_l_english.yml
@@ -274,8 +274,6 @@
  dynn_borja:0 "Borja"
  dynn_boatswain:0 "Boatswain"
  dynn_ribera:0 "Ribera"
- dynn_aracena:0 "Aracena"
- dynn_martin:0 "Martin"
  dynn_agurto:0 "Agurto"
  dynn_aboim:0 "Aboim"
  dynn_eivissa:0 "Eivissa"
diff --git a/localization/english/replace/names/NEOW_character_names_l_english.yml b/localization/english/replace/names/NEOW_character_names_l_english.yml
index 94eb8e49a..c37ba8bfc 100644
--- a/localization/english/replace/names/NEOW_character_names_l_english.yml
+++ b/localization/english/replace/names/NEOW_character_names_l_english.yml
@@ -20140,3 +20140,5 @@
  Akram:0 "Akram"
  Ignace:0 "Ignace"
  Miled:0 "Miled"
+ Wadih:0 "Wadih"
+ Mencia:0 "Mencia"
diff --git a/localization/english/replace/titles_l_english.yml b/localization/english/replace/titles_l_english.yml
index 511ce01a0..ba312eb39 100644
--- a/localization/english/replace/titles_l_english.yml
+++ b/localization/english/replace/titles_l_english.yml
@@ -18087,12 +18087,12 @@
  b_al-hayyal:0 "al-Hayyal"
  b_al-jibal:0 "al-Jibal"
  b_tunamir:0 "Tunamir"
- c_nasibin:0 "Nasibin"
- c_nasibin_adj:0 "Nasibinian"
- b_nasibin:0 "Nasibin"
+ c_nasibin:0 "Batman"
+ c_nasibin_adj:0 "Batmanlı"
+ b_nasibin:0 "Nusaybin"
  b_barqaid:0 "Barqaid"
- b_gazirat_ibn_umar:0 "Gazirat ibn Umar"
- b_dara:0 "Dara"
+ b_gazirat_ibn_umar:0 "Cizre"
+ b_dara:0 "Kızıltepe"
  c_khabur:0 "Khabur"
  c_khabur_adj:0 "Khaburan"
  b_makisin:0 "Makisin"
@@ -18118,19 +18118,17 @@
  b_bajarwan:0 "Bajarwan"
  d_diyarbakr:0 "Diyarbakır"
  d_diyarbakr_adj:0 "Diyarbakırlı"
- c_tall_basma:0 "Tall Basma"
- c_tall_basma_adj:0 "Tall Basmani"
+ c_tall_basma:0 "Mardin"
+ c_tall_basma_adj:0 "Mardinli"
  b_tall_basma:0 "Çınar"
- b_hisn_kaifa:0 "Hisn Kaifa"
+ b_hisn_kaifa:0 "Midyat"
  c_hakkari:0 "Hakkari"
  c_hakkari_adj:0 "Hakkari"
  b_hakkari:0 "Hakkari"
- b_baqirda:0 "Baqirda"
- b_tamanin:0 "Tamanin"
- b_saird:0 "Saird"
+ b_baqirda:0 "Şırnak"
+ b_tamanin:0 "Uludere"
+ b_saird:0 "Siirt"
  b_juza:0 "Juza"
- b_tall_fafan:0 "Tall Fafan"
- b_arzan:0 "Arzan"
  b_erkne:0 "Dicle"
  d_euphrates:0 "Euphrates"
  d_euphrates_adj:0 "Euphratese"
@@ -19188,7 +19186,7 @@
  b_oltisi:0 "Horasan"
  b_tmogvi:0 "Tmogvi"
  b_arthanuji:0 "Arthanuji"
- b_artaani:0 "Ardavan"
+ b_artaani:0 "Ardahan"
  b_tskhinvali:0 "Tskhinvali"
  b_uplistsikhe:0 "Uplistsikhe"
  b_nicopsia:0 "Nicopsia"
@@ -27269,8 +27267,8 @@
  b_colonea:0 "Şebinkarahisar"
  b_neocaesara:0 "Niksar"
  b_sinoria:0 "Yağlıdere"
- c_edessa:0 "Şanlıurfa"
- c_edessa_adj:0 "Şanlıurfalı"
+ c_edessa:0 "Urfa"
+ c_edessa_adj:0 "Urfalı"
  b_edessa:0 "Şanlıurfa"
  b_al-bira:0 "Birecik"
  c_marash:0 "Kahramanmaraş"
@@ -27308,8 +27306,8 @@
  c_mayyafariqin:0 "Bismil"
  c_mayyafariqin_adj:0 "Bismilli"
  b_mayyafariqin:0 "Silvan"
- b_tall_fafan:0 "Fafan"
- b_arzan:0 "Erzen"
+ b_tall_fafan:0 "Pervari"
+ b_arzan:0 "Batman"
  b_nasriye:0 "Bismil"
  b_hani:0 "Arıcak"
  b_hisn_di-l-qarnain:0 "Bingöl"
@@ -27407,6 +27405,10 @@
  d_kars_adj:0 "Ağrılı"
  c_ardahan:0 "Ardahan"
  c_ardahan_adj:0 "Ardahanlı"
+ d_mardin:0 "Mardin"
+ d_mardin_adj:0 "Mardinli"
+ c_sirnak:0 "Şırnak"
+ c_sirnak_adj:0 "Şırnaklı"
  
  e_caucasia:0 "Caucasia"
  e_caucasia_adj:0 "Caucasian"
diff --git a/map_data/geographical_regions/geographical_region.txt b/map_data/geographical_regions/geographical_region.txt
index 5092d9cc5..f4393f9f8 100644
--- a/map_data/geographical_regions/geographical_region.txt
+++ b/map_data/geographical_regions/geographical_region.txt
@@ -257,7 +257,7 @@ world_middle_east_jerusalem = {
 world_middle_east_arabia = {
 	duchies = {
 		#Jazira
-		d_diyarrabia d_diyarmudar d_diyarbakr d_euphrates
+		d_diyarrabia d_diyarmudar d_diyarbakr d_mardin d_euphrates
 		#Arabia
 		d_jawf d_amman d_shammar d_medina d_mecca d_asir d_najd d_yamama d_al-hasa d_bahrain d_oman
 		#Yemen
@@ -1596,7 +1596,7 @@ custom_eastern_balkans = {
 custom_outremer = {
 	duchies = {
 		#Jazira
-		d_diyarrabia d_diyarmudar d_diyarbakr d_euphrates
+		d_diyarrabia d_diyarmudar d_diyarbakr d_mardin d_euphrates
 		#Arabia (minus extremities)
 		d_jawf d_amman d_shammar d_medina d_mecca d_asir d_najd
 		#Mesopotamia
@@ -1821,7 +1821,7 @@ custom_greater_armenia = {
 		#Atropatene
 		d_azerbaijan
 		#Sophene
-		d_diyarbakr
+		d_diyarbakr d_mardin
 		#Gordyene & Adiabene
 		d_kurdistan
 		#Cilicia
@@ -2070,7 +2070,7 @@ custom_beth_nahrain = {
 		#Jerusalem
 		d_oultrejourdain d_palestine d_urdunn
 		#Jazira
-		d_diyarrabia d_diyarmudar d_diyarbakr d_euphrates
+		d_diyarrabia d_diyarmudar d_diyarbakr d_mardin d_euphrates
 		#Mesopotamia
 		d_kermanshah d_basra d_baghdad d_samarra d_kurdistan d_wasit d_kufa
 	}
@@ -2323,7 +2323,7 @@ world_mesopotamia = { #k_mesopotamia
 }
 world_jazira = { #k_jazira
 	duchies = {
-		d_diyarrabia d_diyarmudar d_diyarbakr d_euphrates
+		d_diyarrabia d_diyarmudar d_diyarbakr d_mardin d_euphrates
 	}
 }
 
@@ -2498,7 +2498,7 @@ special_mongol_empire_conquest_region_prio_4 = {
 		#k_mesopotamia
 		d_samarra d_wasit d_kufa d_basra d_baghdad
 		#k_jazira
-		d_diyarrabia d_diyarmudar d_diyarbakr d_euphrates d_kurdistan
+		d_diyarrabia d_diyarmudar d_diyarbakr d_mardin d_euphrates d_kurdistan
 
 		#Western Steppe
 		# k_caucasus
@@ -2941,7 +2941,7 @@ ghw_region_anatolia = {
 ghw_region_near_east = {
 	duchies = {
 		#Jazira
-		d_diyarrabia d_diyarmudar d_diyarbakr d_euphrates
+		d_diyarrabia d_diyarmudar d_diyarbakr d_mardin d_euphrates
 		#Mesopotamia
 		d_samarra d_kurdistan d_wasit d_kufa d_basra d_baghdad
 		#Northern Syria
@@ -3707,7 +3707,7 @@ islamic_heartlands = { # Set up so that Apostolic survives a bit longer
 		d_oultrejourdain d_palestine d_urdunn
 		#Southern Syria
 		d_lebanon d_damascus
-		#Jazira, excluding: d_diyarbakr, d_diyarmudar
+		#Jazira, excluding: d_diyarbakr d_mardin, d_diyarmudar
 		d_diyarrabia d_euphrates
 		#Mesopotamia
 		d_samarra d_kurdistan d_wasit d_kufa d_basra d_baghdad
@@ -5012,7 +5012,7 @@ tgp_silk_road_occident_region = {
 		d_daylam d_tabaristan d_gurgan d_azerbaijan # Daylam
 		d_isfahan d_kirman d_yazd d_rayy d_hamadan d_fars d_hormuz d_khuzestan d_kermanshah # Persia
 		d_samarra d_kurdistan d_wasit d_kufa d_basra d_baghdad # Mesopotamia
-		d_diyarrabia d_diyarmudar d_diyarbakr d_euphrates # Jazira
+		d_diyarrabia d_diyarmudar d_diyarbakr d_mardin d_euphrates # Jazira
 		d_nishapur d_ghur d_herat d_nasa d_kohestan # Khorasan
 	}
 	counties = {
@@ -5373,7 +5373,7 @@ hunt_animal_boar_region = {
 		# Southern Scandinavia
 		d_slesvig d_sjaelland d_jylland d_skane d_smaland d_viken d_vastergotland d_ostergotland d_finland d_savo d_karelia d_bergslagen d_svealand
 		# Egypt
-		d_diyarmudar d_diyarbakr d_sinai d_cairo d_delta d_al-said d_alexandria d_cyrenaica d_nobatia d_shamir d_makuria
+		d_diyarmudar d_diyarbakr d_mardin d_sinai d_cairo d_delta d_al-said d_alexandria d_cyrenaica d_nobatia d_shamir d_makuria
 	}
 }
 
@@ -5391,7 +5391,7 @@ hunt_animal_bear_region = {
 	}
 	duchies = {
 		# North Mesopotamia
-		d_kermanshah d_baghdad d_samarra d_kurdistan d_wasit d_diyarrabia d_diyarmudar d_diyarbakr d_euphrates d_isfahan d_rayy d_hamadan d_fars d_khuzestan d_daylam d_tabaristan d_azerbaijan d_edessa
+		d_kermanshah d_baghdad d_samarra d_kurdistan d_wasit d_diyarrabia d_diyarmudar d_diyarbakr d_mardin d_euphrates d_isfahan d_rayy d_hamadan d_fars d_khuzestan d_daylam d_tabaristan d_azerbaijan d_edessa
 	}
 }