From 0a4758ee1cba5d2ffd3ac6e1014dd16d4a2dcc6e Mon Sep 17 00:00:00 2001
From: Actoba <jmyles@jmyles.co.uk>
Date: Mon, 30 Jun 2014 22:32:36 +0100
Subject: [PATCH] Fix #34 - Updated skill section to use proficiency for
 trained skills and double proficiency for expert skills

---
 DnD_5e/DnD_5e.html | 219 +++++++++++++++++++++++++++++++--------------
 1 file changed, 153 insertions(+), 66 deletions(-)

diff --git a/DnD_5e/DnD_5e.html b/DnD_5e/DnD_5e.html
index 1be05ead59..56e62e13ac 100644
--- a/DnD_5e/DnD_5e.html
+++ b/DnD_5e/DnD_5e.html
@@ -222,8 +222,7 @@
 				<div class="sheet-row sheet-sub-header">
 					<div class="sheet-col-1-7 sheet-center sheet-small-label">&nbsp;</div>
 					<div class="sheet-col-2-7 sheet-small-label">Strength Skills</div>
-					<div class="sheet-col-1-7 sheet-center sheet-small-label">Prof.</div>
-					<div class="sheet-col-1-7 sheet-center sheet-small-label">Exp.</div>
+					<div class="sheet-col-2-7 sheet-center sheet-small-label">Training</div>
 					<div class="sheet-col-1-7 sheet-center sheet-small-label">Misc</div>
 					<div class="sheet-col-1-7 sheet-center sheet-small-label">Total</div>
 				</div>
@@ -231,10 +230,15 @@
 				<div class="sheet-row sheet-skill-row">
 					<div class="sheet-col-1-7"><button class="sheet-skill-roll" type="roll" name="roll_Athletics_Check" value="/em makes an ability check\n\nSTR (Athletics) check :\n[[1d20 + @{athletics} [Proficiency + Strength Mod + Expertise + Misc] + @{global_check_bonus} [Ability Check Bonus] ]] | [[1d20 + @{athletics} [Proficiency + Strength Mod + Expertise + Misc] + @{global_check_bonus} [Ability Check Bonus] ]]"></button></div>
 					<div class="sheet-col-2-7 sheet-skill-name">Athletics</div>
-					<div class="sheet-col-1-7 sheet-center sheet-skill-checkbox"><input type="checkbox" name="attr_pb_athletics" value="1"/></div>
-					<div class="sheet-col-1-7 sheet-center sheet-skill-checkbox"><input type="checkbox" name="attr_expertise_athletics" value="5"/></div>
+					<div class="sheet-col-2-7">
+						<select name="attr_athletics_prof_exp">
+							<option value="0">Untrained</option>
+							<option value="@{PB}">Trained</option>
+							<option value="2*@{PB}">Expert</option>
+						</select>
+					</div>
 					<div class="sheet-col-1-7"><input type="number" name="attr_athletics_bonus" value="0" step="1"/></div>
-					<div class="sheet-col-1-7"><input type="number" name="attr_athletics" value="(@{pb_athletics}*@{PB})+@{strength_mod}+@{expertise_athletics}+@{athletics_bonus}" disabled="disabled"></div>
+					<div class="sheet-col-1-7"><input type="number" name="attr_athletics" value="@{athletics_prof_exp}+@{strength_mod}+@{athletics_bonus}" disabled="disabled"></div>
 				</div>
 				
 				<div class="sheet-row sheet-skill-row">
@@ -249,8 +253,7 @@
 				<div class="sheet-row sheet-sub-header">
 					<div class="sheet-col-1-7 sheet-center sheet-small-label">&nbsp;</div>
 					<div class="sheet-col-2-7 sheet-small-label">Dexterity Skills</div>
-					<div class="sheet-col-1-7 sheet-center sheet-small-label">Prof.</div>
-					<div class="sheet-col-1-7 sheet-center sheet-small-label">Exp.</div>
+					<div class="sheet-col-2-7 sheet-center sheet-small-label">Training</div>
 					<div class="sheet-col-1-7 sheet-center sheet-small-label">Misc</div>
 					<div class="sheet-col-1-7 sheet-center sheet-small-label">Total</div>
 				</div>
@@ -258,28 +261,43 @@
 				<div class="sheet-row sheet-skill-row">
 					<div class="sheet-col-1-7"><button class="sheet-skill-roll" type="roll" name="roll_Acrobatics_Check" value="/em makes an ability check\n\nDEX (Acrobatics) check :\n[[1d20 + @{acrobatics} [Proficiency + Dexterity Mod + Expertise + Misc] + @{global_check_bonus} [Ability Check Bonus] ]] | [[1d20 + @{acrobatics} [Proficiency + Dexterity Mod + Expertise + Misc] + @{global_check_bonus} [Ability Check Bonus] ]]"></button></div>
 					<div class="sheet-col-2-7 sheet-skill-name">Acrobatics</div>
