diff --git a/Digital Shades/sheet.html b/Digital Shades/sheet.html
index 3bcdbe081f..20a7464a3e 100644
--- a/Digital Shades/sheet.html	
+++ b/Digital Shades/sheet.html	
@@ -71,7 +71,7 @@
 					<td class="sheet-auto-style1" style="height: 34px">
 					<input class="sheet-font-courriernew" name="attr_bang1" type="checkbox" value="0" />T.B.</td>
 					<td style="height: 34px">
-					<button class="sheet-button" name="attr_roll_skill_toughbastard_life" style="width: 35px" type="roll" value="/em @{character_name} rolls Tough Bastard skill [[ @{skill_toughbastard1}d6 ]] [[ @{skill_toughbastard2}d6 ]] [[ @{skill_toughbastard3}d6 ]] + @{upgrades24}">
+					<button class="sheet-button" name="attr_roll_skill_toughbastard_life" style="width: 35px" type="roll" value="&amp;{template:default} {{name=tough bastard skill Test}} {{unskilled=[[ (1 - @{skill_toughbastard1})d6r&lt;2 -2 ]]+ @{upgrades24}}} {{skilled=[[@{skill_toughbastard1}d6]] [[@{skill_toughbastard2}d6]] [[@{skill_toughbastard3}d6]] + @{upgrades24}}">
 					</button></td>
 				</tr>
 				<tr>
@@ -109,7 +109,7 @@
 			<table style="width: 100%; height: 757px;">
 				<tr>
 					<td style="height: 21px; width: 39px;">
-					<button attr_roll_skill_backalley"="" class="sheet-button" style="width: 35px" type="roll" value="/em @{character_name} rolls Back Alley skill [[ @{skill_backalley1}d6 ]] [[ @{skill_backalley2}d6 ]] [[ @{skill_backalley3}d6 ]]">
+					<button class="sheet-button" name="attr_roll_skill_backalley" style="width: 35px" type="roll" value="&amp;{template:default} {{name=Back Alley skill Test}} {{unskilled=[[ (1 - @{skill_backalley1})d6r&lt;2 -2 ]]}} {{skilled=[[ @{skill_backalley1}d6 ]] [[ @{skill_backalley2}d6 ]] [[ @{skill_backalley3}d6 ]]}}">
 					</button></td>
 					<td style="height: 21px; width: 66px;">
 					<input class="sheet-font-courriernew" name="attr_skill_backalley1" type="checkbox" value="1" /><input class="sheet-font-courriernew" name="attr_skill_backalley2" type="checkbox" value="1" /><input class="sheet-font-courriernew" name="attr_skill_backalley3" type="checkbox" value="1" /></td>
@@ -118,7 +118,7 @@
 				</tr>
 				<tr>
 					<td style="height: 23px; width: 39px;">
-					<button attr_roll_skill_badge"="" class="sheet-button" style="width: 35px; height: 34px name=" type="roll" value="/em @{character_name} rolls Badge skill [[ @{skill_badge1}d6 ]] [[ @{skill_badge2}d6 ]] [[ @{skill_badge3}d6 ]]">
+					<button class="sheet-button" name="attr_roll_skill_badge" style="width: 35px; height: 34px name=" type="roll" value="&amp;{template:default} {{name=Badge skill Test}} {{unskilled=[[ (1 - @{skill_badge1})d6r&lt;2 -2 ]]}} {{skilled=[[ @{skill_badge1}d6 ]] [[ @{skill_badge2}d6 ]] [[ @{skill_badge3}d6 ]]}}">
 					</button></td>
 					<td style="height: 23px; width: 66px;">
 					<input class="sheet-font-courriernew" name="attr_skill_badge1" type="checkbox" value="1" /><input class="sheet-font-courriernew" name="attr_skill_badge2" type="checkbox" value="1" /><input class="sheet-font-courriernew" name="attr_skill_badge3" type="checkbox" value="1" /></td>
@@ -126,7 +126,7 @@
 				</tr>
 				<tr>
 					<td style="height: 23px; width: 39px;">
