diff --git a/Mongoose_Traveller2e/MongooseTraveller.html b/Mongoose_Traveller2e/MongooseTraveller.html
index 474ff74d0e..fd6560713f 100644
--- a/Mongoose_Traveller2e/MongooseTraveller.html
+++ b/Mongoose_Traveller2e/MongooseTraveller.html
@@ -70,38 +70,38 @@
 				<td data-i18n="mod-u">Mod</td>
 			</tr>
 			<tr>
-				<td style="width:100px"><button class="sheet-button" name="roll_Strength" type="roll" value='&{template:skill-attrib} {{skill= Strength }} {{character= @{character_name} }} @{ro_default_rolltype} + @{mod-Strength}[STR] @{ro_default_mod}]] }}  }}' ><div class="sheet-button_header" data-i18n="strength-u">Strength</div></button></td>
+				<td style="width:100px"><button class="sheet-button" name="roll_Strength" type="roll" value='&{template:skill-attrib} {{skill=^{strength-u}}} {{character= @{character_name} }} @{ro_default_rolltype} + @{mod-Strength}[STR] @{ro_default_mod}]] }}  }}' ><div class="sheet-button_header" data-i18n="strength-u">Strength</div></button></td>
 				<td><input type="number" class="sheet-input sheet-bold" name="attr_base-Strength" value="0"/></td>
 				<td><input type="number" class="sheet-input sheet-norm" name="attr_injury-Strength" value="0"/></td>
 				<td><input type="number" class="sheet-input sheet-mod" name="attr_mod-Strength" value="0" /></td>
 				<td style="width:10px"><input type="hidden" name="attr_calc-Strength" value="0"/></td>
 
-				<td style="width:100px"><button class="sheet-button" name="roll_Dexterity" type="roll" value='&{template:skill-attrib} {{skill= Dexterity }} {{character= @{character_name} }} @{ro_default_rolltype} + @{mod-Dexterity}[DEX] @{ro_default_mod}]] }}  }}' ><div class="sheet-button_header" data-i18n="dexterity-u">Dexterity</div></button></td>
+				<td style="width:100px"><button class="sheet-button" name="roll_Dexterity" type="roll" value='&{template:skill-attrib} {{skill=^{dexterity-u}}} {{character= @{character_name} }} @{ro_default_rolltype} + @{mod-Dexterity}[DEX] @{ro_default_mod}]] }}  }}' ><div class="sheet-button_header" data-i18n="dexterity-u">Dexterity</div></button></td>
 				<td><input type="number" class="sheet-input sheet-bold" name="attr_base-Dexterity" value="0"/></td>
 				<td><input type="number" class="sheet-input sheet-norm" name="attr_injury-Dexterity" value="0"/></td>
 				<td><input type="number" class="sheet-input sheet-mod" name="attr_mod-Dexterity" value="0"/></td>
 				<td style="width:10px"><input type="hidden" name="attr_calc-Dexterity" value="0"/></td>
 
-				<td style="width:100px"><button class="sheet-button" name="roll_Endurance" type="roll" value='&{template:skill-attrib} {{skill= Endurance }} {{character= @{character_name} }} @{ro_default_rolltype} + @{mod-Endurance}[END] @{ro_default_mod}]] }}  }}' ><div class="sheet-button_header" data-i18n="endurance-u">Endurance</div></button></td>
+				<td style="width:100px"><button class="sheet-button" name="roll_Endurance" type="roll" value='&{template:skill-attrib} {{skill=^{endurance-u}}} {{character= @{character_name} }} @{ro_default_rolltype} + @{mod-Endurance}[END] @{ro_default_mod}]] }}  }}' ><div class="sheet-button_header" data-i18n="endurance-u">Endurance</div></button></td>
 				<td><input type="number" class="sheet-input sheet-bold" name="attr_base-Endurance" value="0"/></td>
 				<td><input type="number" class="sheet-input sheet-norm" name="attr_injury-Endurance" value="0"/></td>
 				<td><input type="number" class="sheet-input sheet-mod" name="attr_mod-Endurance" value="0"/></td>
 				<td style="width:10px"><input type="hidden" name="attr_calc-Endurance" value="0"/></td>
 			</tr>
 			<tr>
-				<td style="width:100px"><button class="sheet-button" name="roll_Intellect" type="roll" value='&{template:skill-attrib} {{skill= Intellect }} {{character= @{character_name} }} @{ro_default_rolltype} + @{mod-Intellect}[INT] @{ro_default_mod}]] }}  }}' ><div class="sheet-button_header" data-i18n="intellect-u">Intellect</div></button></td>
+				<td style="width:100px"><button class="sheet-button" name="roll_Intellect" type="roll" value='&{template:skill-attrib} {{skill=^{intellect-u}}} {{character= @{character_name} }} @{ro_default_rolltype} + @{mod-Intellect}[INT] @{ro_default_mod}]] }}  }}' ><div class="sheet-button_header" data-i18n="intellect-u">Intellect</div></button></td>
 				<td><input type="number" class="sheet-input sheet-bold" name="attr_base-Intellect" value="0"/></td>
 				<td><input type="number" class="sheet-input sheet-norm" name="attr_injury-Intellect" value="0"/></td>
 				<td><input type="number" class="sheet-input sheet-mod" name="attr_mod-Intellect" value="0"/></td>
 				<td style="width:10px"><input type="hidden" name="attr_calc-Intellect" value="0"/></td>
 
-				<td style="width:100px"><button class="sheet-button" name="roll_Education" type="roll" value='&{template:skill-attrib} {{skill= Education }} {{character= @{character_name} }} @{ro_default_rolltype} + @{mod-Education}[EDU] @{ro_default_mod}]] }}  }}' ><div class="sheet-button_header" data-i18n="education-u">Education</div></button></td>
+				<td style="width:100px"><button class="sheet-button" name="roll_Education" type="roll" value='&{template:skill-attrib} {{skill=^{education-u}}} {{character= @{character_name} }} @{ro_default_rolltype} + @{mod-Education}[EDU] @{ro_default_mod}]] }}  }}' ><div class="sheet-button_header" data-i18n="education-u">Education</div></button></td>
 				<td><input type="number" class="sheet-input sheet-bold" name="attr_base-Education" value="0"/></td>
 				<td><input type="number" class="sheet-input sheet-norm" name="attr_injury-Education" value="0"/></td>
 				<td><input type="number" class="sheet-input sheet-mod" name="attr_mod-Education" value="0"/></td>
 				<td style="width:10px"><input type="hidden" name="attr_calc-Education" value="0"/></td>
 
-				<td style="width:100px"><button class="sheet-button" name="roll_Social" type="roll" value='&{template:skill-attrib} {{skill= Social }} {{character= @{character_name} }} @{ro_default_rolltype} + @{mod-Social}[SOC] @{ro_default_mod}]] }}  }}' ><div class="sheet-button_header" data-i18n="social-u">Social</div></button></td>
+				<td style="width:100px"><button class="sheet-button" name="roll_Social" type="roll" value='&{template:skill-attrib} {{skill=^{social-u}}} {{character= @{character_name} }} @{ro_default_rolltype} + @{mod-Social}[SOC] @{ro_default_mod}]] }}  }}' ><div class="sheet-button_header" data-i18n="social-u">Social</div></button></td>
 				<td><input type="number" class="sheet-input sheet-bold" name="attr_base-Social" value="0"/></td>
 				<td><input type="number" class="sheet-input sheet-norm" name="attr_injury-Social" value="0"/></td>
 				<td><input type="number" class="sheet-input sheet-mod" name="attr_mod-Social" value="0"/></td>
@@ -386,7 +386,7 @@
 								<th style="width:55px;"></th>
 							</tr>
 							<tr>
