diff --git a/common/landed_titles/nistrenia.txt b/common/landed_titles/nistrenia.txt
index 591f5cab..1d450832 100644
--- a/common/landed_titles/nistrenia.txt
+++ b/common/landed_titles/nistrenia.txt
@@ -88,7 +88,7 @@ e_nistrenia = {
 
 					color = { 133 93 38 }
 				}				
-			}	
+			}		
 		}
 		d_transcarpathia = {
 			color = { 217 11 26 }
@@ -671,77 +671,35 @@ e_nistrenia = {
 		capital = c_lapusna
 		
 		d_nistrenia = {
-			color = { 180 150 20 }
-			capital = c_odessa	
-			c_odessa = {
-				color = { 137 69 13 }
+			color = { 90 60 140 }
+			capital = c_odessa
+			c_tiraspol = {
+				color = { 90 60 140 }
 				b_tiraspol = {
 					province = 5267
 
-					color = { 137 69 13 }
+					color = { 90 60 140 }
 				}
-				b_okachiv = {
-					province = 543
+				b_grigoriopol = {
+					province = 12441
 
-					color = { 137 69 13 }
-				}
-				b_odessa = {
-					province = 5268
-
-					color = { 137 69 13 }
-				}
-				b_olbia_ETEL = {
-					province = 542
-
-					color = { 137 69 13 }
+					color = { 90 60 140 }
 				}
 			}
-			c_ladyzyn = {
-				color = { 165 110 18 }
+			c_rybnitsa = {
+				color = { 50 40 100 }
+				b_rybnitsa = {
+					province = 12446
 
-				b_ladyzyn = {
-					province = 5257
-
-					color = { 165 110 18 }
+					color = { 50 40 100 }
 				}
-				b_birzula = {
-					province = 5258
+				b_camenca = {
+					province = 12442
 
-					color = { 165 110 18 }
-				}
-				b_liubashivka = {
-					province = 5259
-
-					color = { 165 110 18 }
+					color = { 50 40 100 }
 				}
 			}
-			c_ushytsia = {
-				color = { 163 201 106 }
-
-
-				b_ushytsia = {
-					province = 5098
-
-					color = { 163 201 106 }
-
-				}
-				b_vinnytsia = {
-					province = 5099
-
-					color = { 163 201 106 }
-				}
-				b_yampil = {
-					province = 5100
-
-					color = { 163 201 106 }
-				}
-				b_haisyn = {
-					province = 5101
-
-					color = { 125 201 106 }
-				}				
-			}			
-		}	
+		}
 		d_bukovina = {
 			color = { 210 200 70 }
 
@@ -1015,7 +973,7 @@ e_nistrenia = {
 	k_galicia-volhynia = {
 		color = { 50 150 130 }
 
-		capital = c_lviv # Volodymyr
+		capital = c_volodymyr # Volodymyr
 
 
 		d_volhynia = {
@@ -1063,9 +1021,13 @@ e_nistrenia = {
 					color = { 81 99 28 }
 				}
 			}
-			c_dubrovytsia = {
+			c_sarny = {
 				color = { 81 99 28 }
+				b_sarny = {
+					province = 5102
 
+					color = { 110 140 20 }
+				}
 				b_dubrovytsia = {
 					province = 5109
 
@@ -1077,28 +1039,22 @@ e_nistrenia = {
 
 					color = { 81 99 28 }
 				}
-				b_sarny = {
-					province = 5102
-
-					color = { 110 140 20 }
-				}
-				b_selo = {
+				b_rokytne = {
 					province = 5103
 
 					color = { 110 140 20 }
 				}
 			}
-			c_peresopnytsia = {
+			c_rivne = {
 				color = { 50 155 100 }
-
-				b_peresopnytsia = {
-					province = 5051
+				b_rivne = {
+					province = 5052
 
 					color = { 50 155 100 }
 
 				}
-				b_rivne = {
-					province = 5052
+				b_peresopnytsia = {
+					province = 5051
 
 					color = { 50 155 100 }
 
@@ -1109,6 +1065,17 @@ e_nistrenia = {
 					color = { 50 155 100 }
 
 				}
+				b_dubno = {
+					province = 5071
+
+					color = { 80 212 60 }
+				}
+				b_ostroh = {
+					province = 5072
+
+					color = { 80 212 60 }
+
+				}
 			}
 		}
 		d_ungvar = {
@@ -1160,23 +1127,17 @@ e_nistrenia = {
 		d_halych = {
 			color = { 80 212 60 }
 
-			capital = c_lviv # Galich
+			capital = c_ivano_frankivsk # Galich
 
 
-			c_halych = {
+			c_ivano_frankivsk = {
 				color = { 212 247 71 }
 
-				b_halych = {
+				b_ivano_frankivsk = {
 					province = 536
 
 					color = { 212 247 71 }
 
-				}
-				b_sambir = {
-					province = 5060
-
-					color = { 212 247 71 }
-
 				}
 				b_kolomyia = {
 					province = 5061
@@ -1199,17 +1160,6 @@ e_nistrenia = {
 					color = { 70 235 185 }
 
 				}
-				b_dubno = {
-					province = 5071
-
-					color = { 80 212 60 }
-				}
-				b_ostroh = {
-					province = 5072
-
-					color = { 80 212 60 }
-
-				}				
 			}			
 			c_lviv = {
 				color = { 130 212 7 }
@@ -1232,30 +1182,23 @@ e_nistrenia = {
 
 					color = { 130 212 7 }
 				}
-				b_buchach = {
-					province = 5066
+				b_sambir = {
+					province = 5060
 
-					color = { 130 212 7 }
+					color = { 212 247 71 }
 
 				}
-				b_moklekov = {
-					province = 5067
-
-					color = { 130 212 7 }
-				}
 			}
-			c_terebovl = {
+			c_ternopil = {
 				color = { 177 247 71 }
-
-
-				b_terebovl = {
-					province = 546
+				b_ternopil = {
+					province = 5066
 
 					color = { 177 247 71 }
 
 				}
-				b_horodok = {
-					province = 5068
+				b_terebovl = {
+					province = 546
 
 					color = { 177 247 71 }
 
@@ -1266,6 +1209,14 @@ e_nistrenia = {
 					color = { 177 247 71 }
 
 				}
+				b_monastyryska = {
+					province = 5067
+
+					color = { 177 247 71 }
+				}
+			}
+			c_zaslavl = {
+				color = { 80 212 60 }
 			}
 		}
 	}
@@ -1273,16 +1224,16 @@ e_nistrenia = {
 	k_ruthenia = {
 		color = { 70 150 90 }
 
-		capital = c_kiev # Kiev
+		capital = c_kyiv # Kiev
 
-		d_kiev = {
+		d_kyiv = {
 			color = { 52 120 69 }
 
-			capital = c_kiev # Kiev
-			c_kiev = {
+			capital = c_kyiv # Kiev
+			c_kyiv = {
 				color = { 53 105 66 }
 
-				b_kiev = {
+				b_kyiv = {
 					province = 547
 
 					color = { 70 150 90 }
@@ -1302,11 +1253,6 @@ e_nistrenia = {
 
 					color = { 70 150 90 }
 				}
-				b_kaniv = {
-					province = 5085
-
-					color = { 70 150 90 }
-				}
 				b_zdvyzhen = {
 					province = 5086
 
@@ -1326,21 +1272,6 @@ e_nistrenia = {
 					color = { 96 125 11 }
 				}
 			}
-			c_zaslavl = {
-				color = { 80 212 60 }
-
-				b_zaslavl = {
-					province = 5070
-
-					color = { 80 212 60 }
-
-				}
-				b_kolodiazhen = {
-					province = 5092
-
-					color = { 70 183 89 }
-				}
-			}			
 			c_zhytomyr = {
 				color = { 120 190 130 }
 				b_zhytomyr = {
@@ -1348,21 +1279,7 @@ e_nistrenia = {
 
 					color = { 120 190 130 }
 				}
-				b_mezhybozhe = {
-					province = 5088
-
-					color = { 120 190 130 }
-				}
-				b_rastovets = {
-					province = 5089
-
-					color = { 120 190 130 }
-				}
-			}
-			c_zvyahel = {
-				color = { 70 183 89 }
-
-				b_zvyahel = {
+				b_novohrad_volynskyi = {
 					province = 5091
 
 					color = { 70 183 89 }
@@ -1390,86 +1307,221 @@ e_nistrenia = {
 
 					color = { 52 156 80 }
 				}
-				b_radynka = {
+				b_poliske = {
 					province = 5097
 
 					color = { 52 156 80 }
 				}
-			}
+				b_pripyat = {
+					province = 12440
 
-			c_korsun = {
-				color = { 125 201 106 }
-
-				b_korsun = {
-					province = 544
-
-					color = { 125 201 106 }
-				}
-				b_malaia_skvirka = {
-					province = 5090
-
-					color = { 125 201 106 }
+					color = { 52 156 80 }
 				}
 			}
-		}
-
-		d_pereyaslavl = {
-			color = { 37 143 71 }
-
-			capital = c_pereyaslavl # Pereyaslavl
-
-			c_pereyaslavl = {
-				color = { 22 115 52 }
+			c_livoberezhna = {
+				color = { 62 145 82 }
 
 				b_pereyaslavl = {
 					province = 555
 
-					color = { 22 115 52 }
+					color = { 62 145 82 }
 				}
 				b_boryspil = {
 					province = 5178
 
-					color = { 22 115 52 }
-				}
-				b_priluk = {
-					province = 5179
-
-					color = { 22 115 52 }
-				}
-				b_zolotonosha = {
-					province = 5180
-
-					color = { 22 115 52 }
+					color = { 62 145 82 }
 				}
 			}
-			c_hradyzk = {
-				color = { 50 102 67 }
+		}
+		d_odessa = {
+			color = { 4 80 70 }
+			capital = c_kiev
+			c_odessa = {
+				color = { 4 80 70 }
+				b_odessa = {
+					province = 5268
 
-				b_hradyzk = {
+					color = { 4 80 70 }
+				}
+				b_okachiv = {
+					province = 543
+
+					color = { 4 80 70 }
+				}
+				b_berezivka = {
+					province = 542
+
+					color = { 4 80 70 }
+				}
+				b_rozdilna= {
+					province = 12445
+
+					color = { 4 80 70 }
+				}
+			}
+			c_podilsk = {
+				color = { 20 100 90 }
+				b_podilsk = {
+					province = 5258
+
+					color = { 20 100 90 }
+				}
+				b_liubashivka = {
+					province = 5259
+
+					color = { 20 100 90 }
+				}
+			}			
+		}	
+		d_podolia = {
+			color = { 10 120 90 }
+			capital = c_khmelnytskyi 
+			c_khmelnytskyi  = {
+				color = { 10 120 90 }
+				b_khmelnytskyi = {
+					province = 5088
+
+					color = { 10 120 90 }
+				}	
+				b_kamianets_podilskyi = {
+					province = 5098
+
+					color = { 10 120 90 }
+
+				}
+				b_horodok = {
+					province = 5068
+
+					color = { 10 120 90 }
+
+				}
+				b_shepetivka = {
+					province = 5092
+
+					color = { 10 120 90 }
+				}	
+				b_iziaslav = {
+					province = 5070
+
+					color = { 10 120 90 }
+
+				}				
+			}
+			c_vinnytsia = {
+				color = { 30 140 110 }
+				b_vinnytsia = {
+					province = 5099
+
+					color = { 163 201 106 }
+				}
+				b_yampil = {
+					province = 5100
+
+					color = { 10 140 100 }
+				}
+				b_haisyn = {
+					province = 5101
+
+					color = { 10 140 100 }
+				}
+				b_ladyzhyn = {
+					province = 5257
+
+					color = { 165 110 18 }
+				}
+				b_lyopovets = {
+					province = 5090
+
+					color = { 125 201 106 }
+				}
+				b_khmilnyk = {
+					province = 5089
+
+					color = { 120 190 130 }
+				}
+			}
+			c_uman = {
+				color = { 105 60 10 }
+
+				b_khrystynivka = {
+					province = 5260
+
+					color = { 105 60 10 }
+				}
+				b_buky = {
+					province = 5261
+
+					color = { 105 60 10 }
+				}
+				b_uman = {
+					province = 5262
+
+					color = { 105 60 10 }
+				}
+			}
+		}
+		d_poltava = {
+			color = { 37 143 71 }
+
+			capital = c_poltava # Pereyaslavl
+			c_poltava = {
+				color = { 37 143 71 }
+				b_poltava = {
+					province = 5184
+					color = { 37 143 71 }
+				}
+				b_karlivka = {
+					province = 5282
+
+					color = { 37 143 71 }
+				}
+			}
+			c_kremenchuk = {
+				color = { 77 163 91 }
+
+				b_kremenchuk = {
 					province = 5181
 
-					color = { 50 102 67 }
+					color = { 57 163 91  }
+				}
+				b_myrhorod = {
+					province = 5183
+
+					color = { 57 163 91}
+				}
+				b_lubny = {
+					province = 5190
+
+					color = { 98 146 103 }
+				}
+			}
+		}
+		d_sumy = {
+			color = { 24 130 58 }
+
+			capital = c_sumy
+			c_sumy = {
+				color = { 24 130 58 }
+				b_sumy = {
+					province = 5188
+
+					color = { 24 130 58 }
+				}
+				b_nedryhailiv = {
+					province = 5187
+
+					color = { 24 130 58 }
 				}
 				b_akhtyr = {
 					province = 5182
 
-					color = { 50 102 67 }
-				}
-				b_myrhorod = {
-					province = 5183
-
-					color = { 50 102 67 }
-				}
-				b_poltava = {
-					province = 5184
-
 					color = { 50 102 67 }
 				}
 			}
-			c_romen = {
+			c_romny = {
 				color = { 4 110 38 }
 
-				b_romen = {
+				b_romny = {
 					province = 5185
 
 					color = { 4 110 38 }
@@ -1477,81 +1529,16 @@ e_nistrenia = {
 				b_lokhrytsia = {
 					province = 5186
 
-					color = { 4 110 38 }
-				}
-				b_nedryhailiv = {
-					province = 5187
-
-					color = { 4 110 38 }
-				}
-				b_sumy = {
-					province = 5188
-
 					color = { 4 110 38 }
 				}
 			}
-			c_voin = {
-				color = { 98 146 103 }
-
-				b_voin = {
-					province = 5189
-
-					color = { 98 146 103 }
-				}
-				b_lubny = {
-					province = 5190
-
-					color = { 98 146 103 }
-				}
-			}
-		}
-
-		d_chernigov = {
-			color = { 150 235 91 }
-
-			capital = c_chernigov # Chernigov
-
-			c_chernigov = {
-				color = { 121 189 74 }
-
-				b_chernigov = {
-					province = 554
-
-					color = { 121 189 74 }
-				}
-				b_lyubech = {
-					province = 553
-
-					color = { 121 189 74 }
-				}
-				b_unenezh = {
-					province = 5201
-
-					color = { 121 189 74 }
-				}
-			}
-			c_novgorod_seversky = {
-				color = { 108 135 2 }
-
-				b_novgorod_seversky = {
-					province = 567
-
-					color = { 108 135 2 }
-				}
-				b_borzna = {
-					province = 5191
-
-					color = { 108 135 2 }
-				}
-				b_glukhov = {
+			c_hlukhiv = {
+				color = { 140 165 40 }
+				b_hlukhiv = {
 					province = 5192
 
 					color = { 108 135 2 }
 				}
-			}
-			c_putyvl = {
-				color = { 140 165 40 }
-
 				b_putyvl = {
 					province = 5193
 
@@ -1569,236 +1556,392 @@ e_nistrenia = {
 				}
 			}
 		}
+		d_chernihiv = {
+			color = { 150 235 91 }
+
+			capital = c_chernihiv # Chernigov
+
+			c_chernihiv = {
+				color = { 121 189 74 }
+
+				b_chernihiv = {
+					province = 554
+
+					color = { 121 189 74 }
+				}
+				b_slavutych = {
+					province = 553
+
+					color = { 121 189 74 }
+				}
+			}
+			c_novgorod_seversky = {
+				color = { 108 135 2 }
+
+				b_novgorod_seversky = {
+					province = 567
+
+					color = { 108 135 2 }
+				}
+			}
+			c_nizhyn = {
+				color = { 22 115 52 }
+				b_nizhyn = {
+					province = 5201
+
+					color = { 121 189 74 }
+				}
+				b_bakhmach = {
+					province = 5191
+
+					color = { 108 135 2 }
+				}
+				b_pryluky = {
+					province = 5179
+
+					color = { 22 115 52 }
+				}
+			}
+		}
 
 
-		d_yedisan = {	#Karayedisan
-			color = { 156 82 22 }
+		d_cherkassy = {	#Karayedisan
+			color = { 10 100 100 }
 
 			capital = c_cherkassy
 			c_cherkassy = {
-				color = { 125 80 18 }
+				color = { 10 100 100  }
 
 				b_cherkassy = {
 					province = 5263
 
-					color = { 125 80 18 }
+					color = { 10 100 100 }
 				}
-				b_sacacatce = {
+				b_korsun = {
+					province = 544
+
+					color = { 10 100 100  }
+				}
+				b_kaniv = {
+					province = 5085
+
+					color = { 10 100 100  }
+				}
+				b_chornobai = {
+					province = 5189
+
+					color = { 10 100 100  }
+				}
+				b_zolotonosha = {
+					province = 5180
+
+					color = { 22 115 52 }
+				}
+			}
+			c_kirovohrad = {
+				color = { 30 120 120 }
+				b_kirovohrad = {
 					province = 5264
 
-					color = { 125 80 18 }
+					color = { 30 120 120 }
 				}
-				b_kashan = {
-					province = 5265
-
-					color = { 125 80 18 }
-				}
-				b_pervomaisk = {
+				b_novoukrainka = {
 					province = 5266
 
-					color = { 125 80 18 }
+					color = { 30 120 120 }
+				}
+				b_holovanivsk = {
+					province = 5265
+
+					color = { 30 120 120 }
 				}
 			}
-			c_uman = {
-				color = { 105 60 10 }
+		}
 
-				b_yary = {
-					province = 5260
+		d_kherson = {
+			color = { 7 140 63 }
 
-					color = { 105 60 10 }
+			capital = c_kherson # Odessa
+
+			c_kherson = {
+				color = { 7 140 63 }
+
+				b_kherson = {
+					province = 5269
+
+					color = { 7 140 63 }
 				}
-				b_buky = {
-					province = 5261
+				b_beryslav = {
+					province = 5272
 
-					color = { 105 60 10 }
-				}
-				b_uman = {
-					province = 5262
-
-					color = { 105 60 10 }
+					color = { 19 105 55 }
 				}
 			}
+			c_mykolaiv = {
+				color = { 34 97 79 }
+				b_mykolaiv = {
+					province = 12539
+					color = { 34 97 79 }
+					}
+				b_bashtanka = {
+					province = 5270
+
+					color = { 7 140 63 }
+				}
+				b_voznesensk = {
+					province = 5271
+
+					color = { 7 140 63 }
+				}
+			}
+			c_oleshky = {
+				color = { 40 130 200 }
+
+
+				b_oleshky = {
+					province = 558
+
+					color = { 40 130 200 }
+				}
+				b_khakovka = {
+					province = 5278
+
+					color = { 40 130 200 }
+				}
+				b_henichesk = {
+					province = 5279
+
+					color = { 40 130 200 }
+				}
+				b_skadovsk = {
+					province = 12400
+
+					color = { 40 130 200 }
+				}
+			}
+		}
+		d_zaporizhzhia = {
+			color = { 115 60 200 }
+			
+			capital = c_zaporizhzhia # zaporizhzhia
+
+			c_zaporizhzhia = {
+				color = { 115 60 200 }
+				b_zaporizhzhia = {
+					province = 557
+
+					color = { 115 60 200 }
+				}
+				b_polohy = {
+					province = 12536
+
+					color = { 115 60 200 }
+				}
+				b_vasylivka = {
+					province = 12399
+
+					color = { 115 60 200 }
+				}
+			}
+			c_melitopol = {
+				color = { 135 80 220 }
+				b_melitopol = {
+					province = 5281
+
+					color = { 135 80 220 }
+				}
+				b_kyrylivka = {
+					province = 12397
+
+					color = { 135 80 220 }
+				}
+				b_berdiansk = {
+					province = 12444
+
+					color = { 135 80 220 }
+				}
+			}
+		}
+		d_donbas = {
+			color = { 80 20 130 }
+			
+			capital = c_donetsk
+			
+			c_donetsk = {
+				color = { 80 20 130 }
+
+				b_donetsk = {
+					province = 5324
+
+					color = { 80 20 130 }
+				}
+				b_kramatorsk = {
+					province = 12535
+
+					color = { 80 20 130 }
+				}
+				b_bakhmut = {
+					province = 564
+
+					color = { 80 20 130 }
+				}
+				b_kuzeytorg = {
+					province = 5328
+
+					color = { 80 20 130 }
+				}
+			}
+			
+			c_mariupol = {
+				color = { 100 40 140 }
+				b_mariupol = {
+					province = 5280
+
+					color = { 100 40 140 }
+				}
+				b_kalmiuske = {
+					province = 12453
+					color = { 100 40 140 }
+				}
+				b_volnovakha = {
+					province = 12452
+					color = { 100 40 140 }
+				}
+			}	
+			c_luhansk = {
+				color = { 130 70 170 }
+				b_luhansk = {
+					province = 12534
+
+					color = { 130 70 170 }
+				}
+				b_starobilsk = {
+					province = 12486
+
+					color = { 130 70 170 }
+				}
+				b_podgornye = {
+					province = 5327
+
+					color = { 130 70 170 }
+				}
+			}
+		}
+		d_dnipro = {
+			color = { 60 30 80 }
+
+			capital = c_dnipro
+			
 			c_dnipro = {
-				color = { 100 65 37 }
+				color = { 60 30 80 }
 
 				b_dnipro = {
 					province = 5274
 
-					color = { 100 65 37 }
+					color = { 60 30 80 }
 				}
 
 				b_salmacatce = {
 					province = 5275
 
-					color = { 100 65 37 }
+					color = { 60 30 80 }
 				}
 			}
-		}
+			c_kryvyi_rih = {
+				color = { 80 50 100 }
 
-		d_kizilyedisan = {
-			color = { 117 49 0 }
+				b_kryvyi_rih = {
+					province = 12538
 
-			capital = c_kherson # Odessa
-
-			c_kherson = {
-				color = { 125 90 65 }
-
-				b_kherson = {
-					province = 5269
-
-					color = { 125 90 65 }
-				}
-				b_kazanka = {
-					province = 5270
-
-					color = { 125 90 65 }
-				}
-				b_voznessensk = {
-					province = 5271
-
-					color = { 125 90 65 }
-				}
-			}
-			c_lower_dniepr = {
-				color = { 183 125 94 }
-
-				b_beryslav = {
-					province = 5272
-
-					color = { 183 125 94 }
+					color = { 80 50 100}
 				}
 				b_nikopol = {
 					province = 5273
 
-					color = { 183 125 94 }
+					color = { 80 50 100 }
 				}
 			}
-		}
+			c_pavlohrad = {
+				color = { 60 10 140 }
+				b_pavlohrad = {
+					province = 12447
 
-		d_levedia = {
-			color = { 210 160 69 }
+					color = { 60 10 140 }
+				}
+				b_synelnykove = {
+					province = 12449
 
-			capital = c_samar
+					color = { 60 10 140 }
+				}
+				b_pokrovske = {
+					province = 5321
 
-			
+					color = { 60 10 140 }
+				}
+			}
 			c_samar = {
-				color = { 180 180 90 }
+				color = { 70 40 140 }
 
 				b_samar = {
 					province = 556
 
-					color = { 180 180 90 }
+					color = { 70 40 140 }
 				}
-				b_karlivka = {
-					province = 5282
+				b_pidhorodnie = {
+					province = 12448
 
-					color = { 180 180 90 }
+					color = { 70 40 140 }
 				}
-				b_kharka = {
+			}
+		}
+		d_kharkiv = {
+			color = { 2 116 221 }
+
+			capital = c_kharkiv
+
+			c_kharkiv = {
+				color = { 2 116 221 }
+				b_kharkiv = {
 					province = 565
 
-					color = { 180 180 90 }
+					color = { 2 116 221 }
 				}
 				b_bohodukhiv = {
 					province = 5283
 
-					color = { 180 180 90 }
+					color = { 2 116 221 }
 				}
-			}
-			c_bakhmut = {
-				color = { 150 100 20 }
+			}	
+			c_izium = {
+				color = { 80 180 240 }
+				b_izium = {
+					province = 12451
 
-				b_bakhmut = {
-					province = 564
-
-					color = { 150 100 20 }
-				}
-				b_tor = {
-					province = 5322
-
-					color = { 150 100 20 }
+					color = { 80 180 240 }
 				}
 				b_volcha = {
 					province = 5323
 
-					color = { 150 100 20 }
+					color = { 80 180 240 }
 				}
+				b_kupiansk = {
+					province = 12450
 
-				b_kuzeytorg = {
-					province = 5328
-
-					color = { 240 230 60 }
-				}
-				b_podgornye = {
-					province = 5327
-
-					color = { 185 150 70 }
+					color = { 80 180 240 }
 				}
 			}
 			c_lozova = {
-				color = { 130 70 0 }
+				color = { 40 80 120 }
 				
 				b_lozova = {
 					province = 5320
 
-					color = { 130 70 0 }
+					color = { 40 80 120}
 				}
-				b_pokrovsk = {
-					province = 5321
+				b_berestyn = {
+					province = 5322
 
-					color = { 130 70 0 }
-				}
-			}
-		}
-		
-		d_red_levedia = {
-			color = { 196 140 49 }
-
-			capital = c_khortytsia # Khortytsia
-
-			c_khortytsia = {
-				color = { 180 130 50 }
-
-
-				b_khortytsia = {
-					province = 557
-
-					color = { 180 130 50 }
-				}
-				b_mariupol = {
-					province = 5280
-
-					color = { 180 130 50 }
-				}
-				b_kutur-ogly = {
-					province = 5281
-
-					color = { 180 130 50 }
-				}
-				b_donetsk = {
-					province = 5324
-
-					color = { 180 130 50 }
-				}
-			}
-			c_oleshye = {
-				color = { 200 130 40 }
-
-
-				b_oleshye = {
-					province = 558
-
-					color = { 200 130 40 }
-				}
-				b_kakovka = {
-					province = 5278
-
-					color = { 200 130 40 }
-				}
-				b_kyzyl_jar = {
-					province = 5279
-
-					color = { 200 130 40 }
+					color = { 40 80 120 }
 				}
 			}
 		}
@@ -1998,7 +2141,12 @@ e_nistrenia = {
 					province = 5108
 
 					color = { 96 125 11 }
-				}				
+				}	
+				b_stolin = {
+					province = 12443
+
+					color = { 96 125 11 }
+				}					
 			}
 
 		}
diff --git a/gfx/map/map_object_data/activities.txt b/gfx/map/map_object_data/activities.txt
index c6ed347c..f9bacef8 100644
--- a/gfx/map/map_object_data/activities.txt
+++ b/gfx/map/map_object_data/activities.txt
@@ -3229,13 +3229,13 @@
 		}
 		{
 			id=542
-			position={ 2653.901123 0.000000 2906.032715 }
+			position={ 2628.784912 0.000000 2935.234863 }
 			rotation={ -0.000000 -0.460977 -0.000000 0.887412 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=543
-			position={ 2615.249268 0.000000 2903.904297 }
+			position={ 2641.858398 0.000000 2909.536133 }
 			rotation={ -0.000000 0.791655 -0.000000 0.610968 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -3313,7 +3313,7 @@
 		}
 		{
 			id=556
-			position={ 2762.103516 0.000000 3054.898926 }
+			position={ 2784.494629 0.000000 3071.275146 }
 			rotation={ -0.000000 -0.261305 -0.000000 0.965256 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -3325,7 +3325,7 @@
 		}
 		{
 			id=558
-			position={ 2741.175781 0.000000 2870.471680 }
+			position={ 2736.948486 0.000000 2877.233887 }
 			rotation={ -0.000000 -0.066966 -0.000000 0.997755 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -27295,7 +27295,7 @@
 		}
 		{
 			id=5072
-			position={ 2315.253174 0.000000 3141.236328 }
+			position={ 2315.249268 0.000000 3156.436523 }
 			rotation={ -0.000000 0.547017 -0.000000 0.837122 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -27313,7 +27313,7 @@
 		}
 		{
 			id=5075
-			position={ 2196.508301 0.000000 3245.349854 }
+			position={ 2200.495117 0.000000 3230.117920 }
 			rotation={ -0.000000 -0.300082 -0.000000 0.953913 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -27517,7 +27517,7 @@
 		}
 		{
 			id=5109
-			position={ 2303.400635 0.000000 3273.880615 }
+			position={ 2299.208008 0.000000 3255.444580 }
 			rotation={ -0.000000 0.425886 -0.000000 0.904777 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -27943,7 +27943,7 @@
 		}
 		{
 			id=5180
-			position={ 2568.591064 0.000000 3142.473389 }
+			position={ 2582.835693 0.000000 3129.093750 }
 			rotation={ -0.000000 0.478381 -0.000000 0.878153 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -28021,7 +28021,7 @@
 		}
 		{
 			id=5193
-			position={ 2665.461426 0.000000 3246.659180 }
+			position={ 2646.569092 0.000000 3247.321289 }
 			rotation={ -0.000000 -0.201641 -0.000000 0.979459 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -28405,13 +28405,13 @@
 		}
 		{
 			id=5257
-			position={ 2497.773926 0.000000 2997.957031 }
+			position={ 2521.571045 0.000000 2999.411377 }
 			rotation={ -0.000000 0.322182 -0.000000 0.946678 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=5258
-			position={ 2520.046143 0.000000 2973.089600 }
+			position={ 2540.475098 0.000000 2971.118408 }
 			rotation={ -0.000000 0.399480 -0.000000 0.916742 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -28465,7 +28465,7 @@
 		}
 		{
 			id=5267
-			position={ 2546.581543 0.000000 2927.674316 }
+			position={ 2580.245361 0.000000 2887.221191 }
 			rotation={ -0.000000 -0.341900 -0.000000 0.939736 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -28501,7 +28501,7 @@
 		}
 		{
 			id=5273
-			position={ 2750.000000 0.000000 2975.000000 }
+			position={ 2763.307617 0.000000 2971.780273 }
 			rotation={ -0.000000 0.420412 -0.000000 0.907333 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -28537,13 +28537,13 @@
 		}
 		{
 			id=5279
-			position={ 2785.796387 0.000000 2879.621338 }
+			position={ 2808.444092 0.000000 2891.898193 }
 			rotation={ -0.000000 -0.298306 -0.000000 0.954470 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=5280
-			position={ 2932.581543 0.000000 2948.698730 }
+			position={ 2915.913086 0.000000 2937.738770 }
 			rotation={ -0.000000 0.288504 -0.000000 0.957479 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -28783,7 +28783,7 @@
 		}
 		{
 			id=5320
-			position={ 2820.704346 0.000000 3055.331543 }
+			position={ 2871.942627 0.000000 3065.040039 }
 			rotation={ -0.000000 -0.354944 -0.000000 0.934888 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -28795,19 +28795,19 @@
 		}
 		{
 			id=5322
-			position={ 2860.982178 0.000000 3064.456299 }
+			position={ 2827.053223 0.000000 3073.017090 }
 			rotation={ -0.000000 -0.318655 -0.000000 0.947871 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=5323
-			position={ 2867.659180 0.000000 3118.115967 }
+			position={ 2846.715820 0.000000 3128.409424 }
 			rotation={ -0.000000 0.544690 -0.000000 0.838638 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=5324
-			position={ 2869.459229 0.000000 2991.744629 }
+			position={ 2956.369385 0.000000 3014.732178 }
 			rotation={ -0.000000 0.277674 -0.000000 0.960675 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -28831,13 +28831,13 @@
 		}
 		{
 			id=5328
-			position={ 2970.646729 0.000000 3010.988281 }
+			position={ 2910.187744 0.000000 3000.776367 }
 			rotation={ -0.000000 0.317151 -0.000000 0.948375 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=5329
-			position={ 3038.526123 0.000000 3032.151367 }
+			position={ 3048.558594 0.000000 3027.064697 }
 			rotation={ -0.000000 -0.351775 -0.000000 0.936085 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -47981,6 +47981,12 @@
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
+		{
+			id=8883
+			position={ 2094.000000 0.000000 3002.000000 }
+			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
 		{
 			id=8993
 			position={ 1296.000000 0.000000 993.000000 }
@@ -65129,12 +65135,30 @@
 			rotation={ 0.000000 0.867118 0.000000 0.498103 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
+		{
+			id=12397
+			position={ 2825.000000 0.000000 2899.000000 }
+			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
 		{
 			id=12398
 			position={ 6436.000000 0.000000 2960.000000 }
 			rotation={ 0.000000 0.293128 0.000000 0.956073 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
+		{
+			id=12399
+			position={ 2799.000000 0.000000 2937.000000 }
+			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=12400
+			position={ 2713.000000 0.000000 2867.000000 }
+			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
 		{
 			id=12401
 			position={ 6790.000000 0.000000 2982.000000 }
@@ -65369,6 +65393,90 @@
 			rotation={ 0.000000 0.993292 0.000000 -0.115634 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
+		{
+			id=12440
+			position={ 2448.000000 0.000000 3237.000000 }
+			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=12441
+			position={ 2534.000000 0.000000 2932.000000 }
+			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=12442
+			position={ 2490.000000 0.000000 2994.000000 }
+			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=12443
+			position={ 2306.000000 0.000000 3285.000000 }
+			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=12444
+			position={ 2882.804199 0.000000 2915.495117 }
+			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=12445
+			position={ 2586.000000 0.000000 2918.000000 }
+			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=12446
+			position={ 2517.000000 0.000000 2967.000000 }
+			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=12447
+			position={ 2819.000000 0.000000 3039.000000 }
+			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=12448
+			position={ 2745.000000 0.000000 3047.000000 }
+			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=12449
+			position={ 2789.000000 0.000000 3026.000000 }
+			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=12450
+			position={ 2894.000000 0.000000 3130.000000 }
+			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=12451
+			position={ 2898.000000 0.000000 3097.000000 }
+			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=12452
+			position={ 2926.000000 0.000000 2968.000000 }
+			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=12453
+			position={ 2958.000000 0.000000 2973.000000 }
+			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
 		{
 			id=12454
 			position={ 7384.000000 0.000000 3089.000000 }
@@ -65561,6 +65669,12 @@
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
+		{
+			id=12486
+			position={ 3000.000000 0.000000 3076.000000 }
+			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
 		{
 			id=12489
 			position={ 7440.000000 0.000000 1874.000000 }
@@ -65711,6 +65825,36 @@
 			rotation={ 0.000000 0.942594 0.000000 -0.333940 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
+		{
+			id=12534
+			position={ 2994.000000 0.000000 3032.000000 }
+			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=12535
+			position={ 2909.000000 0.000000 3049.000000 }
+			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=12536
+			position={ 2865.000000 0.000000 2980.000000 }
+			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=12538
+			position={ 2727.000000 0.000000 2969.000000 }
+			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=12539
+			position={ 2686.000000 0.000000 2937.000000 }
+			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
 		{
 			id=12540
 			position={ 6204.000000 0.000000 1789.000000 }
@@ -70061,12 +70205,6 @@
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
-		{
-			id=13632
-			position={ 2097.827148 0.000000 3503.711426 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
 		{
 			id=13633
 			position={ 2158.028320 0.000000 3473.057373 }
diff --git a/gfx/map/map_object_data/building_locators.txt b/gfx/map/map_object_data/building_locators.txt
index 47616ad8..6e4eb3f9 100644
--- a/gfx/map/map_object_data/building_locators.txt
+++ b/gfx/map/map_object_data/building_locators.txt
@@ -3229,13 +3229,13 @@
 		}
 		{
 			id=542
-			position={ 2662.168213 0.000000 2903.687500 }
+			position={ 2637.052002 0.000000 2932.889648 }
 			rotation={ -0.000000 -0.560855 -0.000000 -0.827914 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=543
-			position={ 2620.584229 0.000000 2895.301758 }
+			position={ 2647.193359 0.000000 2900.933594 }
 			rotation={ -0.000000 -0.988457 -0.000000 0.151499 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -3313,7 +3313,7 @@
 		}
 		{
 			id=556
-			position={ 2753.077637 0.000000 3054.085449 }
+			position={ 2775.468750 0.000000 3070.461670 }
 			rotation={ -0.000000 -0.989076 -0.000000 -0.147408 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -3325,7 +3325,7 @@
 		}
 		{
 			id=558
-			position={ 2746.077637 0.000000 2877.085449 }
+			position={ 2753.334473 0.000000 2887.412109 }
 			rotation={ -0.000000 -0.619437 -0.000000 -0.785046 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -27253,7 +27253,7 @@
 		}
 		{
 			id=5065
-			position={ 2277.077637 0.000000 3111.085449 }
+			position={ 2261.841309 0.000000 3124.415039 }
 			rotation={ -0.000000 -0.774499 -0.000000 0.632575 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -27295,8 +27295,8 @@
 		}
 		{
 			id=5072
-			position={ 2319.077637 0.000000 3135.085449 }
-			rotation={ -0.000000 -0.157813 -0.000000 0.987469 }
+			position={ 2323.392090 0.000000 3152.139160 }
+			rotation={ -0.000000 -0.744395 -0.000000 0.667740 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
@@ -27313,7 +27313,7 @@
 		}
 		{
 			id=5075
-			position={ 2197.329834 0.000000 3237.550781 }
+			position={ 2201.316650 0.000000 3222.318848 }
 			rotation={ -0.000000 -0.227937 -0.000000 -0.973676 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -27517,7 +27517,7 @@
 		}
 		{
 			id=5109
-			position={ 2304.077637 0.000000 3267.085449 }
+			position={ 2299.885010 0.000000 3248.649414 }
 			rotation={ -0.000000 -0.823316 -0.000000 -0.567584 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -27943,7 +27943,7 @@
 		}
 		{
 			id=5180
-			position={ 2576.077637 0.000000 3137.085449 }
+			position={ 2590.322266 0.000000 3123.705811 }
 			rotation={ -0.000000 -0.023553 -0.000000 -0.999723 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -28003,7 +28003,7 @@
 		}
 		{
 			id=5190
-			position={ 2619.093506 0.000000 3141.823242 }
+			position={ 2621.677979 0.000000 3153.495117 }
 			rotation={ -0.000000 -0.994203 -0.000000 0.107515 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -28021,7 +28021,7 @@
 		}
 		{
 			id=5193
-			position={ 2651.347656 0.000000 3254.147949 }
+			position={ 2632.455322 0.000000 3254.810059 }
 			rotation={ -0.000000 -0.419539 -0.000000 0.907737 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -28405,13 +28405,13 @@
 		}
 		{
 			id=5257
-			position={ 2504.077637 0.000000 2990.085449 }
+			position={ 2519.472412 0.000000 3009.339355 }
 			rotation={ -0.000000 -0.877995 -0.000000 -0.478670 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=5258
-			position={ 2525.077637 0.000000 2966.085449 }
+			position={ 2545.506592 0.000000 2964.114258 }
 			rotation={ -0.000000 -0.944137 -0.000000 -0.329552 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -28465,7 +28465,7 @@
 		}
 		{
 			id=5267
-			position={ 2539.077637 0.000000 2931.085449 }
+			position={ 2556.906494 0.000000 2905.616699 }
 			rotation={ -0.000000 -0.813875 -0.000000 -0.581040 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -28501,7 +28501,7 @@
 		}
 		{
 			id=5273
-			position={ 2756.077637 0.000000 2980.085449 }
+			position={ 2779.884521 0.000000 2976.731445 }
 			rotation={ -0.000000 -0.963674 -0.000000 -0.267080 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -28531,19 +28531,19 @@
 		}
 		{
 			id=5278
-			position={ 2782.412354 0.000000 2932.049805 }
+			position={ 2763.432129 0.000000 2932.482178 }
 			rotation={ -0.000000 -0.321546 -0.000000 0.946894 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=5279
-			position={ 2777.077637 0.000000 2878.085449 }
+			position={ 2816.872314 0.000000 2880.168945 }
 			rotation={ -0.000000 -0.999571 -0.000000 0.029305 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=5280
-			position={ 2952.077637 0.000000 2950.085449 }
+			position={ 2935.409180 0.000000 2939.125488 }
 			rotation={ -0.000000 -0.986064 -0.000000 -0.166365 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -28783,7 +28783,7 @@
 		}
 		{
 			id=5320
-			position={ 2806.077637 0.000000 3056.085449 }
+			position={ 2857.315918 0.000000 3065.793945 }
 			rotation={ -0.000000 -0.442520 -0.000000 0.896759 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -28795,19 +28795,19 @@
 		}
 		{
 			id=5322
-			position={ 2852.077637 0.000000 3066.085449 }
+			position={ 2818.148682 0.000000 3074.646240 }
 			rotation={ -0.000000 -0.358077 -0.000000 -0.933692 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=5323
-			position={ 2878.077637 0.000000 3114.085449 }
+			position={ 2857.134277 0.000000 3124.378906 }
 			rotation={ -0.000000 -0.985341 -0.000000 0.170594 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=5324
-			position={ 2878.077637 0.000000 2985.085449 }
+			position={ 2964.987793 0.000000 3008.072998 }
 			rotation={ -0.000000 -0.639532 -0.000000 0.768765 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -28831,13 +28831,13 @@
 		}
 		{
 			id=5328
-			position={ 2975.077637 0.000000 3004.085449 }
+			position={ 2914.618652 0.000000 2993.873535 }
 			rotation={ -0.000000 -0.629979 -0.000000 0.776613 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=5329
-			position={ 3034.077637 0.000000 3025.085449 }
+			position={ 3044.110107 0.000000 3019.998779 }
 			rotation={ -0.000000 -0.999442 -0.000000 -0.033402 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -47981,6 +47981,12 @@
 			rotation={ -0.000000 -0.999983 -0.000000 -0.005813 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
+		{
+			id=8883
+			position={ 2097.000000 0.000000 3002.000000 }
+			rotation={ -0.000000 -0.962724 -0.000000 0.270487 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
 		{
 			id=8993
 			position={ 1316.077637 0.000000 1010.085571 }
@@ -65129,12 +65135,30 @@
 			rotation={ 0.000000 0.867118 0.000000 0.498103 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
+		{
+			id=12397
+			position={ 2828.000000 0.000000 2899.000000 }
+			rotation={ -0.000000 -0.996900 -0.000000 0.078680 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
 		{
 			id=12398
 			position={ 6261.937500 0.000000 2770.756836 }
 			rotation={ 0.000000 0.293128 0.000000 0.956073 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
+		{
+			id=12399
+			position={ 2813.414795 0.000000 2924.706055 }
+			rotation={ -0.000000 -0.826200 -0.000000 -0.563376 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=12400
+			position={ 2707.219727 0.000000 2876.413574 }
+			rotation={ -0.000000 -0.963800 -0.000000 0.266627 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
 		{
 			id=12401
 			position={ 6684.937500 0.000000 2813.756836 }
@@ -65369,6 +65393,90 @@
 			rotation={ 0.000000 0.993292 0.000000 -0.115634 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
+		{
+			id=12440
+			position={ 2453.000000 0.000000 3231.000000 }
+			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=12441
+			position={ 2537.000000 0.000000 2932.000000 }
+			rotation={ -0.000000 -0.695041 -0.000000 -0.718970 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=12442
+			position={ 2493.000000 0.000000 2994.000000 }
+			rotation={ -0.000000 -0.601278 -0.000000 -0.799040 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=12443
+			position={ 2312.000000 0.000000 3287.000000 }
+			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=12444
+			position={ 2889.000000 0.000000 2937.000000 }
+			rotation={ -0.000000 -0.271433 -0.000000 0.962457 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=12445
+			position={ 2589.000000 0.000000 2918.000000 }
+			rotation={ -0.000000 -0.889235 -0.000000 0.457450 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=12446
+			position={ 2520.000000 0.000000 2967.000000 }
+			rotation={ -0.000000 -0.042530 -0.000000 0.999095 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=12447
+			position={ 2822.000000 0.000000 3039.000000 }
+			rotation={ -0.000000 -0.943708 -0.000000 0.330780 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=12448
+			position={ 2748.000000 0.000000 3047.000000 }
+			rotation={ -0.000000 -0.246639 -0.000000 -0.969107 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=12449
+			position={ 2792.000000 0.000000 3026.000000 }
+			rotation={ -0.000000 -0.751435 -0.000000 0.659807 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=12450
+			position={ 2893.000000 0.000000 3124.000000 }
+			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=12451
+			position={ 2901.000000 0.000000 3097.000000 }
+			rotation={ -0.000000 -0.175313 -0.000000 -0.984513 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=12452
+			position={ 2929.000000 0.000000 2968.000000 }
+			rotation={ -0.000000 -0.216567 -0.000000 0.976268 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=12453
+			position={ 2961.000000 0.000000 2973.000000 }
+			rotation={ -0.000000 -0.930385 -0.000000 -0.366584 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
 		{
 			id=12454
 			position={ 7289.937500 0.000000 2929.756836 }
@@ -65561,6 +65669,12 @@
 			rotation={ -0.000000 -0.195973 -0.000000 0.980609 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
+		{
+			id=12486
+			position={ 3003.000000 0.000000 3076.000000 }
+			rotation={ -0.000000 -0.215025 -0.000000 0.976608 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
 		{
 			id=12489
 			position={ 7300.859375 0.000000 1689.671387 }
@@ -65711,6 +65825,36 @@
 			rotation={ 0.000000 0.942594 0.000000 -0.333940 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
+		{
+			id=12534
+			position={ 2997.000000 0.000000 3032.000000 }
+			rotation={ -0.000000 -0.235842 -0.000000 0.971791 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=12535
+			position={ 2912.000000 0.000000 3049.000000 }
+			rotation={ -0.000000 -0.933035 -0.000000 0.359786 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=12536
+			position={ 2868.000000 0.000000 2980.000000 }
+			rotation={ -0.000000 -0.149469 -0.000000 0.988766 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=12538
+			position={ 2736.963623 0.000000 2951.316650 }
+			rotation={ -0.000000 -0.851638 -0.000000 0.524130 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=12539
+			position={ 2689.000000 0.000000 2937.000000 }
+			rotation={ -0.000000 -0.955055 -0.000000 -0.296429 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
 		{
 			id=12540
 			position={ 6067.937500 0.000000 1633.756958 }
@@ -70061,12 +70205,6 @@
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
-		{
-			id=13632
-			position={ 2097.827148 0.000000 3503.711426 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
 		{
 			id=13633
 			position={ 2170.041992 0.000000 3474.593262 }
diff --git a/gfx/map/map_object_data/combat_locators.txt b/gfx/map/map_object_data/combat_locators.txt
index 8e24a3bd..79e8ea09 100644
--- a/gfx/map/map_object_data/combat_locators.txt
+++ b/gfx/map/map_object_data/combat_locators.txt
@@ -3247,13 +3247,13 @@
 		}
 		{
 			id=542
-			position={ 2650.549316 0.000000 2913.069336 }
+			position={ 2625.433105 0.000000 2942.271484 }
 			rotation={ -0.000000 -0.931649 -0.000000 0.363360 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=543
-			position={ 2622.489746 0.000000 2912.604004 }
+			position={ 2649.098877 0.000000 2918.235840 }
 			rotation={ -0.000000 -0.764478 -0.000000 0.644650 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -3331,7 +3331,7 @@
 		}
 		{
 			id=556
-			position={ 2744.571045 0.000000 3063.374512 }
+			position={ 2766.962158 0.000000 3079.750732 }
 			rotation={ -0.000000 -0.945464 -0.000000 0.325726 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -29167,7 +29167,7 @@
 		}
 		{
 			id=5070
-			position={ 2336.554199 0.000000 3139.484863 }
+			position={ 2361.536865 0.000000 3149.286133 }
 			rotation={ -0.000000 -0.503089 -0.000000 0.864235 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -29191,13 +29191,13 @@
 		}
 		{
 			id=5074
-			position={ 2215.662842 0.000000 3215.112061 }
+			position={ 2217.893066 0.000000 3191.181152 }
 			rotation={ -0.000000 -0.548495 -0.000000 0.836154 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=5075
-			position={ 2191.013672 0.000000 3252.704346 }
+			position={ 2195.000488 0.000000 3237.472412 }
 			rotation={ -0.000000 -0.966204 -0.000000 0.257778 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -29209,7 +29209,7 @@
 		}
 		{
 			id=5077
-			position={ 2219.000000 0.000000 3176.000000 }
+			position={ 2214.525391 0.000000 3156.022949 }
 			rotation={ -0.000000 -0.971610 -0.000000 0.236588 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -29401,7 +29401,7 @@
 		}
 		{
 			id=5109
-			position={ 2316.675049 0.000000 3286.899658 }
+			position={ 2312.482422 0.000000 3268.463623 }
 			rotation={ -0.000000 -0.987509 -0.000000 0.157565 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -29827,7 +29827,7 @@
 		}
 		{
 			id=5180
-			position={ 2577.447510 0.000000 3153.437500 }
+			position={ 2596.551758 0.000000 3112.171875 }
 			rotation={ -0.000000 -0.370005 -0.000000 0.929030 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -29881,7 +29881,7 @@
 		}
 		{
 			id=5189
-			position={ 2599.092041 0.000000 3117.773193 }
+			position={ 2616.320557 0.000000 3120.210938 }
 			rotation={ -0.000000 -0.924069 -0.000000 0.382225 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -29905,7 +29905,7 @@
 		}
 		{
 			id=5193
-			position={ 2653.270020 0.000000 3264.062500 }
+			position={ 2634.377686 0.000000 3264.724609 }
 			rotation={ -0.000000 -0.940653 -0.000000 0.339371 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -30295,7 +30295,7 @@
 		}
 		{
 			id=5258
-			position={ 2543.089844 0.000000 2976.444092 }
+			position={ 2563.518799 0.000000 2974.472900 }
 			rotation={ -0.000000 -0.822732 -0.000000 0.568430 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -30349,7 +30349,7 @@
 		}
 		{
 			id=5267
-			position={ 2538.371582 0.000000 2949.524658 }
+			position={ 2556.200439 0.000000 2924.055908 }
 			rotation={ -0.000000 -0.808057 -0.000000 0.589105 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -30361,7 +30361,7 @@
 		}
 		{
 			id=5269
-			position={ 2686.287842 0.000000 2916.781006 }
+			position={ 2714.025879 0.000000 2906.428467 }
 			rotation={ -0.000000 -0.765915 -0.000000 0.642942 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -30415,19 +30415,19 @@
 		}
 		{
 			id=5278
-			position={ 2768.334717 0.000000 2940.964355 }
+			position={ 2766.326660 0.000000 2905.490723 }
 			rotation={ -0.000000 -0.971979 -0.000000 0.235067 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=5279
-			position={ 2793.000000 0.000000 2881.000000 }
+			position={ 2812.379639 0.000000 2903.799316 }
 			rotation={ -0.000000 -0.652053 -0.000000 0.758174 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=5280
-			position={ 2944.195312 0.000000 2957.814697 }
+			position={ 2927.526855 0.000000 2946.854736 }
 			rotation={ -0.000000 -0.979084 -0.000000 0.203459 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -30667,7 +30667,7 @@
 		}
 		{
 			id=5320
-			position={ 2811.692871 0.000000 3067.258057 }
+			position={ 2862.931152 0.000000 3076.966553 }
 			rotation={ -0.000000 -0.975375 -0.000000 0.220552 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -30679,19 +30679,19 @@
 		}
 		{
 			id=5322
-			position={ 2857.885742 0.000000 3079.058105 }
+			position={ 2823.956787 0.000000 3087.618896 }
 			rotation={ -0.000000 -0.986333 -0.000000 0.164762 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=5323
-			position={ 2879.389893 0.000000 3127.497314 }
+			position={ 2858.446533 0.000000 3137.790771 }
 			rotation={ -0.000000 -0.957005 -0.000000 0.290070 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=5324
-			position={ 2889.646729 0.000000 2998.325195 }
+			position={ 2987.978271 0.000000 2996.481445 }
 			rotation={ -0.000000 -0.955660 -0.000000 0.294473 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -30715,13 +30715,13 @@
 		}
 		{
 			id=5328
-			position={ 2963.007324 0.000000 3011.721924 }
+			position={ 2902.548340 0.000000 3001.510010 }
 			rotation={ -0.000000 -0.896689 -0.000000 0.442661 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=5329
-			position={ 3021.637451 0.000000 3031.050049 }
+			position={ 3031.669922 0.000000 3025.963379 }
 			rotation={ -0.000000 -0.914989 -0.000000 0.403478 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -71875,7 +71875,7 @@
 		}
 		{
 			id=12397
-			position={ 0.000000 0.000000 -3.000000 }
+			position={ 2828.212646 0.000000 2910.350586 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -71887,13 +71887,13 @@
 		}
 		{
 			id=12399
-			position={ 0.000000 0.000000 -3.000000 }
+			position={ 2788.285156 0.000000 2939.484619 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12400
-			position={ 0.000000 0.000000 -3.000000 }
+			position={ 2726.463135 0.000000 2858.739258 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -72133,85 +72133,85 @@
 		}
 		{
 			id=12440
-			position={ 0.000000 0.000000 -3.000000 }
+			position={ 2463.787109 0.000000 3229.754883 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12441
-			position={ 0.000000 0.000000 -3.000000 }
+			position={ 2536.880615 0.000000 2937.500000 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12442
-			position={ 0.000000 0.000000 -3.000000 }
+			position={ 2497.464600 0.000000 2997.479980 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12443
-			position={ 0.000000 0.000000 -3.000000 }
+			position={ 2311.926270 0.000000 3278.612061 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12444
-			position={ 0.000000 0.000000 -3.000000 }
+			position={ 2891.605469 0.000000 2933.982666 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
+			scale={ 1.000513 1.000513 1.000513 }
 		}
 		{
 			id=12445
-			position={ 0.000000 0.000000 -3.000000 }
+			position={ 2591.851318 0.000000 2924.850342 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12446
-			position={ 0.000000 0.000000 -3.000000 }
+			position={ 2519.463379 0.000000 2976.947754 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12447
-			position={ 0.000000 0.000000 -3.000000 }
+			position={ 2826.065430 0.000000 3042.718506 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12448
-			position={ 0.000000 0.000000 -3.000000 }
+			position={ 2751.177979 0.000000 3041.169678 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12449
-			position={ 0.000000 0.000000 -3.000000 }
+			position={ 2798.191406 0.000000 3013.839111 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12450
-			position={ 0.000000 0.000000 -3.000000 }
+			position={ 2899.691162 0.000000 3130.642090 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12451
-			position={ 0.000000 0.000000 -3.000000 }
+			position={ 2903.536377 0.000000 3089.382080 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12452
-			position={ 0.000000 0.000000 -3.000000 }
+			position={ 2937.525879 0.000000 2965.449951 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12453
-			position={ 0.000000 0.000000 -3.000000 }
+			position={ 2962.844727 0.000000 2980.618408 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -72409,7 +72409,7 @@
 		}
 		{
 			id=12486
-			position={ 0.000000 0.000000 -3.000000 }
+			position={ 2996.192871 0.000000 3083.582275 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -72667,19 +72667,19 @@
 		}
 		{
 			id=12534
-			position={ 0.000000 0.000000 -3.000000 }
+			position={ 3004.479980 0.000000 3010.067383 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12535
-			position={ 0.000000 0.000000 -3.000000 }
+			position={ 2913.471680 0.000000 3056.830322 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12536
-			position={ 0.000000 0.000000 -3.000000 }
+			position={ 2871.992920 0.000000 2966.308838 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -72691,13 +72691,13 @@
 		}
 		{
 			id=12538
-			position={ 0.000000 0.000000 -3.000000 }
+			position={ 2741.413818 0.000000 2964.754883 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12539
-			position={ 0.000000 0.000000 -3.000000 }
+			position={ 2704.616943 0.000000 2939.799316 }
 			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 4086e6d1..e751f13a 100644
--- a/gfx/map/map_object_data/player_stack_locators.txt
+++ b/gfx/map/map_object_data/player_stack_locators.txt
@@ -3247,13 +3247,13 @@
 		}
 		{
 			id=542
-			position={ 2665.415527 0.000000 2910.001709 }
+			position={ 2640.299316 0.000000 2939.203857 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=543
-			position={ 2628.506592 0.000000 2897.216309 }
+			position={ 2655.115723 0.000000 2902.848145 }
 			rotation={ -0.000000 -0.216440 -0.000000 0.976296 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -3331,7 +3331,7 @@
 		}
 		{
 			id=556
-			position={ 2761.000000 0.000000 3062.000000 }
+			position={ 2783.391113 0.000000 3078.376221 }
 			rotation={ -0.000000 -0.216440 -0.000000 0.976296 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -29179,7 +29179,7 @@
 		}
 		{
 			id=5072
-			position={ 2321.000000 0.000000 3143.000000 }
+			position={ 2317.968506 0.000000 3150.089111 }
 			rotation={ -0.000000 -0.216440 -0.000000 0.976296 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -29197,7 +29197,7 @@
 		}
 		{
 			id=5075
-			position={ 2191.560059 0.000000 3241.485840 }
+			position={ 2195.546875 0.000000 3226.253906 }
 			rotation={ -0.000000 0.536423 -0.000000 0.843949 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -29209,7 +29209,7 @@
 		}
 		{
 			id=5077
-			position={ 2231.000000 0.000000 3167.000000 }
+			position={ 2226.525391 0.000000 3147.022949 }
 			rotation={ -0.000000 -0.216440 -0.000000 0.976296 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -29401,7 +29401,7 @@
 		}
 		{
 			id=5109
-			position={ 2312.000000 0.000000 3274.000000 }
+			position={ 2307.807373 0.000000 3255.563965 }
 			rotation={ -0.000000 -0.216440 -0.000000 0.976296 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -29827,7 +29827,7 @@
 		}
 		{
 			id=5180
-			position={ 2580.000000 0.000000 3143.000000 }
+			position={ 2594.244629 0.000000 3129.620361 }
 			rotation={ -0.000000 -0.216440 -0.000000 0.976296 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -29905,7 +29905,7 @@
 		}
 		{
 			id=5193
-			position={ 2660.270020 0.000000 3258.062500 }
+			position={ 2641.377686 0.000000 3258.724609 }
 			rotation={ -0.000000 -0.216440 -0.000000 0.976296 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -30295,7 +30295,7 @@
 		}
 		{
 			id=5258
-			position={ 2529.000000 0.000000 2971.000000 }
+			position={ 2549.428955 0.000000 2969.028809 }
 			rotation={ -0.000000 -0.216440 -0.000000 0.976296 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -30349,7 +30349,7 @@
 		}
 		{
 			id=5267
-			position={ 2541.000000 0.000000 2937.000000 }
+			position={ 2558.828857 0.000000 2911.531250 }
 			rotation={ -0.000000 -0.216440 -0.000000 0.976296 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -30415,19 +30415,19 @@
 		}
 		{
 			id=5278
-			position={ 2791.334717 0.000000 2939.964355 }
+			position={ 2789.326660 0.000000 2904.490723 }
 			rotation={ -0.000000 -0.216440 -0.000000 0.976296 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=5279
-			position={ 2786.000000 0.000000 2886.000000 }
+			position={ 2805.379639 0.000000 2908.799316 }
 			rotation={ -0.000000 -0.216440 -0.000000 0.976296 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=5280
-			position={ 2956.000000 0.000000 2957.000000 }
+			position={ 2939.331543 0.000000 2946.040039 }
 			rotation={ -0.000000 -0.216440 -0.000000 0.976296 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -30667,7 +30667,7 @@
 		}
 		{
 			id=5320
-			position={ 2813.000000 0.000000 3060.000000 }
+			position={ 2864.238281 0.000000 3069.708496 }
 			rotation={ -0.000000 -0.216440 -0.000000 0.976296 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -30679,19 +30679,19 @@
 		}
 		{
 			id=5322
-			position={ 2860.000000 0.000000 3072.000000 }
+			position={ 2826.071045 0.000000 3080.560791 }
 			rotation={ -0.000000 -0.216440 -0.000000 0.976296 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=5323
-			position={ 2887.000000 0.000000 3121.000000 }
+			position={ 2866.056641 0.000000 3131.293457 }
 			rotation={ -0.000000 -0.216440 -0.000000 0.976296 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=5324
-			position={ 2883.000000 0.000000 2989.000000 }
+			position={ 2969.910156 0.000000 3011.987549 }
 			rotation={ -0.000000 -0.216440 -0.000000 0.976296 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -30715,13 +30715,13 @@
 		}
 		{
 			id=5328
-			position={ 2980.000000 0.000000 3011.000000 }
+			position={ 2919.541016 0.000000 3000.788086 }
 			rotation={ -0.000000 -0.216440 -0.000000 0.976296 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=5329
-			position={ 3044.000000 0.000000 3027.000000 }
+			position={ 3054.032471 0.000000 3021.913330 }
 			rotation={ -0.000000 -0.216440 -0.000000 0.976296 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -71875,7 +71875,7 @@
 		}
 		{
 			id=12397
-			position={ 0.000000 0.000000 0.000000 }
+			position={ 2828.212646 0.000000 2913.350586 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -71887,13 +71887,13 @@
 		}
 		{
 			id=12399
-			position={ 0.000000 0.000000 0.000000 }
+			position={ 2788.036865 0.000000 2939.130371 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12400
-			position={ 0.000000 0.000000 0.000000 }
+			position={ 2726.463135 0.000000 2861.739258 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -72133,85 +72133,85 @@
 		}
 		{
 			id=12440
-			position={ 0.000000 0.000000 0.000000 }
+			position={ 2463.449219 0.000000 3235.787109 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12441
-			position={ 0.000000 0.000000 0.000000 }
+			position={ 2539.368896 0.000000 2928.584961 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12442
-			position={ 0.000000 0.000000 0.000000 }
+			position={ 2499.136719 0.000000 2988.841553 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12443
-			position={ 0.000000 0.000000 0.000000 }
+			position={ 2322.000000 0.000000 3286.000000 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12444
-			position={ 0.000000 0.000000 0.000000 }
+			position={ 2895.227539 0.000000 2925.500244 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12445
-			position={ 0.000000 0.000000 0.000000 }
+			position={ 2599.775391 0.000000 2904.708496 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12446
-			position={ 0.000000 0.000000 0.000000 }
+			position={ 2521.190186 0.000000 2956.972168 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12447
-			position={ 0.000000 0.000000 0.000000 }
+			position={ 2816.295654 0.000000 3025.568604 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12448
-			position={ 0.000000 0.000000 0.000000 }
+			position={ 2753.887451 0.000000 3039.784912 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12449
-			position={ 0.000000 0.000000 0.000000 }
+			position={ 2799.331787 0.000000 3020.787109 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12450
-			position={ 0.000000 0.000000 0.000000 }
+			position={ 2902.000000 0.000000 3119.000000 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12451
-			position={ 0.000000 0.000000 0.000000 }
+			position={ 2914.866211 0.000000 3092.723633 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12452
-			position={ 0.000000 0.000000 0.000000 }
+			position={ 2938.242432 0.000000 2962.590576 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12453
-			position={ 0.000000 0.000000 0.000000 }
+			position={ 2958.247070 0.000000 2947.405518 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -72409,7 +72409,7 @@
 		}
 		{
 			id=12486
-			position={ 0.000000 0.000000 0.000000 }
+			position={ 3012.002197 0.000000 3068.138428 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -72667,19 +72667,19 @@
 		}
 		{
 			id=12534
-			position={ 0.000000 0.000000 0.000000 }
+			position={ 3006.472168 0.000000 3014.375488 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12535
-			position={ 0.000000 0.000000 0.000000 }
+			position={ 2914.706299 0.000000 3022.681641 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12536
-			position={ 0.000000 0.000000 0.000000 }
+			position={ 2874.493164 0.000000 2979.465820 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -72691,13 +72691,13 @@
 		}
 		{
 			id=12538
-			position={ 0.000000 0.000000 0.000000 }
+			position={ 2739.742676 0.000000 2977.029053 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12539
-			position={ 0.000000 0.000000 0.000000 }
+			position={ 2685.989746 0.000000 2925.976807 }
 			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 c79d31f1..0070a29b 100644
--- a/gfx/map/map_object_data/siege_locators.txt
+++ b/gfx/map/map_object_data/siege_locators.txt
@@ -3229,13 +3229,13 @@
 		}
 		{
 			id=542
-			position={ 2654.891357 0.000000 2897.331543 }
+			position={ 2629.775146 0.000000 2926.533691 }
 			rotation={ -0.000000 0.912975 -0.000000 0.408014 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=543
-			position={ 2631.506592 0.000000 2891.216309 }
+			position={ 2658.115723 0.000000 2896.848145 }
 			rotation={ 0.000000 0.819067 0.000000 -0.573697 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -3313,7 +3313,7 @@
 		}
 		{
 			id=556
-			position={ 2747.000000 0.000000 3046.000000 }
+			position={ 2769.391113 0.000000 3062.376221 }
 			rotation={ 0.000000 0.948683 0.000000 0.316228 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -3325,7 +3325,7 @@
 		}
 		{
 			id=558
-			position={ 2736.000000 0.000000 2876.000000 }
+			position={ 2743.256836 0.000000 2886.326660 }
 			rotation={ 0.000000 0.741453 0.000000 0.671005 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -27253,7 +27253,7 @@
 		}
 		{
 			id=5065
-			position={ 2287.000000 0.000000 3113.000000 }
+			position={ 2271.763672 0.000000 3126.329590 }
 			rotation={ -0.000000 -0.633989 -0.000000 0.773342 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -27295,8 +27295,8 @@
 		}
 		{
 			id=5072
-			position={ 2323.000000 0.000000 3125.000000 }
-			rotation={ 0.000000 0.981956 0.000000 -0.189108 }
+			position={ 2312.036621 0.000000 3147.427490 }
+			rotation={ -0.000000 0.881909 -0.000000 0.471418 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
@@ -27313,7 +27313,7 @@
 		}
 		{
 			id=5075
-			position={ 2195.252197 0.000000 3228.465088 }
+			position={ 2199.239014 0.000000 3213.233154 }
 			rotation={ 0.000000 0.994029 0.000000 0.109117 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -27517,7 +27517,7 @@
 		}
 		{
 			id=5109
-			position={ 2314.000000 0.000000 3268.000000 }
+			position={ 2309.807373 0.000000 3249.563965 }
 			rotation={ -0.000000 -0.671005 -0.000000 0.741453 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -27943,7 +27943,7 @@
 		}
 		{
 			id=5180
-			position={ 2568.000000 0.000000 3131.000000 }
+			position={ 2582.244629 0.000000 3117.620361 }
 			rotation={ 0.000000 0.894427 0.000000 0.447214 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -28003,7 +28003,7 @@
 		}
 		{
 			id=5190
-			position={ 2614.021729 0.000000 3131.666504 }
+			position={ 2616.606201 0.000000 3143.338379 }
 			rotation={ -0.000000 0.974426 -0.000000 0.224710 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -28021,7 +28021,7 @@
 		}
 		{
 			id=5193
-			position={ 2657.270020 0.000000 3247.062500 }
+			position={ 2638.377686 0.000000 3247.724609 }
 			rotation={ 0.000000 0.937885 0.000000 -0.346946 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -28405,13 +28405,13 @@
 		}
 		{
 			id=5257
-			position={ 2495.000000 0.000000 2991.000000 }
+			position={ 2510.394775 0.000000 3010.253906 }
 			rotation={ 0.000000 0.666921 0.000000 0.745128 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=5258
-			position={ 2531.000000 0.000000 2959.000000 }
+			position={ 2551.428955 0.000000 2957.028809 }
 			rotation={ 0.000000 0.937885 0.000000 -0.346946 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -28465,7 +28465,7 @@
 		}
 		{
 			id=5267
-			position={ 2550.000000 0.000000 2934.000000 }
+			position={ 2567.828857 0.000000 2908.531250 }
 			rotation={ -0.000000 -0.606994 -0.000000 0.794707 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -28501,7 +28501,7 @@
 		}
 		{
 			id=5273
-			position={ 2755.000000 0.000000 2970.000000 }
+			position={ 2778.806885 0.000000 2966.645996 }
 			rotation={ 0.000000 0.998759 0.000000 0.049814 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -28531,19 +28531,19 @@
 		}
 		{
 			id=5278
-			position={ 2779.334717 0.000000 2923.964355 }
+			position={ 2760.354492 0.000000 2924.396729 }
 			rotation={ 0.000000 0.983954 0.000000 0.178425 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=5279
-			position={ 2767.000000 0.000000 2878.000000 }
+			position={ 2806.794678 0.000000 2880.083496 }
 			rotation={ 0.000000 0.707107 0.000000 0.707107 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=5280
-			position={ 2944.000000 0.000000 2946.000000 }
+			position={ 2927.331543 0.000000 2935.040039 }
 			rotation={ 0.000000 0.850651 0.000000 0.525731 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -28783,7 +28783,7 @@
 		}
 		{
 			id=5320
-			position={ 2815.000000 0.000000 3051.000000 }
+			position={ 2866.238281 0.000000 3060.708496 }
 			rotation={ 0.000000 0.861871 0.000000 -0.507128 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -28795,19 +28795,19 @@
 		}
 		{
 			id=5322
-			position={ 2846.000000 0.000000 3058.000000 }
+			position={ 2812.071045 0.000000 3066.560791 }
 			rotation={ 0.000000 0.948683 0.000000 0.316228 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=5323
-			position={ 2886.000000 0.000000 3109.000000 }
+			position={ 2865.056641 0.000000 3119.293457 }
 			rotation={ 0.000000 0.874642 0.000000 -0.484768 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=5324
-			position={ 2869.000000 0.000000 2981.000000 }
+			position={ 2955.910156 0.000000 3003.987549 }
 			rotation={ 0.000000 0.838492 0.000000 0.544914 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -28831,13 +28831,13 @@
 		}
 		{
 			id=5328
-			position={ 2986.000000 0.000000 3007.000000 }
+			position={ 2925.541016 0.000000 2996.788086 }
 			rotation={ -0.000000 -0.606994 -0.000000 0.794707 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=5329
-			position={ 3026.000000 0.000000 3020.000000 }
+			position={ 3036.032471 0.000000 3014.913330 }
 			rotation={ 0.000000 0.874642 0.000000 0.484769 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -68641,8 +68641,8 @@
 		}
 		{
 			id=12397
-			position={ 3.000000 0.000000 0.000000 }
-			rotation={ -0.000000 -0.000025 -0.000000 1.000000 }
+			position={ 2828.574463 0.000000 2889.928467 }
+			rotation={ -0.000000 -0.999526 -0.000000 0.030788 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
@@ -68653,13 +68653,13 @@
 		}
 		{
 			id=12399
-			position={ 3.000000 0.000000 0.000000 }
+			position={ 2813.585938 0.000000 2935.124512 }
 			rotation={ -0.000000 -0.000025 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12400
-			position={ 3.000000 0.000000 0.000000 }
+			position={ 2720.682861 0.000000 2871.152832 }
 			rotation={ -0.000000 -0.000025 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -68899,85 +68899,85 @@
 		}
 		{
 			id=12440
-			position={ 3.000000 0.000000 0.000000 }
+			position={ 2438.524902 0.000000 3234.568604 }
 			rotation={ -0.000000 -0.000025 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12441
-			position={ 3.000000 0.000000 0.000000 }
+			position={ 2542.368896 0.000000 2928.584961 }
 			rotation={ -0.000000 -0.000025 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12442
-			position={ 3.000000 0.000000 0.000000 }
+			position={ 2502.136719 0.000000 2988.841553 }
 			rotation={ -0.000000 -0.000025 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12443
-			position={ 3.000000 0.000000 0.000000 }
+			position={ 2313.331055 0.000000 3276.070312 }
 			rotation={ -0.000000 -0.000025 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12444
-			position={ 3.000000 0.000000 0.000000 }
+			position={ 2891.070557 0.000000 2945.777100 }
 			rotation={ -0.000000 -0.000025 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12445
-			position={ 3.000000 0.000000 0.000000 }
+			position={ 2605.744141 0.000000 2916.898438 }
 			rotation={ -0.000000 -0.000025 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12446
-			position={ 3.000000 0.000000 0.000000 }
+			position={ 2524.190186 0.000000 2956.972168 }
 			rotation={ -0.000000 -0.000025 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12447
-			position={ 3.000000 0.000000 0.000000 }
+			position={ 2819.295654 0.000000 3025.568604 }
 			rotation={ -0.000000 -0.000025 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12448
-			position={ 3.000000 0.000000 0.000000 }
+			position={ 2756.887451 0.000000 3039.784912 }
 			rotation={ -0.000000 -0.000025 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12449
-			position={ 3.000000 0.000000 0.000000 }
+			position={ 2802.331787 0.000000 3020.787109 }
 			rotation={ -0.000000 -0.000025 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12450
-			position={ 3.000000 0.000000 0.000000 }
+			position={ 2911.697754 0.000000 3124.624756 }
 			rotation={ -0.000000 -0.000025 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12451
-			position={ 3.000000 0.000000 0.000000 }
+			position={ 2917.866211 0.000000 3092.723633 }
 			rotation={ -0.000000 -0.000025 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12452
-			position={ 3.000000 0.000000 0.000000 }
+			position={ 2941.242432 0.000000 2962.590576 }
 			rotation={ -0.000000 -0.000025 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12453
-			position={ 3.000000 0.000000 0.000000 }
+			position={ 2960.442627 0.000000 2960.791504 }
 			rotation={ -0.000000 -0.000025 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -69175,7 +69175,7 @@
 		}
 		{
 			id=12486
-			position={ 3.000000 0.000000 0.000000 }
+			position={ 3015.002197 0.000000 3068.138428 }
 			rotation={ -0.000000 -0.000025 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -69331,19 +69331,19 @@
 		}
 		{
 			id=12534
-			position={ 3.000000 0.000000 0.000000 }
+			position={ 3009.472168 0.000000 3014.375488 }
 			rotation={ -0.000000 -0.000025 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12535
-			position={ 3.000000 0.000000 0.000000 }
+			position={ 2911.160645 0.000000 3037.766846 }
 			rotation={ -0.000000 -0.000025 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12536
-			position={ 3.000000 0.000000 0.000000 }
+			position={ 2877.493164 0.000000 2979.465820 }
 			rotation={ -0.000000 -0.000025 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -69355,13 +69355,13 @@
 		}
 		{
 			id=12538
-			position={ 3.000000 0.000000 0.000000 }
+			position={ 2738.062744 0.000000 2956.931885 }
 			rotation={ -0.000000 -0.000025 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12539
-			position={ 3.000000 0.000000 0.000000 }
+			position={ 2688.989746 0.000000 2925.976807 }
 			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 8f41b28e..b203b1ad 100644
--- a/gfx/map/map_object_data/special_building_locators.txt
+++ b/gfx/map/map_object_data/special_building_locators.txt
@@ -47981,6 +47981,12 @@
 			rotation={ -0.000000 -0.893739 -0.000000 -0.448587 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
+		{
+			id=8883
+			position={ 2097.000000 0.000000 3002.000000 }
+			rotation={ -0.000000 -0.987597 -0.000000 0.157013 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
 		{
 			id=8993
 			position={ 1323.531860 0.000000 1013.522034 }
@@ -65129,12 +65135,30 @@
 			rotation={ -0.000000 -0.472620 -0.000000 0.881266 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
+		{
+			id=12397
+			position={ 2828.000000 0.000000 2899.000000 }
+			rotation={ -0.000000 -0.110778 -0.000000 -0.993845 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
 		{
 			id=12398
 			position={ 6418.000000 0.000000 2957.000000 }
 			rotation={ -0.000000 -0.132591 -0.000000 -0.991171 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
+		{
+			id=12399
+			position={ 2802.000000 0.000000 2937.000000 }
+			rotation={ -0.000000 -0.908579 -0.000000 0.417712 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=12400
+			position={ 2716.000000 0.000000 2867.000000 }
+			rotation={ -0.000000 -0.688511 -0.000000 -0.725226 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
 		{
 			id=12401
 			position={ 6811.000000 0.000000 2991.000000 }
@@ -65369,6 +65393,90 @@
 			rotation={ -0.000000 -0.555589 -0.000000 0.831457 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
+		{
+			id=12440
+			position={ 2451.000000 0.000000 3237.000000 }
+			rotation={ -0.000000 -0.281626 -0.000000 0.959524 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=12441
+			position={ 2537.000000 0.000000 2932.000000 }
+			rotation={ -0.000000 -0.715077 -0.000000 -0.699046 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=12442
+			position={ 2493.000000 0.000000 2994.000000 }
+			rotation={ -0.000000 -0.754782 -0.000000 0.655975 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=12443
+			position={ 2309.000000 0.000000 3285.000000 }
+			rotation={ -0.000000 -0.940512 -0.000000 0.339759 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=12444
+			position={ 2889.000000 0.000000 2937.000000 }
+			rotation={ -0.000000 -0.988946 -0.000000 0.148275 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=12445
+			position={ 2589.000000 0.000000 2918.000000 }
+			rotation={ -0.000000 -0.593636 -0.000000 -0.804734 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=12446
+			position={ 2520.000000 0.000000 2967.000000 }
+			rotation={ -0.000000 -0.237407 -0.000000 0.971410 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=12447
+			position={ 2822.000000 0.000000 3039.000000 }
+			rotation={ -0.000000 -0.717062 -0.000000 -0.697009 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=12448
+			position={ 2748.000000 0.000000 3047.000000 }
+			rotation={ -0.000000 -0.953778 -0.000000 -0.300511 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=12449
+			position={ 2792.000000 0.000000 3026.000000 }
+			rotation={ -0.000000 -0.199190 -0.000000 0.979961 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=12450
+			position={ 2897.000000 0.000000 3130.000000 }
+			rotation={ -0.000000 -0.768259 -0.000000 -0.640139 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=12451
+			position={ 2901.000000 0.000000 3097.000000 }
+			rotation={ -0.000000 -0.955662 -0.000000 0.294467 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=12452
+			position={ 2929.000000 0.000000 2968.000000 }
+			rotation={ -0.000000 -0.366340 -0.000000 -0.930481 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=12453
+			position={ 2961.000000 0.000000 2973.000000 }
+			rotation={ -0.000000 -0.990080 -0.000000 -0.140501 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
 		{
 			id=12454
 			position={ 7416.000000 0.000000 3104.000000 }
@@ -65561,6 +65669,12 @@
 			rotation={ -0.000000 -0.424683 -0.000000 0.905342 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
+		{
+			id=12486
+			position={ 3003.000000 0.000000 3076.000000 }
+			rotation={ -0.000000 -0.915090 -0.000000 -0.403250 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
 		{
 			id=12489
 			position={ 7443.000000 0.000000 1874.000000 }
@@ -65711,6 +65825,36 @@
 			rotation={ -0.000000 -0.970402 -0.000000 0.241496 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
+		{
+			id=12534
+			position={ 2997.000000 0.000000 3032.000000 }
+			rotation={ -0.000000 -0.979391 -0.000000 0.201973 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=12535
+			position={ 2912.000000 0.000000 3049.000000 }
+			rotation={ -0.000000 -0.297214 -0.000000 0.954811 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=12536
+			position={ 2868.000000 0.000000 2980.000000 }
+			rotation={ -0.000000 -0.294071 -0.000000 0.955784 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=12538
+			position={ 2730.000000 0.000000 2969.000000 }
+			rotation={ -0.000000 -0.154000 -0.000000 0.988071 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=12539
+			position={ 2689.000000 0.000000 2937.000000 }
+			rotation={ -0.000000 -0.654115 -0.000000 0.756395 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
 		{
 			id=12540
 			position={ 6210.000000 0.000000 1817.000000 }
@@ -69977,5 +70121,125 @@
 			rotation={ -0.000000 -0.106053 -0.000000 0.994360 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
+		{
+			id=13618
+			position={ 2242.000000 0.000000 3784.000000 }
+			rotation={ -0.000000 -0.992960 -0.000000 -0.118454 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=13619
+			position={ 2236.000000 0.000000 3801.000000 }
+			rotation={ -0.000000 -0.148980 -0.000000 -0.988840 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=13620
+			position={ 2217.000000 0.000000 3786.000000 }
+			rotation={ -0.000000 -0.913270 -0.000000 0.407354 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=13621
+			position={ 2180.000000 0.000000 3763.000000 }
+			rotation={ -0.000000 -0.450278 -0.000000 0.892888 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=13622
+			position={ 2165.000000 0.000000 3803.000000 }
+			rotation={ -0.000000 -0.822084 -0.000000 0.569366 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=13623
+			position={ 2181.000000 0.000000 3812.000000 }
+			rotation={ -0.000000 -0.982182 -0.000000 0.187931 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=13624
+			position={ 2083.000000 0.000000 3789.000000 }
+			rotation={ -0.000000 -0.631227 -0.000000 -0.775598 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=13625
+			position={ 2156.000000 0.000000 3752.000000 }
+			rotation={ -0.000000 -0.281281 -0.000000 -0.959626 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=13626
+			position={ 2213.000000 0.000000 3727.000000 }
+			rotation={ -0.000000 -0.838904 -0.000000 0.544280 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=13627
+			position={ 2089.000000 0.000000 3665.000000 }
+			rotation={ -0.000000 -0.996040 -0.000000 -0.088907 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=13628
+			position={ 2088.000000 0.000000 3636.000000 }
+			rotation={ -0.000000 -0.641479 -0.000000 -0.767140 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=13629
+			position={ 2163.000000 0.000000 3594.000000 }
+			rotation={ -0.000000 -0.414964 -0.000000 -0.909838 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=13630
+			position={ 2131.000000 0.000000 3602.000000 }
+			rotation={ -0.000000 -0.965479 -0.000000 -0.260482 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=13631
+			position={ 2115.000000 0.000000 3655.000000 }
+			rotation={ -0.000000 -0.990764 -0.000000 0.135597 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=13633
+			position={ 2167.000000 0.000000 3479.000000 }
+			rotation={ -0.000000 -0.217983 -0.000000 -0.975953 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=13634
+			position={ 2185.000000 0.000000 3496.000000 }
+			rotation={ -0.000000 -0.468681 -0.000000 -0.883368 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=13635
+			position={ 2216.000000 0.000000 3564.000000 }
+			rotation={ -0.000000 -0.385712 -0.000000 -0.922619 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=13636
+			position={ 2267.000000 0.000000 3548.000000 }
+			rotation={ -0.000000 -0.712547 -0.000000 0.701624 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=13637
+			position={ 2251.000000 0.000000 3528.000000 }
+			rotation={ -0.000000 -0.347681 -0.000000 0.937613 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=13638
+			position={ 2260.000000 0.000000 3569.000000 }
+			rotation={ -0.000000 -0.220390 -0.000000 0.975412 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
 	}
 }
diff --git a/history/provinces/e_nistrenia.txt b/history/provinces/e_nistrenia.txt
index 36eec5a4..62e901f1 100644
--- a/history/provinces/e_nistrenia.txt
+++ b/history/provinces/e_nistrenia.txt
@@ -1000,18 +1000,7 @@
 #k_pontic_steppe
 ##d_yedisan #Karayedisan ###################################
 ###c_ladyzyn
-5257 = {	#Ladyzyn
-	culture = NEOW_vohlynian
-	religion = orthodox
-	holding = castle_holding
-	
-}
-5258 = {	#Birzula	AKA Podilsk
-	holding = none
-}
-5259 = {	#Liubashivka
-	holding = none
-}
+
 
 ###c_uman
 5260 = {	#Yary
@@ -1034,12 +1023,24 @@
 	holding = tribal_holding
 	
 }
-5264 = {	#Sacacatce
-	holding = none
-}
 5265 = {	#Kashan
 	holding = none
 }
+###c_korsun
+544 = {		#Korsun
+holding = none
+}
+5085 = {	#Kaniv
+	holding = none
+	1078.1.1 = {
+		holding = city_holding
+	}
+}
+5264 = {	#Sacacatce
+	culture = NEOW_kievan
+	religion = orthodox
+	holding = tribal_holding
+}
 5266 = {	#Pervomaisk
 	holding = none
 }
@@ -1055,24 +1056,71 @@
 	holding = none
 }
 
-##d_kizilyedisan ###################################
-###c_odessa
-543 = {	#Kara-Kerman
+##d_nistrenia ###################################
+
+#c_rybnitsa
+12446 = {	#Rybnitsa
+	culture = NEOW_ucrainean
+	religion = orthodox
+	holding = castle_holding
+}
+12442 = {	#Camenca
 	holding = none
 }
+
+
+###c_tiraspol
 5267 = {	#Tiraspol
 	culture = NEOW_ucrainean
 	religion = orthodox
 	holding = castle_holding
 	
 }
-5268 = {	#Odessa
-	holding = none	
-}
-542 = {		#Odessa
-	holding = church_holding	
+12441 = {	#Girgoriopol
+	holding = none
 }
 
+##d_odessa ###################################
+
+###c_odessa
+5268 = {	#Odessa
+	culture = NEOW_ucrainean
+	religion = orthodox
+	holding = castle_holding
+}
+542 = {		#Berezivka
+	holding = church_holding	
+}
+543 = {	#Ochakiv
+	holding = none
+}
+12445 = {	#Rozdilna
+	holding = none
+}
+###c_podilsk
+5258 = {	#Podilsk
+	culture = NEOW_ucrainean
+	religion = orthodox
+	holding = castle_holding
+}
+
+5259 = {	#Liubashivka
+	holding = none
+}
+
+###c_mykolaiv
+12539 = {	#Mykolaiv
+	culture = NEOW_ucrainean
+	religion = orthodox
+	holding = castle_holding
+	
+}
+5270 = {	#Bashtanka
+	holding = none
+}
+5271 = {	#Voznessensk
+	holding = none
+}
 ###c_kherson
 5269 = {	#Kherson
 	culture = NEOW_ucrainean
@@ -1080,15 +1128,11 @@
 	holding = castle_holding
 	
 }
-5270 = {	#Kazanka
-	holding = none
-}
-5271 = {	#Voznessensk
-	holding = none
-}
-
-###c_lower_dniepr
 5272 = {	#Beryslav
+	holding = none
+}
+#### Kryvyi Rih
+12538 = {	#Kryvyi Rih
 	culture = NEOW_cossack
 	religion = kozachina
 	holding = tribal_holding
@@ -1098,20 +1142,74 @@
 	holding = none
 }
 
-##d_levedia ###################################
-###c_khortytsia
-557 = {		#Khortytsia
+##d_zaporizhzhia
+###c_zaporizhzhia
+557 = {		#Zaporizhzhia
 	culture = NEOW_cossack
 	religion = kozachina
 	holding = tribal_holding
 }
-5280 = {	#Mariupol
+12536 = {	#Polohy
 	holding = none
 }
-5281 = {	#Kutur-Ogly	AKA Berdyansk
+12399 = {	#Vasylivka
 	holding = none
 }
+###c_melitopol
+5281 = { #Melitopol
+	culture = NEOW_cossack
+	religion = kozachina
+	holding = tribal_holding
+}
+12397 = {	#Kyrylivka
+	holding = none
+}
+12444 = {	#Berdiansk
+	holding = none
+}
+
+##d_donbas
 5324 = {	#Donetsk
+	culture = NEOW_cossack
+	religion = kozachina
+	holding = tribal_holding
+}
+12535 = { #Kramatorsk
+	holding = none
+}
+564 = { #Bakhmut
+	holding = none
+}
+5328 = { #Kuzeytorg
+	holding = none
+)
+
+###c_mariupol
+5280 = {	#Mariupol
+	culture = NEOW_cossack
+	religion = kozachina
+	holding = tribal_holding
+}
+12453 = { #Kalmiuske
+	holding = none
+}
+12452 = { #Volnovakha
+	holding = none
+}
+
+###c_luhansk
+15324 = {	#Luhansk
+	culture = NEOW_cossack
+	religion = kozachina
+	holding = tribal_holding
+}
+12486 = { #Starobilsk
+	holding = none
+}
+12452 = { #Volnovakha
+	holding = none
+}
+5327 = {	#Podgornye
 	holding = none
 }
 
@@ -1121,20 +1219,17 @@
 	religion = kozachina
 	holding = tribal_holding
 }
-5278 = {	#Kakovka
+5278 = {	#Kakhovka
 	holding = none
 }
-5279 = {	#Kyzyl Jar	AKA Melitopol
+5279 = {	#Henichesk
+	holding = none
+}
+12400 = {	#Skadovsk
 	holding = none
 }
 
 ###c_bakhmut
-564 = {		#Bakhmut
-	culture = NEOW_cossack
-	religion = kozachina
-	holding = tribal_holding
-
-}
 5322 = {	#Tor	AKA Sloviansk
 	holding = none
 }
@@ -1208,9 +1303,6 @@
 	holding = tribal_holding
 	
 }
-5327 = {	#Podgornye
-	holding = none
-}
 
 ###c_sarysyn
 595 = {		#Sarysyn
@@ -1347,12 +1439,6 @@
 		holding = church_holding
 	}
 }
-5085 = {	#Kaniv
-	holding = none
-	1078.1.1 = {
-		holding = city_holding
-	}
-}
 5086 = {	#Zdvyzhen
 	holding = none
 }
@@ -1369,12 +1455,6 @@
 		religion = orthodox
 	}
 }
-5088 = {	#Mezhybozhe
-	holding = none
-	1050.1.1 = {
-		holding = city_holding
-	}
-}
 5089 = {	# Rastovets
 	holding = none
 }
@@ -1422,48 +1502,44 @@
 5096 = {	#Ivankiv
 	holding = none
 }
-5097 = {	#Radynka
+5097 = {	#Poliske
+	holding = none
+}
+12440 = {	#Pripyat
 	holding = none
 }
 
 ###c_ushytsia
-5098 = {	#Ushytsia
+5088 = {	#Ushytsia
+	culture = NEOW_vohlynian
+	religion = orthodox
+	holding = castle_holding
+}
+5098 = {	#Khmelnytskyi
+	holding = none
+	1050.1.1 = {
+		holding = city_holding
+	}
+}
+5068 = {	#Horodok
+	holding = none
+}
+###c_vinnytsia
+5099 = {	#Vinnytsia
 	culture = NEOW_vohlynian
 	religion = orthodox
 	holding = tribal_holding
-	935.1.1 = {
-		holding = castle_holding
-	}
-	989.9.15 = {
-		religion = orthodox
-	}
-}
-5099 = {	#Vinnytsia
-	holding = none
 }
 5100 = {	#Yampil
 	holding = none
 }
-
-###c_korsun
-544 = {		#Korsun
-	culture = NEOW_kievan
-	religion = orthodox
-	holding = tribal_holding #Ahistorical? added to give the county a castle
-	935.1.1 = {
-		holding = castle_holding
-	}
-	989.9.15 = {
-		religion = orthodox
-	}
-	#1032.1.1 = {
-	#	#holding = castle_holding
-	#}
-}
-5090 = {	#Malaia Skivrka
+5101 = {	#Haisyn
 	holding = none
 }
-5101 = {	#Haisyn
+5257 = {	#Ladyzyn
+	holding = none
+}
+5090 = {	#Malaia Skivrka
 	holding = none
 }
 
@@ -1488,6 +1564,16 @@
 	}
 }
 5102 = {	#Sarny
+	culture = NEOW_polessian
+	religion = orthodox
+	holding = castle_holding
+}
+5109 = {	#Dubrovytsia
+	culture = NEOW_polessian
+	religion = orthodox
+	holding = castle_holding
+}
+5110 = {	#Stepan'
 	holding = none
 }
 5103 = {	#Selo
@@ -1526,14 +1612,6 @@
 }
 
 ###c_dubrovytsia
-5109 = {	#Dubrovytsia
-	culture = NEOW_polessian
-	religion = orthodox
-	holding = castle_holding
-}
-5110 = {	#Stepan'
-	holding = none
-}
 5111 = {	#Liubeshiv
 	holding = none
 }
@@ -2103,7 +2181,7 @@
 }
 
 ###c_peresopnytsia
-5051 = {	#Peresopnytsia
+5052 = {	#Peresopnytsia
 	culture = NEOW_vohlynian
 	religion = orthodox
 	holding = tribal_holding
@@ -2114,7 +2192,7 @@
 		religion = orthodox
 	}
 }
-5052 = {	# Rivne
+5051 = {	# Rivne
 	holding = none
 }
 5053 = {	#Klevan
@@ -2151,12 +2229,6 @@
 		religion = orthodox
 	}
 }
-5060 = {	#Sambir
-	holding = none
-	1150.1.1 = {
-		holding = city_holding
-	}
-}
 5061 = {	#Kolomyia
 	holding = none
 }
@@ -2190,15 +2262,15 @@
 		holding = church_holding
 	}
 }
-5066 = {	#Buchach
-	holding = none
-}
-5067 = {	#Moklekov
+5060 = {	#Sambir
 	holding = none
+	1150.1.1 = {
+		holding = city_holding
+	}
 }
 
-###c_terebovl
-546 = {		#Terebovl
+###c_Ternopil
+5066 = {		#Ternopil
 	culture = NEOW_vohlynian
 	religion = orthodox
 	holding = tribal_holding
@@ -2209,24 +2281,20 @@
 		religion = orthodox
 	}
 }
-5068 = {	#Horodok
+546 = {	#Buchach
 	holding = none
 }
 5069 = {	#Chortkiv
 	holding = none
 }
-
+5067 = {	#Moklekov
+	holding = none
+}
 ###c_zaslavl
 5070 = {	#Zaslavl
-	culture = NEOW_vohlynian
-	religion = orthodox
-	holding = tribal_holding
 	935.1.1 = {
 		holding = castle_holding
 	}
-	989.9.15 = {
-		religion = orthodox
-	}
 }
 5071 = {	#Dubno
 	holding = none
diff --git a/localization/english/replace/titles_l_english.yml b/localization/english/replace/titles_l_english.yml
index 5a42dc60..ad22aab3 100644
--- a/localization/english/replace/titles_l_english.yml
+++ b/localization/english/replace/titles_l_english.yml
@@ -6815,7 +6815,7 @@
  b_khenchela:0 "Khenchela"
  b_kheralu:0 "Kheralu"
  b_kherla:0 "Kherla"
- b_kherson:1 "Usu-Limani"
+ b_kherson:1 "Kherson"
  b_khertvisi:0 "Khertvisi"
  b_khetaka:0 "Khetaka"
  b_khewra:0 "Khewra"
@@ -17711,12 +17711,12 @@
  c_ladyzyn_adj:0 "Ladyzyan"
  c_cherkassy:0 "Cherkassy"
  c_cherkassy_adj:0 "Cherkassian"
- c_odessa:1 "Kara-Kerman"
- c_odessa_adj:1 "Kara-Kermanian"
- c_kherson:1 "Ingul"
- c_kherson_adj:1 "Ingulian"
- c_dnipro:1 "Buri-chai"
- c_dnipro_adj:1 "Buri-chaian"
+ c_odessa:1 "Odessa"
+ c_odessa_adj:1 "Odessan"
+ c_kherson:1 "Kherson"
+ c_kherson_adj:1 "Kherson"
+ c_dnipro:1 "Dnipro"
+ c_dnipro_adj:1 "Dniprian"
  c_khortytsia:1 "Yilki Su"
  c_khortytsia_adj:1 "Yilki Suan"
  c_bakhmut:0 "Bakhmut"
@@ -25891,4 +25891,53 @@
  b_dinskaya:0 "Dinskaya"
  b_temryuk:0 "Temryuk"
  d_naissus:0 "Nišavski "
- d_naissus_adj:0 "Nišavskin" 
\ No newline at end of file
+ d_naissus_adj:0 "Nišavskin" 
+ 
+  ### Ukraine
+ d_kherson:0 "Kherson"
+ d_kherson_adj:0 "Khersonian"
+ c_oleshky:0 "Oleshky"
+ c_oleshky_adj:0 "Oleshky"
+ b_oleshky:0 "Oleshky"
+ b_henichesk:0 "Henichesk"
+ c_mykolaiv:0 "Mykolaiv"
+ c_mykolaiv_adj:0 "Mykolaiv"
+ b_mykolaiv:0 "Mykolaiv"
+ b_kryvyi_rih:0 "Kryvyi Rih"
+ d_odessa:0 "Odessa"
+ d_odessa_adj:0 "Odessian"
+ c_podilsk:0 "Podilsk"
+ c_podilsk_adj:0 "Podilskian"
+ d_poltava:0 "Poltava"
+ d_poltava_adj:0 "Poltavan"
+ d_kharkiv:0 "Kharkiv"
+ d_kharkiv_adj:0 "Kharkivian"
+ d_dnipro:0 "Dnipro"
+ d_dnipro_adj:0 "Dniprian"
+ d_donbass:0 "Donbass"
+ d_donbass_adj:0 "Donbassian"
+ c_donetsk:0 "Donetsk"
+ c_donetsk_adj:0 "Donetskian"
+ c_luhansk:0 "Luhansk"
+ c_luhansk_adj:0 "Luhanskian"
+ c_mariupol:0 "Mariupol"
+ c_mariupol_adj:0 "Mariupolian"
+ d_zaporizhzhia:0 "Zaporizhzhia"
+ d_zaporizhzhia_adj:0 "Zaporizhzhian"
+ c_zaporizhzhia:0 "Zaporizhzhia"
+ c_zaporizhzhia_adj:0 "Zaporizhzhian"
+ c_melitopol:0 "Melitopol"
+ c_melitopol_adj:0 "Melitopolian"
+ d_podolia:0 "Podolia"
+ d_podolia_adj:0 "Podolian"
+ c_vinnytsia:0 "Vinnytsia"
+ c_vinnytsia_adj:0 "Vinnytsian"
+ d_nistrenia:0 "Nistrenia"
+ d_nistrenia_adj:0 "Nistrenian"
+ c_tiraspol:0 "Tiraspol"
+ c_tiraspol_adj:0 "Tiraspolian"
+ b_grigoriopol:0 "Grigoriopol"
+ c_rybnitsa:0 "Rîbnița"
+ c_rybnitsa_adj:0 "Rîbnițan"
+ b_rybnitsa:0 "Rîbnița"
+ b_camenca:0 "Camenca"
\ No newline at end of file
diff --git a/map_data/definition.csv b/map_data/definition.csv
index 50a673e9..857121d2 100644
--- a/map_data/definition.csv
+++ b/map_data/definition.csv
@@ -5319,7 +5319,7 @@
 5318;131;192;59;Kalmikovsky;x
 5319;173;195;187;Yaitsk;x
 5320;5;198;60;Lozova;x
-5321;47;201;188;Pokrovsk;x
+5321;47;201;188;Pokrovske;x
 5322;89;204;61;Tor;x
 5323;131;207;189;Volcha;x
 5324;173;210;62;Donetsk;x
@@ -12395,10 +12395,10 @@
 12394;185;153;252;CirLXJ_Wulanchabu;x
 12395;49;47;58;CirLXJ_Chayouqian;x
 12396;95;99;107;CirLXJ_Shanyu;x
-12397;6;68;1;;x
+12397;6;68;1;Kyrylivka;x
 12398;96;66;91;CirLXJ_Anbei;x
-12399;14;175;162;;x
-12400;162;24;232;;x
+12399;14;175;162;Vasylivka;x
+12400;162;24;232;Skadovsk;x
 12401;28;20;173;CirLXJ_Zhangjiakou;x
 12402;186;240;242;CirLXJ_Tuncheng;x
 12403;239;229;28;CirLXJ_Longmen;x
@@ -12438,20 +12438,20 @@
 12437;22;143;117;FIC_Amur_Nimen;x
 12438;196;184;158;FIC_Amur_Hara;x
 12439;127;101;154;FIC_Amur_Vandarin;x
-12440;198;255;221;;x
-12441;114;12;33;;x
-12442;41;150;160;;x
-12443;96;252;35;;x
-12444;201;113;242;;x
-12445;52;102;41;;x
-12446;48;24;30;;x
-12447;55;20;56;;x
-12448;100;165;1;;x
-12449;37;11;48;;x
-12450;2;218;221;;x
-12451;142;135;112;;x
-12452;51;71;40;;x
-12453;88;102;80;;x
+12440;198;255;221;Pripyat;x
+12441;114;12;33;Grigoriopol;x
+12442;41;150;160;Camenca;x
+12443;96;252;35;Stolin;x
+12444;201;113;242;Berdiansk;x
+12445;52;102;41;Rozdilna;x
+12446;48;24;30;Rybnitsa;x
+12447;55;20;56;Pavlohrad;x
+12448;100;165;1;Pidhorodnie;x
+12449;37;11;48;Synelnykove;x
+12450;2;218;221;Kupiansk;x
+12451;142;135;112;Izium;x
+12452;51;71;40;Volnovakha;x
+12453;88;102;80;Kalmiuske;x
 12454;116;24;248;FIC_EMan_Bao;x
 12455;71;95;104;FIC_EMan_Senkele;x
 12456;88;119;116;FIC_EMan_Melersuki;x
@@ -12484,7 +12484,7 @@
 12483;18;24;244;IMPASSABLE North East Manchuria mountain 1;x
 12484;19;24;248;IMPASSABLE North East Manchuria mountain 2;x
 12485;20;24;232;IMPASSABLE North East Manchuria mountain 3;x
-12486;21;24;236;;x
+12486;21;24;236;Starobilsk;x
 12487;22;24;240;LAKE Philippines lakes north;x
 12488;45;29;170;LAKE Philippines lake south;x
 12489;24;24;248;IMPASSABLE Philippines Luzon Mountains 1;x
@@ -12532,12 +12532,12 @@
 12531;255;178;175;river_mun;x
 12532;191;243;255;river_mun;x
 12533;225;160;255;river_mun;x
-12534;145;140;255;;x
-12535;255;247;226;;x
-12536;255;99;156;;x
-12537;127;255;136;;x
-12538;255;251;58;;x
-12539;76;222;255;;x
+12534;145;140;255;Luhansk;x
+12535;255;247;226;Kramatorsk;x
+12536;255;99;156;Polohy;x
+12537;127;255;136;Samar;x
+12538;255;251;58;Kryvyi Rih;x
+12539;76;222;255;Mykolaiv;x
 12540;129;207;33;Chiang Coeng;x
 12541;215;76;82;Muang Sing;x
 12542;88;13;100;Muang Fuang;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
+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
@@ -13637,5 +13637,3 @@
 13636;42;27;116;Ignalina;x
 13637;94;27;116;Pabrade;x
 13638;0;24;187;Demene;x
-
-
diff --git a/map_data/provinces.png b/map_data/provinces.png
index eddc8004..3b7ee2b3 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:6316e260a1155b27fd3698831ecff7bf81594a638ec0f46f042adbd6d3187f09
-size 3419726
+oid sha256:9063d089f30c5945a8ecf03ed779a245608ceddbd686f73189a82dd08c7ebe88
+size 3469430