diff --git a/DnDNext_Actoba/DnDNext.html b/DnDNext_Actoba/DnDNext.html
index 77257bf7b9..64419e806e 100644
--- a/DnDNext_Actoba/DnDNext.html
+++ b/DnDNext_Actoba/DnDNext.html
@@ -202,9 +202,9 @@
 			
 			<div class="sheet-row sheet-skill-row">
 				<div class="sheet-col-1-3 sheet-vert-middle">Athletics</div>
-				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_pb-athletics" value="1"/>Prof</span></div>
-				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_ex-athletics" value="5"/>Exp</span></div>
-				<div class="sheet-col-1-3 sheet-vert-middle"><input type="hidden" name="attr_athletics" value="(@{pb-athletics}*@{PB})+@{strength_mod}+@{ex-athletics}" class="sheet-short"><button class="sheet-skill-roll" type='roll' name='roll_athletics' value='/em makes an ability check\n\nSTR (Athletics) check :[[1d20 + @{athletics} [Proficiency + Expertise + Strength Mod] + ?{MiscMod|0} [Misc Modifiers] ]]'>Check</button></div>
+				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_pb_athletics" value="1"/>Prof</span></div>
+				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_expertise_athletics" value="5"/>Exp</span></div>
+				<div class="sheet-col-1-3 sheet-vert-middle"><input type="hidden" name="attr_athletics" value="(@{pb_athletics}*@{PB})+@{strength_mod}+@{expertise_athletics}" class="sheet-short"><button class="sheet-skill-roll" type='roll' name='roll_Athletics_Check' value='/em makes an ability check\n\nSTR (Athletics) check :[[1d20 + @{athletics} [Proficiency + Expertise + Strength Mod] + ?{MiscMod|0} [Misc Modifiers] ]]'>Check</button></div>
 			</div>
 			
 			<div class="sheet-row sheet-skill-header">
@@ -213,23 +213,23 @@
 			
 			<div class="sheet-row sheet-skill-row">
 				<div class="sheet-col-1-3 sheet-vert-middle">Acrobatics</div>
-				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_pb-acrobatics" value="1"/>Prof</span></div>
-				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_ex-acrobatics" value="5"/>Exp</span></div>
-				<div class="sheet-col-1-3 sheet-vert-middle"><input type="hidden" name="attr_acrobatics" value="(@{pb-acrobatics}*@{PB})+@{dexterity_mod}+@{ex-acrobatics}"><button class="sheet-skill-roll" type='roll' name='roll_acrobatics' value='/em makes an ability check\n\nDEX (Acrobatics) check :[[1d20 + @{acrobatics} [Proficiency + Expertise + Dexterity Mod] + ?{MiscMod|0} [Misc Modifiers] ]]'>Check</button></div>
+				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_pb_acrobatics" value="1"/>Prof</span></div>
+				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_expertise_acrobatics" value="5"/>Exp</span></div>
+				<div class="sheet-col-1-3 sheet-vert-middle"><input type="hidden" name="attr_acrobatics" value="(@{pb_acrobatics}*@{PB})+@{dexterity_mod}+@{expertise_acrobatics}"><button class="sheet-skill-roll" type='roll' name='roll_Acrobatics_Check' value='/em makes an ability check\n\nDEX (Acrobatics) check :[[1d20 + @{acrobatics} [Proficiency + Expertise + Dexterity Mod] + ?{MiscMod|0} [Misc Modifiers] ]]'>Check</button></div>
 			</div>
 			
 			<div class="sheet-row sheet-skill-row">
 				<div class="sheet-col-1-3 sheet-vert-middle">Sleight of Hand</div>
-				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_pb-sleightofhand" value="1"/>Prof</span></div>
-				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_ex-sleightofhand" value="5"/>Exp</span></div>
-				<div class="sheet-col-1-3 sheet-vert-middle"><input type="hidden" name="attr_sleightofhand" value="(@{pb-sleightofhand}*@{PB})+@{dexterity_mod}+@{ex-sleightofhand}"><button class="sheet-skill-roll" type='roll' name='roll_sleightofhand' value='/em makes an ability check\n\nDEX (Sleight of Hand) check:[[1d20 + @{sleightofhand} [Proficiency + Expertise + Dexterity Mod] + ?{MiscMod|0} [Misc Modifiers] ]]'>Check</button></div>
+				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_pb_sleightofhand" value="1"/>Prof</span></div>
+				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_expertise_sleightofhand" value="5"/>Exp</span></div>
+				<div class="sheet-col-1-3 sheet-vert-middle"><input type="hidden" name="attr_sleightofhand" value="(@{pb_sleightofhand}*@{PB})+@{dexterity_mod}+@{expertise_sleightofhand}"><button class="sheet-skill-roll" type='roll' name='roll_SleightOfHand_Check' value='/em makes an ability check\n\nDEX (Sleight of Hand) check:[[1d20 + @{sleightofhand} [Proficiency + Expertise + Dexterity Mod] + ?{MiscMod|0} [Misc Modifiers] ]]'>Check</button></div>
 			</div>
 			
 			<div class="sheet-row sheet-skill-row">
 				<div class="sheet-col-1-3 sheet-vert-middle">Stealth</div>