-					<div class="sheet-col-1-7 sheet-center sheet-skill-checkbox"><input type="checkbox" name="attr_pb_acrobatics" value="1"/></div>
-					<div class="sheet-col-1-7 sheet-center sheet-skill-checkbox"><input type="checkbox" name="attr_expertise_acrobatics" value="5"/></div>
+					<div class="sheet-col-2-7">
+						<select name="attr_acrobatics_prof_exp">
+							<option value="0">Untrained</option>
+							<option value="@{PB}">Trained</option>
+							<option value="2*@{PB}">Expert</option>
+						</select>
+					</div>
 					<div class="sheet-col-1-7"><input type="number" name="attr_acrobatics_bonus" value="0" step="1"/></div>
-					<div class="sheet-col-1-7"><input type="number" name="attr_acrobatics" value="(@{pb_acrobatics}*@{PB})+@{dexterity_mod}+@{expertise_acrobatics}+@{acrobatics_bonus}" disabled="disabled"></div>
+					<div class="sheet-col-1-7"><input type="number" name="attr_acrobatics" value="@{acrobatics_prof_exp}+@{dexterity_mod}+@{acrobatics_bonus}" disabled="disabled"></div>
 				</div>
 				
 				<div class="sheet-row sheet-skill-row">
 					<div class="sheet-col-1-7"><button class="sheet-skill-roll" type="roll" name="roll_SleightOfHand_Check" value="/em makes an ability check\n\nDEX (Sleight of Hand) check :\n[[1d20 + @{sleightofhand} [Proficiency + Dexterity Mod + Expertise + Misc] + @{global_check_bonus} [Ability Check Bonus] ]] | [[1d20 + @{sleightofhand} [Proficiency + Dexterity Mod + Expertise + Misc] + @{global_check_bonus} [Ability Check Bonus] ]]"></button></div>
 					<div class="sheet-col-2-7 sheet-skill-name">Sleight of Hand</div>
-					<div class="sheet-col-1-7 sheet-center sheet-skill-checkbox"><input type="checkbox" name="attr_pb_sleightofhand" value="1"/></div>
-					<div class="sheet-col-1-7 sheet-center sheet-skill-checkbox"><input type="checkbox" name="attr_expertise_sleightofhand" value="5"/></div>
+					<div class="sheet-col-2-7">
+						<select name="attr_sleightofhand_prof_exp">
+							<option value="0">Untrained</option>
+							<option value="@{PB}">Trained</option>
+							<option value="2*@{PB}">Expert</option>
+						</select>
+					</div>
 					<div class="sheet-col-1-7"><input type="number" name="attr_sleightofhand_bonus" value="0" step="1"/></div>
-					<div class="sheet-col-1-7"><input type="number" name="attr_sleightofhand" value="(@{pb_sleightofhand}*@{PB})+@{dexterity_mod}+@{expertise_sleightofhand}+@{sleightofhand_bonus}" disabled="disabled"></div>
+					<div class="sheet-col-1-7"><input type="number" name="attr_sleightofhand" value="@{sleightofhand_prof_exp}+@{dexterity_mod}+@{sleightofhand_bonus}" disabled="disabled"></div>
 				</div>
 				
 				<div class="sheet-row sheet-skill-row">
 					<div class="sheet-col-1-7"><button class="sheet-skill-roll" type="roll" name="roll_Stealth_Check" value="/em makes an ability check\n\nDEX (Stealth) check :\n[[1d20 + @{stealth} [Proficiency + Dexterity Mod + Expertise + Misc] + @{global_check_bonus} [Ability Check Bonus] ]] | [[1d20 + @{stealth} [Proficiency + Dexterity Mod + Expertise + Misc] + @{global_check_bonus} [Ability Check Bonus] ]]"></button></div>
 					<div class="sheet-col-2-7 sheet-skill-name">Stealth</div>
-					<div class="sheet-col-1-7 sheet-center sheet-skill-checkbox"><input type="checkbox" name="attr_pb_stealth" value="1"/></div>
-					<div class="sheet-col-1-7 sheet-center sheet-skill-checkbox"><input type="checkbox" name="attr_expertise_stealth" value="5"/></div>
+					<div class="sheet-col-2-7">
+						<select name="attr_stealth_prof_exp">
+							<option value="0">Untrained</option>
+							<option value="@{PB}">Trained</option>
+							<option value="2*@{PB}">Expert</option>
+						</select>
+					</div>
 					<div class="sheet-col-1-7"><input type="number" name="attr_stealth_bonus" value="0" step="1"/></div>
-					<div class="sheet-col-1-7"><input type="number" name="attr_stealth" value="(@{pb_stealth}*@{PB})+@{dexterity_mod}+@{expertise_stealth}+@{stealth_bonus}" disabled="disabled"></div>
+					<div class="sheet-col-1-7"><input type="number" name="attr_stealth" value="@{stealth_prof_exp}+@{dexterity_mod}+@{stealth_bonus}" disabled="disabled"></div>
 				</div>
 				
 				<div class="sheet-row sheet-skill-row">
