diff --git a/common/flavorization/00_title_holders.txt b/common/flavorization/00_title_holders.txt
index 1139c175..3d7785ad 100644
--- a/common/flavorization/00_title_holders.txt
+++ b/common/flavorization/00_title_holders.txt
@@ -92,7 +92,7 @@ title_prince = {
 	gender = male
 	special = holder
 	priority = 60
-	titles = { k_switzerland k_saxony k_wales d_monaco d_lictenstein k_dacia k_moldavia }
+	titles = { k_switzerland k_saxony k_wales d_monaco d_lictenstein k_dacia k_moldavia d_macva }
 	governments = { feudal_government tribal_government administrative_government }
 	flavourization_rules = { 
 		top_liege = no
@@ -103,7 +103,7 @@ title_princess = {
 	gender = female
 	special = holder
 	priority = 60
-	titles = { k_switzerland k_saxony k_wales d_monaco d_lictenstein k_dacia k_moldavia }
+	titles = { k_switzerland k_saxony k_wales d_monaco d_lictenstein k_dacia k_moldavia d_macva }
 	governments = { feudal_government tribal_government administrative_government }
 	flavourization_rules = { 
 		top_liege = no
@@ -111,7 +111,7 @@ title_princess = {
 }
 title_principality = {
 	type = title
-	titles = { k_saxony k_wales d_monaco d_lictenstein d_andorra k_dacia k_moldavia }
+	titles = { k_saxony k_wales d_monaco d_lictenstein d_andorra k_dacia k_moldavia d_macva }
 	priority = 60
 	governments = { feudal_government tribal_government administrative_government }
 	flavourization_rules = { 
diff --git a/common/landed_titles/greece.txt b/common/landed_titles/greece.txt
index 5bfb383e..24c97c9b 100644
--- a/common/landed_titles/greece.txt
+++ b/common/landed_titles/greece.txt
@@ -948,15 +948,15 @@ e_greece = {
 			}			
 			c_phocis = {
 				color = { 150 100 140 }			
-				b_lidoriki = {
-					province = 3698
-
-					color = { 150 100 140 }
-				}
 				b_amfissa = {
 					province = 3729
 
 					color = { 250 65 140 }
+				}				
+				b_lidoriki = {
+					province = 3698
+
+					color = { 150 100 140 }
 				}
 			}				
 		}
diff --git a/common/landed_titles/yugoslavia.txt b/common/landed_titles/yugoslavia.txt
index 661c51f3..f9fe36e9 100644
--- a/common/landed_titles/yugoslavia.txt
+++ b/common/landed_titles/yugoslavia.txt
@@ -18,7 +18,7 @@ e_yugoslavia = {
 		d_krain = {
 			color = { 95 120 100 }
 
-			capital = c_kranj # Kranj
+			capital = c_ljubljana # Kranj
 
 			c_kranj = {
 				color = { 95 120 100 }
@@ -44,11 +44,6 @@ e_yugoslavia = {
 						name_list_saxon = cn_krainburg
 					}
 				}
-				b_krsko = {
-					province = 3102
-
-					color = { 95 120 100 }
-				}
 				b_kamnik = {
 					province = 3101
 
@@ -73,6 +68,11 @@ e_yugoslavia = {
 
 					color = { 115 90 90 }
 				}
+				b_krsko = {
+					province = 3102
+
+					color = { 95 120 100 }
+				}				
 			}
 			c_ljubljana = {
 				color = { 90 125 115 }
@@ -119,6 +119,11 @@ e_yugoslavia = {
 
 					color = { 180 255 200 }
 				}
+				b_piran = {
+					province = 2519
+
+					color = { 75 110 105 }
+				}				
 			}
 		}
     }
@@ -261,8 +266,59 @@ e_yugoslavia = {
 		d_croatia = {
 			color = { 115 40 52 }
 
-			capital = c_gacka # Senj
+			capital = c_zagreb
+			c_zagreb = {
+				color = { 130 30 60 }
 
+				#capital = 461 # Zagreb
+
+				cultural_names = {
+					name_list_roman = cn_andautonia
+					name_list_greek = cn_andautonia
+				}
+
+				b_zagreb = {
+					province = 461
+
+					color = { 130 30 60 }
+				}
+				b_cazma = {
+					province = 3533
+
+					color = { 130 30 60 }
+				}
+				b_samobor = {
+					province = 3534
+
+					color = { 130 30 60 }
+				}
+			}
+			c_zagorje = {
+				color = { 160 20 50 }
+
+				#capital = 458 # Krapina
+
+				b_krapina = {
+					province = 458 # Krapina
+
+					color = { 160 20 50 }
+				}
+				b_garestin = { # Original name of Varazdin
+					province = 460
+
+					color = { 160 20 50 }
+				}
+				b_krizevci = {
+					province = 462
+
+					color = { 160 20 50 }
+				}
+				b_koprivnica = {
+					province = 3531
+
+					color = { 160 20 50 }
+				}
+			}
 			c_gacka = {
 				color = { 115 40 52 }
 
@@ -336,101 +392,46 @@ e_yugoslavia = {
 
 					color = { 90 40 60 }
 				}
-				b_okic = {
-					province = 3537
-
-					color = { 90 40 60 }
-				}
 				b_dubovac = {
 					province = 3536
 
 					color = { 90 40 60 }
-				}
-				b_topusko = {
-					province = 3538
+				}						
+			}
+			c_vodica = {
+				b_sisak = {
+					province = 3535
 
-					color = { 90 40 60 }
+					color = { 130 30 60 }
+				}			
+				b_vodicevo = {
+					province = 3519
+
+					color = { 130 10 20 }
 				}
 				b_dubica = {
 					province = 3518
 
 					color = { 130 10 20 }
-				}
-			}
+				}		
+				b_okic = {
+					province = 3537
+
+					color = { 90 40 60 }
+				}				
+			}				
 		}
 
 		d_slavonia = {
 			color = { 130 30 60 }
 
-			#capital = 461 # Zagreb
+			capital = c_vukovar 
 
 			cultural_names = {
 				name_list_roman = cn_pannonia
 				name_list_greek = cn_pannonia
 			}
 
-			c_zagreb = {
-				color = { 130 30 60 }
-
-				#capital = 461 # Zagreb
-
-				cultural_names = {
-					name_list_roman = cn_andautonia
-					name_list_greek = cn_andautonia
-				}
-
-				b_zagreb = {
-					province = 461
-
-					color = { 130 30 60 }
-				}
-				b_cazma = {
-					province = 3533
-
-					color = { 130 30 60 }
-				}
-				b_samobor = {
-					province = 3534
-
-					color = { 130 30 60 }
-				}
-				b_sisak = {
-					province = 3535
-
-					color = { 130 30 60 }
-				}
-			}
-			c_zagorje = {
-				color = { 160 20 50 }
-
-				#capital = 458 # Krapina
-
-				b_krapina = {
-					province = 458 # Krapina
-
-					color = { 160 20 50 }
-				}
-				b_garestin = { # Original name of Varazdin
-					province = 460
-
-					color = { 160 20 50 }
-				}
-				b_krizevci = {
-					province = 462
-
-					color = { 160 20 50 }
-				}
-				b_koprivnica = {
-					province = 3531
-
-					color = { 160 20 50 }
-				}
-				b_verevce = {
-					province = 3532
-
-					color = { 160 20 50 }
-				}
-			}
 			c_pozega = {
 				color = { 120 30 45 }
 
@@ -455,7 +456,7 @@ e_yugoslavia = {
 					province = 3515
 
 					color = { 125 20 90 }
-				}
+				}					
 			}
 			c_vukovar = {
 				color = { 190 60 95 }
@@ -475,6 +476,11 @@ e_yugoslavia = {
 
 					color = { 190 60 95 }
 				}
+				b_verevce = {
+					province = 3532
+
+					color = { 160 20 50 }
+				}				
 				b_baranyavar = {
 					province = 3842
 
@@ -494,11 +500,6 @@ e_yugoslavia = {
 
 					color = { 75 110 105 }
 				}
-				b_piran = {
-					province = 2519
-
-					color = { 75 110 105 }
-				}
 				b_pazin = {
 					province = 2520
 
@@ -536,7 +537,7 @@ e_yugoslavia = {
 					province = 3556
 
 					color = { 180 110 50 }
-				}
+				}				
 			}
 		}
 	}
@@ -553,31 +554,9 @@ e_yugoslavia = {
 				add = @correct_culture_primary_score
 			}
 		}
-
-		d_rashka = {
-			color = { 103 88 51 }
-
-			capital = c_rashka # Novo Trgovi�te
-
-			c_rashka = {
-				color = { 103 88 51 }
-
-				b_novotrgoviste = {
-					province = 502
-
-					color = { 103 88 51 }
-				}
-				b_zica = {
-					province = 3588
-
-					color = { 103 88 51 }
-				}
-				b_gradac = {
-					province = 3587
-
-					color = { 103 88 51 }
-				}
-			}
+		d_naissus = {
+			color = { 168 135 57 }
+			capital = c_naissus		
 			c_naissus = {
 				color = { 120 110 110 }
 
@@ -610,10 +589,15 @@ e_yugoslavia = {
 
 					color = { 120 110 110 }
 				}
-				b_bosilegrad = {
-					province = 3654
+				b_prokuplje = {
+					province = 3600
 
-					color = { 145 135 135 }
+					color = { 60 65 40 }
+				}
+				b_glubocica = {
+					province = 3657
+
+					color = { 120 110 110 }
 				}				
 			}
 			
@@ -627,10 +611,35 @@ e_yugoslavia = {
 
 					color = { 120 110 110 }
 				}
-				b_glubocica = {
-					province = 3657
+				b_bosilegrad = {
+					province = 3654
 
-					color = { 120 110 110 }
+					color = { 145 135 135 }
+				}					
+			}		
+		}
+		d_rashka = {
+			color = { 103 88 51 }
+
+			capital = c_sumadija # krujevac
+
+			c_rashka = {
+				color = { 103 88 51 }
+
+				b_novotrgoviste = {
+					province = 502
+
+					color = { 103 88 51 }
+				}
+				b_zica = {
+					province = 3588
+
+					color = { 103 88 51 }
+				}
+				b_gradac = {
+					province = 3587
+
+					color = { 103 88 51 }
 				}
 			}
 			c_sumadija = {
@@ -643,28 +652,51 @@ e_yugoslavia = {
 
 					color = { 60 65 40 }
 				}
+				b_kragujevac = {
+					province = 3603
+
+					color = { 128 115 37 }
+				}				
 				b_koznik = {
 					province = 3599
 
 					color = { 60 65 40 }
 				}
-				b_prokuplje = {
-					province = 3600
-
-					color = { 60 65 40 }
-				}
 				b_petrus = {
 					province = 3669
 
 					color = { 120 105 85 }
 				}					
 			}
+			c_zlatibor = {
+				color = { 70 50 40 }
+				b_uzice = {
+					province = 3607
+
+					color = { 168 135 57 }
+				}
+				b_sjenica = {
+					province = 3591
+
+					color = { 70 50 40 }
+				}
+				b_arilje = {
+					province = 3589
+
+					color = { 70 50 40 }
+				}
+				b_rujno = {
+					province = 3590
+
+					color = { 70 50 40 }
+				}
+			}				
 		}
 
 		d_syrmia = {
 			color = { 179 43 111 }
 
-			capital = c_szerem # Szerem / Srem
+			capital = c_bacs# Szerem / Srem
 
 			c_szerem = {
 				color = { 179 43 111 }
@@ -677,27 +709,31 @@ e_yugoslavia = {
 				b_ilok = {
 					province = 3611
 
-					color = { 179 43 111 }
-				}
-				b_zemun = {
-					province = 3613
-
 					color = { 179 43 111 }
 				}
 			}
 			c_bacs = {
 				color = { 145 90 85 }
-
-				b_bacs = {
-					province = 518
-
-					color = { 145 90 85 }
-				}
 				b_titel = {
 					province = 3830
 
 					color = { 145 90 85 }
 				}
+				b_bacs = {
+					province = 518
+
+					color = { 145 90 85 }
+				}
+				b_bodrog = {
+					province = 3863
+
+					color = { 155 85 85 }
+				}
+				b_zenta = {
+					province = 3864
+
+					color = { 155 85 85 }
+				}				
 			}
 			c_keve = {
 				color = { 115 95 30 }
@@ -718,52 +754,12 @@ e_yugoslavia = {
 					color = { 115 95 30 }
 				}
 			}
-			c_bodrog = {
-				color = { 155 85 85 }
-
-				b_bodrog = {
-					province = 3863
-
-					color = { 155 85 85 }
-				}
-				b_zenta = {
-					province = 3864
-
-					color = { 155 85 85 }
-				}
-			}
 		}
 		d_macva = {
-			color = { 168 135 57 }
+			color = { 49 52 124 }
 
 			#capital = 3604 # Macva
 
-			c_macva = {
-				color = { 168 135 57 }
-
-				#capital = 3604 # Macva
-
-				b_macva = {
-					province = 3604
-
-					color = { 168 135 57 }
-				}
-				b_debrc = {
-					province = 3605
-
-					color = { 168 135 57 }
-				}
-				b_krupanj = {
-					province = 3606
-
-					color = { 168 135 57 }
-				}
-				b_uzice = {
-					province = 3607
-
-					color = { 168 135 57 }
-				}
-			}
 			c_beograd = {
 				color = { 128 115 37 }
 
@@ -784,12 +780,33 @@ e_yugoslavia = {
 
 					color = { 128 115 37 }
 				}
-				b_kragujevac = {
-					province = 3603
+				b_zemun = {
+					province = 3613
 
-					color = { 128 115 37 }
-				}
+					color = { 179 43 111 }
+				}				
 			}
+			c_macva = {
+				color = { 168 135 57 }
+
+				#capital = 3604 # Macva
+
+				b_macva = {
+					province = 3604
+
+					color = { 168 135 57 }
+				}
+				b_debrc = {
+					province = 3605
+
+					color = { 168 135 57 }
+				}
+				b_krupanj = {
+					province = 3606
+
+					color = { 168 135 57 }
+				}
+			}			
 			c_branicevo = {
 				color = { 120 125 75 }
 
@@ -810,6 +827,9 @@ e_yugoslavia = {
 
 					color = { 120 125 75 }
 				}
+		
+			}
+			c_borski = {
 				b_kladovo = {
 					province = 3667
 
@@ -819,27 +839,7 @@ e_yugoslavia = {
 					province = 3668
 
 					color = { 120 105 85 }
-				}			
-			}
-
-			c_zlatibor = {
-				color = { 70 50 40 }
-
-				b_sjenica = {
-					province = 3591
-
-					color = { 70 50 40 }
-				}
-				b_arilje = {
-					province = 3589
-
-					color = { 70 50 40 }
-				}
-				b_rujno = {
-					province = 3590
-
-					color = { 70 50 40 }
-				}
+				}	
 			}				
 		}	
 	}	
@@ -876,7 +876,7 @@ e_yugoslavia = {
 					province = 3577
 
 					color = { 129 94 13 }
-				}					
+				}				
 			}
 			c_pomorje = {
 				color = { 155 105 5 }
@@ -897,13 +897,13 @@ e_yugoslavia = {
 					province = 3574
 
 					color = { 155 105 5 }
-				}
+				}		
 
 				b_risan = {
 					province = 3573
 
 					color = { 140 90 35 }
-				}				
+				}					
 			}
 			c_travunia = { # Travunia
 				color = { 140 90 35 }
@@ -965,69 +965,32 @@ e_yugoslavia = {
 		d_bosna = {	#AKA Upper Bosnia
 			color = { 194 115 115 }
 
-			capital = c_rama # Visoki
+			capital = c_vhrbosna # Visoki
 
 			c_rama = {
 				color = { 194 105 125 }
 
 				#capital = 3527 # Visoki
-
-				b_visoki = {
-					province = 3527
-
-					color = { 194 115 115 }
-				}
-				b_prozor = {
-					province = 504
-
-					color = { 194 115 115 }
-				}
 				b_vranduk = {
 					province = 3524
 
 					color = { 194 115 115 }
 				}
+				b_visoki = {
+					province = 3527
+
+					color = { 194 115 115 }
+				}
 				b_bobovac = {
 					province = 3525
 
 					color = { 194 115 115 }
 				}
-				b_travnik = {
-					province = 3526
+				b_usora = {	#Actually Doboj: Usora is a river.
+					province = 463
 
-					color = { 194 115 115 }
-				}
-			}
-			c_donjikraji = {
-				color = { 175 90 115 }
-
-				#capital = 3507 # Jajce
-
-				b_jajce = {
-					province = 3507
-
-					color = { 175 90 115 }
-				}
-				b_kljucnasani = {
-					province = 3504
-
-					color = { 175 90 115 }
-				}
-				b_greben = {
-					province = 3505
-
-					color = { 175 90 115 }
-				}
-				b_kotorvaros = {
-					province = 3506
-
-					color = { 175 90 115 }
-				}
-				b_sokol = {
-					province = 3508
-
-					color = { 175 90 115 }
-				}
+					color = { 170 70 100 }
+				}				
 			}
 			c_vhrbosna = {
 				color = { 150 105 125 }
@@ -1044,11 +1007,28 @@ e_yugoslavia = {
 
 					color = { 150 105 125 }
 				}
-				b_kuclat = {
-					province = 3565
+				b_gorazde = {
+					province = 3582
 
-					color = { 150 105 125 }
+					color = { 105 100 30 }
+				}				
+				b_obalj = {
+					province = 3559
+
+					color = { 195 70 125 }
 				}
+				b_hotca = {
+					province = 3583
+
+					color = { 105 100 30 }
+				}							
+			}
+			c_podrinje = {
+				color = { 105 100 30 }
+
+				#capital = 3583 # Hotca
+
+
 				b_srebrenica = {
 					province = 3566
 
@@ -1058,28 +1038,96 @@ e_yugoslavia = {
 					province = 3568
 
 					color = { 150 105 125 }
-				}
-			}
-			c_podrinje = {
-				color = { 105 100 30 }
-
-				#capital = 3583 # Hotca
-
-				b_hotca = {
-					province = 3583
-
-					color = { 105 100 30 }
-				}
+				}				
 				b_visegrad = {
 					province = 3581
 
 					color = { 105 100 30 }
 				}
-				b_gorazde = {
-					province = 3582
+				b_bijeljina = {
+					province = 3509
 
-					color = { 105 100 30 }
+					color = { 170 80 125 }
 				}
+				b_zvornik = {
+					province = 3511
+
+					color = { 170 80 125 }
+				}
+				b_kuclat = {
+					province = 3565
+
+					color = { 150 105 125 }
+				}					
+			}
+			c_soli = {
+				color = { 170 80 125 }
+
+				#capital = 3510 # Soli - Modern Tuzla
+
+				cultural_names = {
+					name_list_roman = cn_salines
+					name_list_greek = cn_salines
+					name_list_hungarian = cn_so
+					name_list_turkish = cn_tuzla	#A bit out of period, but you never know!
+				}
+				b_soli = {
+					province = 3510
+
+					color = { 170 80 125 }
+				}
+				b_maglaj = {
+					province = 3514
+
+					color = { 170 70 100 }
+				}
+				b_srebrenik = {
+					province = 3513
+
+					color = { 170 70 100 }
+				}				
+			}
+			c_posavska = {
+				color = { 170 70 100 }
+
+				b_tolisa = {
+					province = 3512
+
+					color = { 170 70 100 }
+				}
+			}				
+		}
+
+		d_lower_bosna = {
+			color = { 180 85 120 }
+
+			capital = c_vrbas # Banja Luka
+
+			c_vrbas = {
+				color = { 125 20 90 }
+
+				#capital = 3516 # Banja Luka (though the name is anachronistic, there were various settlements on or near the site)
+
+				b_banjaluka = {
+					province = 3516
+
+					color = { 125 20 90 }
+				}
+				b_glaz = {
+					province = 3517
+
+					color = { 125 20 90 }
+				}
+				b_greben = {
+					province = 3505
+
+					color = { 175 90 115 }
+				}
+				b_kotorvaros = {
+					province = 3506
+
+					color = { 175 90 115 }
+				}				
 			}
 			c_pset = {
 				color = { 135 55 65 }
@@ -1101,102 +1149,43 @@ e_yugoslavia = {
 
 					color = { 135 55 65 }
 				}
-			}
-		}
+				b_kljucnasani = {
+					province = 3504
 
-		d_lower_bosna = {
-			color = { 180 85 120 }
+					color = { 175 90 115 }
+				}	
+				b_topusko = {
+					province = 3538
 
-			capital = c_soli # Soli
+					color = { 90 40 60 }
+				}				
+			}		
+			c_donjikraji = {
+				color = { 175 90 115 }
 
-			c_soli = {
-				color = { 170 80 125 }
+				#capital = 3507 # Jajce
+				b_travnik = {
+					province = 3526
 
-				#capital = 3510 # Soli - Modern Tuzla
-
-				cultural_names = {
-					name_list_roman = cn_salines
-					name_list_greek = cn_salines
-					name_list_hungarian = cn_so
-					name_list_turkish = cn_tuzla	#A bit out of period, but you never know!
+					color = { 194 115 115 }
 				}
+				b_jajce = {
+					province = 3507
 
-				b_soli = {
-					province = 3510
-
-					color = { 170 80 125 }
+					color = { 175 90 115 }
 				}
-				b_bijeljina = {
-					province = 3509
+				b_sokol = {
+					province = 3508
 
-					color = { 170 80 125 }
+					color = { 175 90 115 }
 				}
-				b_zvornik = {
-					province = 3511
-
-					color = { 170 80 125 }
-				}
-			}
-			c_usora = {
-				color = { 170 70 100 }
-
-				#capital = 3513 # Srebrenik
-
-				b_srebrenik = {
-					province = 3513
-
-					color = { 170 70 100 }
-				}
-				b_usora = {	#Actually Doboj: Usora is a river.
-					province = 463
-
-					color = { 170 70 100 }
-				}
-				b_maglaj = {
-					province = 3514
-
-					color = { 170 70 100 }
-				}
-
-				b_tolisa = {
-					province = 3512
-
-					color = { 170 70 100 }
-				}
-			}
-			c_vodica = {	#Actually Krajina.
-				color = { 130 10 20 }
-
-				#capital = 3519 # Vodicevo
-
-				b_vodicevo = {
-					province = 3519
-
-					color = { 130 10 20 }
-				}
-			}
-			c_vrbas = {
-				color = { 125 20 90 }
-
-				#capital = 3516 # Banja Luka (though the name is anachronistic, there were various settlements on or near the site)
-
-				b_banjaluka = {
-					province = 3516
-
-					color = { 125 20 90 }
-				}
-				b_glaz = {
-					province = 3517
-
-					color = { 125 20 90 }
-				}
-			}
+			}			
 		}
 
 		d_usora = {	#Actually Zachlumia
 			color = { 170 70 100 }
 
-			capital = c_zachlumia # Blagaj
+			capital = c_zelengora # Mostar
 
 			cultural_names = {
 				name_list_serbian = cn_zahumlje
@@ -1214,56 +1203,54 @@ e_yugoslavia = {
 					name_list_croatian = cn_zahumlje
 					name_list_bosnian = cn_zahumlje
 				}
+				b_trebinje = {
+					province = 3572
 
-				b_blagaj = {
-					province = 466
-
-					color = { 210 80 90 }
-				}
+					color = { 140 90 35 }
+				}	
 				b_nevesinje = {
 					province = 3561
 
 					color = { 210 80 90 }
 				}
-				b_drijeva = {
-					province = 3562
-
-					color = { 210 80 90 }
-				}
 				b_kljuc = {
 					province = 3563
 
 					color = { 210 80 90 }
-				}
+				}		
+				b_gacko = {
+					province = 3560
+
+					color = { 195 70 125 }
+				}			
+			}
+			c_zelengora = {
+				color = { 195 70 125 }
 				b_mostar = {
 					province = 3558
 
 					color = { 210 80 90 }
 				}
-				b_trebinje = {
-					province = 3572
+				b_blagaj = {
+					province = 466
 
-					color = { 140 90 35 }
-				}				
-			}
-			c_zelengora = {
-				color = { 195 70 125 }
+					color = { 210 80 90 }
+				}					
+				b_drijeva = {
+					province = 3562
 
-				b_gacko = {
-					province = 3560
-
-					color = { 195 70 125 }
+					color = { 210 80 90 }
 				}
 				b_konjic = {
 					province = 3557
 
 					color = { 195 70 125 }
 				}
-				b_obalj = {
-					province = 3559
+				b_prozor = {
+					province = 504
 
-					color = { 195 70 125 }
-				}
+					color = { 194 115 115 }
+				}				
 			}
 			c_zavrsje = {
 				color = { 220 130 100 }
@@ -1276,7 +1263,7 @@ e_yugoslavia = {
 				}
 				#roman = "Emotha"
 				#greek = "Emotha"
-
+			
 				b_hlivno = {
 					province = 3501
 
@@ -1286,7 +1273,7 @@ e_yugoslavia = {
 					province = 3500
 
 					color = { 220 130 100 }
-				}
+				}				
 				b_duvno = {
 					province = 3502
 
diff --git a/history/characters/NEOW_e_greece.txt b/history/characters/NEOW_e_greece.txt
index 8234f462..9087d783 100644
--- a/history/characters/NEOW_e_greece.txt
+++ b/history/characters/NEOW_e_greece.txt
@@ -35,7 +35,7 @@ greece0002 = { #makedon emperor
 }
 
 greece0003 = { #makis
-	name = "makis"
+	name = "Makis"
 	dynasty = argonid_dynasty
 	religion = "megalocratic"
 	culture = thracian
@@ -52,6 +52,61 @@ greece0003 = { #makis
 	}
 }
 
+greece0004 = { #
+	name = "Onomarchos"
+	dynasty = theotimos_dynasty
+	religion = "megalocratic"
+	culture = NEOW_pindusian
+	trait = education_martial_4
+	trait = generous
+	trait = arbitrary
+	trait = lustful
+	sexuality = homosexual
+	2527.1.1 = {
+    	birth = yes
+	}
+	2600.1.1 = {
+    	death = yes
+	}
+}
+
+
+greece0010 = { #
+	name = "Pýrrhos"
+	dynasty = aekos_dynasty
+	religion = "megalocratic"
+	culture = NEOW_pindusian
+	trait = education_martial_4
+	trait = brave
+	trait = impatient
+	trait = ambitious
+	2527.1.1 = {
+    	birth = yes
+	}
+	2600.1.1 = {
+    	death = yes
+	}
+}
+
+
+greece0015 = { #
+	name = "Iáson"
+	dynasty = pherae_dynasty
+	religion = "megalocratic"
+	culture = NEOW_pindusian
+	trait = education_martial_4
+	trait = dilligent
+	trait = temperate
+	trait = ambitious
+	2527.1.1 = {
+    	birth = yes
+	}
+	2600.1.1 = {
+    	death = yes
+	}
+}
+
+
 albania0001 = { #Tirana
 	name = "Ismail"
 	dynasty = qemali_dynasty
@@ -74,7 +129,7 @@ albania0002 = { #North Epiros
 	name = "Kico"
 	dynasty = mustaqi_dynasty
 	culture = NEOW_pindusian
-	religion = megalocratic
+	religion = orthodox
 	trait = education_martial_2
 	trait = cynical
 	trait = ambitious
diff --git a/history/characters/NEOW_e_yugoslavia.txt b/history/characters/NEOW_e_yugoslavia.txt
index f5dd8b18..8071bbd2 100644
--- a/history/characters/NEOW_e_yugoslavia.txt
+++ b/history/characters/NEOW_e_yugoslavia.txt
@@ -1,14 +1,17 @@
-yugoslavia0001 = { #emperor
-	name = "Stefan"
-	dynasty = dursan_dynasty
+yugoslavia0001 = { #Princess of Serbia
+	name = "Milunka"
+	dynasty = savic_dynasty
 	religion = "yugoslavist"
 	culture = NEOW_serbian
-	trait = education_stewardship_3
-	trait = ambitious
-	trait = wrathful
-	trait = greedy
-	trait = shrewd
+	trait = education_martial_2
+	trait = brave
+	trait = deceitful
+	trait = compassionate
+	trait = strong
+	trait = scarred
+	trait = wounded
 	sexuality = heterosexual
+	female = yes
 	2524.1.1 = {
     	birth = yes
 	}
@@ -256,7 +259,7 @@ yugoslavia0006 = { #bulgaria king brother
 	dynasty = vazov_dynasty
 	religion = "diadochic"
 	culture = NEOW_bulgarian
-	trait = education_martial_3
+	trait = education_martial_4
 	trait = unyielding_defender
 	trait = diligent
 	trait = brave
diff --git a/history/provinces/e_makedon.txt b/history/provinces/e_makedon.txt
index 6838f640..d85cc7f6 100644
--- a/history/provinces/e_makedon.txt
+++ b/history/provinces/e_makedon.txt
@@ -578,7 +578,9 @@
 	holding = none
 }
 3729 = {	#Amfissa
-	holding = city_holding
+	holding = church_holding
+	culture = NEOW_pindusian
+	religion = megalocratic	
 	866.1.1 = {
 		special_building_slot = hosios_loukas
 	}
@@ -724,7 +726,7 @@
 	holding = castle_holding
 }
 3698 = {	#Lidoriki
-	holding = church_holding
+	holding = castle_holding
 	culture = NEOW_pindusian
 	religion = megalocratic
 }
@@ -1048,7 +1050,7 @@
 3650 = {	#Strumica
 	culture = NEOW_macedonian
 	religion = megalocratic
-	holding = castle_holding
+	holdin36g = castle_holding
 }
 3648 = {	#Shtip
 	holding = city_holding
diff --git a/history/provinces/e_yugoslavia.txt b/history/provinces/e_yugoslavia.txt
index 678cdeba..948bf830 100644
--- a/history/provinces/e_yugoslavia.txt
+++ b/history/provinces/e_yugoslavia.txt
@@ -55,7 +55,7 @@
 ###c_pula
 2518 = {	#PULA
 	culture = NEOW_croatian
-	religion = yugoslavist
+	religion = roman_catholic
 	holding = castle_holding
 }
 2519 = {	#PIRAN
@@ -209,6 +209,8 @@
 }
 3535 = {	#Sisak
 	holding = city_holding
+	culture = NEOW_croatian
+	religion = yugoslavist	
 }
 
 ###c_zagorje
@@ -274,7 +276,9 @@
 	holding = none
 }
 3524 = {	#Vranduk
-	holding = none
+	culture = NEOW_bosnian
+	religion = aqlani
+	holding = castle_holding
 	#Seems to be from ~XIVth century
 }
 3525 = {	#Bobovac
@@ -282,6 +286,8 @@
 	#Built in 1349
 }
 3526 = {	#Travnik
+	culture = NEOW_bosnian
+	religion = aqlani
 	holding = city_holding
 	#Already inhabited and used in Roman times
 }
@@ -322,6 +328,8 @@
 }
 3566 = {	#Srebrenica
 	holding = castle_holding
+	culture = NEOW_bosnian
+	religion = yugoslavist	
 	#Roman settlement
 	867.1.1 = {
 		special_building_slot = srebrenica_mines_01
@@ -388,7 +396,9 @@
 	#Built/1st mention in XIVth century
 }
 3512 = {	#Tolisa
-	holding = none
+	culture = NEOW_bosnian
+	religion = yugoslavist
+	holding = castle_holding
 	#First mention in XIIIth century
 }
 
@@ -427,6 +437,8 @@
 	holding = none
 }
 3558 = {	#Mostar
+	culture = NEOW_bosnian
+	religion = roman_catholic
 	holding = city_holding
 	#Used since roman times
 }
@@ -510,8 +522,9 @@
 	holding = castle_holding
 }
 3830 = {	#Titel
-	holding = none
-	
+	culture = NEOW_serbian
+	religion = yugoslavist
+	holding = castle_holding
 	1066.1.1 = {
 		holding = church_holding
 		#1st mention in 2088
@@ -689,6 +702,8 @@
 }
 3607 = {	#Užice
 	holding = castle_holding
+	culture = NEOW_serbian
+	religion = orthodox	
 	#Occupied by slavs even before 867
 }
 
@@ -758,7 +773,7 @@
 
 ###c_travunia
 3572 = {	#Trebinje
-	culture = NEOW_montenegran
+	culture = NEOW_bosnian
 	religion = orthodox
 	holding = castle_holding
 }
diff --git a/history/titles/k_greece.txt b/history/titles/k_greece.txt
index cb822a19..8d689f0c 100644
--- a/history/titles/k_greece.txt
+++ b/history/titles/k_greece.txt
@@ -4,4 +4,46 @@ d_athens = {
 	2554.1.1 = {
 		holder = greece0002 
 	}
-}
\ No newline at end of file
+}
+
+d_epirus = {
+	2554.1.1 = {
+		holder = greece0010 
+	}
+}
+
+d_thessaly = {
+	2554.1.1 = {
+		holder = greece0015 
+	}
+}
+
+c_nicopolis = {
+	2554.1.1 = {
+		holder = greece0010 
+	}
+}
+
+c_aetolia = {
+	2554.1.1 = {
+		holder = greece0010 
+	}
+}
+
+c_phocis= {
+	2554.1.1 = {
+		holder = greece0004
+	}
+}
+
+c_neopatras= {
+	2554.1.1 = {
+		holder = greece0004
+	}
+}
+
+b_amfissa= {
+	2554.1.1 = {
+		holder = greece0004
+	}
+}
diff --git a/history/titles/k_serbia.txt b/history/titles/k_serbia.txt
index 43f34c7b..beb5f3b3 100644
--- a/history/titles/k_serbia.txt
+++ b/history/titles/k_serbia.txt
@@ -1,14 +1,32 @@
 
 
-k_serbia  = {
+d_macva  = {
 	2554.1.1 = {
 		holder = yugoslavia0001
-		liege = e_yugoslavia	
 	}
 }
 
 
-k_bosnia = {
+d_rashka  = {
+	2554.1.1 = {
+		holder = yugoslavia0001
+	}
+}
+
+c_szerem  = {
+	2554.1.1 = {
+		holder = yugoslavia0001
+	}
+}
+
+
+d_bosna = {
+	2554.1.1 = {
+		holder = yugoslavia0002
+	}
+}
+
+d_lower_bosna = {
 	2554.1.1 = {
 		holder = yugoslavia0002
 	}
diff --git a/history/titles/k_slovenia.txt b/history/titles/k_slovenia.txt
index 2c7d37ac..8699d31c 100644
--- a/history/titles/k_slovenia.txt
+++ b/history/titles/k_slovenia.txt
@@ -5,3 +5,15 @@ k_slovenia = {
 		holder = yugoslavia0004
 	}
 }
+
+d_krain = {
+	2554.1.1 = {
+		holder = yugoslavia0004
+	}
+}
+
+d_istria  = {
+	2554.1.1 = {
+		holder = yugoslavia0004
+	}
+}
\ 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..289f4141 100644
--- a/localization/english/replace/titles_l_english.yml
+++ b/localization/english/replace/titles_l_english.yml
@@ -16043,8 +16043,8 @@
  d_luxembourg_adj:0 "Luxembourgian"
  d_lykia:0 "Lykia"
  d_lykia_adj:0 "Lykian"
- d_macva:0 "Mačva"
- d_macva_adj:0 "Mačvan"
+ d_macva:0 "Srbija"
+ d_macva_adj:0 "Srbi,"
  d_magadha:0 "Magadha"
  d_magadha_adj:0 "Magadhan"
  d_makran:0 "Makran"
@@ -16227,8 +16227,8 @@
  d_ragusa:0 "Dubrovnik"
  d_ragusa_adj:0 "Dubrovnikan"
  d_raichur_doab:0 "Raichur Doab"
- d_rashka:1 "Raška"
- d_rashka_adj:1 "Raškan"
+ d_rashka:1 "Šumadija"
+ d_rashka_adj:1 "Šumadijan"
  d_ratanpur:0 "Ratanpur"
  d_ratanpur_adj:0 "Ratanpuri"
  d_rattapadi:0 "Rattapadi"
@@ -16402,7 +16402,7 @@
  d_syr_darya_adj:0 "Syr Daryan"
  d_syria:0 "Syria"
  d_syria_adj:0 "Syrian"
- d_syrmia:0 "Syrmia"
+ d_syrmia:0 "Vojvodina"
  d_syrte:0 "Syrte"
  d_syrte_adj:0 "Syrtenian"
  d_tabaristan:0 "Tabaristan"
@@ -25761,4 +25761,6 @@
  b_severskaya:0 "Severskaya"
  b_krymsk:0 "Krymsk"
  b_dinskaya:0 "Dinskaya"
- b_temryuk:0 "Temryuk"
\ No newline at end of file
+ b_temryuk:0 "Temryuk"
+ d_naissus:0 "Nišavski "
+ d_naissus_adj:0 "Nišavskin" 
\ No newline at end of file