diff --git a/MOD/Witcher/common/cb_types/00_cb_types.txt b/MOD/Witcher/common/cb_types/00_cb_types.txt
index 8b78ea427..1990ebfbe 100644
--- a/MOD/Witcher/common/cb_types/00_cb_types.txt
+++ b/MOD/Witcher/common/cb_types/00_cb_types.txt
@@ -2994,7 +2994,7 @@ depose_liege = {
 	can_use = {
 		FROM = { NOT = { culture = wilderness } }
 		ROOT = { NOT = { culture = wilderness } }
-		always = no # v2.21 - Disabled - not working well
+		# always = no # v2.21 - Disabled - not working well
 		ROOT = {
 			de_facto_liege = FROM
 		}
diff --git a/MOD/Witcher/common/landed_titles/01_landed_titles.txt b/MOD/Witcher/common/landed_titles/01_landed_titles.txt
index 96033b46b..718ca4d22 100644
--- a/MOD/Witcher/common/landed_titles/01_landed_titles.txt
+++ b/MOD/Witcher/common/landed_titles/01_landed_titles.txt
@@ -6930,313 +6930,6 @@ e_temeria = {
 			}
 		}
 	}
-	k_emblonia = {
-		color={ 54 14 106 }
-		color2={ 255 255 255 }
-		
-		capital = 512 # c_findetann
-		culture = temerian
-		
-		d_emblonia = {
-			color={ 34 34 96 }
-			color2={ 255 255 255 }
-			
-			allow = {
-				OR = {
-					lower_tier_than = KING
-					any_demesne_province = { OR = { province_id = 14 province_id = 26 province_id = 512 } }
-				}
-			}
-			capital = 512 # c_findetann
-			
-			c_findetann = { # 512
-				color={ 24 44 91 }
-				color2={ 255 255 255 }
-				
-				b_niemborg = {
-				}
-				b_findetann = {
-				}
-				b_will = {
-				}
-				b_hollwinkel = {
-				}
-				b_rastatt = {
-				}
-				b_yburg = {
-				}
-			}
-			c_acorn_bay = { # 26
-				color={ 42 66 122 }
-				color2={ 255 255 255 }
-				
-				b_cochem = {
-				}
-				b_acorn_bay = {
-				}
-				b_wittingen = {
-				}
-				b_garz = {
-				}
-				b_lutter = {
-				}
-			}
-			c_nessvelt = { # 14
-				color={ 36 76 101 }
-				color2={ 255 255 255 }
-				
-				b_nessvelt = {
-				}
-				b_villigst = {
-				}
-				b_aach = {
-				}
-				b_zella = {
-				}
-				b_gillaus = {
-				}
-				b_eresburg = {
-				}
-			}
-		}
-		d_anchor = {
-			color={ 22 23 85 }
-			color2={ 255 255 255 }
-			
-			allow = {
-				OR = {
-					lower_tier_than = KING
-					any_demesne_province = { OR = { province_id = 21 province_id = 496 } }
-				}
-			}
-			capital = 21 # c_anchor
-			
-			c_anchor = { # 21
-				color={ 12 33 80 }
-				color2={ 255 255 255 }
-				
-				b_anckstein = {
-				}
-				b_anchor = {
-				}
-				b_roettingen = {
-				}
-				b_eberharts = {
-				}
-				b_ries = {
-				}
-				b_holtfeld = {
-				}
-				b_schlat = {
-				}
-			}
-			c_wentel = { # 496
-				color={ 41 96 220 }
-				color2={ 255 255 255 }
-				
-				b_wentel = {
-				}
-				b_wentel_2 = {
-				}
-				b_wentel_3 = {
-				}
-				b_wentel_4 = {
-				}
-			}
-		}
-		d_gors_velen = {
-			color={ 92 155 237 }
-			color2={ 255 255 255 }
-			
-			allow = {
-				OR = {
-					lower_tier_than = KING
-					any_demesne_province = { OR = { province_id = 25 province_id = 27 province_id = 383 province_id = 508 } }
-				}
-			}
-			capital = 25 # c_gors_velen
-			
-			c_gors_velen = { # 25
-				color={ 102 145 242 }
-				color2={ 255 255 255 }
-				
-				b_velenburg = {
-				}
-				b_gors_velen = {
-				}
-				b_oesterholz = {
-					holy_site = eternal_fire
-					holy_site = melitele
-				}
-				b_richstein = {
-				}
-				b_hirundum = {
-				}
-				b_eckartsberga = {
-				}
-			}
-			c_alberoda = { # 508
-				color={ 57 103 206 }
-				color2={ 255 255 255 }
-				
-				b_alberoda = {
-				}
-				b_alberoda_2 = {
-				}
-				b_alberoda_3 = {
-				}
-				b_alberoda_4 = {
-				}
-			}
-			c_caelf = { # 27
-				color={ 57 89 161 }
-				color2={ 255 255 255 }
-				
-				b_nydegg = {
-				}
-				b_caelf = {
-				}
-				b_hirundum_2 = {
-				}
-				b_reichers = {
-				}
-				b_bentheim = {
-				}
-				b_garath = {
-				}
-				b_hueffenhardt = {
-				}
-			}
-			c_kilmes = { # 383
-				color={ 74 109 187 }
-				color2={ 255 255 255 }
-				
-				b_kilmes = {
-				}
-				b_eywan = {
-				}
-				b_lubens = {
-				}
-				b_melm = {
-				}
-			}
-		}
-		d_la_valette = {
-			color={ 28 47 86 }
-			color2={ 255 255 255 }
-			
-			allow = {
-				OR = {
-					lower_tier_than = KING
-					any_demesne_province = { OR = { province_id = 13 province_id = 497 province_id = 507 } }
-				}
-			}
-			capital = 13 # c_la_valette
-			
-			c_la_valette = { # 13
-				color={ 18 57 81 }
-				color2={ 255 255 255 }
-				
-				b_la_valette_castle = {
-				}
-				b_la_valette = {
-				}
-				b_crollage = {
-					holy_site = kreve
-				}
-				b_kuffarn = {
-				}
-				b_kaibing = {
-				}
-				b_altenfels = {
-				}
-				b_anstel = {
-				}
-			}
-			c_moyen = { # 507
-				color={ 35 86 119 }
-				color2={ 255 255 255 }
-				
-				b_moyen = {
-				}
-				b_andon = {
-				}
-				b_quetteville = {
-				}
-				b_gutfeld = {
-				}
-			}
-			c_puymory = { # 497
-				color={ 60 93 167 }
-				color2={ 255 255 255 }
-				
-				b_puymory = {
-				}
-				b_puymory_2 = {
-				}
-				b_puymory_3 = {
-				}
-			}
-		}
-		d_oxenfurt = {
-			color={ 155 1 37 }
-			color2={ 255 255 255 }
-			
-			allow = {
-				OR = {
-					lower_tier_than = KING
-					any_demesne_province = { OR = { province_id = 44 province_id = 409 province_id = 509 } }
-				}
-			}
-			capital = 44 # c_oxenfurt
-			
-			c_oxenfurt = { # 44
-				color={ 145 11 32 }
-				color2={ 255 255 255 }
-				
-				b_oxenfurt = {
-				}
-				b_oxenfurt_castle = {
-				}
-				b_stramyl = {
-				}
-				b_ciansky = {
-				}
-				b_bovnava = {
-				}
-				b_stopeza = {
-				}
-				b_dudavo = {
-				}
-			}
-			c_grosmont = { # 509
-				color={ 122 12 29 }
-				color2={ 255 255 255 }
-				
-				b_grosmont = {
-				}
-				b_grosmont_2 = {
-				}
-				b_grosmont_3 = {
-				}
-				b_grosmont_4 = {
-				}
-			}
-			c_ulivo = { # 409
-				color={ 255 56 87 }
-				color2={ 255 255 255 }
-				
-				b_calumet = {
-				}
-				b_ulivo = {
-				}
-				b_ozark = {
-				}
-				b_miory = {
-				}
-			}
-		}
-	}
 }
 k_ard_glas = {
 	color={ 100 5 7 }
@@ -8639,6 +8332,313 @@ k_ebbing = {
 		}
 	}
 }