-								<th><button name="roll_Admin" type="roll" value='&{template:skill-general} {{skill= Admin }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Admin}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header" data-i18n="admin-u">Admin</div></button></th>
+								<th><button name="roll_Admin" type="roll" value='&{template:skill-general} {{skill=^{admin-u}}} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Admin}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header" data-i18n="admin-u">Admin</div></button></th>
 								<th><select type="text" class="sheet-input"  style="width:95px;"name="attr_skillCharacteristicDM-Admin" value="0" />
 									<option value="@{mod-Strength}" data-i18n="skillstrengthoption-u">Strength</option>
 									<option value="@{mod-Dexterity}" data-i18n="skilldexterityoption-u">Dexterity</option>
@@ -420,7 +420,7 @@
 								<th style="width:55px;"></th>
 							</tr>
 							<tr>
-								<th><button name="roll_Advocate" type="roll" value='&{template:skill-general} {{skill= Advocate }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Advocate}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header" data-i18n="advocate-u">Advocate</div></button></th>
+								<th><button name="roll_Advocate" type="roll" value='&{template:skill-general} {{skill=^{advocate-u}}} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Advocate}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header" data-i18n="advocate-u">Advocate</div></button></th>
 								<th><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Advocate" value="0" style="width:95px" />
 									<option value="@{mod-Strength}" data-i18n="skillstrengthoption-u">Strength</option>
 									<option value="@{mod-Dexterity}" data-i18n="skilldexterityoption-u">Dexterity</option>
@@ -453,7 +453,7 @@
 								<th style="width:55px;"></th>
 							</tr>
 							<tr>
-								<th><button name="roll_Animals" type="roll" value='&{template:skill-general} {{skill= Animals }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Animals}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header" data-i18n="animals-u">Animals</div></button></th>
+								<th><button name="roll_Animals" type="roll" value='&{template:skill-general} {{skill=^{animals-u}}} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Animals}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header" data-i18n="animals-u">Animals</div></button></th>
 								<th><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Animals" value="0" style="width:95px" />
 									<option value="@{mod-Strength}" data-i18n="skillstrengthoption-u">Strength</option>
 									<option value="@{mod-Dexterity}" selected data-i18n="skilldexterityoption-u">Dexterity</option>
@@ -485,7 +485,7 @@
 								<table>
 									<tr>
 										<th style="width:55px;"></th>
-										<th style="width:150px;"><button name="roll_Animalsspec" type="roll" style="width:150px;" value='&{template:skill-general} {{skill= Animals }} {{spec= @{skillSpeciality-Animalsspec} }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Animalsspec}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">***</div></button></th>
+										<th style="width:150px;"><button name="roll_Animalsspec" type="roll" style="width:150px;" value='&{template:skill-general} {{skill=^{animals-u}}} {{spec= @{skillSpeciality-Animalsspec} }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Animalsspec}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">***</div></button></th>
 										<th style="width:200px;"><input type="text" class="sheet-input" style="width:200px;" name="attr_skillSpeciality-Animalsspec" value="" placeholder="Specialty Name" /></th>
 										<th style="width:75px;"><input type="number" class="sheet-input" style="width:45px;" name="attr_skilllevel-Animalsspec" value="0" /></th>
 										<th style="width:55px;"><input type="number" class="sheet-input" style="width:50px;" name="attr_skilltotal-Animalsspec" value="@{skillCharacteristicDM-Animals} + @{skilllevel-Animalsspec} + @{skilllevel-Animals} + @{skillmodifier-Animals}" disabled="true"/></th>
@@ -509,7 +509,7 @@
 								<th style="width:55px;"></th>
 							</tr>
 							<tr>
-								<th><button name="roll_Athletics" type="roll" value='&{template:skill-general} {{skill= Athletics }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Athletics}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header" data-i18n="athletics-u">Athletics</div></button></th>
+								<th><button name="roll_Athletics" type="roll" value='&{template:skill-general} {{skill=^{athletics-u}}} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Athletics}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header" data-i18n="athletics-u">Athletics</div></button></th>
 								<th><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Athletics" value="0" style="width:95px" />
 									<option value="@{mod-Strength}" data-i18n="skillstrengthoption-u">Strength</option>
 									<option value="@{mod-Dexterity}" selected data-i18n="skilldexterityoption-u">Dexterity</option>
@@ -542,7 +542,7 @@
 								<table>
 									<tr>
 										<th style="width:55px;"></th>
-										<th style="width:150px;"><button name="roll_Athleticsspec" type="roll" style="width:150px;" value='&{template:skill-general} {{skill= Athletics }} {{spec= @{skillSpeciality-Athleticsspec} }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Athleticsspec}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">***</div></button></th>
+										<th style="width:150px;"><button name="roll_Athleticsspec" type="roll" style="width:150px;" value='&{template:skill-general} {{skill=^{athletics-u}}} {{spec= @{skillSpeciality-Athleticsspec} }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Athleticsspec}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">***</div></button></th>
 										<th style="width:200px;"><input type="text" class="sheet-input" style="width:200px;" name="attr_skillSpeciality-Athleticsspec" value="" placeholder="Specialty Name" /></th>
 										<th style="width:75px;"><input type="number" class="sheet-input" style="width:45px;" name="attr_skilllevel-Athleticsspec" value="0" /></th>
 										<th style="width:55px;"><input type="number" class="sheet-input" style="width:50px;" name="attr_skilltotal-Athleticsspec" value="@{skillCharacteristicDM-Athletics} + @{skilllevel-Athleticsspec} + @{skilllevel-Athletics} + @{skillmodifier-Athletics}" disabled="true"/></th>
@@ -566,7 +566,7 @@
 								<th style="width:55px;"></th>
 							</tr>
 							<tr>
-								<th><button name="roll_Art" type="roll" value='&{template:skill-general} {{skill= Art }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Art}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header" data-i18n="art-u">Art</div></button></th>
+								<th><button name="roll_Art" type="roll" value='&{template:skill-general} {{skill=^{art-u}}} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Art}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header" data-i18n="art-u">Art</div></button></th>
 								<th><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Art" value="0" style="width:95px" />
 									<option value="@{mod-Strength}" data-i18n="skillstrengthoption-u">Strength</option>
 									<option value="@{mod-Dexterity}" data-i18n="skilldexterityoption-u">Dexterity</option>
@@ -598,7 +598,7 @@
 								<table>
 									<tr>
 										<th style="width:55px;"></th>
-										<th style="width:150px;"><button name="roll_Artspec" type="roll" style="width:150px;" value='&{template:skill-general} {{skill= Art }} {{spec= @{skillSpeciality-Artspec} }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Artspec}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">***</div></button></th>
+										<th style="width:150px;"><button name="roll_Artspec" type="roll" style="width:150px;" value='&{template:skill-general} {{skill=^{art-u}}} {{spec= @{skillSpeciality-Artspec} }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Artspec}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">***</div></button></th>
 										<th style="width:200px;"><input type="text" class="sheet-input" style="width:200px;" name="attr_skillSpeciality-Artspec" value="" placeholder="Specialty Name" /></th>
 										<th style="width:75px;"><input type="number" class="sheet-input" style="width:45px;" name="attr_skilllevel-Artspec" value="0" /></th>
 										<th style="width:55px;"><input type="number" class="sheet-input" style="width:50px;" name="attr_skilltotal-Artspec" value="@{skillCharacteristicDM-Art} + @{skilllevel-Artspec} + @{skilllevel-Art} + @{skillmodifier-Art}" disabled="true"/></th>
@@ -622,7 +622,7 @@
 								<th style="width:55px;"></th>
 							</tr>
 							<tr>
-								<th><button name="roll_Astrogation" type="roll" value='&{template:skill-general} {{skill= Astrogation }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Astrogation}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header" data-i18n="astrogation-u">Astrogation</div></button></th>
+								<th><button name="roll_Astrogation" type="roll" value='&{template:skill-general} {{skill=^{astrogation-u}}} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Astrogation}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header" data-i18n="astrogation-u">Astrogation</div></button></th>
 								<th><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Astrogation" value="0" style="width:95px" />
 									<option value="@{mod-Strength}" data-i18n="skillstrengthoption-u">Strength</option>
 									<option value="@{mod-Dexterity}" data-i18n="skilldexterityoption-u">Dexterity</option>
