diff --git a/CWOD-M20/M20.css b/CWOD-M20/M20.css
index 614507ca56..6421796b80 100644
--- a/CWOD-M20/M20.css
+++ b/CWOD-M20/M20.css
@@ -619,3 +619,82 @@ input.sheet-XPcomp + span::before{
 input.sheet-Dice{
     width: 16%;
 }
+button[type=roll].sheet-Dice::before { 
+    content: "";
+}
+select.sheet-Dice{
+    width: 150px;
+}
+
+/* Roll Template */
+.sheet-rolltemplate-generic table {
+    width: 100%;
+	background-color: #FFF;
+	border:2px solid #000;
+	border-spacing: 0;
+	border-collapse: separate;
+	border-radius: 5px;
+	-moz-box-shadow: 2px 2px 5px #000;
+	-webkit-box-shadow: 2px 2px 5px #000;
+	box-shadow:2px 2px 5px #000;
+	overflow: hidden;
+}
+.sheet-rolltemplate-generic .sheet-header {
+	background-color: #000;
+	border: 1px solid #000;
+	color: #FFF;
+	font-family:"Helvetica Neue",Helvetica,sans-serif;
+	font-size: 1.1em;
+}
+.sheet-rolltemplate-generic .sheet-header-table {
+	display:table; 
+	width:100%;
+}
+.sheet-rolltemplate-generic .sheet-header-middle {
+	display:table-cell; 
+	vertical-align:middle;
+}
+.sheet-rolltemplate-generic .sheet-subtitle {
+	background-color: #000;
+	border: 1px solid #000;
+	color: #FFF;
+	font-family: "Helvetica Neue",Helvetica,sans-serif;
+	font-size: 1em;
+	font-weight:normal !important;
+	text-align: left;
+}
+.sheet-rolltemplate-generic .sheet-header a {
+	color: #FFF;
+	text-decoration: underline;
+}
+.sheet-rolltemplate-generic td {
+	padding: 1px 1px 1px 5px;
+	line-height: 1.1em;
+	vertical-align:sub;
+}
+.sheet-rolltemplate-generic td:nth-child(odd) {
+	text-align: left;
+	font-weight:bold;
+}
+.sheet-rolltemplate-generic .inlinerollresult  {
+	color: #FFF;
+	background-color: #000;
+	border-color: #000;
+	min-width: 1em;
+	text-align: center;
+	display: inline-block;
+	margin-left: 1px;
+	padding:0px;
+}
+.sheet-rolltemplate-generic .inlinerollresult.fullcrit {
+	color: #FFF;
+	background-color: #3FB315;
+}
+.sheet-rolltemplate-generic .inlinerollresult.fullfail {
+	color: #FFF;
+	background-color: #B31515;
+}
+.sheet-rolltemplate-generic .inlinerollresult.importantroll {
+	color: #FFF;
+	background-color: #4A57ED;
+}
diff --git a/CWOD-M20/M20.html b/CWOD-M20/M20.html
index 1d4e104965..49984b1c99 100644
--- a/CWOD-M20/M20.html
+++ b/CWOD-M20/M20.html
@@ -3,7 +3,21 @@
 <input type="radio" name="attr_sheet_type" class="sheet-tab sheet-tab3" value="Backgrounds" /><span></span>
 <input type="radio" name="attr_sheet_type" class="sheet-tab sheet-tab4" value="Rotes" /><span></span>
 <input type="radio" name="attr_sheet_type" class="sheet-tab sheet-tab5" value="Experience" /><span></span>
-<button type='roll' name='roll_Roll' class="sheet-Dice" value='?{Description|Action} [[?{Number of Dice|1}d10s>?{Difficulty|6}f1]]'> Dice</button>
+<select name="attr_Whisper" class="Dice">
+	<option value="&nbsp;" selected>Rolls are public</option>
+	<option value="/w gm">Rolls whisper to GM</option>
+</select>
+<br><br>
+<button type="roll" name="roll_Roll" class="sheet-Dice" value="@{Whisper} &{template:generic} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{subtitle}} {{name=?{Description|Action}}} {{Successes=[[ ?{Number of Dice|1}d10s>6f1 ]] }}">Dice</button>
+<button type="roll" name="roll_AreteRollTop" class="sheet-Dice" value="@{Whisper} &{template:generic} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{subtitle=?{Description|Magick}}} {{name=Arete}} {{Successes=[[ ( @{Arete}+?{DP Mod|0} )d10s>?{Difficulty|6}f1 ]] }}">Arete</button>
+<button type="roll" name="roll_WillRollTop" class="sheet-Dice" value="@{Whisper} &{template:generic} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{subtitle=?{Description}}} {{name=Willpower}} {{Successes=[[ ( @{Willpower}+@{Health}+?{DP Mod|0} )d10s>?{Difficulty|6}f1 ]] }}">Willpower</button>
+<button type="roll" name="roll_DamRoll" class="sheet-Dice" value="@{Whisper} &{template:generic} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{subtitle=?{Description}}} {{name=Damage}} {{Successes=[[ ?{Number of Dice|1}d10s>6 ]] }}">Damage</button>
+<button type="roll" name="roll_SoakRoll" class="sheet-Dice" value="@{Whisper} &{template:generic} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{subtitle=?{Description}}} {{name=Soak}} {{Successes=[[ ( @{Stamina}+?{DP Mod|0} )d10s>6 ]] }}">Soak</button>
+<button type="roll" name="roll_DP1RollTop" class="sheet-Dice" value="@{Whisper} &{template:generic} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{subtitle=Die Pool 1}} {{name=?{Description|Action}}} {{Successes=[[ ( @{DPAtt1}+@{DPAbi1}+@{Health}+?{DP Mod|0} )d10s>?{Difficulty|6}f1 ]] }}">Die Pool 1</button>
+<button type="roll" name="roll_DP2RollTop" class="sheet-Dice" value="@{Whisper} &{template:generic} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{subtitle=Die Pool 2}} {{name=?{Description|Action}}} {{Successes=[[ ( @{DPAtt2}+@{DPAbi2}+@{Health}+?{DP Mod|0} )d10s>?{Difficulty|6}f1 ]] }}">Die Pool 2</button>
+<button type="roll" name="roll_DP3RollTop" class="sheet-Dice" value="@{Whisper} &{template:generic} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{subtitle=Die Pool 3}} {{name=?{Description|Action}}} {{Successes=[[ ( @{DPAtt3}+@{DPAbi3}+@{Health}+?{DP Mod|0} )d10s>?{Difficulty|6}f1 ]] }}">Die Pool 3</button>
+<button type="roll" name="roll_DP4RollTop" class="sheet-Dice" value="@{Whisper} &{template:generic} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{subtitle=Die Pool 4}} {{name=?{Description|Action}}} {{Successes=[[ ( @{DPAtt4}+@{DPAbi4}+@{Health}+?{DP Mod|0} )d10s>?{Difficulty|6}f1 ]] }}">Die Pool 4</button>
+<button type="roll" name="roll_DP5RollTop" class="sheet-Dice" value="@{Whisper} &{template:generic} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{subtitle=Die Pool 5}} {{name=?{Description|Action}}} {{Successes=[[ ( @{DPAtt5}+@{DPAbi5}+@{Health}+?{DP Mod|0} )d10s>?{Difficulty|6}f1 ]] }}">Die Pool 5</button>
 
 <div class="clear"></div>
  <!-- Primary Sheet -->
@@ -424,12 +438,12 @@
                     <input type="radio" name="attr_Abi3" value="5" /><span></span>
                 </div>
                 <div class="sheet-row">
-                    <input type="radio" name="attr_bi4" value="0" class="zero" checked/><span></span>
-                    <input type="radio" name="attr_bi4" value="1" /><span></span>
-                    <input type="radio" name="attr_bi4" value="2" /><span></span>
-                    <input type="radio" name="attr_bi4" value="3" /><span></span>
-                    <input type="radio" name="attr_bi4" value="4" /><span></span>
-                    <input type="radio" name="attr_bi4" value="5" /><span></span>
+                    <input type="radio" name="attr_Abi4" value="0" class="zero" checked/><span></span>
+                    <input type="radio" name="attr_Abi4" value="1" /><span></span>
+                    <input type="radio" name="attr_Abi4" value="2" /><span></span>
+                    <input type="radio" name="attr_Abi4" value="3" /><span></span>
+                    <input type="radio" name="attr_Abi4" value="4" /><span></span>
+                    <input type="radio" name="attr_Abi4" value="5" /><span></span>
                 </div>
             </div>
             <div class="sheet-col sheet-spec">
@@ -478,7 +492,8 @@
                     <input type="radio" name="attr_Computer" value="3" /><span></span>
                     <input type="radio" name="attr_Computer" value="4" /><span></span>
                     <input type="radio" name="attr_Computer" value="5" /><span></span>
-                </div>                <div class="sheet-row">
+                </div>
+                <div class="sheet-row">
                     <input type="radio" name="attr_Cosmology" value="0" class="zero" checked/><span></span>
                     <input type="radio" name="attr_Cosmology" value="1" /><span></span>
                     <input type="radio" name="attr_Cosmology" value="2" /><span></span>
@@ -853,7 +868,7 @@
                 <input type="radio" name="attr_Arete" value="8" /><span></span>
                 <input type="radio" name="attr_Arete" value="9" /><span></span>
                 <input type="radio" name="attr_Arete" value="10" /><span></span>
-                <button type='roll' name='roll_AreteRoll' value='Arete: ?{Effect|Magick} [[@{Arete}d10s>?{Difficulty|6}f1]]'></button>
+                <button type='roll' name='roll_AreteRoll' value="@{Whisper} &{template:generic} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{subtitle=?{Description|Magick}}} {{name=Arete}} {{Successes=[[ ( @{Arete}+?{DP Mod|0} )d10s>?{Difficulty|6}f1 ]] }}"></button>
             </div>
             <br>
             <h3 >Willpower</h3>
@@ -868,7 +883,7 @@
                 <input type="radio" name="attr_Willpower" value="8" /><span></span>
                 <input type="radio" name="attr_Willpower" value="9" /><span></span>
                 <input type="radio" name="attr_Willpower" value="10" /><span></span>
-                <button type='roll' name='roll_WillRoll' value='Willpower: ?{Description|Action} [[{(@{Willpower}+@{Health} )d10s}>?{Difficulty|6}f1]]'></button>
+                <button type='roll' name='roll_WillRoll' value="@{Whisper} &{template:generic} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{subtitle=?{Description}}} {{name=Willpower}} {{Successes=[[ ( @{Willpower}+@{Health}+?{DP Mod|0} )d10s>?{Difficulty|6}f1 ]] }}"></button>
             </div>
             <div style="padding-right: 7px">
                 <input type="radio" name="attr_Willpower_Used" value="0" class="zero" checked/><span></span>
@@ -1061,7 +1076,7 @@
                         <option value="@{Other7}">Other Trait 7</option>
                         <option value="@{Other8}">Other Trait 8</option>
                     </select>
-                    <button type='roll' name='roll_DP1Roll' class="DP" value='DP1: ?{Description|Action} [[{(@{DPAtt1}+@{DPAbi1}+@{Health} )d10s}>?{Difficulty|6}f1]]'></button>
+                    <button type='roll' name='roll_DP1Roll' class="DP" value="@{Whisper} &{template:generic} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{subtitle=Die Pool 1}} {{name=?{Description|Action}}} {{Successes=[[ ( @{DPAtt1}+@{DPAbi1}+@{Health+?{DP Mod|0}} )d10s>?{Difficulty|6}f1 ]] }}"></button>
                 </div>
                 <!-- DP2 -->
                 <div class="sheet-row">
@@ -1127,7 +1142,7 @@
                         <option value="@{Other7}">Other Trait 7</option>
                         <option value="@{Other8}">Other Trait 8</option>
                     </select>
-                    <button type='roll' name='roll_DP2Roll' class="DP" value='DP2: ?{Description|Action} [[{(@{DPAtt2}+@{DPAbi2}+@{Health} )d10s}>?{Difficulty|6}f1]]'></button>
+                    <button type='roll' name='roll_DP2Roll' class="DP" value="@{Whisper} &{template:generic} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{subtitle=Die Pool 2}} {{name=?{Description|Action}}} {{Successes=[[ ( @{DPAtt2}+@{DPAbi2}+@{Health}+?{DP Mod|0} )d10s>?{Difficulty|6}f1 ]] }}"></button>
                 </div>
                 <!-- DP3 -->
                 <div class="sheet-row">
@@ -1193,7 +1208,7 @@
                         <option value="@{Other7}">Other Trait 7</option>
                         <option value="@{Other8}">Other Trait 8</option>
                     </select>
-                    <button type='roll' name='roll_DP3Roll' class="DP" value='DP3: ?{Description|Action} [[{(@{DPAtt3}+@{DPAbi3}+@{Health} )d10s}>?{Difficulty|6}f1]]'></button>
+                    <button type='roll' name='roll_DP3Roll' class="DP" value="@{Whisper} &{template:generic} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{subtitle=Die Pool 3}} {{name=?{Description|Action}}} {{Successes=[[ ( @{DPAtt3}+@{DPAbi3}+@{Health}+?{DP Mod|0} )d10s>?{Difficulty|6}f1 ]] }}"></button>
                 </div>
                 <!-- DP4 -->
                 <div class="sheet-row">
@@ -1259,7 +1274,7 @@
                         <option value="@{Other7}">Other Trait 7</option>
                         <option value="@{Other8}">Other Trait 8</option>
                     </select>
-                    <button type='roll' name='roll_DP4Roll' class="DP" value='DP4: ?{Description|Action} [[{(@{DPAtt4}+@{DPAbi4}+@{Health} )d10s}>?{Difficulty|6}f1]]'></button>
+                    <button type='roll' name='roll_DP4Roll' class="DP" value="@{Whisper} &{template:generic} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{subtitle=Die Pool 4}} {{name=?{Description|Action}}} {{Successes=[[ ( @{DPAtt4}+@{DPAbi4}+@{Health}+?{DP Mod|0} )d10s>?{Difficulty|6}f1 ]] }}"></button>
                 </div>
                 <!-- DP5 -->
                 <div class="sheet-row">
@@ -1325,7 +1340,7 @@
                         <option value="@{Other7}">Other Trait 7</option>
                         <option value="@{Other8}">Other Trait 8</option>
                     </select>
-                    <button type='roll' name='roll_DP5Roll' class="DP" value='DP5: ?{Description|Action} [[{(@{DPAtt5}+@{DPAbi5}+@{Health} )d10s}>?{Difficulty|6}f1]]'></button>
+                    <button type='roll' name='roll_DP5Roll' class="DP" value="@{Whisper} &{template:generic} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{subtitle=Die Pool 5}} {{name=?{Description|Action}}} {{Successes=[[ ( @{DPAtt5}+@{DPAbi5}+@{Health}+?{DP Mod|0} )d10s>?{Difficulty|6}f1 ]] }}"></button>
                 </div>
             </div>
         </div>
@@ -1527,3 +1542,58 @@
         </fieldset>
     </div>
 </div>
+
+<div class="sheet-footer">
+    See wiki page for help - 
+    <input type="text" style="width:200px; border:none; cursor:help; height:1.4em;" value="https://wiki.roll20.net/Mage_20th" />
+    <br>
+    If you have comments, suggestions or questions message me - 
+    <input type="text" style="width:250px; border:none; cursor:help; height:1.4em;" value="https://app.roll20.net/users/188485/z" />
+</div>
+
+<!-- Generic Roll Templates -->
+<rolltemplate class="sheet-rolltemplate-generic">
+    <table class="sheet-rolltemplate-generic">
+        <tr>
+            <td colspan="2" class="sheet-header">
+            <div class="sheet-header-table">
+				<span class="sheet-header-middle">
+				{{#character_name}}
+				{{#character_id}}[{{character_name}}](http://journal.roll20.net/character/{{character_id}}){{/character_id}}
+				{{^character_id}}{{character_name}}{{/character_id}}
+				{{#name}}:{{/name}}
+				{{/character_name}}
+				{{#name}}
+				{{#name_link}}[{{name}}]({{name_link}}){{/name_link}}
+				{{^name_link}}{{name}}{{/name_link}}
+				{{/name}}
+				</span>
+			</div>
+            </td>
+        </tr>
+        {{#subtitle}}
+        <tr><td colspan="2" class="sheet-subtitle"><div class="sheet-header-table"><span class="sheet-header-middle">{{subtitle}}</span></div></td></tr>{{/subtitle}}
+        {{#allprops() character_name character_id name_link subtitle}}
+        <tr><td>{{key}} : {{value}}</td></tr>
+        {{/allprops() character_name character_id name_link subtitle}}
+	</table>
+</rolltemplate>
+
+<script type="text/worker">
+  // Every time the sheet is opened, this runs asychronously so it shouldn't slow anything down
+  on("sheet:opened", function() {
+    // Get the misspelled attr if it exists
+    getAttrs(['bi4'], function(attrs) {
+      var updates = {};
+      // Check if the attribute exists and is not blank
+      if(attrs.bi4 && attrs.bi4 !== '') {
+        // Copy value to new, correctly spelled attr
+        updates.Abi4 = attrs.bi4;
+        // Blank old value, so it won't get coppied next time
+        updates.bi4 = '';
+        // Push the new values to the respective attrs
+        setAttrs(updates);
+      }
+    });
+  });
+</script>