-				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_pb-stealth" value="1"/>Prof</span></div>
-				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_ex-stealth" value="5"/>Exp</span></div>
-				<div class="sheet-col-1-3 sheet-vert-middle"><input type="hidden" name="attr_stealth" value="(@{pb-stealth}*@{PB})+@{dexterity_mod}+@{ex-stealth}"><button class="sheet-skill-roll" type='roll' name='roll_stealth' value='/em makes an ability check\n\nDEX (Stealth) check :[[1d20 + @{stealth} [Proficiency + Expertise + Dexterity Mod] + ?{MiscMod|0} [Misc Modifiers] ]]'>Check</button></div>
+				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_pb_stealth" value="1"/>Prof</span></div>
+				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_expertise_stealth" value="5"/>Exp</span></div>
+				<div class="sheet-col-1-3 sheet-vert-middle"><input type="hidden" name="attr_stealth" value="(@{pb_stealth}*@{PB})+@{dexterity_mod}+@{expertise_stealth}"><button class="sheet-skill-roll" type='roll' name='roll_Stealth_Check' value='/em makes an ability check\n\nDEX (Stealth) check :[[1d20 + @{stealth} [Proficiency + Expertise + Dexterity Mod] + ?{MiscMod|0} [Misc Modifiers] ]]'>Check</button></div>
 			</div>
 			
 			<div class="sheet-row sheet-skill-header">
@@ -238,37 +238,37 @@
 			
 			<div class="sheet-row sheet-skill-row">
 				<div class="sheet-col-1-3 sheet-vert-middle">Arcana</div>
-				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_pb-arcana" value="1"/>Prof</span></div>
-				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_ex-arcana" value="5"/>Exp</span></div>
-				<div class="sheet-col-1-3 sheet-vert-middle"><input type="hidden" name="attr_arcana" value="(@{pb-arcana}*@{PB})+@{intelligence_mod}+@{ex-arcana}"><button class="sheet-skill-roll" type='roll' name='roll_arcana' value='/em makes an ability check\n\nINT (Arcana) check :[[1d20 + @{arcana} [Proficiency + Expertise + Intelligence Mod] +?{MiscMod|0} [Misc Modifers] ]]'>Check</button></div>
+				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_pb_arcana" value="1"/>Prof</span></div>
+				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_expertise_arcana" value="5"/>Exp</span></div>
+				<div class="sheet-col-1-3 sheet-vert-middle"><input type="hidden" name="attr_arcana" value="(@{pb_arcana}*@{PB})+@{intelligence_mod}+@{expertise_arcana}"><button class="sheet-skill-roll" type='roll' name='roll_Arcana_Check' value='/em makes an ability check\n\nINT (Arcana) check :[[1d20 + @{arcana} [Proficiency + Expertise + Intelligence Mod] +?{MiscMod|0} [Misc Modifers] ]]'>Check</button></div>
 			</div>
 			
 			<div class="sheet-row sheet-skill-row">
 				<div class="sheet-col-1-3 sheet-vert-middle">History</div>
-				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_pb-history" value="1"/>Prof</span></div>
-				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_ex-history" value="5"/>Exp</span></div>
-				<div class="sheet-col-1-3 sheet-vert-middle"><input type="hidden" name="attr_history" value="(@{pb-history}*@{PB})+@{intelligence_mod}+@{ex-history}"><button class="sheet-skill-roll" type='roll' name='roll_history' value='/em makes an ability check\n\nINT (History) check :[[1d20 + @{history} [Proficiency + Expertise + Intelligence Mod] + ?{MiscMod|0} [Misc Modifiers] ]]'>Check</button></div>
+				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_pb_history" value="1"/>Prof</span></div>
+				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_expertise_history" value="5"/>Exp</span></div>
+				<div class="sheet-col-1-3 sheet-vert-middle"><input type="hidden" name="attr_history" value="(@{pb_history}*@{PB})+@{intelligence_mod}+@{expertise_history}"><button class="sheet-skill-roll" type='roll' name='roll_History_Check' value='/em makes an ability check\n\nINT (History) check :[[1d20 + @{history} [Proficiency + Expertise + Intelligence Mod] + ?{MiscMod|0} [Misc Modifiers] ]]'>Check</button></div>
 			</div>
 			
 			<div class="sheet-row sheet-skill-row">
 				<div class="sheet-col-1-3 sheet-vert-middle">Nature</div>