@@ -655,7 +655,7 @@
 								<th style="width:55px;"></th>
 							</tr>
 							<tr>
-								<th><button name="roll_Broker" type="roll" value='&{template:skill-general} {{skill= Broker }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Broker}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header" data-i18n="broker-u">Broker</div></button></th>
+								<th><button name="roll_Broker" type="roll" value='&{template:skill-general} {{skill=^{broker-u}}} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Broker}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header" data-i18n="broker-u">Broker</div></button></th>
 								<th><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Broker" value="0" style="width:95px" />
 									<option value="@{mod-Strength}" data-i18n="skillstrengthoption-u">Strength</option>
 									<option value="@{mod-Dexterity}" data-i18n="skilldexterityoption-u">Dexterity</option>
@@ -688,7 +688,7 @@
 								<th style="width:55px;"></th>
 							</tr>
 							<tr>
-								<th><button name="roll_Carouse" type="roll" value='&{template:skill-general} {{skill= Carouse }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Carouse}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header" data-i18n="carouse-u">Carouse</div></button></th>
+								<th><button name="roll_Carouse" type="roll" value='&{template:skill-general} {{skill=^{carouse-u}}} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Carouse}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header" data-i18n="carouse-u">Carouse</div></button></th>
 								<th><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Carouse" value="0" style="width:95px" />
 									<option value="@{mod-Strength}" data-i18n="skillstrengthoption-u">Strength</option>
 									<option value="@{mod-Dexterity}" data-i18n="skilldexterityoption-u">Dexterity</option>
@@ -721,7 +721,7 @@
 								<th style="width:55px;"></th>
 							</tr>
 							<tr>
-								<th><button name="roll_Deception" type="roll" value='&{template:skill-general} {{skill= Deception }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Deception}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header" data-i18n="deception-u">Deception</div></button></th>
+								<th><button name="roll_Deception" type="roll" value='&{template:skill-general} {{skill=^{deception-u}}} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Deception}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header" data-i18n="deception-u">Deception</div></button></th>
 								<th><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Deception" value="0" style="width:95px" />
 									<option value="@{mod-Strength}" data-i18n="skillstrengthoption-u">Strength</option>
 									<option value="@{mod-Dexterity}" data-i18n="skilldexterityoption-u">Dexterity</option>
@@ -754,7 +754,7 @@
 								<th style="width:55px;"></th>
 							</tr>
 							<tr>
-								<th><button name="roll_Diplomat" type="roll" value='&{template:skill-general} {{skill= Diplomat }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Diplomat}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header" data-i18n="diplomat-u">Diplomat</div></button></th>
+								<th><button name="roll_Diplomat" type="roll" value='&{template:skill-general} {{skill=^{diplomat-u}}} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Diplomat}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header" data-i18n="diplomat-u">Diplomat</div></button></th>
 								<th><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Diplomat" value="0" style="width:95px" />
 									<option value="@{mod-Strength}" data-i18n="skillstrengthoption-u">Strength</option>
 									<option value="@{mod-Dexterity}" data-i18n="skilldexterityoption-u">Dexterity</option>
@@ -787,7 +787,7 @@
 								<th style="width:55px;"></th>
 							</tr>
 							<tr>
-								<th><button name="roll_Drive" type="roll" value='&{template:skill-general} {{skill= Drive }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Drive}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header" data-i18n="drive-u">Drive</div></button></th>
+								<th><button name="roll_Drive" type="roll" value='&{template:skill-general} {{skill=^{drive-u}}} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Drive}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header" data-i18n="drive-u">Drive</div></button></th>
 								<th><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Drive" value="0" style="width:95px" />
 									<option value="@{mod-Strength}" data-i18n="skillstrengthoption-u">Strength</option>
 									<option value="@{mod-Dexterity}" selected data-i18n="skilldexterityoption-u">Dexterity</option>
@@ -819,7 +819,7 @@
 								<table>
 									<tr>
 										<th style="width:55px;"></th>
-										<th style="width:150px;"><button name="roll_Drivespec" type="roll" style="width:150px;" value='&{template:skill-general} {{skill= Drive }} {{spec= @{skillSpeciality-Drivespec} }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Drivespec}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">***</div></button></th>
+										<th style="width:150px;"><button name="roll_Drivespec" type="roll" style="width:150px;" value='&{template:skill-general} {{skill=^{drive-u}}} {{spec= @{skillSpeciality-Drivespec} }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Drivespec}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">***</div></button></th>
 										<th style="width:200px;"><input type="text" class="sheet-input" style="width:200px;" name="attr_skillSpeciality-Drivespec" value="" placeholder="Specialty Name" /></th>
 										<th style="width:75px;"><input type="number" class="sheet-input" style="width:45px;" name="attr_skilllevel-Drivespec" value="0" /></th>
 										<th style="width:55px;"><input type="number" class="sheet-input" style="width:50px;" name="attr_skilltotal-Drivespec" value="@{skillCharacteristicDM-Drive} + @{skilllevel-Drivespec} + @{skilllevel-Drive} + @{skillmodifier-Drive}" disabled="true"/></th>
@@ -843,7 +843,7 @@
 								<th style="width:55px;"></th>
 							</tr>
 							<tr>
-								<th><button name="roll_Electronics" type="roll" value='&{template:skill-general} {{skill= Electronics }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Electronics}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header" data-i18n="electronics-u">Electronics</div></button></th>
+								<th><button name="roll_Electronics" type="roll" value='&{template:skill-general} {{skill=^{electronics-u}}} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Electronics}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header" data-i18n="electronics-u">Electronics</div></button></th>
 								<th><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Electronics" value="0" style="width:95px" />
 									<option value="@{mod-Strength}" data-i18n="skillstrengthoption-u">Strength</option>
 									<option value="@{mod-Dexterity}" data-i18n="skilldexterityoption-u">Dexterity</option>
@@ -875,7 +875,7 @@
 								<table>
 									<tr>
 										<th style="width:55px;"></th>
-										<th style="width:150px;"><button name="roll_Electronicsspec" type="roll" style="width:150px;" value='&{template:skill-general} {{skill= Electronics }} {{spec= @{skillSpeciality-Electronicsspec} }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Electronicsspec}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">***</div></button></th>
+										<th style="width:150px;"><button name="roll_Electronicsspec" type="roll" style="width:150px;" value='&{template:skill-general} {{skill=^{electronics-u}}} {{spec= @{skillSpeciality-Electronicsspec} }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Electronicsspec}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">***</div></button></th>
 										<th style="width:200px;"><input type="text" class="sheet-input" style="width:200px;" name="attr_skillSpeciality-Electronicsspec" value="" placeholder="Specialty Name" /></th>
 										<th style="width:75px;"><input type="number" class="sheet-input" style="width:45px;" name="attr_skilllevel-Electronicsspec" value="0" /></th>
 										<th style="width:55px;"><input type="number" class="sheet-input" style="width:50px;" name="attr_skilltotal-Electronicsspec" value="@{skillCharacteristicDM-Electronics} + @{skilllevel-Electronicsspec} + @{skilllevel-Electronics} + @{skillmodifier-Electronics}" disabled="true"/></th>
@@ -899,7 +899,7 @@
 								<th style="width:55px;"></th>
 							</tr>
 							<tr>
-								<th><button name="roll_Engineer" type="roll" value='&{template:skill-general} {{skill= Engineer }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Engineer}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header" data-i18n="engineer-u">Engineer</div></button></th>
+								<th><button name="roll_Engineer" type="roll" value='&{template:skill-general} {{skill=^{engineer-u}}} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Engineer}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header" data-i18n="engineer-u">Engineer</div></button></th>
 								<th><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Engineer" value="0" style="width:95px" />
 									<option value="@{mod-Strength}" data-i18n="skillstrengthoption-u">Strength</option>
 									<option value="@{mod-Dexterity}" data-i18n="skilldexterityoption-u">Dexterity</option>
