diff --git a/SavageWorlds/SavageWorlds.html b/SavageWorlds/SavageWorlds.html
index 3a2d3f7cd7..01ebd36928 100644
--- a/SavageWorlds/SavageWorlds.html
+++ b/SavageWorlds/SavageWorlds.html
@@ -18,7 +18,6 @@
                     <option value='Heroic'>Heroic</option>
                     <option value='Legendary'>Legendary</option>
                 </select>
-
                 <input type="number" name="attr_xp" /><br/>
             </td>
         </tr>
@@ -57,69 +56,69 @@
 
 		<label>Agility</label>
 		<select name="attr_agility" class="dtype" value='4'>
-                	<option value="4">d4</option>
-                	<option value="6">d6</option>
-                	<option value="8">d8</option>
-                	<option value="10">d10</option>
-                	<option value="12">d12</option>
-			<option value="12+1">d12+1</option>
-			<option value="12+2">d12+2</option>
-			<option value="12+3">d12+3</option>
-			<option value="12+4">d12+4</option>
-        	</select>
-		<button type='roll' name='roll_Agility' value='@{name} rolls an agility test [[{1d@{agility}!, 1d6!}kh1  + ?{Modifier IE: -2 or 2|0}[Modifier] - @{wound}[Wounds] - @{fatigue}[Fatigue]]]'></button><br />
+            <option value="4!">d4</option>
+            <option value="6!">d6</option>
+            <option value="8!">d8</option>
+        	<option value="10!">d10</option>
+        	<option value="12!">d12</option>
+			<option value="12!+1">d12+1</option>
+			<option value="12!+2">d12+2</option>
+			<option value="12!+3">d12+3</option>
+			<option value="12!+4">d12+4</option>
+        </select>
+		<button type='roll' name='roll_Agility' value='@{name} rolls an agility test [[{1d@{agility}, 1d6!}kh1  + ?{Modifier IE: -2 or 2|0}[Modifier] - @{wound}[Wounds] - @{fatigue}[Fatigue]]]'></button><br />
 		<label>Smarts</label>
 		<select name="attr_smarts" class="dtype" value='4'>
-                	<option value="4">d4</option>
-                	<option value="6">d6</option>
-                	<option value="8">d8</option>
-                	<option value="10">d10</option>
-                	<option value="12">d12</option>
-			<option value="12+1">d12+1</option>
-			<option value="12+2">d12+2</option>
-			<option value="12+3">d12+3</option>
-			<option value="12+4">d12+4</option>
-        	</select>
-		<button type='roll' name='roll_Smarts' value='@{name} rolls a smarts test [[{1d@{smarts}!, 1d6!}kh1  + ?{Modifier IE: -2 or 2|0}[Modifier] - @{wound}[Wounds] - @{fatigue}[Fatigue]]]'></button><br />
+            <option value="4!">d4</option>
+            <option value="6!">d6</option>
+            <option value="8!">d8</option>
+        	<option value="10!">d10</option>
+        	<option value="12!">d12</option>
+			<option value="12!+1">d12+1</option>
+			<option value="12!+2">d12+2</option>
+			<option value="12!+3">d12+3</option>
+			<option value="12!+4">d12+4</option>
+        </select>
+		<button type='roll' name='roll_Smarts' value='@{name} rolls a smarts test [[{1d@{smarts}, 1d6!}kh1  + ?{Modifier IE: -2 or 2|0}[Modifier] - @{wound}[Wounds] - @{fatigue}[Fatigue]]]'></button><br />
 		<label>Spirit</label>
 		<select name="attr_spirit" class="dtype" value='4'>
-                	<option value="4">d4</option>
-                	<option value="6">d6</option>
-                	<option value="8">d8</option>
-                	<option value="10">d10</option>
-                	<option value="12">d12</option>
-			<option value="12+1">d12+1</option>
-			<option value="12+2">d12+2</option>
-			<option value="12+3">d12+3</option>
-			<option value="12+4">d12+4</option>
-        	</select>
-		<button type='roll' name='roll_Spirit' value='@{name} rolls a spirit test [[{1d@{spirit}!, 1d6!}kh1  + ?{Modifier IE: -2 or 2|0}[Modifier] - @{wound}[Wounds] - @{fatigue}[Fatigue]]]'></button><br />
+            <option value="4!">d4</option>
+            <option value="6!">d6</option>
+        	<option value="8!">d8</option>
+        	<option value="10!">d10</option>
+        	<option value="12!">d12</option>
+			<option value="12!+1">d12+1</option>
+			<option value="12!+2">d12+2</option>
+			<option value="12!+3">d12+3</option>
+			<option value="12!+4">d12+4</option>
+        </select>
+		<button type='roll' name='roll_Spirit' value='@{name} rolls a spirit test [[{1d@{spirit}, 1d6!}kh1  + ?{Modifier IE: -2 or 2|0}[Modifier] - @{wound}[Wounds] - @{fatigue}[Fatigue]]]'></button><br />
 		<label>Strength</label>
 		<select name="attr_strength" class="dtype" value='4'>
-                	<option value="4">d4</option>
-                	<option value="6">d6</option>
-                	<option value="8">d8</option>
-                	<option value="10">d10</option>
-                	<option value="12">d12</option>
-			<option value="12+1">d12+1</option>
-			<option value="12+2">d12+2</option>
-			<option value="12+3">d12+3</option>
-			<option value="12+4">d12+4</option>
-        	</select>
-		<button type='roll' name='roll_Strength' value='@{name} rolls a strength test [[{1d@{strength}!, 1d6!}kh1  + ?{Modifier IE: -2 or 2|0}[Modifier] - @{wound}[Wounds] - @{fatigue}[Fatigue]]]'></button><br />
+            <option value="4!">d4</option>
+            <option value="6!">d6</option>
+            <option value="8!">d8</option>
+        	<option value="10!">d10</option>
+        	<option value="12!">d12</option>
+			<option value="12!+1">d12+1</option>
+			<option value="12!+2">d12+2</option>
+			<option value="12!+3">d12+3</option>
+			<option value="12!+4">d12+4</option>
+        </select>
+		<button type='roll' name='roll_Strength' value='@{name} rolls a strength test [[{1d@{strength}, 1d6!}kh1  + ?{Modifier IE: -2 or 2|0}[Modifier] - @{wound}[Wounds] - @{fatigue}[Fatigue]]]'></button><br />
 		<label>Vigor</label>
 		<select name="attr_vigor" class="dtype" value='4'>