-					<button attr_roll_skill_big_money"="" class="sheet-button" style="width: 35px; height: 34px name=" type="roll" value="/em @{character_name} rolls Big Money skill [[ @{skill_bigmoney1}d6 ]] [[ @{skill_bigmoney2}d6 ]] [[ @{skill_bigmoney3}d6 ]]">
+					<button class="sheet-button" name="attr_roll_skill_big_money" style="width: 35px; height: 34px name=" type="roll" value="&amp;{template:default} {{name=Big Money skill Test}} {{unskilled=[[ (1 - @{skill_bigmoney1})d6r&lt;2 -2 ]]}} {{skilled=[[ @{skill_bigmoney1}d6 ]] [[ @{skill_bigmoney2}d6 ]] [[ @{skill_bigmoney3}d6 ]]}}">
 					</button></td>
 					<td style="height: 23px; width: 66px;">
 					<input class="sheet-font-courriernew" name="attr_skill_bigmoney1" type="checkbox" value="1" /><input class="sheet-font-courriernew" name="attr_skill_bigmoney2" type="checkbox" value="1" /><input class="sheet-font-courriernew" name="attr_skill_bigmoney3" type="checkbox" value="1" /></td>
@@ -135,7 +135,7 @@
 				</tr>
 				<tr>
 					<td style="height: 23px; width: 39px;">
-					<button attr_roll_skill_bone_breaker"="" class="sheet-button" style="width: 35px; height: 34px name=" type="roll" value="/em @{character_name} rolls Bone Breaker skill [[ @{skill_bonebreaker1}d6 ]] [[ @{skill_bonebreaker2}d6 ]] [[ @{skill_bonebreaker3}d6 ]] + @{upgrades18}">
+					<button class="sheet-button" name="attr_roll_skill_bone_breaker" style="width: 35px; height: 34px name=" type="roll" value="&amp;{template:default} {{name=Bone Breaker skill Test}} {{unskilled=[[ (1 - @{skill_bonebreaker1})d6r&lt;2 -2 ]]+ @{upgrades18}}} {{skilled=[[@{skill_bonebreaker1}d6]] [[@{skill_bonebreaker2}d6]] [[@{skill_bonebreaker3}d6]] + @{upgrades18}}">
 					</button></td>
 					<td style="height: 23px; width: 66px;">
 					<input class="sheet-font-courriernew" name="attr_skill_bonebreaker1" type="checkbox" value="1" /><input class="sheet-font-courriernew" name="attr_skill_bonebreaker2" type="checkbox" value="1" /><input class="sheet-font-courriernew" name="attr_skill_bonebreaker3" type="checkbox" value="1" /></td>
@@ -143,16 +143,16 @@
 					Breaker</td>
 				</tr>
 				<tr>
-					<td style="height: 23px; width: 39px;">
-					<button attr_roll_skill_connections"="" class="sheet-button" style="width: 35px; height: 34px name=" type="roll" value="/em @{character_name} rolls Connections skill [[ @{skill_connection1}d6 ]] [[ @{skill_connection2}d6 ]] [[ @{skill_connection3}d6 ]]">
+					<td class="auto-style1">
+					<button class="sheet-button" name="attr_roll_skill_connections" style="width: 35px; height: 34px name=" type="roll" value="&amp;{template:default} {{name=Connections skill Test}} {{unskilled=[[ (1 - @{skill_connections1})d6r&lt;2 -2 ]]}} {{skilled=[[ @{skill_connections1}d6 ]] [[ @{skill_connections2}d6 ]] [[ @{skill_connections3}d6 ]]}}">
 					</button></td>
-					<td style="height: 23px; width: 66px;">
-					<input class="sheet-font-courriernew" name="attr_skill_connection1" type="checkbox" value="1" /><input class="sheet-font-courriernew" name="attr_skill_connection2" type="checkbox" value="1" /><input class="sheet-font-courriernew" name="attr_skill_connection3" type="checkbox" value="1" /></td>
-					<td class="sheet-font-courriernew" style="height: 23px">Connections</td>
+					<td class="auto-style2">
+					<input class="sheet-font-courriernew" name="attr_skill_connection1s" type="checkbox" value="1" /><input class="sheet-font-courriernew" name="attr_skill_connections2" type="checkbox" value="1" /><input class="sheet-font-courriernew" name="attr_skill_connections3" type="checkbox" value="1" /></td>
+					<td class="auto-style3">Connections</td>
 				</tr>
 				<tr>
 					<td style="height: 23px; width: 39px;">
