diff --git a/D&D_Moldvay_Natha/dndmold.htm b/D&D_Moldvay_Natha/dndmold.htm
index 32f994f97d..9e7487753a 100644
--- a/D&D_Moldvay_Natha/dndmold.htm
+++ b/D&D_Moldvay_Natha/dndmold.htm
@@ -1,4 +1,4 @@
-<!-- Sheet -->
+<!-- Sheet v1.1 2015-08-29 -->
 <div class="sheet-mainBg" style="width:832px;">
     <div class="sheet-2colrow">
         <div class="sheet-col" style="text-align:center;">
@@ -134,7 +134,7 @@
                         </div>
                         <div class="sheet-carac-roll">
                             <button type='roll'
-                            value="&{template:mold} {{name=Strength}} {{subtags=Stat Roll}} {{statroll=[[1d20cs<[[@{strength}+(?{Modifier|0})]]]]}} {{target=@{strength}}}"
+                            value="&{template:mold} {{name=Strength}} {{subtags=Stat Roll}} {{statroll=[[1d20-?{Modifier|0}]] }} {{target=[[@{strength}]] }}"
                              name='STRroll' class="sheet-carac-roll"></button>
                         </div>
                         <div class="sheet-carac-lib">
@@ -146,7 +146,7 @@
                         <div style="display: table-cell;">
                             Open Door
                             <button type='roll'
-                            value="&{template:mold} {{name=Open Door}} {{subtags=Stat Action}} {{statroll=[[1d6cs<[[2+@{STR}]]]]}} {{target=[[2+@{STR}]]}}"
+                            value="&{template:mold} {{name=Open Door}} {{subtags=Stat Action}} {{statroll=[[1d6-[[@{STR}]] ]] }} {{target=[[2]] }}"
                              name='DOORroll' class="sheet-carac-roll"></button>
                         </div>
                     </div>
@@ -156,7 +156,7 @@
                         </div>
                         <div class="sheet-carac-roll">
                             <button type='roll'
-                            value="&{template:mold} {{name=Intelligence}} {{subtags=Stat Roll}} {{statroll=[[1d20cs<[[@{intelligence}+(?{Modifier|0})]]]]}} {{target=@{intelligence}}}"
+                            value="&{template:mold} {{name=Intelligence}} {{subtags=Stat Roll}} {{statroll=[[1d20-?{Modifier|0}]] }} {{target=[[@{intelligence}]] }}"
                              name='INTroll' class="sheet-carac-roll"></button>
                         </div>
                         <div class="sheet-carac-lib">
@@ -173,7 +173,7 @@
                         </div>
                         <div class="sheet-carac-roll">
                             <button type='roll'
-                            value="&{template:mold} {{name=Wisdom}} {{subtags=Stat Roll}} {{statroll=[[1d20cs<[[@{wisdom}+(?{Modifier|0})]]]]}} {{target=@{wisdom}}}"
+                            value="&{template:mold} {{name=Wisdom}} {{subtags=Stat Roll}} {{statroll=[[1d20-?{Modifier|0}]] }} {{target=[[@{wisdom}]] }}"
                              name='WISroll' class="sheet-carac-roll"></button>
                         </div>
                         <div class="sheet-carac-lib">
@@ -192,7 +192,7 @@
                         </div>
                         <div class="sheet-carac-roll">
                             <button type='roll'
-                            value="&{template:mold} {{name=Dexterity}} {{subtags=Stat Roll}} {{statroll=[[1d20cs<[[@{dexterity}+(?{Modifier|0})]]]]}} {{target=@{dexterity}}}"
+                            value="&{template:mold} {{name=Dexterity}} {{subtags=Stat Roll}} {{statroll=[[1d20-?{Modifier|0}]] }} {{target=[[@{dexterity}]] }}"
                              name='DEXroll' class="sheet-carac-roll"></button>
                         </div>
                         <div class="sheet-carac-lib">
@@ -214,7 +214,7 @@
                         </div>
                         <div class="sheet-carac-roll">
                             <button type='roll'
-                            value="&{template:mold} {{name=Constitution}} {{subtags=Stat Roll}} {{statroll=[[1d20cs<[[@{constitution}+(?{Modifier|0})]]]]}} {{target=@{constitution}}}"
+                            value="&{template:mold} {{name=Constitution}} {{subtags=Stat Roll}} {{statroll=[[1d20-?{Modifier|0} ]] }} {{target=[[@{constitution}]]}}"
                              name='CONroll' class="sheet-carac-roll"></button>
                         </div>
                         <div class="sheet-carac-lib">
@@ -231,7 +231,7 @@
                         </div>
                         <div class="sheet-carac-roll">
                             <button type='roll'
-                            value="&{template:mold} {{name=Charisma}} {{subtags=Stat Roll}} {{statroll=[[1d20cs<[[@{charisma}+(?{Modifier|0})]]]]}} {{target=@{charisma}}}"
+                            value="&{template:mold} {{name=Charisma}} {{subtags=Stat Roll}} {{statroll=[[1d20-?{Modifier|0}]] }} {{target=[[@{charisma}]] }}"
                              name='CHAroll' class="sheet-carac-roll"></button>
                         </div>
                         <div class="sheet-carac-lib">