-                	<option value="4">d4</option>
-                	<option value="6">d6</option>
-                	<option value="8">d8</option>
-                	<option value="10">d10</option>
-                	<option value="12">d12</option>
-			<option value="12+1">d12+1</option>
-			<option value="12+2">d12+2</option>
-			<option value="12+3">d12+3</option>
-			<option value="12+4">d12+4</option>
-        	</select>
-		<button type='roll' name='roll_Vigor' value='@{name} rolls a vigor test [[{1d@{vigor}!, 1d6!}kh1  + ?{Modifier IE: -2 or 2|0}[Modifier] - @{wound}[Wounds] - @{fatigue}[Fatigue]]]'></button><br />
+           <option value="4!">d4</option>
+            <option value="6!">d6</option>
+            <option value="8!">d8</option>
+        	<option value="10!">d10</option>
+        	<option value="12!">d12</option>
+			<option value="12!+1">d12+1</option>
+			<option value="12!+2">d12+2</option>
+			<option value="12!+3">d12+3</option>
+			<option value="12!+4">d12+4</option>
+        </select>
+		<button type='roll' name='roll_Vigor' value='@{name} rolls a vigor test [[{1d@{vigor}, 1d6!}kh1  + ?{Modifier IE: -2 or 2|0}[Modifier] - @{wound}[Wounds] - @{fatigue}[Fatigue]]]'></button><br />
 
 	</div>
 
@@ -143,12 +142,12 @@
                 </tr>
                 <tr>
                     <td>Parry:</td>
-                    <td><input type="number" name="attr_parry" class="sheet-short" value="(@{Fighting}/2)+2+@{parrymod}" disabled="true" /></td>
+                    <td><input type="number" name="attr_parry" class="sheet-short" value="floor(((@{Fighting})/2)+2+@{parrymod})" disabled="true" /></td>
                     <td><input type="number" name="attr_parryMod" class="sheet-short" value="0" /></td>
                 </tr>
                 <tr>
                     <td>Toughness:</td>
-                    <td><input type="number" name="attr_toughness" class="sheet-short" value="(@{Vigor}/2)+2+@{toughnessmod}+@{toughnessarmor}" disabled="true" /></td>
+                    <td><input type="number" name="attr_toughness" class="sheet-short" value="floor(((@{Vigor})/2)+2+@{toughnessmod}+@{toughnessarmor})" disabled="true" /></td>
                     <td><input type="number" name="attr_toughnessMod" class="sheet-short" value="0" /></td>
                     <td><input type="number" name="attr_toughnessArmor" class="sheet-short" value="0" /></td>
                 </tr>
@@ -167,14 +166,16 @@
         <table style='width: 100%;'>
             <thead>
                 <tr>
-                    <td style='width: 50%; text-align: center;'>Wounds</td>
-                    <td style='width: 50%; text-align: center;'>Fatigue</td>
+                    <td style='width: 25%; text-align: center;'>Wounds</td>
+                    <td style='width: 25%; text-align: center;'>Fatigue</td>
+                    <td style='width: 50%; text-align: center;'>Notes</td>
                 </tr>
             </thead>
             <tbody>
                 <tr style='width: 100%;'>
                     <td style='width: 50%; text-align: center;'><input type='number' name='attr_wound' value='0'></td>
                     <td style='width: 50%; text-align: center;'><input type='number' name='attr_fatigue' value='0'></td> 
+                    <td style='width: 50%; text-align: center;'><input type='text' name='attr_woundFatigueNotes'></td> 
                 </tr>
             </tbody>
         </table>
@@ -192,13 +193,13 @@
             <tr>
                 <td>WildCard Unskilled Test: </td>
                 <td>
-                    <button type='roll' class='sheet-MacroButtons' name='roll_WCUnskilled' value='@{name} rolls a wildcard unskilled test [[{1d?{Die Type|0}!, 1d6!}kh1-2  + ?{Modifier IE: -2 or 2|0}[Modifier] - @{wound}[Wounds] - @{fatigue}[Fatigue]]]]'></button>
+                    <button type='roll' class='sheet-MacroButtons' name='roll_WCUnskilled' value='@{name} rolls a wildcard unskilled test [[{1d4!, 1d6!}kh1-2  + ?{Modifier IE: -2 or 2|0}[Modifier] - @{wound}[Wounds] - @{fatigue}[Fatigue]]]]'></button>
                 </td>
             </tr>
             <tr>
                 <td>Melee Damage: </td>
                 <td>
-                    <button type='roll' class='sheet-MacroButtons' name='roll_MeleeDam' value='@{name} rolls melee damage! [[?{Number of Weapon Dice|1}d?{Weapon Die Size|4}! + 1d@{strength}![Strength] + ?{Modifier IE: -2 or 2)|0}[Modifier] + ?{Raise on attack roll? (1 for yes)|0}d6[Raise]]]'></button>
+                    <button type='roll' class='sheet-MacroButtons' name='roll_MeleeDam' value='@{name} rolls melee damage! [[?{Number of Weapon Dice|1}d?{Weapon Die Size|4!} + 1d@{strength}![Strength] + ?{Modifier IE: -2 or 2)|0}[Modifier] + ?{Raise on attack roll? (1 for yes)|0}d6[Raise]]]'></button>
                 </td>
             </tr>
             <tr>
@@ -210,7 +211,7 @@
             <tr>
                 <td>Strength Damage: </td>
                 <td>