@@ -931,7 +931,7 @@
 								<table>
 									<tr>
 										<th style="width:55px;"></th>
-										<th style="width:150px;"><button name="roll_Engineerspec" type="roll" style="width:150px;" value='&{template:skill-general} {{skill= Engineer }} {{spec= @{skillSpeciality-Engineerspec} }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Engineerspec}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">***</div></button></th>
+										<th style="width:150px;"><button name="roll_Engineerspec" type="roll" style="width:150px;" value='&{template:skill-general} {{skill=^{engineer-u}}} {{spec= @{skillSpeciality-Engineerspec} }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Engineerspec}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">***</div></button></th>
 										<th style="width:200px;"><input type="text" class="sheet-input" style="width:200px;" name="attr_skillSpeciality-Engineerspec" value="" placeholder="Specialty Name" /></th>
 										<th style="width:75px;"><input type="number" class="sheet-input" style="width:45px;" name="attr_skilllevel-Engineerspec" value="0" /></th>
 										<th style="width:55px;"><input type="number" class="sheet-input" style="width:50px;" name="attr_skilltotal-Engineerspec" value="@{skillCharacteristicDM-Engineer} + @{skilllevel-Engineerspec} + @{skilllevel-Engineer} + @{skillmodifier-Engineer}" disabled="true"/></th>
@@ -955,7 +955,7 @@
 								<th style="width:55px;"></th>
 							</tr>
 							<tr>
-								<th><button name="roll_Explosives" type="roll" value='&{template:skill-general} {{skill= Explosives }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Explosives}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header" data-i18n="explosives-u">Explosives</div></button></th>
+								<th><button name="roll_Explosives" type="roll" value='&{template:skill-general} {{skill=^{explosives-u}}} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Explosives}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header" data-i18n="explosives-u">Explosives</div></button></th>
 								<th><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Explosives" value="0" style="width:95px" />
 									<option value="@{mod-Strength}" data-i18n="skillstrengthoption-u">Strength</option>
 									<option value="@{mod-Dexterity}" data-i18n="skilldexterityoption-u">Dexterity</option>
@@ -988,7 +988,7 @@
 								<th style="width:55px;"></th>
 							</tr>
 							<tr>
-								<th><button name="roll_Flyer" type="roll" value='&{template:skill-general} {{skill= Flyer }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Flyer}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header" data-i18n="flyer-u">Flyer</div></button></th>
+								<th><button name="roll_Flyer" type="roll" value='&{template:skill-general} {{skill=^{flyer-u}}} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Flyer}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header" data-i18n="flyer-u">Flyer</div></button></th>
 								<th><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Flyer" value="0" style="width:95px" />
 									<option value="@{mod-Strength}" data-i18n="skillstrengthoption-u">Strength</option>
 									<option value="@{mod-Dexterity}" selected data-i18n="skilldexterityoption-u">Dexterity</option>
@@ -1020,7 +1020,7 @@
 								<table>
 									<tr>
 										<th style="width:55px;"></th>
-										<th style="width:150px;"><button name="roll_Flyerspec" type="roll" style="width:150px;" value='&{template:skill-general} {{skill= Flyer }} {{spec= @{skillSpeciality-Flyerspec} }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Flyerspec}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">***</div></button></th>
+										<th style="width:150px;"><button name="roll_Flyerspec" type="roll" style="width:150px;" value='&{template:skill-general} {{skill=^{flyer-u}}} {{spec= @{skillSpeciality-Flyerspec} }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Flyerspec}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">***</div></button></th>
 										<th style="width:200px;"><input type="text" class="sheet-input" style="width:200px;" name="attr_skillSpeciality-Flyerspec" value="" placeholder="Specialty Name" /></th>
 										<th style="width:75px;"><input type="number" class="sheet-input" style="width:45px;" name="attr_skilllevel-Flyerspec" value="0" /></th>
 										<th style="width:55px;"><input type="number" class="sheet-input" style="width:50px;" name="attr_skilltotal-Flyerspec" value="@{skillCharacteristicDM-Flyer} + @{skilllevel-Flyerspec} + @{skilllevel-Flyer} + @{skillmodifier-Flyer}" disabled="true"/></th>
@@ -1044,7 +1044,7 @@
 								<th style="width:55px;"></th>
 							</tr>
 							<tr>
-								<th><button name="roll_Gambler" type="roll" value='&{template:skill-general} {{skill= Gambler }}  {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Gambler}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header" data-i18n="gambler-u">Gambler</div></button></th>
+								<th><button name="roll_Gambler" type="roll" value='&{template:skill-general} {{skill=^{gambler-u}}}  {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Gambler}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header" data-i18n="gambler-u">Gambler</div></button></th>
 								<th><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Gambler" value="0" style="width:95px" />
 									<option value="@{mod-Strength}" data-i18n="skillstrengthoption-u">Strength</option>
 									<option value="@{mod-Dexterity}" data-i18n="skilldexterityoption-u">Dexterity</option>
@@ -1077,7 +1077,7 @@
 								<th style="width:55px;"></th>
 							</tr>
 							<tr>
-								<th><button name="roll_Gunner" type="roll" value='&{template:skill-general} {{skill= Gunner }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Gunner}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header" data-i18n="gunner-u">Gunner</div></button></th>
+								<th><button name="roll_Gunner" type="roll" value='&{template:skill-general} {{skill=^{gunner-u}}} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Gunner}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header" data-i18n="gunner-u">Gunner</div></button></th>
 								<th><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Gunner" value="0" style="width:95px" />
 									<option value="@{mod-Strength}" data-i18n="skillstrengthoption-u">Strength</option>
 									<option value="@{mod-Dexterity}" data-i18n="skilldexterityoption-u">Dexterity</option>
@@ -1109,7 +1109,7 @@
 								<table>
 									<tr>
 										<th style="width:55px;"></th>
-										<th style="width:150px;"><button name="roll_Gunnerspec" type="roll" style="width:150px;" value='&{template:skill-general} {{skill= Gunner }} {{spec= @{skillSpeciality-Gunnerspec} }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Gunnerspec}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">***</div></button></th>
+										<th style="width:150px;"><button name="roll_Gunnerspec" type="roll" style="width:150px;" value='&{template:skill-general} {{skill=^{gunner-u}}} {{spec= @{skillSpeciality-Gunnerspec} }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Gunnerspec}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">***</div></button></th>
 										<th style="width:200px;"><input type="text" class="sheet-input" style="width:200px;" name="attr_skillSpeciality-Gunnerspec" value="" placeholder="Specialty Name" /></th>
 										<th style="width:75px;"><input type="number" class="sheet-input" style="width:45px;" name="attr_skilllevel-Gunnerspec" value="0" /></th>
 										<th style="width:55px;"><input type="number" class="sheet-input" style="width:50px;" name="attr_skilltotal-Gunnerspec" value="@{skillCharacteristicDM-Gunner} + @{skilllevel-Gunnerspec} + @{skilllevel-Gunner} + @{skillmodifier-Gunner}" disabled="true"/></th>
@@ -1133,7 +1133,7 @@
 								<th style="width:55px;"></th>
 							</tr>
 							<tr>
-								<th><button name="roll_GunCombat" type="roll" value='&{template:skill-general} {{skill= Gun Combat }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-GunCombat}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header" data-i18n="guncombat-u">Gun Combat</div></button></th>
+								<th><button name="roll_GunCombat" type="roll" value='&{template:skill-general} {{skill=^{guncombat-u}}} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-GunCombat}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header" data-i18n="guncombat-u">Gun Combat</div></button></th>
 								<th><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-GunCombat" value="0" style="width:95px" />
 									<option value="@{mod-Strength}" data-i18n="skillstrengthoption-u">Strength</option>
 									<option value="@{mod-Dexterity}" selected data-i18n="skilldexterityoption-u">Dexterity</option>
