diff --git a/Mongoose_Traveller/MongooseTraveller.html b/Mongoose_Traveller/MongooseTraveller.html
index d22908af36..83567471f4 100644
--- a/Mongoose_Traveller/MongooseTraveller.html
+++ b/Mongoose_Traveller/MongooseTraveller.html
@@ -33,54 +33,54 @@
                 <div class="sheet-oval"><h2>Characteristics</h2></div>
                 <table class="sheet-characteristics">
                     <tr>
-                        <td colspan="2"><button name="roll_Strength" type="roll" value="/me rolls Strength [[(2d6 + @{mod-Strength}+?{Modifier|0})]]" ><div class="sheet-button_header">Strength</div></button></td>
+                        <td colspan="2"><button name="roll_Strength" type="roll" value="&{template:default} {{name=Roll Strength}} {{result=[[(2d6 + @{mod-Strength}+?{Modifier|0})]]}}" ><div class="sheet-button_header">Strength</div></button></td>
                         <td><input type="number" class="sheet-input sheet-bold" name="attr_base-Strength" /></td>
-                        <td colspan="2"><button name="roll_Intellect" type="roll" value="/me rolls Intellect [[(2d6 + @{mod-Intellect}+?{Modifier|0})]]" ><div class="sheet-button_header">Intellect</div></button></td>
+                        <td colspan="2"><button name="roll_Intellect" type="roll" value="&{template:default} {{name=Roll Intellect}} {{result=[[(2d6 + @{mod-Intellect}+?{Modifier|0})]]}}" ><div class="sheet-button_header">Intellect</div></button></td>
                         <td><input type="number" class="sheet-input sheet-bold" name="attr_base-Intellect" /></td>
                     </tr>
                     <tr>
                         <td><div class="sheet-mod">Mod</div></td>
-                        <td><input type="number" class="sheet-input sheet-mod" name="attr_mod-Strength" /></td>
+                        <td><input type="number" class="sheet-input sheet-mod" name="attr_mod-Strength" disabled="true" value="[[round(-0.00350140056 * @{base-Strength}*@{base-Strength} + 0.4054621849 * @{base-Strength} - 2.644607843)]]"/></td>
                         <td></td>
                         <td><div class="sheet-mod">Mod</div></td>
-                        <td><input type="number" class="sheet-input sheet-mod" name="attr_mod-Intellect" /></td>
+                        <td><input type="number" class="sheet-input sheet-mod" name="attr_mod-Intellect" disabled="true" value="[[round(-0.00350140056 * @{base-Intellect}*@{base-Intellect} + 0.4054621849 * @{base-Intellect} - 2.644607843)]]"/></td>
                         <td></td>
                     </tr>
                     <tr>
-                        <td colspan="2"><button name="roll_Dexterity" type="roll" value="/me rolls Dexterity [[(2d6 + @{mod-Dexterity}+?{Modifier|0})]]" ><div class="sheet-button_header">Dexterity</div></button></td>
+                        <td colspan="2"><button name="roll_Dexterity" type="roll" value="&{template:default} {{name=Roll Dexterity}} {{result=[[(2d6 + @{mod-Dexterity}+?{Modifier|0})]]}}" ><div class="sheet-button_header">Dexterity</div></button></td>
                         <td><input type="number" class="sheet-input sheet-bold" name="attr_base-Dexterity" /></td>
-                        <td colspan="2"><button name="roll_Education" type="roll" value="/me rolls Education [[(2d6 + @{mod-Education}+?{Modifier|0})]]" ><div class="sheet-button_header">Education</div></button></td>
+                        <td colspan="2"><button name="roll_Education" type="roll" value="&{template:default} {{name=Roll Education}} {{result=[[(2d6 + @{mod-Education}+?{Modifier|0})]]}}" ><div class="sheet-button_header">Education</div></button></td>
                         <td><input type="number" class="sheet-input sheet-bold" name="attr_base-Education" /></td>
                     </tr>
                     <tr>
                         <td><div class="sheet-mod">Mod</div></td>
