diff --git a/ShadowbaneInquisition/Shadowbane.html b/ShadowbaneInquisition/Shadowbane.html
index b32cbbed44..c37ba4e6a2 100644
--- a/ShadowbaneInquisition/Shadowbane.html
+++ b/ShadowbaneInquisition/Shadowbane.html
@@ -2882,6 +2882,7 @@
 		<datalist id="Aptitudes">
 			<option value="Agility">
 			<option value="Ballistic Skill">
+			<option value="Conviction">
 			<option value="Defence">
 			<option value="Fellowship">
 			<option value="Fieldcraft">
@@ -2892,7 +2893,6 @@
 			<option value="Leadership">
 			<option value="Offence">
 			<option value="Perception">
-			<option value="Psyker">
 			<option value="Social">
 			<option value="Strength">
 			<option value="Tech">
@@ -4869,7 +4869,7 @@ NOTE: replace worker by javascript for IDE functionality
 		{name: "Agility", aptitudes : ["Agility", "Finesse"]},
 		{name: "Intelligence", aptitudes : ["Intelligence", "Knowledge"]},
 		{name: "Perception", aptitudes : ["Perception", "Fieldcraft"]},
-		{name: "Willpower", aptitudes : ["Willpower", "Psyker"]},
+		{name: "Willpower", aptitudes : ["Willpower", "Conviction"]},
 		{name: "Fellowship", aptitudes : ["Fellowship", "Social"]}
 	]
 	const SKILLS = [
@@ -4892,7 +4892,7 @@ NOTE: replace worker by javascript for IDE functionality
 		{name: "Navigate X", aptitudes : ["Intelligence", "Fieldcraft"]},
 		{name: "Operate X", aptitudes : ["Agility", "Tech"]},
 		{name: "Parry", aptitudes : ["Weapon Skill", "Defence"]},
-		{name: "Psyniscience", aptitudes : ["Perception", "Psyker"]},
+		{name: "Psyniscience", aptitudes : ["Perception", "Conviction"]},
 		{name: "Scholastic Lore X", aptitudes : ["Intelligence", "Knowledge"]},
 		{name: "Scrutiny", aptitudes : ["Perception", "General"]},
 		{name: "Security", aptitudes : ["Intelligence", "Tech"]},
@@ -4932,7 +4932,7 @@ NOTE: replace worker by javascript for IDE functionality
 		{name: "Sound Constitution", aptitudes : ["Toughness", "General"]},
 		{name: "Takedown", aptitudes : ["Weapon Skill", "Offence"]},
 		{name: "Technical Knock", aptitudes : ["Intelligence", "Tech"]},
-		{name: "Warp Sense", aptitudes : ["Perception", "Psyker"]},
+		{name: "Warp Sense", aptitudes : ["Perception", "Conviction"]},
 		{name: "Weapon Training X", aptitudes : ["General", "General"]},
 		{name: "Weapon-Tech", aptitudes : ["Intelligence", "Tech"]}
 	]
@@ -4950,7 +4950,7 @@ NOTE: replace worker by javascript for IDE functionality
 		{name: "Counter Attack", aptitudes : ["Weapon Skill", "Defence"]},
 		{name: "Cover-Up", aptitudes : ["Intelligence", "Knowledge"]},
 		{name: "Daemonhunter", aptitudes : ["Offence", "Willpower"]},
-		{name: "Daemonologist", aptitudes : ["Psyker", "Willpower"]},
+		{name: "Daemonologist", aptitudes : ["Conviction", "Willpower"]},
 		{name: "Deny the Witch", aptitudes : ["Willpower", "Defence"]},
 		{name: "Devastating Assault", aptitudes : ["Weapon Skill", "Offence"]},
 		{name: "Double Tap", aptitudes : ["Finesse", "Offence"]},
@@ -4976,7 +4976,7 @@ NOTE: replace worker by javascript for IDE functionality
 		{name: "Marksman", aptitudes : ["Ballistic Skill", "Finesse"]},
 		{name: "Mechadendrite Use X", aptitudes : ["Intelligence", "Tech"]},
 		{name: "One-on-One", aptitudes : ["Finesse", "Weapon Skill"]},
-		{name: "Penitent Psyker", aptitudes : ["Psyker", "Defence"]},
+		{name: "Penitent Psyker", aptitudes : ["Conviction", "Defence"]},
 		{name: "Precision Killer Melee", aptitudes : ["Weapon Skill", "Finesse"]},
 		{name: "Precision Killer Ranged", aptitudes : ["Ballistic Skill", "Finesse"]},
 		{name: "Prosanguine", aptitudes : ["Toughness", "Tech"]},
@@ -4984,11 +4984,11 @@ NOTE: replace worker by javascript for IDE functionality
 		{name: "Rites of Banishment", aptitudes : ["Offence", "Willpower"]},
 		{name: "Strong Minded", aptitudes : ["Willpower", "Defence"]},
 		{name: "Swift Attack", aptitudes : ["Weapon Skill", "Finesse"]},