-                    <button type='roll' class='sheet-MacroButtons' name='roll_StrengthDam' value='@{name} rolls strength damage! [[/roll 1d@{Strength}! + ?{Modifier IE: -2 or 2)|0}[Modifier] + ?{Raise on attack roll? (1 for yes)|0}d6[Raise]]]'></button>
+                    <button type='roll' class='sheet-MacroButtons' name='roll_StrengthDam' value='@{name} rolls strength damage! [[1d@{Strength}! + ?{Modifier IE: -2 or 2)|0}[Modifier] + ?{Raise on attack roll? (1 for yes)|0}d6[Raise]]]'></button>
                 </td>
             </tr>
             <tr>
@@ -222,7 +223,7 @@
             <tr>
                 <td>Misc Rolls (Exploding)</td>
                 <td>
-                    <button type='roll' class='sheet-MacroButtons' name='roll_MiscExp' value='@{name} rolls an exploding misc roll [[?{Number of dice|0}d?{Size of Dice|0} + ?{Modifier IE: -2 or 2)|0}[Modifier]]]'></button>
+                    <button type='roll' class='sheet-MacroButtons' name='roll_MiscExp' value='@{name} rolls an exploding misc roll [[?{Number of dice|0}d?{Size of Dice|0}! + ?{Modifier IE: -2 or 2)|0}[Modifier]]]'></button>
                 </td>
             </tr>
             <tr>
@@ -247,225 +248,225 @@
         <h5 style="margin-bottom: 5px;">Use the WildCard Unskilled Macro for untrained skills.</h5>
         <label style="width:100px;">Boating</label>
         <select name="attr_boating" class="dtype">
-                <option value="0">U</option>
-                <option value="4">d4</option>
-                <option value="6">d6</option>
-                <option value="8">d8</option>
-                <option value="10">d10</option>
-                <option value="12">d12</option>
-		<option value="12+1">d12+1</option>
-		<option value="12+2">d12+2</option>
-		<option value="12+3">d12+3</option>
-		<option value="12+4">d12+4</option>
+            <option value="0">U</option>
+            <option value="4!">d4</option>
+            <option value="6!">d6</option>
+            <option value="8!">d8</option>
+        	<option value="10!">d10</option>
+        	<option value="12!">d12</option>
+			<option value="12!+1">d12+1</option>
+			<option value="12!+2">d12+2</option>
+			<option value="12!+3">d12+3</option>
+			<option value="12!+4">d12+4</option>
         </select>
-        <button type='roll' name='roll_Boating' value='@{name} rolls a boating test [[{1d@{boating}!, 1d6!}kh1  + ?{Modifier IE: -2 or 2|0}[Modifier] - @{wound}[Wounds] - @{fatigue}[Fatigue]]]'></button><br/>
+        <button type='roll' name='roll_Boating' value='@{name} rolls a boating test [[{1d@{boating}, 1d6!}kh1  + ?{Modifier IE: -2 or 2|0}[Modifier] - @{wound}[Wounds] - @{fatigue}[Fatigue]]]'></button><br/>
         
         <label style="width:100px;">Climbing</label>
         
         <select name="attr_climbing" class="dtype">
-                <option value="0">U</option>
-                <option value="4">d4</option>
-                <option value="6">d6</option>
-                <option value="8">d8</option>
-                <option value="10">d10</option>
-                <option value="12">d12</option>
-		<option value="12+1">d12+1</option>
-		<option value="12+2">d12+2</option>
-		<option value="12+3">d12+3</option>
-		<option value="12+4">d12+4</option>
+            <option value="0">U</option>
+            <option value="4!">d4</option>
+            <option value="6!">d6</option>
+            <option value="8!">d8</option>
+            <option value="10!">d10</option>
+        	<option value="12!">d12</option>
+			<option value="12!+1">d12+1</option>
+			<option value="12!+2">d12+2</option>
+			<option value="12!+3">d12+3</option>
+			<option value="12!+4">d12+4</option>
         </select>
-        <button type='roll' name='roll_Climbing' value='@{name} rolls a climbing test [[{1d@{climbing}!, 1d6!}kh1  + ?{Modifier IE: -2 or 2|0}[Modifier] - @{wound}[Wounds] - @{fatigue}[Fatigue]]]'></button><br/>
+        <button type='roll' name='roll_Climbing' value='@{name} rolls a climbing test [[{1d@{climbing}, 1d6!}kh1  + ?{Modifier IE: -2 or 2|0}[Modifier] - @{wound}[Wounds] - @{fatigue}[Fatigue]]]'></button><br/>
 
         <label style="width:100px;">Driving</label>
         
         <select name="attr_driving" class="dtype">
-                <option value="0">U</option>
-                <option value="4">d4</option>
-                <option value="6">d6</option>
-                <option value="8">d8</option>
-                <option value="10">d10</option>
-                <option value="12">d12</option>
-		<option value="12+1">d12+1</option>
-		<option value="12+2">d12+2</option>
-		<option value="12+3">d12+3</option>
-		<option value="12+4">d12+4</option>
+            <option value="0">U</option>
+            <option value="4!">d4</option>
+            <option value="6!">d6</option>
+            <option value="8!">d8</option>
+            <option value="10!">d10</option>
+        	<option value="12!">d12</option>
+			<option value="12!+1">d12+1</option>
+			<option value="12!+2">d12+2</option>
+			<option value="12!+3">d12+3</option>
+			<option value="12!+4">d12+4</option>
         </select>
-        <button type='roll' name='roll_Driving' value='@{name} rolls a driving test [[{1d@{driving}!, 1d6!}kh1  + ?{Modifier IE: -2 or 2|0}[Modifier] - @{wound}[Wounds] - @{fatigue}[Fatigue]]]'></button><br/>
+        <button type='roll' name='roll_Driving' value='@{name} rolls a driving test [[{1d@{driving}, 1d6!}kh1  + ?{Modifier IE: -2 or 2|0}[Modifier] - @{wound}[Wounds] - @{fatigue}[Fatigue]]]'></button><br/>
 
         <label style="width:100px;">Fighting</label>
         
         <select name="attr_fighting" class="dtype">