-					<button attr_roll_skill_credibility"="" class="sheet-button" style="width: 35px; height: 34px name=" type="roll" value="/em @{character_name} rolls Credibility skill [[ @{skill_credibility1}d6 ]] [[ @{skill_credibility2}d6 ]] [[ @{skill_credibility3}d6 ]]">
+					<button class="sheet-button" name="attr_roll_skill_credibility" style="width: 35px; height: 34px name=" type="roll" value="&amp;{template:default} {{name=Credibility skill Test}} {{unskilled=[[ (1 - @{skill_credibility1})d6r&lt;2 -2 ]]}} {{skilled=[[ @{skill_credibility1}d6 ]] [[ @{skill_credibility2}d6 ]] [[ @{skill_credibility3}d6 ]]}}">
 					</button></td>
 					<td style="height: 23px; width: 66px;">
 					<input class="sheet-font-courriernew" name="attr_skill_credibility1" type="checkbox" value="1" /><input class="sheet-font-courriernew" name="attr_skill_credibility2" type="checkbox" value="1" /><input class="sheet-font-courriernew" name="attr_skill_credibility3" type="checkbox" value="1" /></td>
@@ -160,7 +160,7 @@
 				</tr>
 				<tr>
 					<td style="height: 23px; width: 39px;">
-					<button attr_roll_skill_deals"="" class="sheet-button" style="width: 35px; height: 34px name=" type="roll" value="/em @{character_name} rolls Deals skill [[ @{skill_deals1}d6 ]] [[ @{skill_deals2}d6 ]] [[ @{skill_deals3}d6 ]] + @{upgrades9}">
+					<button class="sheet-button" name="attr_roll_skill_deals" style="width: 35px; height: 34px name=" type="roll" value="/em @{character_name} rolls Deals skill [[ @{skill_deals1}d6 ]] [[ @{skill_deals2}d6 ]] [[ @{skill_deals3}d6 ]] + @{upgrades9}">
 					</button></td>
 					<td style="height: 23px; width: 66px;">
 					<input class="sheet-font-courriernew" name="attr_skill_deals1" type="checkbox" value="1" /><input class="sheet-font-courriernew" name="attr_skill_deals2" type="checkbox" value="1" /><input class="sheet-font-courriernew" name="attr_skill_deals3" type="checkbox" value="1" /></td>
@@ -168,7 +168,7 @@
 				</tr>
 				<tr>
 					<td style="height: 23px; width: 39px;">
-					<button attr_roll_detective"="" class="sheet-button" style="width: 35px; height: 34px name=" type="roll" value="/em @{character_name} rolls Detective skill [[ @{skill_detective1}d6 ]] [[ @{skill_detective2}d6 ]] [[ @{skill_detective3}d6 ]] + @{upgrades6}">
+					<button class="sheet-button" name="attr_roll_detective" style="width: 35px; height: 34px name=" type="roll" value="/em @{character_name} rolls Detective skill [[ @{skill_detective1}d6 ]] [[ @{skill_detective2}d6 ]] [[ @{skill_detective3}d6 ]] + @{upgrades6}">
 					</button></td>
 					<td style="height: 23px; width: 66px;">
 					<input class="sheet-font-courriernew" name="attr_skill_detective1" type="checkbox" value="1" /><input class="sheet-font-courriernew" name="attr_skill_detective2" type="checkbox" value="1" /><input class="sheet-font-courriernew" name="attr_skill_detective3" type="checkbox" value="1" /></td>
@@ -176,7 +176,7 @@
 				</tr>
 				<tr>
 					<td style="height: 23px; width: 39px;">
-					<button attr_roll_domestic_crimes"="" class="sheet-button" style="width: 35px; height: 34px name=" type="roll" value="/em @{character_name} rolls Domestic Crimes skill [[ @{skill_domesticcrimes1}d6 ]] [[ @{skill_domesticcrimes2}d6 ]] [[ @{skill_domesticcrimes3}d6 ]]">
+					<button class="sheet-button" name="attr_roll_domestic_crimes" style="width: 35px; height: 34px name=" type="roll" value="/em @{character_name} rolls Domestic Crimes skill [[ @{skill_domesticcrimes1}d6 ]] [[ @{skill_domesticcrimes2}d6 ]] [[ @{skill_domesticcrimes3}d6 ]]">
 					</button></td>
 					<td style="height: 23px; width: 66px;">
 					<input class="sheet-font-courriernew" name="attr_skill_domesticcrimes1" type="checkbox" value="1" /><input class="sheet-font-courriernew" name="attr_skill_domesticcrimes2" type="checkbox" value="1" /><input class="sheet-font-courriernew" name="attr_skill_domesticcrimes3" type="checkbox" value="1" /></td>