-		{name: "Tainted Psyker", aptitudes : ["Knowledge", "Psyker"]},
+		{name: "Tainted Psyker", aptitudes : ["Knowledge", "Conviction"]},
 		{name: "Two-Weapon Wielder Melee", aptitudes : ["Weapon Skill", "Finesse"]},
 		{name: "Two-Weapon Wielder Ranged", aptitudes : ["Ballistic Skill", "Finesse"]},
 		{name: "Unarmed Specialist", aptitudes : ["Strength", "Offence"]},
-		{name: "Warp Conduit", aptitudes : ["Willpower", "Psyker"]},
+		{name: "Warp Conduit", aptitudes : ["Willpower", "Conviction"]},
 		{name: "Whirlwind of Death", aptitudes : ["Weapon Skill", "Finesse"]},
 		{name: "Witch Finder", aptitudes : ["Knowledge", "Perception"]},
 		{name: "Xenosavant", aptitudes : ["Intelligence", "Knowledge"]}
@@ -4997,7 +4997,7 @@ NOTE: replace worker by javascript for IDE functionality
 		{name: "Adamantium Faith", aptitudes : ["Willpower", "Defence"]},
 		{name: "Aegis of Contempt", aptitudes : ["Defence", "Leadership"]},
 		{name: "Assassin Strike", aptitudes : ["Weapon Skill", "Fieldcraft"]},
-		{name: "Bastion of Iron Will", aptitudes : ["Willpower", "Psyker"]},
+		{name: "Bastion of Iron Will", aptitudes : ["Willpower", "Conviction"]},
 		{name: "Blademaster", aptitudes : ["Weapon Skill", "Finesse"]},
 		{name: "Crushing Blow", aptitudes : ["Weapon Skill", "Offence"]},
 		{name: "Daemonic Disruption", aptitudes : ["Willpower", "General"]},
@@ -5006,7 +5006,7 @@ NOTE: replace worker by javascript for IDE functionality
 		{name: "Delicate Interrogation", aptitudes : ["Intelligence", "Finesse"]},
 		{name: "Divine Protection", aptitudes : ["General", "Finesse"]},
 		{name: "Eye of Vengeance", aptitudes : ["Ballistic Skill", "Offence"]},
-		{name: "Favored by the Warp", aptitudes : ["Willpower", "Psyker"]},
+		{name: "Favored by the Warp", aptitudes : ["Willpower", "Conviction"]},
 		{name: "Flash of Insight", aptitudes : ["Perception", "Knowledge"]},
 		{name: "Halo of Command", aptitudes : ["Fellowship", "Leadership"]},
 		{name: "Hammer Blow", aptitudes : ["Strength", "Offence"]},
@@ -5023,7 +5023,7 @@ NOTE: replace worker by javascript for IDE functionality
 		{name: "Never Die", aptitudes : ["Toughness", "Defence"]},
 		{name: "Preternatural Speed", aptitudes : ["Agility", "Offence"]},
 		{name: "Push the Limit", aptitudes : ["Perception", "Tech"]},
-		{name: "Sanctic Purity", aptitudes : ["Psyker", "Willpower"]},
+		{name: "Sanctic Purity", aptitudes : ["Conviction", "Willpower"]},
 		{name: "Shield Wall", aptitudes : ["Defence", "Weapon Skill"]},
 		{name: "Sprint", aptitudes : ["Agility", "Fieldcraft"]},
 		{name: "Step Aside", aptitudes : ["Agility", "Defence"]},
@@ -5032,7 +5032,7 @@ NOTE: replace worker by javascript for IDE functionality
 		{name: "Thunder Charge", aptitudes : ["Strength", "Offence"]},
 		{name: "True Grit", aptitudes : ["Toughness", "Defence"]},
 		{name: "Two-Weapon Master", aptitudes : ["Finesse", "Offence"]},
-		{name: "Warp Lock", aptitudes : ["Willpower", "Psyker"]},
+		{name: "Warp Lock", aptitudes : ["Willpower", "Conviction"]},
 		{name: "Weapon Intuition", aptitudes : ["Intelligence", "Finesse"]}
 	]
 	const fieldAptitudes = ['aptitude_1','aptitude_2','aptitude_3','aptitude_4','aptitude_5','aptitude_6','aptitude_7','aptitude_8','aptitude_9']
@@ -6863,6 +6863,7 @@ NOTE: replace worker by javascript for IDE functionality
 		const APTITUDES = [
 			"Agility",
 			"Ballistic Skill",
+			"Conviction",
 			"Defence",
 			"Fellowship",
 			"Fieldcraft",
@@ -6873,7 +6874,6 @@ NOTE: replace worker by javascript for IDE functionality
 			"Leadership",
 			"Offence",
 			"Perception",
-			"Psyker",
 			"Social",
 			"Strength",
 			"Tech",