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 f88f923a..da555336 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
@@ -33153,7 +33153,7 @@ k_caucasus={
 }
 
 
-k_volgograd={
+k_khazaria={
 	custom=yes
 	pattern="pattern_solid.dds"
 	color1=red
diff --git a/common/culture/cultures/NEOW_kipchak.txt b/common/culture/cultures/NEOW_kipchak.txt
index 93cae074..abe56226 100644
--- a/common/culture/cultures/NEOW_kipchak.txt
+++ b/common/culture/cultures/NEOW_kipchak.txt
@@ -111,32 +111,4 @@ karachay = {
 		15 = mediterranean_byzantine
 		25 = mediterranean
 	}
-}
-
-kazakh = {
-	color = rgb{0.2 0.5 0.8}
-	
-	ethos = ethos_bellicose
-	heritage = heritage_kipchak
-	language = language_kipchak_cuman
-	martial_custom = martial_custom_male_only	
-	traditions = {
-		tradition_horse_lords
-		tradition_pastoralists
-		tradition_diasporic
-		tradition_horse_breeder
-	}
-	
-	name_list = name_list_NEOW_turkish
-	
-	coa_gfx = { turkic_group_coa_gfx steppe_coa_gfx }
-	building_gfx = { steppe_building_gfx }
-	clothing_gfx = { turkic_clothing_gfx mongol_clothing_gfx }
-	unit_gfx = { mongol_unit_gfx }
-	
-	ethnicities = {
-		30 = slavic_brown_hair
-		30 = slavic_dark_hair
-		40 = asian
-	}
 }
\ No newline at end of file
diff --git a/common/decisions/NEOW_artifact_decisions.txt b/common/decisions/NEOW_artifact_decisions.txt
index b45437c7..1f6c9c04 100644
--- a/common/decisions/NEOW_artifact_decisions.txt
+++ b/common/decisions/NEOW_artifact_decisions.txt
@@ -4,26 +4,19 @@ reforge_crown_wenceslas_decision = {
 	}
 
     desc = reforge_crown_wenceslas_decision_desc
+    decision_group_type = realm
     sort_order = 100
-
     selection_tooltip = reforge_crown_wenceslas_decision_tooltip
     cooldown = { days = 1000 }
 	
 	is_shown = {
-        AND = { 
-            OR = {
-                any_character_artifact = {
-		            has_variable = crown_wenceslas
-	            }
-                has_title = title:k_bohemia
-            }
-            NOT = { 
-                any_character_artifact = {
-                    has_variable = crown_wenceslas_reforged
-	            }
+        OR = {
+            any_character_artifact = {
+                has_variable = crown_wenceslas
             }
+            has_title = title:k_bohemia
         }
-    }
+	}
 
     is_valid = {
         has_title = title:k_bohemia
@@ -32,8 +25,8 @@ reforge_crown_wenceslas_decision = {
         custom_tooltip = {
             text = must_have_crown_wenceslas
             any_character_artifact = {
-		        has_variable = crown_wenceslas
-	        }
+                has_name = crown_wenceslas_name
+            }
         }
     }
 
@@ -49,7 +42,7 @@ reforge_crown_wenceslas_decision = {
             }
             every_character_artifact = {
                 limit = {
-                    has_variable = crown_wenceslas
+                    has_name = crown_wenceslas_name
                 }
                 destroy_artifact = this
             }
@@ -65,7 +58,7 @@ reforge_crown_wenceslas_decision = {
 		        quality = scope:quality
                 culture = root.culture
 	        	decaying = no
-	        	save_scope_as = crown_wenceslas_reforged
+	        	save_scope_as = newly_created_artifact
 	        	history = {
 	        		location = root.capital_province
 	        		actor = root
@@ -73,16 +66,11 @@ reforge_crown_wenceslas_decision = {
                     type = created_before_history
 		        }
             }
-            scope:crown_wenceslas_reforged = {
-                set_variable = { name = historical_unique_artifact value = yes }
-		        set_variable = crown_wenceslas_reforged
-		        save_scope_as = epic
-            }
         }
     }
 
     ai_check_interval = { 500 }
     ai_will_do = {
-        base = 50
+        base = 15
     }
 }
\ No newline at end of file
diff --git a/common/landed_titles/NEOW_special_titles.txt b/common/landed_titles/NEOW_special_titles.txt
index a4319d41..4119fcb2 100644
--- a/common/landed_titles/NEOW_special_titles.txt
+++ b/common/landed_titles/NEOW_special_titles.txt
@@ -20,6 +20,30 @@ d_wisentland = {
 	color = { 127 255 255 }
 }
 
+d_bundesreich = {
+	color = { 209 5 20 }
+}
+
+d_luthermannien = {
+	color = { 46 142 243 }
+}
+
+d_tauben = {
+	color = { 255 255 255 }
+}
+
+d_toterpapsten = {
+	color = { 95 206 204 }
+}
+
+d_arminien = {
+	color = { 127 106 0 }
+}
+
+d_neddersassen = {
+	color =	{ 156 18 16 }
+}
+
 k_gwynedd = {
 	color = { 1 146 1 }
 }