@@ -185,7 +185,7 @@
 				</tr>
 				<tr>
 					<td style="height: 23px; width: 39px;">
-					<button attr_roll_skill_gang"="" class="sheet-button" style="width: 35px; height: 34px name=" type="roll" value="/em @{character_name} rolls Gang skill [[ @{skill_gang1}d6 ]] [[ @{skill_gang2}d6 ]] [[ @{skill_gang3}d6 ]]">
+					<button class="sheet-button" name="attr_roll_skill_gang" style="width: 35px; height: 34px name=" type="roll" value="/em @{character_name} rolls Gang skill [[ @{skill_gang1}d6 ]] [[ @{skill_gang2}d6 ]] [[ @{skill_gang3}d6 ]]">
 					</button></td>
 					<td style="height: 23px; width: 66px;">
 					<input class="sheet-font-courriernew" name="attr_skill_gang1" type="checkbox" value="1" /><input class="sheet-font-courriernew" name="attr_skill_gang2" type="checkbox" value="1" /><input class="sheet-font-courriernew" name="attr_skill_gang3" type="checkbox" value="1" /></td>
@@ -193,7 +193,7 @@
 				</tr>
 				<tr>
 					<td style="height: 23px; width: 39px;">
-					<button attr_roll_guns"="" class="sheet-button" style="width: 35px; height: 34px name=" type="roll" value="/em @{character_name} rolls Guns skill [[ @{skill_guns1}d6 ]] [[ @{skill_guns2}d6 ]] [[ @{skill_guns3}d6 ]] + @{upgrades5}">
+					<button class="sheet-button" name="attr_roll_guns" style="width: 35px; height: 34px name=" type="roll" value="/em @{character_name} rolls Guns skill [[ @{skill_guns1}d6 ]] [[ @{skill_guns2}d6 ]] [[ @{skill_guns3}d6 ]] + @{upgrades5}">
 					</button></td>
 					<td style="height: 23px; width: 66px;">
 					<input class="sheet-font-courriernew" name="attr_skill_guns1" type="checkbox" value="1" /><input class="sheet-font-courriernew" name="attr_skill_guns2" type="checkbox" value="1" /><input class="sheet-font-courriernew" name="attr_skill_guns3" type="checkbox" value="1" /></td>
@@ -201,7 +201,7 @@
 				</tr>
 				<tr>
 					<td style="height: 24px; width: 39px;">
-					<button attr_roll_skill_hacker"="" class="sheet-button" style="width: 35px; height: 34px name=" type="roll" value="/em @{character_name} rolls Hacker skill [[ @{skill_hacker1}d6 ]] [[ @{skill_hacker2}d6 ]] [[ @{skill_hacker3}d6 ]] + @{upgrades2}">
+					<button class="sheet-button" name="attr_roll_skill_hacker" style="width: 35px; height: 34px name=" type="roll" value="/em @{character_name} rolls Hacker skill [[ @{skill_hacker1}d6 ]] [[ @{skill_hacker2}d6 ]] [[ @{skill_hacker3}d6 ]] + @{upgrades2}">
 					</button></td>
 					<td style="height: 24px; width: 66px;">
 					<input class="sheet-font-courriernew" name="attr_skill_hacker1" type="checkbox" value="1" /><input class="sheet-font-courriernew" name="attr_skill_hacker2" type="checkbox" value="1" /><input class="sheet-font-courriernew" name="attr_skill_hacker3" type="checkbox" value="1" /></td>
@@ -209,7 +209,7 @@
 				</tr>
 				<tr>
 					<td style="height: 24px; width: 39px;">
