diff --git a/VIET_Traits/common/traits/00_traits.txt b/VIET_Traits/common/traits/00_traits.txt
index c3b0436b..8f2b7944 100644
--- a/VIET_Traits/common/traits/00_traits.txt
+++ b/VIET_Traits/common/traits/00_traits.txt
@@ -1,3 +1,5 @@
+# -*- ck2.traits -*-
+
 # SPECIAL TRAIT FLAGS
 #
 # pilgrimage = yes		- The character is away and will need a regent, but does not lose any wards, etc
@@ -17,83 +19,144 @@
 
 # INTRIGUE OUTCOMES
 amateurish_plotter = {
+	attribute = intrigue
 	education = yes
 	
 	intrigue = 1
 	stewardship = -1
+	
+	male_insult_adj = INSULT_SCHEMING
+	female_insult_adj = INSULT_SCHEMING
+	child_insult_adj = INSULT_STUPID
 }
 flamboyant_schemer = {
+	attribute = intrigue
 	education = yes
 	
 	intrigue = 3
 	stewardship = -1
+	
+	male_insult_adj = INSULT_SCHEMING
+	female_insult_adj = INSULT_SCHEMING
+	child_insult_adj = INSULT_STUPID
 }
 intricate_webweaver = {
+	attribute = intrigue
 	education = yes
 	
 	intrigue = 6
 	martial = 1
 	diplomacy = 1
 	stewardship = -1
+	
+	male_compliment_adj = COMPL_CLEVER
+	female_compliment_adj = COMPL_CLEVER
+	male_insult_adj = INSULT_SCHEMING
+	female_insult_adj = INSULT_SCHEMING
+	child_insult_adj = INSULT_STUPID
 }
 elusive_shadow = {
+	attribute = intrigue
 	education = yes
 	
 	intrigue = 9
 	martial = 2
 	diplomacy = 2
 	stewardship = -1
+	
+	male_compliment_adj = COMPL_CLEVER
+	female_compliment_adj = COMPL_CLEVER
+	male_insult_adj = INSULT_SCHEMING
+	female_insult_adj = INSULT_SCHEMING
+	child_insult_adj = INSULT_STUPID
 }
 
 # DIPLOMACY OUTCOMES
 naive_appeaser = {
+	attribute = diplomacy
 	education = yes
 	
 	diplomacy = 1
 	martial = -1
+
+	male_insult_adj = INSULT_TWOFACED
+	female_insult_adj = INSULT_TWOFACED
+	child_insult_adj = INSULT_STUPID
 }
 underhanded_rogue = {
+	attribute = diplomacy
 	education = yes
 	
 	diplomacy = 3
 	martial = -1
 	fertility = 0.05
+
+	male_insult_adj = INSULT_TWOFACED
+	female_insult_adj = INSULT_TWOFACED
+	child_insult_adj = INSULT_STUPID
 }
 charismatic_negotiator = {
+	attribute = diplomacy
 	education = yes
 	
-	diplomacy = 6
+	diplomacy = 5 # EMF
 	intrigue = 1
 	learning = 1
 	martial = -1
 	fertility = 0.05
 	
+
+	male_compliment_adj = COMPL_ELOQUENT
+	female_compliment_adj = COMPL_ELOQUENT
+	child_compliment_adj = COMPL_NICE
+	male_insult_adj = INSULT_TWOFACED
+	female_insult_adj = INSULT_TWOFACED
+	child_insult_adj = INSULT_STUPID
 }
 grey_eminence = {
+	attribute = diplomacy
 	education = yes
 	
-	diplomacy = 9
+	diplomacy = 7 # EMF
 	intrigue = 2
 	learning = 2
 	martial = -1
 	fertility = 0.1
+
+	male_compliment_adj = COMPL_ELOQUENT
+	female_compliment_adj = COMPL_ELOQUENT
+	child_compliment_adj = COMPL_NICE
+	male_insult_adj = INSULT_TWOFACED
+	female_insult_adj = INSULT_TWOFACED
+	child_insult_adj = INSULT_STUPID
 }
 
 # STEWARDSHIP OUTCOMES
 indulgent_wastrel = {
+	attribute = stewardship
 	education = yes
 	
 	stewardship = 1
 	diplomacy = -1
+
+	male_insult_adj = INSULT_MISERLY
+	female_insult_adj = INSULT_MISERLY
+	child_insult_adj = INSULT_STUPID
 }
 thrifty_clerk = {
+	attribute = stewardship
 	education = yes
 	
 	stewardship = 3
 	diplomacy = -1
 	fertility = 0.05
+
+	male_insult_adj = INSULT_MISERLY
+	female_insult_adj = INSULT_MISERLY
+	child_insult_adj = INSULT_STUPID
 }
 fortune_builder = {	
+	attribute = stewardship
 	education = yes
 	
 	stewardship = 6
@@ -101,8 +164,16 @@ fortune_builder = {
 	learning = 1
 	diplomacy = -1
 	fertility = 0.1
+
+	male_compliment_adj = COMPL_THRIFTY
+	female_compliment_adj = COMPL_THRIFTY
+	child_compliment_adj = COMPL_CLEVER
+	male_insult_adj = INSULT_MISERLY
+	female_insult_adj = INSULT_MISERLY
+	child_insult_adj = INSULT_STUPID
 }
 midas_touched = {
+	attribute = stewardship
 	education = yes
 	
 	stewardship = 9
@@ -110,10 +181,18 @@ midas_touched = {
 	learning = 2
 	diplomacy = -1
 	fertility = 0.15
+
+	male_compliment_adj = COMPL_THRIFTY
+	female_compliment_adj = COMPL_THRIFTY
+	child_compliment_adj = COMPL_CLEVER
+	male_insult_adj = INSULT_MISERLY
+	female_insult_adj = INSULT_MISERLY
+	child_insult_adj = INSULT_STUPID
 }
 
 # MARTIAL OUTCOMES
 misguided_warrior = {
+	attribute = martial
 	education = yes
 	
 	martial = 1
@@ -124,6 +203,7 @@ misguided_warrior = {
 	health = 0.5
 }
 tough_soldier = {
+	attribute = martial
 	education = yes
 	
 	martial = 3
@@ -134,6 +214,7 @@ tough_soldier = {
 	health = 0.5
 }
 skilled_tactician = {
+	attribute = martial
 	education = yes
 	
 	martial = 6
@@ -146,6 +227,7 @@ skilled_tactician = {
 	health = 0.5
 }
 brilliant_strategist = {
+	attribute = martial
 	education = yes
 	
 	martial = 9
@@ -162,23 +244,31 @@ brilliant_strategist = {
 
 # ECCLESIASTICAL OUTCOMES
 detached_priest = {
-	priest = yes
+	attribute = learning
 	education = yes
 	
 	learning = 1
 	intrigue = -1
+
+	male_insult_adj = INSULT_DRIVELING
+	female_insult_adj = INSULT_DRIVELING
+	child_insult_adj = INSULT_STUPID
 }
 martial_cleric = {
-	priest = yes
+	attribute = learning
 	education = yes
 	
 	learning = 3
 	intrigue = -1
 	
 	ai_zeal = 10
+
+	male_insult_adj = INSULT_DRIVELING
+	female_insult_adj = INSULT_DRIVELING
+	child_insult_adj = INSULT_STUPID
 }
 scholarly_theologian = {
-	priest = yes
+	attribute = learning
 	education = yes
 	
 	learning = 6
@@ -189,9 +279,17 @@ scholarly_theologian = {
 	fertility = -0.05
 	
 	ai_zeal = 20
+
+
+	male_compliment_adj = COMPL_LEARNED
+	female_compliment_adj = COMPL_LEARNED
+	child_compliment_adj = COMPL_CLEVER
+	male_insult_adj = INSULT_DRIVELING
+	female_insult_adj = INSULT_DRIVELING
+	child_insult_adj = INSULT_STUPID
 }
 mastermind_theologian = {
-	priest = yes
+	attribute = learning
 	education = yes
 	
 	learning = 9
@@ -202,6 +300,13 @@ mastermind_theologian = {
 	fertility = -0.05
 	
 	ai_zeal = 30
+
+	male_compliment_adj = COMPL_LEARNED
+	female_compliment_adj = COMPL_LEARNED
+	child_compliment_adj = COMPL_CLEVER
+	male_insult_adj = INSULT_DRIVELING
+	female_insult_adj = INSULT_DRIVELING
+	child_insult_adj = INSULT_STUPID
 }
 
 ########################
@@ -214,7 +319,7 @@ stressed = {
 	stewardship = -1
 	health = -1
 	fertility = -0.1
-	command_modifier = {
+	command_modifier = { # EMF
 		morale_defence = -0.03
 	}
 }
@@ -226,10 +331,13 @@ depressed = {
 	intrigue = -1
 	health = -1
 	fertility = -0.05
-
+	
 	male_insult_adj = INSULT_LUGUBRIOUS
 	female_insult_adj = INSULT_LUGUBRIOUS
-	command_modifier = {
+	male_insult = INSULT_GRUMBLER
+	female_insult = INSULT_GRUMBLER
+
+	command_modifier = { # EMF
 		morale_defence = -0.03
 	}
 }
@@ -237,8 +345,8 @@ depressed = {
 lunatic = { # Highly event driven
 	is_health = yes
 	
-	vassal_opinion = -25
-	sex_appeal_opinion = -25
+	vassal_opinion = -5
+	sex_appeal_opinion = -10
 	same_opinion = 10
 	
 	ai_rationality = -50
@@ -247,29 +355,31 @@ lunatic = { # Highly event driven
 	female_insult = INSULT_BAT
 	male_insult_adj = INSULT_DEMENTED
 	female_insult_adj = INSULT_CRAZED
-	
-	command_modifier = {
+	child_insult_adj = INSULT_CRAZY
+
+	command_modifier = { # EMF
 		random = 0.03
 	}
 }
 possessed = { # Highly event driven
 	is_health = yes
 	
-	sex_appeal_opinion = -25
+	sex_appeal_opinion = -10
 	same_opinion = 10
 	
 	ai_rationality = -40
-
-	combat_rating = 1
 	
-	command_modifier = {
-		random = 0.03
-	}
+	combat_rating = 1
 	
 	male_insult = INSULT_WARLOCK
 	female_insult = INSULT_DEVIL_WOMAN
+	child_insult = INSULT_DEVIL
 	male_insult_adj = INSULT_DEMONIC
 	female_insult_adj = INSULT_DEMONIC
+
+	command_modifier = { # EMF
+		random = 0.03
+	}
 }
 ill = {
 	is_health = yes
@@ -300,7 +410,7 @@ pneumonic = {
 	martial = -2
 	intrigue = -2
 	learning = -2
-	health = -5
+	health = -4
 	fertility = -0.5
 	
 	combat_rating = -3
@@ -320,20 +430,24 @@ syphilitic = {
 	intrigue = -1
 	learning = -1
 	
-	health = -2.5
+	health = -2
 	fertility = -0.2
+	
+	male_insult_adj = INSULT_SYPHILITIC
+	female_insult_adj = INSULT_SYPHILITIC
+	child_insult_adj = INSULT_UGLY
 }
 leper = {
 	is_health = yes
 	is_illness = yes
 	diplomacy = -2
-	health = -1
+	health = -2
 	fertility = -0.2
 	
 	sex_appeal_opinion = -50
 	same_opinion = 10
 	
-	vassal_opinion = -20
+	vassal_opinion = -10
 	
 	combat_rating = -2
 	
@@ -341,6 +455,7 @@ leper = {
 	female_insult = INSULT_LEPER
 	male_insult_adj = INSULT_UNCLEAN
 	female_insult_adj = INSULT_UNCLEAN
+	child_insult_adj = INSULT_UGLY
 }
 wounded = {
 	is_health = yes
@@ -352,7 +467,7 @@ wounded = {
 	combat_rating = -1
 	
 	martial = -1
-	health = -1.5
+	health = -1
 }
 maimed = {
 	is_health = yes
@@ -364,11 +479,14 @@ maimed = {
 	combat_rating = -4
 	
 	sex_appeal_opinion = -15
-	same_opinion = 10
+	same_opinion = 5
 	
 	martial = -2
-	health = -2.5
-	male_insult_adj = INSULT_CRIPPLE
+	health = -2
+	
+	male_insult = INSULT_CRIPPLE
+	male_insult_adj = INSULT_USELESS
+	female_insult_adj = INSULT_USELESS
 }
 infirm = {
 	is_health = yes
@@ -379,7 +497,7 @@ infirm = {
 	martial = -3
 	learning = -3
 	
-	health = -2.5
+	health = -1
 	fertility = -0.3
 	
 	ai_rationality = -10
@@ -389,6 +507,7 @@ infirm = {
 	male_insult = INSULT_DODDERER
 	male_insult_adj = INSULT_SENILE
 	female_insult_adj = INSULT_SENILE
+	child_insult_adj = INSULT_STUPID
 }
 incapable = {
 	is_health = yes
@@ -408,6 +527,8 @@ incapable = {
 	
 	male_insult = INSULT_VEGETABLE
 	female_insult = INSULT_VEGETABLE
+	male_insult_adj = INSULT_USELESS
+	female_insult_adj = INSULT_USELESS
 }
 drunkard = {
 	is_health = yes
@@ -416,13 +537,9 @@ drunkard = {
 	
 	combat_rating = -1
 	
-	same_opinion = 10
-	church_opinion = -10
+	same_opinion = 5
+	church_opinion = -5
 	sex_appeal_opinion = -5
-
-	command_modifier = {
-		defence = -0.05
-	}
 	
 	ai_rationality = -5
 	
@@ -430,12 +547,14 @@ drunkard = {
 	female_insult = INSULT_DRUNKARD
 	male_insult_adj = INSULT_BESOTTED
 	female_insult_adj = INSULT_BESOTTED
+	child_insult_adj = INSULT_STUPID
 }
 has_tuberculosis = {
 	is_epidemic = yes
 	is_illness = yes
 	
-	health = -2.5
+	health = -2
+	
 	combat_rating = -2
 	
 	customizer = no
@@ -444,7 +563,8 @@ has_typhoid_fever = {
 	is_epidemic = yes
 	is_illness = yes
 	
-	health = -3.5
+	health = -2
+	
 	combat_rating = -4
 	
 	customizer = no
@@ -453,10 +573,13 @@ has_typhus = {
 	is_epidemic = yes
 	is_illness = yes
 	
-	health = -3.5
+	health = -4
+	
 	combat_rating = -4
 	
 	customizer = no
+
+	child_insult_adj = INSULT_SMELLY
 }
 has_bubonic_plague = {
 	is_epidemic = yes
@@ -467,12 +590,17 @@ has_bubonic_plague = {
 	combat_rating = -10
 	
 	customizer = no
+
+	male_insult_adj = INSULT_DECAYING
+	female_insult_adj = INSULT_DECAYING
+	child_insult_adj = INSULT_SMELLY
 }
 has_measles = {
 	is_epidemic = yes
 	is_illness = yes
 	
-	health = -2.5
+	health = -2
+	
 	combat_rating = -3
 	
 	customizer = no
@@ -481,7 +609,8 @@ has_small_pox = {
 	is_epidemic = yes
 	is_illness = yes
 
-	health = -3.5
+	health = -3
+	
 	combat_rating = -10
 	
 	customizer = no
@@ -492,30 +621,29 @@ has_small_pox = {
 ############################
 
 crusader = {
-	potential = {
-		religion_group = christian
+	opposites = {
+		mujahid
 	}
 	
-	martial = 2
 	combat_rating = 1
 	
-	church_opinion = 25
-	same_opinion_if_same_religion = 30
+	church_opinion = 15
+	same_opinion_if_same_religion = 15
 	
 	ai_zeal = 10
-
+	
 	male_compliment = COMPL_CRUSADER
 	female_compliment = COMPL_CRUSADER
 	
-	command_modifier = {
+	command_modifier = { # EMF
 		religious_enemy = 0.05
 	}
 }
 
 bastard = {
 	diplomacy = -1
-	same_opinion = 10
-	
+	same_opinion = 5
+
 	opposites =  {
 		legit_bastard
 	}
@@ -526,13 +654,13 @@ bastard = {
 	male_insult_adj = INSULT_BASEBORN
 }
 twin = {
-	twin_opinion = 30
+	twin_opinion = 15
 	
 	customizer = no
 }
 legit_bastard = {
 	diplomacy = -1
-	
+
 	opposites =  {
 		bastard
 	}
@@ -541,7 +669,9 @@ legit_bastard = {
 	male_insult_adj = INSULT_BASEBORN
 }
 pregnant = {
-	spouse_opinion = 25
+	combat_rating = -2
+	
+	spouse_opinion = 15
 	
 	customizer = no
 }
@@ -551,6 +681,13 @@ excommunicated = {
 
 	religious = yes
 	customizer = no
+	
+	male_insult = INSULT_RENEGADE
+	female_insult = INSULT_RENEGADE
+	child_insult = INSULT_DEVIL
+	male_insult_adj = INSULT_GODLESS
+	female_insult_adj = INSULT_GODLESS
+	child_insult_adj = INSULT_EVIL
 }
 kinslayer = {
 	potential = {
@@ -559,21 +696,25 @@ kinslayer = {
 
 	diplomacy = -3
 	
-	dynasty_opinion = -25
+	dynasty_opinion = -15
 	
 	male_insult = INSULT_KINSLAYER
 	female_insult = INSULT_KINSLAYER
 }
 homosexual = {
 	sex_appeal_opinion = 30 # Only to those of the same sex
-	vassal_opinion = -10
+	vassal_opinion = -5
 	
 	fertility = -0.15
 	
+	ruler_designer_cost = 0
+	
 	male_insult = INSULT_SODOMITE
 	male_insult_adj = INSULT_EFFEMINATE
 	female_insult = INSULT_LESBIAN
 	female_insult_adj = INSULT_SAPPHIC
+	child_insult = INSULT_PEABRAIN
+	child_insult_adj = CRAZY
 }
 
 #####################
@@ -581,7 +722,7 @@ homosexual = {
 #####################
 
 clubfooted = {
-	birth = 50
+	birth = 100 # EMF
 	inherit_chance = 15
 	
 	combat_rating = -1
@@ -597,7 +738,7 @@ clubfooted = {
 	female_insult_adj = INSULT_LIMPING
 }
 harelip = {
-	birth = 50
+	birth = 100 # EMF
 	inherit_chance = 15
 	
 	sex_appeal_opinion = -10
@@ -611,13 +752,13 @@ harelip = {
 	female_insult_adj = INSULT_CLEFT_LIPPED
 }
 hunchback = {
-	birth = 50
+	birth = 100 # EMF
 	inherit_chance = 15
 	
 	sex_appeal_opinion = -30
 	same_opinion = 5
 	
-	vassal_opinion = -5
+	vassal_opinion = -2 # EMF
 	
 	martial = -1
 	
@@ -627,43 +768,34 @@ hunchback = {
 	female_insult_adj = INSULT_CROOKED
 }
 lisp = {
-	birth = 50
+	birth = 100 # EMF
 	inherit_chance = 15
 	
 	sex_appeal_opinion = -5
 	same_opinion = 5
 	
 	diplomacy = -1
-
+	
 	male_insult = INSULT_LISPER
 	female_insult = INSULT_LISPER
 	male_insult_adj = INSULT_FALTERING
 	female_insult_adj = INSULT_FALTERING
-	
-	command_modifier = {
-		morale_offence = -0.01
-		morale_defence = -0.01
-	}
+	child_insult_adj = INSULT_STUPID
 }
 stutter = {
-	birth = 50
+	birth = 100 # EMF
 	inherit_chance = 15
 	
 	same_opinion = 5
 	
 	diplomacy = -1
-
+	
 	male_insult_adj = INSULT_STUTTERING
 	female_insult_adj = INSULT_STUTTERING
-	
-	command_modifier = {
-		morale_offence = -0.02
-		morale_defence = -0.02
-	}	
-	
+	child_insult_adj = INSULT_STUPID
 }
 fair = {
-	birth = 100
+	birth = 200 # EMF
 	inherit_chance = 15
 	
 	sex_appeal_opinion = 30
@@ -678,9 +810,10 @@ fair = {
 	female_compliment_adj = COMPL_FAIR
 	male_compliment = COMPL_CHARMER
 	male_compliment_adj = COMPL_HANDSOME
+	child_compliment_adj = COMPL_PRETTY
 }
 ugly = {
-	birth = 100
+	birth = 200 # EMF
 	inherit_chance = 10
 	
 	sex_appeal_opinion = -20
@@ -690,44 +823,51 @@ ugly = {
 	}
 	
 	diplomacy = -1
-
+	
 	male_insult = INSULT_GROTESQUE
 	female_insult = INSULT_GORGON
+	female_insult = INSULT_TROLL
 	male_insult_adj = INSULT_HIDEOUS
 	female_insult_adj = INSULT_HIDEOUS
-
-	command_modifier = {
-		morale_offence = 0.03
-	}
+	child_insult_adj = INSULT_UGLY
 }
 dwarf = {
 	birth = 25
 	inherit_chance = 25
+	both_parent_has_trait_inherit_chance = 50
 	
 	sex_appeal_opinion = -30
 	same_opinion = 10
+	vassal_opinion = -10 # EMF
 
-	opposites =  {
+	opposites =  { # EMF
 		tall
 	}
 
+	intrigue = 1 # EMF
+	monthly_character_prestige = 0.05 # EMF
 	martial = -1
 	
+	health = -1 #EMF
+	fertility = -0.1 #EMF
+
 	combat_rating = -3
 	
 	male_insult = INSULT_DWARF
 	female_insult = INSULT_DWARF
 	male_insult_adj = INSULT_LITTLE
 	female_insult_adj = INSULT_LITTLE
+	child_insult_adj = INSULT_STUPID
 }
 genius = {
-	birth = 50
+	birth = 100 # EMF
 	inherit_chance = 15
 	
 	opposites =  {
 		imbecile
 		slow
 		quick
+		dull
 	}
 	
 	diplomacy = 5
@@ -740,22 +880,25 @@ genius = {
 	
 	ai_rationality = 30
 	
-	vassal_opinion = 5
+	vassal_opinion = 3 # EMF
 	
 	male_compliment = COMPL_GENIUS
 	male_compliment_adj = COMPL_BRILLIANT
 	female_compliment = COMPL_GENIUS
 	female_compliment_adj = COMPL_BRILLIANT
+	child_compliment = COMPL_SMARTY
+	child_compliment_adj = COMPL_CLEVER
 }
 
 quick = {
-	birth = 100
+	birth = 200 # EMF
 	inherit_chance = 15
 	
 	opposites =  {
 		imbecile
 		slow
 		genius
+		dull
 	}
 	
 	diplomacy = 3
@@ -767,13 +910,14 @@ quick = {
 	ai_rationality = 15
 }
 slow = {
-	birth = 100
+	birth = 200 # EMF
 	inherit_chance = 15
 	
 	opposites =  {
 		imbecile
 		quick
 		genius
+		shrewd
 	}
 	
 	diplomacy = -3
@@ -788,9 +932,10 @@ slow = {
 	female_insult = INSULT_NITWIT
 	male_insult_adj = INSULT_DIM
 	female_insult_adj = INSULT_VACUOUS
+	child_insult_adj = INSULT_STUPID
 }
 imbecile = {
-	birth = 50
+	birth = 100 # EMF
 	inherit_chance = 15
 	
 	sex_appeal_opinion = -30
@@ -815,12 +960,14 @@ imbecile = {
 	
 	male_insult = INSULT_IMBECILE
 	female_insult = INSULT_IMBECILE
+	child_insult = INSULT_PEABRAIN
 	male_insult_adj = INSULT_IDIOT
 	female_insult_adj = INSULT_IDIOT
 }
 inbred = {
 	inbred = yes
 	inherit_chance = 25
+	both_parent_has_trait_inherit_chance = 50
 	
 	sex_appeal_opinion = -30
 	
@@ -834,64 +981,65 @@ inbred = {
 	
 	combat_rating = -2
 	
-	vassal_opinion = -20
+	vassal_opinion = -10
 	
 	ai_rationality = -20
 	
 	male_insult = INSULT_ABOMINATION
 	female_insult = INSULT_FREAK
+	child_insult = INSULT_TROLL
 	male_insult_adj = INSULT_MONSTROUS
 	female_insult_adj = INSULT_HIDEOUS
+	child_insult_adj = INSULT_UGLY
 }
 strong = {
-	birth = 100
+	birth = 200 # EMF
 	inherit_chance = 15
 	
 	opposites =  {
 		weak
+		feeble
 	}
 	
-	diplomacy = 1
+	# diplomacy = 1 # EMF
 	martial = 2
 	
-	health = 2
+	health = 1
 	fertility = 0.1
 	
-	combat_rating = 2
+	combat_rating = 1
 	
 	sex_appeal_opinion = 10
-	vassal_opinion = 10
-	tribal_opinion = 20
-
-	male_compliment_adj = COMPL_STRONG
+	vassal_opinion = 5
+	tribal_opinion = 10
 	
-	command_modifier = {
+	male_compliment_adj = COMPL_STRONG
+
+	command_modifier = { # EMF
 		damage = 0.02
 		morale_offence = 0.01
 	}
 }
 weak = {
-	birth = 100
+	birth = 200 # EMF
 	inherit_chance = 15
 	
 	opposites =  {
 		strong
+		robust
 	}
 	
 	health = -1.0
 	fertility = -0.05
 	
 	martial = -1
-	combat_rating = -2
+	combat_rating = -1
 	
 	sex_appeal_opinion = -10
-	vassal_opinion = -10
-	tribal_opinion = -20
-
-	male_insult = INSULT_WEAKLING	
-	command_modifier = {
-		morale_defence = -0.01
-	}
+	vassal_opinion = -5
+	tribal_opinion = -10
+	
+	male_insult = INSULT_WEAKLING
 }
 
 ################################################
@@ -900,27 +1048,30 @@ weak = {
 
 celibate = {
 	
-	potential = {
-		religion_group = christian
-	}
-	
 	opposites =  {
 		hedonist
+		lustful # EMF
 		seducer
 		seductress
 	}
-
-	learning = 2
-
+	
 	fertility = -10.0
+	learning = 2 # EMF
 	
-	christian_church_opinion = 10
-	opposite_opinion = -20
-	same_opinion = 20
+	christian_church_opinion = 5
+	opposite_opinion = -5
+	same_opinion = 10
 	
 	monthly_character_piety = 1
 	
 	ai_zeal = 30
+	
+	male_compliment = COMPL_VIRTUOUS
+	female_compliment = COMPL_VIRTUOUS
+	child_compliment = COMPL_NICE
+	male_insult = INSULT_UNMANLY
+	female_insult = INSULT_FRIGID
+	child_insult = INSULT_STUPID
 }
 
 hedonist = {
@@ -928,27 +1079,29 @@ hedonist = {
 	
 	opposites =  {
 		celibate
+		chaste # EMF
+		perfecti # EMF
 	}
-
+	
 	diplomacy = 2
 	intrigue = 1
 
 	fertility = 0.2
 	
-	opposite_opinion = -20
-	same_opinion = 20
-	
-	christian_church_opinion = -10
+	opposite_opinion = -5
+	same_opinion = 10
 	
-	monthly_character_piety = -0.5
+	christian_church_opinion = -5
 	
 	ai_zeal = -30
+	ruler_designer_cost = 10
 	
 	male_insult = INSULT_DEBAUCHER
 	female_insult = INSULT_DEBAUCHER
+	child_insult = INSULT_HAYBRAIN
 	male_insult_adj = INSULT_PERVERTED
 	female_insult_adj = INSULT_DEGENERATE
-	
+	child_insult_adj = INSULT_CRAZY
 }
 scholar = {
 	lifestyle = yes
@@ -962,35 +1115,60 @@ scholar = {
 	
 	learning = 3
 	
-	same_opinion = 20
+	same_opinion = 10
+	
+	ruler_designer_cost = 10
 	
 	male_compliment = COMPL_SCHOLAR
 	female_compliment = COMPL_SCHOLAR
+	child_compliment = COMPL_SMARTY
 	male_compliment_adj = COMPL_LEARNED
 	female_compliment_adj = COMPL_LEARNED
+	child_compliment_adj = COMPL_CLEVER
+	male_insult = INSULT_BOOKWORM
+	female_insult = INSULT_BOOKWORM
+	child_insult = INSULT_BORE
+	male_insult_adj = INSULT_SQUINTEYED
+	female_insult_adj = INSULT_SQUINTEYED
 }
 gardener = {
 	lifestyle = yes
 	
 	stewardship = 2
-	intrigue = 1
+	learning = 1
 	
-	same_opinion = 20
+	same_opinion = 10
+	
+	ruler_designer_cost = 10
+	
+	male_insult = INSULT_TREEHUGGER
+	female_insult = INSULT_TREEHUGGER
 }
 mystic = {
 	lifestyle = yes
 	
-	learning = 2
-	stewardship = 1
+	intrigue = 2 # EMF
+	learning = 1 # EMF
+	
+	same_opinion = 10
 	
-	same_opinion = 20
-
 	male_compliment = COMPL_MYSTIC
 	female_compliment = COMPL_MYSTIC
 	
-	command_modifier = {
-		random = 0.01
-	}
+	ruler_designer_cost = 10
+	
+	male_compliment = COMPL_SCHOLAR
+	female_compliment = COMPL_SCHOLAR
+	child_compliment = COMPL_SMARTY
+	male_compliment_adj = COMPL_LEARNED
+	female_compliment_adj = COMPL_LEARNED
+	child_compliment_adj = COMPL_CLEVER
+	male_insult = INSULT_OCCULTIST
+	female_insult = INSULT_OCCULTIST
+	child_insult = INSULT_DEVIL
+	male_insult_adj = INSULT_GODLESS
+	female_insult_adj = INSULT_GODLESS
+	child_insult_adj = INSULT_WEIRD
 }
 impaler = {
 	lifestyle = yes
@@ -998,11 +1176,15 @@ impaler = {
 	potential = {
 		NOT = { religion = jain }
 	}
-	
-	intrigue = 2
-	learning = 1
-	
-	same_opinion = 20
+
+	martial = 1  # EMF
+	intrigue = 2  # EMF
+
+	opposites = {  # EMF
+		  kind
+	}
+
+	same_opinion = 10
 	
 	ai_honor = -15
 	
@@ -1014,6 +1196,9 @@ impaler = {
 	female_insult = INSULT_TORTURER
 	male_insult_adj = INSULT_EVIL
 	female_insult_adj = INSULT_EVIL
+	child_insult_adj = INSULT_WICKED
+	
+	ruler_designer_cost = 10
 }
 duelist = {
 	lifestyle = yes
@@ -1023,9 +1208,10 @@ duelist = {
 	
 	same_opinion = 20
 	
-	command_modifier = {
-		damage = 0.01
-	}
+	ruler_designer_cost = 10
+	
+	male_compliment = COMPL_BLADEMASTER
+	female_compliment = COMPL_CHAMPION
 }
 hunter = {
 	lifestyle = yes
@@ -1033,25 +1219,31 @@ hunter = {
 	potential = {
 		NOT = { religion = jain }
 	}
-
+	
 	martial = 2
-	diplomacy = 1
+	# diplomacy = 1 # EMF
 	
-	same_opinion = 20
-
 	command_modifier = {
-		morale_offence = 0.03
+		pursue = 0.2
 	}
+
+	same_opinion = 10
+	
+	ruler_designer_cost = 10
+	
+	male_compliment = COMPL_HUNTMASTER
 }
 
 # Way of Life DLC: No longer a lifestyle trait
 poet = {
 	diplomacy = 1
 	
-	same_opinion = 20
+	same_opinion = 10
 	
 	male_compliment = COMPL_POET
 	female_compliment = COMPL_POET
+	
+	ruler_designer_cost = 4
 }
 
 # Way of Life DLC: No longer a lifestyle trait
@@ -1061,8 +1253,11 @@ falconer = {
 	}
 
 	diplomacy = 1
+	martial = 1 # EMF
 	
-	same_opinion = 20
+	same_opinion = 10
+	
+	ruler_designer_cost = 4
 }
 
 #################################################################
@@ -1074,12 +1269,14 @@ lustful = {
 	personality = yes
 	opposites =  {
 		chaste
+		celibate # EMF
+		perfecti # EMF
 	}
-	fertility = 0.2
+	fertility = 0.25
 	
 	intrigue = 1
 	
-	christian_church_opinion = -10
+	christian_church_opinion = -5
 	
 	monthly_character_piety = -0.25
 	
@@ -1088,10 +1285,13 @@ lustful = {
 	
 	male_insult = INSULT_LECHER
 	male_insult_adj = INSULT_LECHEROUS
+	child_insult = INSULT_TROLL
+	child_insult_adj = INSULT_CREEPY
 	female_insult = INSULT_TROLLOP
 	female_insult_adj = INSULT_WANTON
 	male_compliment_adj = COMPL_VIVACIOUS
 	female_compliment_adj = COMPL_VIVACIOUS
+	female_compliment_adj = COMPL_NICE
 }
 chaste = {
 	personality = yes
@@ -1102,13 +1302,14 @@ chaste = {
 	
 	opposites =  {
 		lustful
+		hedonist # EMF
 	}
 	fertility = -0.15
 	
 	learning = 1
 	
-	christian_church_opinion = 10
-	opposite_opinion = -20
+	christian_church_opinion = 5
+	opposite_opinion = -5
 	
 	monthly_character_piety = 0.5
 	
@@ -1116,36 +1317,36 @@ chaste = {
 	
 	male_compliment_adj = COMPL_CHASTE
 	female_compliment_adj = COMPL_CHASTE
+	child_compliment_adj = COMPL_NICE
 	male_insult = INSULT_PRUDE
 	female_insult = INSULT_PRUNE
+	child_insult = INSULT_PIGFACE
 	female_insult_adj = INSULT_PRUDISH
+	child_insult_adj = INSULT_STUPID
 }
 gluttonous = {
 	personality = yes
 	opposites =  {
 		temperate
+		perfecti
 	}
 	
 	sex_appeal_opinion = -15
-	church_opinion = -10
-	same_opinion = 10
-
-	global_tax_modifier = 0.05	
-	stewardship = -2
+	church_opinion = -5
+	same_opinion = 5
 	
-	health = 0.5
+	stewardship = -1 # EMF
+	health = -0.25 # EMF
 	
 	ai_greed = 20
 	ai_zeal = -10
-
+	
 	male_insult = INSULT_GLUTTON
 	male_insult_adj = INSULT_GORGING
 	female_insult = INSULT_GLUTTON
 	female_insult_adj = INSULT_GORGING
-	
-	command_modifier = {
-		speed = -0.02
-	}
+	child_insult = INSULT_PIGFACE
+	child_insult_adj = INSULT_FLABBY
 }
 temperate = {
 	personality = yes
@@ -1153,11 +1354,12 @@ temperate = {
 		gluttonous
 	}
 	
-	church_opinion = 10
-	opposite_opinion = -20
-	same_opinion = 20
-
+	church_opinion = 5
+	opposite_opinion = -5
+	same_opinion = 5
+	
 	stewardship = 2
+	monthly_character_piety = 0.15 # EMF
 	
 	ai_greed = -20
 	ai_zeal = 10
@@ -1166,11 +1368,13 @@ temperate = {
 	female_insult = INSULT_BORE
 	male_compliment_adj = COMPL_LEVELHEADED
 	female_compliment_adj = COMPL_PLEASANT
+	child_compliment_adj = COMPL_NICE
 }
 greedy = {
 	personality = yes
 	opposites =  {
 		charitable
+		perfecti
 	}
 	global_tax_modifier = 0.1
 	diplomacy = -1
@@ -1181,18 +1385,21 @@ greedy = {
 	
 	male_insult_adj = INSULT_COVETOUS
 	female_insult_adj = INSULT_VENAL
+	child_insult_adj = INSULT_STUPID
 }
 charitable = {
 	personality = yes
 	opposites =  {
 		greedy
 	}
-	global_tax_modifier = -0.05
-	diplomacy = 3
+	diplomacy = 2 # EMF
+
+	global_tax_modifier = -0.05 # EMF
+	monthly_character_piety = 0.25 # EMF
 	
-	church_opinion = 10
-	opposite_opinion = -20
-	same_opinion = 20
+	church_opinion = 5
+	opposite_opinion = -5
+	same_opinion = 5
 	
 	ai_honor = 10
 	ai_ambition = -15
@@ -1209,9 +1416,7 @@ slothful = {
 		diligent
 	}
 	
-	fertility = 0.1
-	
-	vassal_opinion = -10
+	vassal_opinion = -5
 	
 	diplomacy = -1
 	intrigue = -1
@@ -1224,15 +1429,15 @@ slothful = {
 	ai_greed = 10
 	ai_zeal = -10
 
+	command_modifier = { # EMF
+		speed = -0.05
+	}
+	
 	male_insult = INSULT_IDLER
 	female_insult = INSULT_IDLER
 	male_insult_adj = INSULT_INDOLENT
 	female_insult_adj = INSULT_INDOLENT
-	
-	command_modifier = {
-		speed = -0.03
-	}
-	
+	child_insult_adj = INSULT_LAZY
 }
 diligent = {
 	personality = yes
@@ -1240,13 +1445,11 @@ diligent = {
 		slothful
 	}
 	
-	fertility = -0.1
-	
-	vassal_opinion = 10
-	opposite_opinion = -20
-	same_opinion = 20
+	vassal_opinion = 5
+	opposite_opinion = -5
+	same_opinion = 5
 	
-	diplomacy = 1
+	# diplomacy = 1  # EMF
 	intrigue = 1
 	stewardship = 1
 	martial = 1
@@ -1254,20 +1457,21 @@ diligent = {
 	
 	ai_greed = -10
 	ai_zeal = 10
-
-	male_compliment_adj = COMPL_DILIGENT
-	female_compliment_adj = COMPL_DILIGENT
+	ai_ambition = 10 # EMF
 	
-	command_modifier = {
+	command_modifier = { # EMF
 		morale_defence = 0.02
 		speed = 0.02
 	}	
 	
+	male_compliment_adj = COMPL_DILIGENT
+	female_compliment_adj = COMPL_DILIGENT
 }
 envious = {
 	personality = yes
 	opposites =  {
 		kind
+		perfecti
 	}
 	intrigue = 2
 	diplomacy = -1
@@ -1275,37 +1479,31 @@ envious = {
 	liege_opinion = -15
 	
 	ai_honor = -10
-
+	
 	male_insult_adj = INSULT_ENVIOUS
 	female_insult_adj = INSULT_ENVIOUS
-	
-	command_modifier = {
-		damage = 0.01
-	}
 }
 kind = {
 	personality = yes
 	opposites =  {
 		envious
 		cruel
+		impaler # EMF
 	}
 	intrigue = -2
-	diplomacy = 2
+	diplomacy = 1 # EMF
 	
-	vassal_opinion = 10
-	opposite_opinion = -20
-	same_opinion = 20
+	vassal_opinion = 3 # EMF
+	opposite_opinion = -10 # EMF
+	same_opinion = 10 # EMF
 	
-	ai_honor = 10
+	monthly_character_piety = 0.25 # EMF
 
-	male_insult = INSULT_SOFT
+	ai_honor = 10
+	
+	male_insult_adj = INSULT_SOFT
 	male_compliment_adj = COMPL_KINDLY
 	female_compliment_adj = COMPL_KINDHEARTED
-	
-	command_modifier = {
-		morale_defence = 0.01
-		pursue = -0.03
-	}
 }
 wroth = {
 	personality = yes
@@ -1318,14 +1516,10 @@ wroth = {
 	
 	ai_rationality = -10
 	ai_honor = -5
-
+	
 	male_insult_adj = INSULT_RAGING
 	female_insult = INSULT_HARRIDAN
-	
-	command_modifier = {
-		damage = 0.03
-		pursue = 0.03
-	}	
+	child_insult = INSULT_MEANIE
 }
 patient = {
 	personality = yes
@@ -1341,12 +1535,13 @@ patient = {
 	ai_rationality = 10
 	
 	command_modifier = {
-		flank = 0.01
-		defence = 0.03
+		flank = 0.05 # EMF
+		defence = 0.1 # EMF
 	}
 	
 	male_insult = INSULT_SPIDER
 	female_insult = INSULT_SPIDER
+	child_insult = INSULT_DONKEY
 }
 proud = {
 	personality = yes
@@ -1354,16 +1549,10 @@ proud = {
 		humble
 	}
 	
-	same_opinion = -20
-
 	monthly_character_prestige = 0.5
 	
 	ai_ambition = 10
 	
-	command_modifier = {
-		morale_offence = 0.03
-	}
-
 	male_compliment_adj = COMPL_PROUD
 	female_compliment_adj = COMPL_PROUD
 }
@@ -1374,17 +1563,16 @@ humble = {
 	}
 	
 	monthly_character_piety = 1
-	opposite_opinion = -20
-	same_opinion = 20
+	opposite_opinion = -5
+	same_opinion = 5
 	
 	ai_ambition = -10
-
+	
 	male_compliment_adj = COMPL_HUMBLE
 	female_compliment_adj = COMPL_HUMBLE
-	
-	command_modifier = {
-		morale_defence = 0.03
-	}
+	male_insult_adj = INSULT_GROVELING
+	female_insult_adj = INSULT_GROVELING
+	child_insult_adj = INSULT_STUPID
 }
 
 # OTHER
@@ -1398,18 +1586,14 @@ deceitful = {
 	intrigue = 3
 	diplomacy = -2
 	
-	opposite_opinion = -20
-	
-	zoroastrian_opinion = -10
+	opposite_opinion = -10 # EMF
+	zoroastrian_opinion = -5 # EMF
 	
 	ai_honor = -25
-
-		command_modifier = {
-		flank = 0.02
-	}
-
+	
 	male_insult_adj = INSULT_DECEITFUL
 	female_insult_adj = INSULT_DECEITFUL
+	child_insult_adj = INSULT_WICKED
 }
 honest = {
 	personality = yes
@@ -1418,21 +1602,19 @@ honest = {
 	}
 	
 	intrigue = -2
-	diplomacy = 3
+	diplomacy = 2 # EMF
 	
-	opposite_opinion = -20
-	same_opinion = 20
-	
-	zoroastrian_opinion = 10
+	opposite_opinion = -10 # EMF
+	same_opinion = 10 # EMF
+
+	zoroastrian_opinion = 5 # EMF
+	monthly_character_piety = 0.2 # EMF
 	
 	ai_honor = 25
-
+	
 	male_compliment_adj = COMPL_SINCERE
 	female_compliment_adj = COMPL_FORTHRIGHT
-	
-	command_modifier = {
-		center = 0.01
-	}
+	child_compliment_adj = COMPL_GOOD
 }
 craven = {
 	personality = yes
@@ -1441,20 +1623,18 @@ craven = {
 	}
 	
 	vassal_opinion = -5
-
-	intrigue = 1
-	diplomacy = 1	
+	intrigue = 1  # EMF
 	martial = -2
 	combat_rating = -1
 	
 	command_modifier = {
 		morale_defence = -0.2
-		retreat = 0.01
 	}
 	
 	male_insult = INSULT_COWARD
 	male_insult_adj = INSULT_CRAVEN
 	female_insult_adj = INSULT_WUSSY
+	child_insult_adj = INSULT_WUSSY
 }
 brave = {
 	personality = yes
@@ -1462,17 +1642,15 @@ brave = {
 		craven
 	}
 	
-	vassal_opinion = 10
-	opposite_opinion = -20
-	same_opinion = 20
-
-	intrigue = -2	
+	vassal_opinion = 3 # EMF
+	opposite_opinion = -5
+	same_opinion = 5
+	
 	martial = 2
 	combat_rating = 1
 	
 	command_modifier = {
 		morale_defence = 0.1
-		center = 0.01
 	}
 	
 	male_compliment_adj = COMPL_BRAVE
@@ -1483,21 +1661,14 @@ shy = {
 	opposites =  {
 		gregarious
 	}
-
-	same_opinion = 20
-
-	learning = 1
-	stewardship = 1	
+	
 	diplomacy = -2
-
+	
 	male_insult_adj = INSULT_TIMID
 	female_insult_adj = INSULT_COY
+	child_insult_adj = INSULT_STUPID
 	female_compliment_adj = COMPL_DEMURE
-	
-	command_modifier = {
-		morale_offence = -0.01
-		morale_defence = -0.01
-	}	
+	child_compliment_adj = COMPL_NICE
 }
 gregarious = {
 	personality = yes
@@ -1506,18 +1677,19 @@ gregarious = {
 	}
 	
 	sex_appeal_opinion = 5
-	same_opinion = 20
-	
-	vassal_opinion = 5
+	same_opinion = 5
 	
-	intrigue = -2	
+	# vassal_opinion = 5 # EMF
+
 	diplomacy = 2
+	intrigue = 1
 	
 	male_compliment = COMPL_WIT
 	male_compliment_adj = COMPL_AFFABLE
 	female_compliment = COMPL_WIT
 	female_compliment_adj = COMPL_FETCHING
-	
+	child_compliment_adj = COMPL_NICE
+	child_compliment_adj = COMPL_HERO
 }
 ambitious = {
 	personality = yes
@@ -1531,42 +1703,38 @@ ambitious = {
 	martial = 2
 	learning = 2
 	
-	same_opinion = -10
-	ambition_opinion = -50 # Against those they want something from
+	same_opinion = -5
+	ambition_opinion = -25 # Against those they want something from
 	
 	ai_ambition = 40
 	ai_zeal = 10
-
+	
 	male_insult_adj = INSULT_RAPACIOUS
 	female_insult_adj = INSULT_GRASPING
-	
-	command_modifier = {
-		damage = 0.01
-		center = 0.01
-	}
+	male_insult_adj = INSULT_RAPACIOUS
+	female_insult_adj = INSULT_GRASPING
+	child_insult_adj = INSULT_WICKED
 }
 content = {
 	personality = yes
 	opposites =  {
 		ambitious
 	}
-
-	vassal_opinion = 5
 	
 	intrigue = -1
+	stewardship = 2 # EMF
 	
-	liege_opinion = 50
+	liege_opinion = 25
+	vassal_opinion = 5 # EMF
+	health = 0.5 # EMF
 	
 	monthly_character_piety = 0.5
 	
 	ai_ambition = -40
 	ai_zeal = -10
 	
-	command_modifier = {
-		morale_defence = 0.01
-		damage = -0.03
-		pursue = -0.02
-	}
+	male_insult_adj = INSULT_SPINELESS
+	female_insult_adj = INSULT_SPINELESS
 }
 arbitrary = {
 	personality = yes
@@ -1576,9 +1744,9 @@ arbitrary = {
 	
 	stewardship = -2
 	learning = -1
-	intrigue = 2
+	intrigue = 2 # EMF
 	
-	vassal_opinion = -10
+	vassal_opinion = -5
 	
 	ai_rationality = -20
 	ai_honor = -10
@@ -1586,12 +1754,16 @@ arbitrary = {
 	
 	male_insult = INSULT_SCATTERBRAIN
 	female_insult = INSULT_SCATTERBRAIN
+	child_insult = INSULT_IDIOT
 	male_insult_adj = INSULT_ERRATIC
 	female_insult_adj = INSULT_ERRATIC
+	child_insult_adj = INSULT_WICKED
 	male_compliment = COMPL_ROGUE
 	male_compliment_adj = COMPL_RAFFISH
 	female_compliment = COMPL_DEVIL
 	female_compliment_adj = COMPL_IMPISH
+	child_compliment = COMPL_SMARTY
+	child_compliment_adj = COMPL_CLEVER
 }
 just = {
 	personality = yes
@@ -1601,50 +1773,46 @@ just = {
 	
 	stewardship = 2
 	learning = 1
-	intrigue = -2
+	intrigue = -2 # EMF
 	
-	vassal_opinion = 10
-	opposite_opinion = -20
-	same_opinion = 20
+	vassal_opinion = 5
+	opposite_opinion = -5
+	same_opinion = 5
 	
 	ai_rationality = 20
 	ai_honor = 10
 	ai_zeal = 10
-
+	
+	monthly_character_piety = 0.2 # EMF
+	
 	male_compliment_adj = COMPL_JUST
 	female_compliment_adj = COMPL_JUST
-	
-	command_modifier = {
-		morale_defence = 0.02
-		damage = -0.03
-	}
+	child_compliment_adj = COMPL_NICE
 }
 cynical = {
 	personality = yes
 	opposites = {
 		zealous
+		perfecti
 	}
 	
 	intrigue = 2
 	
 	church_opinion = -5
-	opposite_opinion = -20
-	same_opinion = 20
+	opposite_opinion = -5
+	same_opinion = 5
 	
 	monthly_character_piety = -0.2
 	
 	ai_rationality = 10
 	ai_zeal = -100
-
+	
 	male_compliment_adj = COMPL_WRY
 	female_compliment_adj = COMPL_WRY
+	child_compliment_adj = COMPL_CLEVER
 	male_insult = INSULT_UNBELIEVER
 	female_insult = INSULT_UNBELIEVER
-	
-	command_modifier = {
-		morale_defence = -0.01
-		flank = 0.01
-	}
+	child_insult = INSULT_DEVIL
 }
 zealous = {
 	personality = yes
@@ -1656,32 +1824,29 @@ zealous = {
 		sympathy_zoroastrianism
 		sympathy_judaism
 		sympathy_indian
-		sympathy_gnostic
 	}
 	
 	martial = 2
 	
-	church_opinion = 10
-	infidel_opinion = -50
-	opposite_opinion = -20
-	same_opinion_if_same_religion = 30
+	church_opinion = 5
+	infidel_opinion = -25
+	opposite_opinion = -5
+	same_opinion_if_same_religion = 15
 	
 	monthly_character_piety = 1
 	
 	ai_rationality = -10
 	ai_zeal = 100
-
-	male_insult = INSULT_BIGOT
-	female_insult = INSULT_BIGOT
+	
+	male_insult = INSULT_FANATIC
+	female_insult = INSULT_FANATIC
+	child_insult = INSULT_BORE
 	male_insult_adj = INSULT_NARROWMINDED
 	female_insult_adj = INSULT_NARROWMINDED
+	child_insult_adj = INSULT_NASTY
 	male_compliment_adj = COMPL_RIGHTEOUS
 	female_compliment_adj = COMPL_RIGHTEOUS
-	
-	command_modifier = {
-		damage = 0.01
-		religious_enemy = 0.03
-	}
+	child_compliment_adj = COMPL_GOOD
 }
 paranoid = {
 	personality = yes
@@ -1690,18 +1855,13 @@ paranoid = {
 	}
 	
 	intrigue = 2
-	diplomacy = -1
+	diplomacy = -2 # EMF
 	
 	ai_honor = -10
-
+	
 	male_insult_adj = INSULT_PARANOID
 	female_insult_adj = INSULT_PARANOID
-	
-	command_modifier = {
-		pursue = -0.03
-		morale_offence = -0.03
-		defence = 0.05
-	}
+	child_insult_adj = INSULT_GROUCHY
 }
 trusting = {
 	personality = yes
@@ -1710,19 +1870,15 @@ trusting = {
 	}
 	
 	intrigue = -2
-	diplomacy = 1
+	diplomacy = 2
 	
 	ai_honor = 10
-
+	
 	male_insult = INSULT_FOOL
 	female_insult = INSULT_FOOL
 	male_insult_adj = INSULT_GULLIBLE
 	female_insult_adj = INSULT_GULLIBLE
-	
-	command_modifier = {
-		defence = -0.03
-		retreat = 0.01
-	}	
+	child_insult_adj = INSULT_STUPID
 }
 cruel = {
 	personality = yes
@@ -1733,19 +1889,21 @@ cruel = {
 	intrigue = 1
 	diplomacy = -1
 	
-	vassal_opinion = -10
-	ai_honor = -10
-	ai_greed = 10
+	vassal_opinion = -5
+	ai_honor = -5
+	ai_greed = 5
 	
 	command_modifier = {
 		morale_offence = 0.1
-		pursue = 0.03
+		pursue = 0.05 # EMF
 	}
 	
 	male_insult = INSULT_BRUTE
 	female_insult = INSULT_FIEND
+	child_insult = INSULT_TROLL
 	male_insult_adj = INSULT_CRUEL
 	female_insult_adj = INSULT_CALLOUS
+	child_insult_adj = INSULT_WICKED
 }
 
 #Leadership traits
@@ -1754,7 +1912,6 @@ light_foot_leader = {
 	
 	command_modifier = {
 		light_infantry = 0.2
-		heavy_infantry = -0.1
 	}
 }
 
@@ -1763,7 +1920,6 @@ heavy_infantry_leader = {
 	
 	command_modifier = {
 		heavy_infantry = 0.2
-		cavalry = -0.1
 	}
 }
 
@@ -1772,7 +1928,6 @@ cavalry_leader = {
 	
 	command_modifier = {
 		cavalry = 0.2
-		light_infantry = -0.1
 	}
 }
 
@@ -1780,8 +1935,8 @@ inspiring_leader = {
 	leader = yes
 	
 	command_modifier = {
-		morale_defence = 0.1
-		center = 0.1
+		morale_offence = 0.15
+		morale_defence = 0.15
 	}
 }
 
@@ -1789,8 +1944,7 @@ trickster = {
 	leader = yes
 	
 	command_modifier = {
-		morale_offence = 0.1
-		defence = -0.2
+		random = 0.3
 	}
 }
 
@@ -1807,16 +1961,17 @@ defensive_leader = {
 	leader = yes
 	
 	command_modifier = {
-		defence = 0.1
-		damage = -0.2
+		defence = 0.25
+		damage = -0.1
 	}
 }
 
+# Renamed to "Direct Leader"
 experimenter = {
 	leader = yes
 	
 	command_modifier = {
-		random = 0.3
+		center = 0.2
 	}
 }
 
@@ -1825,7 +1980,6 @@ flanker = {
 	
 	command_modifier = {
 		flank = 0.2
-		center = -0.2
 	}
 }
 
@@ -1833,9 +1987,9 @@ aggressive_leader = {
 	leader = yes
 	
 	command_modifier = {
-		pursue = 0.2
+		pursue = 0.25
 		damage = 0.1
-		defence = -0.2
+		defence = -0.1
 	}
 }
 
diff --git a/VIET_Traits/common/traits/01_traits.txt b/VIET_Traits/common/traits/01_traits.txt
index ee6e8156..098524ef 100644
--- a/VIET_Traits/common/traits/01_traits.txt
+++ b/VIET_Traits/common/traits/01_traits.txt
@@ -1,25 +1,26 @@
+# -*- ck2.traits -*-
+
 ########################################################################################################
 # WARNING: IF YOU DON'T ADD NEW TRAITS LAST (IN THE LAST READ TRAIT FILE), IT WILL BREAK OLD SAVE GAMES!
 ########################################################################################################
 
 # Muslim equivalent of Crusader (HARD STATUS - DO NOT REMOVE!)
 mujahid = {
-	potential = {
-		religion_group = muslim
+	opposites = {
+		crusader
 	}
 	
-	martial = 2
 	combat_rating = 1
 	
-	muslim_opinion = 10
-	same_opinion_if_same_religion = 30
+	muslim_opinion = 5
+	same_opinion_if_same_religion = 15
 	
 	ai_zeal = 10
-
+	
 	male_compliment = COMPL_MUJAHID
 	female_compliment = COMPL_MUJAHID
-
-	command_modifier = {
+	
+	command_modifier = { # EMF
 		religious_enemy = 0.05
 	}
 
@@ -31,7 +32,7 @@ hajjaj = {
 		religion_group = muslim
 	}
 	
-	muslim_opinion = 10
+	muslim_opinion = 5
 	monthly_character_piety = 0.1
 	stewardship = 1
 	
@@ -48,7 +49,7 @@ on_hajj = {
 	
 	cached = yes # Keep a cache of all trait holders, to use with the corresponding event trigger 
 	
-	muslim_opinion = 20
+	muslim_opinion = 10
 	monthly_character_piety = 0.2
 	
 	pilgrimage = yes # Will need a regent, but can still be guardian to children
@@ -58,8 +59,6 @@ on_hajj = {
 
 # Muslim who is schooled in Islamic jurisprudence
 faqih = {
-	lifestyle = yes
-	
 	opposites = {
 		scholar
 	}
@@ -67,10 +66,10 @@ faqih = {
 	potential = {
 		religion_group = muslim
 	}
-
+	
 	learning = 3
 	
-	vassal_opinion = 10
+	vassal_opinion = 5
 	
 	male_compliment = COMPL_FAQIH
 	female_compliment = COMPL_FAQIH
@@ -84,8 +83,6 @@ hafiz = {
 		religion_group = muslim
 	}
 	
-	learning = 2
-	
 	muslim_opinion = 5
 	
 	male_compliment = COMPL_HAFIZ
@@ -100,14 +97,9 @@ sayyid = {
 		mirza
 	}
 
-	monthly_character_prestige = 0.05
-
-	command_modifier = {
-		morale_offence = 0.02
-		morale_defence = 0.02
-	}
+	monthly_character_prestige = 0.05 # EMF
 	
-	muslim_opinion = 10
+	muslim_opinion = 5
 	
 	male_compliment = COMPL_SAYYID
 	female_compliment = COMPL_SAYYIDA
@@ -133,17 +125,11 @@ mirza = {
 	opposites =  {
 		sayyid
 	}
-
+	
 	male_compliment = COMPL_MIRZA
 	female_compliment = COMPL_MIRZA
 
-	monthly_character_prestige = 0.03
-
-	command_modifier = {
-		morale_offence = 0.01
-		morale_defence = 0.01
-	}
-
+	monthly_character_prestige = 0.05 # EMF
 }
 
 # The character is visibly scarred from an old wound
diff --git a/VIET_Traits/common/traits/02_traits.txt b/VIET_Traits/common/traits/02_traits.txt
index 05c9d42b..92e18fe0 100644
--- a/VIET_Traits/common/traits/02_traits.txt
+++ b/VIET_Traits/common/traits/02_traits.txt
@@ -1,3 +1,5 @@
+# -*- ck2.traits -*-
+
 ########################################################################################################
 # WARNING: IF YOU DON'T ADD NEW TRAITS LAST (IN THE LAST READ TRAIT FILE), IT WILL BREAK OLD SAVE GAMES!
 ########################################################################################################
@@ -13,6 +15,7 @@ eunuch = {
 	
 	male_insult = INSULT_EUNUCH
 	male_insult_adj = INSULT_UNMANNED
+	child_insult_adj = INSULT_SILLY
 }
 
 blinded = {
@@ -23,15 +26,15 @@ blinded = {
 	health = -1
 	
 	customizer = no
-	
+	is_health = yes # EMF
 	combat_rating = -10
 	
 	blinding = yes
-
+	
 	male_insult_adj = INSULT_BLIND
 	female_insult_adj = INSULT_BLIND
-	
-	command_modifier = {
+
+	command_modifier = { # EMF
 		damage = -0.05
 		defence = -0.05
 	}
@@ -41,7 +44,7 @@ blinded = {
 born_in_the_purple = {
 	customizer = no
 	
-	vassal_opinion = 10
+	vassal_opinion = 3 # EMF
 	monthly_character_prestige = 0.5
 	
 	male_compliment_adj = COMPL_PURPLE_BORN
@@ -51,17 +54,11 @@ born_in_the_purple = {
 augustus = {
 	customizer = no
 	
-	vassal_opinion = 15
+	vassal_opinion = 10
 	monthly_character_prestige = 0.5
-
-	male_compliment = COMPL_AUGUSTUS
-	female_compliment = COMPL_AUGUSTUS
 	
-	command_modifier = {
-		center = 0.03
-		morale_offence = 0.01
-		morale_defence = 0.01
-	}	
+	male_compliment = COMPL_AUGUSTUS
+	female_compliment = COMPL_AUGUSTUS	
 }
 
 flat_terrain_leader = {
@@ -101,6 +98,9 @@ desert_terrain_leader = {
 	command_modifier = {
 		terrain = desert
 	}
+
+	male_insult = INSULT_DESERT_RAT
+	female_insult = INSULT_DESERT_RAT
 }
 
 holy_warrior = {
@@ -108,12 +108,12 @@ holy_warrior = {
 	
 	command_modifier = {
 		religious_enemy = 0.3
-		morale_defence = 0.1
-		damage = -0.1
 	}
 	
 	male_compliment = COMPL_HOLY_WARRIOR
 	female_compliment = COMPL_HOLY_WARRIOR
+	male_insult = INSULT_FANATIC
+	female_insult = INSULT_FANATIC
 }
 
 unyielding_leader = {
@@ -137,7 +137,7 @@ has_aztec_disease = {
 	intrigue = -1
 	learning = -1
 	
-	health = -4
+	health = -4 # EMF
 	fertility = -0.2
 	
 	combat_rating = -3
@@ -154,9 +154,9 @@ child_of_consort = {
 peasant_leader = {
 	diplomacy = -5
 	
-	same_opinion = 50
+	same_opinion = 25
 	
-	vassal_opinion = -20
+	vassal_opinion = -10
 
 	rebel_inherited = yes
 	customizer = no
@@ -168,9 +168,9 @@ peasant_leader = {
 }
 
 heresiarch = {
-	infidel_opinion = -30
+	infidel_opinion = -15
 	
-	same_religion_opinion = 50
+	same_religion_opinion = 25
 	
 	rebel_inherited = yes
 	customizer = no
@@ -178,6 +178,7 @@ heresiarch = {
 	
 	male_insult = INSULT_HERESIARCH
 	female_insult = INSULT_HERESIARCH
+	child_insult = INSULT_PEABRAIN
 }
 
 berserker = {
@@ -191,13 +192,20 @@ berserker = {
 	diplomacy = -2
 	combat_rating = 3
 	
-	same_opinion = 20
+	same_opinion = 10
 	
 	ai_rationality = -5
-
-	male_compliment = COMPL_BERSERKER
 	
-	command_modifier = {
+	male_compliment = COMPL_BERSERKER
+	female_compliment = COMPL_BERSERKER
+	male_insult = INSULT_LUNATIC
+	female_insult = INSULT_LUNATIC
+	child_insult = INSULT_TROLL
+	male_insult_adj = INSULT_CRAZED
+	female_insult_adj = INSULT_CRAZED
+	child_insult_adj = INSULT_CR
+	
+	command_modifier = { # EMF
 		damage = 0.05
 		defence = -0.05
 	}
@@ -209,42 +217,37 @@ varangian = {
 	
 	combat_rating = 2
 	
-	same_opinion = 20
+	same_opinion = 10
 	
 	customizer = no
 	
-	command_modifier = {
+	command_modifier = { # EMF
 		defence = 0.03
 	}
 }
 
 saoshyant = {
-	zoroastrian_opinion = 20
+	zoroastrian_opinion = 10
 	
 	customizer = no
-
+	
 	combat_rating = 5
 	
 	male_compliment = COMPL_SAOSHYANT
 	female_compliment = COMPL_SAOSHYANT
 	
-	command_modifier = {
+	command_modifier = { # EMF
 		center = 0.05
-		morale_offence = 0.05
 		morale_defence = 0.05
+		morale_offence = 0.05
 	}
 }
 
 saoshyant_descendant = {
 	
-	zoroastrian_opinion = 10
+	zoroastrian_opinion = 5
 	
 	customizer = no
-	
-	command_modifier = {
-		morale_offence = 0.02
-		morale_defence = 0.02
-	}
 }
 
 viking = {
@@ -254,24 +257,23 @@ viking = {
 			religion = norse_pagan_reformed
 		}
 	}
+	opposites = {
+		raider
+	}
 	martial = 1
 	combat_rating = 1
 	monthly_character_prestige = 0.3
-	same_religion_opinion = 15
 	
 	same_opinion = 10
-	religious = yes
-
+	
+	ai_greed = 10
+	
 	male_insult = COMPL_PIRATE
 	female_insult = COMPL_PIRATE
 	male_compliment = COMPL_VIKING
 	male_compliment_adj = COMPL_VIKING
 	female_compliment = COMPL_VALKYRIE
 	female_compliment_adj = COMPL_VIKING
-	
-	command_modifier = {
-		damage = 0.02
-	}
 }
 
 monk = {
@@ -281,7 +283,7 @@ monk = {
 	}
 	
 	monthly_character_piety = 0.3
-	same_religion_opinion = 10
+	same_religion_opinion = 5
 	
 	religious = yes # Lost immediately on religion change
 	cannot_marry = yes
@@ -299,7 +301,7 @@ nun = {
 	}
 	
 	monthly_character_piety = 0.3
-	same_religion_opinion = 10
+	same_religion_opinion = 5
 	
 	religious = yes # Lost immediately on religion change
 	cannot_marry = yes
@@ -320,7 +322,7 @@ on_pilgrimage = {
 	cached = yes    # Keep a cache of all trait holders, to use with the corresponding event trigger 
 	
 	monthly_character_piety = 0.2
-	same_religion_opinion = 10
+	same_religion_opinion = 5
 	
 	pilgrimage = yes    # Will need a regent, but can still be guardian to children
 	customizer = no
@@ -339,7 +341,6 @@ sickly = {
 	
 	customizer = no
 	random = no
-	customizer = no
 }
 
 mutazilite = {
@@ -351,8 +352,8 @@ mutazilite = {
 		ashari
 	}
 	
-	same_opinion = 25
-	opposite_opinion = -50
+	same_opinion = 15
+	opposite_opinion = -25
 	
 	customizer = no
 	random = no
@@ -367,8 +368,8 @@ ashari = {
 		mutazilite
 	}
 	
-	same_opinion = 25
-	opposite_opinion = -50
+	same_opinion = 15
+	opposite_opinion = -25
 	
 	customizer = no
 	random = no
@@ -385,10 +386,16 @@ sympathy_christendom = {
 
 	tolerates_christian = yes		# Tolerates and is tolerated by Christians
 	
-	same_opinion_if_same_religion = 10
+	same_opinion_if_same_religion = 5
 
 	customizer = no
 	random = no
+
+	male_insult = INSULT_LOVER_OF_HEATHENS
+	female_insult = INSULT_LOVER_OF_HEATHENS
+	male_insult_adj = INSULT_UNPRINCIPLED
+	female_insult_adj = INSULT_UNPRINCIPLED
+	child_insult_adj = INSULT_STUPID
 }
 
 sympathy_islam = {
@@ -403,10 +410,16 @@ sympathy_islam = {
 
 	tolerates_muslim = yes		# Tolerates and is tolerated by Muslims
 
-	same_opinion_if_same_religion = 10
+	same_opinion_if_same_religion = 5
 
 	customizer = no
 	random = no
+
+	male_insult = INSULT_LOVER_OF_HEATHENS
+	female_insult = INSULT_LOVER_OF_HEATHENS
+	male_insult_adj = INSULT_UNPRINCIPLED
+	female_insult_adj = INSULT_UNPRINCIPLED
+	child_insult_adj = INSULT_STUPID
 }
 
 sympathy_pagans = {
@@ -421,10 +434,16 @@ sympathy_pagans = {
 
 	tolerates_pagan_group = yes		# Tolerates and is tolerated by Pagans
 
-	same_opinion_if_same_religion = 10
+	same_opinion_if_same_religion = 5
 
 	customizer = no
 	random = no
+
+	male_insult = INSULT_LOVER_OF_HEATHENS
+	female_insult = INSULT_LOVER_OF_HEATHENS
+	male_insult_adj = INSULT_UNPRINCIPLED
+	female_insult_adj = INSULT_UNPRINCIPLED
+	child_insult_adj = INSULT_STUPID
 }
 
 sympathy_zoroastrianism = {
@@ -439,10 +458,16 @@ sympathy_zoroastrianism = {
 
 	tolerates_zoroastrian_group = yes		# Tolerates and is tolerated by Zoroastrians
 
-	same_opinion_if_same_religion = 10
+	same_opinion_if_same_religion = 5
 
 	customizer = no
 	random = no
+
+	male_insult = INSULT_LOVER_OF_HEATHENS
+	female_insult = INSULT_LOVER_OF_HEATHENS
+	male_insult_adj = INSULT_UNPRINCIPLED
+	female_insult_adj = INSULT_UNPRINCIPLED
+	child_insult_adj = INSULT_STUPID
 }
 
 sympathy_judaism = {
@@ -457,10 +482,16 @@ sympathy_judaism = {
 
 	tolerates_jewish_group = yes		# Tolerates and is tolerated by Jews
 
-	same_opinion_if_same_religion = 10
+	same_opinion_if_same_religion = 5
 
 	customizer = no
 	random = no
+
+	male_insult = INSULT_LOVER_OF_HEATHENS
+	female_insult = INSULT_LOVER_OF_HEATHENS
+	male_insult_adj = INSULT_UNPRINCIPLED
+	female_insult_adj = INSULT_UNPRINCIPLED
+	child_insult_adj = INSULT_STUPID
 }
 
 bad_priest_christian = {
@@ -474,13 +505,20 @@ bad_priest_christian = {
 		}
 	}
 
-	church_opinion = -20
-	same_opinion_if_same_religion = 50
+	church_opinion = -10
+	same_opinion_if_same_religion = 25
 
 	monthly_character_piety = -1
 
 	customizer = no
 	random = no
+
+	male_insult = INSULT_SCARECROW
+	female_insult = INSULT_SCARECROW
+	child_insult = INSULT_SCARECROW
+	male_insult_adj = INSULT_DECADENT
+	female_insult_adj = INSULT_CORRUPT
+	child_insult_adj = INSULT_CRUMMY
 }
 
 bad_priest_muslim = {
@@ -496,13 +534,20 @@ bad_priest_muslim = {
 		}
 	}
 	
-	church_opinion = -20
-	same_opinion_if_same_religion = 50
+	church_opinion = -10
+	same_opinion_if_same_religion = 25
 
 	monthly_character_piety = -1
 
 	customizer = no
 	random = no
+
+	male_insult = INSULT_SCARECROW
+	female_insult = INSULT_SCARECROW
+	child_insult = INSULT_SCARECROW
+	male_insult_adj = INSULT_DECADENT
+	female_insult_adj = INSULT_CORRUPT
+	child_insult_adj = INSULT_CRUMMY
 }
 
 bad_priest_norse = {
@@ -517,13 +562,20 @@ bad_priest_norse = {
 		}
 	}
 	
-	church_opinion = -20
-	same_opinion_if_same_religion = 50
+	church_opinion = -10
+	same_opinion_if_same_religion = 25
 
 	monthly_character_piety = -1
 
 	customizer = no
 	random = no
+
+	male_insult = INSULT_SCARECROW
+	female_insult = INSULT_SCARECROW
+	child_insult = INSULT_SCARECROW
+	male_insult_adj = INSULT_USELESS
+	female_insult_adj = INSULT_USELESS
+	child_insult_adj = INSULT_CRUMMY
 }
 
 bad_priest_tengri = {
@@ -537,13 +589,20 @@ bad_priest_tengri = {
 		}
 	}
 	
-	church_opinion = -20
-	same_opinion_if_same_religion = 50
+	church_opinion = -10
+	same_opinion_if_same_religion = 25
 
 	monthly_character_piety = -1
 
 	customizer = no
 	random = no
+
+	male_insult = INSULT_SCARECROW
+	female_insult = INSULT_SCARECROW
+	child_insult = INSULT_SCARECROW
+	male_insult_adj = INSULT_DECADENT
+	female_insult_adj = INSULT_CORRUPT
+	child_insult_adj = INSULT_CRUMMY
 }
 
 bad_priest_zoroastrian = {
@@ -557,13 +616,20 @@ bad_priest_zoroastrian = {
 		}
 	}
 
-	church_opinion = -20
-	same_opinion_if_same_religion = 50
+	church_opinion = -10
+	same_opinion_if_same_religion = 25
 
 	monthly_character_piety = -1
 
 	customizer = no
 	random = no
+
+	male_insult = INSULT_SCARECROW
+	female_insult = INSULT_SCARECROW
+	child_insult = INSULT_SCARECROW
+	male_insult_adj = INSULT_DECADENT
+	female_insult_adj = INSULT_CORRUPT
+	child_insult_adj = INSULT_CRUMMY
 }
 
 bad_priest_aztec = {
@@ -577,13 +643,20 @@ bad_priest_aztec = {
 		}
 	}
 
-	church_opinion = -20
-	same_opinion_if_same_religion = 50
+	church_opinion = -10
+	same_opinion_if_same_religion = 25
 
 	monthly_character_piety = -1
 
 	customizer = no
 	random = no
+
+	male_insult = INSULT_SCARECROW
+	female_insult = INSULT_SCARECROW
+	child_insult = INSULT_SCARECROW
+	male_insult_adj = INSULT_USELESS
+	female_insult_adj = INSULT_USELESS
+	child_insult_adj = INSULT_CRUMMY
 }
 
 narrow_flank_leader = {
@@ -647,10 +720,16 @@ sympathy_indian = {
 
 	tolerates_indian_group = yes		# Tolerates and is tolerated by Indian religions
 
-	same_opinion_if_same_religion = 10
+	same_opinion_if_same_religion = 5
 
 	customizer = no
 	random = no
+
+	male_insult = INSULT_LOVER_OF_HEATHENS
+	female_insult = INSULT_LOVER_OF_HEATHENS
+	male_insult_adj = INSULT_UNPRINCIPLED
+	female_insult_adj = INSULT_UNPRINCIPLED
+	child_insult_adj = INSULT_STUPID
 }
 
 shaivist_hindu = {
@@ -821,12 +900,19 @@ decadent = {
 	customizer = no
 	random = no
 	
-	combat_rating = -1
+	muslim_opinion = -25
+	same_opinion = 50
+	monthly_character_piety = -1.0
+	ai_zeal = -50
+	ai_greed = 20
+	ai_honor = -20
 	
 	male_insult = INSULT_SYBARITE
 	female_insult = INSULT_SYBARITE
+	child_insult = INSULT_FARTMASTER
 	male_insult_adj = INSULT_DECADENT
 	female_insult_adj = INSULT_DECADENT
+	child_insult_adj = INSULT_LAZY
 }
 
 # Character is seen as a reincarnation of another character.
@@ -852,6 +938,9 @@ jungle_terrain_leader = {
 	command_modifier = {
 		terrain = jungle
 	}
+
+	male_insult = INSULT_JUNGLE_SNAKE
+	female_insult = INSULT_JUNGLE_SNAKE
 }
 
 in_hiding = {
@@ -861,12 +950,17 @@ in_hiding = {
 
 	monthly_character_prestige = -2
 	diplomacy = -5
-	vassal_opinion = -10
+	vassal_opinion = -5
 	
 	in_hiding = yes
 
 	customizer = no
 	random = no
+
+	male_insult = INSULT_COWARD
+	female_insult = INSULT_COWARD
+	male_insult_adj = INSULT_SNEAKING
+	female_insult_adj = INSULT_SNEAKING
 }
 
 winter_soldier = {
@@ -885,6 +979,7 @@ seducer = {
 	opposites =  {
 		celibate
 		seductress
+		perfecti
 	}
 	
 	potential = {
@@ -901,6 +996,7 @@ seducer = {
 	male_compliment = COMPL_SEDUCER
 	male_compliment_adj = COMPL_CHARMING
 	
+	ruler_designer_cost = 0
 }
 
 seductress = {
@@ -909,6 +1005,7 @@ seductress = {
 	opposites =  {
 		celibate
 		seducer
+		perfecti
 	}
 	
 	potential = {
@@ -924,47 +1021,87 @@ seductress = {
 	female_insult_adj = INSULT_DEBASED
 	female_compliment = COMPL_ENCHANTRESS
 	female_compliment_adj = COMPL_RAVISHING
+	
+	ruler_designer_cost = 0
 }
 
 administrator = {
 	lifestyle = yes
 	
 	stewardship = 3
+	
+	command_modifier = {
+		speed = 0.1
+	}
+	
+	ruler_designer_cost = 0
 }
 
 architect = {
 	lifestyle = yes
 	
-	same_opinion = 20
+	same_opinion = 10
 	
 	stewardship = 2
 	martial = 1
+	
+	command_modifier = {
+		siege = 0.2
+	}
+	
+	ruler_designer_cost = 0
+	
+	male_compliment = COMPL_ARCHITECT
+	female_compliment = COMPL_ARCHITECT
 }
 
 strategist = {
 	lifestyle = yes
 	
-	same_opinion = 20
+	same_opinion = 10
 	
 	martial = 2
 	stewardship = 1
+	
+	command_modifier = {
+		defence = 0.2
+	}
+	
+	ruler_designer_cost = 0
 }
 
 socializer = {
 	lifestyle = yes
 	
-	same_opinion = 20
+	same_opinion = 10
 	sex_appeal_opinion = 10
 	
 	diplomacy = 3
+	
+	ruler_designer_cost = 0
+	
+	male_insult = INSULT_BLABBERER
+	female_insult = INSULT_BLABBERER
+	male_insult_adj = INSULT_SCHEMING
+	female_insult_adj = INSULT_SCHEMING
+	child_insult_adj = INSULT_SILLY
 }
 
 schemer = {
 	lifestyle = yes
 	
-	same_opinion = -10
+	same_opinion = -5
 	
 	intrigue = 3
+	
+	ruler_designer_cost = 0
+
+	male_insult = INSULT_INSTIGATOR
+	female_insult = INSULT_INSTIGATOR
+	child_insult = INSULT_SNEAK
+	male_insult_adj = INSULT_SCHEMING
+	female_insult_adj = INSULT_SCHEMING
+	child_insult_adj = INSULT_STUPID
 }
 
 theologian = {
@@ -972,6 +1109,17 @@ theologian = {
 	
 	learning = 2
 	intrigue = 1
+	
+	ruler_designer_cost = 0
+
+	male_insult = INSULT_BOOKWORM
+	female_insult = INSULT_BOOKWORM
+	male_insult_adj = INSULT_SQUINTEYED
+	female_insult_adj = INSULT_SQUINTEYED
+	male_compliment = COMPL_SCHOLAR
+	female_compliment = COMPL_SCHOLAR
+	male_compliment_adj = COMPL_LEARNED
+	female_compliment_adj = COMPL_LEARNED
 }
 
 gamer = {
@@ -980,5 +1128,316 @@ gamer = {
 	diplomacy = 2
 	martial = 1
 	
-	same_opinion = 20
+	command_modifier = {
+		narrow_flank = 0.3
+	}
+	
+	same_opinion = 10
+	
+	ruler_designer_cost = 0
+}
+
+adventurer = {
+
+	martial = 1
+	diplomacy = -1
+	combat_rating = 1
+	levy_size = 0.2
+	max_manpower_mult = 0.1
+	
+	same_opinion = 10
+
+	ai_ambition = 40
+	
+	customizer = no
+	random = no
+
+	male_insult = INSULT_UPSTART
+	female_insult = INSULT_UPSTART
+	child_insult = INSULT_PEABRAIN
+	male_insult_adj = INSULT_GRABBING
+	female_insult_adj = INSULT_GRABBING
+	child_insult_adj = INSULT_CRUMMY
+	male_compliment = COMPL_CONQUEROR
+	female_compliment = COMPL_CONQUEROR
+	male_compliment_adj = COMPL_AUDACIOUS
+	female_compliment_adj = COMPL_AUDACIOUS
+}
+
+erudite = {
+	personality = yes
+	
+	learning = 2
+	
+	church_opinion = 5
+	
+	male_insult = INSULT_WINDBAG
+	female_insult = INSULT_WINDBAG
+	child_insult = INSULT_BORE
+	male_insult_adj = INSULT_BLATHERING
+	female_insult_adj = INSULT_BLATHERING
+	male_compliment = COMPL_SCHOLAR
+	female_compliment = COMPL_SCHOLAR
+	male_compliment_adj = COMPL_WISE
+	female_compliment_adj = COMPL_WISE
+}
+
+stubborn = {
+	personality = yes
+	
+	stewardship = 1
+	diplomacy = -1
+	
+	vassal_opinion = -5
+	ai_ambition = 10
+	ai_zeal = 10
+	
+	male_insult = INSULT_MULE
+	female_insult = INSULT_MULE
+	male_insult_adj = INSULT_PIGHEADED
+	female_insult_adj = INSULT_PIGHEADED
+}
+
+
+### Childhood Traits
+
+haughty = {
+	childhood = yes
+	
+	martial = 1
+
+	male_insult = INSULT_BRAT
+	female_insult = INSULT_BRAT
+	child_insult = INSULT_TROLL
+	male_insult_adj = INSULT_ARROGANT
+	female_insult_adj = INSULT_ARROGANT
+	child_insult_adj = INSULT_GROUCHY
+	male_compliment_adj = COMPL_PROUD
+	female_compliment_adj = COMPL_PROUD
+}
+
+affectionate = {
+	childhood = yes
+	
+	diplomacy = 1
+
+	male_insult = INSULT_TICK
+	female_insult = INSULT_TICK
+	male_insult_adj = INSULT_CLINGY
+	female_insult_adj = INSULT_CLINGY
+	child_insult_adj = INSULT_FLOPPY
+	male_compliment_adj = COMPL_SWEET
+	female_compliment_adj = COMPL_SWEET
+}
+
+timid = {
+	childhood = yes
+	
+	opposites =  {
+		rowdy
+	}
+
+	learning = 1
+
+	male_insult_adj = INSULT_CREEPY
+	female_insult_adj = INSULT_CREEPY
+	male_compliment_adj = COMPL_GOOD
+	female_compliment_adj = COMPL_GOOD
+}
+
+rowdy = {
+	childhood = yes
+
+	opposites =  {
+		timid
+	}
+	
+	martial = 1
+
+	male_insult = INSULT_RUFFIAN
+	female_insult = INSULT_RUFFIAN
+	male_insult_adj = INSULT_WILD
+	female_insult_adj = INSULT_WILD
+	child_insult_adj = INSULT_CRAZY
+}
+
+willful = {
+	childhood = yes
+	
+	intrigue = 1
+
+	male_insult = INSULT_MULE
+	female_insult = INSULT_MULE
+	male_insult_adj = INSULT_PIGHEADED
+	female_insult_adj = INSULT_PIGHEADED
+}
+
+brooding = {
+	childhood = yes
+	
+	intrigue = 1
+
+	male_insult = INSULT_BORE
+	female_insult = INSULT_BORE
+	male_insult_adj = INSULT_CREEPY
+	female_insult_adj = INSULT_CREEPY
+	male_compliment_adj = COMPL_CLEVER
+	female_compliment_adj = COMPL_CLEVER
+}
+
+indolent = {
+	childhood = yes
+
+	intrigue = 1
+	
+	male_insult_adj = INSULT_USELESS
+	female_insult_adj = INSULT_USELESS
+}
+
+playful = {
+	childhood = yes
+	
+	diplomacy = 1
+	
+	male_compliment_adj = COMPL_LOVELY
+	female_compliment_adj = COMPL_LOVELY
+}
+
+conscientious = {
+	childhood = yes
+
+	stewardship = 1
+
+	male_insult = INSULT_BORE
+	female_insult = INSULT_BORE
+}
+
+fussy = {
+	childhood = yes
+	
+	stewardship = 1
+
+	male_insult_adj = INSULT_USELESS
+	female_insult_adj = INSULT_USELESS
+}
+
+curious = {
+	childhood = yes
+	
+	learning = 1
+	
+	male_insult = INSULT_SNEAK
+	female_insult = INSULT_SNEAK
+}
+
+idolizer = {
+	childhood = yes
+	
+	learning = 1
+
+	male_insult = INSULT_WORM
+	female_insult = INSULT_WORM
+}
+
+# Lunatic Special Traits
+horse = {
+	sex_appeal_opinion = -20
+	fertility = -50.0
+	health = -4
+
+	diplomacy = -10
+	intrigue = -10
+	stewardship = -10
+	martial = -10
+	learning = -10
+
+	inherit_chance = 100
+
+	customizer = no
+	random = no
+	
+	cannot_marry = yes
+	cannot_inherit = yes
+	can_hold_titles = no # Hopefully this will block Glitterhoof from becoming pope again
+
+	potential = {
+		race = horse
+	}
+}
+######
+
+robust = {
+	opposites =  {
+		weak
+		feeble
+	}
+	
+	diplomacy = 1
+	martial = 2
+	
+	health = 1
+	
+	combat_rating = 1
+	
+	sex_appeal_opinion = 5
+	vassal_opinion = 5
+	tribal_opinion = 5
+	
+	male_compliment_adj = COMPL_STRONG
+}
+
+feeble = {
+	opposites =  {
+		strong
+		robust
+	}
+	
+	martial = -1
+	combat_rating = -1
+	
+	sex_appeal_opinion = -5
+	vassal_opinion = -5
+	tribal_opinion = -5
+	
+	male_insult = INSULT_WEAKLING
+}
+
+shrewd = {
+	opposites =  {
+		imbecile
+		slow
+		genius
+		dull
+	}
+	
+	diplomacy = 2
+	intrigue = 2
+	stewardship = 2
+	martial = 2
+	learning = 2
+	
+	ai_rationality = 15
+}
+
+dull = {
+	opposites =  {
+		imbecile
+		quick
+		genius
+		shrewd
+	}
+	
+	diplomacy = -2
+	intrigue = -2
+	stewardship = -2
+	martial = -2
+	learning = -2
+	
+	ai_rationality = -15
+	
+	male_insult = INSULT_DULLARD
+	female_insult = INSULT_NITWIT
+	male_insult_adj = INSULT_DIM
+	female_insult_adj = INSULT_VACUOUS
+	child_insult_adj = INSULT_STUPID
 }
diff --git a/VIET_Traits/events/VIET_Traits_introduction.txt b/VIET_Traits/events/VIET_Traits_introduction.txt
index 41ef5c6f..1051c36f 100644
--- a/VIET_Traits/events/VIET_Traits_introduction.txt
+++ b/VIET_Traits/events/VIET_Traits_introduction.txt
@@ -8,12 +8,11 @@ namespace = cybrxkhan
 
 narrative_event = {
 	id = cybrxkhan.3
-	title = "cybrxkhan.3.name"
-	desc = "cybrxkhan.3.desc"
-	major = yes
-	hide_new = yes
-	hide_from = yes
+#	title = "cybrxkhan.3.name"
+#	desc = "cybrxkhan.3.desc"
+
 	is_triggered_only = yes
+	hide_window = yes
 	
 	picture = "GFX_evt_small_town_serindian"
 	
@@ -25,4 +24,4 @@ narrative_event = {
 		name = "cybrxkhan.3.a"
 		set_global_flag = VIET_Traits_On
 	}
-}
\ No newline at end of file
+}