-                <option value="0">U</option>
-                <option value="4">d4</option>
-                <option value="6">d6</option>
-                <option value="8">d8</option>
-                <option value="10">d10</option>
-                <option value="12">d12</option>
-		<option value="12+1">d12+1</option>
-		<option value="12+2">d12+2</option>
-		<option value="12+3">d12+3</option>
-		<option value="12+4">d12+4</option>
+            <option value="0">U</option>
+            <option value="4!">d4</option>
+            <option value="6!">d6</option>
+            <option value="8!">d8</option>
+            <option value="10!">d10</option>
+        	<option value="12!">d12</option>
+			<option value="12!+1">d12+1</option>
+			<option value="12!+2">d12+2</option>
+			<option value="12!+3">d12+3</option>
+			<option value="12!+4">d12+4</option>
         </select>
-        <button type='roll' name='roll_fighting' value='@{name} rolls a fighting test [[{1d@{fighting}!, 1d6!}kh1  + ?{Modifier IE: -2 or 2|0}[Modifier] - @{wound}[Wounds] - @{fatigue}[Fatigue]]]'></button><br/>
+        <button type='roll' name='roll_fighting' value='@{name} rolls a fighting test [[{1d@{fighting}, 1d6!}kh1  + ?{Modifier IE: -2 or 2|0}[Modifier] - @{wound}[Wounds] - @{fatigue}[Fatigue]]]'></button><br/>
         
         <label style="width:100px;">Gambling</label>
         
         <select name="attr_gambling" class="dtype">
-                <option value="0">U</option>
-                <option value="4">d4</option>
-                <option value="6">d6</option>
-                <option value="8">d8</option>
-                <option value="10">d10</option>
-                <option value="12">d12</option>
-		<option value="12+1">d12+1</option>
-		<option value="12+2">d12+2</option>
-		<option value="12+3">d12+3</option>
-		<option value="12+4">d12+4</option>
+            <option value="0">U</option>
+            <option value="4!">d4</option>
+            <option value="6!">d6</option>
+            <option value="8!">d8</option>
+            <option value="10!">d10</option>
+        	<option value="12!">d12</option>
+			<option value="12!+1">d12+1</option>
+			<option value="12!+2">d12+2</option>
+			<option value="12!+3">d12+3</option>
+			<option value="12!+4">d12+4</option>
         </select>
-        <button type='roll' name='roll_Gambling' value='@{name} rolls a gambling test [[{1d@{gambling}!, 1d6!}kh1  + ?{Modifier IE: -2 or 2|0}[Modifier] - @{wound}[Wounds] - @{fatigue}[Fatigue]]]'></button><br/>
+        <button type='roll' name='roll_Gambling' value='@{name} rolls a gambling test [[{1d@{gambling}, 1d6!}kh1  + ?{Modifier IE: -2 or 2|0}[Modifier] - @{wound}[Wounds] - @{fatigue}[Fatigue]]]'></button><br/>
         
         <label style="width:100px;">Healing</label>
         
         <select name="attr_healing" class="dtype">
-                <option value="0">U</option>
-                <option value="4">d4</option>
-                <option value="6">d6</option>
-                <option value="8">d8</option>
-                <option value="10">d10</option>
-                <option value="12">d12</option>
-		<option value="12+1">d12+1</option>
-		<option value="12+2">d12+2</option>
-		<option value="12+3">d12+3</option>
-		<option value="12+4">d12+4</option>
+            <option value="0">U</option>
+            <option value="4!">d4</option>
+            <option value="6!">d6</option>
+            <option value="8!">d8</option>
+            <option value="10!">d10</option>
+        	<option value="12!">d12</option>
+			<option value="12!+1">d12+1</option>
+			<option value="12!+2">d12+2</option>
+			<option value="12!+3">d12+3</option>
+			<option value="12!+4">d12+4</option>
         </select>
-        <button type='roll' name='roll_Healing' value='@{name} rolls a healing test [[{1d@{healing}!, 1d6!}kh1  + ?{Modifier IE: -2 or 2|0}[Modifier] - @{wound}[Wounds] - @{fatigue}[Fatigue]]]'></button><br/>
+        <button type='roll' name='roll_Healing' value='@{name} rolls a healing test [[{1d@{healing}, 1d6!}kh1  + ?{Modifier IE: -2 or 2|0}[Modifier] - @{wound}[Wounds] - @{fatigue}[Fatigue]]]'></button><br/>
         
         <label style="width:100px;">Intimidation</label>
         
         <select name="attr_intimidation" class="dtype">
-                <option value="0">U</option>
-                <option value="4">d4</option>
-                <option value="6">d6</option>
-                <option value="8">d8</option>
-                <option value="10">d10</option>
-                <option value="12">d12</option>
-		<option value="12+1">d12+1</option>
-		<option value="12+2">d12+2</option>
-		<option value="12+3">d12+3</option>
-		<option value="12+4">d12+4</option>
+            <option value="0">U</option>
+            <option value="4!">d4</option>
+            <option value="6!">d6</option>
+            <option value="8!">d8</option>
+            <option value="10!">d10</option>
+        	<option value="12!">d12</option>
+			<option value="12!+1">d12+1</option>
+			<option value="12!+2">d12+2</option>
+			<option value="12!+3">d12+3</option>
+			<option value="12!+4">d12+4</option>
         </select>
-        <button type='roll' name='roll_Intimidation' value='@{name} rolls an intimidation test [[{1d@{intimidation}!, 1d6!}kh1  + ?{Modifier IE: -2 or 2|0}[Modifier] - @{wound}[Wounds] - @{fatigue}[Fatigue]]]'></button><br/>
+        <button type='roll' name='roll_Intimidation' value='@{name} rolls an intimidation test [[{1d@{intimidation}, 1d6!}kh1  + ?{Modifier IE: -2 or 2|0}[Modifier] - @{wound}[Wounds] - @{fatigue}[Fatigue]]]'></button><br/>
         
         <label style="width:100px;">Investigation</label>
         
         <select name="attr_investigation" class="dtype">