@@ -294,8 +312,7 @@
 				<div class="sheet-row sheet-sub-header">
 					<div class="sheet-col-1-7 sheet-center sheet-small-label">&nbsp;</div>
 					<div class="sheet-col-2-7 sheet-small-label">Intelligence Skills</div>
-					<div class="sheet-col-1-7 sheet-center sheet-small-label">Prof.</div>
-					<div class="sheet-col-1-7 sheet-center sheet-small-label">Exp.</div>
+					<div class="sheet-col-2-7 sheet-center sheet-small-label">Training</div>
 					<div class="sheet-col-1-7 sheet-center sheet-small-label">Misc</div>
 					<div class="sheet-col-1-7 sheet-center sheet-small-label">Total</div>
 				</div>
@@ -303,46 +320,71 @@
 				<div class="sheet-row sheet-skill-row">
 					<div class="sheet-col-1-7"><button class="sheet-skill-roll" type="roll" name="roll_Arcana_Check" value="/em makes an ability check\n\nINT (Arcana) check :\n[[1d20 + @{arcana} [Proficiency + Intelligence Mod + Expertise + Misc] + @{global_check_bonus} [Ability Check Bonus] ]] | [[1d20 + @{arcana} [Proficiency + Intelligence Mod + Expertise + Misc] + @{global_check_bonus} [Ability Check Bonus] ]]"></button></div>
 					<div class="sheet-col-2-7 sheet-skill-name">Arcana</div>
-					<div class="sheet-col-1-7 sheet-center sheet-skill-checkbox"><input type="checkbox" name="attr_pb_arcana" value="1"/></div>
-					<div class="sheet-col-1-7 sheet-center sheet-skill-checkbox"><input type="checkbox" name="attr_expertise_arcana" value="5"/></div>
+					<div class="sheet-col-2-7">
+						<select name="attr_arcana_prof_exp">
+							<option value="0">Untrained</option>
+							<option value="@{PB}">Trained</option>
+							<option value="2*@{PB}">Expert</option>
+						</select>
+					</div>
 					<div class="sheet-col-1-7"><input type="number" name="attr_arcana_bonus" value="0" step="1"/></div>
-					<div class="sheet-col-1-7"><input type="number" name="attr_arcana" value="(@{pb_arcana}*@{PB})+@{intelligence_mod}+@{expertise_arcana}+@{arcana_bonus}" disabled="disabled"></div>
+					<div class="sheet-col-1-7"><input type="number" name="attr_arcana" value="@{arcana_prof_exp}+@{intelligence_mod}+@{arcana_bonus}" disabled="disabled"></div>
 				</div>
 				
 				<div class="sheet-row sheet-skill-row">
 					<div class="sheet-col-1-7"><button class="sheet-skill-roll" type="roll" name="roll_History_Check" value="/em makes an ability check\n\nINT (History) check :\n[[1d20 + @{history} [Proficiency + Intelligence Mod + Expertise + Misc] + @{global_check_bonus} [Ability Check Bonus] ]] | [[1d20 + @{history} [Proficiency + Intelligence Mod + Expertise + Misc] + @{global_check_bonus} [Ability Check Bonus] ]]"></button></div>
 					<div class="sheet-col-2-7 sheet-skill-name">History</div>
-					<div class="sheet-col-1-7 sheet-center sheet-skill-checkbox"><input type="checkbox" name="attr_pb_history" value="1"/></div>
-					<div class="sheet-col-1-7 sheet-center sheet-skill-checkbox"><input type="checkbox" name="attr_expertise_history" value="5"/></div>
+					<div class="sheet-col-2-7">
+						<select name="attr_history_prof_exp">
+							<option value="0">Untrained</option>
+							<option value="@{PB}">Trained</option>
+							<option value="2*@{PB}">Expert</option>
+						</select>
+					</div>
 					<div class="sheet-col-1-7"><input type="number" name="attr_history_bonus" value="0" step="1"/></div>
-					<div class="sheet-col-1-7"><input type="number" name="attr_history" value="(@{pb_history}*@{PB})+@{intelligence_mod}+@{expertise_history}+@{history_bonus}" disabled="disabled"></div>
+					<div class="sheet-col-1-7"><input type="number" name="attr_history" value="@{history_prof_exp}+@{intelligence_mod}+@{history_bonus}" disabled="disabled"></div>
 				</div>
 				
 				<div class="sheet-row sheet-skill-row">
 					<div class="sheet-col-1-7"><button class="sheet-skill-roll" type="roll" name="roll_Investigation_Check" value="/em makes an ability check\n\nINT (Investigation) check :\n[[1d20 + @{investigation} [Proficiency + Intelligence Mod + Expertise + Misc] + @{global_check_bonus} [Ability Check Bonus] ]] | [[1d20 + @{investigation} [Proficiency + Intelligence Mod + Expertise + Misc] + @{global_check_bonus} [Ability Check Bonus] ]]"></button></div>
 					<div class="sheet-col-2-7 sheet-skill-name">Investigation</div>