-                        <td><input type="number" class="sheet-input sheet-mod" name="attr_mod-Dexterity" /></td>
+                        <td><input type="number" class="sheet-input sheet-mod" name="attr_mod-Dexterity" disabled="true" value="[[round(-0.00350140056 * @{base-Dexterity}*@{base-Dexterity} + 0.4054621849 * @{base-Dexterity} - 2.644607843)]]"/></td>
                         <td></td>
                         <td><div class="sheet-mod">Mod</div></td>
-                        <td><input type="number" class="sheet-input sheet-mod" name="attr_mod-Education" /></td>
+                        <td><input type="number" class="sheet-input sheet-mod" name="attr_mod-Education" disabled="true" value="[[round(-0.00350140056 * @{base-Education}*@{base-Education} + 0.4054621849 * @{base-Education} - 2.644607843)]]"/></td>
                         <td></td>
                     </tr>
                     <tr>
-                        <td colspan="2"><button name="roll_Endurance" type="roll" value="/me rolls Endurance [[(2d6 + @{mod-Endurance}+?{Modifier|0})]]" ><div class="sheet-button_header">Endurance</div></button></td>
+                        <td colspan="2"><button name="roll_Endurance" type="roll" value="&{template:default} {{name=Roll Endurance}} {{result=[[(2d6 + @{mod-Endurance}+?{Modifier|0})]]}}" ><div class="sheet-button_header">Endurance</div></button></td>
                         <td><input type="number" class="sheet-input sheet-bold" name="attr_base-Endurance" /></td>
-                        <td colspan="2"><button name="roll_Social" type="roll" value="/me rolls Social [[(2d6 + @{mod-Social}+?{Modifier|0})]]" ><div class="sheet-button_header">Social</div></button></td>
+                        <td colspan="2"><button name="roll_Social" type="roll" value="&{template:default} {{name=Roll Social}} {{result=[[(2d6 + @{mod-Social}+?{Modifier|0})]]}}" ><div class="sheet-button_header">Social</div></button></td>
                         <td><input type="number" class="sheet-input sheet-bold" name="attr_base-Social" /></td>
                     </tr>
                     <tr>
                         <td><div class="sheet-mod">Mod</div></td>
-                        <td><input type="number" class="sheet-input sheet-mod" name="attr_mod-Endurance" /></td>
+                        <td><input type="number" class="sheet-input sheet-mod" name="attr_mod-Endurance" disabled="true" value="[[round(-0.00350140056 * @{base-Endurance}*@{base-Endurance} + 0.4054621849 * @{base-Endurance} - 2.644607843)]]"/></td>
                         <td></td>
                         <td><div class="sheet-mod">Mod</div></td>
-                        <td><input type="number" class="sheet-input sheet-mod" name="attr_mod-Social" /></td>
+                        <td><input type="number" class="sheet-input sheet-mod" name="attr_mod-Social" disabled="true" value="[[round(-0.00350140056 * @{base-Social}*@{base-Social} + 0.4054621849 * @{base-Social} - 2.644607843)]]"/></td>
                         <td></td>
                     </tr>
                     <tr>
-                        <td colspan="2"><button name="roll_PsionicStrength" type="roll" value="/me rolls Psionic Strength [[(2d6 + @{mod-PsionicStrength}+?{Modifier|0})]]" ><div class="sheet-button_header">Psionic Strength</div></button></td>
+                        <td colspan="2"><button name="roll_PsionicStrength" type="roll" value="&{template:default} {{name=Roll Psionic Strength}} {{result=[[(2d6 + @{mod-PsionicStrength}+?{Modifier|0})]]}}" ><div class="sheet-button_header">Psionic Strength</div></button></td>
                         <td><input type="number" class="sheet-input sheet-bold" name="attr_base-PsionicStrength" /></td>
                     </tr>
                     <tr>
                         <td><div class="sheet-mod">Mod</div></td>
-                        <td><input type="number" class="sheet-input sheet-mod" name="attr_mod-PsionicStrength" /></td>
+                        <td><input type="number" class="sheet-input sheet-mod" name="attr_mod-PsionicStrength" disabled="true" value="[[round(-0.00350140056 * @{base-PsionicStrength}*@{base-PsionicStrength} + 0.4054621849 * @{base-PsionicStrength} - 2.644607843)]]"/></td>
                     </tr>
                 </table>
             </div>