-					<button attr_roll_skill_knowhow"="" class="sheet-button" style="width: 35px; height: 34px name=" type="roll" value="/em @{character_name} rolls Know How skill [[ @{skill_knowhow1}d6 ]] [[ @{skill_knowhow2}d6 ]] [[ @{skill_knowhow3}d6 ]]">
+					<button class="sheet-button" name="attr_roll_skill_knowhow" style="width: 35px; height: 34px name=" type="roll" value="/em @{character_name} rolls Know How skill [[ @{skill_knowhow1}d6 ]] [[ @{skill_knowhow2}d6 ]] [[ @{skill_knowhow3}d6 ]]">
 					</button></td>
 					<td style="height: 24px; width: 66px;">
 					<input class="sheet-font-courriernew" name="attr_skill_knowhow1" type="checkbox" value="1" /><input class="sheet-font-courriernew" name="attr_skill_knowhow2" type="checkbox" value="1" /><input class="sheet-font-courriernew" name="attr_skill_knowhow3" type="checkbox" value="1" /></td>
@@ -223,7 +223,7 @@
 				</tr>
 				<tr>
 					<td style="height: 24px; width: 39px;">
-					<button attr_roll_skill_medic"="" class="sheet-button" style="width: 35px; height: 34px name=" type="roll" value="/em @{character_name} rolls Medic skill [[ @{skill_medic1}d6 ]] [[ @{skill_medic2}d6 ]] [[ @{skill_medic3}d6 ]] + @{upgrades19}">
+					<button class="sheet-button" name="attr_roll_skill_medic" style="width: 35px; height: 34px name=" type="roll" value="/em @{character_name} rolls Medic skill [[ @{skill_medic1}d6 ]] [[ @{skill_medic2}d6 ]] [[ @{skill_medic3}d6 ]] + @{upgrades19}">
 					</button></td>
 					<td style="height: 24px; width: 66px;">
 					<input class="sheet-font-courriernew" name="attr_skill_medic1" type="checkbox" value="1" /><input class="sheet-font-courriernew" name="attr_skill_medic2" type="checkbox" value="1" /><input class="sheet-font-courriernew" name="attr_skill_medic3" type="checkbox" value="1" /></td>
@@ -231,7 +231,7 @@
 				</tr>
 				<tr>
 					<td style="height: 24px; width: 39px;">
-					<button attr_roll_military"="" class="sheet-button" style="width: 35px; height: 34px name=" type="roll" value="/em @{character_name} rolls Military skill [[ @{skill_military1}d6 ]] [[ @{skill_military2}d6 ]] [[ @{skill_military3}d6 ]]">
+					<button class="sheet-button" name="attr_roll_military" style="width: 35px; height: 34px name=" type="roll" value="/em @{character_name} rolls Military skill [[ @{skill_military1}d6 ]] [[ @{skill_military2}d6 ]] [[ @{skill_military3}d6 ]]">
 					</button></td>
 					<td style="height: 24px; width: 66px;">
 					<input class="sheet-font-courriernew" name="attr_skill_military1" type="checkbox" value="1" /><input class="sheet-font-courriernew" name="attr_skill_military2" type="checkbox" value="1" /><input class="sheet-font-courriernew" name="attr_skill_military3" type="checkbox" value="1" /></td>
@@ -239,7 +239,7 @@
 				</tr>
 				<tr>
 					<td style="height: 24px; width: 39px;">
-					<button attr_roll_skill_runner"="" class="sheet-button" style="width: 35px; height: 34px name=" type="roll" value="/em @{character_name} rolls runner skill [[ @{skill_runner1}d6 ]] [[ @{skill_runner2}d6 ]] [[ @{skill_runner3}d6 ]] + @{upgrades11}">
+					<button class="sheet-button" name="attr_roll_skill_runner" style="width: 35px; height: 34px name=" type="roll" value="/em @{character_name} rolls runner skill [[ @{skill_runner1}d6 ]] [[ @{skill_runner2}d6 ]] [[ @{skill_runner3}d6 ]] + @{upgrades11}">
 					</button></td>
 					<td style="height: 24px; width: 66px;">
 					<input class="sheet-font-courriernew" name="attr_skill_runner1" type="checkbox" value="1" /><input class="sheet-font-courriernew" name="attr_skill_runner2" type="checkbox" value="1" /><input class="sheet-font-courriernew" name="attr_skill_runner3" type="checkbox" value="1" /></td>