-					<div class="sheet-col-1-7 sheet-center sheet-skill-checkbox"><input type="checkbox" name="attr_pb_investigation" value="1"/></div>
-					<div class="sheet-col-1-7 sheet-center sheet-skill-checkbox"><input type="checkbox" name="attr_expertise_investigation" value="5"/></div>
+					<div class="sheet-col-2-7">
+						<select name="attr_investigation_prof_exp">
+							<option value="0">Untrained</option>
+							<option value="@{PB}">Trained</option>
+							<option value="2*@{PB}">Expert</option>
+						</select>
+					</div>
 					<div class="sheet-col-1-7"><input type="number" name="attr_investigation_bonus" value="0" step="1"/></div>
-					<div class="sheet-col-1-7"><input type="number" name="attr_investigation" value="(@{pb_investigation}*@{PB})+@{intelligence_mod}+@{expertise_investigation}+@{investigation_bonus}" disabled="disabled"></div>
+					<div class="sheet-col-1-7"><input type="number" name="attr_investigation" value="@{investigation_prof_exp}+@{intelligence_mod}+@{investigation_bonus}" disabled="disabled"></div>
 				</div>
 				
 				<div class="sheet-row sheet-skill-row">
 					<div class="sheet-col-1-7"><button class="sheet-skill-roll" type="roll" name="roll_Nature_Check" value="/em makes an ability check\n\nINT (Nature) check :\n[[1d20 + @{nature} [Proficiency + Intelligence Mod + Expertise + Misc] + @{global_check_bonus} [Ability Check Bonus] ]] | [[1d20 + @{nature} [Proficiency + Intelligence Mod + Expertise + Misc] + @{global_check_bonus} [Ability Check Bonus] ]]"></button></div>
 					<div class="sheet-col-2-7 sheet-skill-name">Nature</div>
-					<div class="sheet-col-1-7 sheet-center sheet-skill-checkbox"><input type="checkbox" name="attr_pb_nature" value="1"/></div>
-					<div class="sheet-col-1-7 sheet-center sheet-skill-checkbox"><input type="checkbox" name="attr_expertise_nature" value="5"/></div>
+					<div class="sheet-col-2-7">
+						<select name="attr_nature_prof_exp">
+							<option value="0">Untrained</option>
+							<option value="@{PB}">Trained</option>
+							<option value="2*@{PB}">Expert</option>
+						</select>
+					</div>
 					<div class="sheet-col-1-7"><input type="number" name="attr_nature_bonus" value="0" step="1"/></div>
-					<div class="sheet-col-1-7"><input type="number" name="attr_nature" value="(@{pb_nature}*@{PB})+@{intelligence_mod}+@{expertise_nature}+@{nature_bonus}" disabled="disabled"></div>
+					<div class="sheet-col-1-7"><input type="number" name="attr_nature" value="@{nature_prof_exp}+@{intelligence_mod}+@{nature_bonus}" disabled="disabled"></div>
 				</div>
 				
 				<div class="sheet-row sheet-skill-row">
 					<div class="sheet-col-1-7"><button class="sheet-skill-roll" type="roll" name="roll_Religion_Check" value="/em makes an ability check\n\nINT (Religion) check :\n[[1d20 + @{religion} [Proficiency + Intelligence Mod + Expertise + Misc] + @{global_check_bonus} [Ability Check Bonus] ]] | [[1d20 + @{religion} [Proficiency + Intelligence Mod + Expertise + Misc] + @{global_check_bonus} [Ability Check Bonus] ]]"></button></div>
 					<div class="sheet-col-2-7 sheet-skill-name">Religion</div>
-					<div class="sheet-col-1-7 sheet-center sheet-skill-checkbox"><input type="checkbox" name="attr_pb_religion" value="1"/></div>
-					<div class="sheet-col-1-7 sheet-center sheet-skill-checkbox"><input type="checkbox" name="attr_expertise_religion" value="5"/></div>
+					<div class="sheet-col-2-7">
+						<select name="attr_religion_prof_exp">
+							<option value="0">Untrained</option>
+							<option value="@{PB}">Trained</option>
+							<option value="2*@{PB}">Expert</option>
+						</select>
+					</div>
 					<div class="sheet-col-1-7"><input type="number" name="attr_religion_bonus" value="0" step="1"/></div>