-                <option value="0">U</option>
-                <option value="4">d4</option>
-                <option value="6">d6</option>
-                <option value="8">d8</option>
-                <option value="10">d10</option>
-                <option value="12">d12</option>
-		<option value="12+1">d12+1</option>
-		<option value="12+2">d12+2</option>
-		<option value="12+3">d12+3</option>
-		<option value="12+4">d12+4</option>
+            <option value="0">U</option>
+            <option value="4!">d4</option>
+            <option value="6!">d6</option>
+            <option value="8!">d8</option>
+            <option value="10!">d10</option>
+        	<option value="12!">d12</option>
+			<option value="12!+1">d12+1</option>
+			<option value="12!+2">d12+2</option>
+			<option value="12!+3">d12+3</option>
+			<option value="12!+4">d12+4</option>
         </select>
-        <button type='roll' name='roll_Investigation' value='@{name} rolls an investigation test [[{1d@{investigation}!, 1d6!}kh1  + ?{Modifier IE: -2 or 2|0}[Modifier] - @{wound}[Wounds] - @{fatigue}[Fatigue]]]'></button><br/>
+        <button type='roll' name='roll_Investigation' value='@{name} rolls an investigation test [[{1d@{investigation}, 1d6!}kh1  + ?{Modifier IE: -2 or 2|0}[Modifier] - @{wound}[Wounds] - @{fatigue}[Fatigue]]]'></button><br/>
         
         <label style="width:100px;">Lockpicking</label>
         
         <select name="attr_lockpicking" class="dtype">
-                <option value="0">U</option>
-                <option value="4">d4</option>
-                <option value="6">d6</option>
-                <option value="8">d8</option>
-                <option value="10">d10</option>
-                <option value="12">d12</option>
-		<option value="12+1">d12+1</option>
-		<option value="12+2">d12+2</option>
-		<option value="12+3">d12+3</option>
-		<option value="12+4">d12+4</option>
+            <option value="0">U</option>
+            <option value="4!">d4</option>
+            <option value="6!">d6</option>
+            <option value="8!">d8</option>
+            <option value="10!">d10</option>
+        	<option value="12!">d12</option>
+			<option value="12!+1">d12+1</option>
+			<option value="12!+2">d12+2</option>
+			<option value="12!+3">d12+3</option>
+			<option value="12!+4">d12+4</option>
         </select>
-        <button type='roll' name='roll_Lockpicking' value='@{name} rolls a lockpicking test [[{1d@{lockpicking}!, 1d6!}kh1  + ?{Modifier IE: -2 or 2|0}[Modifier] - @{wound}[Wounds] - @{fatigue}[Fatigue]]]'></button><br/>
+        <button type='roll' name='roll_Lockpicking' value='@{name} rolls a lockpicking test [[{1d@{lockpicking}, 1d6!}kh1  + ?{Modifier IE: -2 or 2|0}[Modifier] - @{wound}[Wounds] - @{fatigue}[Fatigue]]]'></button><br/>
         
         <label style="width:100px;">Notice</label>
         
         <select name="attr_notice" class="dtype">
-                <option value="0">U</option>
-                <option value="4">d4</option>
-                <option value="6">d6</option>
-                <option value="8">d8</option>
-                <option value="10">d10</option>
-                <option value="12">d12</option>
-		<option value="12+1">d12+1</option>
-		<option value="12+2">d12+2</option>
-		<option value="12+3">d12+3</option>
-		<option value="12+4">d12+4</option>
+            <option value="0">U</option>
+            <option value="4!">d4</option>
+            <option value="6!">d6</option>
+            <option value="8!">d8</option>
+            <option value="10!">d10</option>
+        	<option value="12!">d12</option>
+			<option value="12!+1">d12+1</option>
+			<option value="12!+2">d12+2</option>
+			<option value="12!+3">d12+3</option>
+			<option value="12!+4">d12+4</option>
         </select>
-        <button type='roll' name='roll_Notice' value='@{name} rolls a notice test [[{1d@{notice}!, 1d6!}kh1  + ?{Modifier IE: -2 or 2|0}[Modifier] - @{wound}[Wounds] - @{fatigue}[Fatigue]]]'></button><br/>
+        <button type='roll' name='roll_Notice' value='@{name} rolls a notice test [[{1d@{notice}, 1d6!}kh1  + ?{Modifier IE: -2 or 2|0}[Modifier] - @{wound}[Wounds] - @{fatigue}[Fatigue]]]'></button><br/>
         
         <label style="width:100px;">Persuasion</label>
         
         <select name="attr_persuasion" class="dtype">
-                <option value="0">U</option>
-                <option value="4">d4</option>
-                <option value="6">d6</option>
-                <option value="8">d8</option>
-                <option value="10">d10</option>
-                <option value="12">d12</option>
-		<option value="12+1">d12+1</option>
-		<option value="12+2">d12+2</option>
-		<option value="12+3">d12+3</option>
-		<option value="12+4">d12+4</option>
+            <option value="0">U</option>
+            <option value="4!">d4</option>
+            <option value="6!">d6</option>
+            <option value="8!">d8</option>
+            <option value="10!">d10</option>
+        	<option value="12!">d12</option>
+			<option value="12!+1">d12+1</option>
+			<option value="12!+2">d12+2</option>
+			<option value="12!+3">d12+3</option>
+			<option value="12!+4">d12+4</option>
         </select>
-        <button type='roll' name='roll_Persuasion' value='@{name} rolls a persuasion test [[{1d@{persuasion}!, 1d6!}kh1  + ?{Modifier IE: -2 or 2|0}[Modifier] - @{wound}[Wounds] - @{fatigue}[Fatigue]]]'></button><br/>
+        <button type='roll' name='roll_Persuasion' value='@{name} rolls a persuasion test [[{1d@{persuasion}, 1d6!}kh1  + ?{Modifier IE: -2 or 2|0}[Modifier] - @{wound}[Wounds] - @{fatigue}[Fatigue]]]'></button><br/>
         <label style="width:100px;">Piloting</label>
         
         <select name="attr_piloting" class="dtype">