@@ -1165,7 +1165,7 @@
 								<table>
 									<tr>
 										<th style="width:55px;"></th>
-										<th style="width:150px;"><button name="roll_GunCombatspec" type="roll" style="width:150px;" value='&{template:skill-general} {{skill= GunCombat }} {{spec= @{skillSpeciality-GunCombatspec} }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-GunCombatspec}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">***</div></button></th>
+										<th style="width:150px;"><button name="roll_GunCombatspec" type="roll" style="width:150px;" value='&{template:skill-general} {{skill=^{guncombat-u}}} {{spec= @{skillSpeciality-GunCombatspec} }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-GunCombatspec}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">***</div></button></th>
 										<th style="width:200px;"><input type="text" class="sheet-input" style="width:200px;" name="attr_skillSpeciality-GunCombatspec" value="" placeholder="Specialty Name" /></th>
 										<th style="width:75px;"><input type="number" class="sheet-input" style="width:45px;" name="attr_skilllevel-GunCombatspec" value="0" /></th>
 										<th style="width:55px;"><input type="number" class="sheet-input" style="width:50px;" name="attr_skilltotal-GunCombatspec" value="@{skillCharacteristicDM-GunCombat} + @{skilllevel-GunCombatspec} + @{skilllevel-GunCombat} + @{skillmodifier-GunCombat}" disabled="true"/></th>
@@ -1189,7 +1189,7 @@
 								<th style="width:55px;"></th>
 							</tr>
 							<tr>
-								<th><button name="roll_HeavyWeapons" type="roll" value='&{template:skill-general} {{skill= Heavy Weapons }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-HeavyWeapons}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header" data-i18n="heavyweapons-u">Heavy Weapons</div></button></th>
+								<th><button name="roll_HeavyWeapons" type="roll" value='&{template:skill-general} {{skill=^{heavyweapons-u}}} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-HeavyWeapons}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header" data-i18n="heavyweapons-u">Heavy Weapons</div></button></th>
 								<th><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-HeavyWeapons" value="0" style="width:95px" />
 									<option value="@{mod-Strength}" data-i18n="skillstrengthoption-u">Strength</option>
 									<option value="@{mod-Dexterity}" selected data-i18n="skilldexterityoption-u">Dexterity</option>
@@ -1221,7 +1221,7 @@
 								<table>
 									<tr>
 										<th style="width:55px;"></th>
-										<th style="width:150px;"><button name="roll_HeavyWeaponsspec" type="roll" style="width:150px;" value='&{template:skill-general} {{skill= HeavyWeapons }} {{spec= @{skillSpeciality-HeavyWeaponsspec} }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-HeavyWeaponsspec}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">***</div></button></th>
+										<th style="width:150px;"><button name="roll_HeavyWeaponsspec" type="roll" style="width:150px;" value='&{template:skill-general} {{skill=^{heavyweapons-u}}} {{spec= @{skillSpeciality-HeavyWeaponsspec} }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-HeavyWeaponsspec}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">***</div></button></th>
 										<th style="width:200px;"><input type="text" class="sheet-input" style="width:200px;" name="attr_skillSpeciality-HeavyWeaponsspec" value="" placeholder="Specialty Name" /></th>
 										<th style="width:75px;"><input type="number" class="sheet-input" style="width:45px;" name="attr_skilllevel-HeavyWeaponsspec" value="0" /></th>
 										<th style="width:55px;"><input type="number" class="sheet-input" style="width:50px;" name="attr_skilltotal-HeavyWeaponsspec" value="@{skillCharacteristicDM-HeavyWeapons} + @{skilllevel-HeavyWeaponsspec} + @{skilllevel-HeavyWeapons} + @{skillmodifier-HeavyWeapons}" disabled="true"/></th>
@@ -1245,7 +1245,7 @@
 								<th style="width:55px;"></th>
 							</tr>
 							<tr>
-								<th><button name="roll_Investigate" type="roll" value='&{template:skill-general} {{skill= Investigate }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Investigate}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header" data-i18n="investigate-u">Investigate</div></button></th>
+								<th><button name="roll_Investigate" type="roll" value='&{template:skill-general} {{skill=^{investigate-u}}} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Investigate}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header" data-i18n="investigate-u">Investigate</div></button></th>
 								<th><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Investigate" value="0" style="width:95px" />
 									<option value="@{mod-Strength}" data-i18n="skillstrengthoption-u">Strength</option>
 									<option value="@{mod-Dexterity}" data-i18n="skilldexterityoption-u">Dexterity</option>
@@ -1278,7 +1278,7 @@
 								<th style="width:55px;"></th>
 							</tr>
 							<tr>
-								<th><button name="roll_JackOfAllTrades" type="roll" value='&{template:skill-general} {{skill= Jack-Of-All-Trades }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-JackOfAllTrades}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header" data-i18n="jackot-u">>Jack-Of-All-Trades</div></button></th>
+								<th><button name="roll_JackOfAllTrades" type="roll" value='&{template:skill-general} {{skill=^{jackot-u}}} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-JackOfAllTrades}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header" data-i18n="jackot-u">>Jack-Of-All-Trades</div></button></th>
 								<th><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-JackOfAllTrades" value="0" style="width:95px" />
 									<option value="@{mod-Strength}" data-i18n="skillstrengthoption-u">Strength</option>
 									<option value="@{mod-Dexterity}" data-i18n="skilldexterityoption-u">Dexterity</option>
@@ -1311,7 +1311,7 @@
 								<th style="width:55px;"></th>
 							</tr>
 							<tr>
-								<th><button name="roll_Language" type="roll" value='&{template:skill-general} {{skill= Language }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Language}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header" data-i18n="language-u">Language</div></button></th>
+								<th><button name="roll_Language" type="roll" value='&{template:skill-general} {{skill=^{language-u}}} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Language}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header" data-i18n="language-u">Language</div></button></th>
 								<th><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Language" value="0" style="width:95px" />
 									<option value="@{mod-Strength}" data-i18n="skillstrengthoption-u">Strength</option>
 									<option value="@{mod-Dexterity}" data-i18n="skilldexterityoption-u">Dexterity</option>
@@ -1343,7 +1343,7 @@
 								<table>
 									<tr>
 										<th style="width:55px;"></th>
-										<th style="width:150px;"><button name="roll_Languagespec" type="roll" style="width:150px;" value='&{template:skill-general} {{skill= Language }} {{spec= @{skillSpeciality-Languagespec} }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Languagespec}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">***</div></button></th>
+										<th style="width:150px;"><button name="roll_Languagespec" type="roll" style="width:150px;" value='&{template:skill-general} {{skill=^{language-u}}} {{spec= @{skillSpeciality-Languagespec} }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Languagespec}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">***</div></button></th>
 										<th style="width:200px;"><input type="text" class="sheet-input" style="width:200px;" name="attr_skillSpeciality-Languagespec" value="" placeholder="Specialty Name" /></th>
 										<th style="width:75px;"><input type="number" class="sheet-input" style="width:45px;" name="attr_skilllevel-Languagespec" value="0" /></th>
 										<th style="width:55px;"><input type="number" class="sheet-input" style="width:50px;" name="attr_skilltotal-Languagespec" value="@{skillCharacteristicDM-Language} + @{skilllevel-Languagespec} + @{skilllevel-Language} + @{skillmodifier-Language}" disabled="true"/></th>
@@ -1367,7 +1367,7 @@
 								<th style="width:55px;"></th>
 							</tr>
 							<tr>
-								<th><button name="roll_Leadership" type="roll" value='&{template:skill-general} {{skill= Leadership }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Leadership}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header" data-i18n="leadership-u">Leadership</div></button></th>
+								<th><button name="roll_Leadership" type="roll" value='&{template:skill-general} {{skill=^{leadership-u}}} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Leadership}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header" data-i18n="leadership-u">Leadership</div></button></th>
 								<th><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Leadership" value="0" style="width:95px" />
 									<option value="@{mod-Strength}" data-i18n="skillstrengthoption-u">Strength</option>
 									<option value="@{mod-Dexterity}" data-i18n="skilldexterityoption-u">Dexterity</option>