+k_emblonia = {
+	color={ 54 14 106 }
+	color2={ 255 255 255 }
+	
+	capital = 512 # c_findetann
+	culture = temerian
+	
+	d_emblonia = {
+		color={ 34 34 96 }
+		color2={ 255 255 255 }
+		
+		allow = {
+			OR = {
+				lower_tier_than = KING
+				any_demesne_province = { OR = { province_id = 14 province_id = 26 province_id = 512 } }
+			}
+		}
+		capital = 512 # c_findetann
+		
+		c_findetann = { # 512
+			color={ 24 44 91 }
+			color2={ 255 255 255 }
+			
+			b_niemborg = {
+			}
+			b_findetann = {
+			}
+			b_will = {
+			}
+			b_hollwinkel = {
+			}
+			b_rastatt = {
+			}
+			b_yburg = {
+			}
+		}
+		c_acorn_bay = { # 26
+			color={ 42 66 122 }
+			color2={ 255 255 255 }
+			
+			b_cochem = {
+			}
+			b_acorn_bay = {
+			}
+			b_wittingen = {
+			}
+			b_garz = {
+			}
+			b_lutter = {
+			}
+		}
+		c_nessvelt = { # 14
+			color={ 36 76 101 }
+			color2={ 255 255 255 }
+			
+			b_nessvelt = {
+			}
+			b_villigst = {
+			}
+			b_aach = {
+			}
+			b_zella = {
+			}
+			b_gillaus = {
+			}
+			b_eresburg = {
+			}
+		}
+	}
+	d_anchor = {
+		color={ 22 23 85 }
+		color2={ 255 255 255 }
+		
+		allow = {
+			OR = {
+				lower_tier_than = KING
+				any_demesne_province = { OR = { province_id = 21 province_id = 496 } }
+			}
+		}
+		capital = 21 # c_anchor
+		
+		c_anchor = { # 21
+			color={ 12 33 80 }
+			color2={ 255 255 255 }
+			
+			b_anckstein = {
+			}
+			b_anchor = {
+			}
+			b_roettingen = {
+			}
+			b_eberharts = {
+			}
+			b_ries = {
+			}
+			b_holtfeld = {
+			}
+			b_schlat = {
+			}
+		}
+		c_wentel = { # 496
+			color={ 41 96 220 }
+			color2={ 255 255 255 }
+			
+			b_wentel = {
+			}
+			b_wentel_2 = {
+			}
+			b_wentel_3 = {
+			}
+			b_wentel_4 = {
+			}
+		}
+	}
+	d_gors_velen = {
+		color={ 92 155 237 }
+		color2={ 255 255 255 }
+		
+		allow = {
+			OR = {
+				lower_tier_than = KING
+				any_demesne_province = { OR = { province_id = 25 province_id = 27 province_id = 383 province_id = 508 } }
+			}
+		}
+		capital = 25 # c_gors_velen
+		
+		c_gors_velen = { # 25
+			color={ 102 145 242 }
+			color2={ 255 255 255 }
+			
+			b_velenburg = {
+			}
+			b_gors_velen = {
+			}
+			b_oesterholz = {
+				holy_site = eternal_fire
+				holy_site = melitele
+			}
+			b_richstein = {
+			}
+			b_hirundum = {
+			}
+			b_eckartsberga = {
+			}
+		}
+		c_alberoda = { # 508
+			color={ 57 103 206 }
+			color2={ 255 255 255 }
+			
+			b_alberoda = {
+			}
+			b_alberoda_2 = {
+			}
+			b_alberoda_3 = {
+			}
+			b_alberoda_4 = {
+			}
+		}
+		c_caelf = { # 27
+			color={ 57 89 161 }
+			color2={ 255 255 255 }
+			
+			b_nydegg = {
+			}
+			b_caelf = {
+			}
+			b_hirundum_2 = {
+			}
+			b_reichers = {
+			}
+			b_bentheim = {
+			}
+			b_garath = {
+			}
+			b_hueffenhardt = {
+			}
+		}
+		c_kilmes = { # 383
+			color={ 74 109 187 }
+			color2={ 255 255 255 }
+			
+			b_kilmes = {
+			}
+			b_eywan = {
+			}
+			b_lubens = {
+			}
+			b_melm = {
+			}
+		}
+	}
+	d_la_valette = {
+		color={ 28 47 86 }
+		color2={ 255 255 255 }
+		
+		allow = {
+			OR = {
+				lower_tier_than = KING
+				any_demesne_province = { OR = { province_id = 13 province_id = 497 province_id = 507 } }
+			}
+		}
+		capital = 13 # c_la_valette
+		
+		c_la_valette = { # 13
+			color={ 18 57 81 }
+			color2={ 255 255 255 }
+			
+			b_la_valette_castle = {
+			}
+			b_la_valette = {
+			}
+			b_crollage = {
+				holy_site = kreve
+			}
+			b_kuffarn = {
+			}
+			b_kaibing = {
+			}
+			b_altenfels = {
+			}
+			b_anstel = {
+			}
+		}
+		c_moyen = { # 507
+			color={ 35 86 119 }
+			color2={ 255 255 255 }
+			
+			b_moyen = {
+			}
+			b_andon = {
+			}
+			b_quetteville = {
+			}
+			b_gutfeld = {
+			}
+		}
+		c_puymory = { # 497
+			color={ 60 93 167 }
+			color2={ 255 255 255 }
+			
+			b_puymory = {
+			}
+			b_puymory_2 = {
+			}
+			b_puymory_3 = {
+			}
+		}
+	}
+	d_oxenfurt = {
+		color={ 155 1 37 }
+		color2={ 255 255 255 }
+		
+		allow = {
+			OR = {
+				lower_tier_than = KING
+				any_demesne_province = { OR = { province_id = 44 province_id = 409 province_id = 509 } }
+			}
+		}
+		capital = 44 # c_oxenfurt
+		
+		c_oxenfurt = { # 44
+			color={ 145 11 32 }
+			color2={ 255 255 255 }
+			
+			b_oxenfurt = {
+			}
+			b_oxenfurt_castle = {
+			}
+			b_stramyl = {
+			}
+			b_ciansky = {
+			}
+			b_bovnava = {
+			}
+			b_stopeza = {
+			}
+			b_dudavo = {
+			}
+		}
+		c_grosmont = { # 509
+			color={ 122 12 29 }
+			color2={ 255 255 255 }
+			
+			b_grosmont = {
+			}
+			b_grosmont_2 = {
+			}
+			b_grosmont_3 = {
+			}
+			b_grosmont_4 = {
+			}
+		}
+		c_ulivo = { # 409
+			color={ 255 56 87 }
+			color2={ 255 255 255 }
+			
+			b_calumet = {
+			}
+			b_ulivo = {
+			}
+			b_ozark = {
+			}
+			b_miory = {
+			}
+		}
+	}
+}
 k_eternal_fire = {
 	color={ 173 1 46 }
 	color2={ 255 255 255 }
diff --git a/MOD/Witcher/common/traits/W_special_traits.txt b/MOD/Witcher/common/traits/W_special_traits.txt
index 89f0db6ae..bf0ac1698 100644
--- a/MOD/Witcher/common/traits/W_special_traits.txt
+++ b/MOD/Witcher/common/traits/W_special_traits.txt
@@ -216,6 +216,9 @@ kind2 = { # Secret dragon trait
 	}
 }
 
