diff --git a/Digital Shades/sheet.html b/Digital Shades/sheet.html
index bf1b28121b..05ac614a8b 100644
--- a/Digital Shades/sheet.html	
+++ b/Digital Shades/sheet.html	
@@ -14,10 +14,10 @@
 		</div>
 		<form method="post">
 			<div class="sheet-auto-style1">
-			<textarea name="attr_self_text" style="width: 218px; height: 55px"></textarea></div>
+				<textarea name="attr_self_text" style="width: 218px; height: 55px"></textarea></div>
 		</form>
 		</td>
-		<td class="sheet-top-centered" valign="top" style="height: 184px">[<span class="sheet-courrier-purple"><strong>Health</strong></span>]<table align="center" class="sheet-box">
+		<td class="sheet-top-centered" style="height: 184px" valign="top">[<span class="sheet-courrier-purple"><strong>Health</strong></span>]<table align="center" class="sheet-box">
 			<tr>
 				<td class="sheet-font-courriernew">&nbsp;</td>
 				<td class="sheet-font-courriernew"><strong>blunt</strong></td>
@@ -43,7 +43,8 @@
 				<td class="sheet-font-courriernew">&nbsp;</td>
 			</tr>
 			<tr>
-				<td class="sheet-font-courriernew" style="height: 58px">Hurts like ell!</td>
+				<td class="sheet-font-courriernew" style="height: 58px">Hurts like 
+				ell!</td>
 				<td style="height: 58px">
 				<input class="sheet-font-courriernew" name="attr_blunt3" type="checkbox" value="0" /></td>
 				<td style="height: 58px">
@@ -51,7 +52,7 @@
 				<td style="height: 58px">
 				<input class="sheet-font-courriernew" name="attr_bang1" type="checkbox" value="0" /><span class="sheet-font-courriernew">T.B.</span></td>
 				<td style="height: 58px">
-				<button class="sheet-button" type="roll" name="attr_roll_skill_toughbastard_life" value="/em @{character_name} rolls Tough Bastard skill [[ @{skilltoughbastard1}d6 ]] [[ @{skilltoughbastard2}d6 ]] [[ @{skilltoughbastard3}d6 ]] + @{upgrades24}" style="width: 35px; height: 34px">
+				<button class="sheet-button" name="attr_roll_skill_toughbastard_life" style="width: 35px; height: 34px" type="roll" value="/em @{character_name} rolls Tough Bastard skill [[ @{skill_toughbastard1}d6 ]] [[ @{skill_toughbastard2}d6 ]] [[ @{skill_toughbastard3}d6 ]] + @{upgrades24}">
 				</button></td>
 			</tr>
 			<tr>
@@ -62,8 +63,7 @@
 				<input class="sheet-font-courriernew" name="attr_sharp3" type="checkbox" value="0" /></td>
 				<td>
 				<input class="sheet-font-courriernew" name="attr_bang2" type="checkbox" value="0" /><span class="sheet-font-courriernew">K.O.</span></td>
-				<td>
-				&nbsp;</td>
+				<td>&nbsp;</td>
 			</tr>
 		</table>
 		</td>
@@ -76,14 +76,14 @@
 			<strong><span class="sheet-medium-courriernew-black">[</span></strong><span class="sheet-courrier-purple"><strong>Disadvantage</strong></span><span class="sheet-medium-courriernew-black"><strong>]</strong></span></div>
 		<form method="post">
 			<div class="sheet-auto-style1">
-			<textarea name="attr_disadvantage_text" style="width: 216px; height: 61px"></textarea></div>
+				<textarea name="attr_disadvantage_text" style="width: 216px; height: 61px"></textarea></div>
 		</form>
 		</td>
 		<td class="sheet-top-centered" style="height: 88px"><strong>
 		<span class="sheet-medium-courriernew-black">[</span></strong><span class="sheet-courrier-purple"><strong>Gear</strong></span>]<br class="sheet-font-courriernew">
 		<form method="post">
 			<div class="sheet-auto-style1">
-			<textarea name="attr_gears_text" style="width: 691px; height: 59px"></textarea></div>
+				<textarea name="attr_gears_text" style="width: 691px; height: 59px"></textarea></div>
 		</form>
 		</td>
 	</tr>
@@ -94,7 +94,7 @@
 		<table class="sheet-box" style="width: 100%; height: 757px;">
 			<tr>
 				<td style="height: 21px; width: 39px;">