@@ -1400,7 +1400,7 @@
 								<th style="width:55px;"></th>
 							</tr>
 							<tr>
-								<th><button name="roll_Mechanic" type="roll" value='&{template:skill-general} {{skill= Mechanic }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Mechanic}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header" data-i18n="mechanic-u">Mechanic</div></button></th>
+								<th><button name="roll_Mechanic" type="roll" value='&{template:skill-general} {{skill=^{mechanic-u}}} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Mechanic}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header" data-i18n="mechanic-u">Mechanic</div></button></th>
 								<th><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Mechanic" value="0" style="width:95px" />
 									<option value="@{mod-Strength}" data-i18n="skillstrengthoption-u">Strength</option>
 									<option value="@{mod-Dexterity}" data-i18n="skilldexterityoption-u">Dexterity</option>
@@ -1433,7 +1433,7 @@
 								<th style="width:55px;"></th>
 							</tr>
 							<tr>
-								<th><button name="roll_Medic" type="roll" value='&{template:skill-general} {{skill= Medic }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Medic}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header" data-i18n="medic-u">Medic</div></button></th>
+								<th><button name="roll_Medic" type="roll" value='&{template:skill-general} {{skill=^{medic-u}}} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Medic}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header" data-i18n="medic-u">Medic</div></button></th>
 								<th><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Medic" value="0" style="width:95px" />
 									<option value="@{mod-Strength}" data-i18n="skillstrengthoption-u">Strength</option>
 									<option value="@{mod-Dexterity}" data-i18n="skilldexterityoption-u">Dexterity</option>
@@ -1466,7 +1466,7 @@
 								<th style="width:55px;"></th>
 							</tr>
 							<tr>
-								<th><button name="roll_Melee" type="roll" value='&{template:skill-general} {{skill= Melee }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Melee}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header" data-i18n="melee-u">Melee</div></button></th>
+								<th><button name="roll_Melee" type="roll" value='&{template:skill-general} {{skill=^{melee-u}}} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Melee}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header" data-i18n="melee-u">Melee</div></button></th>
 								<th><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Melee" value="0" style="width:95px" />
 									<option value="@{mod-Strength}" data-i18n="skillstrengthoption-u">Strength</option>
 									<option value="@{mod-Dexterity}" selected data-i18n="skilldexterityoption-u">Dexterity</option>
@@ -1498,7 +1498,7 @@
 								<table>
 									<tr>
 										<th style="width:55px;"></th>
-										<th style="width:150px;"><button name="roll_Meleespec" type="roll" style="width:150px;" value='&{template:skill-general} {{skill= Melee }} {{spec= @{skillSpeciality-Meleespec} }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Meleespec}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">***</div></button></th>
+										<th style="width:150px;"><button name="roll_Meleespec" type="roll" style="width:150px;" value='&{template:skill-general} {{skill=^{melee-u}}} {{spec= @{skillSpeciality-Meleespec} }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Meleespec}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">***</div></button></th>
 										<th style="width:200px;"><input type="text" class="sheet-input" style="width:200px;" name="attr_skillSpeciality-Meleespec" value="" placeholder="Specialty Name" /></th>
 										<th style="width:75px;"><input type="number" class="sheet-input" style="width:45px;" name="attr_skilllevel-Meleespec" value="0" /></th>
 										<th style="width:55px;"><input type="number" class="sheet-input" style="width:50px;" name="attr_skilltotal-Meleespec" value="@{skillCharacteristicDM-Melee} + @{skilllevel-Meleespec} + @{skilllevel-Melee} + @{skillmodifier-Melee}" disabled="true"/></th>
@@ -1522,7 +1522,7 @@
 								<th style="width:55px;"></th>
 							</tr>
 							<tr>
-								<th><button name="roll_Navigation" type="roll" value='&{template:skill-general} {{skill= Navigation }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Navigation}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header" data-i18n="navigation-u">Navigation</div></button></th>
+								<th><button name="roll_Navigation" type="roll" value='&{template:skill-general} {{skill=^{navigation-u}}} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Navigation}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header" data-i18n="navigation-u">Navigation</div></button></th>
 								<th><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Navigation" value="0" style="width:95px" />
 									<option value="@{mod-Strength}" data-i18n="skillstrengthoption-u">Strength</option>
 									<option value="@{mod-Dexterity}" data-i18n="skilldexterityoption-u">Dexterity</option>
@@ -1555,7 +1555,7 @@
 								<th style="width:55px;"></th>
 							</tr>
 							<tr>
-								<th><button name="roll_Persuade" type="roll" value='&{template:skill-general} {{skill= Persuade }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Persuade}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header" data-i18n="persuade-u">Persuade</div></button></th>
+								<th><button name="roll_Persuade" type="roll" value='&{template:skill-general} {{skill=^{persuade-u}}} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Persuade}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header" data-i18n="persuade-u">Persuade</div></button></th>
 								<th><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Persuade" value="0" style="width:95px" />
 									<option value="@{mod-Strength}" data-i18n="skillstrengthoption-u">Strength</option>
 									<option value="@{mod-Dexterity}" data-i18n="skilldexterityoption-u">Dexterity</option>
@@ -1588,7 +1588,7 @@
 								<th style="width:55px;"></th>
 							</tr>
 							<tr>
-								<th><button name="roll_Pilot" type="roll" value='&{template:skill-general} {{skill= Pilot }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Pilot}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header" data-i18n="pilot-u">Pilot</div></button></th>
+								<th><button name="roll_Pilot" type="roll" value='&{template:skill-general} {{skill=^{pilot-u}}} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Pilot}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header" data-i18n="pilot-u">Pilot</div></button></th>
 								<th><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Pilot" value="0" style="width:95px" />
 									<option value="@{mod-Strength}" data-i18n="skillstrengthoption-u">Strength</option>
 									<option value="@{mod-Dexterity}" selected data-i18n="skilldexterityoption-u">Dexterity</option>
@@ -1620,7 +1620,7 @@
 								<table>
 									<tr>
 										<th style="width:55px;"></th>
-										<th style="width:150px;"><button name="roll_Pilotspec" type="roll" style="width:150px;" value='&{template:skill-general} {{skill= Pilot }} {{spec= @{skillSpeciality-Pilotspec} }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Pilotspec}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">***</div></button></th>
+										<th style="width:150px;"><button name="roll_Pilotspec" type="roll" style="width:150px;" value='&{template:skill-general} {{skill=^{pilot-u}}} {{spec= @{skillSpeciality-Pilotspec} }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Pilotspec}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">***</div></button></th>
 										<th style="width:200px;"><input type="text" class="sheet-input" style="width:200px;" name="attr_skillSpeciality-Pilotspec" value="" placeholder="Specialty Name" /></th>
 										<th style="width:75px;"><input type="number" class="sheet-input" style="width:45px;" name="attr_skilllevel-Pilotspec" value="0" /></th>
 										<th style="width:55px;"><input type="number" class="sheet-input" style="width:50px;" name="attr_skilltotal-Pilotspec" value="@{skillCharacteristicDM-Pilot} + @{skilllevel-Pilotspec} + @{skilllevel-Pilot} + @{skillmodifier-Pilot}" disabled="true"/></th>
@@ -1644,7 +1644,7 @@
 								<th style="width:55px;"></th>
 							</tr>
 							<tr>
-								<th><button name="roll_Profession" type="roll" value='&{template:skill-general} {{skill= Profession }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Profession}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header" data-i18n="profession-u">Profession</div></button></th>
+								<th><button name="roll_Profession" type="roll" value='&{template:skill-general} {{skill=^{profession-u}}} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Profession}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header" data-i18n="profession-u">Profession</div></button></th>
 								<th><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Profession" value="0" style="width:95px" />
 									<option value="@{mod-Strength}" data-i18n="skillstrengthoption-u">Strength</option>
 									<option value="@{mod-Dexterity}" data-i18n="skilldexterityoption-u">Dexterity</option>