\ No newline at end of file
diff --git a/common/landed_titles/finland.txt b/common/landed_titles/finland.txt
index 71574f33..d91208ee 100644
--- a/common/landed_titles/finland.txt
+++ b/common/landed_titles/finland.txt
@@ -238,7 +238,7 @@ e_finland = {
 		d_giemajohka = { #(Kemi älv)
 			color = { 130 130 190 }
 
-			capital = c_giepma
+			capital = c_giempa
 			c_giepma = {	#Kemi
 				color = { 210 220 255 }
 				b_giempa = { #Kemi
@@ -266,11 +266,6 @@ e_finland = {
 
 					color = { 210 240 255 }
 				}
-				b_sombio = {
-					province = 390
-
-					color = { 130 125 245 }
-				}
 			}
 			c_kittila = {
 				color = { 143 194 249  }
@@ -320,33 +315,18 @@ e_finland = {
 		d_guoldat = { #Guoládat = Kola
 			color = { 44 20 169 }
 			capital = c_skolt
-			c_murmansk = {
-				color = { 144 120 250 }
-				b_murmansk = {
-					province = 404
 
-					color = { 144 120 250 } 
-				}
-				b_pechengsky = {
-					province = 8789
-					color = { 144 120 250 }
-				}
-				b_vidyayevo = { #Mue´t??
-					province = 402
-
-					color = { 144 120 250 }
-				}
-			}
 			c_ter = {
 				color = { 55 35 245 }
-				b_jovvkuj = { #Jovvkuj
-					province = 415
+
+				b_sosnevke = { #Sosnevke
+					province = 417
 
 					color = { 55 35 245 }
 
 				}
-				b_sosnevke = { #Sosnevke
-					province = 417
+				b_jovvkuj = { #Jovvkuj
+					province = 415
 
 					color = { 55 35 245 }
 
@@ -357,6 +337,10 @@ e_finland = {
 					color = { 55 35 245 }
 
 				}
+				b_peliza = {
+					province = 8790
+					color = { 55 35 245 }
+				}
 			}
 			c_jovvkuj = {	#Kildin
 				color = { 40 15 200 }
@@ -379,21 +363,17 @@ e_finland = {
 					color = { 40 15 200 }
 
 				}
-				b_kintus = { #Kintuš
-					province = 414
+			}
+			c_east_kiilt = {	#Kordok
+				color = { 25 5 75 }
 
-					color = { 35 5 135 }
-				}
 				b_lujavvr = { #Lujavv'r
 					province = 410
 
 					color = { 25 5 75 }
 
 				}
-			}
-			c_east_kiilt = {	#Kordok
-				color = { 25 5 75 }
-				b_tyrber = {
+				b_koardegk = {
 					province = 405
 
 					color = { 25 5 75 }
@@ -404,19 +384,21 @@ e_finland = {
 					color = { 25 5 75 }
 				}
 			}
-			c_tersky = {
+			c_kintus = {
 				color = { 35 5 135 }
-				b_umba = {
-					province = 8792
+
+				b_kintus = { #Kintuš
+					province = 414
+
 					color = { 35 5 135 }
 				}
-				b_varzuga = {	#AKA Varzuga
+				b_varsiga = {	#AKA Varzuga
 					province = 8791
 					color = { 35 5 135 }
 				}
-				b_pyalitsa = {
-					province = 8790
-					color = { 55 35 245 }
+				b_cascarena = {
+					province = 8792
+					color = { 35 5 135 }
 				}
 			}
 			c_akkel = {	#Akkala
@@ -437,8 +419,28 @@ e_finland = {
 					color = { 35 10 145 }
 				}
 			}
-			c_skolt = {
+			c_kitka = {
+				color = { 150 100 250 }
+
+				b_kitka = {
+					province = 419
+
+					color = { 15 10 150 }
+				}
+				b_koulajavri = { #Koulajävri
+					province = 418
+
+					color = { 15 10 150 }
+				}
+			}
+			c_sombio = {
 				color = { 130 125 245 }
+
+				b_sombio = {
+					province = 390
+
+					color = { 130 125 245 }
+				}
 				b_suonnjel = { #Suõ?nnjel
 					province = 401
 
@@ -454,10 +456,22 @@ e_finland = {
 
 					color = { 130 125 245 }
 				}
-				b_koulajavri = { #Koulajävri
-					province = 418
+			}
+			c_skolt = {
+				color = { 144 120 250 }
+				b_kiilt = {
+					province = 404
 
-					color = { 15 10 150 }
+					color = { 144 120 250 } 
+				}
+				b_skolt = {
+					province = 8789
+					color = { 144 120 250 }
+				}
+				b_muetkk = { #Mue´t??
+					province = 402
+
+					color = { 144 120 250 }
 				}
 			}			
 		}		
@@ -740,11 +754,6 @@ e_finland = {
 					province = 455
 					color = { 20 5 150 }
 				}
-				b_kitka = {
-					province = 419
-
-					color = { 15 10 150 }
-				}
 			}			
 			c_povenets = {
 				color = { 123 164 161 }
@@ -908,22 +917,6 @@ e_finland = {
 					province = 171
 					color = { 220 160 50 }
 				}
-				b_schlisselburg = {
-					province = 170
-					color = { 0 113 113 }
-
-					cultural_names = {
-						name_list_swedish = cn_noteborg_SWENORSE
-						name_list_norse = cn_noteborg_SWENORSE
-						name_list_norwegian = cn_noteborg_DANNOR
-						name_list_danish = cn_noteborg_DANNOR
-						name_list_franconian = cn_schlusselburg
-						name_list_saxon = cn_schlusselburg
-						name_list_swabian = cn_schlusselburg
-						name_list_bavarian = cn_schlusselburg
-						name_list_russian = cn_oreshek
-					}
-				}
 			}
 						
 			c_kymmenlaakso = {
diff --git a/common/landed_titles/nistrenia.txt b/common/landed_titles/nistrenia.txt
index 8f6150cf..f294ea66 100644
--- a/common/landed_titles/nistrenia.txt
+++ b/common/landed_titles/nistrenia.txt
@@ -2262,11 +2262,6 @@ e_nistrenia = {
 					province = 5224
 
 					color = { 126 99 133 }
-				}
-				b_mstislavl = {
-					province = 551
-
-					color = { 146 124 153 }
 				}				
 			}			
 		}
@@ -2740,18 +2735,18 @@ e_nistrenia = {
 			}
 		}
 	}
-	k_volgograd = {
+	k_khazaria = {
 		color = { 227 201 98 }
-		capital = c_volgograd
+		capital = c_sarysyn
 	
-		d_volgograd = {
+		d_khazaria = {
 			color = { 143 92 21 }
 
-			capital = c_volgograd
-			c_volgograd = {
+			capital = c_sarysyn # Sarkel
+			c_sarysyn = {
 				color = { 91 95 25 }
 
-				b_volgograd = {
+				b_sarysyn = {
 					province = 595
 					color = { 91 95 25 }
 				}
@@ -2761,78 +2756,77 @@ e_nistrenia = {
 
 					color = { 91 95 25 }
 				}
-				b_svetlyy_yar= {
+				b_sarepta = {
 					province = 5333
 
 					color = { 145 100 38 }
 				}
-				b_kotelnikovo  = {
-					province = 5315
-
-					color = { 125 80 18 }
-				}				
-			}
-			c_surovikino = {
-				color = { 130 130 60 }
-				b_surovikino = {
-					province = 594
-
-					color = { 130 130 60 }
-				}
-				b_serafimovich = {
-					province = 5291
-
-					color = { 130 130 60 }
-				}
-			}
-			c_volzhskiy  = {
-				color = { 176 102 16 }
-				
-				b_volzhskiy = {
+				b_saray = {
 					province = 619
 
 					color = { 176 102 16 }
 				}
-				b_nikolayevsk = {
+				b_nikolaievsk = {
 					province = 5316
 
 					color = { 176 102 16 }
-				}					
+				}				
 			}
 			c_frolovo = {
-				color = { 121 105 45 }
+				color = { 91 95 25 }
 				
 				b_frolovo = {
 					province = 5293
 
-					color = { 121 105 45 }
+					color = { 91 95 25 }
 				}				
 				b_yelan = {
 					province = 5295
 
-					color = { 121 105 45 }
+					color = { 91 95 25 }
 				}
 				b_peschanka = {
 					province = 5508
 
-					color = { 121 105 45 }
+					color = { 95 65 74 }
 				}
 				b_tersa = {
 					province = 5410
 
-					color = { 121 105 45 }
+					color = { 95 65 74 }
 				}
 				b_viazovka = {
 					province = 5379
 
-					color = { 121 105 45 }
+					color = { 95 70 59 }
 				}
 			}		
 		}
-		d_astrakhan = {
+		d_itil = {
 			color = { 196 118 27 }
 
 			capital = c_itil  #Itil
+
+			c_itil = {
+				color = { 176 102 16 }
+
+				b_itil = {
+					province = 620
+
+					color = { 176 102 16 }
+				}
+				b_chyorny_yar = {
+					province = 5345
+
+					color = { 176 102 16 }
+				}
+
+				b_saqsin = {
+					province = 5313
+
+					color = { 202 125 19 }
+				}				
+			}
 			c_astrakhan = {
 				color = { 151 118 30 }
 
@@ -2841,35 +2835,16 @@ e_nistrenia = {
 
 					color = { 151 118 30 }
 				}
-				b_narimanov = {
+				b_khazaran = {
 					province = 604
 
 					color = { 151 118 30 }
 				}
 			}
-			c_akthubinsk = {
-				color = { 176 102 16 }
-				b_akthubinsk = {
-					province = 5345
-
-					color = { 176 102 16 }
-				}
-				b_kharabali = {
-					province = 620
-
-					color = { 176 102 16 }
-				}
-
-				b_volodarsky = {
-					province = 5313
-
-					color = { 202 125 19 }
-				}				
-			}
-			c_chyorny_yar = {
+			c_beksima = {
 				color = { 145 100 38 }
 
-				b_chyorny_yar = {
+				b_beksima = {
 					province = 605
 
 					color = { 145 100 38 }
@@ -2955,27 +2930,27 @@ e_nistrenia = {
 				}
 			}
 		}
-		d_rostov = {
-			color = { 100 20 50 }
+		d_don_valley = {
+			color = { 227 201 98 }
 
 			capital = c_tana
 
-			c_rostov_on_don = {
-				color = { 100 20 50 }
-				b_rostov_on_don = {
+			c_tana = {
+				color = { 215 190 55 }
+				b_tana = {
 					province = 596
 
-					color = { 100 20 50 }
+					color = { 215 190 55 }
 				}
 				b_taganrog = {
 					province = 563
 
-					color = { 100 20 50 }
+					color = { 215 190 55 }
 				}
 				b_ivanovskoye = {
 					province = 5329
 
-					color = { 100 20 50 }
+					color = { 240 230 60 }
 				}
 			}
 			c_golden_hills = {
@@ -2986,12 +2961,36 @@ e_nistrenia = {
 
 					color = { 205 175 85 }
 				}
+				b_siyahtepe = {
+					province = 5291
+
+					color = { 205 175 85 }
+				}
 				b_ust-donvokhi = {
 					province = 5292
 
 					color = { 205 175 85 }
 				}
-			}		
+				b_kazarki = {
+					province = 594
+
+					color = { 205 175 85 }
+				}
+			}
+			c_kazanskaya = {
+				color = { 236 200 105 }
+
+				b_kazanskaya = {
+					province = 5287
+
+					color = { 236 200 105 }
+				}
+				b_khopyor = {
+					province = 593
+
+					color = { 74 70 33 }
+				}				
+			}			
 			c_millerovo = {
 				color = { 185 150 70 }
 
@@ -3038,6 +3037,11 @@ e_nistrenia = {
 
 					color = { 125 80 18 }
 				}
+				b_aksay = {
+					province = 5315
+
+					color = { 125 80 18 }
+				}
 				b_semikarakary = {
 					province = 5332
 
@@ -3247,18 +3251,17 @@ e_nistrenia = {
 				}
 			}
 			c_laganya = {
-				color = { 40 130 210 }
 				b_lagan = { 
 					province = 5312
 					color = { 130 180 220 }
 				}
 				b_komsomolsky = { 
 					province = 12390
-					color = { 130 180 220 }
+					ccolor = { 130 180 220 }
 				}
 				b_ik_buurla = { 
 					province = 12389
-					color = { 130 180 220 }
+					ccolor = { 130 180 220 }
 				}
 				b_yusta = {
 					province = 5514
diff --git a/common/landed_titles/russia.txt b/common/landed_titles/russia.txt
index 966474ad..c1a61760 100644
--- a/common/landed_titles/russia.txt
+++ b/common/landed_titles/russia.txt
@@ -73,6 +73,11 @@
 						name_list_lithuanian = cn_naugardas
 					}
 				}
+				b_soltsy = {
+					province = 5140
+
+					color = { 122 153 90 }
+				}
 				b_svolensk = {
 					province = 5254
 
@@ -82,15 +87,26 @@
 
 			c_luki = {
 				color = { 43 166 109 }
-				b_borovichi = {
-					province = 5155
 
-					color = { 125 229 163 }
-				}	
+				b_kholm_NOV = {
+					province = 5162
+
+					color = { 43 166 109 }
+				}
+				b_seltsa_u_nishi = {
+					province = 5163
+
+					color = { 43 166 109 }
+				}
 				b_valday = {
 					province = 5166
 
 					color = { 140 170 120 }
+				}	
+				b_borovichi = {
+					province = 5155
+
+					color = { 125 229 163 }
 				}				
 			}			
 		
@@ -102,16 +118,17 @@
 
 					color = { 97 189 149 }
 				}
-				b_kholm_NOV = {
-					province = 5162
+				b_dedovichi = {
+					province = 5144
 
-					color = { 43 166 109 }
+					color = { 97 189 149 }
 				}
-				b_kresttsy = {
-					province = 5163
+				b_loknya = {
+					province = 5145
 
-					color = { 43 166 109 }
+					color = { 97 189 149 }
 				}
+
 			}
 		}
 		d_pskov = {
@@ -156,16 +173,6 @@
 				b_porkhov = {
 					province = 5177
 
-					color = { 97 189 149 }
-				}	
-				b_soltsy = {
-					province = 5140
-
-					color = { 122 153 90 }
-				}
-				b_dedovichi = {
-					province = 5144
-
 					color = { 97 189 149 }
 				}				
 			}
@@ -203,11 +210,6 @@
 					province = 5161
 
 					color = { 43 166 109 }
-				}	
-				b_loknya = {
-					province = 5145
-
-					color = { 97 189 149 }
 				}				
 			}
 		}	
@@ -221,50 +223,48 @@
 
 				b_nyen = {
 					province = 169
-					color = { 0 113 113 }
-				}
-				b_kronstadt = {
-					province = 12374
-					color = { 0 113 113 }
-				}	
-				b_petergof = {
-					province = 12373
-					color = { 0 113 113 }
-				}
-				b_pushkin = {
-					province = 12372
-					color = { 0 113 113 }
-				}
-				b_sestroretsk = {
-					province = 12371
-					color = { 0 113 113 }
-				}					
-			}
-			c_ingria = {
-				b_gatchina = {
-					province = 5142
-
 					color = { 113 0 0 }
 				}
-				b_sosnovy_bor = {
+				b_noteborg = {
+					province = 170
+					color = { 113 0 0 }
+
+					cultural_names = {
+						name_list_swedish = cn_noteborg_SWENORSE
+						name_list_norse = cn_noteborg_SWENORSE
+						name_list_norwegian = cn_noteborg_DANNOR
+						name_list_danish = cn_noteborg_DANNOR
+						name_list_franconian = cn_schlusselburg
+						name_list_saxon = cn_schlusselburg
+						name_list_swabian = cn_schlusselburg
+						name_list_bavarian = cn_schlusselburg
+						name_list_russian = cn_oreshek
+					}
+				}
+				b_koporye = {
 					province = 168
 					color = { 113 0 0 }
 				}
-				b_kingisepp = {
+				b_yama = {
 					province = 167
 					color = { 113 0 0 }
-				}	
+				}
 				b_luga = {
 					province = 5141
 
-					color = { 113 0 0 }
+					color = { 122 153 90 }
+				}
+				b_pushkin = {
+					province = 5142
+
+					color = { 122 153 90 }
 				}	
-				b_tosno = {
+				b_lyuban = {
 					province = 5139
 
-					color = { 113 0 0 }
-				}						
-			}
+					color = { 122 153 90 }
+				}				
+			}			
 			c_tikhvin = {
 				color = { 125 229 163 }
 
@@ -311,20 +311,15 @@
 					province = 5160
 
 					color = { 120 250 200 }
-				}	
-				b_shugozero = {
-					province = 12370
-
-					color = { 120 250 200 }
-				}					
+				}				
 			}	
 		}
 	}
 
-	k_moskva = { #Vladimir
+	k_opolye = { #Vladimir
 		color = { 87 144 50 }
 
-		capital = c_moskva # Moscow
+		capital = c_moskva # Yaroslavl
 
 		ai_primary_priority = {
 			if = {
@@ -335,103 +330,72 @@
 			}
 		}
 
-		d_moskva = {
-			color = { 180 60 40 }
+		d_opolye = {
+			color = { 100 168 56 }
 
-			capital = c_moskva # Moscow
+			capital = c_moskva # Yaroslavl
 				
 			c_moskva = {
-				color = { 180 160 40 }
+				color = { 10 150 10 }
 
 				b_moskva = {
 					province = 575
 
-					color = { 180 160 40 }
+					color = { 10 150 10 }
 				}
-				b_zelenograd = {
-					province = 12345
+				b_kolomna = {
+					province = 578
 
-					color = { 180 160 40 }
-				}	
-				b_danilov_moscow = {
-					province = 12346
-					color = { 180 160 40 }
+					color = { 10 150 10 }
 				}
-				b_kuntsevo = {
-					province = 12347
-
-					color = { 180 160 40 }
-				}
-				b_koroshevo = {
-					province = 12350
-
-					color = { 180 160 40 }
-				}
-				b_izmaylovo = {
-					province = 12369
-
-					color = { 180 160 40 }
-				}
-			}
-			c_dmitrov = {
-				color = { 140 120 10 }
-
 				b_dmitrov = {
 					province = 570
 
-					color = { 140 120 10 }
+					color = { 10 150 10 }
 				}
 				b_naro-fominsk = {
 					province = 5244
 
-					color = { 140 120 10 }
+					color = { 10 150 10 }
 				}
 				b_serpukhov = {
 					province = 5245
 
-					color = { 140 120 10 }
-				}
-			}
-			c_kolomna = {	
-				color = { 140 130 50 }
-				b_kolomna = {
-					province = 578
-
-					color = { 140 130 50 }
+					color = { 10 150 10 }
 				}	
 				b_yegoryevsk = {
 					province = 5238
 
-					color = { 140 130 50 }
+					color = { 67 174 67 }
 				}
 				b_volochok = {
 					province = 5236
 
-					color = { 140 130 50 }
+					color = { 67 174 67 }
 				}				
 			}
 			c_mozhaysk = {
-				color = { 141 135 60 }
+				color = { 101 89 105 }
 
 				b_mozhaysk = {
 					province = 587
 
-					color = { 141 135 60 }
+					color = { 101 89 105 }
 				}
 				b_lotoshino = {
 					province = 5226
 
-					color = { 141 135 60 }
+					color = { 101 89 105 }
 				}
 				b_volok_lamsky = {
 					province = 5174
 
-					color = { 141 135 60 }
+					color = { 50 102 50 }
 				}
 				b_klin = {
 					province = 5243
 
-					color = { 141 135 60 }
+					color = { 50 102 50 }
 				}				
 			}
 		}
@@ -439,7 +403,7 @@
 			color = { 67 174 67 }
 			capital = c_vladimir
 			
-			c_ivanovo = {
+			c_plyos = {
 				color = { 5 85 35 }
 				b_ivanovo = {
 					province = 5241
@@ -451,7 +415,7 @@
 
 					color = { 6 145 75 }
 				}
-				b_vichuga = {
+				b_plyos = {
 					province = 5247
 
 					color = { 5 85 35 }
@@ -563,12 +527,7 @@
 					province = 5165
 
 					color = { 140 170 120 }
-				}	
-				b_udomlya = {
-					province = 972
-
-					color = { 140 170 120 }
-				}					
+				}				
 			}
 			c_bezichi = {
 				color = { 153 204 153 }
@@ -735,6 +694,11 @@
 
 					color = { 146 124 153 }
 				}
+				b_mstislavl = {
+					province = 551
+
+					color = { 146 124 153 }
+				}
 				b_yelnya = {
 					province = 5220
 
@@ -839,123 +803,118 @@
 				}				
 			}
 		}
-		d_oryol = {
-			color = { 80 120 120 }
+		d_novosil = {
+			color = { 180 201 36 }
 
-			capital = c_oryol # Novosil
-			c_oryol = {
-				color = { 80 120 120 }
-
-				b_oryol = {
-					province = 5211
-
-					color = { 80 120 120 }
-				}	
-				b_krom = {
-					province = 5210
-
-					color = { 80 120 120 }
-				}				
-			}
-			c_novosil = {
-				color = { 60 100 100 }
-
-				b_novosil = {
-					province = 5215
-
-					color = { 50 90 90 }
-				}
-				b_mtensk = {
-					province = 5216
-
-					color = { 50 90 90 }
-				}
-				b_ust-livny = {
-					province = 5207
-
-					color = { 50 90 90 }
-				}					
-			}
-		}	
-		d_tula = {
-			color = { 130 100 50 }
-
-			capital = c_tula # Novosil
+			capital = c_novosil # Novosil
 			c_tula = {
-				color = { 130 100 50 }
+				color = { 101 110 45 }
 
 				b_tula = {
 					province = 5231
 
-					color = { 130 100 50 }
+					color = { 101 110 45 }
 				}
 				b_rostislavl = {
 					province = 5229
 
-					color = { 130 100 50 }
+					color = { 60 95 25 }
 				}				
-			}			
-			c_odoyev = {
-				color = { 100 80 30 }
+			}
+			c_novosil = {
+				color = { 158 176 38 }
 
-				b_odoyev = {
-					province = 5217
+				b_novosil = {
+					province = 5215
 
-					color = { 100 80 30 }
+					color = { 158 176 38 }
 				}
-				b_suvorov = {
-					province = 5218
+				b_mtensk = {
+					province = 5216
 
-					color = { 100 80 30 }
+					color = { 158 176 38 }
+				}
+				b_ust-livny = {
+					province = 5207
+
+					color = { 73 128 27 }
+				}					
+			}
+			c_karachev = {
+				color = { 82 165 10 }
+
+				b_krom = {
+					province = 5210
+
+					color = { 82 165 10 }
+				}
+				b_oryol = {
+					province = 5211
+
+					color = { 82 165 10 }
 				}
 				b_belev = {
 					province = 5214
 
-					color = { 100 80 30 }
+					color = { 99 198 42 }
+				}				
+			}			
+			c_odoyev = {
+				color = { 138 156 16 }
+
+				b_odoyev = {
+					province = 5217
+
+					color = { 138 156 16 }
+				}
+				b_suvorov = {
+					province = 5218
+
+					color = { 138 156 16 }
 				}
 			}
 		}		
 		d_ryazan = {
-			color = { 120 100 30 }
+			color = { 75 110 41 }
 
 			capital = c_ryazan # Ryazan
 
 			c_ryazan = {
-				color = { 120 100 30 }
+				color = { 60 95 25 }
 				b_pereyaslavl_ryazanski = {
 					province = 5228
 
-					color = { 120 100 30 }
+					color = { 60 95 25 }
 				}
 
 				b_ryazan = {
 					province = 580
 
-					color = { 120 100 30 }
+					color = { 60 95 25 }
 				}
 				b_pronsk = {
 					province = 577
 
-					color = { 120 100 30 }
+					color = { 101 110 45 }
 				}
 			
 			}
 			c_gorodets-meshchyorsky = {
-				color = { 100 70 10 }
+				color = { 100 130 50 }
 				b_gorodets-meshchyorsky = {
 					province = 5233
 
-					color = { 100 70 10 }
+					color = { 100 130 50 }
 				}		
 				b_vaskina_polyana = {
 					province = 5253
 
-					color = { 100 70 10 }
+					color = { 60 95 25 }
 				}
 				b_klepiki = {
 					province = 5230
 
-					color = { 100 70 10 }
+					color = { 60 95 25 }
 				}				
 			}		
 		}
@@ -1001,30 +960,48 @@
 						name_list_muroma = cn_voronej
 					}
 				}
-				b_ostrogozhsk  = {
-					province = 5285
+				b_usman = {
+					province = 5352
 
-					color = { 60 75 40 }
+					color = { 26 52 24 }
 				}
-				b_semiluki  = {
-					province = 12341
+				b_lipetsk = {
+					province = 5351
 
-					color = { 60 75 40 }
+					color = { 26 52 24 }
 				}
 				b_yelets = {
 					province = 5232
 
 					color = { 101 110 45 }
 				}
+				
 			}			
-			c_novovoronezh = {
-				color = { 40 60 50 }
+			c_karatayak = {
+				color = { 56 42 24 }
 
+				b_karatayak = {
+					province = 5371
 
-				b_novovoronezh = {
+					color = { 56 42 24 }
+				}
+				b_pavlovsk = {
+					province = 5373
+
+					color = { 56 42 24 }
+
+					cultural_names = {
+						name_list_mordvin = cn_varakavir
+						name_list_merya = cn_varakavir
+						name_list_meshchera = cn_varakavir
+						name_list_mari = cn_varakavir
+						name_list_muroma = cn_varakavir
+					}
+				}
+				b_babrov = {
 					province = 5372
 
-					color = { 40 60 50 }
+					color = { 56 42 24 }
 
 					cultural_names = {
 						name_list_mordvin = cn_tundokev
@@ -1034,138 +1011,109 @@
 						name_list_muroma = cn_tundokev
 					}
 				}
-				
-				b_bobrov = {
-					province = 5373
-				
-					color = { 40 60 50 }
-					
-					cultural_names = {
-						name_list_mordvin = cn_varakavir
-						name_list_merya = cn_varakavir
-						name_list_meshchera = cn_varakavir
-						name_list_mari = cn_varakavir
-						name_list_muroma = cn_varakavir
-					}
-				}
 			}
-			c_pavlovsk = {
-				color = { 50 70 50 }
-				b_pavlovsk = {
-					province = 5380
-
-					color = { 50 70 50 }
-				}
-				b_liski = {
-					province = 5371
-
-					color = { 50 70 50 }
-				}
-				b_rossosh   = {
-					province = 5325
-
-					color = { 50 70 50 }
-				}
-			}		
-			c_ertil= {
-				color = { 40 58 40 }
-
-				b_ertil = {
-					province = 5374
-
-					color = { 40 58 40 }
-				}
-				b_ternovka = {
-					province = 5375
-
-					color = { 40 58 40 }
-				}
-				b_novokhopyorsk = {
-					province = 5376
-
-					color = { 40 58 40 }
-				}
-				b_talovaya = {
-					province = 5382
-
-					color = { 74 70 33 }
-				}
-				b_uryupinsk = {
-					province = 5381
-
-					color = { 74 70 33 }
-				}
-			}
-			c_boguchar = {
-				color = { 70 110 70 }
-
-				b_boguchar = {
-					province = 5287
-
-					color = { 70 110 70 }
-				}
-				b_kalach = {
-					province = 593
-
-					color = { 70 110 70 }
-				}				
-			}	
-		}
-		d_kursk = {
-			color = { 60 100 50 }
-			capital = c_kursk
 			c_kursk = {
-				color = { 60 100 50 }
+				color = { 130 180 55 }
 
 				b_kursk = {
 					province = 5196
 
-					color = { 60 100 50 }
+					color = { 130 180 55 }
 				}
 				b_rylsk = {
 					province = 5197
 
-					color = { 60 100 50 }
+					color = { 130 180 55 }
 				}
 				b_sudzha = {
 					province = 5198
 
-					color = { 60 100 50 }
+					color = { 130 180 55 }
 				}
 				b_oboyan = {
 					province = 5199
 
-					color = { 60 100 50 }
-				}
-				b_shchigry = {
-					province = 5286
-
-					color = { 60 100 50 }
+					color = { 130 180 55 }
 				}
 			}			
-			c_belgorod = {
+			c_oskol = {
 				color = { 66 62 44 }
-				b_belgorod = {
-					province = 5284
 
-					color = { 66 62 44 }
-				}	
 				b_oskol = {
 					province = 566
 
 					color = { 66 62 44 }
-				}		
-				b_valyuki = {
-					province = 12343
+				}
+				b_chally-kala = {
+					province = 5284
 
 					color = { 66 62 44 }
-				}		
-				b_korocha = {
-					province = 12342
+				}
+				b_boguchar = {
+					province = 5325
 
-					color = { 66 62 44 }
+					color = { 236 200 105 }
 				}				
 			}
+			c_khursa = {
+				color = { 60 75 40 }
+
+				b_khursa = {
+					province = 5286
+
+					color = { 60 75 40 }
+				}
+				b_khorysdan = {
+					province = 5285
+
+					color = { 60 75 40 }
+				}
+			}
+		}
+
+		d_khopyor = {
+			color = { 46 52 24 }
+
+			capital = c_khopyor
+
+			c_khopyor = {
+				color = { 74 70 33 }
+
+				b_bychok = {
+					province = 5380
+
+					color = { 74 70 33 }
+				}
+				b_kriucha = {
+					province = 5381
+
+					color = { 74 70 33 }
+				}
+				b_manina = {
+					province = 5382
+
+					color = { 74 70 33 }
+				}
+			}			
+			c_tuluchezeva = {
+				color = { 40 58 40 }
+
+				b_tuluchezeva = {
+					province = 5374
+
+					color = { 40 58 40 }
+				}
+				b_lejlotka = {
+					province = 5375
+
+					color = { 40 58 40 }
+				}
+				b_trotskhoper = {
+					province = 5376
+
+					color = { 40 58 40 }
+				}
+			}
 		}
 
 		d_tambov = {
@@ -1244,29 +1192,6 @@
 					color = { 0 35 15 }
 				}
 			}
-			c_lipetsk = {
-				color = { 26 52 24 }
-				b_lipetsk = {
-					province = 5351
-
-					color = { 26 52 24 }
-				}
-				b_usman = {
-					province = 5352
-
-					color = { 26 52 24 }
-				}
-				b_yelets = {
-					province = 5232
-
-					color = { 101 110 45 }
-				}	
-				b_zadonsk = {
-					province = 12344
-
-					color = { 101 110 45 }
-				}					
-			}	
 		}	
 	}
 	k_bjarmaland = {
diff --git a/common/on_action/game_start.txt b/common/on_action/game_start.txt
index 0bc18cc9..f6ef1718 100644
--- a/common/on_action/game_start.txt
+++ b/common/on_action/game_start.txt
@@ -391,10 +391,6 @@ on_game_start = {
 			vassal_contract_set_obligation_level = { type = administrative_themes level = 3 }
 			set_subject_contract_modification_blocked = no
 		}
-		title:b_volgograd = {
-			set_title_name = title_STALINGRAD
-			set_title_color = { 250 25 25 }
-		}
 		#title:e_arabia.holder ?= {
 		#	every_vassal = {
 		#		limit = {
diff --git a/common/scripted_effects/NEOW_historical_artifacts_creation_effect.txt b/common/scripted_effects/NEOW_historical_artifacts_creation_effect.txt
index c22ddb5a..afe6b90c 100644
--- a/common/scripted_effects/NEOW_historical_artifacts_creation_effect.txt
+++ b/common/scripted_effects/NEOW_historical_artifacts_creation_effect.txt
@@ -44,7 +44,7 @@ create_artifact_crown_wenceslas_effect = { # Crown of Saint Wenceslas
 		wealth = scope:wealth
 		quality = scope:quality
 		decaying = no
-		save_scope_as = crown_wenceslas
+		save_scope_as = newly_created_artifact
 		history = {
 			type = created_before_history
 			date = 1346.1.1
@@ -52,7 +52,7 @@ create_artifact_crown_wenceslas_effect = { # Crown of Saint Wenceslas
 		}
 	}
 
-	scope:crown_wenceslas = {
+	scope:newly_created_artifact = {
 		set_variable = { name = historical_unique_artifact value = yes }
 		set_variable = crown_wenceslas
 		save_scope_as = epic
diff --git a/gfx/map/map_object_data/activities.txt b/gfx/map/map_object_data/activities.txt
index 35bfa953..efd0cf1c 100644
--- a/gfx/map/map_object_data/activities.txt
+++ b/gfx/map/map_object_data/activities.txt
@@ -1015,7 +1015,7 @@
 		}
 		{
 			id=169
-			position={ 2340.750000 0.000000 3834.957520 }
+			position={ 2349.722656 0.000000 3825.431641 }
 			rotation={ -0.000000 0.496791 -0.000000 0.867870 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -3427,7 +3427,7 @@
 		}
 		{
 			id=575
-			position={ 2712.287354 0.000000 3573.622559 }
+			position={ 2689.916992 0.000000 3587.081787 }
 			rotation={ -0.000000 0.443858 -0.000000 0.896097 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -4799,12 +4799,6 @@
 			rotation={ -0.000000 0.581602 -0.000000 0.813473 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
-		{
-			id=972
-			position={ 2550.000000 0.000000 3710.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
 		{
 			id=1013
 			position={ 3340.162598 0.000000 2532.065430 }
@@ -29927,12 +29921,6 @@
 			rotation={ -0.000000 -0.186283 -0.000000 0.982496 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
-		{
-			id=5514
-			position={ 3361.000000 0.000000 2895.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
 		{
 			id=5519
 			position={ 3929.427979 0.000000 3619.018555 }
@@ -64979,48 +64967,6 @@
 			rotation={ 0.000000 0.905610 0.000000 0.424111 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
-		{
-			id=12341
-			position={ 2825.000000 0.000000 3316.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=12342
-			position={ 2805.000000 0.000000 3212.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=12343
-			position={ 2896.000000 0.000000 3166.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=12344
-			position={ 2866.000000 0.000000 3388.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=12345
-			position={ 2694.000000 0.000000 3591.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=12346
-			position={ 2715.132812 0.000000 3568.063721 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=12347
-			position={ 2698.000000 0.000000 3571.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
 		{
 			id=12348
 			position={ 6351.000000 0.000000 2627.000000 }
@@ -65033,12 +64979,6 @@
 			rotation={ 0.000000 0.194381 0.000000 0.980926 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
-		{
-			id=12350
-			position={ 2702.000000 0.000000 3581.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
 		{
 			id=12351
 			position={ 6307.000000 0.000000 2644.000000 }
@@ -65147,108 +65087,6 @@
 			rotation={ 0.000000 0.176127 0.000000 -0.984367 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
-		{
-			id=12369
-			position={ 2714.000000 0.000000 3578.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=12370
-			position={ 2441.000000 0.000000 3849.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=12371
-			position={ 2330.000000 0.000000 3850.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=12372
-			position={ 2347.000000 0.000000 3827.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=12373
-			position={ 2323.000000 0.000000 3835.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=12374
-			position={ 2317.422607 0.000000 3847.597168 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=12375
-			position={ 3224.000000 0.000000 2882.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=12376
-			position={ 3188.000000 0.000000 2859.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=12377
-			position={ 3247.000000 0.000000 2852.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=12378
-			position={ 3171.000000 0.000000 2819.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=12379
-			position={ 3330.000000 0.000000 2815.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=12380
-			position={ 3128.000000 0.000000 2849.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=12381
-			position={ 3240.000000 0.000000 2820.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=12382
-			position={ 3288.000000 0.000000 2832.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=12383
-			position={ 3317.000000 0.000000 2941.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=12384
-			position={ 3168.000000 0.000000 2894.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=12385
-			position={ 3264.000000 0.000000 2971.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
 		{
 			id=12386
 			position={ 6583.000000 0.000000 2911.000000 }
@@ -65261,24 +65099,6 @@
 			rotation={ 0.000000 0.973687 0.000000 -0.227891 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
-		{
-			id=12388
-			position={ 3242.000000 0.000000 2909.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=12389
-			position={ 3310.000000 0.000000 2869.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=12390
-			position={ 3382.000000 0.000000 2842.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
 		{
 			id=12391
 			position={ 6589.000000 0.000000 2947.000000 }
diff --git a/gfx/map/map_object_data/building_locators.txt b/gfx/map/map_object_data/building_locators.txt
index 1a1acba8..b84a5eb2 100644
--- a/gfx/map/map_object_data/building_locators.txt
+++ b/gfx/map/map_object_data/building_locators.txt
@@ -1015,7 +1015,7 @@
 		}
 		{
 			id=169
-			position={ 2338.466064 0.000000 3838.665527 }
+			position={ 2354.077637 0.000000 3818.085449 }
 			rotation={ -0.000000 -0.967914 -0.000000 -0.251280 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -3427,7 +3427,7 @@
 		}
 		{
 			id=575
-			position={ 2705.714844 0.000000 3576.118652 }
+			position={ 2697.077637 0.000000 3591.085449 }
 			rotation={ -0.000000 -0.203243 -0.000000 0.979128 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -4799,12 +4799,6 @@
 			rotation={ -0.000000 -0.990456 -0.000000 -0.137831 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
-		{
-			id=972
-			position={ 2553.000000 0.000000 3710.000000 }
-			rotation={ -0.000000 -0.962724 -0.000000 0.270487 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
 		{
 			id=1013
 			position={ 3344.077637 0.000000 2525.085449 }
@@ -28333,7 +28327,7 @@
 		}
 		{
 			id=5244
-			position={ 2678.852051 3.707764 3568.940918 }
+			position={ 2678.077637 0.000000 3571.085449 }
 			rotation={ -0.000000 -0.498755 -0.000000 -0.866743 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -29927,12 +29921,6 @@
 			rotation={ -0.000000 -0.657911 -0.000000 0.753096 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
-		{
-			id=5514
-			position={ 3364.000000 0.000000 2895.000000 }
-			rotation={ -0.000000 -0.996900 -0.000000 0.078680 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
 		{
 			id=5519
 			position={ 3797.387451 0.000000 3434.787598 }
@@ -64979,48 +64967,6 @@
 			rotation={ 0.000000 0.905610 0.000000 0.424111 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
-		{
-			id=12341
-			position={ 2830.000000 0.000000 3334.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=12342
-			position={ 2817.000000 0.000000 3188.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=12343
-			position={ 2912.000000 0.000000 3159.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=12344
-			position={ 2897.000000 0.000000 3384.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=12345
-			position={ 2697.000000 0.000000 3591.000000 }
-			rotation={ -0.000000 -0.601278 -0.000000 -0.799040 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=12346
-			position={ 2712.000000 0.000000 3567.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=12347
-			position={ 2701.000000 0.000000 3571.000000 }
-			rotation={ -0.000000 -0.271433 -0.000000 0.962457 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
 		{
 			id=12348
 			position={ 6192.937500 0.000000 2442.756836 }
@@ -65033,12 +64979,6 @@
 			rotation={ 0.000000 0.194381 0.000000 0.980926 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
-		{
-			id=12350
-			position={ 2704.000000 0.000000 3581.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
 		{
 			id=12351
 			position={ 6163.710938 0.000000 2473.265625 }
@@ -65147,108 +65087,6 @@
 			rotation={ 0.000000 0.176127 0.000000 -0.984367 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
-		{
-			id=12369
-			position={ 2717.000000 0.000000 3578.000000 }
-			rotation={ -0.000000 -0.042530 -0.000000 0.999095 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=12370
-			position={ 2463.000000 0.000000 3836.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=12371
-			position={ 2333.000000 0.000000 3849.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=12372
-			position={ 2349.000000 0.000000 3828.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=12373
-			position={ 2331.000000 0.000000 3835.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=12374
-			position={ 2316.000000 0.000000 3848.000000 }
-			rotation={ -0.000000 -0.175313 -0.000000 -0.984513 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=12375
-			position={ 3238.000000 0.000000 2886.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=12376
-			position={ 3194.000000 0.000000 2862.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=12377
-			position={ 3251.000000 0.000000 2846.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=12378
-			position={ 3178.000000 0.000000 2816.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=12379
-			position={ 3308.000000 0.000000 2800.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=12380
-			position={ 3139.000000 0.000000 2847.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=12381
-			position={ 3242.000000 0.000000 2814.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=12382
-			position={ 3302.000000 0.000000 2835.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=12383
-			position={ 3334.000000 0.000000 2945.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=12384
-			position={ 3174.000000 0.000000 2897.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=12385
-			position={ 3275.000000 0.000000 2970.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
 		{
 			id=12386
 			position={ 6463.937500 0.000000 2720.756836 }
@@ -65261,24 +65099,6 @@
 			rotation={ 0.000000 0.973687 0.000000 -0.227891 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
-		{
-			id=12388
-			position={ 3263.000000 0.000000 2903.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=12389
-			position={ 3291.000000 0.000000 2875.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=12390
-			position={ 3399.000000 0.000000 2839.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
 		{
 			id=12391
 			position={ 6474.937500 0.000000 2749.756836 }
diff --git a/gfx/map/map_object_data/combat_locators.txt b/gfx/map/map_object_data/combat_locators.txt
index fa8230dc..5e121fd3 100644
--- a/gfx/map/map_object_data/combat_locators.txt
+++ b/gfx/map/map_object_data/combat_locators.txt
@@ -11,6 +11,12 @@
 			rotation={ 0.000000 0.000000 0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
+		{
+			id=0
+			position={ 2105.088623 0.000000 2534.008789 }
+			rotation={ -0.000000 -0.230068 -0.000000 0.973175 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
 		{
 			id=1
 			position={ 274.374359 0.000000 4439.049316 }
@@ -1021,7 +1027,7 @@
 		}
 		{
 			id=169
-			position={ 2339.679932 0.000000 3835.340820 }
+			position={ 2362.232666 0.000000 3834.422607 }
 			rotation={ -0.000000 -0.970683 -0.000000 0.240362 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -3445,7 +3451,7 @@
 		}
 		{
 			id=575
-			position={ 2710.472168 0.000000 3576.151611 }
+			position={ 2681.751465 0.000000 3592.772217 }
 			rotation={ -0.000000 -0.945782 -0.000000 0.324802 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -5399,12 +5405,6 @@
 			rotation={ -0.000000 -0.217054 -0.000000 0.976160 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
-		{
-			id=972
-			position={ 2553.000000 0.000000 3707.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
 		{
 			id=973
 			position={ 1222.577026 0.000000 3418.731201 }
@@ -31823,12 +31823,6 @@
 			rotation={ -0.000000 0.181574 -0.000000 0.983377 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
-		{
-			id=5514
-			position={ 3364.000000 0.000000 2892.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
 		{
 			id=5519
 			position={ 3931.468506 0.000000 3635.966553 }
@@ -71551,43 +71545,43 @@
 		}
 		{
 			id=12341
-			position={ 2831.028564 0.000000 3307.608887 }
-			rotation={ -0.000000 0.106041 -0.000000 0.994362 }
+			position={ 0.000000 0.000000 -3.000000 }
+			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12342
-			position={ 2811.595215 0.000000 3199.735840 }
+			position={ 0.000000 0.000000 -3.000000 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12343
-			position={ 2896.151855 0.000000 3167.884277 }
+			position={ 0.000000 0.000000 -3.000000 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12344
-			position={ 2876.759277 0.000000 3387.908691 }
+			position={ 0.000000 0.000000 -3.000000 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12345
-			position={ 2699.040283 0.000000 3590.058838 }
+			position={ 0.000000 0.000000 -3.000000 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12346
-			position={ 2711.666748 0.000000 3568.238525 }
+			position={ 0.000000 0.000000 -3.000000 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12347
-			position={ 2700.401367 0.000000 3571.257324 }
+			position={ 0.000000 0.000000 -3.000000 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -71605,7 +71599,7 @@
 		}
 		{
 			id=12350
-			position={ 2703.160889 0.000000 3582.286621 }
+			position={ 0.000000 0.000000 -3.000000 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -71719,104 +71713,104 @@
 		}
 		{
 			id=12369
-			position={ 2718.459229 0.000000 3578.280029 }
+			position={ 0.000000 0.000000 -3.000000 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12370
-			position={ 2443.876221 0.000000 3844.018799 }
+			position={ 0.000000 0.000000 -3.000000 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12371
-			position={ 2331.445801 0.000000 3850.741699 }
+			position={ 0.000000 0.000000 -3.000000 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12372
-			position={ 2345.540039 0.000000 3827.721924 }
+			position={ 0.000000 0.000000 -3.000000 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12373
-			position={ 2328.640869 0.000000 3835.428223 }
+			position={ 0.000000 0.000000 -3.000000 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12374
-			position={ 2317.728516 0.000000 3846.944336 }
+			position={ 0.000000 0.000000 -3.000000 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12375
-			position={ 3233.647217 0.000000 2876.144043 }
+			position={ 0.000000 0.000000 -3.000000 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12376
-			position={ 3196.520508 0.000000 2872.039062 }
+			position={ 0.000000 0.000000 -3.000000 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12377
-			position={ 3246.075684 0.000000 2852.350586 }
+			position={ 0.000000 0.000000 -3.000000 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12378
-			position={ 3177.806885 0.000000 2824.392090 }
+			position={ 0.000000 0.000000 -3.000000 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12379
-			position={ 3329.502197 0.000000 2820.732910 }
+			position={ 0.000000 0.000000 -3.000000 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12380
-			position={ 3137.618652 0.000000 2859.340088 }
+			position={ 0.000000 0.000000 -3.000000 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12381
-			position={ 3258.173096 0.000000 2823.959961 }
+			position={ 0.000000 0.000000 -3.000000 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12382
-			position={ 3299.708252 0.000000 2827.049316 }
+			position={ 0.000000 0.000000 -3.000000 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12383
-			position={ 3313.898682 0.000000 2922.270996 }
+			position={ 0.000000 0.000000 -3.000000 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12384
-			position={ 3175.736328 0.000000 2883.910889 }
+			position={ 0.000000 0.000000 -3.000000 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12385
-			position={ 3266.536621 0.000000 2942.104004 }
-			rotation={ -0.000000 -0.012896 -0.000000 0.999917 }
+			position={ 0.000000 0.000000 -3.000000 }
+			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
@@ -71833,19 +71827,19 @@
 		}
 		{
 			id=12388
-			position={ 3256.246338 -0.002373 2897.743408 }
+			position={ 0.000000 0.000000 -3.000000 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12389
-			position={ 3307.569336 0.000000 2878.049561 }
+			position={ 0.000000 0.000000 -3.000000 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12390
-			position={ 3372.602783 0.000000 2842.734863 }
+			position={ 0.000000 0.000000 -3.000000 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			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 4c70e122..c92cdd7d 100644
--- a/gfx/map/map_object_data/player_stack_locators.txt
+++ b/gfx/map/map_object_data/player_stack_locators.txt
@@ -11,6 +11,12 @@
 			rotation={ 0.000000 0.000000 0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
+		{
+			id=0
+			position={ 2075.469238 0.000000 2476.612793 }
+			rotation={ -0.000000 -0.216440 -0.000000 0.976296 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
 		{
 			id=1
 			position={ 274.573578 0.000000 4469.125977 }
@@ -1021,7 +1027,7 @@
 		}
 		{
 			id=169
-			position={ 2339.156494 0.000000 3834.374756 }
+			position={ 2364.000000 0.000000 3823.000000 }
 			rotation={ -0.000000 -0.216440 -0.000000 0.976296 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -3445,7 +3451,7 @@
 		}
 		{
 			id=575
-			position={ 2713.281250 0.000000 3578.726318 }
+			position={ 2699.000000 0.000000 3597.000000 }
 			rotation={ -0.000000 -0.216440 -0.000000 0.976296 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -5399,12 +5405,6 @@
 			rotation={ -0.000000 -0.217054 -0.000000 0.976160 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
-		{
-			id=972
-			position={ 2553.000000 0.000000 3710.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
 		{
 			id=973
 			position={ 1249.544434 0.000000 3440.593262 }
@@ -31823,12 +31823,6 @@
 			rotation={ -0.000000 0.179923 -0.000000 0.983681 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
-		{
-			id=5514
-			position={ 3364.000000 0.000000 2895.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
 		{
 			id=5519
 			position={ 3945.450195 0.000000 3622.030518 }
@@ -71551,43 +71545,43 @@
 		}
 		{
 			id=12341
-			position={ 2839.000000 0.000000 3327.000000 }
+			position={ 0.000000 0.000000 0.000000 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12342
-			position={ 2810.081299 0.000000 3191.461670 }
+			position={ 0.000000 0.000000 0.000000 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12343
-			position={ 2922.000000 0.000000 3157.000000 }
+			position={ 0.000000 0.000000 0.000000 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12344
-			position={ 2872.857910 0.000000 3401.329834 }
+			position={ 0.000000 0.000000 0.000000 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12345
-			position={ 2699.040283 0.000000 3593.058838 }
+			position={ 0.000000 0.000000 0.000000 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12346
-			position={ 2709.277344 0.000000 3570.969482 }
+			position={ 0.000000 0.000000 0.000000 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12347
-			position={ 2701.221191 0.000000 3571.299805 }
+			position={ 0.000000 0.000000 0.000000 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -71605,7 +71599,7 @@
 		}
 		{
 			id=12350
-			position={ 2701.491943 0.000000 3585.011963 }
+			position={ 0.000000 0.000000 0.000000 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -71719,103 +71713,103 @@
 		}
 		{
 			id=12369
-			position={ 2715.477051 0.000000 3583.835449 }
+			position={ 0.000000 0.000000 0.000000 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12370
-			position={ 2446.448486 0.000000 3850.553467 }
+			position={ 0.000000 0.000000 0.000000 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12371
-			position={ 2329.032471 0.000000 3850.533691 }
+			position={ 0.000000 0.000000 0.000000 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12372
-			position={ 2345.829590 0.000000 3824.522949 }
+			position={ 0.000000 0.000000 0.000000 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12373
-			position={ 2319.004883 0.000000 3840.631104 }
+			position={ 0.000000 0.000000 0.000000 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12374
-			position={ 2317.728516 0.000000 3849.944336 }
+			position={ 0.000000 0.000000 0.000000 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12375
-			position={ 3248.000000 0.000000 2884.000000 }
+			position={ 0.000000 0.000000 0.000000 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12376
-			position={ 3203.000000 0.000000 2857.000000 }
+			position={ 0.000000 0.000000 0.000000 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12377
-			position={ 3261.000000 0.000000 2845.000000 }
+			position={ 0.000000 0.000000 0.000000 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12378
-			position={ 3187.000000 0.000000 2808.000000 }
+			position={ 0.000000 0.000000 0.000000 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12379
-			position={ 3345.952637 0.000000 2809.298340 }
+			position={ 0.000000 0.000000 0.000000 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12380
-			position={ 3149.000000 0.000000 2841.000000 }
+			position={ 0.000000 0.000000 0.000000 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12381
-			position={ 3252.000000 0.000000 2810.000000 }
+			position={ 0.000000 0.000000 0.000000 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12382
-			position={ 3043.973633 0.000000 3019.561523 }
+			position={ 0.000000 0.000000 0.000000 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12383
-			position={ 3341.057129 0.000000 2943.347168 }
+			position={ 0.000000 0.000000 0.000000 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12384
-			position={ 3184.000000 0.000000 2895.000000 }
+			position={ 0.000000 0.000000 0.000000 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12385
-			position={ 3285.000000 0.000000 2968.000000 }
+			position={ 0.000000 0.000000 0.000000 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -71833,19 +71827,19 @@
 		}
 		{
 			id=12388
-			position={ 3273.000000 0.000000 2900.000000 }
+			position={ 0.000000 0.000000 0.000000 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12389
-			position={ 3299.000000 0.000000 2868.000000 }
+			position={ 0.000000 0.000000 0.000000 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12390
-			position={ 3409.000000 0.000000 2837.000000 }
+			position={ 0.000000 0.000000 0.000000 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			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 23298a28..e7dc2457 100644
--- a/gfx/map/map_object_data/siege_locators.txt
+++ b/gfx/map/map_object_data/siege_locators.txt
@@ -1015,7 +1015,7 @@
 		}
 		{
 			id=169
-			position={ 2343.697266 0.000000 3836.629150 }
+			position={ 2352.000000 0.000000 3809.000000 }
 			rotation={ 0.000000 0.994029 0.000000 0.109117 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -3427,7 +3427,7 @@
 		}
 		{
 			id=575
-			position={ 2715.637207 0.000000 3577.033203 }
+			position={ 2707.000000 0.000000 3592.000000 }
 			rotation={ -0.000000 -0.671005 -0.000000 0.741453 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -4799,12 +4799,6 @@
 			rotation={ -0.000000 -0.633989 -0.000000 0.773342 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
-		{
-			id=972
-			position={ 2556.000000 0.000000 3710.000000 }
-			rotation={ -0.000000 -0.000025 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
 		{
 			id=1013
 			position={ 3335.000000 0.000000 2528.000000 }
@@ -29927,12 +29921,6 @@
 			rotation={ 0.000000 0.861871 0.000000 -0.507128 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
-		{
-			id=5514
-			position={ 3367.000000 0.000000 2895.000000 }
-			rotation={ -0.000000 -0.000025 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
 		{
 			id=5519
 			position={ 3935.450195 0.000000 3610.030518 }
@@ -68317,43 +68305,43 @@
 		}
 		{
 			id=12341
-			position={ 2818.369141 0.000000 3320.259277 }
+			position={ 3.000000 0.000000 0.000000 }
 			rotation={ -0.000000 -0.000025 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12342
-			position={ 2818.105469 0.000000 3229.902588 }
+			position={ 3.000000 0.000000 0.000000 }
 			rotation={ -0.000000 -0.000025 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12343
-			position={ 2907.640137 0.000000 3155.201660 }
+			position={ 3.000000 0.000000 0.000000 }
 			rotation={ -0.000000 -0.000025 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12344
-			position={ 2847.531006 0.000000 3391.136719 }
+			position={ 3.000000 0.000000 0.000000 }
 			rotation={ -0.000000 -0.000025 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12345
-			position={ 2697.166504 0.000000 3594.986572 }
+			position={ 3.000000 0.000000 0.000000 }
 			rotation={ -0.000000 -0.000025 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12346
-			position={ 2708.999023 0.000000 3563.775146 }
+			position={ 3.000000 0.000000 0.000000 }
 			rotation={ -0.000000 -0.000025 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12347
-			position={ 2702.880127 0.000000 3572.676758 }
+			position={ 3.000000 0.000000 0.000000 }
 			rotation={ -0.000000 -0.000025 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -68371,7 +68359,7 @@
 		}
 		{
 			id=12350
-			position={ 2708.230957 0.000000 3585.309326 }
+			position={ 3.000000 0.000000 0.000000 }
 			rotation={ -0.000000 -0.000025 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -68485,103 +68473,103 @@
 		}
 		{
 			id=12369
-			position={ 2718.260742 0.000000 3575.439941 }
+			position={ 3.000000 0.000000 0.000000 }
 			rotation={ -0.000000 -0.000025 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12370
-			position={ 2437.021484 0.000000 3855.052490 }
+			position={ 3.000000 0.000000 0.000000 }
 			rotation={ -0.000000 -0.000025 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12371
-			position={ 2340.132324 0.000000 3848.599121 }
+			position={ 3.000000 0.000000 0.000000 }
 			rotation={ -0.000000 -0.000025 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12372
-			position={ 2354.198730 0.000000 3827.267090 }
+			position={ 3.000000 0.000000 0.000000 }
 			rotation={ -0.000000 -0.000025 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12373
-			position={ 2332.100586 0.000000 3834.803223 }
+			position={ 3.000000 0.000000 0.000000 }
 			rotation={ -0.000000 -0.000025 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12374
-			position={ 2312.854736 0.000000 3850.397949 }
+			position={ 3.000000 0.000000 0.000000 }
 			rotation={ -0.000000 -0.000025 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12375
-			position={ 3224.444580 0.000000 2889.933594 }
+			position={ 3.000000 0.000000 0.000000 }
 			rotation={ -0.000000 -0.000025 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12376
-			position={ 3176.814453 0.000000 2863.442627 }
+			position={ 3.000000 0.000000 0.000000 }
 			rotation={ -0.000000 -0.000025 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12377
-			position={ 3266.947754 0.000000 2856.475830 }
+			position={ 3.000000 0.000000 0.000000 }
 			rotation={ -0.000000 -0.000025 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12378
-			position={ 3176.126465 0.000000 2834.915771 }
+			position={ 3.000000 0.000000 0.000000 }
 			rotation={ -0.000000 -0.000025 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12379
-			position={ 3317.517822 0.000000 2813.665527 }
+			position={ 3.000000 0.000000 0.000000 }
 			rotation={ -0.000000 -0.000025 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12380
-			position={ 3118.427734 0.000000 2835.109131 }
+			position={ 3.000000 0.000000 0.000000 }
 			rotation={ -0.000000 -0.000025 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12381
-			position={ 3231.680176 0.000000 2825.198975 }
+			position={ 3.000000 0.000000 0.000000 }
 			rotation={ -0.000000 -0.000025 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12382
-			position={ 3291.966797 0.000000 2834.375732 }
+			position={ 3.000000 0.000000 0.000000 }
 			rotation={ -0.000000 -0.000025 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12383
-			position={ 3303.322266 0.000000 2963.442383 }
+			position={ 3.000000 0.000000 0.000000 }
 			rotation={ -0.000000 -0.000025 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12384
-			position={ 3173.104248 0.000000 2908.203125 }
+			position={ 3.000000 0.000000 0.000000 }
 			rotation={ -0.000000 -0.000025 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12385
-			position={ 3263.745850 0.000000 2990.019043 }
+			position={ 3.000000 0.000000 0.000000 }
 			rotation={ -0.000000 -0.000025 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -68599,19 +68587,19 @@
 		}
 		{
 			id=12388
-			position={ 3250.671143 0.000000 2913.579102 }
+			position={ 3.000000 0.000000 0.000000 }
 			rotation={ -0.000000 -0.000025 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12389
-			position={ 3329.260742 0.000000 2877.562988 }
+			position={ 3.000000 0.000000 0.000000 }
 			rotation={ -0.000000 -0.000025 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12390
-			position={ 3370.733643 0.000000 2854.187012 }
+			position={ 3.000000 0.000000 0.000000 }
 			rotation={ -0.000000 -0.000025 -0.000000 1.000000 }
 			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 c28cdcee..b203b1ad 100644
--- a/gfx/map/map_object_data/special_building_locators.txt
+++ b/gfx/map/map_object_data/special_building_locators.txt
@@ -4799,12 +4799,6 @@
 			rotation={ -0.000000 -0.632438 -0.000000 0.774612 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
-		{
-			id=972
-			position={ 2553.000000 0.000000 3710.000000 }
-			rotation={ -0.000000 -0.987597 -0.000000 0.157013 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
 		{
 			id=1013
 			position={ 3344.852295 0.000000 2535.480225 }
@@ -29927,12 +29921,6 @@
 			rotation={ -0.000000 0.517978 -0.000000 -0.855394 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
-		{
-			id=5514
-			position={ 3364.000000 0.000000 2895.000000 }
-			rotation={ -0.000000 -0.110778 -0.000000 -0.993845 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
 		{
 			id=5519
 			position={ 3944.815918 0.000000 3605.785156 }
@@ -64979,48 +64967,6 @@
 			rotation={ -0.000000 -0.784692 -0.000000 -0.619886 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
-		{
-			id=12341
-			position={ 2828.000000 0.000000 3316.000000 }
-			rotation={ -0.000000 -0.908579 -0.000000 0.417712 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=12342
-			position={ 2808.000000 0.000000 3212.000000 }
-			rotation={ -0.000000 -0.688511 -0.000000 -0.725226 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=12343
-			position={ 2899.000000 0.000000 3166.000000 }
-			rotation={ -0.000000 -0.281626 -0.000000 0.959524 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=12344
-			position={ 2869.000000 0.000000 3388.000000 }
-			rotation={ -0.000000 -0.715077 -0.000000 -0.699046 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=12345
-			position={ 2697.000000 0.000000 3591.000000 }
-			rotation={ -0.000000 -0.754782 -0.000000 0.655975 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=12346
-			position={ 2711.000000 0.000000 3567.000000 }
-			rotation={ -0.000000 -0.940512 -0.000000 0.339759 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=12347
-			position={ 2701.000000 0.000000 3571.000000 }
-			rotation={ -0.000000 -0.988946 -0.000000 0.148275 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
 		{
 			id=12348
 			position={ 6338.000000 0.000000 2633.000000 }
@@ -65033,12 +64979,6 @@
 			rotation={ -0.000000 -0.351162 -0.000000 -0.936315 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
-		{
-			id=12350
-			position={ 2705.000000 0.000000 3581.000000 }
-			rotation={ -0.000000 -0.593636 -0.000000 -0.804734 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
 		{
 			id=12351
 			position={ 6305.000000 0.000000 2654.000000 }
@@ -65147,108 +65087,6 @@
 			rotation={ -0.000000 -0.999747 -0.000000 0.022513 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
-		{
-			id=12369
-			position={ 2717.000000 0.000000 3578.000000 }
-			rotation={ -0.000000 -0.237407 -0.000000 0.971410 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=12370
-			position={ 2444.000000 0.000000 3849.000000 }
-			rotation={ -0.000000 -0.717062 -0.000000 -0.697009 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=12371
-			position={ 2333.000000 0.000000 3850.000000 }
-			rotation={ -0.000000 -0.953778 -0.000000 -0.300511 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=12372
-			position={ 2350.000000 0.000000 3827.000000 }
-			rotation={ -0.000000 -0.199190 -0.000000 0.979961 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=12373
-			position={ 2326.000000 0.000000 3835.000000 }
-			rotation={ -0.000000 -0.768259 -0.000000 -0.640139 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=12374
-			position={ 2316.000000 0.000000 3848.000000 }
-			rotation={ -0.000000 -0.955662 -0.000000 0.294467 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=12375
-			position={ 3227.000000 0.000000 2882.000000 }
-			rotation={ -0.000000 -0.366340 -0.000000 -0.930481 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=12376
-			position={ 3191.000000 0.000000 2859.000000 }
-			rotation={ -0.000000 -0.990080 -0.000000 -0.140501 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=12377
-			position={ 3250.000000 0.000000 2852.000000 }
-			rotation={ -0.000000 -0.915090 -0.000000 -0.403250 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=12378
-			position={ 3174.000000 0.000000 2819.000000 }
-			rotation={ -0.000000 -0.979391 -0.000000 0.201973 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=12379
-			position={ 3333.000000 0.000000 2815.000000 }
-			rotation={ -0.000000 -0.297214 -0.000000 0.954811 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=12380
-			position={ 3131.000000 0.000000 2849.000000 }
-			rotation={ -0.000000 -0.294071 -0.000000 0.955784 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=12381
-			position={ 3243.000000 0.000000 2820.000000 }
-			rotation={ -0.000000 -0.154000 -0.000000 0.988071 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=12382
-			position={ 3291.000000 0.000000 2832.000000 }
-			rotation={ -0.000000 -0.654115 -0.000000 0.756395 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=12383
-			position={ 3320.000000 0.000000 2941.000000 }
-			rotation={ -0.000000 -0.992960 -0.000000 -0.118454 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=12384
-			position={ 3171.000000 0.000000 2894.000000 }
-			rotation={ -0.000000 -0.148980 -0.000000 -0.988840 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=12385
-			position={ 3267.000000 0.000000 2971.000000 }
-			rotation={ -0.000000 -0.913270 -0.000000 0.407354 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
 		{
 			id=12386
 			position={ 6596.000000 0.000000 2904.000000 }
@@ -65261,24 +65099,6 @@
 			rotation={ -0.000000 -0.652547 -0.000000 0.757748 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
-		{
-			id=12388
-			position={ 3245.000000 0.000000 2909.000000 }
-			rotation={ -0.000000 -0.450278 -0.000000 0.892888 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=12389
-			position={ 3313.000000 0.000000 2869.000000 }
-			rotation={ -0.000000 -0.822084 -0.000000 0.569366 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=12390
-			position={ 3385.000000 0.000000 2842.000000 }
-			rotation={ -0.000000 -0.982182 -0.000000 0.187931 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
 		{
 			id=12391
 			position={ 6603.000000 0.000000 2932.000000 }
diff --git a/gfx/map/terrain/detail_intensity.tga b/gfx/map/terrain/detail_intensity.tga
index dd1d2fb0..52b0083f 100644
--- a/gfx/map/terrain/detail_intensity.tga
+++ b/gfx/map/terrain/detail_intensity.tga
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:28b6c4b4f1cc1dd74936090aca0028c8626e9cf32bc3e21697ec53076cebd911
+oid sha256:d051307c25609310df280a266a879fa316a9e646387b48e803f4ba41c2d9f35f
 size 169869356
diff --git a/history/characters/NEOW_russia.txt b/history/characters/NEOW_russia.txt
index 68495a92..23c5c372 100644
--- a/history/characters/NEOW_russia.txt
+++ b/history/characters/NEOW_russia.txt
@@ -239,33 +239,4 @@ russia0014 = {
 	2600.1.1 = {
     	death = yes
 	}
-}
-
-skarlet_khanov = {
-	name = "Skarlet"
-	culture = NEOW_cossack
-	religion = stalinist
-	dna = dna_skarlet
-	portrait_override={ 
-		portrait_modifier_overrides={
-			custom_hair=f_hair_ep3_byzantine_01_common
-			custom_beards=female_empty
-		}
-	}
-	female = yes
-	trait = education_martial_3
-	trait = zealous
-	trait = wrathful
-	trait = bastard
-	trait = intellect_good_1
-	trait = sadistic
-	trait = torturer
-	trait = drunkard
-	sexuality = heterosexual
-	2531.8 = {
-    	birth = yes
-	}
-	2600.1.1 = {
-    	death = yes
-	}
 }
\ No newline at end of file
diff --git a/history/provinces/e_finland.txt b/history/provinces/e_finland.txt
index 14ceff6d..c90def3b 100644
--- a/history/provinces/e_finland.txt
+++ b/history/provinces/e_finland.txt
@@ -995,12 +995,13 @@
 
 ###c_sombio
 390 = {	#Sombio
-}
-401 = {	#b_suonnjel = Suõ'nnjel = Priretjny
 	culture = sami
 	religion = sami_pagan
 	holding = tribal_holding
 }
+401 = {	#b_suonnjel = Suõ'nnjel = Priretjny
+	holding = none
+}
 403 = {	#b_nuottjaurr = Nuõ´ttjäu´rr = Notozero
 	holding = none
 }
@@ -1022,37 +1023,39 @@
 }
 
 ###c_skolt
-404 = {	#Kiilt
+8789 = {	#Skolt
 	culture = NEOW_novgorodian
 	religion = orthodox
 	holding = tribal_holding
 }
+404 = {	#Kiilt
+	holding = none
+}
 402 = {	#b_muetkk = Mue´tkk = Motovsky
 	holding = none
 }
 
-8789 = {	#Skolt
-	holding = none
-}
-
 ##d_guoldat ###################################
 ###c_ter
-415 = {	#Jovvkuj = Yokanga
-	culture = NEOW_novgorodian
-	religion = orthodox
+417 = {	#Sosnevke = Sosnovka
+	culture = sami
+	religion = sami_pagan
 	holding = tribal_holding
 }
-417 = {	#Sosnevke = Sosnovka
+415 = {	#Jovvkuj = Yokanga
 	holding = none
 }
 416 = {	#b_penne = P'enne = Ponoy
 	holding = none
 }
+8790 = {	#Peliza (named after local river)
+	holding = none
+}
 
 ###c_jovvkuj
 413 = {	#b_guoddemjavvr = Guoddemjavv'r = Kuroptevsky
-	culture = sami
-	religion = sami_pagan
+	culture = NEOW_novgorodian
+	religion = orthodox
 	holding = tribal_holding
 }
 411 = {	#b_lejjavvr = Lejjavv'r = Lyavozero
@@ -1064,34 +1067,26 @@
 
 ###c_east_kiilt = Kordok
 410 = {	#b_lujavvr = Lujavv'r = Lovozero
-	holding = none
-}
-405 = {	#Koardegk = Voronye
 	culture = sami
 	religion = sami_pagan
 	holding = tribal_holding
 }
+405 = {	#Koardegk = Voronye
+	holding = none
+}
 406 = {	#b_maselk = Masel'k = Pulozero = Maaselka
 	holding = none
 }
 
 ###c_kintus
 414 = {	#Kintuš = Kamensky
-	holding = none
-}
-8792 = {	#Cascarena
 	culture = sami
 	religion = sami_pagan
 	holding = tribal_holding
 }
 8791 = {	#Varsiga = Varzuga
-	culture = sami
-	religion = sami_pagan
-	holding = tribal_holding
+	holding = none
 }
-8790 = {	#Peliza (named after local river)
-	culture = sami
-	religion = sami_pagan
-	holding = tribal_holding
+8792 = {	#Cascarena
+	holding = none
 }
-
diff --git a/history/provinces/e_nistrenia.txt b/history/provinces/e_nistrenia.txt
index faeee2d2..41be1e22 100644
--- a/history/provinces/e_nistrenia.txt
+++ b/history/provinces/e_nistrenia.txt
@@ -1348,9 +1348,8 @@ holding = none
 	holding = none
 }
 594 = {		#Kazarki
-	culture = NEOW_cossack
-	religion = kozachina
-	holding = tribal_holding
+	#probable location of NEOW_cossack settlement
+	holding = none
 }
 
 ###c_kazanskaya
@@ -1377,6 +1376,7 @@ holding = none
 	culture = NEOW_nizhnevolzhan
 	religion = stalinist
 	holding = tribal_holding
+	
 }
 5293 = {	#Frolovo
 	culture = NEOW_cossack
@@ -2776,22 +2776,24 @@ holding = none
 	holding = tribal_holding
 }
 ###c_itil
-5345 = {	#Akhtubinsk
-	culture = kazakh
-	religion = stalinist
-	holding = tribal_holding
-}
 620 = {		#Itil	#NEOW_cossack capital #what
-	holding = none
-}
-619 = {		#Saray	AKA "Old Sarai" or "Sarai Batu"
 	culture = NEOW_nizhnevolzhan
 	religion = stalinist
 	holding = tribal_holding
+	
+}
+619 = {		#Saray	AKA "Old Sarai" or "Sarai Batu"
+	holding = none
+	#1066.1.2 = {
+	#	holding = city_holding
+	#}
 }
 5316 = {	#Nikolaievsk
 	holding = none
 }
+5345 = {	#Chyorny Yar
+	holding = none
+}
 
 ###c_saqsin
 5313 = {
diff --git a/history/provinces/e_russia.txt b/history/provinces/e_russia.txt
index f2602ce8..88d339be 100644
--- a/history/provinces/e_russia.txt
+++ b/history/provinces/e_russia.txt
@@ -12,10 +12,15 @@
 5139 = {	#Lyuban
 	holding = none
 }
+5140 = {	#Soltsy
+	holding = church_holding
+}
 5141 = {	#Luga
 	holding = none
 }
-
+5142 = {	#Pushkin
+	holding = none
+}
 
 ###c_rusa
 5143 = {	#Rusa
@@ -23,9 +28,15 @@
 	religion = third_covenant
 	holding = castle_holding
 }
+5144 = {	#Dedovichi
+	holding = none
+}
 5145 = {	#Loknya
 	holding = none
 }
+5177 = {	#Porkhov
+	holding = none
+}
 
 ###c_pskov
 5146 = {	#Pskov
@@ -42,15 +53,7 @@
 5149 = {	#Gdov
 	holding = none
 }
-5140 = {	#Soltsy
-	holding = church_holding
-}
-5177 = {	#Porkhov
-	holding = none
-}
-5144 = {	#Dedovichi
-	holding = none
-}
+
 ###c_sebezh
 5150 = {	#Sebezh
 	culture = NEOW_polotskian
@@ -73,12 +76,8 @@
 170 = {		#NOTEBORG
 	holding = none
 }
-5142 = {		#KOPORYE
-	culture = NEOW_petrogradian
-	religion = third_covenant
-	holding = castle_holding
-}
 168 = {		#KOPORYE
+	holding = none
 }
 167 = {		#YAMA
 	holding = none
@@ -108,11 +107,8 @@
 	holding = none
 }
 5155 = {	#Borovichi
-	culture = NEOW_novgorodian
-	religion = third_covenant
-	holding = castle_holding
+	holding = none
 }
-
 5254 = {	#Svolensk
 	holding = none
 }
@@ -157,9 +153,7 @@
 	holding = none
 }
 5166 = {	#Valday
-	culture = NEOW_novgorodian
-	religion = third_covenant
-	holding = castle_holding
+	holding = none
 }
 5167 = {	#Vyshny Volochyok
 	culture = NEOW_novgorodian
@@ -261,14 +255,10 @@
 	holding = castle_holding
 }
 578 = {		#Kolomna
-	culture = NEOW_nizhegorodian
-	religion = third_covenant
-	holding = castle_holding
+	holding = none
 }
 570 = {		#Dmitrov
-	culture = NEOW_nizhegorodian
-	religion = third_covenant
-	holding = castle_holding
+	holding = none
 }
 5244 = {	#Naro-Fominsk
 	holding = none
@@ -280,10 +270,6 @@
 ##d_ryazan ###################################
 ###c_ryazan
 580 = {		#Ryazan aka Old Ryazan
-	holding = none
-}
-
-5228 = {	#Pereyaslavl Ryazanski
 	culture = NEOW_nizhegorodian
 	religion = third_covenant
 	holding = castle_holding
@@ -291,8 +277,6 @@
 5228 = {	#Pereyaslavl Ryazanski AKA modern Ryazan
 	culture = NEOW_nizhegorodian
 	religion = third_covenant
-580 = {		#Ryazan
-	holding = none
 }
 5229 = {	#Rostislavl
 	holding = none
@@ -471,9 +455,7 @@
 	#holding = city_holding
 }
 5351 = {	#Lipetsk
-	culture = NEOW_nizhegorodian
-	religion = third_covenant
-	holding = castle_holding
+	holding = none
 }
 
 ###c_karatayak
@@ -487,18 +469,17 @@
 	holding = none
 }
 5372 = {	#Babrov	AKA Bobrov
-	culture = NEOW_nizhnevolzhan
-	religion = stalinist
-	holding = tribal_holding
+	holding = none
 }
 
 ###c_oskol = Kalitva
-5284 = {
+566 = {		#Kalitva	AKA Staraya Kalitva b_oskol
 	culture = NEOW_cossack
 	religion = kozachina
 	holding = tribal_holding
 }
-566 = {		#Kalitva	AKA Staraya Kalitva b_oskol
+5284 = {	#Chally-Kala
+	#Can be found in atlas of NEOW_nizhegorodian Empire from the XIXth century, in the province of Saratov
 	holding = none
 }
 
diff --git a/history/titles/e_russia.txt b/history/titles/e_russia.txt
index cf260f49..41b6dfcd 100644
--- a/history/titles/e_russia.txt
+++ b/history/titles/e_russia.txt
@@ -1,4 +1,4 @@
-d_oryol = {
+d_novosil= {
 	2550.1.1 = {
 		holder = russia0001
 	}
diff --git a/history/titles/k_transyvania.txt b/history/titles/k_transyvania.txt
index 5ec7acd9..7f9e3f74 100644
--- a/history/titles/k_transyvania.txt
+++ b/history/titles/k_transyvania.txt
@@ -24,7 +24,7 @@ k_kuban = {
 	}
 }
 
-c_rostov_on_don = {
+c_tana = {
 	2550.1.1 = {
 		holder = russia0003
 	}
@@ -62,66 +62,38 @@ c_oleshky = {
 	}
 }
 
-k_volgograd = {
-	2550.1.1 = {
-		holder = russia0002
-		effect = {
-			set_title_name = title_STALINGRAD
-			set_title_color = { 250 25 25 }
-		}
-	}
-}
-
-d_volgograd = {
-	2550.1.1 = {
-		holder = russia0002
-		effect = {
-			set_title_name = title_STALINGRAD
-			set_title_color = { 250 25 25 }
-		}
-	}
-}
-
-c_volgograd = {
-	2550.1.1 = {
-		holder = russia0002
-		effect = {
-			set_title_name = title_STALINGRAD
-			set_title_color = { 250 25 25 }
-		}
-	}
-}
-
-b_volgograd = {
-	2550.1.1 = {
-		holder = russia0002
-		name = title_STALINGRAD
-		effect = {
-			set_title_name = title_STALINGRAD
-			set_title_color = { 250 25 25 }
-		}
-	}
-}
-
-d_astrakhan = {
+k_khazaria= {
 	2550.1.1 = {
 		holder = russia0002
 	}
 }
 
-d_rostov = {
+d_khazaria= {
 	2550.1.1 = {
 		holder = russia0002
 	}
 }
 
-k_kalmykia = {
+d_itil= {
+	2550.1.1 = {
+		holder = russia0002
+	}
+}
+
+d_don_valley = {
+	2550.1.1 = {
+		holder = russia0002
+	}
+}
+
+
+k_kalmykia= {
 	2550.1.1 = {
 		holder = russia0007
 	}
 }
 
-d_alania = {
+d_alania= {
 	2550.1.1 = {
 		holder = russia0007
 	}
@@ -223,11 +195,4 @@ k_galicia-volhynia = {
 	2554.1.1 = {
 		holder = zapadoslavia0086
 	}
-}
-
-c_frolovo = {
-	2554.1.1 = {
-		holder = skarlet_khanov
-		liege = k_volgograd
-	}
 }
\ No newline at end of file
diff --git a/localization/english/replace/titles_cultural_names_l_english.yml b/localization/english/replace/titles_cultural_names_l_english.yml
index 80e03cac..4b85db53 100644
--- a/localization/english/replace/titles_cultural_names_l_english.yml
+++ b/localization/english/replace/titles_cultural_names_l_english.yml
@@ -6007,5 +6007,4 @@
  cn_uumaja_adj:0 "Uumaja"
  cn_arvidsjaur:0 "Arvidsjaur"
  cn_ornskoldsvik:0 "Örnsköldsvik"
- 
  
\ 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 bd44f5e1..d2f42811 100644
--- a/localization/english/replace/titles_l_english.yml
+++ b/localization/english/replace/titles_l_english.yml
@@ -17876,7 +17876,7 @@
  b_cabartei:0 "Cabartei"
  b_tserlona:0 "Tserlona"
  b_cisterki:0 "Cisterki"
- b_nikolayevsk:1 "Nikolayevsk"
+ b_nikolaievsk:1 "Altyn-Nor"
  b_chyorny_yar:0 "Chyorny Yar"
  b_saraychiq:0 "Saraychiq"
  b_ryn:0 "Ryn"
@@ -25037,12 +25037,7 @@
  #Special
 
  c_new_england: "New England"
- c_new_england_adj: New English"
-
- title_STALINGRAD: "Stalingrad"
- title_STALINGRAD_adj: "Stalinist"
- title_CAROLINGIA: "Carolingia"
- title_CAROLINGIA_adj: "Carolingian"
+ c_new_england_adj: "New English"
 
  k_bosporan_kingdom: "Bosporan Kingdom"
  k_bosporan_kingdom_article: "the "
@@ -25115,9 +25110,15 @@
  k_alsace:0 "Alsace" 
  k_alsace_adj:0 "Alsatian" 
 
+
+ d_toterpapsten:0 "Toterpapsten" 
+ d_toterpapsten_adj:0 "Toterpapstener"
  
- d_wisenland:0 "Wisentland" 
+ d_wisentland:0 "Wisentland" 
  d_wisentland_adj:0 "Wisentlander" 
+ 
+ d_bundesreich:0 "Bundesreich" 
+ d_bundesreich_adj:0 "Bundesreicher"
 
  ###NEOW Scandinavian Titles
  c_buskerud:0 "Buskerud"
@@ -25812,7 +25813,7 @@
 
  ### Event stuff related to titles
 
- capital_union_key:0 "[Concatenate(ROOT.Char.GetCapitalLocation.GetNameNoTooltip, ' Soviet')]"
+ capital_union_key:0 "[Concatenate(ROOT.Char.GetCapitalLocation.GetNameNoTooltip, ' Union')]"
  
  #LAAMPS
  d_laamp_test_jewish:0 "$ashkenazi$ Community of the $dynn_britannia_kohn$'s"
@@ -25918,42 +25919,7 @@
  b_dinskaya:0 "Dinskaya"
  b_temryuk:0 "Temryuk"
  d_naissus:0 "Nišavski "
- d_naissus_adj:0 "Nišavskin"
- 
- d_astrakhan:0 "Astrakhan"
- d_astrakhan_adj:0 "Astrakhani"
- c_akhtubinsk:0 "Akhtubinsk"
- c_akhtubinsk_adj:0 "Akhtubinskian"
- c_chyorny_yar:0 "Chyorny Yar"
- c_chyorny_yar_adj:0 "Chyorny Yarian"
- b_narimanov:0 "Narimanov"
- b_volodarsky:0 "Volodarsky"
- b_akhtubinsk:0 "Akhtubinsk"
- b_chyorny_yar:0 "Chyorny Yar"
- 
- b_volzhsky:0 "Volzhsky"
- b_svetlyy_yar:0 "Svetlyy Yar"
- 
- k_volgograd:0 "Volga"
- k_volgograd_adj:0 "Volgan"
-
- d_volgograd:0 "Volgograd"
- d_volgograd_adj:0 "Volgan"
- 
- c_volgograd:0 "Volgograd"
- c_volgograd_adj:0 "Volgan"
- 
- b_volgograd:0 "Volgograd"
- b_volgograd_adj:0 "Volgan"
- 
- c_murmansk:0 "Murmansk"
- c_murmansk_adj:0 "Murmanskian"
- b_murmansk:0 "Murmansk"
- b_vidyayevo:0 "Vidyayevo"
- b_pechengsky:0 "Pechengsky"
- c_tersky:0 "Tersky"
- c_tersky_adj:0 "Terskian"
- b_pyalitsa:0 "Pyalitsa"
+ d_naissus_adj:0 "Nišavskin" 
  
   ### Ukraine
  d_kherson:0 "Kherson"
diff --git a/map_data/default.map b/map_data/default.map
index 58461bcd..9eb5a784 100644
--- a/map_data/default.map
+++ b/map_data/default.map
@@ -253,7 +253,7 @@ impassable_mountains = LIST { 3029 3031 3036 }
 
 #Russia
 impassable_mountains = RANGE { 5516 5518 }
-impassable_mountains = LIST { 8703 }
+impassable_mountains = LIST { 972 8703 }
 
 #Scandinavia & Finland & Iceland
 impassable_mountains = RANGE { 652 658 }
diff --git a/map_data/definition.csv b/map_data/definition.csv
index c09368e5..525b7cef 100644
--- a/map_data/definition.csv
+++ b/map_data/definition.csv
@@ -12339,16 +12339,16 @@
 12338;126;127;42;;x
 12339;54;127;56;CirQF_Dongheqiao;x
 12340;249;0;158;;x
-12341;153;193;159;Semiluki;x
-12342;4;23;240;Korocha;x
-12343;145;214;128;Valyuki;x
-12344;153;62;44;Zadonsk;x
-12345;175;166;158;Zelenograd;x
-12346;156;173;152;Danilov;x
-12347;239;224;124;Kuntsevo;x
+12341;153;193;159;;x
+12342;4;23;240;;x
+12343;145;214;128;;x
+12344;153;62;44;;x
+12345;175;166;158;;x
+12346;156;173;152;;x
+12347;239;224;124;;x
 12348;23;61;158;CirQF_Tongxiahai;x
 12349;12;161;242;CirQF_Xiaoguan;x
-12350;164;175;154;Koroshevo;x
+12350;164;175;154;;x
 12351;13;23;236;CirQF_Suirongbao;x
 12352;166;214;132;CirQF_Tonganzhai;x
 12353;224;51;91;CirQF_Zhonganbao;x
@@ -12367,15 +12367,15 @@
 12366;24;3;61;CirQF_Longxi;x
 12367;29;23;240;CirQF_Weiyuanbao;x
 12368;93;75;209;CirQF_Dingxi;x
-12369;60;46;68;Izmaylovo;x
-12370;202;102;204;Shugozero;x
-12371;61;55;68;Sestroretsk;x
-12372;35;27;71;Pushkin;x
-12373;15;173;175;Petersgof;x
-12374;36;23;248;Kronstadt;x
-12375;103;107;65;Panasenkovsky;x
-12376;238;237;242;Ipatovsky;x
-12377;169;146;232;Turkmensky;x
+12369;60;46;68;;x
+12370;202;102;204;;x
+12371;61;55;68;;x
+12372;35;27;71;;x
+12373;15;173;175;;x
+12374;36;23;248;;x
+12375;103;107;65;;x
+12376;238;237;242;;x
+12377;169;146;232;;x
 12378;160;125;147;;x
 12379;22;14;51;;x
 12380;252;40;96;;x
@@ -12946,7 +12946,7 @@
 12945;234;86;120;;x
 12946;140;84;84;;x
 12947;107;161;159;b_qianzhou_qianhua;x
-12948;255;216;0;x;x
+12948;255;216;0;x
;x
 12949;143;205;49;b_zhangzhou_zhangpu_southwest;x
 12950;180;79;227;b_zhangzhou_zhangpu_west;x
 12951;126;81;15;b_zhangzhou_longxi_west;x
diff --git a/map_data/nodes.dat b/map_data/nodes.dat
index 8f370b82..e3571f4c 100644
Binary files a/map_data/nodes.dat and b/map_data/nodes.dat differ
diff --git a/map_data/provinces.png b/map_data/provinces.png
index 19599a34..96b758a8 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:8c9c6091a2197e06d0983cb47b77c6ddeed8ef25f14e7f67ba4ebd9db076b471
-size 3474225
+oid sha256:73c61f9aba3b1821eac16b809dbb2411db38e849ce109c50dfc1f6091deabbc1
+size 3473255