-					<div class="sheet-col-1-7"><input type="number" name="attr_religion" value="(@{pb_religion}*@{PB})+@{intelligence_mod}+@{expertise_religion}+@{religion_bonus}" disabled="disabled"></div>
+					<div class="sheet-col-1-7"><input type="number" name="attr_religion" value="@{religion_prof_exp}+@{intelligence_mod}+@{religion_bonus}" disabled="disabled"></div>
 				</div>
 
 				<div class="sheet-row sheet-skill-row">
@@ -361,8 +403,7 @@
 				<div class="sheet-row sheet-sub-header">
 					<div class="sheet-col-1-7 sheet-center sheet-small-label">&nbsp;</div>
 					<div class="sheet-col-2-7 sheet-small-label">Wisdom Skills</div>
-					<div class="sheet-col-1-7 sheet-center sheet-small-label">Prof.</div>
-					<div class="sheet-col-1-7 sheet-center sheet-small-label">Exp.</div>
+					<div class="sheet-col-2-7 sheet-center sheet-small-label">Training</div>
 					<div class="sheet-col-1-7 sheet-center sheet-small-label">Misc</div>
 					<div class="sheet-col-1-7 sheet-center sheet-small-label">Total</div>
 				</div>
@@ -370,46 +411,71 @@
 				<div class="sheet-row sheet-skill-row">
 					<div class="sheet-col-1-7"><button class="sheet-skill-roll" type="roll" name="roll_AnimalHandling_Check" value="/em makes an ability check\n\nWIS (Animal Handling) check :\n[[1d20 + @{animalhandling} [Proficiency + Wisdom Mod + Expertise + Misc] + @{global_check_bonus} [Ability Check Bonus] ]] | [[1d20 + @{animalhandling} [Proficiency + Wisdom Mod + Expertise + Misc] + @{global_check_bonus} [Ability Check Bonus] ]]"></button></div>
 					<div class="sheet-col-2-7 sheet-skill-name">Animal Handling</div>
-					<div class="sheet-col-1-7 sheet-center sheet-skill-checkbox"><input type="checkbox" name="attr_pb_animalhandling" value="1"/></div>
-					<div class="sheet-col-1-7 sheet-center sheet-skill-checkbox"><input type="checkbox" name="attr_expertise_animalhandling" value="5"/></div>
+					<div class="sheet-col-2-7">
+						<select name="attr_animalhandling_prof_exp">
+							<option value="0">Untrained</option>
+							<option value="@{PB}">Trained</option>
+							<option value="2*@{PB}">Expert</option>
+						</select>
+					</div>
 					<div class="sheet-col-1-7"><input type="number" name="attr_animalhandling_bonus" value="0" step="1"/></div>
-					<div class="sheet-col-1-7"><input type="number" name="attr_animalhandling" value="(@{pb_animalhandling}*@{PB})+@{wisdom_mod}+@{expertise_animalhandling}+@{animalhandling_bonus}" disabled="disabled"></div>
+					<div class="sheet-col-1-7"><input type="number" name="attr_animalhandling" value="@{animalhandling_prof_exp}+@{wisdom_mod}+@{animalhandling_bonus}" disabled="disabled"></div>
 				</div>					
 				
 				<div class="sheet-row sheet-skill-row">
 					<div class="sheet-col-1-7"><button class="sheet-skill-roll" type="roll" name="roll_Insight_Check" value="/em makes an ability check\n\nWIS (Insight) check :\n[[1d20 + @{insight} [Proficiency + Wisdom Mod + Expertise + Misc] + @{global_check_bonus} [Ability Check Bonus] ]] | [[1d20 + @{insight} [Proficiency + Wisdom Mod + Expertise + Misc] + @{global_check_bonus} [Ability Check Bonus] ]]"></button></div>
 					<div class="sheet-col-2-7 sheet-skill-name">Insight</div>
-					<div class="sheet-col-1-7 sheet-center sheet-skill-checkbox"><input type="checkbox" name="attr_pb_insight" value="1"/></div>
-					<div class="sheet-col-1-7 sheet-center sheet-skill-checkbox"><input type="checkbox" name="attr_expertise_insight" value="5"/></div>
+					<div class="sheet-col-2-7">
+						<select name="attr_insight_prof_exp">
+							<option value="0">Untrained</option>
+							<option value="@{PB}">Trained</option>
+							<option value="2*@{PB}">Expert</option>
+						</select>
+					</div>
 					<div class="sheet-col-1-7"><input type="number" name="attr_insight_bonus" value="0" step="1"/></div>