@@ -247,7 +247,7 @@
 				</tr>
 				<tr>
 					<td style="height: 24px; width: 39px;">
-					<button attr_roll_skill_samurai"="" class="sheet-button" style="width: 35px; height: 34px name=" type="roll" value="/em @{character_name} rolls Samurai skill [[ @{skill_samurai1}d6 ]] [[ @{skill_samurai2}d6 ]] [[ @{skill_samurai3}d6 ]] + @{upgrades18}">
+					<button class="sheet-button" name="attr_roll_skill_samurai" style="width: 35px; height: 34px name=" type="roll" value="/em @{character_name} rolls Samurai skill [[ @{skill_samurai1}d6 ]] [[ @{skill_samurai2}d6 ]] [[ @{skill_samurai3}d6 ]] + @{upgrades18}">
 					</button></td>
 					<td style="height: 24px; width: 66px;">
 					<input class="sheet-font-courriernew" name="attr_skill_samurai1" type="checkbox" value="1" /><input class="sheet-font-courriernew" name="attr_skill_samurai2" type="checkbox" value="1" /><input class="sheet-font-courriernew" name="attr_skill_samurai3" type="checkbox" value="1" /></td>
@@ -255,7 +255,7 @@
 				</tr>
 				<tr>
 					<td style="height: 24px; width: 39px;">
-					<button attr_roll_skill_shadow"="" class="sheet-button" style="width: 35px; height: 34px name=" type="roll" value="/em @{character_name} rolls shadow skill [[ @{skill_shadow1}d6 ]] [[ @{skill_shadow2}d6 ]] [[ @{skill_shadow3}d6 ]] + @{upgrades16}">
+					<button class="sheet-button" name="attr_roll_skill_shadow" style="width: 35px; height: 34px name=" type="roll" value="/em @{character_name} rolls shadow skill [[ @{skill_shadow1}d6 ]] [[ @{skill_shadow2}d6 ]] [[ @{skill_shadow3}d6 ]] + @{upgrades16}">
 					</button></td>
 					<td style="height: 24px; width: 66px;">
 					<input class="sheet-font-courriernew" name="attr_skill_shadow1" type="checkbox" value="1" /><input class="sheet-font-courriernew" name="attr_skill_shadow2" type="checkbox" value="1" /><input class="sheet-font-courriernew" name="attr_skill_shadow3" type="checkbox" value="1" /></td>
@@ -263,7 +263,7 @@
 				</tr>
 				<tr>
 					<td style="height: 24px; width: 39px;">
-					<button attr_roll_skill_showoff"="" class="sheet-button" style="width: 35px; height: 34px name=" type="roll" value="/em @{character_name} rolls show off skill [[ @{skill_showoff1}d6 ]] [[ @{skill_showoff2}d6 ]] [[ @{skill_showoff3}d6 ]] + @{upgrades9}">
+					<button class="sheet-button" name="attr_roll_skill_showoff" style="width: 35px; height: 34px name=" type="roll" value="/em @{character_name} rolls show off skill [[ @{skill_showoff1}d6 ]] [[ @{skill_showoff2}d6 ]] [[ @{skill_showoff3}d6 ]] + @{upgrades9}">
 					</button></td>
 					<td style="height: 24px; width: 66px;">
 					<input class="sheet-font-courriernew" name="attr_skill_showoff1" type="checkbox" value="1" /><input class="sheet-font-courriernew" name="attr_skill_showoff2" type="checkbox" value="1" /><input class="sheet-font-courriernew" name="attr_skill_showoff3" type="checkbox" value="1" /></td>
@@ -271,7 +271,7 @@
 				</tr>
 				<tr>
 					<td style="height: 24px; width: 39px;">
-					<button attr_roll_skill_technerd"="" class="sheet-button" style="width: 35px; height: 34px name=" type="roll" value="/em @{character_name} rolls Tech Nerd skill [[ @{skill_technerd1}d6 ]] [[ @{skill_technerd2}d6 ]] [[ @{skill_technerd3}d6 ]] + @{upgrades19}">
+					<button class="sheet-button" name="attr_roll_skill_technerd" style="width: 35px; height: 34px name=" type="roll" value="/em @{character_name} rolls Tech Nerd skill [[ @{skill_technerd1}d6 ]] [[ @{skill_technerd2}d6 ]] [[ @{skill_technerd3}d6 ]] + @{upgrades19}">
 					</button></td>
 					<td style="height: 24px; width: 66px;">
 					<input class="sheet-font-courriernew" name="attr_skill_technerd1" type="checkbox" value="1" /><input class="sheet-font-courriernew" name="attr_skill_technerd2" type="checkbox" value="1" /><input class="sheet-font-courriernew" name="attr_skill_technerd3" type="checkbox" value="1" /></td>