-				<button class="sheet-button" type="roll" style="width: 35px; height: 34px name="attr_roll_skill_backalley" value="/em @{character_name} rolls Back Alley skill [[ @{skillbackalley1}d6 ]] [[ @{skillbackalley2}d6 ]] [[ @{skillbackalley3}d6 ]]"> 
+				<button attr_roll_skill_backalley"="" class="sheet-button" style="width: 35px; height: 34px name=" type="roll" value="/em @{character_name} rolls Back Alley skill [[ @{skill_backalley1}d6 ]] [[ @{skill_backalley2}d6 ]] [[ @{skill_backalley3}d6 ]]">
 				</button></td>
 				<td style="height: 21px">
 				<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>
@@ -102,7 +102,7 @@
 			</tr>
 			<tr>
 				<td style="height: 23px; width: 39px;">
-				<button class="sheet-button" type="roll" style="width: 35px; height: 34px name="attr_roll_skill_Badge" value="/em @{character_name} rolls Badge skill [[ @{skillbadge1}d6 ]] [[ @{skillbadge2}d6 ]] [[ @{skillbadge3}d6 ]]">
+				<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></td>
 				<td style="height: 23px">
 				<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>
@@ -110,7 +110,7 @@
 			</tr>
 			<tr>
 				<td style="height: 23px; width: 39px;">
-				<button class="sheet-button" type="roll" style="width: 35px; height: 34px name="attr_roll_skill_Big_Money" value="/em @{character_name} rolls Big Money skill [[ @{skillbigmoney1}d6 ]] [[ @{skillbigmoney2}d6 ]] [[ @{skillbigmoney3}d6 ]]">
+				<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></td>
 				<td style="height: 23px">
 				<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>
@@ -118,7 +118,7 @@
 			</tr>
 			<tr>
 				<td style="height: 23px; width: 39px;">
-				<button class="sheet-button" type="roll" style="width: 35px; height: 34px name="attr_roll_skill_Bone_Breaker" value="/em @{character_name} rolls Bone Breaker skill [[ @{skillbonebreaker1}d6 ]] [[ @{skillbonebreaker2}d6 ]] [[ @{skillbonebreaker3}d6 ]] + @{upgrades18}">
+				<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></td>
 				<td style="height: 23px">
 				<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>
@@ -126,7 +126,7 @@
 			</tr>
 			<tr>
 				<td style="height: 23px; width: 39px;">
-				<button class="sheet-button" type="roll" style="width: 35px; height: 34px name="attr_roll_skill_connections" value="/em @{character_name} rolls Connections skill [[ @{skillconnection1}d6 ]] [[ @{skillconnection2}d6 ]] [[ @{skillconnection3}d6 ]]">
+				<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 ]]">
 				</button></td>
 				<td style="height: 23px">
 				<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>
@@ -134,7 +134,7 @@
 			</tr>
 			<tr>
 				<td style="height: 23px; width: 39px;">
-				<button class="sheet-button" type="roll" style="width: 35px; height: 34px name="attr_roll_skill_credibility" value="/em @{character_name} rolls Credibility skill [[ @{skillcredibility1}d6 ]] [[ @{skillcredibility2}d6 ]] [[ @{skillcredibility3}d6 ]]">
+				<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></td>
 				<td style="height: 23px">
 				<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>
@@ -142,7 +142,7 @@
 			</tr>
 			<tr>
 				<td style="height: 23px; width: 39px;">
-				<button class="sheet-button" type="roll" style="width: 35px; height: 34px name="attr_roll_skill_deals" value="/em @{character_name} rolls Deals skill [[ @{skilldeals1}d6 ]] [[ @{skilldeals2}d6 ]] [[ @{skilldeals3}d6 ]] + @{upgrades9}">
+				<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></td>
 				<td style="height: 23px">
 				<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>
@@ -150,7 +150,7 @@
 			</tr>
 			<tr>
 				<td style="height: 23px; width: 39px;">
-				<button class="sheet-button" type="roll" style="width: 35px; height: 34px name="attr_roll_detective" value="/em @{character_name} rolls Detective skill [[ @{skilldetective1}d6 ]] [[ @{skilldetective2}d6 ]] [[ @{skilldetective3}d6 ]] + @{upgrades6}">
+				<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></td>
 				<td style="height: 23px">
 				<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>