+foltest = {
+}
+
 ################################################
 # BLOODLINES
 ################################################
diff --git a/MOD/Witcher/events/W_assassin_of_kings_events.txt b/MOD/Witcher/events/W_assassin_of_kings_events.txt
index 8d118fbd2..a9142d062 100644
--- a/MOD/Witcher/events/W_assassin_of_kings_events.txt
+++ b/MOD/Witcher/events/W_assassin_of_kings_events.txt
@@ -42,6 +42,13 @@ narrative_event = {
 		name = EVTOPTAaok.2
 		clr_character_flag = aok_arjan
 		set_character_flag = aok_arjan_start
+		
+		k_temeria = {
+			reverse_war = {
+				target = ROOT
+				casus_belli = depose_liege
+			}
+		}
 	}
 }
 # Foltest offer Arjan to surrender during siege
@@ -59,21 +66,75 @@ character_event = {
 	
 	option = { # Offer
 		name = EVTOPTAaok.3
-		random_playable_ruler = {
-			limit = { has_character_flag = aok_arjan_start }
-			character_event = { id = aok.4 tooltip = EVTTOOLTIPaok.4 }
+		#random_playable_ruler = {
+		#	limit = { has_character_flag = aok_arjan_start }
+		#	character_event = { id = aok.4 tooltip = EVTTOOLTIPaok.4 }
+		#}
+		location = {
+			county = {
+				holder_scope = {
+					character_event = { id = aok.4 days = 1 tooltip = EVTTOOLTIPaok }
+				}
+			}
 		}
 		clr_character_flag = aok_foltest_start
 		set_character_flag = aok_foltest_offers_surrender
-		ai_chance = { factor = 1 }
+		#character_event = { id = aok.7 tooltip = EVTTOOLTIPaok.7 }
+		ai_chance = { factor = 100 }
 	}
 	option = { # Don't offer
 		name = EVTOPTBaok.3
 		clr_character_flag = aok_foltest_start
 		set_character_flag = aok_foltest_siege
-		ai_chance = { factor = 1 }
+		ai_chance = { factor = 0 }
+	}
+}
+
+# Who do we want to send in?
+character_event = {
+	id = aok.7
+	desc = EVTDESCaok.7
+	picture = GFX_evt_siege
+	
+	is_triggered_only = yes
+		
+	immediate = {
+		random_playable_ruler = {
+			limit = { has_character_flag = aok_arjan_start }
+			character_event = { id = aok.4 tooltip = EVTTOOLTIPaok.4 }
+		}
+	}
+	
+	option = {	# Send the Witcher
+		name = EVTOPTAaok.7
+		ai_chance = {
+			factor = 1
+			modifier = {
+				factor = 5
+			}
+		}
+	}
+	option = {	# Send my marshal
+		name = EVTOPTBaok.7
+		ai_chance = {
+			factor = 1
+			modifier = {
+				factor = 5
+			}
+		}
+	}
+	option = {	# Go in myself
+		name = EVTOPTCaok.7
+		ai_chance = {
+			factor = 1
+			modifier = {
+				factor = 5
+				trait = brave
+			}
+		}
 	}
 }
+
 # Arjan decides if surrender
 character_event = {
 	id = aok.4
@@ -1846,7 +1907,7 @@ character_event = {
 	}
 	option = { # Lyria and Rivia
 		random_independent_ruler = {
-			limit = { has_landed_title = k_lyria_rivia }
+			limit = { has_landed_title = e_lyria_rivia }
 			character_event = { id = aok.2001 days = 100 random = 100 }
 		}
 		ai_chance = {
@@ -1854,7 +1915,7 @@ character_event = {
 			modifier = {
 				factor = 0
 				any_independent_ruler = {
-					has_landed_title = k_lyria_rivia
+					has_landed_title = e_lyria_rivia
 					ai = no
 				}
 			}
@@ -1871,7 +1932,7 @@ character_event = {
 			modifier = {
 				factor = 0
 				any_independent_ruler = {
-					has_landed_title = k_lyria_rivia
+					has_landed_title = e_lyria_rivia
 					ai = no
 				}
 			}
diff --git a/MOD/Witcher/gfx/characters/western_male/heroes.dds b/MOD/Witcher/gfx/characters/western_male/heroes.dds
new file mode 100644
index 000000000..d5fb5ccd5
Binary files /dev/null and b/MOD/Witcher/gfx/characters/western_male/heroes.dds differ
diff --git a/MOD/Witcher/history/characters/020000_temerian.txt b/MOD/Witcher/history/characters/020000_temerian.txt
index 8856ea103..cfad165b2 100644
--- a/MOD/Witcher/history/characters/020000_temerian.txt
+++ b/MOD/Witcher/history/characters/020000_temerian.txt
@@ -782,7 +782,8 @@
 	father=24998
 	mother=92500
 	religion=melitele culture=temerian
-	add_trait=tough_soldier add_trait=diligent add_trait=chaste add_trait=skilled_warrior add_trait=canon add_trait=human add_trait=dezmods_blood
+	add_trait=tough_soldier add_trait=diligent add_trait=chaste add_trait=skilled_warrior 
+	add_trait=foltest add_trait=human add_trait=dezmods_blood
 	1223.6.7={ birth=yes } 
 	1274.1.1={ 
 		effect={
@@ -840,6 +841,7 @@
 	mother=24994
 	religion=melitele culture=temerian
 	add_trait=canon add_trait=human add_trait=slow add_trait=dezmods_blood
+	add_trait=bastard
 	1248.10.3={ birth=yes } 
 	1255.1.1={ 
 		effect={ 
diff --git a/MOD/Witcher/history/titles/d_gors_velen.txt b/MOD/Witcher/history/titles/d_gors_velen.txt
index 151d81af9..98781fa32 100644
--- a/MOD/Witcher/history/titles/d_gors_velen.txt
+++ b/MOD/Witcher/history/titles/d_gors_velen.txt
@@ -1,7 +1,7 @@
 500.1.1={
 	law = agnatic_succession
 	law = succ_gavelkind
-	liege = k_temeria
+	liege = e_temeria
 }
 #600.1.1={
 #	de_jure_liege = k_temeria
diff --git a/MOD/Witcher/history/titles/k_temeria.txt b/MOD/Witcher/history/titles/k_temeria.txt
index f0b587f0c..46ab4f51d 100644
--- a/MOD/Witcher/history/titles/k_temeria.txt
+++ b/MOD/Witcher/history/titles/k_temeria.txt
@@ -1,7 +1,7 @@
 500.1.1={
 	law = succ_primogeniture	
 	law = crown_levy_1
-	liege = k_temeria
+	liege = e_temeria
 }
 1100.1.1 = {
 	law = crown_obligation_1
diff --git a/MOD/Witcher/history/wars/lavalette.txt b/MOD/Witcher/history/wars/lavalette.txt
index 9dcd68b65..311a48f76 100644
--- a/MOD/Witcher/history/wars/lavalette.txt
+++ b/MOD/Witcher/history/wars/lavalette.txt
@@ -1,17 +1,22 @@
-name = "Defiance of La Valette"
+#name = "Defiance of La Valette"
 
-casus_belli = {
-	actor = 20211
-	recipient = 24999
-	casus_belli=depose_liege
-	date=1273.12.1
-}
+#casus_belli = {
+#	casus_belli=claim_on_liege_plot
+#	actor=20211
+#	recipient = 24999
+#	landed_title=e_temeria
+#	date=1273.12.1
+#}
 
-1273.12.1 = {
-	add_defender = 24999
-	add_attacker = 20211
-}
-1274.8.1 = {
-	rem_defender = 24999
-	rem_attacker = 20211
-}
\ No newline at end of file
+# In civil wars defender MUST be added before attacker!
+#1273.12.1 = {
+#	add_defender = 24999
+#	add_attacker = 20211
+#	start_war = yes
+#}
+
+#1274.8.1= {
+#	end_war = yes
+#	rem_defender = 24999
+#	rem_attacker = 20211
+#}
diff --git a/MOD/Witcher/interface/W_traits.gfx b/MOD/Witcher/interface/W_traits.gfx
index 5494bbcb6..e8cc7284a 100644
--- a/MOD/Witcher/interface/W_traits.gfx
+++ b/MOD/Witcher/interface/W_traits.gfx
@@ -496,6 +496,13 @@ spriteTypes = {
 		norefcount = yes
 		effectFile = "gfx/FX/buttonstate.lua"
 	}
+	spriteType = {
+		name = "GFX_trait_foltest"
+		texturefile = "gfx/traits/canon.tga"
+		noOfFrames = 1
+		norefcount = yes
+		effectFile = "gfx/FX/buttonstate.lua"
+	}
 	spriteType = {
 		name = "GFX_trait_strong_emperor"
 		texturefile = "gfx/traits/strong_emperor.tga"
diff --git a/MOD/Witcher/interface/portrait_properties.txt b/MOD/Witcher/interface/portrait_properties.txt
index 7ea934da1..f22cf3259 100644
--- a/MOD/Witcher/interface/portrait_properties.txt
+++ b/MOD/Witcher/interface/portrait_properties.txt
@@ -1239,20 +1239,42 @@
 		modifier = {
 			factor = 0
 			OR = {
-				trait = has_measles
-				trait = has_small_pox
+				# trait = has_measles
+				# trait = has_small_pox
+				trait = foltest
+			}
+		}
+	}
+	#1 = { 
+	#	factor = 100
+	#	modifier = {
+	#		factor = 0
+	#		OR = {
+	#			NOT = {
+	#				trait = has_measles
+	#				trait = has_small_pox
+	#			}
+	#		}
+	#	}
+  	#}
+	1 = {
+		factor = 100
+		modifier = {
+			factor = 0
+			OR = {
+				NOT = {
+					trait = foltest
+				}
 			}
 		}
- 	}
-
-	1 = { # red dots
+  	}
+	2 = {
 		factor = 100
 		modifier = {
 			factor = 0
 			OR = {
 				NOT = {
-					trait = has_measles
-					trait = has_small_pox
+					trait = kind2
 				}
 			}
 		}
diff --git a/MOD/Witcher/interface/portraits/portrait_sprites.gfx b/MOD/Witcher/interface/portraits/portrait_sprites.gfx
index 48811d99d..86693e889 100644
--- a/MOD/Witcher/interface/portraits/portrait_sprites.gfx
+++ b/MOD/Witcher/interface/portraits/portrait_sprites.gfx
@@ -1458,4 +1458,11 @@ spriteTypes = {
 		can_be_lowres = yes
 	}
 	
+	spriteType = {
+		name = "GFX_character_heroes"
+		texturefile = "gfx\\characters\\western_male\\heroes.dds"
+		noOfFrames = 22
+		norefcount = yes
+		can_be_lowres = yes
+	}
 }
diff --git a/MOD/Witcher/interface/portraits/portraits.gfx b/MOD/Witcher/interface/portraits/portraits.gfx
index 0b7a734d6..c777d4aa9 100644
--- a/MOD/Witcher/interface/portraits/portraits.gfx
+++ b/MOD/Witcher/interface/portraits/portraits.gfx
@@ -35,6 +35,7 @@ spriteTypes = {
 			"GFX_western_male_clothes_infront:p3:c4"
 			"GFX_western_male_headgear:p5:c5"
 			"GFX_character_imprisoned:p6"
+			"GFX_character_heroes:p8"
 		}
 
 		hair_color_index = 8
@@ -88,6 +89,7 @@ spriteTypes = {
 			"GFX_western_male_clothes_infront:p3:c4"
 			"GFX_western_male_headgear:p5:c5"
 			"GFX_character_imprisoned:p6"
+			"GFX_character_heroes:p8"
 		}
 
 		hair_color_index = 8
@@ -142,6 +144,7 @@ spriteTypes = {
 			"GFX_western_male_clothes_infront:p3:c4"
 			"GFX_western_male_headgear:p5:c5"
 			"GFX_character_imprisoned:p6"
+			"GFX_character_heroes:p8"
 		}
 
 		hair_color_index = 8
@@ -355,6 +358,7 @@ spriteTypes = {
 			"GFX_empty:p3:c4"									#19
 			"GFX_western_female_headgear:p5:c5"                 #20
 			"GFX_character_imprisoned:p6"                       #21
+			"GFX_character_heroes:p8"
 		}
 
 		hair_color_index = 8
@@ -406,6 +410,7 @@ spriteTypes = {
 			"GFX_empty:p3:c4"
 			"GFX_western_female_headgear:p5:c5"
 			"GFX_character_imprisoned:p6"
+			"GFX_character_heroes:p8"
 		}
 
 		hair_color_index = 8
diff --git a/MOD/Witcher/localisation/W_assassin_of_kings_events.csv b/MOD/Witcher/localisation/W_assassin_of_kings_events.csv
index 2f445a0d1..36b01b9b2 100644
--- a/MOD/Witcher/localisation/W_assassin_of_kings_events.csv
+++ b/MOD/Witcher/localisation/W_assassin_of_kings_events.csv
@@ -18,6 +18,10 @@ EVTDESCaok.6;The war is over, the castle has fallen and my children are safe and
 EVTOPTAaok.6;They are my children.;;;;;;;;;;;;;x
 EVTOPTBaok.6;I will not leave them in hands of traitors.;;;;;;;;;;;;;x
 EVTOPTCaok.6;The war is over!;;;;;;;;;;;;;x
+EVTOPTAaok.7;Send the Witcher;;;;;;;;;;;;;x
+EVTOPTBaok.7;Send my marshal;;;;;;;;;;;;;x
+EVTOPTCaok.7;Go in myself;;;;;;;;;;;;;x
+
 
 EVTNAMEaok.1003;The Unicorn Returns.;;;;;;;;;;;;;x
 EVTDESCaok.1003;Once again, war threatens to engulf Aedirn and the Pontar Valley, past atrocities and treaties alike cast aside in the name of ambition. Although the last war ended in the fiery retribution of the witch Sabrina Glevissig, that is all the more reason to press forward and bring honor to the fallen dead. The death of King Demavend has emboldened you, as you have finally returned to claim your right and finally bring an end to his battle for the land rightfully called Lormark, and perhaps much more.\nHowever, Upper Aedirn does not remain idle. Years of repression and racism have inspired a unified rebellion among the lesser classes, led by Saskia the Dragonslayer, all ready to defend and reform their homeland. Furthermore, Demavend’s son, Prince Stennis, can still claim rightful rule and challenge any aggression. A bloody star rises over this old field of battle, and the spirits tremble in their wake.;;;;;;;;;;;;;x
diff --git a/MOD/Witcher/map/climate.txt b/MOD/Witcher/map/climate.txt
index ac3bca813..db0581518 100644
--- a/MOD/Witcher/map/climate.txt
+++ b/MOD/Witcher/map/climate.txt
@@ -27,6 +27,8 @@ normal_winter = {
 	345 346 347 348 349 350 351 352 353 354 403 407 499 500 501 503 504 505 
 	# Dol Blathanna
 	131 132 133 134 623 624 625 626 
+	# Emblonia
+	13 14 21 25 26 27 44 383 409 496 507 508 509 512 
 	# Eternal Fire
 	412 
 	# KAEDWEN / Daevon
@@ -59,10 +61,10 @@ normal_winter = {
 	149 150 151 152 153 158 159 160 161 162 163 164 382 392 393 395 399 410 650 651 652 653 656 657 671 
 	# TEMERIA / Brugge
 	28 29 30 31 398 674 675 676 677 
-	# TEMERIA / Emblonia
-	13 14 21 25 26 27 44 383 409 496 507 508 509 512 
 	# TEMERIA / Temeria
-	5 6 7 8 9 10 11 15 16 17 18 19 20 22 23 24 384 391 396 397 485 486 487 488 489 490 491 492 493 494 495 497 510 511 
+	5 6 7 8 9 10 11 16 17 18 19 20 22 23 24 384 391 396 397 485 486 487 488 489 490 491 492 493 494 495 
+	# Temeria
+	15 497 510 511 
 	# Tir Tochair
 	300 301 302 303 304 
 	# Toussaint
diff --git a/MOD/Witcher/map/provinceDef.xls b/MOD/Witcher/map/provinceDef.xls
index e25526c1b..e36414c8f 100644
Binary files a/MOD/Witcher/map/provinceDef.xls and b/MOD/Witcher/map/provinceDef.xls differ