-				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_pb-nature" value="1"/>Prof</span></div>
-				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_ex-nature" value="5"/>Exp</span></div>
-				<div class="sheet-col-1-6 sheet-vert-middle"><input type="hidden" name="attr_nature" value="(@{pb-nature}*@{PB})+@{intelligence_mod}+@{ex-nature}"><button class="sheet-skill-roll" type='roll' name='roll_nature' value='/em makes an ability check\n\nINT (Nature) check :[[1d20 + @{nature} [Proficiency + Expertise + Intelligence Mod] + ?{MiscMod|0} [Misc Modifiers] ]]'>Check</button></div>
+				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_pb_nature" value="1"/>Prof</span></div>
+				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_expertise_nature" value="5"/>Exp</span></div>
+				<div class="sheet-col-1-6 sheet-vert-middle"><input type="hidden" name="attr_nature" value="(@{pb_nature}*@{PB})+@{intelligence_mod}+@{expertise_nature}"><button class="sheet-skill-roll" type='roll' name='roll_Nature_Check' value='/em makes an ability check\n\nINT (Nature) check :[[1d20 + @{nature} [Proficiency + Expertise + Intelligence Mod] + ?{MiscMod|0} [Misc Modifiers] ]]'>Check</button></div>
 			</div>
 			
 			<div class="sheet-row sheet-skill-row">
 				<div class="sheet-col-1-3 sheet-vert-middle">Religion</div>
-				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_pb-religion" value="1"/>Prof</span></div>
-				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_ex-religion" value="5"/>Exp</span></div>
-				<div class="sheet-col-1-3 sheet-vert-middle"><input type="hidden" name="attr_religion" value="(@{pb-religion}*@{PB})+@{intelligence_mod}+@{ex-religion}"><button class="sheet-skill-roll" type='roll' name='roll_religion' value='/em makes an ability check\n\nINT (Religion) check :[[1d20 + @{religion} [Proficiency + Expertise + Intelligence Mod] + ?{MiscMod|0} [Misc Modifiers] ]]'>Check</button></div>
+				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_pb_religion" value="1"/>Prof</span></div>
+				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_expertise_religion" value="5"/>Exp</span></div>
+				<div class="sheet-col-1-3 sheet-vert-middle"><input type="hidden" name="attr_religion" value="(@{pb_religion}*@{PB})+@{intelligence_mod}+@{expertise_religion}"><button class="sheet-skill-roll" type='roll' name='roll_Religion_Check' value='/em makes an ability check\n\nINT (Religion) check :[[1d20 + @{religion} [Proficiency + Expertise + Intelligence Mod] + ?{MiscMod|0} [Misc Modifiers] ]]'>Check</button></div>
 			</div>
 			
 			<div class="sheet-row sheet-skill-row">
 				<div class="sheet-col-1-3 sheet-vert-middle">Search</div>
-				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_pb-search" value="1"/>Prof</span></div>
-				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_ex-search" value="5"/>Exp</span></div>
-				<div class="sheet-col-1-3 sheet-vert-middle"><input type="hidden" name="attr_search" value="(@{pb-search}*@{PB})+@{intelligence_mod}+@{ex-search}"><button class="sheet-skill-roll" type='roll' name='roll_search' value='/em makes an ability check\n\nINT (Search) check :[[1d20 + @{search} [Proficiency + Expertise + Intelligence Mod] + ?{MiscMod|0} [Misc Modifers] ]]'>Check</button></div>
+				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_pb_search" value="1"/>Prof</span></div>
+				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_expertise_search" value="5"/>Exp</span></div>
+				<div class="sheet-col-1-3 sheet-vert-middle"><input type="hidden" name="attr_search" value="(@{pb_search}*@{PB})+@{intelligence_mod}+@{expertise_search}"><button class="sheet-skill-roll" type='roll' name='roll_Search_Check' value='/em makes an ability check\n\nINT (Search) check :[[1d20 + @{search} [Proficiency + Expertise + Intelligence Mod] + ?{MiscMod|0} [Misc Modifers] ]]'>Check</button></div>
 			</div>
 			
 			<div class="sheet-row sheet-skill-header">