-                <option value="0">U</option>
-                <option value="4">d4</option>
-                <option value="6">d6</option>
-                <option value="8">d8</option>
-                <option value="10">d10</option>
-                <option value="12">d12</option>
-		<option value="12+1">d12+1</option>
-		<option value="12+2">d12+2</option>
-		<option value="12+3">d12+3</option>
-		<option value="12+4">d12+4</option>
+            <option value="0">U</option>
+            <option value="4!">d4</option>
+            <option value="6!">d6</option>
+            <option value="8!">d8</option>
+            <option value="10!">d10</option>
+        	<option value="12!">d12</option>
+			<option value="12!+1">d12+1</option>
+			<option value="12!+2">d12+2</option>
+			<option value="12!+3">d12+3</option>
+			<option value="12!+4">d12+4</option>
         </select>
-        <button type='roll' name='roll_Piloting' value='@{name} rolls a piloting test [[{1d@{piloting}!, 1d6!}kh1  + ?{Modifier IE: -2 or 2|0}[Modifier] - @{wound}[Wounds] - @{fatigue}[Fatigue]]]'></button><br/>
+        <button type='roll' name='roll_Piloting' value='@{name} rolls a piloting test [[{1d@{piloting}, 1d6!}kh1  + ?{Modifier IE: -2 or 2|0}[Modifier] - @{wound}[Wounds] - @{fatigue}[Fatigue]]]'></button><br/>
         
         <label style="width:100px;">Repair</label>
         
         <select name="attr_repair" class="dtype">
-                <option value="0">U</option>
-                <option value="4">d4</option>
-                <option value="6">d6</option>
-                <option value="8">d8</option>
-                <option value="10">d10</option>
-                <option value="12">d12</option>
-		<option value="12+1">d12+1</option>
-		<option value="12+2">d12+2</option>
-		<option value="12+3">d12+3</option>
-		<option value="12+4">d12+4</option>
+            <option value="0">U</option>
+            <option value="4!">d4</option>
+            <option value="6!">d6</option>
+            <option value="8!">d8</option>
+            <option value="10!">d10</option>
+        	<option value="12!">d12</option>
+			<option value="12!+1">d12+1</option>
+			<option value="12!+2">d12+2</option>
+			<option value="12!+3">d12+3</option>
+			<option value="12!+4">d12+4</option>
         </select>
-        <button type='roll' name='roll_Repair' value='@{name} rolls a repair test [[{1d@{repair}!, 1d6!}kh1  + ?{Modifier IE: -2 or 2|0}[Modifier] - @{wound}[Wounds] - @{fatigue}[Fatigue]]]'></button><br/>
+        <button type='roll' name='roll_Repair' value='@{name} rolls a repair test [[{1d@{repair}, 1d6!}kh1  + ?{Modifier IE: -2 or 2|0}[Modifier] - @{wound}[Wounds] - @{fatigue}[Fatigue]]]'></button><br/>
         
         <label style="width:100px;">Riding</label>
         
         <select name="attr_riding" class="dtype">
-                <option value="0">U</option>
-                <option value="4">d4</option>
-                <option value="6">d6</option>
-                <option value="8">d8</option>
-                <option value="10">d10</option>
-                <option value="12">d12</option>
-		<option value="12+1">d12+1</option>
-		<option value="12+2">d12+2</option>
-		<option value="12+3">d12+3</option>
-		<option value="12+4">d12+4</option>
+            <option value="0">U</option>
+            <option value="4!">d4</option>
+            <option value="6!">d6</option>
+            <option value="8!">d8</option>
+            <option value="10!">d10</option>
+        	<option value="12!">d12</option>
+			<option value="12!+1">d12+1</option>
+			<option value="12!+2">d12+2</option>
+			<option value="12!+3">d12+3</option>
+			<option value="12!+4">d12+4</option>
         </select>
-        <button type='roll' name='roll_Riding' value='@{name} rolls a riding test [[{1d@{riding}!, 1d6!}kh1  + ?{Modifier IE: -2 or 2|0}[Modifier] - @{wound}[Wounds] - @{fatigue}[Fatigue]]]'></button><br/>
+        <button type='roll' name='roll_Riding' value='@{name} rolls a riding test [[{1d@{riding}, 1d6!}kh1  + ?{Modifier IE: -2 or 2|0}[Modifier] - @{wound}[Wounds] - @{fatigue}[Fatigue]]]'></button><br/>
     </div>
     
     <div class="sheet-col">
@@ -474,143 +475,143 @@
         <label style="width:100px;">Shooting</label>
         
         <select name="attr_shooting" class="dtype">
-                <option value="0">U</option>
-                <option value="4">d4</option>
-                <option value="6">d6</option>
-                <option value="8">d8</option>
-                <option value="10">d10</option>
-                <option value="12">d12</option>
-		<option value="12+1">d12+1</option>
-		<option value="12+2">d12+2</option>
-		<option value="12+3">d12+3</option>
-		<option value="12+4">d12+4</option>
+            <option value="0">U</option>
+            <option value="4!">d4</option>
+            <option value="6!">d6</option>
+            <option value="8!">d8</option>
+            <option value="10!">d10</option>
+        	<option value="12!">d12</option>
+			<option value="12!+1">d12+1</option>
+			<option value="12!+2">d12+2</option>
+			<option value="12!+3">d12+3</option>
+			<option value="12!+4">d12+4</option>
         </select>