@@ -257,7 +257,7 @@
                         </div>
                         <div class="sheet-carac-roll">
                             <button type='roll'
-                            value="&{template:mold} {{name=Poison or Death ray}} {{subtags=Saving Throw}} {{saveroll=[[1d20cs>[[@{ST_Poison}-(?{Modifier|0})]] ]] }} {{target=@{ST_Poison}}}"
+                            value="&{template:mold} {{name=Poison or Death ray}} {{subtags=Saving Throw}} {{saveroll=[[1d20+?{Modifier|0}]] }} {{target=[[@{ST_Poison}]] }}"
                              name='JS_SOU' class="sheet-carac-roll"></button>
                         </div>
                         <div class="sheet-carac-lib">
@@ -270,7 +270,7 @@
                         </div>
                         <div class="sheet-carac-roll">
                             <button type='roll'
-                            value="&{template:mold} {{name=Magic Wand}} {{subtags=Saving Throw}} {{saveroll=[[1d20cs>[[@{ST_Wand}-@{WIS}-(?{Modifier|0})]] ]] }} {{target=@{ST_Wand}}}"
+                            value="&{template:mold} {{name=Magic Wand}} {{subtags=Saving Throw}} {{saveroll=[[1d20+?{Modifier|0}]] }} {{target=[[@{ST_Wand}]] }}"
                              name='JS_POIS' class="sheet-carac-roll"></button>
                         </div>
                         <div class="sheet-carac-lib">
@@ -283,7 +283,7 @@
                         </div>
                         <div class="sheet-carac-roll">
                             <button type='roll'
-                            value="&{template:mold} {{name=Turn to Stone or Paralysis}} {{subtags=Saving Throw}} {{saveroll=[[1d20cs>[[@{ST_Stone}-@{WIS}-(?{Modifier|0})]] ]] }} {{target=@{ST_Stone}}}"
+                            value="&{template:mold} {{name=Turn to Stone or Paralysis}} {{subtags=Saving Throw}} {{saveroll=[[1d20+?{Modifier|0} ]] }} {{target=[[@{ST_Stone}]] }}"
                              name='JS_PETRI' class="sheet-carac-roll"></button>
                         </div>
                         <div class="sheet-carac-lib">
@@ -296,7 +296,7 @@
                         </div>
                         <div class="sheet-carac-roll">
                             <button type='roll'
-                            value="&{template:mold} {{name=Dragon Breath}} {{subtags=Saving Throw}} {{saveroll=[[1d20cs>[[@{ST_Breath}-(?{Modifier|0})]] ]] }} {{target=@{ST_Breath}}}"
+                            value="&{template:mold} {{name=Dragon Breath}} {{subtags=Saving Throw}} {{saveroll=[[1d20+?{Modifier|0} ]] }} {{target=[[@{ST_Breath}]] }}"
                              name='JS_BATON' class="sheet-carac-roll"></button>
                         </div>
                         <div class="sheet-carac-lib">
@@ -309,7 +309,7 @@
                         </div>
                         <div class="sheet-carac-roll">
                             <button type='roll'
-                            value="&{template:mold} {{name=Spells or Magic Staff}} {{subtags=Saving Throw}} {{saveroll=[[1d20cs>[[@{ST_Spell}-@{WIS}-(?{Modifier|0})]] ]] }} {{target=@{ST_Spell}}}"
+                            value="&{template:mold} {{name=Spells or Magic Staff}} {{subtags=Saving Throw}} {{saveroll=[[1d20+?{Modifier|0} ]] }} {{target=[[@{ST_Spell}]] }}"
                              name='JS_SORTS' class="sheet-carac-roll"></button>
                         </div>
                         <div class="sheet-carac-lib">
@@ -406,14 +406,14 @@
             <div style="display: table-row; width: 100%;">
                 <div style="display: table-cell; text-align: left;width: 50%;">
                     <button type='roll' name="DetectRoll"
-                        value="&{template:mold} {{name=Detect Secret Doors}} {{subtags=Misc. Action}} {{talent=[[1d6cs<@{misc_detectdoor}]] }} {{target=@{misc_detectdoor}}}">
+                        value="&{template:mold} {{name=Detect Secret Doors}} {{subtags=Misc. Action}} {{talent=[[1d6]] }} {{target=[[@{misc_detectdoor}]] }}">
                     </button>
                     Detect Secret Doors (1d6 &lt;=
                     <input type="number" name="attr_misc_detectdoor" class="sheet-inMainNum"  style="width: 45px;" value="2" />)
                 </div>
                 <div style="display: table-cell; text-align: left;">
                     <button type='roll' name="TrapRoll"
-                        value="&{template:mold} {{name=Find Traps}} {{subtags=Misc. Action}} {{talent=[[1d6cs<@{misc_findtrap}]] }} {{target=@{misc_findtrap}}}">
+                        value="&{template:mold} {{name=Find Traps}} {{subtags=Misc. Action}} {{talent=[[1d6]] }} {{target=[[@{misc_findtrap}]] }}">
                     </button>
                     Find Traps (1d6 &lt;=
                     <input type="number" name="attr_misc_findtrap" class="sheet-inMainNum"  style="width: 45px;" value="2" />)