@@ -277,37 +277,37 @@
 			
 			<div class="sheet-row sheet-skill-row">
 				<div class="sheet-col-1-3 sheet-vert-middle">Animal Handling</div>
-				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_pb-animalhandling" value="1"/>Prof</span></div>
-				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_ex-animalhandling" value="5"/>Exp</span></div>
-				<div class="sheet-col-1-3 sheet-vert-middle"><input type="hidden" name="attr_animalhandling" value="(@{pb-animalhandling}*@{PB})+@{wisdom_mod}+@{ex-animalhandling}"><button class="sheet-skill-roll" type='roll' name='roll_animalhandling' value='/em makes an ability check\n\nWIS (Animal Handling) check :[[1d20 + @{animalhandling} [Proficiency + Expertise + Wisdom Mod] + ?{MiscMod|0} [Misc Modifiers] ]]'>Check</button></div>
+				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_pb_animalhandling" value="1"/>Prof</span></div>
+				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_expertise_animalhandling" value="5"/>Exp</span></div>
+				<div class="sheet-col-1-3 sheet-vert-middle"><input type="hidden" name="attr_animalhandling" value="(@{pb_animalhandling}*@{PB})+@{wisdom_mod}+@{expertise_animalhandling}"><button class="sheet-skill-roll" type='roll' name='roll_AnimalHandling_Check' value='/em makes an ability check\n\nWIS (Animal Handling) check :[[1d20 + @{animalhandling} [Proficiency + Expertise + Wisdom Mod] + ?{MiscMod|0} [Misc Modifiers] ]]'>Check</button></div>
 			</div>
 			
 			<div class="sheet-row sheet-skill-row">
 				<div class="sheet-col-1-3 sheet-vert-middle">Insight</div>
-				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_pb-insight" value="1"/>Prof</span></div>
-				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_ex-insight" value="5"/>Exp</span></div>
-				<div class="sheet-col-1-3 sheet-vert-middle"><input type="hidden" name="attr_insight" value="(@{pb-insight}*@{PB})+@{wisdom_mod}+@{ex-insight}"><button class="sheet-skill-roll" type='roll' name='roll_insight' value='/em makes an ability check\n\nWIS (Insight) check :[[1d20 + @{insight} [Proficiency + Expertise + Wisdom Mod] + ?{MiscMod|0} [Misc Modifiers] ]]'>Check</button></div>
+				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_pb_insight" value="1"/>Prof</span></div>
+				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_expertise_insight" value="5"/>Exp</span></div>
+				<div class="sheet-col-1-3 sheet-vert-middle"><input type="hidden" name="attr_insight" value="(@{pb_insight}*@{PB})+@{wisdom_mod}+@{expertise_insight}"><button class="sheet-skill-roll" type='roll' name='roll_Insight_Check' value='/em makes an ability check\n\nWIS (Insight) check :[[1d20 + @{insight} [Proficiency + Expertise + Wisdom Mod] + ?{MiscMod|0} [Misc Modifiers] ]]'>Check</button></div>
 			</div>
 			
 			<div class="sheet-row sheet-skill-row">
 				<div class="sheet-col-1-3 sheet-vert-middle">Medicine</div>
-				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_pb-medicine" value="1"/>Prof</span></div>
-				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_ex-medicine" value="5"/>Exp</span></div>
-				<div class="sheet-col-1-3 sheet-vert-middle"><input type="hidden" name="attr_medicine" value="(@{pb-medicine}*@{PB})+@{wisdom_mod}+@{ex-medicine}"><button class="sheet-skill-roll" type='roll' name='roll_medicine' value='/em makes an ability check\n\nWIS (Medicine) check :[[1d20 + @{medicine} [Proficiency + Expertise + Wisdom Mod] + ?{MiscMod|0} [Misc modifiers] ]]'>Check</button></div>
+				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_pb_medicine" value="1"/>Prof</span></div>
+				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_expertise_medicine" value="5"/>Exp</span></div>
+				<div class="sheet-col-1-3 sheet-vert-middle"><input type="hidden" name="attr_medicine" value="(@{pb_medicine}*@{PB})+@{wisdom_mod}+@{expertise_medicine}"><button class="sheet-skill-roll" type='roll' name='roll_Medicine_Check' value='/em makes an ability check\n\nWIS (Medicine) check :[[1d20 + @{medicine} [Proficiency + Expertise + Wisdom Mod] + ?{MiscMod|0} [Misc modifiers] ]]'>Check</button></div>
 			</div>
 			
 			<div class="sheet-row sheet-skill-row">
 				<div class="sheet-col-1-3 sheet-vert-middle">Perception</div>