@@ -1676,7 +1676,7 @@
 								<table>
 									<tr>
 										<th style="width:55px;"></th>
-										<th style="width:150px;"><button name="roll_Professionspec" type="roll" style="width:150px;" value='&{template:skill-general} {{skill= Profession }} {{spec= @{skillSpeciality-Professionspec} }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Professionspec}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">***</div></button></th>
+										<th style="width:150px;"><button name="roll_Professionspec" type="roll" style="width:150px;" value='&{template:skill-general} {{skill=^{profession-u}}} {{spec= @{skillSpeciality-Professionspec} }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Professionspec}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">***</div></button></th>
 										<th style="width:200px;"><input type="text" class="sheet-input" style="width:200px;" name="attr_skillSpeciality-Professionspec" value="" placeholder="Specialty Name" /></th>
 										<th style="width:75px;"><input type="number" class="sheet-input" style="width:45px;" name="attr_skilllevel-Professionspec" value="0" /></th>
 										<th style="width:55px;"><input type="number" class="sheet-input" style="width:50px;" name="attr_skilltotal-Professionspec" value="@{skillCharacteristicDM-Profession} + @{skilllevel-Professionspec} + @{skilllevel-Profession} + @{skillmodifier-Profession}" disabled="true"/></th>
@@ -1700,7 +1700,7 @@
 								<th style="width:55px;"></th>
 							</tr>
 							<tr>
-								<th><button name="roll_Recon" type="roll" value='&{template:skill-general} {{skill= Recon }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Recon}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header" data-i18n="recon-u">Recon</div></button></th>
+								<th><button name="roll_Recon" type="roll" value='&{template:skill-general} {{skill=^{recon-u}}} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Recon}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header" data-i18n="recon-u">Recon</div></button></th>
 								<th><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Recon" value="0" style="width:95px" />
 									<option value="@{mod-Strength}" data-i18n="skillstrengthoption-u">Strength</option>
 									<option value="@{mod-Dexterity}" data-i18n="skilldexterityoption-u">Dexterity</option>
@@ -1733,7 +1733,7 @@
 								<th style="width:55px;"></th>
 							</tr>
 							<tr>
-								<th><button name="roll_Science" type="roll" value='&{template:skill-general} {{skill= Science }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Science}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header" data-i18n="science-u">Science</div></button></th>
+								<th><button name="roll_Science" type="roll" value='&{template:skill-general} {{skill=^{science-u}}} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Science}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header" data-i18n="science-u">Science</div></button></th>
 								<th><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Science" value="0" style="width:95px" />
 									<option value="@{mod-Strength}" data-i18n="skillstrengthoption-u">Strength</option>
 									<option value="@{mod-Dexterity}" data-i18n="skilldexterityoption-u">Dexterity</option>
@@ -1765,7 +1765,7 @@
 								<table>
 									<tr>
 										<th style="width:55px;"></th>
-										<th style="width:150px;"><button name="roll_Sciencespec" type="roll" style="width:150px;" value='&{template:skill-general} {{skill= Science }} {{spec= @{skillSpeciality-Sciencespec} }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Sciencespec}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">***</div></button></th>
+										<th style="width:150px;"><button name="roll_Sciencespec" type="roll" style="width:150px;" value='&{template:skill-general} {{skill=^{science-u}}} {{spec= @{skillSpeciality-Sciencespec} }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Sciencespec}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">***</div></button></th>
 										<th style="width:200px;"><input type="text" class="sheet-input" style="width:200px;" name="attr_skillSpeciality-Sciencespec" value="" placeholder="Specialty Name" /></th>
 										<th style="width:75px;"><input type="number" class="sheet-input" style="width:45px;" name="attr_skilllevel-Sciencespec" value="0" /></th>
 										<th style="width:55px;"><input type="number" class="sheet-input" style="width:50px;" name="attr_skilltotal-Sciencespec" value="@{skillCharacteristicDM-Science} + @{skilllevel-Sciencespec} + @{skilllevel-Science} + @{skillmodifier-Science}" disabled="true"/></th>
@@ -1789,7 +1789,7 @@
 								<th style="width:55px;"></th>
 							</tr>
 							<tr>
-								<th><button name="roll_Seafarer" type="roll" value='&{template:skill-general} {{skill= Seafarer }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Seafarer}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header" data-i18n="seafarer-u">Seafarer</div></button></th>
+								<th><button name="roll_Seafarer" type="roll" value='&{template:skill-general} {{skill=^{seafarer-u}}} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Seafarer}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header" data-i18n="seafarer-u">Seafarer</div></button></th>
 								<th><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Seafarer" value="0" style="width:95px" />
 									<option value="@{mod-Strength}" data-i18n="skillstrengthoption-u">Strength</option>
 									<option value="@{mod-Dexterity}" data-i18n="skilldexterityoption-u">Dexterity</option>
@@ -1821,7 +1821,7 @@
 								<table>
 									<tr>
 										<th style="width:55px;"></th>
-										<th style="width:150px;"><button name="roll_Seafarerspec" type="roll" style="width:150px;" value='&{template:skill-general} {{skill= Seafarer }} {{spec= @{skillSpeciality-Seafarerspec} }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Seafarerspec}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">***</div></button></th>
+										<th style="width:150px;"><button name="roll_Seafarerspec" type="roll" style="width:150px;" value='&{template:skill-general} {{skill=^{seafarer-u}}} {{spec= @{skillSpeciality-Seafarerspec} }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Seafarerspec}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">***</div></button></th>
 										<th style="width:200px;"><input type="text" class="sheet-input" style="width:200px;" name="attr_skillSpeciality-Seafarerspec" value="" placeholder="Specialty Name" /></th>
 										<th style="width:75px;"><input type="number" class="sheet-input" style="width:45px;" name="attr_skilllevel-Seafarerspec" value="0" /></th>
 										<th style="width:55px;"><input type="number" class="sheet-input" style="width:50px;" name="attr_skilltotal-Seafarerspec" value="@{skillCharacteristicDM-Seafarer} + @{skilllevel-Seafarerspec} + @{skilllevel-Seafarer} + @{skillmodifier-Seafarer}" disabled="true"/></th>
@@ -1845,7 +1845,7 @@
 								<th style="width:55px;"></th>
 							</tr>
 							<tr>
-								<th><button name="roll_Stealth" type="roll" value='&{template:skill-general} {{skill= Stealth }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Stealth}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header" data-i18n="stealth-u">Stealth</div></button></th>
+								<th><button name="roll_Stealth" type="roll" value='&{template:skill-general} {{skill=^{stealth-u}}} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Stealth}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header" data-i18n="stealth-u">Stealth</div></button></th>
 								<th><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Stealth" value="0" style="width:95px" />
 									<option value="@{mod-Strength}" data-i18n="skillstrengthoption-u">Strength</option>
 									<option value="@{mod-Dexterity}" selected data-i18n="skilldexterityoption-u">Dexterity</option>
@@ -1878,7 +1878,7 @@
 								<th style="width:55px;"></th>
 							</tr>
 							<tr>
-								<th><button name="roll_Steward" type="roll" value='&{template:skill-general} {{skill= Steward }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Steward}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header" data-i18n="steward-u">Steward</div></button></th>
+								<th><button name="roll_Steward" type="roll" value='&{template:skill-general} {{skill=^{steward-u}}} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Steward}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header" data-i18n="steward-u">Steward</div></button></th>
 								<th><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Steward" value="0" style="width:95px" />
 									<option value="@{mod-Strength}" data-i18n="skillstrengthoption-u">Strength</option>
 									<option value="@{mod-Dexterity}" data-i18n="skilldexterityoption-u">Dexterity</option>