-					<div class="sheet-col-1-7"><input type="number" name="attr_insight" value="(@{pb_insight}*@{PB})+@{wisdom_mod}+@{expertise_insight}+@{insight_bonus}" disabled="disabled"></div>
+					<div class="sheet-col-1-7"><input type="number" name="attr_insight" value="@{insight_prof_exp}+@{wisdom_mod}+@{insight_bonus}" disabled="disabled"></div>
 				</div>
 				
 				<div class="sheet-row sheet-skill-row">
 					<div class="sheet-col-1-7"><button class="sheet-skill-roll" type="roll" name="roll_Medicine_Check" value="/em makes an ability check\n\nWIS (Medicine) check :\n[[1d20 + @{medicine} [Proficiency + Wisdom Mod + Expertise + Misc] + @{global_check_bonus} [Ability Check Bonus] ]] | [[1d20 + @{medicine} [Proficiency + Wisdom Mod + Expertise + Misc] + @{global_check_bonus} [Ability Check Bonus] ]]"></button></div>
 					<div class="sheet-col-2-7 sheet-skill-name">Medicine</div>
-					<div class="sheet-col-1-7 sheet-center sheet-skill-checkbox"><input type="checkbox" name="attr_pb_medicine" value="1"/></div>
-					<div class="sheet-col-1-7 sheet-center sheet-skill-checkbox"><input type="checkbox" name="attr_expertise_medicine" value="5"/></div>
+					<div class="sheet-col-2-7">
+						<select name="attr_medicine_prof_exp">
+							<option value="0">Untrained</option>
+							<option value="@{PB}">Trained</option>
+							<option value="2*@{PB}">Expert</option>
+						</select>
+					</div>
 					<div class="sheet-col-1-7"><input type="number" name="attr_medicine_bonus" value="0" step="1"/></div>
-					<div class="sheet-col-1-7"><input type="number" name="attr_medicine" value="(@{pb_medicine}*@{PB})+@{wisdom_mod}+@{expertise_medicine}+@{medicine_bonus}" disabled="disabled"></div>
+					<div class="sheet-col-1-7"><input type="number" name="attr_medicine" value="@{medicine_prof_exp}+@{wisdom_mod}+@{medicine_bonus}" disabled="disabled"></div>
 				</div>
 				
 				<div class="sheet-row sheet-skill-row">
 					<div class="sheet-col-1-7"><button class="sheet-skill-roll" type="roll" name="roll_Perception_Check" value="/em makes an ability check\n\nWIS (Perception) check :\n[[1d20 + @{perception} [Proficiency + Wisdom Mod + Expertise + Misc] + @{global_check_bonus} [Ability Check Bonus] ]] | [[1d20 + @{perception} [Proficiency + Wisdom Mod + Expertise + Misc] + @{global_check_bonus} [Ability Check Bonus] ]]"></button></div>
 					<div class="sheet-col-2-7 sheet-skill-name">Perception</div>
-					<div class="sheet-col-1-7 sheet-center sheet-skill-checkbox"><input type="checkbox" name="attr_pb_perception" value="1"/></div>
-					<div class="sheet-col-1-7 sheet-center sheet-skill-checkbox"><input type="checkbox" name="attr_expertise_perception" value="5"/></div>
+					<div class="sheet-col-2-7">
+						<select name="attr_perception_prof_exp">
+							<option value="0">Untrained</option>
+							<option value="@{PB}">Trained</option>
+							<option value="2*@{PB}">Expert</option>
+						</select>
+					</div>
 					<div class="sheet-col-1-7"><input type="number" name="attr_perception_bonus" value="0" step="1"/></div>
-					<div class="sheet-col-1-7"><input type="number" name="attr_perception" value="(@{pb_perception}*@{PB})+@{wisdom_mod}+@{expertise_perception}+@{perception_bonus}" disabled="disabled"></div>
+					<div class="sheet-col-1-7"><input type="number" name="attr_perception" value="@{perception_prof_exp}+@{wisdom_mod}+@{perception_bonus}" disabled="disabled"></div>
 				</div>
 				
 				<div class="sheet-row sheet-skill-row">
 					<div class="sheet-col-1-7"><button class="sheet-skill-roll" type="roll" name="roll_Survival_Check" value="/em makes an ability check\n\nWIS (Survival) check :\n[[1d20 + @{survival} [Proficiency + Wisdom Mod + Expertise + Misc] + @{global_check_bonus} [Ability Check Bonus] ]] | [[1d20 + @{survival} [Proficiency + Wisdom Mod + Expertise + Misc] + @{global_check_bonus} [Ability Check Bonus] ]]"></button></div>
 					<div class="sheet-col-2-7 sheet-skill-name">Survival</div>
-					<div class="sheet-col-1-7 sheet-center sheet-skill-checkbox"><input type="checkbox" name="attr_pb_survival" value="1"/></div>
-					<div class="sheet-col-1-7 sheet-center sheet-skill-checkbox"><input type="checkbox" name="attr_expertise_survival" value="5"/></div>
+					<div class="sheet-col-2-7">
+						<select name="attr_survival_prof_exp">
+							<option value="0">Untrained</option>
+							<option value="@{PB}">Trained</option>
+							<option value="2*@{PB}">Expert</option>
+						</select>
+					</div>
 					<div class="sheet-col-1-7"><input type="number" name="attr_survival_bonus" value="0" step="1"/></div>