@@ -422,14 +422,14 @@
             <div style="display: table-row;">
                 <div style="display: table-cell; text-align: left;width: 50%;">
                     <button type='roll' name="ListenRoll"
-                        value="&{template:mold} {{name=Listen}} {{subtags=Misc. Action}} {{talent=[[1d6cs<@{misc_listen}]] }} {{target=@{misc_listen}}}">
+                        value="&{template:mold} {{name=Listen}} {{subtags=Misc. Action}} {{talent=[[1d6]] }} {{target=[[@{misc_listen}]] }}">
                     </button>
                     Listen (1d6 &lt;=
                     <input type="number" name="attr_misc_listen" class="sheet-inMainNum"  style="width: 45px;" value="2" />)
                 </div>
                 <div style="display: table-cell; text-align: left;">
                     <button type='roll' name="SurpriseRoll"
-                        value="&{template:mold} {{name=Surprise Check}} {{subtags=Misc. Action}} {{talent=[[1d6cs<2]]}} {{target=2}}">
+                        value="&{template:mold} {{name=Surprise Check}} {{subtags=Misc. Action}} {{talent=[[1d6]] }} {{target=[[2]] }}">
                     </button>
                     Surprise Check (1d6 &lt;= 2)
                 </div>
@@ -443,7 +443,7 @@
                         <div style="display: table-row;">
                             <div style="display: table-cell; text-align: center;width: 40px;">
                                 <button type='roll' name="Talent_@{attaque-nom}"
-                                    value="&{template:mold} {{name=@{talent-nom}}} {{subtags=Spec. abilty/Skill}} {{talent=[[@{talent-nbde}d@{talent-de}cs<@{talent-chance}]] }} {{target=@{talent-chance}}}"></button>
+                                    value="&{template:mold} {{name=@{talent-nom}}} {{subtags=Special ability or Skill}} {{talent=[[@{talent-nbde}d@{talent-de}]] }} {{target=[[@{talent-chance}]] }}"></button>
                             </div>
                             <input style="width:150px;" type="text" name="attr_talent-nom" class="sheet-inMainTxt" placeholder="Ability or Skill" />
                             &nbsp;<input type="number" name="attr_talent-nbde" class="sheet-inMainNum" style="width: 45px;" title="Nombre de d&eacute;s" value="1" />
@@ -570,21 +570,35 @@
         {{/miscroll}}
         {{#statroll}}
             <tr class="rowcolor"><td><span class="tcat">Roll: </span>{{statroll}} &lt; {{target}} </td></tr>
-            {{#rollWasCrit() statroll}}
+            {{#rollLess() statroll target}}
                     <tr><td class="subheader" style="color:green;"><b>Success!</b></td></tr>
-            {{/rollWasCrit() statroll}}
+            {{/rollLess() statroll target}}
+            {{#rollGreater() statroll target}}
+                    <tr><td class="subheader" style="color:red;"><b>Failure.</b></td></tr>
+            {{/rollGreater() statroll target}}
         {{/statroll}}
         {{#saveroll}}
             <tr class="rowcolor"><td><span class="tcat">Roll: </span>{{saveroll}} &gt; {{target}}</td></tr>
-            {{#rollWasCrit() saveroll}}
+            {{#rollLess() saveroll target}}
+                    <tr><td class="subheader" style="color:red;"><b>Failure.</b></td></tr>
+            {{/rollLess() saveroll target}}
+            {{#rollGreater() saveroll target}}
                     <tr><td class="subheader" style="color:green;"><b>Success!</b></td></tr>
-            {{/rollWasCrit() saveroll}}
+            {{/rollGreater() saveroll target}}
         {{/saveroll}}
         {{#talent}}
-            <tr class="rowcolor"><td><span class="tcat">Roll: </span>{{talent}} &lt;= {{target}}</td></tr>
-            {{#rollWasCrit() talent}}
-                    <tr><td class="subheader" style="color:green;"><b>Success!</b></td></tr>
-            {{/rollWasCrit() talent}}
+            {{#rollGreater() target 0}}
+                <tr class="rowcolor"><td><span class="tcat">Roll: </span>{{talent}} &lt;= {{target}}</td></tr>
+                {{#rollLess() talent target}}
+                        <tr><td class="subheader" style="color:green;"><b>Success!</b></td></tr>
+                {{/rollLess() talent target}}
+                {{#rollGreater() talent target}}
+                        <tr><td class="subheader" style="color:red;"><b>Failure.</b></td></tr>
+                {{/rollGreater() talent target}}
+            {{/rollGreater() target 0}}
+            {{#rollTotal() target 0}}
+                <tr class="rowcolor"><td><span class="tcat">Roll: </span>{{talent}}</td></tr>
+            {{/rollTotal() target 0}}
         {{/talent}}
         {{#attack}}
             <tr class="rowcolor"><td><span class="tcat">To Hit: </span>{{attack}}</td></tr>