-				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_pb-perception" value="1"/>Prof</span></div>
-				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_ex-perception" value="5"/>Exp</span></div>
-				<div class="sheet-col-1-3 sheet-vert-middle"><input type="hidden" name="attr_perception" value="(@{pb-perception}*@{PB})+@{wisdom_mod}+@{ex-perception}"><button class="sheet-skill-roll" type='roll' name='roll_perception' value='/em makes an ability check\n\nWIS (Perception) check :[[1d20 + @{perception} [Proficiency + Expertise + Wisdom Mod] + ?{MiscMod|0} [Misc Modifiers] ]]'>Check</button></div>
+				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_pb_perception" value="1"/>Prof</span></div>
+				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_expertise_perception" value="5"/>Exp</span></div>
+				<div class="sheet-col-1-3 sheet-vert-middle"><input type="hidden" name="attr_perception" value="(@{pb_perception}*@{PB})+@{wisdom_mod}+@{expertise_perception}"><button class="sheet-skill-roll" type='roll' name='roll_Perception_Check' value='/em makes an ability check\n\nWIS (Perception) check :[[1d20 + @{perception} [Proficiency + Expertise + Wisdom Mod] + ?{MiscMod|0} [Misc Modifiers] ]]'>Check</button></div>
 			</div>
 			
 			<div class="sheet-row sheet-skill-row">
 				<div class="sheet-col-1-3 sheet-vert-middle">Survival</div>
-				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_pb-survival" value="1"/>Prof</span></div>
-				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_ex-survival" value="5"/>Exp</span></div>
-				<div class="sheet-col-1-3 sheet-vert-middle"><input type="hidden" name="attr_survival" value="(@{pb-survival}*@{PB})+@{wisdom_mod}+@{ex-survival}"><button class="sheet-skill-roll" type='roll' name='roll_survival' value='/em makes an ability check\n\nWIS (Survival) check :[[1d20 + @{survival} [Proficiency + Expertise + Wisdom Mod] + ?{MiscMod|0} [Misc Modifiers] ]]'>Check</button></div>
+				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_pb_survival" value="1"/>Prof</span></div>
+				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_expertise_survival" value="5"/>Exp</span></div>
+				<div class="sheet-col-1-3 sheet-vert-middle"><input type="hidden" name="attr_survival" value="(@{pb_survival}*@{PB})+@{wisdom_mod}+@{expertise_survival}"><button class="sheet-skill-roll" type='roll' name='roll_Survival_Check' value='/em makes an ability check\n\nWIS (Survival) check :[[1d20 + @{survival} [Proficiency + Expertise + Wisdom Mod] + ?{MiscMod|0} [Misc Modifiers] ]]'>Check</button></div>
 			</div>
 			
 			<div class="sheet-row sheet-skill-header">
@@ -316,30 +316,30 @@
 			
 			<div class="sheet-row sheet-skill-row">
 				<div class="sheet-col-1-3 sheet-vert-middle">Deception</div>
-				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_pb-deception" value="1"/>Prof</span></div>
-				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_ex-deception" value="5"/>Exp</span></div>
-				<div class="sheet-col-1-3 sheet-vert-middle"><input type="hidden" name="attr_deception" value="(@{pb-deception}*@{PB})+@{charisma_mod}+@{ex-deception}"><button class="sheet-skill-roll" type='roll' name='roll_deception' value='/em makes an ability check\n\nCHA (Deception) check :[[1d20 + @{deception} [Proficiency + Expertise + Charisma Mod] + ?{MiscMod|0} [Misc Modifiers] ]]'>Check</button></div>
+				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_pb_deception" value="1"/>Prof</span></div>
+				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_expertise_deception" value="5"/>Exp</span></div>
+				<div class="sheet-col-1-3 sheet-vert-middle"><input type="hidden" name="attr_deception" value="(@{pb_deception}*@{PB})+@{charisma_mod}+@{expertise_deception}"><button class="sheet-skill-roll" type='roll' name='roll_Deception_Check' value='/em makes an ability check\n\nCHA (Deception) check :[[1d20 + @{deception} [Proficiency + Expertise + Charisma Mod] + ?{MiscMod|0} [Misc Modifiers] ]]'>Check</button></div>
 			</div>
 			
 			<div class="sheet-row sheet-skill-row">
 				<div class="sheet-col-1-3 sheet-vert-middle">Intimidation</div>