-					<div class="sheet-col-1-7"><input type="number" name="attr_survival" value="(@{pb_survival}*@{PB})+@{wisdom_mod}+@{expertise_survival}+@{survival_bonus}" disabled="disabled"></div>
+					<div class="sheet-col-1-7"><input type="number" name="attr_survival" value="@{survival_prof_exp}+@{wisdom_mod}+@{survival_bonus}" disabled="disabled"></div>
 				</div>
 				
 				<div class="sheet-row sheet-skill-row">
@@ -424,8 +490,7 @@
 				<div class="sheet-row sheet-sub-header">
 					<div class="sheet-col-1-7 sheet-center sheet-small-label">&nbsp;</div>
 					<div class="sheet-col-2-7 sheet-small-label">Charisma Skills</div>
-					<div class="sheet-col-1-7 sheet-center sheet-small-label">Prof.</div>
-					<div class="sheet-col-1-7 sheet-center sheet-small-label">Exp.</div>
+					<div class="sheet-col-2-7 sheet-center sheet-small-label">Training</div>
 					<div class="sheet-col-1-7 sheet-center sheet-small-label">Misc</div>
 					<div class="sheet-col-1-7 sheet-center sheet-small-label">Total</div>
 				</div>
@@ -433,37 +498,57 @@
 				<div class="sheet-row sheet-skill-row">
 					<div class="sheet-col-1-7"><button class="sheet-skill-roll" type="roll" name="roll_Deception_Check" value="/em makes an ability check\n\nCHA (Deception) check :\n[[1d20 + @{deception} [Proficiency + Charisma Mod + Expertise + Misc] + @{global_check_bonus} [Ability Check Bonus] ]] | [[1d20 + @{deception} [Proficiency + Charisma Mod + Expertise + Misc] + @{global_check_bonus} [Ability Check Bonus] ]]"></button></div>
 					<div class="sheet-col-2-7 sheet-skill-name">Deception</div>
-					<div class="sheet-col-1-7 sheet-center sheet-skill-checkbox"><input type="checkbox" name="attr_pb_deception" value="1"/></div>
-					<div class="sheet-col-1-7 sheet-center sheet-skill-checkbox"><input type="checkbox" name="attr_expertise_deception" value="5"/></div>
+					<div class="sheet-col-2-7">
+						<select name="attr_deception_prof_exp">
+							<option value="0">Untrained</option>
+							<option value="@{PB}">Trained</option>
+							<option value="2*@{PB}">Expert</option>
+						</select>
+					</div>
 					<div class="sheet-col-1-7"><input type="number" name="attr_deception_bonus" value="0" step="1"/></div>
-					<div class="sheet-col-1-7"><input type="number" name="attr_deception" value="(@{pb_deception}*@{PB})+@{charisma_mod}+@{expertise_deception}+@{deception_bonus}" disabled="disabled"></div>
+					<div class="sheet-col-1-7"><input type="number" name="attr_deception" value="@{deception_prof_exp}+@{charisma_mod}+@{deception_bonus}" disabled="disabled"></div>
 				</div>
 				
 				<div class="sheet-row sheet-skill-row">
 					<div class="sheet-col-1-7"><button class="sheet-skill-roll" type="roll" name="roll_Intimidation_Check" value="/em makes an ability check\n\nCHA (Intimidation) check :\n[[1d20 + @{intimidation} [Proficiency + Charisma Mod + Expertise + Misc] + @{global_check_bonus} [Ability Check Bonus] ]] | [[1d20 + @{intimidation} [Proficiency + Charisma Mod + Expertise + Misc] + @{global_check_bonus} [Ability Check Bonus] ]]"></button></div>
 					<div class="sheet-col-2-7 sheet-skill-name">Intimidation</div>
-					<div class="sheet-col-1-7 sheet-center sheet-skill-checkbox"><input type="checkbox" name="attr_pb_intimidation" value="1"/></div>
-					<div class="sheet-col-1-7 sheet-center sheet-skill-checkbox"><input type="checkbox" name="attr_expertise_intimidation" value="5"/></div>
+					<div class="sheet-col-2-7">
+						<select name="attr_intimidation_prof_exp">
+							<option value="0">Untrained</option>
+							<option value="@{PB}">Trained</option>
+							<option value="2*@{PB}">Expert</option>
+						</select>
+					</div>
 					<div class="sheet-col-1-7"><input type="number" name="attr_intimidation_bonus" value="0" step="1"/></div>