-        <button type='roll' name='roll_shooting' value='@{name} rolls a shooting test [[{1d@{shooting}!, 1d6!}kh1  + ?{Modifier IE: -2 or 2|0}[Modifier] - @{wound}[Wounds] - @{fatigue}[Fatigue]]]'></button><br/>
+        <button type='roll' name='roll_shooting' value='@{name} rolls a shooting test [[{1d@{shooting}, 1d6!}kh1  + ?{Modifier IE: -2 or 2|0}[Modifier] - @{wound}[Wounds] - @{fatigue}[Fatigue]]]'></button><br/>
         
         <label style="width:100px;">Stealth</label>
         
         <select name="attr_stealth" class="dtype">
-                <option value="0">U</option>
-                <option value="4">d4</option>
-                <option value="6">d6</option>
-                <option value="8">d8</option>
-                <option value="10">d10</option>
-                <option value="12">d12</option>
-		<option value="12+1">d12+1</option>
-		<option value="12+2">d12+2</option>
-		<option value="12+3">d12+3</option>
-		<option value="12+4">d12+4</option>
+            <option value="0">U</option>
+            <option value="4!">d4</option>
+            <option value="6!">d6</option>
+            <option value="8!">d8</option>
+            <option value="10!">d10</option>
+        	<option value="12!">d12</option>
+			<option value="12!+1">d12+1</option>
+			<option value="12!+2">d12+2</option>
+			<option value="12!+3">d12+3</option>
+			<option value="12!+4">d12+4</option>
         </select>
-        <button type='roll' name='roll_Stealth' value='@{name} rolls a stealth test [[{1d@{stealth}!, 1d6!}kh1  + ?{Modifier IE: -2 or 2|0}[Modifier] - @{wound}[Wounds] - @{fatigue}[Fatigue]]]'></button><br/>
+        <button type='roll' name='roll_Stealth' value='@{name} rolls a stealth test [[{1d@{stealth}, 1d6!}kh1  + ?{Modifier IE: -2 or 2|0}[Modifier] - @{wound}[Wounds] - @{fatigue}[Fatigue]]]'></button><br/>
         
         <label style="width:100px;">Streetwise</label>
         
         <select name="attr_streetwise" class="dtype">
-                <option value="0">U</option>
-                <option value="4">d4</option>
-                <option value="6">d6</option>
-                <option value="8">d8</option>
-                <option value="10">d10</option>
-                <option value="12">d12</option>
-		<option value="12+1">d12+1</option>
-		<option value="12+2">d12+2</option>
-		<option value="12+3">d12+3</option>
-		<option value="12+4">d12+4</option>
+            <option value="0">U</option>
+            <option value="4!">d4</option>
+            <option value="6!">d6</option>
+            <option value="8!">d8</option>
+            <option value="10!">d10</option>
+        	<option value="12!">d12</option>
+			<option value="12!+1">d12+1</option>
+			<option value="12!+2">d12+2</option>
+			<option value="12!+3">d12+3</option>
+			<option value="12!+4">d12+4</option>
         </select>
-        <button type='roll' name='roll_Streetwise' value='@{name} rolls a streetwise test [[{1d@{streetwise}!, 1d6!}kh1  + ?{Modifier IE: -2 or 2|0}[Modifier] - @{wound}[Wounds] - @{fatigue}[Fatigue]]]'></button><br/>
+        <button type='roll' name='roll_Streetwise' value='@{name} rolls a streetwise test [[{1d@{streetwise}, 1d6!}kh1  + ?{Modifier IE: -2 or 2|0}[Modifier] - @{wound}[Wounds] - @{fatigue}[Fatigue]]]'></button><br/>
         
         <label style="width:100px;">Survival</label>
         
         <select name="attr_survival" class="dtype">
-                <option value="0">U</option>
-                <option value="4">d4</option>
-                <option value="6">d6</option>
-                <option value="8">d8</option>
-                <option value="10">d10</option>
-                <option value="12">d12</option>
-		<option value="12+1">d12+1</option>
-		<option value="12+2">d12+2</option>
-		<option value="12+3">d12+3</option>
-		<option value="12+4">d12+4</option>
+            <option value="0">U</option>
+            <option value="4!">d4</option>
+            <option value="6!">d6</option>
+            <option value="8!">d8</option>
+            <option value="10!">d10</option>
+        	<option value="12!">d12</option>
+			<option value="12!+1">d12+1</option>
+			<option value="12!+2">d12+2</option>
+			<option value="12!+3">d12+3</option>
+			<option value="12!+4">d12+4</option>
         </select>
-        <button type='roll' name='roll_Survival' value='@{name} rolls a survival test [[{1d@{survival}!, 1d6!}kh1  + ?{Modifier IE: -2 or 2|0}[Modifier] - @{wound}[Wounds] - @{fatigue}[Fatigue]]]'></button><br/>
+        <button type='roll' name='roll_Survival' value='@{name} rolls a survival test [[{1d@{survival}, 1d6!}kh1  + ?{Modifier IE: -2 or 2|0}[Modifier] - @{wound}[Wounds] - @{fatigue}[Fatigue]]]'></button><br/>
         
         <label style="width:100px;">Swimming</label>
         
         <select name="attr_swimming" class="dtype">
-                <option value="0">U</option>
-                <option value="4">d4</option>
-                <option value="6">d6</option>
-                <option value="8">d8</option>
-                <option value="10">d10</option>
-                <option value="12">d12</option>
-		<option value="12+1">d12+1</option>
-		<option value="12+2">d12+2</option>
-		<option value="12+3">d12+3</option>
-		<option value="12+4">d12+4</option>
+            <option value="0">U</option>
+            <option value="4!">d4</option>
+            <option value="6!">d6</option>
+            <option value="8!">d8</option>
+            <option value="10!">d10</option>
+        	<option value="12!">d12</option>
+			<option value="12!+1">d12+1</option>
+			<option value="12!+2">d12+2</option>
+			<option value="12!+3">d12+3</option>
+			<option value="12!+4">d12+4</option>
         </select>