-				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_pb-intimidation" value="1"/>Prof</span></div>
-				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_ex-intimidation" value="5"/>Exp</span></div>
-				<div class="sheet-col-1-3 sheet-vert-middle"><input type="hidden" name="attr_intimidation" value="(@{pb-intimidation}*@{PB})+@{charisma_mod}+@{ex-intimidation}"><button class="sheet-skill-roll" type='roll' name='roll_intimidation' value='/em makes an ability check\n\nCHA (Intimidation) check :[[1d20 + @{intimidation} [Proficiency + Expertise + Charisma Mod] + ?{MiscMod|0} [Misc Modifiers] ]]'>Check</button></div>
+				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_pb_intimidation" value="1"/>Prof</span></div>
+				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_expertise_intimidation" value="5"/>Exp</span></div>
+				<div class="sheet-col-1-3 sheet-vert-middle"><input type="hidden" name="attr_intimidation" value="(@{pb_intimidation}*@{PB})+@{charisma_mod}+@{expertise_intimidation}"><button class="sheet-skill-roll" type='roll' name='roll_Intimidation_Check' value='/em makes an ability check\n\nCHA (Intimidation) check :[[1d20 + @{intimidation} [Proficiency + Expertise + Charisma Mod] + ?{MiscMod|0} [Misc Modifiers] ]]'>Check</button></div>
 			</div>
 			
 			<div class="sheet-row sheet-skill-row">
 				<div class="sheet-col-1-3 sheet-vert-middle">Performance</div>
-				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_pb-performance" value="1"/>Prof</span></div>
-				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_ex-performance" value="5"/>Exp</span></div>
-				<div class="sheet-col-1-3 sheet-vert-middle"><input type="hidden" name="attr_performance" value="(@{pb-performance}*@{PB})+@{charisma_mod}+@{ex-performance}"><button class="sheet-skill-roll" type='roll' name='roll_performance' value='/em makes an ability check\n\nCHA (Performance) check :[[1d20 + @{performance} [Proficiency + Expertise + Charisma Mod] + ?{MiscMod|0} [Misc Modifiers] ]]'>Check</button></div>
+				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_pb_performance" value="1"/>Prof</span></div>
+				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_expertise_performance" value="5"/>Exp</span></div>
+				<div class="sheet-col-1-3 sheet-vert-middle"><input type="hidden" name="attr_performance" value="(@{pb_performance}*@{PB})+@{charisma_mod}+@{expertise_performance}"><button class="sheet-skill-roll" type='roll' name='roll_Performance_Check' value='/em makes an ability check\n\nCHA (Performance) check :[[1d20 + @{performance} [Proficiency + Expertise + Charisma Mod] + ?{MiscMod|0} [Misc Modifiers] ]]'>Check</button></div>
 			</div>
 			
 			<div class="sheet-row sheet-skill-row">
 				<div class="sheet-col-1-3 sheet-vert-middle">Persuasion</div>
-				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_pb-persuasion" value="1"/>Prof</span></div>
-				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_ex-persuasion" value="5"/>Exp</span></div>
-				<div class="sheet-col-1-3 sheet-vert-middle"><input type="hidden" name="attr_persuasion" value="(@{pb-persuasion}*@{PB})+@{charisma_mod}+@{ex-persuasion}"><button class="sheet-skill-roll" type='roll' name='roll_persuasion' value='/em makes an ability check\n\nCHA (Persuasion) check :[[1d20 + @{persuasion} [Proficiency + Expertise + Charisma Mod] + ?{MiscMod|0} [Misc Modifiers] ]]'>Check</button></div>
+				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_pb_persuasion" value="1"/>Prof</span></div>
+				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_expertise_persuasion" value="5"/>Exp</span></div>
+				<div class="sheet-col-1-3 sheet-vert-middle"><input type="hidden" name="attr_persuasion" value="(@{pb_persuasion}*@{PB})+@{charisma_mod}+@{expertise_persuasion}"><button class="sheet-skill-roll" type='roll' name='roll_Persuasion_Check' value='/em makes an ability check\n\nCHA (Persuasion) check :[[1d20 + @{persuasion} [Proficiency + Expertise + Charisma Mod] + ?{MiscMod|0} [Misc Modifiers] ]]'>Check</button></div>
 			</div>
 		
 		</div>