-					<div class="sheet-col-1-7"><input type="number" name="attr_intimidation" value="(@{pb_intimidation}*@{PB})+@{charisma_mod}+@{expertise_intimidation}+@{intimidation_bonus}" disabled="disabled"></div>
+					<div class="sheet-col-1-7"><input type="number" name="attr_intimidation" value="@{intimidation_prof_exp}+@{charisma_mod}+@{intimidation_bonus}" disabled="disabled"></div>
 				</div>
 				
 				<div class="sheet-row sheet-skill-row">
 					<div class="sheet-col-1-7"><button class="sheet-skill-roll" type="roll" name="roll_Performance_Check" value="/em makes an ability check\n\nCHA (Performance) check :\n[[1d20 + @{performance} [Proficiency + Charisma Mod + Expertise + Misc] + @{global_check_bonus} [Ability Check Bonus] ]] | [[1d20 + @{performance} [Proficiency + Charisma Mod + Expertise + Misc] + @{global_check_bonus} [Ability Check Bonus] ]]"></button></div>
 					<div class="sheet-col-2-7 sheet-skill-name">Performance</div>
-					<div class="sheet-col-1-7 sheet-center sheet-skill-checkbox"><input type="checkbox" name="attr_pb_performance" value="1"/></div>
-					<div class="sheet-col-1-7 sheet-center sheet-skill-checkbox"><input type="checkbox" name="attr_expertise_performance" value="5"/></div>
+					<div class="sheet-col-2-7">
+						<select name="attr_performance_prof_exp">
+							<option value="0">Untrained</option>
+							<option value="@{PB}">Trained</option>
+							<option value="2*@{PB}">Expert</option>
+						</select>
+					</div>
 					<div class="sheet-col-1-7"><input type="number" name="attr_performance_bonus" value="0" step="1"/></div>
-					<div class="sheet-col-1-7"><input type="number" name="attr_performance" value="(@{pb_performance}*@{PB})+@{charisma_mod}+@{expertise_performance}+@{performance_bonus}" disabled="disabled"></div>
+					<div class="sheet-col-1-7"><input type="number" name="attr_performance" value="@{performance_prof_exp}+@{charisma_mod}+@{performance_bonus}" disabled="disabled"></div>
 				</div>
 				
 				<div class="sheet-row sheet-skill-row">
 					<div class="sheet-col-1-7"><button class="sheet-skill-roll" type="roll" name="roll_Persuasion_Check" value="/em makes an ability check\n\nCHA (Persuasion) check :\n[[1d20 + @{persuasion} [Proficiency + Charisma Mod + Expertise + Misc] + @{global_check_bonus} [Ability Check Bonus] ]] | [[1d20 + @{persuasion} [Proficiency + Charisma Mod + Expertise + Misc] + @{global_check_bonus} [Ability Check Bonus] ]]"></button></div>
 					<div class="sheet-col-2-7 sheet-skill-name">Persuasion</div>
-					<div class="sheet-col-1-7 sheet-center sheet-skill-checkbox"><input type="checkbox" name="attr_pb_persuasion" value="1"/></div>
-					<div class="sheet-col-1-7 sheet-center sheet-skill-checkbox"><input type="checkbox" name="attr_expertise_persuasion" value="5"/></div>
+					<div class="sheet-col-2-7">
+						<select name="attr_persuasion_prof_exp">
+							<option value="0">Untrained</option>
+							<option value="@{PB}">Trained</option>
+							<option value="2*@{PB}">Expert</option>
+						</select>
+					</div>
 					<div class="sheet-col-1-7"><input type="number" name="attr_persuasion_bonus" value="0" step="1"/></div>
-					<div class="sheet-col-1-7"><input type="number" name="attr_persuasion" value="(@{pb_persuasion}*@{PB})+@{charisma_mod}+@{expertise_persuasion}+@{persuasion_bonus}" disabled="disabled"></div>
+					<div class="sheet-col-1-7"><input type="number" name="attr_persuasion" value="@{persuasion_prof_exp}+@{charisma_mod}+@{persuasion_bonus}" disabled="disabled"></div>
 				</div>
 				
 				<div class="sheet-row sheet-skill-row">
@@ -478,12 +563,14 @@
 				
 				<div class="sheet-row sheet-sub-header">
 					<div class="sheet-col-1-2 sheet-center sheet-small-label">Passive skill</div>
-					<div class="sheet-col-1-2 sheet-small-label">Score</div>
+					<div class="sheet-col-1-4 sheet-small-label sheet-center">Misc</div>
+					<div class="sheet-col-1-4 sheet-small-label sheet-center">Score</div>
 				</div>
 				
 				<div class="sheet-row sheet-skill-row">
 					<div class="sheet-col-1-2 sheet-margin-top sheet-center">Passive Perception</div>
-					<div class="sheet-col-1-2"><input type="number" name="attr_passive_perception" value="10+@{perception}" disabled="disabled"></div>
+					<div class="sheet-col-1-4"><input type="number" name="attr_passive_perception_bonus" value="0" step="1"></div>
+					<div class="sheet-col-1-4"><input type="number" name="attr_passive_perception" value="10+@{perception}+@{passive_perception_bonus}" disabled="disabled"></div>
 				</div>
 			
 			</div>