@@ -158,7 +158,7 @@
 			</tr>
 			<tr>
 				<td style="height: 23px; width: 39px;">
-				<button class="sheet-button" type="roll" style="width: 35px; height: 34px name="attr_roll_domestic_crimes" value="/em @{character_name} rolls Domestic Crimes skill [[ @{skilldomesticcrimes1}d6 ]] [[ @{skilldomesticcrimes2}d6 ]] [[ @{skilldomesticcrimes3}d6 ]]">
+				<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></td>
 				<td style="height: 23px">
 				<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>
@@ -167,7 +167,7 @@
 			</tr>
 			<tr>
 				<td style="height: 23px; width: 39px;">
-				<button class="sheet-button" type="roll" style="width: 35px; height: 34px name="attr_roll_skill_gang" value="/em @{character_name} rolls Gang skill [[ @{skillgang1}d6 ]] [[ @{skillgang2}d6 ]] [[ @{skillgang3}d6 ]]">
+				<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></td>
 				<td style="height: 23px">
 				<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>
@@ -175,7 +175,7 @@
 			</tr>
 			<tr>
 				<td style="height: 23px; width: 39px;">
-				<button class="sheet-button" type="roll" style="width: 35px; height: 34px name="attr_roll_guns" value="/em @{character_name} rolls Guns skill [[ @{skillguns1}d6 ]] [[ @{skillguns2}d6 ]] [[ @{skillguns3}d6 ]] + @{upgrades5}">
+				<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></td>
 				<td style="height: 23px">
 				<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>
@@ -183,7 +183,7 @@
 			</tr>
 			<tr>
 				<td style="height: 24px; width: 39px;">
-				<button class="sheet-button" type="roll" style="width: 35px; height: 34px name="attr_roll_skill_hacker" value="/em @{character_name} rolls Hacker skill [[ @{skillhacker1}d6 ]] [[ @{skillhacker2}d6 ]] [[ @{skillhacker3}d6 ]] + @{upgrades2}">
+				<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></td>
 				<td style="height: 24px">
 				<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>
@@ -191,22 +191,21 @@
 			</tr>
 			<tr>
 				<td style="height: 24px; width: 39px;">
-				<button class="sheet-button" type="roll" style="width: 35px; height: 34px name="attr_roll_skill_knowhow" value="/em @{character_name} rolls Know How skill [[ @{skillknowhow1}d6 ]] [[ @{skillknowhow2}d6 ]] [[ @{skillknowhow3}d6 ]]">
+				<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></td>
 				<td style="height: 24px">
 				<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>
 				<td class="sheet-font-courriernew" style="height: 24px">Know-how&nbsp;</td>
 			</tr>
 			<tr>
-				<td class="sheet-font-courriernew" style="height: 24px; width: 39px;">
-				&nbsp;</td>
+				<td class="sheet-font-courriernew" style="height: 24px; width: 39px;">&nbsp;</td>
 				<td class="sheet-font-courriernew" style="height: 24px">&nbsp;</td>
 				<td style="height: 24px">
 				<input class="sheet-font-courriernew" name="attr_skill_knowhow_text" style="width: 139px" type="text" /></td>
 			</tr>
 			<tr>
 				<td style="height: 24px; width: 39px;">
-				<button class="sheet-button" type="roll" style="width: 35px; height: 34px name="attr_roll_skill_medic" value="/em @{character_name} rolls Medic skill [[ @{skillmedic1}d6 ]] [[ @{skillmedic2}d6 ]] [[ @{skillmedic3}d6 ]] + @{upgrades19}">
+				<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></td>
 				<td style="height: 24px">
 				<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>
@@ -214,7 +213,7 @@
 			</tr>
 			<tr>
 				<td style="height: 24px; width: 39px;">
-				<button class="sheet-button" type="roll" style="width: 35px; height: 34px name="attr_roll_military" value="/em @{character_name} rolls Military skill [[ @{skillmilitary1}d6 ]] [[ @{skillmilitary2}d6 ]] [[ @{skillmilitary3}d6 ]]">
+				<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></td>
 				<td style="height: 24px">
 				<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>
@@ -222,7 +221,7 @@
 			</tr>
 			<tr>
 				<td style="height: 24px; width: 39px;">