@@ -280,7 +280,7 @@
 				</tr>
 				<tr>
 					<td style="height: 24px; width: 39px;">
-					<button attr_roll_skill_toughbastard"="" class="sheet-button" style="width: 35px; height: 34px name=" type="roll" value="/em @{character_name} rolls Tough Bastard skill [[ @{skill_toughbastard1}d6 ]] [[ @{skill_toughbastard2}d6 ]] [[ @{skill_toughbastard3}d6 ]] + @{upgrades24}">
+					<button class="sheet-button" name="attr_roll_skill_toughbastard" style="width: 35px; height: 34px name=" type="roll" value="&amp;{template:default} {{name=tough bastard skill Test}} {{unskilled=[[ (1 - @{skill_toughbastard1})d6r&lt;2 -2 ]]+ @{upgrades24}}} {{skilled=[[@{skill_toughbastard1}d6]] [[@{skill_toughbastard2}d6]] [[@{skill_toughbastard3}d6]] + @{upgrades24}}">
 					</button></td>
 					<td style="height: 24px; width: 66px;">
 					<input class="sheet-font-courriernew" name="attr_skill_toughbastard1" type="checkbox" value="1" /><input class="sheet-font-courriernew" name="attr_skill_toughbastard2" type="checkbox" value="1" /><input class="sheet-font-courriernew" name="attr_skill_toughbastard3" type="checkbox" value="1" /></td>
@@ -289,7 +289,7 @@
 				</tr>
 				<tr>
 					<td style="width: 39px; height: 19px;">
-					<button attr_roll_skill_urbane"="" class="sheet-button" style="width: 35px; height: 34px name=" type="roll" value="/em @{character_name} rolls urbane skill [[ @{skill_urbane1}d6 ]] [[ @{skill_urbane2}d6 ]] [[ @{skill_urbane3}d6 ]]">
+					<button class="sheet-button" name="attr_roll_skill_urbane" style="width: 35px; height: 34px name=" type="roll" value="/em @{character_name} rolls urbane skill [[ @{skill_urbane1}d6 ]] [[ @{skill_urbane2}d6 ]] [[ @{skill_urbane3}d6 ]]">
 					</button></td>
 					<td style="height: 19px; width: 66px;">
 					<input class="sheet-font-courriernew" name="attr_skill_urbane1" type="checkbox" value="1" /><input class="sheet-font-courriernew" name="attr_skill_urbane2" type="checkbox" value="1" /><input class="sheet-font-courriernew" name="attr_skill_urbane3" type="checkbox" value="1" /></td>
@@ -297,7 +297,7 @@
 				</tr>
 				<tr>
 					<td style="height: 24px; width: 39px;">
-					<button attr_roll_skill_vehicles"="" class="sheet-button" style="width: 35px; height: 34px name=" type="roll" value="/em @{character_name} rolls vehicles skill [[ @{skill_vehicles1}d6 ]] [[ @{skill_vehicles2}d6 ]] [[ @{skill_vehicles3}d6 ]]">
+					<button class="sheet-button" name="attr_roll_skill_vehicles" style="width: 35px; height: 34px name=" type="roll" value="/em @{character_name} rolls vehicles skill [[ @{skill_vehicles1}d6 ]] [[ @{skill_vehicles2}d6 ]] [[ @{skill_vehicles3}d6 ]]">
 					</button></td>
 					<td style="height: 24px; width: 66px;">
 					<input class="sheet-font-courriernew" name="attr_skill_vehicles1" type="checkbox" value="1" /><input class="sheet-font-courriernew" name="attr_skill_vehicles2" type="checkbox" value="1" /><input class="sheet-font-courriernew" name="attr_skill_vehicles3" type="checkbox" value="1" /></td>