diff --git a/common/landed_titles/finland.txt b/common/landed_titles/finland.txt
index c30e1bed..fbd0dd44 100644
--- a/common/landed_titles/finland.txt
+++ b/common/landed_titles/finland.txt
@@ -16,53 +16,21 @@ e_finland = {
 		d_vasterbottena  = {
 			color = { 153 204 189  }
 			capital = c_ubmeje
-				cultural_names = {
-						name_list_swedish = cn_vasterbotten
-						name_list_norwegian = cn_vasterbotten
-						name_list_danish = cn_vasterbotten
-						name_list_icelander = cn_vasterbotten
-						name_list_finnish = cn_lansipohja
-				}
 			c_ubmeje = {
 				color = { 153 204 189  }
-				cultural_names = {
-						name_list_swedish = cn_umea
-						name_list_norwegian = cn_umea
-						name_list_danish = cn_umea
-						name_list_icelander = cn_umea
-						name_list_finnish = cn_uumaja
-				}
 				b_ubmeje = { #(Umeå)
 					province = 368
+
 					color = { 153 204 189  }
-					cultural_names = {
-						name_list_swedish = cn_umea
-						name_list_norwegian = cn_umea
-						name_list_danish = cn_umea
-						name_list_icelander = cn_umea
-						name_list_finnish = cn_uumaja
-					}
 				}
 				b_arviesjavrrie = {  #Árviesjávrrie (Arvidsjaur)
 					province = 375
+
 					color = { 153 204 189  }
-					cultural_names = {
-						name_list_swedish = cn_arvidsjaur
-						name_list_norwegian = cn_arvidsjaur
-						name_list_danish = cn_arvidsjaur
-						name_list_icelander = cn_arvidsjaur
-						name_list_finnish = cn_arvidsjaur
-					}
 				}
-				b_orrestaare = { #(Örnsköldsvik)
+				b_grundasund = { #(Grundsunda)
 					province = 382
-					cultural_names = {
-						name_list_swedish = cn_ornskoldsvik
-						name_list_norwegian = cn_ornskoldsvik
-						name_list_danish = cn_ornskoldsvik
-						name_list_icelander = cn_ornskoldsvik
-						name_list_finnish = cn_ornskoldsvik
-					}
+
 					color = { 153 204 189  }
 				}
 			}
@@ -404,248 +372,230 @@ e_finland = {
 		}
 
 		d_finland = {
-			color = { 245 245 245 }
+			color = { 200 160 0 }
 
 			capital = c_nyland #Turku
 
 			c_finland = {
-				color = { 235 245 245 }
+				color = { 200 140 0 }
 
 				b_turku = {
 					province = 179
-					color = { 235 245 245 }
+					color = { 200 140 0 }
 				}
-				b_salo = {
+				b_rikala = {
 					province = 178
-					color = { 235 245 245 }
+					color = { 200 140 0 }
 				}
-				b_uusikaupunki  = {
+				b_rauma = {
 					province = 180
-					ccolor = { 235 245 245 }
+					color = { 200 140 0 }
 				}
 			}
 
 			c_nyland = {
-				color = { 185 185 233 }
-				
-				b_helsinki = {
-					province = 176
-					color = { 185 185 233 }
-				}
+				color = { 200 190 0 }
+
 				b_porvoo = {
 					province = 175
-					color = { 185 185 233 }
+					color = { 200 190 0 }
+				}
+				b_espoo = {
+					province = 176
+					color = { 200 190 0 }
 				}
 				b_raseborg = {
 					province = 177
-					color = { 185 185 233 }
+					color = { 200 190 0 }
+
+				}
+				b_vehkalahti = {
+					province = 197
+					color = { 200 190 0 }
 
 				}
 			}
 			c_aland = {
 				color = { 28 56 199 }
+
+
 				b_sund = {
 					province = 216
 					color = { 28 56 199 }
 				}
-				b_mariehamn = {
+				b_jomala = {
 					province = 217
 					color = { 28 56 199 }
 				}
 			}
 			c_satakunta = {
-				color = { 205 205 245 }
+				color = { 200 190 25 }
 
-				b_pori = {
+				b_ulvila = {
 					province = 185
-					color = { 205 205 245 }
+					color = { 200 190 25 }
 				}
-				b_rauma = {
+				b_liinmaa = {
 					province = 183
-					color = { 205 205 245 }
+					color = { 200 190 25 }
+				}
+				b_telja = {
+					province = 184
+					color = { 200 190 25 }
+				}
+				b_pirkkala = {
+					province = 186
+					color = { 200 190 25 }
 				}
 			}
 
-			c_pirkanmaa = {
-				color = { 151 151 215 }
+			c_messukyla = {
+				color = { 200 175 10 }
 
-				b_tampere = {
+				b_messukyla = {
 					province = 211
-					color = { 151 151 215 }
-				}
-				b_nokia = {
-					province = 184
-					color = { 151 151 215 }
+					color = { 200 175 10 }
 				}
 				b_ruovesi = {
 					province = 212
 					color = { 200 175 10 }
 				}
-				b_ikaalinen = {
-					province = 186
-					color = { 200 175 10 }
-				}
 			}
 
-			c_kantahame = {
-				color = { 150 170 210 }
+			c_tavasts = {
+				color = { 200 110 0 }
 
 				b_hameenlinna = {
 					province = 205
-					color = { 150 170 210 }
+					color = { 200 110 0 }
 				}
-				b_forssa = {
+				b_somero = {
 					province = 206
-					color = { 150 170 210 }
+					color = { 200 110 0 }
 				}
-			}
-			c_paijathame = {
-				color = { 90 100 200 }
 				b_lahti = {
 					province = 208
-					color = { 90 100 200 }
-				}
-				b_sysma = {
-					province = 207
-					color = { 90 100 200 }
-				}
-			}
-			c_kymmenlaakso = {
-				color = { 80 90 180 }
-				b_vehkalahti = {
-					province = 197
-					color = { 220 130 0 }
-
-				}
-			}
-			c_viipuri = {
-				color = { 140 140 190 }
-
-				b_viipuri = {
-					province = 182
-					color = { 230 200 10 }
-				}
-				b_parikkala = {
-					province = 181
-					color = { 230 200 10 }
-				}
-				b_savitaipale = {
-					province = 187
-					color = { 230 200 10 }
+					color = { 200 110 0 }
 				}
 			}
 		}
 
 		d_savo  = {
-			color = { 110 110 140 }
+			color = { 250 100 20 }
 
 			capital = c_olavinlinna # Olofsborg
-			
-			c_kuopio = {
-				color = { 110 110 140 }
-				b_kuopio = {
-					province = 651
-					color = { 110 110 140 }
-				}
-				b_keitele = {
-					province = 448
-					color = { 110 110 140 }
-				}
-			}
-			
-			c_mikkeli = {
-				color = { 140 170 200 }
-				b_mikkeli = {
-					province = 188
-					color = { 140 170 200 }
-				}
-				b_savonlinna = {
+
+			c_olavinlinna = {
+				color = { 250 80 10 }
+
+				b_olavinlinna = {
 					province = 190
-					color = { 140 170 200 }
+					color = { 250 80 10 }
 				}
 				b_sulkava = {
 					province = 189
-					color = { 140 170 200 }
+					color = { 250 80 10 }
 				}
-				b_konnevesi = {
-					province = 447
-					color = { 140 170 200 }
+
+				b_mikkeli = {
+					province = 188
+					color = { 250 80 10 }
 				}
 			}
 
-			c_jyvaskyla = {
-				color = { 105 105 130 }
-				b_jyvaskyla = {
-					province = 209
-					color = { 105 105 130 }
+			c_sysma = {
+				color = { 250 120 50 }
+
+				b_sysma = {
+					province = 207
+					color = { 250 120 50 }
 				}
-				b_saarijarvi = {
-					province = 650
-					color = { 105 105 130 }
+				b_paijala = {
+					province = 209
+					color = { 250 120 50 }
+				}
+				b_konnevesi = {
+					province = 447
+					color = { 250 120 50 }
+				}
+			}
+
+			c_pielinen = {
+				color = { 230 65 35 }
+
+				b_pielinen = {
+					province = 449
+					color = { 230 65 35 }
+				}
+				b_keitele = {
+					province = 448
+					color = { 230 65 35 }
 				}
 			}
 		}
 
 		d_pohjanmaa = {
-			color = { 90 160 200 }
+			color = { 140 125 25 }
 
 			capital = c_oulu
 
 			c_oulu = {
-				color = { 60 140 180 }
+				color = { 140 100 40 }
 
 				b_oulu = {
 					province = 444
-					color = { 60 140 180 }
+					color = { 140 100 40 }
 				}
 				b_liminka = {
 					province = 445
-					color = { 60 140 180 }
+					color = { 140 100 40 }
 				}
-				b_kokkola = {
+				b_puolanka = {
+					province = 446
+					color = { 140 100 40 }
+				}
+				b_veteli = {
 					province = 443
-					color = { 60 140 180 }
+					color = { 140 100 40 }
 				}
 			}
 
-			c_seinajoki = {
-				color = { 40 125 155 }
-				b_seinajoki = {
-					province = 210
-					color = { 40 125 155 }
-				}
-				b_kauhajoki = {
-					province = 215
-					color = { 40 125 155 }
-				}
-			}
+			c_pedersore = {
+				color = { 140 145 45 }
 
-			c_vaasa = {
-				color = { 90 130 160 }
-				b_vaasa = {
-					province = 213
-					color = { 90 130 160 }
-				}
 				b_pedersore = {
 					province = 442
-					color = { 90 130 160 }
+					color = { 140 145 45 }
 				}
-				b_kaskinen = {
+				b_vuohijarvi = {
+					province = 210
+					color = { 140 145 45 }
+				}
+			}
+
+			c_mustasaari = {
+				color = { 140 110 15 }
+
+				b_mustasaari = {
+					province = 213
+					color = { 140 110 15 }
+				}
+				b_merikarvia = {
 					province = 214
-					color = { 90 130 160 }
+					color = { 140 110 15 }
+				}
+				b_levanluhta = {
+					province = 215
+					color = { 140 110 15 }
 				}
 			}
 
 			c_kainuu = {
-				color = { 50 90 140 }
+				color = { 140 125 25 }
 
 				b_kajaani = {
 					province = 450
-					color = { 50 90 140 }
-				}
-				b_puolanka = {
-					province = 446
-					color = { 50 90 140 }
+					color = { 145 125 25 }
 				}
 			}
 		}
@@ -676,21 +626,35 @@ e_finland = {
 					color = { 220 160 50 }
 				}
 			}
-			c_joensuu = {
-				color = { 120 160 170 }
-				b_joensuu = {
-					province = 204
-					color = { 220 140 20 }
-				}
-				b_kitee = {
+			c_suparsaari = {
+				color = { 250 80 10 }
+				b_suoparsaari = {
 					province = 203
 					color = { 250 80 10 }
 				}
-				b_pielinen = {
-					province = 449
-					color = { 230 65 35 }
+				b_tohmajarvi = {
+					province = 204
+					color = { 220 140 20 }
 				}
 			}	
+			c_viipuri = {
+				color = { 230 200 10 }
+
+				b_viipuri = {
+					province = 182
+					color = { 230 200 10 }
+
+				}
+				b_parikkala = {
+					province = 181
+					color = { 230 200 10 }
+				}
+				b_savitaipale = {
+					province = 187
+					color = { 230 200 10 }
+				}
+			}
+
 			c_sortavala = {
 				color = { 220 140 20 }
 
diff --git a/gfx/map/map_object_data/activities.txt b/gfx/map/map_object_data/activities.txt
index d224782b..a56587c0 100644
--- a/gfx/map/map_object_data/activities.txt
+++ b/gfx/map/map_object_data/activities.txt
@@ -5,6 +5,48 @@
 	generated_content=no
 	layer="activities_layer"
 	instances={
+		{
+			id=0
+			position={ 12532.431641 0.000000 10026.444336 }
+			rotation={ -0.000000 0.267792 -0.000000 0.963477 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=0
+			position={ 7545.659180 0.000000 4327.460938 }
+			rotation={ 0.000000 0.936860 0.000000 -0.349706 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=0
+			position={ 7538.800293 0.000000 4309.077637 }
+			rotation={ 0.000000 0.936860 0.000000 -0.349706 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=0
+			position={ 7034.426758 0.000000 3342.635498 }
+			rotation={ 0.000000 0.936860 0.000000 -0.349706 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=0
+			position={ 6428.332520 0.000000 2460.125732 }
+			rotation={ 0.000000 0.936860 0.000000 -0.349706 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=0
+			position={ 6432.458496 0.000000 2462.395752 }
+			rotation={ 0.000000 0.936860 0.000000 -0.349706 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=0
+			position={ 6437.306152 0.000000 2472.136230 }
+			rotation={ 0.000000 0.936860 0.000000 -0.349706 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
 		{
 			id=1
 			position={ 258.331116 0.000000 4468.756836 }
@@ -1105,7 +1147,7 @@
 		}
 		{
 			id=184
-			position={ 2074.635498 0.000000 3950.712402 }
+			position={ 2067.796875 0.000000 3938.089844 }
 			rotation={ -0.000000 -0.284352 -0.000000 0.958720 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -1285,7 +1327,7 @@
 		}
 		{
 			id=214
-			position={ 2008.802856 0.000000 4026.065430 }
+			position={ 2019.977539 0.000000 4003.670166 }
 			rotation={ -0.000000 -0.429996 -0.000000 0.902831 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -2293,7 +2335,7 @@
 		}
 		{
 			id=384
-			position={ 2036.757812 0.000000 4394.736816 }
+			position={ 2008.606323 0.000000 4421.618164 }
 			rotation={ -0.000000 0.013580 -0.000000 0.999908 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -2341,7 +2383,7 @@
 		}
 		{
 			id=392
-			position={ 1999.754639 0.000000 4438.083008 }
+			position={ 2056.086426 0.000000 4408.430664 }
 			rotation={ -0.000000 -0.262188 -0.000000 0.965017 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -2503,7 +2545,7 @@
 		}
 		{
 			id=419
-			position={ 2266.243408 0.000000 4250.456055 }
+			position={ 2218.683350 0.000000 4265.948242 }
 			rotation={ -0.000000 0.415588 -0.000000 0.909553 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -2665,7 +2707,7 @@
 		}
 		{
 			id=446
-			position={ 2204.820557 0.000000 4157.900391 }
+			position={ 2191.273926 0.000000 4147.214844 }
 			rotation={ -0.000000 -0.249946 -0.000000 0.968260 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -3743,18 +3785,6 @@
 			rotation={ -0.000000 -0.466303 -0.000000 0.884625 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
-		{
-			id=650
-			position={ 2153.328613 0.000000 4034.004150 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=651
-			position={ 2225.309570 0.000000 4013.669922 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
 		{
 			id=668
 			position={ 3568.670166 0.000000 2541.057617 }
@@ -6539,18 +6569,6 @@
 			rotation={ -0.000000 0.437009 -0.000000 0.899457 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
-		{
-			id=1469
-			position={ 1889.000000 0.000000 3492.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=1470
-			position={ 1929.000000 0.000000 3343.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
 		{
 			id=1499
 			position={ 868.780090 0.000000 3523.653809 }
@@ -10481,6 +10499,12 @@
 			rotation={ -0.000000 -0.498280 -0.000000 0.867016 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
+		{
+			id=2156
+			position={ 677.634583 0.000000 3015.413086 }
+			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
 		{
 			id=2157
 			position={ 692.956360 0.000000 3067.857666 }
@@ -16679,6 +16703,12 @@
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
+		{
+			id=3257
+			position={ 1787.000000 0.000000 2944.000000 }
+			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
 		{
 			id=3258
 			position={ 1187.852783 0.000000 2737.259033 }
@@ -44687,6 +44717,12 @@
 			rotation={ -0.000000 0.281058 -0.000000 0.959691 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
+		{
+			id=8121
+			position={ 1650.158936 0.000000 697.937195 }
+			rotation={ -0.000000 -0.229013 -0.000000 0.973423 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
 		{
 			id=8122
 			position={ 1658.558838 0.000000 642.424500 }
@@ -47413,13 +47449,13 @@
 		}
 		{
 			id=8784
-			position={ 2085.649414 0.000000 4302.528809 }
+			position={ 2059.000000 0.000000 4324.000000 }
 			rotation={ 0.000000 0.758000 0.000000 0.652254 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=8785
-			position={ 2137.923584 0.000000 4288.759277 }
+			position={ 2134.000000 0.000000 4286.000000 }
 			rotation={ 0.000000 0.981821 0.000000 0.189807 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -47567,420 +47603,6 @@
 			rotation={ 0.000000 0.544914 0.000000 0.838492 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
-		{
-			id=8814
-			position={ 2029.000000 0.000000 3281.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8815
-			position={ 2139.000000 0.000000 3306.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8816
-			position={ 2162.000000 0.000000 3450.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8817
-			position={ 2172.000000 0.000000 3428.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8818
-			position={ 2136.000000 0.000000 3359.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8819
-			position={ 2165.000000 0.000000 3227.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8820
-			position={ 2146.000000 0.000000 3209.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8821
-			position={ 2155.000000 0.000000 3277.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8822
-			position={ 2189.000000 0.000000 3255.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8823
-			position={ 2199.000000 0.000000 3176.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8824
-			position={ 2061.000000 0.000000 3217.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8825
-			position={ 2079.000000 0.000000 3204.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8826
-			position={ 2134.000000 0.000000 3102.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8827
-			position={ 2057.000000 0.000000 3113.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8828
-			position={ 1959.000000 0.000000 3111.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8829
-			position={ 1915.000000 0.000000 3136.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8830
-			position={ 2002.000000 0.000000 3126.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8831
-			position={ 2568.000000 0.000000 2482.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8832
-			position={ 2517.000000 0.000000 2476.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8833
-			position={ 2485.000000 0.000000 2464.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8834
-			position={ 3452.000000 0.000000 2687.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8835
-			position={ 3467.000000 0.000000 2662.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8836
-			position={ 3420.000000 0.000000 2645.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8837
-			position={ 3434.000000 0.000000 2669.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8838
-			position={ 3447.000000 0.000000 2645.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8839
-			position={ 3435.000000 0.000000 2625.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8840
-			position={ 3484.000000 0.000000 2594.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8841
-			position={ 3505.000000 0.000000 2598.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8842
-			position={ 3462.000000 0.000000 2631.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8843
-			position={ 3474.000000 0.000000 2615.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8844
-			position={ 3431.000000 0.000000 2702.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8845
-			position={ 3450.000000 0.000000 2718.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8846
-			position={ 3418.000000 0.000000 2775.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8847
-			position={ 3380.000000 0.000000 2749.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8848
-			position={ 3383.000000 0.000000 2792.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8849
-			position={ 3400.000000 0.000000 2757.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8850
-			position={ 3371.000000 0.000000 2697.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8851
-			position={ 3401.000000 0.000000 2699.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8852
-			position={ 3378.000000 0.000000 2721.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8853
-			position={ 3356.000000 0.000000 2669.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8854
-			position={ 3340.000000 0.000000 2699.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8855
-			position={ 3340.000000 0.000000 2722.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8856
-			position={ 3339.000000 0.000000 2663.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8857
-			position={ 3326.000000 0.000000 2681.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8858
-			position={ 3317.000000 0.000000 2651.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8859
-			position={ 3300.000000 0.000000 2669.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8860
-			position={ 3211.000000 0.000000 2746.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8861
-			position={ 3217.000000 0.000000 2720.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8862
-			position={ 3187.000000 0.000000 2748.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8863
-			position={ 3242.000000 0.000000 2699.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8864
-			position={ 3246.000000 0.000000 2718.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8865
-			position={ 3276.000000 0.000000 2683.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8866
-			position={ 3188.000000 0.000000 2715.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8867
-			position={ 3172.000000 0.000000 2729.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8868
-			position={ 3203.000000 0.000000 2700.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8869
-			position={ 3153.000000 0.000000 2725.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8870
-			position={ 3307.000000 0.000000 2724.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8871
-			position={ 3274.000000 0.000000 2713.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8872
-			position={ 3073.000000 0.000000 2730.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8873
-			position={ 3049.000000 0.000000 2750.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8874
-			position={ 3079.000000 0.000000 2756.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8875
-			position={ 3102.000000 0.000000 2718.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8876
-			position={ 3014.000000 0.000000 2759.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8877
-			position={ 3010.000000 0.000000 2788.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8878
-			position={ 3030.000000 0.000000 2778.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8879
-			position={ 2985.000000 0.000000 2793.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8880
-			position={ 3038.000000 0.000000 2808.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8881
-			position={ 3039.000000 0.000000 2823.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8882
-			position={ 2978.000000 0.000000 2808.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 }
@@ -51911,12 +51533,24 @@
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
+		{
+			id=9666
+			position={ 809.136658 0.000000 3140.674316 }
+			rotation={ 0.000000 0.440934 0.000000 0.897540 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
 		{
 			id=9667
 			position={ 597.805786 0.000000 3544.986572 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
+		{
+			id=9667
+			position={ 600.077637 0.000000 3540.085449 }
+			rotation={ 0.000000 0.440934 0.000000 0.897540 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
 		{
 			id=9668
 			position={ 635.825562 0.000000 3541.639893 }
@@ -52577,12 +52211,78 @@
 			rotation={ 0.000000 0.315154 0.000000 -0.949041 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
+		{
+			id=9785
+			position={ 6681.000000 0.000000 1958.000000 }
+			rotation={ 0.000000 0.853570 0.000000 0.520978 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
 		{
 			id=9786
 			position={ 1465.558594 0.000000 2872.865234 }
 			rotation={ 0.000000 0.842628 0.000000 -0.538496 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
+		{
+			id=9787
+			position={ 6681.000000 0.000000 2566.000000 }
+			rotation={ 0.000000 0.437122 0.000000 0.899402 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=9788
+			position={ 6664.000000 0.000000 2576.000000 }
+			rotation={ 0.000000 0.990414 0.000000 0.138128 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=9789
+			position={ 6645.000000 0.000000 2602.000000 }
+			rotation={ 0.000000 0.782862 0.000000 -0.622196 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=9790
+			position={ 6717.000000 0.000000 2564.000000 }
+			rotation={ 0.000000 0.910015 0.000000 -0.414575 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=9791
+			position={ 6758.000000 0.000000 2564.000000 }
+			rotation={ 0.000000 0.330355 0.000000 0.943857 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=9792
+			position={ 6764.000000 0.000000 2577.000000 }
+			rotation={ 0.000000 0.224139 0.000000 0.974557 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=9793
+			position={ 6890.000000 0.000000 2507.000000 }
+			rotation={ 0.000000 0.989068 0.000000 -0.147458 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=9794
+			position={ 6816.000000 0.000000 2602.000000 }
+			rotation={ 0.000000 0.998841 0.000000 -0.048129 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=9795
+			position={ 6829.000000 0.000000 2592.000000 }
+			rotation={ 0.000000 0.451332 0.000000 0.892356 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=9796
+			position={ 6818.000000 0.000000 2562.000000 }
+			rotation={ 0.000000 0.958820 0.000000 0.284013 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
 		{
 			id=9797
 			position={ 1321.104492 0.000000 2809.027832 }
@@ -68825,6 +68525,12 @@
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
+		{
+			id=13422
+			position={ 7177.000000 0.000000 2805.000000 }
+			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
 		{
 			id=13423
 			position={ 6513.000000 0.000000 2451.000000 }
@@ -69617,6 +69323,12 @@
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
+		{
+			id=13555
+			position={ 6858.000000 0.000000 2127.000000 }
+			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
 		{
 			id=13556
 			position={ 7097.000000 0.000000 2146.000000 }
@@ -69953,12 +69665,6 @@
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
-		{
-			id=13614
-			position={ 1650.000000 0.000000 701.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
 		{
 			id=13615
 			position={ 2048.773926 0.000000 3489.759033 }
diff --git a/gfx/map/map_object_data/building_locators.txt b/gfx/map/map_object_data/building_locators.txt
index 5ed89181..e652728a 100644
--- a/gfx/map/map_object_data/building_locators.txt
+++ b/gfx/map/map_object_data/building_locators.txt
@@ -5,6 +5,12 @@
 	generated_content=no
 	layer="building_layer"
 	instances={
+		{
+			id=0
+			position={ 9315.441406 0.000000 6692.637695 }
+			rotation={ 0.000000 0.666921 0.000000 0.745128 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
 		{
 			id=1
 			position={ 271.799835 0.000000 4462.883301 }
@@ -1285,8 +1291,8 @@
 		}
 		{
 			id=214
-			position={ 2011.678833 0.000000 4011.918213 }
-			rotation={ -0.000000 -0.991579 -0.000000 -0.129503 }
+			position={ 2015.077637 0.000000 4009.085449 }
+			rotation={ -0.000000 -0.991987 -0.000000 -0.126340 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
@@ -2293,7 +2299,7 @@
 		}
 		{
 			id=384
-			position={ 2030.255371 0.000000 4381.999512 }
+			position={ 2003.846436 0.000000 4417.979492 }
 			rotation={ -0.000000 -0.943708 -0.000000 0.330780 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -2341,7 +2347,7 @@
 		}
 		{
 			id=392
-			position={ 1996.447998 0.000000 4444.413574 }
+			position={ 2052.779785 0.000000 4414.761230 }
 			rotation={ -0.000000 -0.930385 -0.000000 -0.366584 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -2503,7 +2509,7 @@
 		}
 		{
 			id=419
-			position={ 2256.584473 0.000000 4265.337402 }
+			position={ 2222.293701 0.000000 4273.183105 }
 			rotation={ -0.000000 -0.455952 -0.000000 0.890004 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -2641,7 +2647,7 @@
 		}
 		{
 			id=442
-			position={ 2035.994263 0.000000 4093.219727 }
+			position={ 2053.029541 0.000000 4079.205566 }
 			rotation={ -0.000000 0.232786 -0.000000 0.972528 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -2665,7 +2671,7 @@
 		}
 		{
 			id=446
-			position={ 2215.127441 0.000000 4160.649902 }
+			position={ 2201.580811 0.000000 4149.964355 }
 			rotation={ -0.000000 -0.225000 -0.000000 0.974359 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -3743,18 +3749,6 @@
 			rotation={ -0.000000 -0.687107 -0.000000 0.726556 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
-		{
-			id=650
-			position={ 2134.971924 0.000000 4059.707520 }
-			rotation={ -0.000000 -0.962724 -0.000000 0.270487 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=651
-			position={ 2224.912598 0.000000 4056.576904 }
-			rotation={ -0.000000 -0.996900 -0.000000 0.078680 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
 		{
 			id=668
 			position={ 3571.077637 0.000000 2533.085449 }
@@ -6539,18 +6533,6 @@
 			rotation={ -0.000000 -0.996657 -0.000000 0.081693 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
-		{
-			id=1469
-			position={ 1892.000000 0.000000 3492.000000 }
-			rotation={ -0.000000 -0.826200 -0.000000 -0.563376 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=1470
-			position={ 1932.000000 0.000000 3343.000000 }
-			rotation={ -0.000000 -0.963800 -0.000000 0.266627 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
 		{
 			id=1499
 			position={ 886.759949 0.000000 3512.667236 }
@@ -16679,6 +16661,12 @@
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
+		{
+			id=3257
+			position={ 1790.000000 0.000000 2944.000000 }
+			rotation={ -0.000000 -0.962724 -0.000000 0.270487 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
 		{
 			id=3258
 			position={ 1190.522705 0.000000 2724.276611 }
@@ -44687,6 +44675,12 @@
 			rotation={ -0.000000 -0.467139 -0.000000 -0.884184 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
+		{
+			id=8121
+			position={ 1642.077637 0.000000 700.085571 }
+			rotation={ -0.000000 -0.047786 -0.000000 -0.998858 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
 		{
 			id=8122
 			position={ 1655.609009 0.000000 636.178467 }
@@ -47413,13 +47407,13 @@
 		}
 		{
 			id=8784
-			position={ 2065.727051 0.000000 4331.614258 }
+			position={ 2039.077637 0.000000 4353.085449 }
 			rotation={ 0.000000 0.758000 0.000000 0.652254 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=8785
-			position={ 2091.427734 0.000000 4313.619629 }
+			position={ 2081.077637 0.000000 4308.085449 }
 			rotation={ 0.000000 0.981821 0.000000 0.189807 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -47567,420 +47561,6 @@
 			rotation={ 0.000000 0.544914 0.000000 0.838492 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
-		{
-			id=8814
-			position={ 2032.000000 0.000000 3281.000000 }
-			rotation={ -0.000000 -0.759288 -0.000000 0.650755 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8815
-			position={ 2142.000000 0.000000 3306.000000 }
-			rotation={ -0.000000 -0.695041 -0.000000 -0.718970 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8816
-			position={ 2165.000000 0.000000 3450.000000 }
-			rotation={ -0.000000 -0.601278 -0.000000 -0.799040 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8817
-			position={ 2175.000000 0.000000 3428.000000 }
-			rotation={ -0.000000 -0.338905 -0.000000 0.940821 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8818
-			position={ 2139.000000 0.000000 3359.000000 }
-			rotation={ -0.000000 -0.271433 -0.000000 0.962457 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8819
-			position={ 2168.000000 0.000000 3227.000000 }
-			rotation={ -0.000000 -0.889235 -0.000000 0.457450 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8820
-			position={ 2149.000000 0.000000 3209.000000 }
-			rotation={ -0.000000 -0.042530 -0.000000 0.999095 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8821
-			position={ 2158.000000 0.000000 3277.000000 }
-			rotation={ -0.000000 -0.943708 -0.000000 0.330780 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8822
-			position={ 2192.000000 0.000000 3255.000000 }
-			rotation={ -0.000000 -0.246639 -0.000000 -0.969107 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8823
-			position={ 2202.000000 0.000000 3176.000000 }
-			rotation={ -0.000000 -0.751435 -0.000000 0.659807 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8824
-			position={ 2064.000000 0.000000 3217.000000 }
-			rotation={ -0.000000 -0.008268 -0.000000 -0.999966 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8825
-			position={ 2082.000000 0.000000 3204.000000 }
-			rotation={ -0.000000 -0.175313 -0.000000 -0.984513 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8826
-			position={ 2137.000000 0.000000 3102.000000 }
-			rotation={ -0.000000 -0.216567 -0.000000 0.976268 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8827
-			position={ 2060.000000 0.000000 3113.000000 }
-			rotation={ -0.000000 -0.930385 -0.000000 -0.366584 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8828
-			position={ 1962.000000 0.000000 3111.000000 }
-			rotation={ -0.000000 -0.215025 -0.000000 0.976608 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8829
-			position={ 1918.000000 0.000000 3136.000000 }
-			rotation={ -0.000000 -0.235842 -0.000000 0.971791 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8830
-			position={ 2005.000000 0.000000 3126.000000 }
-			rotation={ -0.000000 -0.933035 -0.000000 0.359786 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8831
-			position={ 2571.000000 0.000000 2482.000000 }
-			rotation={ -0.000000 -0.149469 -0.000000 0.988766 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8832
-			position={ 2520.000000 0.000000 2476.000000 }
-			rotation={ -0.000000 -0.851638 -0.000000 0.524130 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8833
-			position={ 2488.000000 0.000000 2464.000000 }
-			rotation={ -0.000000 -0.955055 -0.000000 -0.296429 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8834
-			position={ 3455.000000 0.000000 2687.000000 }
-			rotation={ -0.000000 -0.763981 -0.000000 0.645238 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8835
-			position={ 3470.000000 0.000000 2662.000000 }
-			rotation={ -0.000000 -0.988132 -0.000000 0.153608 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8836
-			position={ 3423.000000 0.000000 2645.000000 }
-			rotation={ -0.000000 -0.858271 -0.000000 -0.513197 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8837
-			position={ 3437.000000 0.000000 2669.000000 }
-			rotation={ -0.000000 -0.773227 -0.000000 0.634130 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8838
-			position={ 3450.000000 0.000000 2645.000000 }
-			rotation={ -0.000000 -0.564998 -0.000000 0.825092 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8839
-			position={ 3438.000000 0.000000 2625.000000 }
-			rotation={ -0.000000 -0.242634 -0.000000 -0.970118 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8840
-			position={ 3487.000000 0.000000 2594.000000 }
-			rotation={ -0.000000 -0.837185 -0.000000 -0.546920 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8841
-			position={ 3508.000000 0.000000 2598.000000 }
-			rotation={ -0.000000 -0.725192 -0.000000 0.688547 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8842
-			position={ 3465.000000 0.000000 2631.000000 }
-			rotation={ -0.000000 -0.397930 -0.000000 -0.917416 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8843
-			position={ 3477.000000 0.000000 2615.000000 }
-			rotation={ -0.000000 -0.497946 -0.000000 0.867208 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8844
-			position={ 3434.000000 0.000000 2702.000000 }
-			rotation={ -0.000000 -0.850995 -0.000000 -0.525175 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8845
-			position={ 3453.000000 0.000000 2718.000000 }
-			rotation={ -0.000000 -0.597641 -0.000000 0.801764 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8846
-			position={ 3421.000000 0.000000 2775.000000 }
-			rotation={ -0.000000 -0.278916 -0.000000 -0.960315 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8847
-			position={ 3383.000000 0.000000 2749.000000 }
-			rotation={ -0.000000 -0.501156 -0.000000 -0.865357 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8848
-			position={ 3386.000000 0.000000 2792.000000 }
-			rotation={ -0.000000 -0.301129 -0.000000 -0.953583 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8849
-			position={ 3403.000000 0.000000 2757.000000 }
-			rotation={ -0.000000 -0.097490 -0.000000 -0.995236 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8850
-			position={ 3374.000000 0.000000 2697.000000 }
-			rotation={ -0.000000 -0.694575 -0.000000 -0.719421 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8851
-			position={ 3404.000000 0.000000 2699.000000 }
-			rotation={ -0.000000 -0.947268 -0.000000 -0.320442 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8852
-			position={ 3381.000000 0.000000 2721.000000 }
-			rotation={ -0.000000 -0.311985 -0.000000 -0.950087 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8853
-			position={ 3359.000000 0.000000 2669.000000 }
-			rotation={ -0.000000 -0.038197 -0.000000 -0.999270 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8854
-			position={ 3343.000000 0.000000 2699.000000 }
-			rotation={ -0.000000 -0.455952 -0.000000 0.890004 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8855
-			position={ 3343.000000 0.000000 2722.000000 }
-			rotation={ -0.000000 -0.912758 -0.000000 0.408501 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8856
-			position={ 3342.000000 0.000000 2663.000000 }
-			rotation={ -0.000000 -0.980737 -0.000000 -0.195331 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8857
-			position={ 3329.000000 0.000000 2681.000000 }
-			rotation={ -0.000000 -0.378915 -0.000000 -0.925431 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8858
-			position={ 3320.000000 0.000000 2651.000000 }
-			rotation={ -0.000000 -0.949659 -0.000000 0.313286 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8859
-			position={ 3303.000000 0.000000 2669.000000 }
-			rotation={ -0.000000 -0.893576 -0.000000 0.448912 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8860
-			position={ 3214.000000 0.000000 2746.000000 }
-			rotation={ -0.000000 -0.816476 -0.000000 -0.577379 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8861
-			position={ 3220.000000 0.000000 2720.000000 }
-			rotation={ -0.000000 -0.868440 -0.000000 -0.495795 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8862
-			position={ 3190.000000 0.000000 2748.000000 }
-			rotation={ -0.000000 -0.964729 -0.000000 0.263244 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8863
-			position={ 3245.000000 0.000000 2699.000000 }
-			rotation={ -0.000000 -0.473960 -0.000000 0.880546 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8864
-			position={ 3249.000000 0.000000 2718.000000 }
-			rotation={ -0.000000 -0.556952 -0.000000 -0.830545 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8865
-			position={ 3279.000000 0.000000 2683.000000 }
-			rotation={ -0.000000 -0.629775 -0.000000 0.776778 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8866
-			position={ 3191.000000 0.000000 2715.000000 }
-			rotation={ -0.000000 -0.903530 -0.000000 0.428524 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8867
-			position={ 3175.000000 0.000000 2729.000000 }
-			rotation={ -0.000000 -0.993952 -0.000000 0.109818 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8868
-			position={ 3206.000000 0.000000 2700.000000 }
-			rotation={ -0.000000 -0.856567 -0.000000 -0.516037 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8869
-			position={ 3156.000000 0.000000 2725.000000 }
-			rotation={ -0.000000 -0.858160 -0.000000 0.513382 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8870
-			position={ 3310.000000 0.000000 2724.000000 }
-			rotation={ -0.000000 -0.928267 -0.000000 -0.371914 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8871
-			position={ 3277.000000 0.000000 2713.000000 }
-			rotation={ -0.000000 -0.999231 -0.000000 -0.039209 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8872
-			position={ 3076.000000 0.000000 2730.000000 }
-			rotation={ -0.000000 -0.986345 -0.000000 0.164694 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8873
-			position={ 3052.000000 0.000000 2750.000000 }
-			rotation={ -0.000000 -0.947994 -0.000000 0.318289 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8874
-			position={ 3082.000000 0.000000 2756.000000 }
-			rotation={ -0.000000 -0.191584 -0.000000 -0.981476 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8875
-			position={ 3105.000000 0.000000 2718.000000 }
-			rotation={ -0.000000 -0.010496 -0.000000 0.999945 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8876
-			position={ 3017.000000 0.000000 2759.000000 }
-			rotation={ -0.000000 -0.468638 -0.000000 0.883390 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8877
-			position={ 3013.000000 0.000000 2788.000000 }
-			rotation={ -0.000000 -0.993560 -0.000000 0.113304 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8878
-			position={ 3033.000000 0.000000 2778.000000 }
-			rotation={ -0.000000 -0.568649 -0.000000 -0.822580 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8879
-			position={ 2988.000000 0.000000 2793.000000 }
-			rotation={ -0.000000 -0.650848 -0.000000 0.759208 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8880
-			position={ 3041.000000 0.000000 2808.000000 }
-			rotation={ -0.000000 -0.996219 -0.000000 -0.086880 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8881
-			position={ 3042.000000 0.000000 2823.000000 }
-			rotation={ -0.000000 -0.990935 -0.000000 0.134343 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8882
-			position={ 2981.000000 0.000000 2808.000000 }
-			rotation={ -0.000000 -0.999983 -0.000000 -0.005813 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
 		{
 			id=8993
 			position={ 1316.077637 0.000000 1010.085571 }
@@ -51905,18 +51485,6 @@
 			rotation={ 0.000000 0.440934 0.000000 0.897540 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
-		{
-			id=9666
-			position={ 819.000000 0.000000 3162.000000 }
-			rotation={ -0.000000 -0.537614 -0.000000 0.843191 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=9667
-			position={ 603.000000 0.000000 3535.000000 }
-			rotation={ -0.000000 -0.978319 -0.000000 0.207105 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
 		{
 			id=9668
 			position={ 633.236511 0.000000 3534.834473 }
@@ -52577,12 +52145,78 @@
 			rotation={ 0.000000 0.315154 0.000000 -0.949041 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
+		{
+			id=9785
+			position={ 6565.937500 0.000000 1764.756958 }
+			rotation={ 0.000000 0.853570 0.000000 0.520978 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
 		{
 			id=9786
 			position={ 1463.077637 0.000000 2865.085449 }
 			rotation={ 0.000000 0.842628 0.000000 -0.538496 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
+		{
+			id=9787
+			position={ 6569.937500 0.000000 2403.756836 }
+			rotation={ 0.000000 0.437122 0.000000 0.899402 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=9788
+			position={ 6548.937500 0.000000 2414.756836 }
+			rotation={ 0.000000 0.990414 0.000000 0.138128 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=9789
+			position={ 6510.937500 0.000000 2398.756836 }
+			rotation={ 0.000000 0.782862 0.000000 -0.622196 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=9790
+			position={ 6599.937500 0.000000 2392.756836 }
+			rotation={ 0.000000 0.910015 0.000000 -0.414575 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=9791
+			position={ 6631.937500 0.000000 2369.756836 }
+			rotation={ 0.000000 0.330355 0.000000 0.943857 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=9792
+			position={ 6644.937500 0.000000 2390.756836 }
+			rotation={ 0.000000 0.224139 0.000000 0.974557 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=9793
+			position={ 6774.937500 0.000000 2339.756836 }
+			rotation={ 0.000000 0.989068 0.000000 -0.147458 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=9794
+			position={ 6651.937500 0.000000 2410.756836 }
+			rotation={ 0.000000 0.998841 0.000000 -0.048129 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=9795
+			position={ 6709.937500 0.000000 2406.756836 }
+			rotation={ 0.000000 0.451332 0.000000 0.892356 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=9796
+			position={ 6659.937500 0.000000 2363.756836 }
+			rotation={ 0.000000 0.958820 0.000000 0.284013 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
 		{
 			id=9797
 			position={ 1316.156738 0.000000 2802.319824 }
@@ -68825,6 +68459,12 @@
 			rotation={ -0.000000 -0.816276 -0.000000 -0.577661 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
+		{
+			id=13422
+			position={ 7037.859375 0.000000 2620.671387 }
+			rotation={ -0.000000 -0.949051 -0.000000 0.315121 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
 		{
 			id=13423
 			position={ 6373.859375 0.000000 2266.671387 }
@@ -69617,6 +69257,12 @@
 			rotation={ -0.000000 -0.755501 -0.000000 0.655147 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
+		{
+			id=13555
+			position={ 6718.859375 0.000000 1942.671387 }
+			rotation={ -0.000000 -0.135137 -0.000000 0.990827 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
 		{
 			id=13556
 			position={ 6957.859375 0.000000 1961.671387 }
@@ -69953,12 +69599,6 @@
 			rotation={ -0.000000 -0.698612 -0.000000 -0.715501 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
-		{
-			id=13614
-			position={ 1653.000000 0.000000 701.000000 }
-			rotation={ -0.000000 -0.695829 -0.000000 -0.718208 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
 		{
 			id=13615
 			position={ 2063.800781 0.000000 3487.210938 }
diff --git a/gfx/map/map_object_data/combat_locators.txt b/gfx/map/map_object_data/combat_locators.txt
index c66cc757..4a5934f5 100644
--- a/gfx/map/map_object_data/combat_locators.txt
+++ b/gfx/map/map_object_data/combat_locators.txt
@@ -11,6 +11,48 @@
 			rotation={ 0.000000 0.000000 0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
+		{
+			id=0
+			position={ 12537.431641 0.000000 9996.444336 }
+			rotation={ -0.000000 -0.156045 -0.000000 0.987750 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=0
+			position={ 7550.659180 0.000000 4297.460938 }
+			rotation={ 0.000000 -0.978216 0.000000 0.207591 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=0
+			position={ 7543.800293 0.000000 4279.077637 }
+			rotation={ 0.000000 -0.978216 0.000000 0.207591 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=0
+			position={ 7039.426758 0.000000 3312.635498 }
+			rotation={ 0.000000 -0.978216 0.000000 0.207591 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=0
+			position={ 6433.332520 0.000000 2430.125732 }
+			rotation={ 0.000000 -0.978216 0.000000 0.207591 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=0
+			position={ 6437.458496 0.000000 2432.395752 }
+			rotation={ 0.000000 -0.978216 0.000000 0.207591 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=0
+			position={ 6442.306152 0.000000 2442.136230 }
+			rotation={ 0.000000 -0.978216 0.000000 0.207591 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
 		{
 			id=1
 			position={ 274.374359 0.000000 4439.049316 }
@@ -1093,7 +1135,7 @@
 		}
 		{
 			id=181
-			position={ 2280.868652 0.000000 3949.638184 }
+			position={ 2287.760498 0.000000 3946.617676 }
 			rotation={ -0.000000 -0.331933 -0.000000 0.943303 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -1111,7 +1153,7 @@
 		}
 		{
 			id=184
-			position={ 2063.474365 0.000000 3950.467285 }
+			position={ 2061.000000 0.000000 3934.000000 }
 			rotation={ -0.000000 -0.626665 -0.000000 0.779288 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -1129,7 +1171,7 @@
 		}
 		{
 			id=187
-			position={ 2231.563965 0.000000 3910.721924 }
+			position={ 2216.000000 0.000000 3919.000000 }
 			rotation={ -0.000000 -0.569268 -0.000000 0.822152 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -1279,7 +1321,7 @@
 		}
 		{
 			id=212
-			position={ 2114.345215 0.000000 3991.057129 }
+			position={ 2120.000000 0.000000 4017.000000 }
 			rotation={ -0.000000 -0.574729 -0.000000 0.818344 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -1291,7 +1333,7 @@
 		}
 		{
 			id=214
-			position={ 2007.800537 0.000000 4002.657471 }
+			position={ 2036.516846 0.000000 4012.042480 }
 			rotation={ -0.000000 -0.734232 -0.000000 0.678899 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -2323,7 +2365,7 @@
 		}
 		{
 			id=388
-			position={ 2193.641113 0.000000 4300.405762 }
+			position={ 2156.341309 0.000000 4289.870605 }
 			rotation={ -0.000000 0.156670 -0.000000 0.987651 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -2347,7 +2389,7 @@
 		}
 		{
 			id=392
-			position={ 2005.250000 0.000000 4465.573242 }
+			position={ 2061.581787 0.000000 4435.920898 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -2401,7 +2443,7 @@
 		}
 		{
 			id=401
-			position={ 2231.807373 0.000000 4388.617188 }
+			position={ 2220.906494 0.000000 4386.151367 }
 			rotation={ -0.000000 0.114828 -0.000000 0.993385 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -2515,7 +2557,7 @@
 		}
 		{
 			id=420
-			position={ 2221.881592 0.000000 4229.833008 }
+			position={ 2250.903076 0.000000 4223.730469 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -2653,7 +2695,7 @@
 		}
 		{
 			id=443
-			position={ 2102.530762 0.000000 4083.094727 }
+			position={ 2114.149902 0.000000 4111.363281 }
 			rotation={ -0.000000 -0.993519 -0.000000 -0.113667 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -2671,7 +2713,7 @@
 		}
 		{
 			id=446
-			position={ 2217.124756 0.000000 4183.384766 }
+			position={ 2203.578125 0.000000 4172.699219 }
 			rotation={ -0.000000 -0.276710 -0.000000 0.960953 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -3887,18 +3929,6 @@
 			rotation={ -0.000000 -0.374097 -0.000000 0.927390 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
-		{
-			id=650
-			position={ 2144.000000 0.000000 4046.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=651
-			position={ 2203.538330 0.000000 4023.752441 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
 		{
 			id=661
 			position={ 2434.786865 0.000000 4475.217773 }
@@ -8081,18 +8111,6 @@
 			rotation={ -0.000000 -0.997655 -0.000000 0.068441 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
-		{
-			id=1469
-			position={ 1892.000000 0.000000 3489.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=1470
-			position={ 1932.000000 0.000000 3340.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
 		{
 			id=1472
 			position={ 1714.000000 0.000000 3992.000000 }
@@ -18557,6 +18575,12 @@
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
+		{
+			id=3257
+			position={ 1790.000000 0.000000 2941.000000 }
+			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
 		{
 			id=3258
 			position={ 1192.316040 0.000000 2727.500732 }
@@ -50395,13 +50419,13 @@
 		}
 		{
 			id=8784
-			position={ 2059.649414 0.000000 4339.528809 }
+			position={ 2033.000000 0.000000 4361.000000 }
 			rotation={ 0.000000 0.316228 0.000000 0.948683 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=8785
-			position={ 2132.408447 0.000000 4300.273926 }
+			position={ 2075.000000 0.000000 4300.000000 }
 			rotation={ 0.000000 0.948683 0.000000 0.316228 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -50549,6 +50573,30 @@
 			rotation={ 0.000000 0.544914 0.000000 0.838492 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
+		{
+			id=8810
+			position={ 7109.000000 0.000000 2182.000000 }
+			rotation={ 0.000000 0.544914 0.000000 0.838492 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=8811
+			position={ 7098.000000 0.000000 2157.000000 }
+			rotation={ 0.000000 0.000000 0.000000 1.000000 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=8812
+			position={ 7105.000000 0.000000 2195.000000 }
+			rotation={ 0.000000 0.811242 0.000000 0.584710 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=8813
+			position={ 7194.000000 0.000000 2217.000000 }
+			rotation={ 0.000000 -0.948683 0.000000 0.316228 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
 		{
 			id=8814
 			position={ 7211.000000 0.000000 2196.000000 }
@@ -56159,6 +56207,12 @@
 			rotation={ 0.000000 -0.995133 0.000000 0.098538 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
+		{
+			id=9759
+			position={ 6542.000000 0.000000 2329.000000 }
+			rotation={ 0.000000 -0.289784 0.000000 0.957092 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
 		{
 			id=9760
 			position={ 1846.664917 0.000000 2447.423584 }
@@ -56303,12 +56357,78 @@
 			rotation={ 0.000000 -0.923880 0.000000 0.382683 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
+		{
+			id=9785
+			position={ 6699.000000 0.000000 1953.000000 }
+			rotation={ 0.000000 0.544914 0.000000 0.838492 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
 		{
 			id=9786
 			position={ 1464.636841 0.000000 2871.340088 }
 			rotation={ 0.000000 -0.507128 0.000000 0.861871 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
+		{
+			id=9787
+			position={ 6722.000000 0.000000 2587.000000 }
+			rotation={ 0.000000 -0.741453 0.000000 0.671005 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=9788
+			position={ 6682.000000 0.000000 2594.000000 }
+			rotation={ 0.000000 0.861871 0.000000 0.507128 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=9789
+			position={ 6644.000000 0.000000 2587.000000 }
+			rotation={ 0.000000 0.544914 0.000000 0.838492 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=9790
+			position={ 6750.000000 0.000000 2583.000000 }
+			rotation={ 0.000000 -0.447214 0.000000 0.894427 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=9791
+			position={ 6783.000000 0.000000 2558.000000 }
+			rotation={ 0.000000 -0.544914 0.000000 0.838492 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=9792
+			position={ 6797.000000 0.000000 2575.000000 }
+			rotation={ 0.000000 -0.707107 0.000000 0.707107 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=9793
+			position={ 6908.000000 0.000000 2519.000000 }
+			rotation={ 0.000000 0.861871 0.000000 0.507128 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=9794
+			position={ 6803.000000 0.000000 2599.000000 }
+			rotation={ 0.000000 -0.544914 0.000000 0.838492 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=9795
+			position={ 6842.000000 0.000000 2589.000000 }
+			rotation={ 0.000000 0.773342 0.000000 0.633989 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=9796
+			position={ 6806.000000 0.000000 2538.000000 }
+			rotation={ 0.000000 -0.981956 0.000000 0.189108 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
 		{
 			id=9797
 			position={ 1316.835205 0.000000 2798.685547 }
@@ -74975,12 +75095,6 @@
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
-		{
-			id=12946
-			position={ 0.000000 0.000000 -3.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
 		{
 			id=12947
 			position={ 7058.000000 0.000000 2216.000000 }
@@ -77195,6 +77309,12 @@
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
+		{
+			id=13422
+			position={ 7180.000000 0.000000 2802.000000 }
+			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
 		{
 			id=13423
 			position={ 6516.000000 0.000000 2448.000000 }
@@ -78341,12 +78461,6 @@
 			rotation={ -0.000000 0.575791 -0.000000 0.817597 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
-		{
-			id=13614
-			position={ 1653.000000 0.000000 698.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
 		{
 			id=13615
 			position={ 2049.820312 0.000000 3478.229736 }
diff --git a/gfx/map/map_object_data/player_stack_locators.txt b/gfx/map/map_object_data/player_stack_locators.txt
index 0e33b03b..8965bad8 100644
--- a/gfx/map/map_object_data/player_stack_locators.txt
+++ b/gfx/map/map_object_data/player_stack_locators.txt
@@ -11,6 +11,48 @@
 			rotation={ 0.000000 0.000000 0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
+		{
+			id=0
+			position={ 1332.000000 0.000000 2954.000000 }
+			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=0
+			position={ 7543.659180 0.000000 4317.460938 }
+			rotation={ 0.000000 0.936860 0.000000 -0.349706 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=0
+			position={ 7536.800293 0.000000 4299.077637 }
+			rotation={ 0.000000 0.936860 0.000000 -0.349706 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=0
+			position={ 7032.426758 0.000000 3332.635498 }
+			rotation={ 0.000000 0.936860 0.000000 -0.349706 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=0
+			position={ 6426.332520 0.000000 2450.125732 }
+			rotation={ 0.000000 0.936860 0.000000 -0.349706 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=0
+			position={ 6430.458496 0.000000 2452.395752 }
+			rotation={ 0.000000 0.936860 0.000000 -0.349706 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=0
+			position={ 6435.306152 0.000000 2462.136230 }
+			rotation={ 0.000000 0.936860 0.000000 -0.349706 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
 		{
 			id=1
 			position={ 274.573578 0.000000 4469.125977 }
@@ -1093,7 +1135,7 @@
 		}
 		{
 			id=181
-			position={ 2278.705811 0.000000 3941.878174 }
+			position={ 2281.782471 0.000000 3932.631348 }
 			rotation={ -0.000000 -0.431425 -0.000000 0.902149 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -1279,7 +1321,7 @@
 		}
 		{
 			id=212
-			position={ 2098.226318 0.000000 3980.970459 }
+			position={ 2114.831055 0.000000 4003.762939 }
 			rotation={ -0.000000 -0.216440 -0.000000 0.976296 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -1291,7 +1333,7 @@
 		}
 		{
 			id=214
-			position={ 2012.816284 0.000000 4017.012695 }
+			position={ 2009.553345 0.000000 4012.029785 }
 			rotation={ -0.000000 -0.216440 -0.000000 0.976296 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -2347,7 +2389,7 @@
 		}
 		{
 			id=392
-			position={ 2000.978271 0.000000 4450.933594 }
+			position={ 2057.310059 0.000000 4421.281250 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -2509,13 +2551,13 @@
 		}
 		{
 			id=419
-			position={ 2240.769775 0.000000 4295.705078 }
+			position={ 2216.157471 0.000000 4276.818359 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=420
-			position={ 2222.201172 0.000000 4241.125977 }
+			position={ 2251.222656 0.000000 4235.023438 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -2671,7 +2713,7 @@
 		}
 		{
 			id=446
-			position={ 2220.684082 0.000000 4161.814941 }
+			position={ 2207.137451 0.000000 4151.129395 }
 			rotation={ -0.000000 0.011936 -0.000000 0.999929 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -3887,18 +3929,6 @@
 			rotation={ -0.000000 -0.420024 -0.000000 0.907513 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
-		{
-			id=650
-			position={ 2154.189697 0.000000 4058.070312 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=651
-			position={ 2230.833252 0.000000 4040.270508 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
 		{
 			id=661
 			position={ 2455.421387 0.000000 4488.642578 }
@@ -8081,18 +8111,6 @@
 			rotation={ -0.000000 -0.216440 -0.000000 0.976296 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
-		{
-			id=1469
-			position={ 1892.000000 0.000000 3492.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=1470
-			position={ 1932.000000 0.000000 3343.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
 		{
 			id=1472
 			position={ 1717.000000 0.000000 4000.000000 }
@@ -18557,6 +18575,12 @@
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
+		{
+			id=3257
+			position={ 1790.000000 0.000000 2944.000000 }
+			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
 		{
 			id=3258
 			position={ 1197.127808 0.000000 2729.570801 }
@@ -50395,7 +50419,7 @@
 		}
 		{
 			id=8784
-			position={ 2050.649414 0.000000 4326.528809 }
+			position={ 2024.000000 0.000000 4348.000000 }
 			rotation={ 0.000000 0.758000 0.000000 0.652254 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -50549,6 +50573,30 @@
 			rotation={ 0.000000 0.544914 0.000000 0.838492 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
+		{
+			id=8810
+			position={ 7116.000000 0.000000 2166.000000 }
+			rotation={ 0.000000 0.995427 0.000000 0.095524 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=8811
+			position={ 7106.000000 0.000000 2151.000000 }
+			rotation={ 0.000000 0.804687 0.000000 0.593700 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=8812
+			position={ 7135.000000 0.000000 2205.000000 }
+			rotation={ 0.000000 0.970837 0.000000 -0.239739 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=8813
+			position={ 7181.000000 0.000000 2214.000000 }
+			rotation={ 0.000000 0.496745 0.000000 -0.867897 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
 		{
 			id=8814
 			position={ 7217.000000 0.000000 2209.000000 }
@@ -56159,6 +56207,12 @@
 			rotation={ 0.000000 0.934561 0.000000 0.355804 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
+		{
+			id=9759
+			position={ 6533.000000 0.000000 2317.000000 }
+			rotation={ 0.000000 0.709778 0.000000 -0.704426 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
 		{
 			id=9760
 			position={ 1839.605957 0.000000 2453.781494 }
@@ -56303,12 +56357,78 @@
 			rotation={ 0.000000 0.315154 0.000000 -0.949041 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
+		{
+			id=9785
+			position={ 6693.000000 0.000000 1966.000000 }
+			rotation={ 0.000000 0.853570 0.000000 0.520978 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
 		{
 			id=9786
 			position={ 1459.967407 0.000000 2854.805176 }
 			rotation={ 0.000000 0.842628 0.000000 -0.538496 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
+		{
+			id=9787
+			position={ 6691.000000 0.000000 2576.000000 }
+			rotation={ 0.000000 0.437122 0.000000 0.899402 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=9788
+			position={ 6674.000000 0.000000 2585.000000 }
+			rotation={ 0.000000 0.990414 0.000000 0.138128 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=9789
+			position={ 6651.000000 0.000000 2591.000000 }
+			rotation={ 0.000000 0.782862 0.000000 -0.622196 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=9790
+			position={ 6728.000000 0.000000 2565.000000 }
+			rotation={ 0.000000 0.910015 0.000000 -0.414575 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=9791
+			position={ 6769.000000 0.000000 2555.000000 }
+			rotation={ 0.000000 0.330355 0.000000 0.943857 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=9792
+			position={ 6771.000000 0.000000 2577.000000 }
+			rotation={ 0.000000 0.224139 0.000000 0.974557 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=9793
+			position={ 6945.000000 0.000000 2526.000000 }
+			rotation={ 0.000000 0.989068 0.000000 -0.147458 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=9794
+			position={ 6798.000000 0.000000 2598.000000 }
+			rotation={ 0.000000 0.998841 0.000000 -0.048129 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=9795
+			position={ 6865.000000 0.000000 2583.000000 }
+			rotation={ 0.000000 0.451332 0.000000 0.892356 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=9796
+			position={ 6810.000000 0.000000 2558.000000 }
+			rotation={ 0.000000 0.958820 0.000000 0.284013 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
 		{
 			id=9797
 			position={ 1324.786621 0.000000 2804.170166 }
@@ -74975,12 +75095,6 @@
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
-		{
-			id=12946
-			position={ 0.000000 0.000000 0.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
 		{
 			id=12947
 			position={ 7062.000000 0.000000 2183.000000 }
@@ -77195,6 +77309,12 @@
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
+		{
+			id=13422
+			position={ 7180.000000 0.000000 2805.000000 }
+			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
 		{
 			id=13423
 			position={ 6516.000000 0.000000 2451.000000 }
@@ -78341,12 +78461,6 @@
 			rotation={ -0.000000 0.947614 -0.000000 0.319417 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
-		{
-			id=13614
-			position={ 1653.000000 0.000000 701.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
 		{
 			id=13615
 			position={ 2054.544922 0.000000 3482.105713 }
diff --git a/gfx/map/map_object_data/siege_locators.txt b/gfx/map/map_object_data/siege_locators.txt
index 8282703c..c9f0fcad 100644
--- a/gfx/map/map_object_data/siege_locators.txt
+++ b/gfx/map/map_object_data/siege_locators.txt
@@ -5,6 +5,60 @@
 	generated_content=no
 	layer="unit_layer"
 	instances={
+		{
+			id=0
+			position={ 15739.251953 0.000000 13337.930664 }
+			rotation={ -0.000000 0.911777 -0.000000 0.410684 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=0
+			position={ 7676.321289 0.000000 4529.926270 }
+			rotation={ 0.000000 0.666921 0.000000 0.745128 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=0
+			position={ 7659.654297 0.000000 4497.133789 }
+			rotation={ 0.000000 0.666921 0.000000 0.745128 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=0
+			position={ 7537.659180 0.000000 4307.460938 }
+			rotation={ 0.000000 0.666921 0.000000 0.745128 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=0
+			position={ 7530.800293 0.000000 4289.077637 }
+			rotation={ 0.000000 0.666921 0.000000 0.745128 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=0
+			position={ 7026.426758 0.000000 3322.635498 }
+			rotation={ 0.000000 0.666921 0.000000 0.745128 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=0
+			position={ 6420.332520 0.000000 2440.125732 }
+			rotation={ 0.000000 0.666921 0.000000 0.745128 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=0
+			position={ 6424.458496 0.000000 2442.395752 }
+			rotation={ 0.000000 0.666921 0.000000 0.745128 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=0
+			position={ 6429.306152 0.000000 2452.136230 }
+			rotation={ 0.000000 0.666921 0.000000 0.745128 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
 		{
 			id=1
 			position={ 280.866028 0.000000 4465.129883 }
@@ -1285,8 +1339,8 @@
 		}
 		{
 			id=214
-			position={ 2007.931152 0.000000 4020.511719 }
-			rotation={ -0.000000 -0.188342 -0.000000 -0.982104 }
+			position={ 2026.000000 0.000000 4010.000000 }
+			rotation={ -0.000000 -0.674338 -0.000000 0.738423 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
@@ -2293,7 +2347,7 @@
 		}
 		{
 			id=384
-			position={ 2022.431030 0.000000 4389.090820 }
+			position={ 1996.022095 0.000000 4425.070801 }
 			rotation={ -0.000000 0.395411 -0.000000 0.918504 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -2341,7 +2395,7 @@
 		}
 		{
 			id=392
-			position={ 1988.468750 0.000000 4450.914062 }
+			position={ 2044.800537 0.000000 4421.261719 }
 			rotation={ -0.000000 0.398702 -0.000000 0.917081 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -2503,7 +2557,7 @@
 		}
 		{
 			id=419
-			position={ 2256.547119 0.000000 4274.333008 }
+			position={ 2222.256348 0.000000 4282.178711 }
 			rotation={ -0.000000 -0.000025 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -2641,7 +2695,7 @@
 		}
 		{
 			id=442
-			position={ 2045.139038 0.000000 4088.333740 }
+			position={ 2062.174316 0.000000 4074.319580 }
 			rotation={ -0.000000 0.862541 -0.000000 -0.505988 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -2665,7 +2719,7 @@
 		}
 		{
 			id=446
-			position={ 2223.183838 0.000000 4153.471680 }
+			position={ 2209.637207 0.000000 4142.786133 }
 			rotation={ -0.000000 0.912944 -0.000000 -0.408085 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -3743,18 +3797,6 @@
 			rotation={ 0.000000 0.898315 0.000000 -0.439351 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
-		{
-			id=650
-			position={ 2134.633789 0.000000 4069.343018 }
-			rotation={ -0.000000 -0.000025 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=651
-			position={ 2224.693115 0.000000 4064.955566 }
-			rotation={ -0.000000 -0.000025 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
 		{
 			id=668
 			position={ 3562.000000 0.000000 2536.000000 }
@@ -6539,18 +6581,6 @@
 			rotation={ 0.000000 0.981956 0.000000 -0.189108 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
-		{
-			id=1469
-			position={ 1895.000000 0.000000 3492.000000 }
-			rotation={ -0.000000 -0.000025 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=1470
-			position={ 1935.000000 0.000000 3343.000000 }
-			rotation={ -0.000000 -0.000025 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
 		{
 			id=1499
 			position={ 873.085938 0.000000 3516.552246 }
@@ -16679,6 +16709,12 @@
 			rotation={ -0.000000 -0.000025 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
+		{
+			id=3257
+			position={ 1793.000000 0.000000 2944.000000 }
+			rotation={ -0.000000 -0.000025 -0.000000 1.000000 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
 		{
 			id=3258
 			position={ 1191.127808 0.000000 2716.570801 }
@@ -47419,13 +47455,13 @@
 		}
 		{
 			id=8784
-			position={ 2072.649414 0.000000 4324.528809 }
+			position={ 2046.000000 0.000000 4346.000000 }
 			rotation={ 0.000000 -0.923880 0.000000 0.382683 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=8785
-			position={ 2099.350098 0.000000 4318.534180 }
+			position={ 2089.000000 0.000000 4313.000000 }
 			rotation={ 0.000000 -0.484769 0.000000 0.874642 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -47573,6 +47609,36 @@
 			rotation={ -0.000000 -0.291913 -0.000000 0.956445 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
+		{
+			id=8809
+			position={ 7221.000000 0.000000 2372.000000 }
+			rotation={ 0.000000 -0.671005 0.000000 0.741453 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=8810
+			position={ 7128.000000 0.000000 2180.000000 }
+			rotation={ 0.000000 -0.633989 0.000000 0.773342 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=8811
+			position={ 7097.000000 0.000000 2137.000000 }
+			rotation={ 0.000000 0.998759 0.000000 0.049814 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=8812
+			position={ 7125.000000 0.000000 2205.000000 }
+			rotation={ 0.000000 -0.447214 0.000000 0.894427 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=8813
+			position={ 7187.000000 0.000000 2235.000000 }
+			rotation={ 0.000000 0.049814 0.000000 0.998759 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
 		{
 			id=8814
 			position={ 7198.000000 0.000000 2182.000000 }
@@ -53171,6 +53237,12 @@
 			rotation={ 0.000000 -0.948683 0.000000 0.316228 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
+		{
+			id=9759
+			position={ 6533.000000 0.000000 2314.000000 }
+			rotation={ 0.000000 0.968028 0.000000 0.250841 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
 		{
 			id=9760
 			position={ 1831.605957 0.000000 2454.781494 }
@@ -53315,12 +53387,78 @@
 			rotation={ 0.000000 0.948683 0.000000 0.316228 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
+		{
+			id=9785
+			position={ 6718.000000 0.000000 1949.000000 }
+			rotation={ 0.000000 -0.707107 0.000000 0.707107 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
 		{
 			id=9786
 			position={ 1460.121460 0.000000 2857.995605 }
 			rotation={ -0.000000 0.987375 -0.000000 0.158401 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
+		{
+			id=9787
+			position={ 6704.000000 0.000000 2582.000000 }
+			rotation={ 0.000000 0.894427 0.000000 0.447214 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=9788
+			position={ 6695.000000 0.000000 2608.000000 }
+			rotation={ 0.000000 -0.207591 0.000000 0.978216 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=9789
+			position={ 6659.000000 0.000000 2591.000000 }
+			rotation={ 0.000000 -0.316228 0.000000 0.948683 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=9790
+			position={ 6738.000000 0.000000 2568.000000 }
+			rotation={ 0.000000 0.978216 0.000000 0.207591 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=9791
+			position={ 6764.000000 0.000000 2556.000000 }
+			rotation={ 0.000000 0.633989 0.000000 0.773342 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=9792
+			position={ 6777.000000 0.000000 2575.000000 }
+			rotation={ 0.000000 0.707107 0.000000 0.707107 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=9793
+			position={ 6927.000000 0.000000 2524.000000 }
+			rotation={ 0.000000 -0.707107 0.000000 0.707107 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=9794
+			position={ 6784.000000 0.000000 2593.000000 }
+			rotation={ 0.000000 0.773342 0.000000 0.633989 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=9795
+			position={ 6856.000000 0.000000 2600.000000 }
+			rotation={ 0.000000 -0.207591 0.000000 0.978216 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=9796
+			position={ 6801.000000 0.000000 2558.000000 }
+			rotation={ 0.000000 0.049814 0.000000 0.998759 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
 		{
 			id=9797
 			position={ 1322.963623 0.000000 2798.854492 }
@@ -70397,12 +70535,6 @@
 			rotation={ -0.000000 -0.000025 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
-		{
-			id=12946
-			position={ 3.000000 0.000000 0.000000 }
-			rotation={ -0.000000 -0.000025 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
 		{
 			id=12947
 			position={ 7058.000000 0.000000 2196.000000 }
@@ -72581,6 +72713,12 @@
 			rotation={ -0.000000 -0.000025 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
+		{
+			id=13422
+			position={ 7183.000000 0.000000 2805.000000 }
+			rotation={ -0.000000 -0.000025 -0.000000 1.000000 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
 		{
 			id=13423
 			position={ 6519.000000 0.000000 2451.000000 }
@@ -73715,12 +73853,6 @@
 			rotation={ -0.000000 -0.000025 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
-		{
-			id=13614
-			position={ 1656.000000 0.000000 701.000000 }
-			rotation={ -0.000000 -0.000025 -0.000000 1.000000 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
 		{
 			id=13615
 			position={ 2055.685547 0.000000 3487.874512 }
diff --git a/gfx/map/map_object_data/special_building_locators.txt b/gfx/map/map_object_data/special_building_locators.txt
index 1d28bf9a..5810a7a6 100644
--- a/gfx/map/map_object_data/special_building_locators.txt
+++ b/gfx/map/map_object_data/special_building_locators.txt
@@ -1,4 +1,4 @@
-game_object_locator={
+game_object_locator={
 	name="special_building"
 	render_pass=Map
 	clamp_to_water_level=yes
@@ -3743,18 +3743,6 @@ game_object_locator={
 			rotation={ -0.000000 -0.821011 -0.000000 -0.570911 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
-		{
-			id=650
-			position={ 2144.000000 0.000000 4049.000000 }
-			rotation={ -0.000000 -0.987597 -0.000000 0.157013 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=651
-			position={ 2221.000000 0.000000 4035.000000 }
-			rotation={ -0.000000 -0.110778 -0.000000 -0.993845 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
 		{
 			id=668
 			position={ 3559.284180 0.000000 2542.616211 }
@@ -6539,18 +6527,6 @@ game_object_locator={
 			rotation={ -0.000000 -0.231504 -0.000000 0.972834 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
-		{
-			id=1469
-			position={ 1892.000000 0.000000 3492.000000 }
-			rotation={ -0.000000 -0.908579 -0.000000 0.417712 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=1470
-			position={ 1932.000000 0.000000 3343.000000 }
-			rotation={ -0.000000 -0.688511 -0.000000 -0.725226 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
 		{
 			id=1499
 			position={ 870.017517 0.000000 3507.880615 }
@@ -16667,18 +16643,18 @@ game_object_locator={
 			rotation={ -0.000000 -0.581363 -0.000000 -0.813644 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
-		{
-			id=3222
-			position={ 811.000000 0.000000 3021.000000 }
-			rotation={ -0.000000 -0.281626 -0.000000 0.959524 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
 		{
 			id=3256
 			position={ 1280.000000 0.000000 2636.000000 }
 			rotation={ -0.000000 -0.987597 -0.000000 0.157013 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
+		{
+			id=3257
+			position={ 1790.000000 0.000000 2944.000000 }
+			rotation={ -0.000000 -0.110778 -0.000000 -0.993845 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
 		{
 			id=3258
 			position={ 1189.367310 0.000000 2767.796387 }
@@ -44687,6 +44663,12 @@ game_object_locator={
 			rotation={ -0.000000 -0.934650 -0.000000 -0.355567 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
+		{
+			id=8121
+			position={ 1631.131470 0.000000 703.645996 }
+			rotation={ -0.000000 -0.902620 -0.000000 -0.430440 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
 		{
 			id=8122
 			position={ 1659.422363 0.000000 643.181152 }
@@ -47519,468 +47501,6 @@ game_object_locator={
 			rotation={ -0.000000 -0.848475 -0.000000 0.529235 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
-		{
-			id=8802
-			position={ 728.000000 0.000000 3024.000000 }
-			rotation={ -0.000000 -0.715077 -0.000000 -0.699046 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8803
-			position={ 747.000000 0.000000 3051.000000 }
-			rotation={ -0.000000 -0.754782 -0.000000 0.655975 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8804
-			position={ 1408.000000 0.000000 2679.000000 }
-			rotation={ -0.000000 -0.940512 -0.000000 0.339759 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8805
-			position={ 1387.000000 0.000000 2747.000000 }
-			rotation={ -0.000000 -0.988946 -0.000000 0.148275 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8806
-			position={ 1589.000000 0.000000 2847.000000 }
-			rotation={ -0.000000 -0.593636 -0.000000 -0.804734 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8807
-			position={ 1615.000000 0.000000 2866.000000 }
-			rotation={ -0.000000 -0.237407 -0.000000 0.971410 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8808
-			position={ 1608.000000 0.000000 2849.000000 }
-			rotation={ -0.000000 -0.717062 -0.000000 -0.697009 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8809
-			position={ 1625.000000 0.000000 2859.000000 }
-			rotation={ -0.000000 -0.953778 -0.000000 -0.300511 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8814
-			position={ 2032.000000 0.000000 3281.000000 }
-			rotation={ -0.000000 -0.199190 -0.000000 0.979961 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8815
-			position={ 2142.000000 0.000000 3306.000000 }
-			rotation={ -0.000000 -0.768259 -0.000000 -0.640139 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8816
-			position={ 2165.000000 0.000000 3450.000000 }
-			rotation={ -0.000000 -0.955662 -0.000000 0.294467 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8817
-			position={ 2175.000000 0.000000 3428.000000 }
-			rotation={ -0.000000 -0.366340 -0.000000 -0.930481 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8818
-			position={ 2139.000000 0.000000 3359.000000 }
-			rotation={ -0.000000 -0.990080 -0.000000 -0.140501 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8819
-			position={ 2168.000000 0.000000 3227.000000 }
-			rotation={ -0.000000 -0.915090 -0.000000 -0.403250 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8820
-			position={ 2149.000000 0.000000 3209.000000 }
-			rotation={ -0.000000 -0.979391 -0.000000 0.201973 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8821
-			position={ 2158.000000 0.000000 3277.000000 }
-			rotation={ -0.000000 -0.297214 -0.000000 0.954811 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8822
-			position={ 2192.000000 0.000000 3255.000000 }
-			rotation={ -0.000000 -0.294071 -0.000000 0.955784 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8823
-			position={ 2202.000000 0.000000 3176.000000 }
-			rotation={ -0.000000 -0.154000 -0.000000 0.988071 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8824
-			position={ 2064.000000 0.000000 3217.000000 }
-			rotation={ -0.000000 -0.654115 -0.000000 0.756395 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8825
-			position={ 2082.000000 0.000000 3204.000000 }
-			rotation={ -0.000000 -0.992960 -0.000000 -0.118454 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8826
-			position={ 2137.000000 0.000000 3102.000000 }
-			rotation={ -0.000000 -0.148980 -0.000000 -0.988840 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8827
-			position={ 2060.000000 0.000000 3113.000000 }
-			rotation={ -0.000000 -0.913270 -0.000000 0.407354 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8828
-			position={ 1962.000000 0.000000 3111.000000 }
-			rotation={ -0.000000 -0.450278 -0.000000 0.892888 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8829
-			position={ 1918.000000 0.000000 3136.000000 }
-			rotation={ -0.000000 -0.822084 -0.000000 0.569366 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8830
-			position={ 2005.000000 0.000000 3126.000000 }
-			rotation={ -0.000000 -0.982182 -0.000000 0.187931 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8831
-			position={ 2571.000000 0.000000 2482.000000 }
-			rotation={ -0.000000 -0.631227 -0.000000 -0.775598 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8832
-			position={ 2520.000000 0.000000 2476.000000 }
-			rotation={ -0.000000 -0.281281 -0.000000 -0.959626 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8833
-			position={ 2488.000000 0.000000 2464.000000 }
-			rotation={ -0.000000 -0.838904 -0.000000 0.544280 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8834
-			position={ 3455.000000 0.000000 2687.000000 }
-			rotation={ -0.000000 -0.996040 -0.000000 -0.088907 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8835
-			position={ 3470.000000 0.000000 2662.000000 }
-			rotation={ -0.000000 -0.641479 -0.000000 -0.767140 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8836
-			position={ 3423.000000 0.000000 2645.000000 }
-			rotation={ -0.000000 -0.414964 -0.000000 -0.909838 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8837
-			position={ 3437.000000 0.000000 2669.000000 }
-			rotation={ -0.000000 -0.965479 -0.000000 -0.260482 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8838
-			position={ 3450.000000 0.000000 2645.000000 }
-			rotation={ -0.000000 -0.990764 -0.000000 0.135597 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8839
-			position={ 3438.000000 0.000000 2625.000000 }
-			rotation={ -0.000000 -0.217983 -0.000000 -0.975953 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8840
-			position={ 3487.000000 0.000000 2594.000000 }
-			rotation={ -0.000000 -0.468681 -0.000000 -0.883368 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8841
-			position={ 3508.000000 0.000000 2598.000000 }
-			rotation={ -0.000000 -0.385712 -0.000000 -0.922619 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8842
-			position={ 3465.000000 0.000000 2631.000000 }
-			rotation={ -0.000000 -0.712547 -0.000000 0.701624 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8843
-			position={ 3477.000000 0.000000 2615.000000 }
-			rotation={ -0.000000 -0.347681 -0.000000 0.937613 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8844
-			position={ 3434.000000 0.000000 2702.000000 }
-			rotation={ -0.000000 -0.220390 -0.000000 0.975412 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8845
-			position={ 3453.000000 0.000000 2718.000000 }
-			rotation={ -0.000000 -0.688882 -0.000000 0.724873 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8846
-			position={ 3421.000000 0.000000 2775.000000 }
-			rotation={ -0.000000 -0.373816 -0.000000 -0.927503 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8847
-			position={ 3383.000000 0.000000 2749.000000 }
-			rotation={ -0.000000 -0.999904 -0.000000 0.013841 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8848
-			position={ 3386.000000 0.000000 2792.000000 }
-			rotation={ -0.000000 -0.271490 -0.000000 0.962441 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8849
-			position={ 3403.000000 0.000000 2757.000000 }
-			rotation={ -0.000000 -0.997370 -0.000000 -0.072477 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8850
-			position={ 3374.000000 0.000000 2697.000000 }
-			rotation={ -0.000000 -0.954281 -0.000000 -0.298911 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8851
-			position={ 3404.000000 0.000000 2699.000000 }
-			rotation={ -0.000000 -0.667255 -0.000000 0.744829 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8852
-			position={ 3381.000000 0.000000 2721.000000 }
-			rotation={ -0.000000 -0.884690 -0.000000 0.466180 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8853
-			position={ 3359.000000 0.000000 2669.000000 }
-			rotation={ -0.000000 -0.849464 -0.000000 0.527646 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8854
-			position={ 3343.000000 0.000000 2699.000000 }
-			rotation={ -0.000000 -0.452056 -0.000000 0.891989 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8855
-			position={ 3343.000000 0.000000 2722.000000 }
-			rotation={ -0.000000 -0.915914 -0.000000 0.401373 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8856
-			position={ 3342.000000 0.000000 2663.000000 }
-			rotation={ -0.000000 -0.935943 -0.000000 0.352153 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8857
-			position={ 3329.000000 0.000000 2681.000000 }
-			rotation={ -0.000000 -0.963010 -0.000000 0.269465 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8858
-			position={ 3320.000000 0.000000 2651.000000 }
-			rotation={ -0.000000 -0.980071 -0.000000 -0.198646 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8859
-			position={ 3303.000000 0.000000 2669.000000 }
-			rotation={ -0.000000 -0.927982 -0.000000 0.372626 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8860
-			position={ 3214.000000 0.000000 2746.000000 }
-			rotation={ -0.000000 -0.256329 -0.000000 0.966590 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8861
-			position={ 3220.000000 0.000000 2720.000000 }
-			rotation={ -0.000000 -0.898512 -0.000000 0.438949 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8862
-			position={ 3190.000000 0.000000 2748.000000 }
-			rotation={ -0.000000 -0.359293 -0.000000 -0.933225 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8863
-			position={ 3245.000000 0.000000 2699.000000 }
-			rotation={ -0.000000 -0.988664 -0.000000 -0.150147 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8864
-			position={ 3249.000000 0.000000 2718.000000 }
-			rotation={ -0.000000 -0.293745 -0.000000 0.955884 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8865
-			position={ 3279.000000 0.000000 2683.000000 }
-			rotation={ -0.000000 -0.724658 -0.000000 0.689109 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8866
-			position={ 3191.000000 0.000000 2715.000000 }
-			rotation={ -0.000000 -0.806442 -0.000000 -0.591313 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8867
-			position={ 3175.000000 0.000000 2729.000000 }
-			rotation={ -0.000000 -0.828638 -0.000000 -0.559785 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8868
-			position={ 3206.000000 0.000000 2700.000000 }
-			rotation={ -0.000000 -0.837298 -0.000000 -0.546747 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8869
-			position={ 3156.000000 0.000000 2725.000000 }
-			rotation={ -0.000000 -0.988560 -0.000000 0.150830 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8870
-			position={ 3310.000000 0.000000 2724.000000 }
-			rotation={ -0.000000 -0.321068 -0.000000 0.947056 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8871
-			position={ 3277.000000 0.000000 2713.000000 }
-			rotation={ -0.000000 -0.874268 -0.000000 0.485443 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8872
-			position={ 3076.000000 0.000000 2730.000000 }
-			rotation={ -0.000000 -0.793146 -0.000000 -0.609031 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8873
-			position={ 3052.000000 0.000000 2750.000000 }
-			rotation={ -0.000000 -0.995079 -0.000000 0.099088 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8874
-			position={ 3082.000000 0.000000 2756.000000 }
-			rotation={ -0.000000 -0.372962 -0.000000 -0.927847 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8875
-			position={ 3105.000000 0.000000 2718.000000 }
-			rotation={ -0.000000 -0.994008 -0.000000 0.109307 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8876
-			position={ 3017.000000 0.000000 2759.000000 }
-			rotation={ -0.000000 -0.121546 -0.000000 0.992586 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8877
-			position={ 3013.000000 0.000000 2788.000000 }
-			rotation={ -0.000000 -0.254985 -0.000000 0.966945 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8878
-			position={ 3033.000000 0.000000 2778.000000 }
-			rotation={ -0.000000 -0.618200 -0.000000 0.786021 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8879
-			position={ 2988.000000 0.000000 2793.000000 }
-			rotation={ -0.000000 -0.722298 -0.000000 -0.691582 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8880
-			position={ 3041.000000 0.000000 2808.000000 }
-			rotation={ -0.000000 -0.650820 -0.000000 -0.759232 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8881
-			position={ 3042.000000 0.000000 2823.000000 }
-			rotation={ -0.000000 -0.934242 -0.000000 0.356640 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=8882
-			position={ 2981.000000 0.000000 2808.000000 }
-			rotation={ -0.000000 -0.893739 -0.000000 -0.448587 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
 		{
 			id=8993
 			position={ 1323.531860 0.000000 1013.522034 }
@@ -52577,12 +52097,78 @@ game_object_locator={
 			rotation={ -0.000000 -0.997422 -0.000000 0.071759 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
+		{
+			id=9785
+			position={ 6700.000000 0.000000 1954.000000 }
+			rotation={ -0.000000 -0.928244 -0.000000 0.371971 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
 		{
 			id=9786
 			position={ 6763.000000 0.000000 2603.000000 }
 			rotation={ -0.000000 -0.788558 -0.000000 -0.614960 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
+		{
+			id=9787
+			position={ 6697.000000 0.000000 2577.000000 }
+			rotation={ -0.000000 -0.786732 -0.000000 0.617295 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=9788
+			position={ 6681.000000 0.000000 2591.000000 }
+			rotation={ -0.000000 -0.801205 -0.000000 -0.598390 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=9789
+			position={ 6652.000000 0.000000 2591.000000 }
+			rotation={ -0.000000 -0.958482 -0.000000 -0.285154 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=9790
+			position={ 6737.000000 0.000000 2571.000000 }
+			rotation={ -0.000000 -0.824364 -0.000000 0.566060 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=9791
+			position={ 6769.000000 0.000000 2555.000000 }
+			rotation={ -0.000000 -0.616796 -0.000000 0.787123 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=9792
+			position={ 6778.000000 0.000000 2576.000000 }
+			rotation={ -0.000000 -0.978356 -0.000000 0.206929 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=9793
+			position={ 6916.000000 0.000000 2522.000000 }
+			rotation={ -0.000000 -0.315057 -0.000000 -0.949073 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=9794
+			position={ 6797.000000 0.000000 2596.000000 }
+			rotation={ -0.000000 -0.705396 -0.000000 0.708814 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=9795
+			position={ 6845.000000 0.000000 2591.000000 }
+			rotation={ -0.000000 -0.427844 -0.000000 0.903853 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
+		{
+			id=9796
+			position={ 6803.000000 0.000000 2549.000000 }
+			rotation={ -0.000000 -0.683295 -0.000000 -0.730143 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
 		{
 			id=9797
 			position={ 6857.000000 0.000000 2520.000000 }
@@ -68825,6 +68411,12 @@ game_object_locator={
 			rotation={ -0.000000 -0.891257 -0.000000 0.453499 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
+		{
+			id=13422
+			position={ 7180.000000 0.000000 2805.000000 }
+			rotation={ -0.000000 -0.481383 -0.000000 0.876510 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
 		{
 			id=13423
 			position={ 6516.000000 0.000000 2451.000000 }
@@ -69617,6 +69209,12 @@ game_object_locator={
 			rotation={ -0.000000 -0.869484 -0.000000 0.493961 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
+		{
+			id=13555
+			position={ 6861.000000 0.000000 2127.000000 }
+			rotation={ -0.000000 -0.286034 -0.000000 -0.958220 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
 		{
 			id=13556
 			position={ 7100.000000 0.000000 2146.000000 }
@@ -69953,29 +69551,5 @@ game_object_locator={
 			rotation={ -0.000000 -0.632632 -0.000000 -0.774452 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
-		{
-			id=13614
-			position={ 1653.000000 0.000000 701.000000 }
-			rotation={ -0.000000 -0.643726 -0.000000 0.765256 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=13615
-			position={ 2050.000000 0.000000 3483.000000 }
-			rotation={ -0.000000 -0.964936 -0.000000 -0.262487 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=13616
-			position={ 2026.000000 0.000000 3515.000000 }
-			rotation={ -0.000000 -0.900174 -0.000000 -0.435531 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
-		{
-			id=13617
-			position={ 2085.000000 0.000000 3480.000000 }
-			rotation={ -0.000000 -0.106053 -0.000000 0.994360 }
-			scale={ 1.000000 1.000000 1.000000 }
-		}
 	}
 }
diff --git a/history/provinces/e_finland.txt b/history/provinces/e_finland.txt
index 98753b87..82278740 100644
--- a/history/provinces/e_finland.txt
+++ b/history/provinces/e_finland.txt
@@ -87,8 +87,8 @@
 
 }
 
-# 178 - SALO
-178 = {	# 178 - SALO
+# 178 - RIKALA
+178 = {	# 178 - RIKALA
 	
 	# Misc
 	culture = finnish
@@ -117,8 +117,8 @@
 
 }
 
-# 180 - UUSIKAUPUNKI
-180 = {	# 180 - UUSIKAUPUNKI
+# 180 - RAUMA
+180 = {	# 180 - RAUMA
 	
 	# Misc
 	culture = finnish
@@ -335,7 +335,7 @@
 	# Misc
 	culture = finnish
 	religion = lutheran
-	holding = tribal_holding
+	holding = none
 	
 	# History
 	1158.1.1 = { religion = lutheran }	#Northern Crusades
@@ -490,33 +490,6 @@
 
 }
 
-650 = {
-	
-	# Misc
-	culture = finnish
-	religion = lutheran
-	terrain = forest
-	holding = none
-	
-	# History
-	1250.1.1 = { religion = lutheran }	#Northern Crusades
-
-}
-
-651 = {
-	
-	# Misc
-	culture = finnish
-	religion = lutheran
-	terrain = forest
-	holding = none
-	
-	# History
-	1250.1.1 = { religion = lutheran }	#Northern Crusades
-
-}
-
-
 # 210 - VUOHIJARVI
 210 = {	# 210 - VUOHIJARVI
 	
@@ -524,7 +497,7 @@
 	culture = finnish
 	religion = lutheran
 	terrain = forest
-	holding = tribal_holding
+	holding = none
 	
 	# History
 	1250.1.1 = { religion = lutheran }	#Northern Crusades
@@ -567,7 +540,7 @@
 213 = {	# 213 - MUSTASAARI
 	
 	# Misc
-	culture = swedish
+	culture = finnish
 	religion = lutheran
 	
 	holding = tribal_holding
@@ -581,7 +554,7 @@
 214 = {	# 214 - MERIKARVIA
 	
 	# Misc
-	culture = swedish
+	culture = finnish
 	religion = lutheran
 	terrain = forest
 	holding = none
@@ -659,7 +632,7 @@
 442 = {	# 442 - PEDERSORE
 	
 	# Misc
-	culture = swedish
+	culture = finnish
 	religion = lutheran
 	
 	holding = tribal_holding
diff --git a/localization/english/replace/titles_cultural_names_l_english.yml b/localization/english/replace/titles_cultural_names_l_english.yml
index 6683a33e..50d0ecad 100644
--- a/localization/english/replace/titles_cultural_names_l_english.yml
+++ b/localization/english/replace/titles_cultural_names_l_english.yml
@@ -5282,16 +5282,3 @@
  #Albanian
  cn_shqiperia:0 "Shqipëria" 
  cn_epiri_i_veriut:0 "Epiri i Veriut"
-
- #Finland
- cn_vasterbotten:0 "Västerbotten"
- cn_vasterbotten_adj:0 "Västerbottenian"
- cn_lansipohja:0 "Länsipohja"
- cn_lansipohja_adj:0 "Länsipohjan"
- cn_umea:0 "Umeå"
- cn_umea_adj:0 "Umeån"
- cn_uumaja:0 "Uumaja"
- cn_uumaja_adj:0 "Uumaja"
- cn_arvidsjaur:0 "Arvidsjaur"
- cn_ornskoldsvik:0 "Örnsköldsvik"
- 
\ No newline at end of file
diff --git a/localization/english/replace/titles_l_english.yml b/localization/english/replace/titles_l_english.yml
index b4954591..d819bd23 100644
--- a/localization/english/replace/titles_l_english.yml
+++ b/localization/english/replace/titles_l_english.yml
@@ -5086,7 +5086,7 @@
  b_grosseto:0 "Grosseto"
  b_grunberg:0 "Zielona Góra"
  b_gubin:0 "Gubin"
- b_orrestaare:0 "Orrestaare"
+ b_grundasund:0 "Grundasund"
  b_grunningen:0 "Grünningen"
  b_grybow:0 "Grybow"
  b_guadalajara:0 "Guadalajara"
@@ -25003,44 +25003,6 @@
  k_transylvania:0 "Transylvania"
  k_transylvania_adj:1 "Transylvanian"
  
- #### Finland ####
- 
- c_pirkanmaa:0 "Pirkanmaa"
- c_pirkanmaa_adj:1 "Pirkanmaa"
- c_kantahame:0 "Kanta-Häme"
- c_kantahame_adj:1 "Kanta-Häme"
- c_paijathame:0 "Päijät-Häme"
- c_paijathame_adj:1 "Päijät-Häme"
- c_vaasa:0 "Vaasa"
- c_vaasa_adj:1 "Vaasa"
- c_kymmenlaakso:0 "Kymmenlaakso"
- c_kymmenlaakso_adj:1 "Kymmenlaakso"
- c_mikkeli:0 "Mikkeli"
- c_mikkeli_adj:1 "Mikkeli"
- c_jyvaskyla:0 "Jyväskylä"
- c_jyvaskyla_adj:1 "Jyväskylä"
- c_seinajoki:0 "Seinäjoki"
- c_seinajoki_adj:1 "Seinäjoki"
- c_kuopio:0 "Kuopio"
- c_kuopio_adj:1 "Kuopio"
- c_joensuu:0 "Joensuu"
- c_joensuu_adj:1 "Joensuu"
- b_tampere:0 "Tampere"
- b_nokia:0 "Nokia"
- b_pori:0 "Pori"
- b_rauma:0 "Rauma"
- b_mariehamn:0 "Mariehamn"
- b_kaskinen:0 "Kaskinen"
- b_vaasa:0 "Vaasa"
- b_saarijarvi:0 "Saarijärvi"
- b_savonlinna:0 "Savonlinna"
- b_jyvaskyla:0 "Jyväskylä"
- b_seinajoki:0 "Seinäjoki"
- b_kauhajoki:0 "Kauhajoki"
- b_kokkola:0 "Kokkola"
- b_joensuu:0 "Joensuu"
- b_kitee:0 "Kitee"
- 
  #### Schleswig Holstein ####
  
  k_schleswig_holstein:0 "Schleswig-Holstein"
diff --git a/map_data/default.map b/map_data/default.map
index 571bdd59..4836a994 100644
--- a/map_data/default.map
+++ b/map_data/default.map
@@ -256,7 +256,7 @@ impassable_mountains = RANGE { 5516 5518 }
 impassable_mountains = LIST { 972 8703 }
 
 #Scandinavia & Finland & Iceland
-impassable_mountains = RANGE { 652 658 }
+impassable_mountains = RANGE { 650 658 }
 impassable_mountains = RANGE { 3260 3264 }
 impassable_mountains = LIST { 281 299 899 902 935 971 3307 }
 
diff --git a/map_data/definition.csv b/map_data/definition.csv
index bcc5da0e..3258aff8 100644
--- a/map_data/definition.csv
+++ b/map_data/definition.csv
@@ -176,9 +176,9 @@
 175;0;99;215;PORVOO;x
 176;42;102;88;ESPOO;x
 177;84;105;216;RASEBORG;x
-178;126;108;89;SALO;x
+178;126;108;89;RIKALA;x
 179;168;111;217;TURKU;x
-180;0;114;90;UUSIKAUPUNKI;x
+180;0;114;90;RAUMA;x
 181;42;117;218;PARIKKALA;x
 182;84;120;91;VIIPURI;x
 183;126;123;219;LIINMAA;x
diff --git a/map_data/provinces.png b/map_data/provinces.png
index 88aa31db..671b5eb7 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:89bcdc864a50101cef711750dfcd81673577fc45e6c63b463b119f704914c9fc
-size 2623671
+oid sha256:f213cfdf92b100f923e94a6ca88d6a83d30c1bafe88baf0b746a47164084cf36
+size 2489632