-				<button class="sheet-button" type="roll" style="width: 35px; height: 34px name="attr_roll_skill_runner" value="/em @{character_name} rolls runner skill [[ @{skillrunner1}d6 ]] [[ @{skillrunner2}d6 ]] [[ @{skillrunner3}d6 ]] + @{upgrades11}">
+				<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></td>
 				<td style="height: 24px">
 				<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>
@@ -230,7 +229,7 @@
 			</tr>
 			<tr>
 				<td style="height: 24px; width: 39px;">
-				<button class="sheet-button" type="roll" style="width: 35px; height: 34px name="attr_roll_skill_samurai" value="/em @{character_name} rolls Samurai skill [[ @{skillsamurai1}d6 ]] [[ @{skillsamurai2}d6 ]] [[ @{skillsamurai3}d6 ]] + @{upgrades18}">
+				<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></td>
 				<td style="height: 24px">
 				<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>
@@ -238,7 +237,7 @@
 			</tr>
 			<tr>
 				<td style="height: 24px; width: 39px;">
-				<button class="sheet-button" type="roll" style="width: 35px; height: 34px name="attr_roll_skill_shadow" value="/em @{character_name} rolls shadow skill [[ @{skillshadow1}d6 ]] [[ @{skillshadow2}d6 ]] [[ @{skillshadow3}d6 ]] + @{upgrades16}">
+				<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></td>
 				<td style="height: 24px">
 				<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>
@@ -246,7 +245,7 @@
 			</tr>
 			<tr>
 				<td style="height: 24px; width: 39px;">
-				<button class="sheet-button" type="roll" style="width: 35px; height: 34px name="attr_roll_skill_showoff" value="/em @{character_name} rolls show off skill [[ @{skillshowoff1}d6 ]] [[ @{skillshowoff2}d6 ]] [[ @{skillshowoff3}d6 ]] + @{upgrades9}">
+				<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></td>
 				<td style="height: 24px">
 				<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>
@@ -254,7 +253,7 @@
 			</tr>
 			<tr>
 				<td style="height: 24px; width: 39px;">
-				<button class="sheet-button" type="roll" style="width: 35px; height: 34px name="attr_roll_skill_technerd" value="/em @{character_name} rolls Tech Nerd skill [[ @{skilltechnerd1}d6 ]] [[ @{skilltechnerd2}d6 ]] [[ @{skilltechnerd3}d6 ]] + @{upgrades19}">
+				<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></td>
 				<td style="height: 24px">
 				<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>
@@ -262,29 +261,29 @@
 			</tr>
 			<tr>
 				<td style="height: 24px; width: 39px;">
-				<button class="sheet-button" type="roll" style="width: 35px; height: 34px name="attr_roll_skill_toughbastard" value="/em @{character_name} rolls Tough Bastard skill [[ @{skilltoughbastard1}d6 ]] [[ @{skilltoughbastard2}d6 ]] [[ @{skilltoughbastard3}d6 ]] + @{upgrades24}">
+				<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></td>
 				<td style="height: 24px">
 				<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>
 				<td class="sheet-font-courriernew" style="height: 24px">Tough Bastard</td>
 			</tr>
 			<tr>
-				<td style="width: 39px;">
-				<button class="sheet-button" type="roll" style="width: 35px; height: 34px name="attr_roll_skill_urbane" value="/em @{character_name} rolls urbane skill [[ @{skillurbane1}d6 ]] [[ @{skillurbane2}d6 ]] [[ @{skillurbane3}d6 ]]">
+				<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></td>
-				<td>
+				<td style="height: 19px">
 				<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>
-				<td class="sheet-font-courriernew">Urbane</td>
+				<td class="sheet-font-courriernew" style="height: 19px">Urbane</td>
 			</tr>
 			<tr>
 				<td style="height: 24px; width: 39px;">
-				<button class="sheet-button" type="roll" style="width: 35px; height: 34px name="attr_roll_skill_vehicles" value="/em @{character_name} rolls vehicles skill [[ @{skillvehicles1}d6 ]] [[ @{skillvehicles2}d6 ]] [[ @{skillvehicles3}d6 ]]">
+				<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></td>
 				<td style="height: 24px">
 				<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>
 				<td class="sheet-font-courriernew" style="height: 24px">Vehicles</td>
 			</tr>
-			</table>
+		</table>
 		</td>
 		<td class="sheet-top-centered" style="height: 24px">
 		<div class="sheet-auto-style1">