@@ -1911,7 +1911,7 @@
 								<th style="width:55px;"></th>
 							</tr>
 							<tr>
-								<th><button name="roll_Streetwise" type="roll" value='&{template:skill-general} {{skill= Streetwise }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Streetwise}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header" data-i18n="streetwise-u">Streetwise</div></button></th>
+								<th><button name="roll_Streetwise" type="roll" value='&{template:skill-general} {{skill=^{streetwise-u}}} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Streetwise}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header" data-i18n="streetwise-u">Streetwise</div></button></th>
 								<th><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Streetwise" value="0" style="width:95px" />
 									<option value="@{mod-Strength}" data-i18n="skillstrengthoption-u">Strength</option>
 									<option value="@{mod-Dexterity}" data-i18n="skilldexterityoption-u">Dexterity</option>
@@ -1944,7 +1944,7 @@
 								<th style="width:55px;"></th>
 							</tr>
 							<tr>
-								<th><button name="roll_Survival" type="roll" value='&{template:skill-general} {{skill= Survival }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Survival}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header" data-i18n="survival-u">Survival</div></button></th>
+								<th><button name="roll_Survival" type="roll" value='&{template:skill-general} {{skill=^{survival-u}}} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Survival}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header" data-i18n="survival-u">Survival</div></button></th>
 								<th><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Survival" value="0" style="width:95px" />
 									<option value="@{mod-Strength}" data-i18n="skillstrengthoption-u">Strength</option>
 									<option value="@{mod-Dexterity}" data-i18n="skilldexterityoption-u">Dexterity</option>
@@ -1977,7 +1977,7 @@
 								<th style="width:55px;"></th>
 							</tr>
 							<tr>
-								<th><button name="roll_Tactics" type="roll" value='&{template:skill-general} {{skill= Tactics }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Tactics}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header" data-i18n="tactics-u">Tactics</div></button></th>
+								<th><button name="roll_Tactics" type="roll" value='&{template:skill-general} {{skill=^{tactics-u}}} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Tactics}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header" data-i18n="tactics-u">Tactics</div></button></th>
 								<th><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Tactics" value="0" style="width:95px" />
 									<option value="@{mod-Strength}" data-i18n="skillstrengthoption-u">Strength</option>
 									<option value="@{mod-Dexterity}" data-i18n="skilldexterityoption-u">Dexterity</option>
@@ -2009,7 +2009,7 @@
 								<table>
 									<tr>
 										<th style="width:55px;"></th>
-										<th style="width:150px;"><button name="roll_Tacticsspec" type="roll" style="width:150px;" value='&{template:skill-general} {{skill= Tactics }} {{spec= @{skillSpeciality-Tacticsspec} }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Tacticsspec}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">***</div></button></th>
+										<th style="width:150px;"><button name="roll_Tacticsspec" type="roll" style="width:150px;" value='&{template:skill-general} {{skill=^{tactics-u}}} {{spec= @{skillSpeciality-Tacticsspec} }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Tacticsspec}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">***</div></button></th>
 										<th style="width:200px;"><input type="text" class="sheet-input" style="width:200px;" name="attr_skillSpeciality-Tacticsspec" value="" placeholder="Specialty Name" /></th>
 										<th style="width:75px;"><input type="number" class="sheet-input" style="width:45px;" name="attr_skilllevel-Tacticsspec" value="0" /></th>
 										<th style="width:55px;"><input type="number" class="sheet-input" style="width:50px;" name="attr_skilltotal-Tacticsspec" value="@{skillCharacteristicDM-Tactics} + @{skilllevel-Tacticsspec} + @{skilllevel-Tactics} + @{skillmodifier-Tactics}" disabled="true"/></th>
@@ -2033,7 +2033,7 @@
 								<th style="width:55px;"></th>
 							</tr>
 							<tr>
-								<th><button name="roll_VaccSuit" type="roll" value='&{template:skill-general} {{skill= Vacc Suit }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-VaccSuit}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header" data-i18n="vaccsuit-u">Vacc Suit</div></button></th>
+								<th><button name="roll_VaccSuit" type="roll" value='&{template:skill-general} {{skill=^{vaccsuit-u}}} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-VaccSuit}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header" data-i18n="vaccsuit-u">Vacc Suit</div></button></th>
 								<th><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-VaccSuit" value="0" style="width:95px" />
 									<option value="@{mod-Strength}" data-i18n="skillstrengthoption-u">Strength</option>
 									<option value="@{mod-Dexterity}" selected data-i18n="skilldexterityoption-u">Dexterity</option>
@@ -2271,7 +2271,7 @@
 								</select>
 							</td>
 							<td>
-								<button data-i18n="initiativeroll-u" type="roll" name="roll_initiative" value="&{template:skill-general} {{skill= Initiative}} {{character= @{character_name} }}@{ro_default_rolltype}+@{initiativeattribute}[Attribute Modifier] @{ro_default_mod} &{tracker}]]}}" ></button>
+								<button data-i18n="initiativeroll-u" type="roll" name="roll_initiative" value="&{template:skill-general} {{skill= ^{initiative-u}}} {{character= @{character_name} }}@{ro_default_rolltype}+@{initiativeattribute}[Attribute Modifier] @{ro_default_mod} &{tracker}]]}}" ></button>
 							</td>
 						</tr>
 					</table>
@@ -2427,7 +2427,7 @@
 						<td></td>
 					</tr>
 					<tr>
-						<td style="width:130px"><button class="sheet-button" name="roll_PsionicStrength" type="roll" value='&{template:skill-attrib} {{skill= Psionic Strength }} {{character= @{character_name} }} {{roll= [[@{ro_default_rolltype} + @{mod-PsionicStrength} @{ro_default_mod}]] }}   }}' ><div class="sheet-button_header" data-i18n="psionicstrength-u">Psionic Strength</div></button></td>
+						<td style="width:130px"><button class="sheet-button" name="roll_PsionicStrength" type="roll" value='&{template:skill-attrib} {{skill=^{psionicstrength-u}}} {{character= @{character_name} }} {{roll= [[@{ro_default_rolltype} + @{mod-PsionicStrength} @{ro_default_mod}]] }}   }}' ><div class="sheet-button_header" data-i18n="psionicstrength-u">Psionic Strength</div></button></td>
 						<td><input type="number" class="sheet-input sheet-bold" name="attr_base-PsionicStrength" value="0"/></td>
 						<td><input type="number" class="sheet-input sheet-norm" name="attr_injury-PsionicStrength" value="0"/></td>
 						<td><input type="number" class="sheet-input sheet-mod" name="attr_mod-PsionicStrength" value="0"/></td>
@@ -2530,7 +2530,7 @@
 					</select>
 				</td>
 				<td>
-					<button data-i18n="initiativeroll-u" type="roll" name="roll_initiative" value="&{template:skill-general} {{skill= Initiative}} {{character= @{character_name} }}@{ro_default_rolltype}+@{initiativeattribute}[Attribute Modifier] @{ro_default_mod} &{tracker}]]}}" ></button>
+					<button data-i18n="initiativeroll-u" type="roll" name="roll_initiative" value="&{template:skill-general} {{skill=^{initiative-u}}} {{character= @{character_name} }}@{ro_default_rolltype}+@{initiativeattribute}[Attribute Modifier] @{ro_default_mod} &{tracker}]]}}" ></button>
 				</td>
 			</tr>
 		</table>
diff --git a/Mongoose_Traveller2e/translation.json b/Mongoose_Traveller2e/translation.json
index e30184bc5d..c2229d28e2 100644
--- a/Mongoose_Traveller2e/translation.json
+++ b/Mongoose_Traveller2e/translation.json
@@ -198,5 +198,6 @@
 	"rollwithbane-u": "Rolling with BANE",
 	"boonbane-u": "Boon/Bane",
 	"misc-u": "Misc",
-	"attack-u": "Attack"
+	"attack-u": "Attack",
+	"initiative-u": "Initiative"
 }
\ No newline at end of file