-        <button type='roll' name='roll_Swimming' value='@{name} rolls a swimming test [[{1d@{swimming}!, 1d6!}kh1  + ?{Modifier IE: -2 or 2|0}[Modifier] - @{wound}[Wounds] - @{fatigue}[Fatigue]]]'></button><br/>
+        <button type='roll' name='roll_Swimming' value='@{name} rolls a swimming test [[{1d@{swimming}, 1d6!}kh1  + ?{Modifier IE: -2 or 2|0}[Modifier] - @{wound}[Wounds] - @{fatigue}[Fatigue]]]'></button><br/>
         
         <label style="width:100px;">Taunt</label>
         
         <select name="attr_taunt" class="dtype">
-                <option value="0">U</option>
-                <option value="4">d4</option>
-                <option value="6">d6</option>
-                <option value="8">d8</option>
-                <option value="10">d10</option>
-                <option value="12">d12</option>
-		<option value="12+1">d12+1</option>
-		<option value="12+2">d12+2</option>
-		<option value="12+3">d12+3</option>
-		<option value="12+4">d12+4</option>
+            <option value="0">U</option>
+            <option value="4!">d4</option>
+            <option value="6!">d6</option>
+            <option value="8!">d8</option>
+            <option value="10!">d10</option>
+        	<option value="12!">d12</option>
+			<option value="12!+1">d12+1</option>
+			<option value="12!+2">d12+2</option>
+			<option value="12!+3">d12+3</option>
+			<option value="12!+4">d12+4</option>
         </select>
-        <button type='roll' name='roll_Taunt' value='@{name} rolls a taunt test [[{1d@{taunt}!, 1d6!}kh1  + ?{Modifier IE: -2 or 2|0}[Modifier] - @{wound}[Wounds] - @{fatigue}[Fatigue]]]'></button><br/>
+        <button type='roll' name='roll_Taunt' value='@{name} rolls a taunt test [[{1d@{taunt}, 1d6!}kh1  + ?{Modifier IE: -2 or 2|0}[Modifier] - @{wound}[Wounds] - @{fatigue}[Fatigue]]]'></button><br/>
         
         <label style="width:100px;">Throwing</label>
         
         <select name="attr_throwing" class="dtype">
-                <option value="0">U</option>
-                <option value="4">d4</option>
-                <option value="6">d6</option>
-                <option value="8">d8</option>
-                <option value="10">d10</option>
-                <option value="12">d12</option>
-		<option value="12+1">d12+1</option>
-		<option value="12+2">d12+2</option>
-		<option value="12+3">d12+3</option>
-		<option value="12+4">d12+4</option>
+            <option value="0">U</option>
+            <option value="4!">d4</option>
+            <option value="6!">d6</option>
+            <option value="8!">d8</option>
+            <option value="10!">d10</option>
+        	<option value="12!">d12</option>
+			<option value="12!+1">d12+1</option>
+			<option value="12!+2">d12+2</option>
+			<option value="12!+3">d12+3</option>
+			<option value="12!+4">d12+4</option>
         </select>
-        <button type='roll' name='roll_Throwing' value='@{name} rolls a throwing test [[{1d@{throwing}!, 1d6!}kh1  + ?{Modifier IE: -2 or 2|0}[Modifier] - @{wound}[Wounds] - @{fatigue}[Fatigue]]]'></button><br/>
+        <button type='roll' name='roll_Throwing' value='@{name} rolls a throwing test [[{1d@{throwing}, 1d6!}kh1  + ?{Modifier IE: -2 or 2|0}[Modifier] - @{wound}[Wounds] - @{fatigue}[Fatigue]]]'></button><br/>
         
         <label style="width:100px;">Tracking</label>
         
         <select name="attr_tracking" class="dtype">
-                <option value="0">U</option>
-                <option value="4">d4</option>
-                <option value="6">d6</option>
-                <option value="8">d8</option>
-                <option value="10">d10</option>
-                <option value="12">d12</option>
-		<option value="12+1">d12+1</option>
-		<option value="12+2">d12+2</option>
-		<option value="12+3">d12+3</option>
-		<option value="12+4">d12+4</option>
+            <option value="0">U</option>
+            <option value="4!">d4</option>
+            <option value="6!">d6</option>
+            <option value="8!">d8</option>
+            <option value="10!">d10</option>
+        	<option value="12!">d12</option>
+			<option value="12!+1">d12+1</option>
+			<option value="12!+2">d12+2</option>
+			<option value="12!+3">d12+3</option>
+			<option value="12!+4">d12+4</option>
         </select>
-        <button type='roll' name='roll_Tracking' value='@{name} rolls a tracking test [[{1d@{tracking}!, 1d6!}kh1  + ?{Modifier IE: -2 or 2|0}[Modifier] - @{wound}[Wounds] - @{fatigue}[Fatigue]]]'></button><br/>
+        <button type='roll' name='roll_Tracking' value='@{name} rolls a tracking test [[{1d@{tracking}, 1d6!}kh1  + ?{Modifier IE: -2 or 2|0}[Modifier] - @{wound}[Wounds] - @{fatigue}[Fatigue]]]'></button><br/>
         
         <h3 style="margin-bottom: 10px;">Additional Skills (Knowledge etc...)</h3>
         <fieldset class="repeating_skills">
             <select name="attr_dtype" class="dtype">
-                <option value="d4">d4</option>
-                <option value="d6">d6</option>
-                <option value="d8">d8</option>
-                <option value="d10">d10</option>
-                <option value="d12">d12</option>
-        		<option value="d12+1">d12+1</option>
-        		<option value="d12+2">d12+2</option>
-        		<option value="d12+3">d12+3</option>
-        		<option value="d12+4">d12+4</option>
+            <option value="0">U</option>
+                <option value="6!">d6</option>
+                <option value="8!">d8</option>
+                <option value="10!">d10</option>
+            	<option value="12!">d12</option>
+    			<option value="12!+1">d12+1</option>
+    			<option value="12!+2">d12+2</option>
+    			<option value="12!+3">d12+3</option>
+    			<option value="12!+4">d12+4</option>
             </select>
             <input type="text" name="attr_skillname" />
         </fieldset>