diff --git a/CypherSystem/CypherSystem.css b/CypherSystem/CypherSystem.css
index a315183756..dde87bf23a 100644
--- a/CypherSystem/CypherSystem.css
+++ b/CypherSystem/CypherSystem.css
@@ -26,11 +26,29 @@ input[type=radio].sheet-styleNumenera + span,
 input[type=radio].sheet-styleTheStrange + span,
 input[type=radio].sheet-styleNpc + span,
 input[type=radio].sheet-actionRoll + span,
-input[type=radio].sheet-macroRoll + span{
+input[type=radio].sheet-macroRoll + span,
+input[type=checkbox].sheet-chkUseAsset + span,
+input[type=checkbox].sheet-chkUseBonus + span,
+input[type=checkbox].sheet-chkUseCost + span
+{
     font-size:11px;
     color: #888888;
     text-align:left;
 }
+div.sheet-UseAsset,
+div.sheet-UseBonus,
+div.sheet-UseCost{
+    display: none
+}
+input[type=checkbox].sheet-chkUseAsset:checked ~ div.sheet-main div.sheet-UseAsset{
+    display: inline-block;
+}
+input[type=checkbox].sheet-chkUseBonus:checked ~ div.sheet-main div.sheet-UseBonus{
+    display: inline-block;
+}
+input[type=checkbox].sheet-chkUseCost:checked ~ div.sheet-main div.sheet-UseCost{
+    display: inline-block;
+}
 input[type=radio].sheet-styleNumenera:checked ~ .sheet-main{
     background: linear-gradient(#E1E1EE,white);
     width: 1056px;
@@ -58,17 +76,25 @@ input[type=radio].sheet-styleNpc:checked ~ .sheet-npc{
     display: inherit;
 }
 button[type=roll].sheet-btDesc{
-    font-family: inherit;
     color: inherit;
-    font-size:inherit;
     height:20px;
-    line-height: 11px;
+    width:22px;
+    line-height: 16px;
     vertical-align: middle;
     padding:none;
+    border:none;
+    margin:none;
+    background:none;
+    border-radius:10px;
+    opacity: 0.4;
 }
 button[type=roll].sheet-btDesc:before{
     content:none;
 }
+button[type=roll].sheet-btDesc:hover{
+   box-shadow: 1px 1px 1px 1px #888888;
+   opacity: 0.7;
+}
 button[type=roll].sheet-basicbt {
     padding: 2px 0px 0px 1px;
     margin: 0px 0px 0px 0px;
@@ -364,7 +390,7 @@ input[type=radio].sheet-styleTheStrange:checked ~ div.sheet-main input[type=text
 select{
     height: 20px;
     margin: 0px;
-    padding-left: 0.3em;
+    padding-left: 0em;
     padding-right: 0.2em;
     padding-top: 0.2em;
     padding-bottom: 0.1em;
diff --git a/CypherSystem/CypherSystem.htm b/CypherSystem/CypherSystem.htm
index 535e714694..8fe16bb7ab 100644
--- a/CypherSystem/CypherSystem.htm
+++ b/CypherSystem/CypherSystem.htm
@@ -4,16 +4,67 @@
 <input type="radio" name="attr_sheetStyle" value="1" class="sheet-styleNumenera" title="Numen&eacute;ra" /><span>Numen&eacute;ra</span>
 <input type="radio" name="attr_sheetStyle" value="2" class="sheet-styleTheStrange" title="The Strange"/><span>The Strange</span>
 <input type="radio" name="attr_sheetStyle" value="99" class="sheet-styleNpc" title="NPC"/><span>NPC</span>
-<div style="display:inline-block;font-size:11px;color: #888888;text-align:left;font-weight: bold;margin-left:10px;">- Rolls type:</div>
+<div style="display:inline-block;font-size:11px;color: #888888;text-align:left;font-weight: bold;margin-left:0px;">- Rolls type:</div>
 <input type="radio" name="attr_sheetRolls" value="0" class="sheet-actionRoll" checked="checked" title="Roll using the Action section parameters" /><span>Action Section</span>
 <input type="radio" name="attr_sheetRolls" value="1" class="sheet-macroRoll" title="Roll using roll queries for parameters" /><span>Roll Queries</span>
-<div style="display:inline-block;font-size:11px;color: #888888;text-align:left;margin-left:10px;">- Version 1.4 (2015-11-21)</div>
+<div style="display:inline-block;font-size:11px;color: #888888;text-align:left;font-weight: bold;margin-left:0px;">- Use:</div>
+<input type="checkbox" name="attr_sheetUseAsset" value="1" class="sheet-chkUseAsset" title="Ask for/Use assets in attributes, skills and attacks rolls"  /><span>Assets</span>
+<input type="checkbox" name="attr_sheetUseBonus" value="1" class="sheet-chkUseBonus" title="Ask for/Use roll bonus in attributes, skills and attacks rolls"  /><span>bonus</span>
+<input type="checkbox" name="attr_sheetUseCost" value="1" class="sheet-chkUseCost" title="Ask for/Use cost in attributes and skills rolls"  /><span>Costs</span>
+<div style="display:inline-block;font-size:11px;color: #888888;text-align:left;margin-left:0px;">- v1.5 (2015-12-21)</div>
+<script type="text/worker">
+    on("change:sheetusebonus", function() {
+        getAttrs(["sheetUseBonus"], function(values) {
+            if(values.sheetUseBonus == "1"){
+                setAttrs({
+                    rollQstBonus: "?{Bonus|0|1|2|-1|-2}",
+                    rollVarBonus: 0
+                });
+            } else {
+                setAttrs({
+                    rollQstBonus: 0,
+                    rollVarBonus: 0
+                });
+            };
+        });
+    });
+    on("change:sheetusecost", function() {
+        getAttrs(["sheetUseCost"], function(values) {
+            if(values.sheetUseCost == "1"){
+                setAttrs({
+                    rollQstCost: "?{Cost|0}",
+                    rollVarCost: 0
+                });
+            } else {
+                setAttrs({
+                    rollQstCost: 0,
+                    rollVarCost: 0
+                });
+            };
+        });
+    });
+    on("change:sheetuseasset", function() {
+        getAttrs(["sheetUseAsset"], function(values) {
+            if(values.sheetUseAsset == "1"){
+                setAttrs({
+                    rollQstAsset: "?{Asset|0|1|2}",
+                    rollVarAsset: 0
+                });
+            } else {
+                setAttrs({
+                    rollQstAsset: 0,
+                    rollVarAsset: 0
+                });
+            };
+        });
+    });
+</script>
 <div class="sheet-main">
     <div style="display: none;"> <!-- HIDDEN Rolls and Calculations -->
         <!-- Using the Action Section -->
         <input type="hidden" name="attr_targNum" value="@{rollVarDiff}*3" />
-        <input type="hidden" name="attr_effortCost" value="ceil((@{rollVarRollEff}+@{rollVarRollDmg})/6)+(@{rollVarRollEff}+@{rollVarRollDmg})*2" />
-        <input type="hidden" name="attr_effortSpeedCost" value="ceil((@{rollVarRollEff}+@{rollVarRollDmg})/6)+(@{rollVarRollEff}+@{rollVarRollDmg})*(2+@{armorspeedcost})" />
+        <input type="hidden" name="attr_effortCost" value="ceil((@{rollVarRollEff}+@{rollVarRollDmg})/6)+(@{rollVarRollEff}+@{rollVarRollDmg})*(2+ceil(@{damage-track}/4))" />
+        <input type="hidden" name="attr_effortSpeedCost" value="ceil((@{rollVarRollEff}+@{rollVarRollDmg})/6)+(@{rollVarRollEff}+@{rollVarRollDmg})*(2+@{armorspeedcost}+ceil(@{damage-track}/4))" />
         <input type="hidden" name="attr_totalCost" value="@{effortCost}+@{rollVarCost}" />
         <input type="hidden" name="attr_totalSpeedCost" value="@{effortSpeedCost}+@{rollVarCost}" />
         <input type="hidden" name="attr_MightCost" value="@{totalCost}-@{mightedge}" />
@@ -21,14 +72,14 @@
         <input type="hidden" name="attr_IntelCost" value="@{totalCost}-@{intellectedge}" />
         <!-- Using questions -->
         <input type="hidden" name="attr_rollQstDiff" value="?{Difficulty|0 - None/Unknown,0|1 - Simple,1|2 - Standard,2|3 - Demanding,3|4 - Difficult,4|5 - Challenging,5|6 - Intimidating,6|7 - Formidable,7|8 - Heroic,8|9 - Immortal,9|10 - Impossible,10}" />
-        <input type="hidden" name="attr_rollQstCost" value="?{Cost|0}" />
-        <input type="hidden" name="attr_rollQstBonus" value="?{Bonus|0|1|2|-1|-2}" />
+        <input type="hidden" name="attr_rollQstCost" value="0" />
+        <input type="hidden" name="attr_rollQstBonus" value="0" />
         <input type="hidden" name="attr_rollQstRollEff" value="?{Effort to Roll|0|1|2|3|4|5|6}" />
         <input type="hidden" name="attr_rollQstRollDmg" value="?{Effort to Damage|0|1|2|3|4|5|6}" />
-        <input type="hidden" name="attr_rollQstAsset" value="?{Asset|0|1|2}" />
+        <input type="hidden" name="attr_rollQstAsset" value="0" />
         <input type="hidden" name="attr_targNumQst" value="@{rollQstDiff}*3" />
-        <input type="hidden" name="attr_effortCostQst" value="ceil((@{rollQstRollEff}+@{rollQstRollDmg})/6)+(@{rollQstRollEff}+@{rollQstRollDmg})*2" />
-        <input type="hidden" name="attr_effortSpeedCostQst" value="ceil((@{rollQstRollEff}+@{rollQstRollDmg})/6)+(@{rollQstRollEff}+@{rollQstRollDmg})*(2+@{armorspeedcost})" />
+        <input type="hidden" name="attr_effortCostQst" value="ceil((@{rollQstRollEff}+@{rollQstRollDmg})/6)+(@{rollQstRollEff}+@{rollQstRollDmg})*(2+ceil(@{damage-track}/4))" />
+        <input type="hidden" name="attr_effortSpeedCostQst" value="ceil((@{rollQstRollEff}+@{rollQstRollDmg})/6)+(@{rollQstRollEff}+@{rollQstRollDmg})*(2+@{armorspeedcost}+ceil(@{damage-track}/4))" />
         <input type="hidden" name="attr_totalCostQst" value="@{effortCostQst}+@{rollQstCost}" />
         <input type="hidden" name="attr_totalSpeedCostQst" value="@{effortSpeedCostQst}+@{rollQstCost}" />
         <input type="hidden" name="attr_MightCostQst" value="@{totalCostQst}-@{mightedge}" />
@@ -36,7 +87,7 @@
         <input type="hidden" name="attr_IntelCostQst" value="@{totalCostQst}-@{intellectedge}" />
     </div> <!-- END HIDDEN Rolls and Calculations -->
     <table>
-        <!-- ******* COL 1 **************** -->
+<!-- ******* COL 1 **************** -->
         <tr>
         <td width="352px" valign="top"> <!-- COL 1 -->
             <div class="sheet-supblock"> <!--- Name -->
@@ -113,7 +164,7 @@
                                             value="&{template:cyphBasicRoll} {{charid=@{character_id}}} {{stat=might}} {{diceRoll=[[1d20cs>17cf1]]}} {{attribute=Might}} {{attrEdge=@{mightedge}}} {{bonusToRoll=[[@{rollVarBonus}]]}} {{difficulty=[[@{rollVarDiff}]]}} {{targNum=[[@{targNum}]]}} {{finalDiff=[[@{rollVarDiff}-@{rollVarAsset}-@{rollVarRollEff}]]}} {{targNumRoll=[[(@{rollVarDiff}-@{rollVarAsset}-@{rollVarRollEff})*3-(1*@{rollVarBonus})]]}} {{totalCost=[[@{MightCost}]]}} {{effortCost=[[@{effortCost}]]}} {{effortRoll=[[@{rollVarRollEff}]]}} {{effortDmg=[[@{rollVarRollDmg}]]}} {{statExpense=[[@{rollVarCost}]]}} {{assets=[[@{rollVarAsset}]]}} {{bonusDmg=[[@{rollVarRollDmg}*3]]}}"
                                             name="roll_actionMightCheck"></button>
                                         <button type="roll" class="sheet-macrobt" title="Might Roll, roll queries for parameters"
-                                            value="&{template:cyphBasicRoll} {{charid=@{character_id}}} {{stat=might}} {{diceRoll=[[1d20cs>17cf1]]}} {{attribute=Might}} {{attrEdge=@{mightedge}}} {{difficulty=[[@{rollQstDiff}]]}} {{effortRoll=[[@{rollQstRollEff}]]}} {{assets=[[@{rollQstAsset}]]}} {{bonusToRoll=[[@{rollQstBonus}]]}} {{statExpense=[[@{rollQstCost}]]}} {{effortDmg=[[@{rollQstRollDmg}]]}} {{targNum=[[@{targNumQst}]]}} {{finalDiff=[[@{rollQstDiff}-@{rollQstAsset}-@{rollQstRollEff}]]}}  {{targNumRoll=[[(@{rollQstDiff}-@{rollQstAsset}-@{rollQstRollEff})*3-(1*@{rollQstBonus})]]}} {{totalCost=[[@{MightCostQst}]]}} {{effortCost=[[@{effortCostQst}]]}} {{bonusDmg=[[@{rollQstRollDmg}*3]]}}"
+                                            value="&{template:cyphBasicRoll} {{charid=@{character_id}}} {{stat=might}} {{diceRoll=[[1d20cs>17cf1]]}} {{attribute=Might}} {{attrEdge=@{mightedge}}} {{difficulty=[[@{rollQstDiff}]]}} {{effortRoll=[[@{rollQstRollEff}]]}} {{assets=[[@{rollQstAsset}]]}} {{bonusToRoll=[[@{rollQstBonus}]]}} {{statExpense=[[@{rollQstCost}]]}} {{effortDmg=[[0]]}} {{targNum=[[@{targNumQst}]]}} {{finalDiff=[[@{rollQstDiff}-@{rollQstAsset}-@{rollQstRollEff}]]}}  {{targNumRoll=[[(@{rollQstDiff}-@{rollQstAsset}-@{rollQstRollEff})*3-(1*@{rollQstBonus})]]}} {{totalCost=[[ceil(@{rollQstRollEff}/6)+@{rollQstRollEff}*(2+ceil(@{damage-track}/4))+@{rollQstCost}-@{mightedge}]]}} {{effortCost=[[ceil(@{rollQstRollEff}/6)+@{rollQstRollEff}*(2+ceil(@{damage-track}/4))]]}} {{bonusDmg=[[0]]}}"
                                             name="roll_macroMightCheck"></button>
                                     </div>
                                 </td>
@@ -125,7 +176,7 @@
                                             value="&{template:cyphBasicRoll} {{charid=@{character_id}}} {{stat=speed}} {{diceRoll=[[1d20cs>17cf1]]}} {{attribute=Speed}} {{attrEdge=@{speededge}}} {{bonusToRoll=[[@{rollVarBonus}]]}} {{difficulty=[[@{rollVarDiff}]]}} {{targNum=[[@{targNum}]]}} {{finalDiff=[[@{rollVarDiff}-@{rollVarAsset}-@{rollVarRollEff}]]}} {{targNumRoll=[[(@{rollVarDiff}-@{rollVarAsset}-@{rollVarRollEff})*3-(1*@{rollVarBonus})]]}} {{totalCost=[[@{SpeedCost}]]}} {{effortCost=[[@{effortSpeedCost}]]}} {{effortRoll=[[@{rollVarRollEff}]]}} {{effortDmg=[[@{rollVarRollDmg}]]}} {{statExpense=[[@{rollVarCost}]]}} {{assets=[[@{rollVarAsset}]]}} {{bonusDmg=[[@{rollVarRollDmg}*3]]}}"
                                             name="roll_actionSpeedCheck"></button>
                                         <button type="roll" class="sheet-macrobt" title="Speed Roll, roll queries for parameters"
-                                            value="&{template:cyphBasicRoll} {{charid=@{character_id}}} {{stat=speed}} {{diceRoll=[[1d20cs>17cf1]]}} {{attribute=Speed}} {{attrEdge=@{speededge}}} {{difficulty=[[@{rollQstDiff}]]}} {{effortRoll=[[@{rollQstRollEff}]]}} {{assets=[[@{rollQstAsset}]]}} {{bonusToRoll=[[@{rollQstBonus}]]}} {{statExpense=[[@{rollQstCost}]]}} {{effortDmg=[[@{rollQstRollDmg}]]}} {{targNum=[[@{targNumQst}]]}} {{finalDiff=[[@{rollQstDiff}-@{rollQstAsset}-@{rollQstRollEff}]]}} {{targNumRoll=[[(@{rollQstDiff}-@{rollQstAsset}-@{rollQstRollEff})*3-(1*@{rollQstBonus})]]}} {{totalCost=[[@{SpeedCostQst}]]}} {{effortCost=[[@{effortCostQst}]]}} {{bonusDmg=[[@{rollQstRollDmg}*3]]}}"
+                                            value="&{template:cyphBasicRoll} {{charid=@{character_id}}} {{stat=speed}} {{diceRoll=[[1d20cs>17cf1]]}} {{attribute=Speed}} {{attrEdge=@{speededge}}} {{difficulty=[[@{rollQstDiff}]]}} {{effortRoll=[[@{rollQstRollEff}]]}} {{assets=[[@{rollQstAsset}]]}} {{bonusToRoll=[[@{rollQstBonus}]]}} {{statExpense=[[@{rollQstCost}]]}} {{effortDmg=[[0]]}} {{targNum=[[@{targNumQst}]]}} {{finalDiff=[[@{rollQstDiff}-@{rollQstAsset}-@{rollQstRollEff}]]}} {{targNumRoll=[[(@{rollQstDiff}-@{rollQstAsset}-@{rollQstRollEff})*3-(1*@{rollQstBonus})]]}} {{totalCost=[[ceil(@{rollQstRollEff}/6)+@{rollQstRollEff}*(2+@{armorspeedcost}+ceil(@{damage-track}/4))-@{speededge}]]}} {{effortCost=[[ceil(@{rollQstRollEff}/6)+@{rollQstRollEff}*(2+@{armorspeedcost}+ceil(@{damage-track}/4))]]}} {{bonusDmg=[[0]]}}"
                                             name="roll_macroSpeedCheck"></button>
                                     </div>
                                 </td>
@@ -137,7 +188,7 @@
                                             value="&{template:cyphBasicRoll} {{charid=@{character_id}}} {{stat=intellect}} {{diceRoll=[[1d20cs>17cf1]]}} {{attribute=Intellect}} {{attrEdge=@{intellectedge}}} {{bonusToRoll=[[@{rollVarBonus}]]}} {{difficulty=[[@{rollVarDiff}]]}} {{targNum=[[@{targNum}]]}} {{finalDiff=[[@{rollVarDiff}-@{rollVarAsset}-@{rollVarRollEff}]]}} {{targNumRoll=[[(@{rollVarDiff}-@{rollVarAsset}-@{rollVarRollEff})*3-(1*@{rollVarBonus})]]}} {{totalCost=[[@{IntelCost}]]}} {{effortCost=[[@{effortCost}]]}} {{effortRoll=[[@{rollVarRollEff}]]}} {{effortDmg=[[@{rollVarRollDmg}]]}} {{statExpense=[[@{rollVarCost}]]}} {{assets=[[@{rollVarAsset}]]}} {{bonusDmg=[[@{rollVarRollDmg}*3]]}}"
                                             name="roll_actionIntellectCheck"></button>
                                         <button type="roll" class="sheet-macrobt" title="Intellect Roll, roll queries for parameters"
-                                            value="&{template:cyphBasicRoll} {{charid=@{character_id}}} {{stat=intellect}} {{diceRoll=[[1d20cs>17cf1]]}} {{attribute=Intellect}} {{attrEdge=@{intellectedge}}} {{difficulty=[[@{rollQstDiff}]]}} {{effortRoll=[[@{rollQstRollEff}]]}} {{assets=[[@{rollQstAsset}]]}} {{bonusToRoll=[[@{rollQstBonus}]]}} {{statExpense=[[@{rollQstCost}]]}} {{effortDmg=[[@{rollQstRollDmg}]]}} {{targNum=[[@{targNumQst}]]}} {{finalDiff=[[@{rollQstDiff}-@{rollQstAsset}-@{rollQstRollEff}]]}} {{targNumRoll=[[(@{rollQstDiff}-@{rollQstAsset}-@{rollQstRollEff})*3-(1*@{rollQstBonus})]]}} {{totalCost=[[@{IntelCostQst}]]}} {{effortCost=[[@{effortCostQst}]]}} {{bonusDmg=[[@{rollQstRollDmg}*3]]}}"
+                                            value="&{template:cyphBasicRoll} {{charid=@{character_id}}} {{stat=intellect}} {{diceRoll=[[1d20cs>17cf1]]}} {{attribute=Intellect}} {{attrEdge=@{intellectedge}}} {{difficulty=[[@{rollQstDiff}]]}} {{effortRoll=[[@{rollQstRollEff}]]}} {{assets=[[@{rollQstAsset}]]}} {{bonusToRoll=[[@{rollQstBonus}]]}} {{statExpense=[[@{rollQstCost}]]}} {{effortDmg=[[0]]}} {{targNum=[[@{targNumQst}]]}} {{finalDiff=[[@{rollQstDiff}-@{rollQstAsset}-@{rollQstRollEff}]]}} {{targNumRoll=[[(@{rollQstDiff}-@{rollQstAsset}-@{rollQstRollEff})*3-(1*@{rollQstBonus})]]}} {{totalCost=[[ceil(@{rollQstRollEff}/6)+@{rollQstRollEff}*(2+ceil(@{damage-track}/4))+@{rollQstCost}-@{intellectedge}]]}} {{effortCost=[[ceil(@{rollQstRollEff}/6)+@{rollQstRollEff}*(2+ceil(@{damage-track}/4))]]}} {{bonusDmg=[[0]]}}"
                                             name="roll_macroIntellectCheck"></button>
                                     </div>
                                 </td>
@@ -213,41 +264,7 @@
                                     </SELECT>
                                 </td>
                                 <td class="sheet-text2" style="text-align: right;">
-                                    COST
-                                </td>
-                                <td style="text-align: left;">
-                                    <SELECT class="sheet-selaction" name="attr_rollVarCost" title="Extra Stat Pool cost from a Power or Ability">
-                                        <OPTION value="0" SELECTED>0</OPTION>
-                                        <OPTION value="1">1</OPTION>
-                                        <OPTION value="2">2</OPTION>
-                                        <OPTION value="3">3</OPTION>
-                                        <OPTION value="4">4</OPTION>
-                                        <OPTION value="5">5</OPTION>
-                                        <OPTION value="6">6</OPTION>
-                                        <OPTION value="7">7</OPTION>
-                                        <OPTION value="8">8</OPTION>
-                                        <OPTION value="9">9</OPTION>
-                                        <OPTION value="10">10</OPTION>
-                                        <OPTION value="11">11</OPTION>
-                                        <OPTION value="12">12</OPTION>
-                                    </SELECT>
-                                </td>
-                                <td class="sheet-text2" style="text-align: right;">
-                                    BONUS
-                                </td>
-                                <td style="text-align: left;">
-                                    <SELECT class="sheet-selaction" name="attr_rollVarBonus" title="Bonus to the ROLL (0, 1 or 2 maximum)">
-                                        <OPTION value="-2">-2</OPTION>
-                                        <OPTION value="-1">-1</OPTION>
-                                        <OPTION value="0" SELECTED>0</OPTION>
-                                        <OPTION value="1">1</OPTION>
-                                        <OPTION value="2">2</OPTION>
-                                    </SELECT>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td class="sheet-text2" style="text-align: right;">
-                                    ROLL EFFORT
+                                    ROLL EFF.
                                 </td>
                                 <td style="text-align: left;">
                                     <SELECT class="sheet-selaction" name="attr_rollVarRollEff" title="Effort to lower DIFFICULTY">
@@ -274,15 +291,55 @@
                                         <OPTION value="4">6</OPTION>
                                     </SELECT>
                                 </td>
+                            </tr>
+                            <tr>
                                 <td class="sheet-text2" style="text-align: right;">
-                                    ASSET
+                                    <div class="sheet-UseAsset">ASSET</div>
                                 </td>
                                 <td  class="sheet-text2" style="text-align: left;">
-                                    <SELECT class="sheet-selaction" name="attr_rollVarAsset"  title="Asset(s) : position, equipment etc. (0, 1 or 2 maximum)">
-                                        <OPTION value="0" SELECTED>0</OPTION>
-                                        <OPTION value="1">1</OPTION>
-                                        <OPTION value="2">2</OPTION>
-                                    </SELECT>
+                                    <div class="sheet-UseAsset">
+                                        <SELECT class="sheet-selaction" name="attr_rollVarAsset"  title="Asset(s) : position, equipment etc. (0, 1 or 2 maximum)">
+                                            <OPTION value="0" SELECTED>0</OPTION>
+                                            <OPTION value="1">1</OPTION>
+                                            <OPTION value="2">2</OPTION>
+                                        </SELECT>
+                                    </div>
+                                </td>
+                                <td class="sheet-text2" style="text-align: right;">
+                                    <div class="sheet-UseBonus">BONUS</div>
+                                </td>
+                                <td style="text-align: left;">
+                                    <div class="sheet-UseBonus">
+                                        <SELECT class="sheet-selaction" name="attr_rollVarBonus" title="Bonus to the ROLL (0, 1 or 2 maximum)">
+                                            <OPTION value="-2">-2</OPTION>
+                                            <OPTION value="-1">-1</OPTION>
+                                            <OPTION value="0" SELECTED>0</OPTION>
+                                            <OPTION value="1">1</OPTION>
+                                            <OPTION value="2">2</OPTION>
+                                        </SELECT>
+                                    </div>
+                                </td>
+                                <td class="sheet-text2" style="text-align: right;">
+                                    <div class="sheet-UseCost">COST</div>
+                                </td>
+                                <td style="text-align: left;">
+                                    <div class="sheet-UseCost">
+                                        <SELECT class="sheet-selaction" name="attr_rollVarCost" title="Extra Stat Pool cost from a Power or Ability">
+                                            <OPTION value="0" SELECTED>0</OPTION>
+                                            <OPTION value="1">1</OPTION>
+                                            <OPTION value="2">2</OPTION>
+                                            <OPTION value="3">3</OPTION>
+                                            <OPTION value="4">4</OPTION>
+                                            <OPTION value="5">5</OPTION>
+                                            <OPTION value="6">6</OPTION>
+                                            <OPTION value="7">7</OPTION>
+                                            <OPTION value="8">8</OPTION>
+                                            <OPTION value="9">9</OPTION>
+                                            <OPTION value="10">10</OPTION>
+                                            <OPTION value="11">11</OPTION>
+                                            <OPTION value="12">12</OPTION>
+                                        </SELECT>
+                                    </div>
                                 </td>
                             </tr>
                         </table>
@@ -367,13 +424,13 @@
                         <div class="sheet-text1" style="text-align: left;">SPECIAL ABILITIES</div>
                         <fieldset class="repeating_abilities">
                             <div class="sheet-text2">
-                                <button type="roll" class="sheet-btDesc" title="Show in chat" value="&{template:cyphDesc} {{name=@{abilityname}}} {{type=Special Ability}} {{use=@{abilityuse}}} {{description=@{abilitydesc}}}">Name</button>
-                                <input type="text" style="width: 190px;font-weight: bold;" name="attr_abilityname" title="Ability name"s placeholder="Name" />
-                                <select name="attr_abilityuse" style="width: 90px;" title="Eventual conditions of use of this ability: enabler, action, once a day etc.">
+                                <input type="text" style="width: 210px;font-weight: bold;" name="attr_abilityname" title="Ability name"s placeholder="Name" />
+                                <select name="attr_abilityuse" style="width: 85px;" title="Eventual conditions of use of this ability: enabler, action, once a day etc.">
                                     <option selected="selected">Action</option>
                                     <option>Enabler</option>
                                     <option>Other</option>
                                 </select>
+                                <button type="roll" name="ShowAbility" class="sheet-btDesc" title="Show in chat" value="&{template:cyphDesc} {{name=@{abilityname}}} {{type=Special Ability}} {{use=@{abilityuse}}} {{description=@{abilitydesc}}}"><img src="https://s3.amazonaws.com/files.d20.io/images/13924213/_SbpEpVjj9V7Dow_GKKYhQ/med.png?1448153028" style="width: 16px;height:16px;"/></button>
                             </div>
                             <div><textarea style="height: 46px" name="attr_abilitydesc" title="Ability description" placeholder="Description and notes"></textarea></div>
                         </fieldset>
@@ -389,7 +446,8 @@
                 </div>
             </div> <!-- END BACKGROUND -->
         </td> <!-- END COL 1 -->
-        <!-- ******* COL 2 **************** -->
+<!-- ******* COL 2 **************** -->
+    <!-- *** SKILLS *** -->
         <td width="352px" valign="top"> <!-- COL 2 -->
             <div class="sheet-supblock"> <!-- MIGHT SKILLS -->
                 <div class="sheet-blublock">
@@ -405,10 +463,10 @@
                                     <option value="2">S&nbsp;&nbsp;&nbsp;&nbsp;Specialized</option>
                                 </select>
                                 <button type="roll" class="sheet-actionbt" title="Might Skill Roll, using the Action section parameters"
-                                    value="&{template:cyphBasicRoll} {{charid=@{character_id}}} {{stat=might}} {{diceRoll=[[1d20cs>17cf1]]}} {{attribute=@{skillmightname}}} {{attrEdge=@{mightedge}}} {{bonusToRoll=[[@{rollVarBonus}]]}} {{difficulty=[[@{rollVarDiff}]]}} {{targNum=[[@{targNum}]]}} {{finalDiff=[[@{rollVarDiff}-(1*@{rollVarAsset})-(1*@{rollVarRollEff})-(1*@{skillmightlvl})]]}} {{targNumRoll=[[(3*@{rollVarDiff})-(3*@{rollVarAsset})-(3*@{rollVarRollEff})-(3*@{skillmightlvl})-(1*@{rollVarBonus})]]}} {{totalCost=[[@{MightCost}]]}} {{effortCost=[[@{effortCost}]]}} {{effortRoll=[[@{rollVarRollEff}]]}} {{effortDmg=[[@{rollVarRollDmg}]]}} {{statExpense=[[@{rollVarCost}]]}} {{assets=[[@{rollVarAsset}]]}} {{bonusDmg=[[@{rollVarRollDmg}*3]]}} {{skilled=[[@{skillmightlvl}]]}}"
+                                    value="&{template:cyphBasicRoll} {{charid=@{character_id}}} {{stat=might}} {{diceRoll=[[1d20cs>17cf1]]}} {{attribute=@{skillmightname}}} {{attrEdge=@{mightedge}}} {{bonusToRoll=[[@{rollVarBonus}]]}} {{difficulty=[[@{rollVarDiff}]]}} {{targNum=[[@{targNum}]]}} {{finalDiff=[[@{rollVarDiff}-(1*@{rollVarAsset})-(1*@{rollVarRollEff})-(1*@{skillmightlvl})]]}} {{targNumRoll=[[(3*@{rollVarDiff})-(3*@{rollVarAsset})-(3*@{rollVarRollEff})-(3*@{skillmightlvl})-(1*@{rollVarBonus})]]}} {{totalCost=[[@{MightCost}]]}} {{effortCost=[[@{effortCost}]]}} {{effortRoll=[[@{rollVarRollEff}]]}} {{effortDmg=[[0]]}} {{statExpense=[[@{rollVarCost}]]}} {{assets=[[@{rollVarAsset}]]}} {{bonusDmg=[[0]]}} {{skilled=[[@{skillmightlvl}]]}}"
                                     name="roll_actionMightSkillCheck"></button>
                                 <button type="roll" class="sheet-macrobt" title="Might Skill Roll, roll queries for parameters"
-                                    value="&{template:cyphBasicRoll} {{charid=@{character_id}}} {{stat=might}} {{diceRoll=[[1d20cs>17cf1]]}} {{attribute=@{skillmightname}}} {{attrEdge=@{mightedge}}} {{difficulty=[[@{rollQstDiff}]]}} {{effortRoll=[[@{rollQstRollEff}]]}} {{assets=[[@{rollQstAsset}]]}} {{bonusToRoll=[[@{rollQstBonus}]]}} {{statExpense=[[@{rollQstCost}]]}} {{effortDmg=[[@{rollQstRollDmg}]]}} {{targNum=[[@{targNumQst}]]}} {{finalDiff=[[@{rollQstDiff}-(1*@{rollQstAsset})-(1*@{rollQstRollEff})-(1*@{skillmightlvl})]]}} {{targNumRoll=[[(3*@{rollQstDiff})-(3*@{rollQstAsset})-(3*@{rollQstRollEff})-(3*@{skillmightlvl})-(1*@{rollQstBonus})]]}} {{totalCost=[[@{MightCostQst}]]}} {{effortCost=[[@{effortCostQst}]]}} {{bonusDmg=[[@{rollQstRollDmg}*3]]}} {{skilled=[[@{skillmightlvl}]]}}"
+                                    value="&{template:cyphBasicRoll} {{charid=@{character_id}}} {{stat=might}} {{diceRoll=[[1d20cs>17cf1]]}} {{attribute=@{skillmightname}}} {{attrEdge=@{mightedge}}} {{difficulty=[[@{rollQstDiff}]]}} {{effortRoll=[[@{rollQstRollEff}]]}} {{assets=[[@{rollQstAsset}]]}} {{bonusToRoll=[[@{rollQstBonus}]]}} {{statExpense=[[@{rollQstCost}]]}} {{effortDmg=[[0]]}} {{targNum=[[@{targNumQst}]]}} {{finalDiff=[[@{rollQstDiff}-(1*@{rollQstAsset})-(1*@{rollQstRollEff})-(1*@{skillmightlvl})]]}} {{targNumRoll=[[(3*@{rollQstDiff})-(3*@{rollQstAsset})-(3*@{rollQstRollEff})-(3*@{skillmightlvl})-(1*@{rollQstBonus})]]}} {{totalCost=[[ceil(@{rollQstRollEff}/6)+@{rollQstRollEff}*(2+ceil(@{damage-track}/4))+@{rollQstCost}-@{mightedge}]]}} {{effortCost=[[ceil(@{rollQstRollEff}/6)+@{rollQstRollEff}*(2+ceil(@{damage-track}/4))]]}} {{bonusDmg=[[0]]}} {{skilled=[[@{skillmightlvl}]]}}"
                                     name="roll_macroMightSkillCheck"></button>
                             </div>
                         </fieldset>
@@ -444,10 +502,10 @@
                                     <option value="2">S&nbsp;&nbsp;&nbsp;&nbsp;Specialized</option>
                                 </select>
                                 <button type="roll" class="sheet-actionbt" title="Speed Skill Roll, using the Action section parameters"
-                                    value="&{template:cyphBasicRoll} {{charid=@{character_id}}} {{stat=speed}} {{diceRoll=[[1d20cs>17cf1]]}} {{attribute=@{skillspeedname}}} {{attrEdge=@{speededge}}} {{bonusToRoll=[[@{rollVarBonus}]]}} {{difficulty=[[@{rollVarDiff}]]}} {{targNum=[[@{targNum}]]}} {{finalDiff=[[@{rollVarDiff}-(1*@{rollVarAsset})-(1*@{rollVarRollEff})-(1*@{skillspeedlvl})]]}} {{targNumRoll=[[(3*@{rollVarDiff})-(3*@{rollVarAsset})-(3*@{rollVarRollEff})-(3*@{skillspeedlvl})-(1*@{rollVarBonus})]]}} {{totalCost=[[@{SpeedCost}]]}} {{effortCost=[[@{effortSpeedCost}]]}} {{effortRoll=[[@{rollVarRollEff}]]}} {{effortDmg=[[@{rollVarRollDmg}]]}} {{statExpense=[[@{rollVarCost}]]}} {{assets=[[@{rollVarAsset}]]}} {{bonusDmg=[[@{rollVarRollDmg}*3]]}} {{skilled=[[@{skillspeedlvl}]]}}"
+                                    value="&{template:cyphBasicRoll} {{charid=@{character_id}}} {{stat=speed}} {{diceRoll=[[1d20cs>17cf1]]}} {{attribute=@{skillspeedname}}} {{attrEdge=@{speededge}}} {{bonusToRoll=[[@{rollVarBonus}]]}} {{difficulty=[[@{rollVarDiff}]]}} {{targNum=[[@{targNum}]]}} {{finalDiff=[[@{rollVarDiff}-(1*@{rollVarAsset})-(1*@{rollVarRollEff})-(1*@{skillspeedlvl})]]}} {{targNumRoll=[[(3*@{rollVarDiff})-(3*@{rollVarAsset})-(3*@{rollVarRollEff})-(3*@{skillspeedlvl})-(1*@{rollVarBonus})]]}} {{totalCost=[[@{SpeedCost}]]}} {{effortCost=[[@{effortSpeedCost}]]}} {{effortRoll=[[@{rollVarRollEff}]]}} {{effortDmg=[[0]]}} {{statExpense=[[@{rollVarCost}]]}} {{assets=[[@{rollVarAsset}]]}} {{bonusDmg=[[0]]}} {{skilled=[[@{skillspeedlvl}]]}}"
                                      name="roll_actionSpeedSkillCheck"></button>
                                 <button type="roll" class="sheet-macrobt" title="Speed Skill Roll, roll queries for parameters"
-                                    value="&{template:cyphBasicRoll} {{charid=@{character_id}}} {{stat=speed}} {{diceRoll=[[1d20cs>17cf1]]}} {{attribute=@{skillspeedname}}} {{attrEdge=@{speededge}}} {{difficulty=[[@{rollQstDiff}]]}} {{effortRoll=[[@{rollQstRollEff}]]}} {{assets=[[@{rollQstAsset}]]}} {{bonusToRoll=[[@{rollQstBonus}]]}} {{statExpense=[[@{rollQstCost}]]}} {{effortDmg=[[@{rollQstRollDmg}]]}} {{targNum=[[@{targNumQst}]]}} {{finalDiff=[[@{rollQstDiff}-(1*@{rollQstAsset})-(1*@{rollQstRollEff})-(1*@{skillspeedlvl})]]}} {{targNumRoll=[[(3*@{rollQstDiff})-(3*@{rollQstAsset})-(3*@{rollQstRollEff})-(3*@{skillspeedlvl})-(1*@{rollQstBonus})]]}} {{totalCost=[[@{SpeedCostQst}]]}} {{effortCost=[[@{effortSpeedCostQst}]]}} {{bonusDmg=[[@{rollQstRollDmg}*3]]}} {{skilled=[[@{skillspeedlvl}]]}}"
+                                    value="&{template:cyphBasicRoll} {{charid=@{character_id}}} {{stat=speed}} {{diceRoll=[[1d20cs>17cf1]]}} {{attribute=@{skillspeedname}}} {{attrEdge=@{speededge}}} {{difficulty=[[@{rollQstDiff}]]}} {{effortRoll=[[@{rollQstRollEff}]]}} {{assets=[[@{rollQstAsset}]]}} {{bonusToRoll=[[@{rollQstBonus}]]}} {{statExpense=[[@{rollQstCost}]]}} {{effortDmg=[[0]]}} {{targNum=[[@{targNumQst}]]}} {{finalDiff=[[@{rollQstDiff}-(1*@{rollQstAsset})-(1*@{rollQstRollEff})-(1*@{skillspeedlvl})]]}} {{targNumRoll=[[(3*@{rollQstDiff})-(3*@{rollQstAsset})-(3*@{rollQstRollEff})-(3*@{skillspeedlvl})-(1*@{rollQstBonus})]]}} {{totalCost=[[ceil(@{rollQstRollEff}/6)+@{rollQstRollEff}*(2+@{armorspeedcost}+ceil(@{damage-track}/4))-@{speededge}]]}} {{effortCost=[[ceil(@{rollQstRollEff}/6)+@{rollQstRollEff}*(2+@{armorspeedcost}+ceil(@{damage-track}/4))]]}} {{bonusDmg=[[0]]}} {{skilled=[[@{skillspeedlvl}]]}}"
                                      name="roll_macroSpeedSkillCheck"></button>
                             </div>
                         </fieldset>
@@ -468,22 +526,176 @@
                                     <option value="2">S&nbsp;&nbsp;&nbsp;&nbsp;Specialized</option>
                                 </select>
                                 <button type="roll" class="sheet-actionbt" title="Intellect Skill Roll, using the Action section parameters"
-                                    value="&{template:cyphBasicRoll} {{charid=@{character_id}}} {{stat=intellect}} {{diceRoll=[[1d20cs>17cf1]]}} {{attribute=@{skillintelname}}} {{attrEdge=@{intellectedge}}} {{bonusToRoll=[[@{rollVarBonus}]]}} {{difficulty=[[@{rollVarDiff}]]}} {{targNum=[[@{targNum}]]}} {{finalDiff=[[@{rollVarDiff}-(1*@{rollVarAsset})-(1*@{rollVarRollEff})-(1*@{skillintellvl})]]}} {{targNumRoll=[[(3*@{rollVarDiff})-(3*@{rollVarAsset})-(3*@{rollVarRollEff})-(3*@{skillintellvl})-(1*@{rollVarBonus})]]}} {{totalCost=[[@{IntelCost}]]}} {{effortCost=[[@{effortCost}]]}} {{effortRoll=[[@{rollVarRollEff}]]}} {{effortDmg=[[@{rollVarRollDmg}]]}} {{statExpense=[[@{rollVarCost}]]}} {{assets=[[@{rollVarAsset}]]}} {{bonusDmg=[[@{rollVarRollDmg}*3]]}} {{skilled=[[@{skillintellvl}]]}}"
+                                    value="&{template:cyphBasicRoll} {{charid=@{character_id}}} {{stat=intellect}} {{diceRoll=[[1d20cs>17cf1]]}} {{attribute=@{skillintelname}}} {{attrEdge=@{intellectedge}}} {{bonusToRoll=[[@{rollVarBonus}]]}} {{difficulty=[[@{rollVarDiff}]]}} {{targNum=[[@{targNum}]]}} {{finalDiff=[[@{rollVarDiff}-(1*@{rollVarAsset})-(1*@{rollVarRollEff})-(1*@{skillintellvl})]]}} {{targNumRoll=[[(3*@{rollVarDiff})-(3*@{rollVarAsset})-(3*@{rollVarRollEff})-(3*@{skillintellvl})-(1*@{rollVarBonus})]]}} {{totalCost=[[@{IntelCost}]]}} {{effortCost=[[@{effortCost}]]}} {{effortRoll=[[@{rollVarRollEff}]]}} {{effortDmg=[[0]]}} {{statExpense=[[@{rollVarCost}]]}} {{assets=[[@{rollVarAsset}]]}} {{bonusDmg=[[0]]}} {{skilled=[[@{skillintellvl}]]}}"
                                     name="roll_actionIntellectCheck"></button>
                                 <button type="roll" class="sheet-macrobt" title="Intellect Skill Roll, roll queries for parameters"
-                                    value="&{template:cyphBasicRoll} {{charid=@{character_id}}} {{stat=intellect}} {{diceRoll=[[1d20cs>17cf1]]}} {{attribute=@{skillintelname}}} {{attrEdge=@{intellectedge}}} {{difficulty=[[@{rollQstDiff}]]}} {{effortRoll=[[@{rollQstRollEff}]]}} {{assets=[[@{rollQstAsset}]]}} {{bonusToRoll=[[@{rollQstBonus}]]}} {{statExpense=[[@{rollQstCost}]]}} {{effortDmg=[[@{rollQstRollDmg}]]}} {{targNum=[[@{targNumQst}]]}} {{finalDiff=[[@{rollQstDiff}-(1*@{rollQstAsset})-(1*@{rollQstRollEff})-(1*@{skillintellvl})]]}} {{targNumRoll=[[(3*@{rollQstDiff})-(3*@{rollQstAsset})-(3*@{rollQstRollEff})-(3*@{skillintellvl})-(1*@{rollQstBonus})]]}} {{totalCost=[[@{IntelCostQst}]]}} {{effortCost=[[@{effortCostQst}]]}} {{bonusDmg=[[@{rollQstRollDmg}*3]]}} {{skilled=[[@{skillintellvl}]]}}"
+                                    value="&{template:cyphBasicRoll} {{charid=@{character_id}}} {{stat=intellect}} {{diceRoll=[[1d20cs>17cf1]]}} {{attribute=@{skillintelname}}} {{attrEdge=@{intellectedge}}} {{difficulty=[[@{rollQstDiff}]]}} {{effortRoll=[[@{rollQstRollEff}]]}} {{assets=[[@{rollQstAsset}]]}} {{bonusToRoll=[[@{rollQstBonus}]]}} {{statExpense=[[@{rollQstCost}]]}} {{effortDmg=[[0]]}} {{targNum=[[@{targNumQst}]]}} {{finalDiff=[[@{rollQstDiff}-(1*@{rollQstAsset})-(1*@{rollQstRollEff})-(1*@{skillintellvl})]]}} {{targNumRoll=[[(3*@{rollQstDiff})-(3*@{rollQstAsset})-(3*@{rollQstRollEff})-(3*@{skillintellvl})-(1*@{rollQstBonus})]]}} {{totalCost=[[ceil(@{rollQstRollEff}/6)+@{rollQstRollEff}*(2+ceil(@{damage-track}/4))+@{rollQstCost}-@{intellectedge}]]}} {{effortCost=[[ceil(@{rollQstRollEff}/6)+@{rollQstRollEff}*(2+ceil(@{damage-track}/4))]]}} {{bonusDmg=[[0]]}} {{skilled=[[@{skillintellvl}]]}}"
                                     name="roll_macroIntellectSkillCheck"></button>
                             </div>
                         </fieldset>
                     </div>
                 </div>
             </div> <!-- END INTEL SKILLS -->
-            <div class="sheet-supblock"> <!-- ATTACKS -->
+    <!-- *** ATTACKS *** -->
+            <div class="sheet-supblock"> <!-- MIGHT ATTACKS -->
+                <div class="sheet-blublock">
+                    <div class="sheet-inpblock">
+                        <div class="sheet-text1" style="text-align: left;">ATTACKS • MIGHT</div>
+                        <fieldset class="repeating_attackmight">
+                            <table style="margin-bottom: 5px;">
+                                <tr>
+                                    <td class="sheet-text1" style="text-align: left;" COLSPAN="3">
+                                        <input type="text" style="width: 100%;font-weight: bold;" name="attr_atkmightname" title="Attack: weapon or power/ability name" placeholder="Attack" />
+                                    </td>
+                                    <td class="sheet-text2" style="width: 50px;text-align: center;">
+
+                                        <button type="roll" class="sheet-actionbt" title="Might Attack Roll, using the Action section parameters"
+                                            value="&{template:cyphBasicRoll} {{charid=@{character_id}}} {{stat=might}} {{diceRoll=[[1d20cs>17cf1]]}} {{attribute=@{atkmightname}}} {{attrEdge=@{mightedge}}} {{bonusToRoll=[[@{rollVarBonus}]]}} {{difficulty=[[@{rollVarDiff}]]}} {{targNum=[[@{targNum}]]}} {{finalDiff=[[@{rollVarDiff}-(1*@{rollVarAsset})-(1*@{rollVarRollEff})-(1*@{atkmightlvl})-(1*@{atkmightmod})]]}} {{targNumRoll=[[(3*@{rollVarDiff})-(3*@{rollVarAsset})-(3*@{rollVarRollEff})-(3*@{atkmightlvl})-(3*@{atkmightmod})-(1*@{rollVarBonus})]]}} {{totalCost=[[@{effortCost}+@{atkmightcost}-@{mightedge}]]}} {{effortCost=[[@{effortCost}]]}} {{effortRoll=[[@{rollVarRollEff}]]}} {{effortDmg=[[@{rollVarRollDmg}]]}} {{statExpense=[[@{atkmightcost}]]}} {{assets=[[@{rollVarAsset}]]}} {{bonusDmg=[[@{atkmightdmg}+@{rollVarRollDmg}*3]]}} {{skilled=[[@{atkmightlvl}]]}} {{atkmod=[[@{atkmightmod}]]}}"
+                                            name="roll_actionMightAttack"></button>
+
+                                        <button type="roll" class="sheet-macrobt" title="Might Attack Roll, roll queries for parameters"
+                                            value="&{template:cyphBasicRoll} {{charid=@{character_id}}} {{stat=might}} {{diceRoll=[[1d20cs>17cf1]]}} {{attribute=@{atkmightname}}} {{attrEdge=@{mightedge}}} {{difficulty=[[@{rollQstDiff}]]}} {{effortRoll=[[@{rollQstRollEff}]]}} {{assets=[[@{rollQstAsset}]]}} {{bonusToRoll=[[@{rollQstBonus}]]}} {{statExpense=[[@{atkmightcost}]]}} {{effortDmg=[[@{rollQstRollDmg}]]}} {{targNum=[[@{targNumQst}]]}} {{finalDiff=[[@{rollQstDiff}-(1*@{rollQstAsset})-(1*@{rollQstRollEff})-(1*@{atkmightlvl})-(1*@{atkmightmod})]]}} {{targNumRoll=[[(3*@{rollQstDiff})-(3*@{rollQstAsset})-(3*@{rollQstRollEff})-(3*@{atkmightlvl})-(3*@{atkmightmod})-(1*@{rollQstBonus})]]}} {{totalCost=[[@{effortCostQst}+@{atkmightcost}-@{mightedge}]]}} {{effortCost=[[@{effortCostQst}]]}} {{bonusDmg=[[@{atkmightdmg}+@{rollQstRollDmg}*3]]}} {{skilled=[[@{atkmightlvl}]]}} {{atkmod=[[@{atkmightmod}]]}}"
+                                            name="roll_macroMightAttack"></button>
+
+                                        <button type="roll" name="ShowMightAttack" class="sheet-btDesc" title="Show in chat" value="&{template:cyphDesc} {{name=@{atkmightname}}} {{type=Attack}}  {{description=Mod:@{atkmightmod}, Damage:@{atkmightdmg}, Skilled:@{atkmightlvl}, Cost:@{atkmightcost}}}"><img src="https://s3.amazonaws.com/files.d20.io/images/13924213/_SbpEpVjj9V7Dow_GKKYhQ/med.png?1448153028" style="width: 16px;height:16px;"/></button>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td class="sheet-text2" style="width: 100%;text-align: right;">
+                                        Mod:
+                                        <input type="number" name="attr_atkmightmod" min="0" style="width:30px;" title="Reduction of the difficulty of the attack roll" value="0" />
+                                    </td>
+                                    <td class="sheet-text2" style="width: 50px;text-align: right;">
+                                        Dmg:
+                                        <input type="number" name="attr_atkmightdmg" min="0" style="width:40px;" title="Damage" value="0" />
+                                    </td>
+                                    <td class="sheet-text2" style="width: 50px;text-align: right;">
+                                        Skilled:
+                                        <select  name="attr_atkmightlvl" style="width: 40px" title="I = inability, U = untrained, T = trained, S = specialized">
+                                            <option value="-1">I&nbsp;&nbsp;&nbsp;&nbsp;Inability</option>
+                                            <option value="0" selected>U&nbsp;&nbsp;&nbsp;&nbsp;Untrained</option>
+                                            <option value="1">T&nbsp;&nbsp;&nbsp;&nbsp;Trained</option>
+                                            <option value="2">S&nbsp;&nbsp;&nbsp;&nbsp;Specialized</option>
+                                        </select>
+                                    </td>
+                                    <td class="sheet-text2" style="width: 50px;text-align: right;">
+                                        Cost:
+                                        <input type="number" name="attr_atkmightcost" min="0" style="width:30px;" title="Cost" value="0" />
+                                    </td>
+                                </tr>
+                            </table>
+                        </fieldset>
+                    </div>
+                </div>
+            </div> <!-- END MIGHT ATTACKS -->
+            <div class="sheet-supblock"> <!-- SPEED ATTACKS -->
+                <div class="sheet-blublock">
+                    <div class="sheet-inpblock">
+                        <div class="sheet-text1" style="text-align: left;">ATTACKS • SPEED</div>
+                        <fieldset class="repeating_attackspeed">
+                            <table style="margin-bottom: 5px;">
+                                <tr>
+                                    <td class="sheet-text1" style="text-align: left;" COLSPAN="3">
+                                        <input type="text" style="width: 100%;font-weight: bold;" name="attr_atkspeedname" title="Attack: weapon or power/ability name" placeholder="Attack" />
+                                    </td>
+                                    <td class="sheet-text2" style="width: 50px;text-align: center;">
+
+                                        <button type="roll" class="sheet-actionbt" title="Speed Attack Roll, using the Action section parameters"
+                                            value="&{template:cyphBasicRoll} {{charid=@{character_id}}} {{stat=speed}} {{diceRoll=[[1d20cs>17cf1]]}} {{attribute=@{atkspeedname}}} {{attrEdge=@{speededge}}} {{bonusToRoll=[[@{rollVarBonus}]]}} {{difficulty=[[@{rollVarDiff}]]}} {{targNum=[[@{targNum}]]}} {{finalDiff=[[@{rollVarDiff}-(1*@{rollVarAsset})-(1*@{rollVarRollEff})-(1*@{atkspeedlvl})-(1*@{atkspeedmod})]]}} {{targNumRoll=[[(3*@{rollVarDiff})-(3*@{rollVarAsset})-(3*@{rollVarRollEff})-(3*@{atkspeedlvl})-(3*@{atkspeedmod})-(1*@{rollVarBonus})]]}} {{totalCost=[[@{effortSpeedCost}+@{atkspeedcost}-@{speededge}]]}} {{effortCost=[[@{effortSpeedCost}]]}} {{effortRoll=[[@{rollVarRollEff}]]}} {{effortDmg=[[@{rollVarRollDmg}]]}} {{statExpense=[[@{atkspeedcost}]]}} {{assets=[[@{rollVarAsset}]]}} {{bonusDmg=[[@{atkspeeddmg}+@{rollVarRollDmg}*3]]}} {{skilled=[[@{atkspeedlvl}]]}} {{atkmod=[[@{atkspeedmod}]]}}"
+                                            name="roll_actionSpeedAttack"></button>
+
+                                        <button type="roll" class="sheet-macrobt" title="Speed Attack Roll, roll queries for parameters"
+                                            value="&{template:cyphBasicRoll} {{charid=@{character_id}}} {{stat=speed}} {{diceRoll=[[1d20cs>17cf1]]}} {{attribute=@{atkspeedname}}} {{attrEdge=@{speededge}}} {{difficulty=[[@{rollQstDiff}]]}} {{effortRoll=[[@{rollQstRollEff}]]}} {{assets=[[@{rollQstAsset}]]}} {{bonusToRoll=[[@{rollQstBonus}]]}} {{statExpense=[[@{atkspeedcost}]]}} {{effortDmg=[[@{rollQstRollDmg}]]}} {{targNum=[[@{targNumQst}]]}} {{finalDiff=[[@{rollQstDiff}-(1*@{rollQstAsset})-(1*@{rollQstRollEff})-(1*@{atkspeedlvl})-(1*@{atkspeedmod})]]}} {{targNumRoll=[[(3*@{rollQstDiff})-(3*@{rollQstAsset})-(3*@{rollQstRollEff})-(3*@{atkspeedlvl})-(3*@{atkspeedmod})-(1*@{rollQstBonus})]]}} {{totalCost=[[@{effortSpeedCostQst}+@{atkspeedcost}-@{speededge}]]}} {{effortCost=[[@{effortSpeedCostQst}]]}} {{bonusDmg=[[@{atkspeeddmg}+@{rollQstRollDmg}*3]]}} {{skilled=[[@{atkspeedlvl}]]}} {{atkmod=[[@{atkspeedmod}]]}}"
+                                            name="roll_macroSpeedAttack"></button>
+
+                                        <button type="roll" name="ShowSpeedAttack" class="sheet-btDesc" title="Show in chat" value="&{template:cyphDesc} {{name=@{atkspeedname}}} {{type=Attack}}  {{description=Mod:@{atkspeedmod}, Damage:@{atkspeeddmg}, Skilled:@{atkspeedlvl}, Cost:@{atkspeedcost}}}"><img src="https://s3.amazonaws.com/files.d20.io/images/13924213/_SbpEpVjj9V7Dow_GKKYhQ/med.png?1448153028" style="width: 16px;height:16px;"/></button>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td class="sheet-text2" style="width: 100%;text-align: right;">
+                                        Mod:
+                                        <input type="number" name="attr_atkspeedmod" min="0" style="width:30px;" title="Reduction of the difficulty of the attack roll" value="0" />
+                                    </td>
+                                    <td class="sheet-text2" style="width: 50px;text-align: right;">
+                                        Dmg:
+                                        <input type="number" name="attr_atkspeeddmg" min="0" style="width:40px;" title="Damage" value="0" />
+                                    </td>
+                                    <td class="sheet-text2" style="width: 50px;text-align: right;">
+                                        Skilled:
+                                        <select  name="attr_atkspeedlvl" style="width: 40px" title="I = inability, U = untrained, T = trained, S = specialized">
+                                            <option value="-1">I&nbsp;&nbsp;&nbsp;&nbsp;Inability</option>
+                                            <option value="0" selected>U&nbsp;&nbsp;&nbsp;&nbsp;Untrained</option>
+                                            <option value="1">T&nbsp;&nbsp;&nbsp;&nbsp;Trained</option>
+                                            <option value="2">S&nbsp;&nbsp;&nbsp;&nbsp;Specialized</option>
+                                        </select>
+                                    </td>
+                                    <td class="sheet-text2" style="width: 50px;text-align: right;">
+                                        Cost:
+                                        <input type="number" name="attr_atkspeedcost" min="0" style="width:30px;" title="Cost" value="0" />
+                                    </td>
+                                </tr>
+                            </table>
+                        </fieldset>
+                    </div>
+                </div>
+            </div> <!-- END SPEED ATTACKS -->
+            <div class="sheet-supblock"> <!-- INTELLECT ATTACKS -->
+                <div class="sheet-blublock">
+                    <div class="sheet-inpblock">
+                        <div class="sheet-text1" style="text-align: left;">ATTACKS • INTELLECT</div>
+                        <fieldset class="repeating_attackintel">
+                            <table style="margin-bottom: 5px;">
+                                <tr>
+                                    <td class="sheet-text1" style="text-align: left;" COLSPAN="3">
+                                        <input type="text" style="width: 100%;font-weight: bold;" name="attr_atkintelname" title="Attack: weapon or power/ability name" placeholder="Attack" />
+                                    </td>
+                                    <td class="sheet-text2" style="width: 50px;text-align: center;">
+
+                                        <button type="roll" class="sheet-actionbt" title="Might Attack Roll, using the Action section parameters"
+                                            value="&{template:cyphBasicRoll} {{charid=@{character_id}}} {{stat=intellect}} {{diceRoll=[[1d20cs>17cf1]]}} {{attribute=@{atkintelname}}} {{attrEdge=@{intellectedge}}} {{bonusToRoll=[[@{rollVarBonus}]]}} {{difficulty=[[@{rollVarDiff}]]}} {{targNum=[[@{targNum}]]}} {{finalDiff=[[@{rollVarDiff}-(1*@{rollVarAsset})-(1*@{rollVarRollEff})-(1*@{atkintellvl})-(1*@{atkintelmod})]]}} {{targNumRoll=[[(3*@{rollVarDiff})-(3*@{rollVarAsset})-(3*@{rollVarRollEff})-(3*@{atkintellvl})-(3*@{atkintelmod})-(1*@{rollVarBonus})]]}} {{totalCost=[[@{effortCost}+@{atkintelcost}-@{intellectedge}]]}} {{effortCost=[[@{effortCost}]]}} {{effortRoll=[[@{rollVarRollEff}]]}} {{effortDmg=[[@{rollVarRollDmg}]]}} {{statExpense=[[@{atkintelcost}]]}} {{assets=[[@{rollVarAsset}]]}} {{bonusDmg=[[@{atkinteldmg}+@{rollVarRollDmg}*3]]}} {{skilled=[[@{atkintellvl}]]}} {{atkmod=[[@{atkintelmod}]]}}"
+                                            name="roll_actionIntelAttack"></button>
+
+                                        <button type="roll" class="sheet-macrobt" title="Might Attack Roll, roll queries for parameters"
+                                            value="&{template:cyphBasicRoll} {{charid=@{character_id}}} {{stat=intellect}} {{diceRoll=[[1d20cs>17cf1]]}} {{attribute=@{atkintelname}}} {{attrEdge=@{intellectedge}}} {{difficulty=[[@{rollQstDiff}]]}} {{effortRoll=[[@{rollQstRollEff}]]}} {{assets=[[@{rollQstAsset}]]}} {{bonusToRoll=[[@{rollQstBonus}]]}} {{statExpense=[[@{atkintelcost}]]}} {{effortDmg=[[@{rollQstRollDmg}]]}} {{targNum=[[@{targNumQst}]]}} {{finalDiff=[[@{rollQstDiff}-(1*@{rollQstAsset})-(1*@{rollQstRollEff})-(1*@{atkintellvl})-(1*@{atkintelmod})]]}} {{targNumRoll=[[(3*@{rollQstDiff})-(3*@{rollQstAsset})-(3*@{rollQstRollEff})-(3*@{atkintellvl})-(3*@{atkintelmod})-(1*@{rollQstBonus})]]}} {{totalCost=[[@{effortCostQst}+@{atkintelcost}-@{intellectedge}]]}} {{effortCost=[[@{effortCostQst}]]}} {{bonusDmg=[[@{atkinteldmg}+@{rollQstRollDmg}*3]]}} {{skilled=[[@{atkintellvl}]]}} {{atkmod=[[@{atkintelmod}]]}}"
+                                            name="roll_macroIntelAttack"></button>
+
+                                        <button type="roll" name="ShowIntelAttack" class="sheet-btDesc" title="Show in chat" value="&{template:cyphDesc} {{name=@{atkintelname}}} {{type=Attack}}  {{description=Mod:@{atkmightmod}, Damage:@{atkinteldmg}, Skilled:@{atkintellvl}, Cost:@{atkintelcost}}}"><img src="https://s3.amazonaws.com/files.d20.io/images/13924213/_SbpEpVjj9V7Dow_GKKYhQ/med.png?1448153028" style="width: 16px;height:16px;"/></button>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td class="sheet-text2" style="width: 100%;text-align: right;">
+                                        Mod:
+                                        <input type="number" name="attr_atkintelmod" min="0" style="width:30px;" title="Reduction of the difficulty of the attack roll" value="0" />
+                                    </td>
+                                    <td class="sheet-text2" style="width: 50px;text-align: right;">
+                                        Dmg:
+                                        <input type="number" name="attr_atkinteldmg" min="0" style="width:40px;" title="Damage" value="0" />
+                                    </td>
+                                    <td class="sheet-text2" style="width: 50px;text-align: right;">
+                                        Skilled:
+                                        <select  name="attr_atkintellvl" style="width: 40px" title="I = inability, U = untrained, T = trained, S = specialized">
+                                            <option value="-1">I&nbsp;&nbsp;&nbsp;&nbsp;Inability</option>
+                                            <option value="0" selected>U&nbsp;&nbsp;&nbsp;&nbsp;Untrained</option>
+                                            <option value="1">T&nbsp;&nbsp;&nbsp;&nbsp;Trained</option>
+                                            <option value="2">S&nbsp;&nbsp;&nbsp;&nbsp;Specialized</option>
+                                        </select>
+                                    </td>
+                                    <td class="sheet-text2" style="width: 50px;text-align: right;">
+                                        Cost:
+                                        <input type="number" name="attr_atkintelcost" min="0" style="width:30px;" title="Cost" value="0" />
+                                    </td>
+                                </tr>
+                            </table>
+                        </fieldset>
+                    </div>
+                </div>
+            </div> <!-- END INTELLECT ATTACKS -->
+            <div class="sheet-supblock"> <!-- OTHER ATTACKS -->
                 <div class="sheet-blublock">
                     <div class="sheet-inpblock2">
                         <table>
                             <tr>
-                                <td class="sheet-text1" style="text-align: left;">ATTACKS</td>
+                                <td class="sheet-text1" style="text-align: left;">Other ATTACKS</td>
                                 <td class="sheet-text2" style="width: 30px;text-align: center;">MOD</td>
                                 <td class="sheet-text2" style="width: 50px;text-align: center;">DAM</td>
                             </tr>
@@ -497,7 +709,7 @@
                                     <td class="sheet-text2" style="width: 30px;text-align: center;">
                                         <input type="number" name="attr_atkmod" min="0" style="width:30px;" title="Mod" value="0" />
                                     </td>
-                                    <td class="sheet-text2" style="width: 30px;text-align: center;">
+                                    <td class="sheet-text2" style="width: 50px;text-align: center;">
                                         <input type="number" name="attr_atkdmg" min="0" style="width:50px;" title="Damage" value="0" />
                                     </td>
                                 </tr>
@@ -505,7 +717,7 @@
                         </fieldset>
                     </div>
                 </div>
-            </div> <!-- END ATTACKS -->
+            </div> <!-- END OTHER ATTACKS -->
             <div class="sheet-supblock"> <!-- ADVANCEMENT -->
                 <div class="sheet-blublock">
                     <div class="sheet-inpblock2">
@@ -580,7 +792,7 @@
                 </div>
             </div> <!-- END ADVANCEMENT -->
         </td> <!-- END COL 2 -->
-        <!-- ******* COL 3 **************** -->
+<!-- ******* COL 3 **************** -->
         <td valign="top"> <!-- COL 3 -->
             <img class="sheet-gamelogoCypher" src="https://lh4.googleusercontent.com/-T_PWRmd-TxE/Vfs9cEqYWbI/AAAAAAAAW0I/rUC1JdU-UXg/w900-h263/Roll20_cypher_logo.png" />
             <img class="sheet-gamelogoNumenera" src="http://upload.wikimedia.org/wikipedia/en/8/8e/Numenera_Logo.png" />
@@ -599,10 +811,10 @@
                         </table>
                         <fieldset class="repeating_cypher-list">
                             <div class="sheet-text2">
-                                <button type="roll" class="sheet-btDesc" title="Show in chat" value="&{template:cyphDesc} {{name=@{cypher-name}}} {{type=Cypher}} {{level=@{cypher-level}}} {{description=@{cypher-description}}}">Name</button>
-                                <input type="text" style="width: 210px;font-weight: bold;" name="attr_cypher-name" title="Name of the cypher" placeholder="Cypher" />
+                                <input type="text" style="width: 235px;font-weight: bold;" name="attr_cypher-name" title="Name of the cypher" placeholder="Cypher" />
                                 Lvl&nbsp;
                                 <input type="number" style="width: 40px;" name="attr_cypher-level" title="Level of the Cypher" min="0" value="1" />
+                                <button type="roll" name="ShowCypher" class="sheet-btDesc" title="Show in chat" value="&{template:cyphDesc} {{name=@{cypher-name}}} {{type=Cypher}} {{level=@{cypher-level}}} {{description=@{cypher-description}}}"><img src="https://s3.amazonaws.com/files.d20.io/images/13924213/_SbpEpVjj9V7Dow_GKKYhQ/med.png?1448153028" style="width: 16px;height:16px;"/></button>
                             </div>
                             <div>
                                 <textarea name="attr_cypher-description" style="height: 46px; width: 100%;" title="Description of the Cypher" placeholder="Description"></textarea>
@@ -617,10 +829,10 @@
                         <div class="sheet-text1" style="text-align: left;">ARTIFACTS</div>
                         <fieldset class="repeating_artifact-list">
                             <div class="sheet-text2" style="text-align: left;">
-                                <button type="roll" class="sheet-btDesc" title="Show in chat" value="&{template:cyphDesc} {{name=@{artifact-name}}} {{type=Artefact}} {{level=@{artifact-level}}} {{depletion=@{artdepthreshold} in @{artdepdice}}} {{description=@{artifact-description}}}">Name</button>
-                                <input type="text" style="width: 210px;font-weight: bold;" name="attr_artifact-name" title="Name" placeholder="Artifact" />
+                                <input type="text" style="width: 235px;font-weight: bold;" name="attr_artifact-name" title="Name" placeholder="Artifact" />
                                 Lvl&nbsp;
                                 <input type="number" style="width: 40px;" name="attr_artifact-level" title="Level" min="0" max="99" value="1" />
+                                <button type="roll" name="ShowArtifact" class="sheet-btDesc" title="Show in chat" value="&{template:cyphDesc} {{name=@{artifact-name}}} {{type=Artefact}} {{level=@{artifact-level}}} {{depletion=@{artdepthreshold} in @{artdepdice}}} {{description=@{artifact-description}}}"><img src="https://s3.amazonaws.com/files.d20.io/images/13924213/_SbpEpVjj9V7Dow_GKKYhQ/med.png?1448153028" style="width: 16px;height:16px;"/></button>
                             </div>
                             <div class="sheet-text2" style="text-align: left;">
                                 Depletion &nbsp;
@@ -669,19 +881,24 @@
                         </table>
                         <table>
                             <tr>
-                                <td class="sheet-text2" style="text-align: left;">ITEM</td>
-                                <td class="sheet-text2" style="width:50px;">#</td>
+                                <td class="sheet-text2" style="width: 260px;text-align: left;">ITEM</td>
+                                <td style="text-align: left;">#</td>
                             </tr>
                         </table>
                         <fieldset class="repeating_equipment-list">
                             <table>
                               <tr>
-                                  <td style="width: 100%; text-align: left;"><input type="text" name="attr_equipment-name" title="Item" placeholder="Equipment name" /></td>
-                                  <td width="50px"><input type="number" name="attr_equipment-qty" title="Quantity" value="1" /></td>
+                                  <td style="width: 100%; text-align: left;"><input type="text" name="attr_equipment-name" style="width:100%" title="Item" placeholder="Equipment name" /></td>
+                                  <td width="70px">
+                                    <input type="number" name="attr_equipment-qty" title="Quantity" value="1" />
+                                    <button type="roll" name="ShowItem" class="sheet-btDesc" title="Show in chat" value="&{template:cyphDesc} {{name=Item}} {{type=Equipment}} {{description=@{equipment-name} #@{equipment-qty}}}"><img src="https://s3.amazonaws.com/files.d20.io/images/13924213/_SbpEpVjj9V7Dow_GKKYhQ/med.png?1448153028" style="width: 16px;height:16px;"/></button>
+                                  </td>
                               </tr>
                             </table>
                         </fieldset>
-                        <div class="sheet-text2" style="text-align: left;">MISC.</div>
+                        <div class="sheet-text2" style="text-align: left;">MISC.
+                            <button type="roll" name="ShowMiscEquip" class="sheet-btDesc" title="Show in chat" value="&{template:cyphDesc} {{name=Misc. equipment}}  {{type=Equipment}} {{description=@{possessions}}}"><img src="https://s3.amazonaws.com/files.d20.io/images/13924213/_SbpEpVjj9V7Dow_GKKYhQ/med.png?1448153028" style="width: 16px;height:16px;"/></button>
+                        </div>
                         <textarea name="attr_possessions" style="height: 100px; width: 100%;" title="Miscellaneous equipment"></textarea>
                     </div>
                 </div>
@@ -888,11 +1105,12 @@
 </rolltemplate> <!-- End template cyphInit !-->
 <rolltemplate class="sheet-rolltemplate-cyphBasicRoll">
    <table>
-        <tr><th COLSPAN="2">{{attribute}} Roll</th></tr>
         <tr>
-            <td>1d20</td>
-            <td>
-                {{diceRoll}} (Diff.
+            <th COLSPAN="2">{{attribute}}</th>
+        </tr>
+        <tr>
+            <td COLSPAN="2"><b>Roll:</b>
+                {{diceRoll}} (beats diff.
                 {{#rollLess() diceRoll 3}}0{{/rollLess() diceRoll 3}}
                 {{#rollBetween() diceRoll 3 5}}1{{/rollBetween() diceRoll 3 5}}
                 {{#rollBetween() diceRoll 6 8}}2{{/rollBetween() diceRoll 6 8}}
@@ -932,12 +1150,9 @@
             <tr><td COLSPAN="2" style="color:red;text-align:center;font-weight:bold;">GM Intrusion</td></tr>
         {{/rollWasFumble() diceRoll}}
         {{#rollGreater() difficulty 0}}
-            {{#rollGreater() diceRoll targNumRoll}}
+            {{^rollLess() diceRoll targNumRoll}}
                 <tr><td  COLSPAN="2" style="font-size:105%;font-weight:bold;color:green;text-align:center;">Success!</td></tr>
-            {{/rollGreater() diceRoll targNumRoll}}
-            {{#rollTotal() diceRoll targNumRoll}}
-                <tr><td  COLSPAN="2" style="font-size:105%;font-weight:bold;color:green;text-align:center;">Success!</td></tr>
-            {{/rollTotal() diceRoll targNumRoll}}
+            {{/rollLess() diceRoll targNumRoll}}
             {{#rollLess() diceRoll targNumRoll}}
                 <tr><td  COLSPAN="2" style="font-size:105%;font-weight:bold;color:red;text-align:center;">Failure</td></tr>
             {{/rollLess() diceRoll targNumRoll}}
@@ -945,7 +1160,7 @@
                 <tr><td COLSPAN="2"><hr/></td></tr>
             {{/rollLess() finalDiff difficulty}}
             <tr>
-                <td><span>Difficulty</span></td>
+                <td><b>Difficulty</b></td>
                 <td>{{difficulty}} (TN {{targNum}})</td>
             </tr>
         {{/rollGreater() difficulty 0}}
@@ -966,41 +1181,34 @@
         {{#rollGreater() assets 0}}
             <tr><td>Asset(s)</td><td><i>- {{assets}}</i></td></tr>
         {{/rollGreater() assets 0}}
+        {{#atkmod}}
+            {{#rollGreater() atkmod 0}}
+                <tr><td>Mod</td><td><i>- {{atkmod}}</i></td></tr>
+            {{/rollGreater() atkmod 0}}
+        {{/atkmod}}
         {{#rollGreater() effortRoll 0}}
             <tr><td>Effort</td><td><i>- {{effortRoll}}</i></td></tr>
         {{/rollGreater() effortRoll 0}}
         {{#rollGreater() difficulty 0}}
-            {{#rollLess() targNumRoll targNum}}
+            {{^rollTotal() targNumRoll targNum}}
                 <tr>
                     <td style="text-align: right;">=</td>
                     <td style="text-align: left;">{{finalDiff}} (TN {{targNumRoll}})</td>
                 </tr>
-            {{/rollLess() targNumRoll targNum}}
-            {{#rollGreater() targNumRoll targNum}}
-                <tr>
-                    <td style="text-align: right;">=</td>
-                    <td style="text-align: left;">{{finalDiff}} (TN {{targNumRoll}})</td>
-                </tr>
-            {{/rollGreater() targNumRoll targNum}}
+            {{/rollTotal() targNumRoll targNum}}
         {{/rollGreater() difficulty 0}}
         {{#rollTotal() difficulty 0}}
-            {{#rollLess() finalDiff 0}}
+            {{^rollTotal() finalDiff 0}}
                 <tr>
                     <td style="text-align: right;">= Difficulty </td>
                     <td style="text-align: left;" >{{finalDiff}} steps</td>
                 </tr>
-            {{/rollLess() finalDiff 0}}
-            {{#rollGreater() finalDiff 0}}
-                <tr>
-                    <td style="text-align: right;">= Difficulty </td>
-                    <td style="text-align: left;" >+{{finalDiff}} steps</td>
-                </tr>
-            {{/rollGreater() finalDiff 0}}
+            {{/rollTotal() finalDiff 0}}
         {{/rollTotal() difficulty 0}}
-        {{#rollGreater() effortDmg 0}}
+        {{#rollGreater() bonusDmg 0}}
             <tr><td COLSPAN="2"><hr/></td></tr>
-            <tr><td><span><b>Damage</b></span></td><td>+{{bonusDmg}} ({{effortDmg}} eff.)</td></tr>
-        {{/rollGreater() effortDmg 0}}
+            <tr><td><span><b>Damage</b></span></td><td>{{bonusDmg}} ({{effortDmg}} effort)</td></tr>
+        {{/rollGreater() bonusDmg 0}}
         {{#rollGreater() totalCost 0}}
             <tr><td COLSPAN="2"><hr/></td></tr>
             <tr>
diff --git a/CypherSystem/ReadMe.md b/CypherSystem/ReadMe.md
index 884ccdcf58..1eedfab48d 100644
--- a/CypherSystem/ReadMe.md
+++ b/CypherSystem/ReadMe.md
@@ -3,7 +3,7 @@ Character sheet, with integrated rolls and optional API script, for the Cypher S
 It can look like and be used as a sheet for _Numen&eacute;ra_ (except the armor stat cost, as per the CSR rule) or _The Strange_ (except the armor stat cost thing also, and the recursion management which requires several characters/sheets, one per recursion).
 
 # Current version:
-Version 1.4 (November 21st, 2015).
+Version 1.5 (December 21st, 2015).
 
 * Screenshot [Generic Cypher System style](CypherSystem.png)
 * Screenshot [Numenera style](CypherSystem_style_Numenera.png)
@@ -42,6 +42,16 @@ Set up the API script:
 
 # Release Notes
 
+##Release 1.5 (December 21st, 2015)
+
+* New "Attacks" section (one per stat), with integrated rolls, taking in account skill level, costs, damage etc.
+* Stat and skill rolls don't ask/use damage effort anymore (use the new attack sections/rolls instead)
+* New options to simplify rolls: choose if rolls ask for/use assets, bonus and cost. Default is now not askink/using them.
+* "Name" button to logo/info button
+* Info button can be dragged to the macro bar
+* Added info button to equipment and consummables
+* Damage track taken in account for effort cost calculation
+
 ##Release 1.4 (November 21st, 2015)
 [See detailed post on the Roll20 forum](https://app.roll20.net/forum/post/2357046/cypher-system-core-rule-book-sheet/?pageforid=2645489#post-2645489)
 
diff --git a/CypherSystem/sheet.json b/CypherSystem/sheet.json
index 6bfd1be960..2d2ed59b69 100644
--- a/CypherSystem/sheet.json
+++ b/CypherSystem/sheet.json
@@ -4,5 +4,5 @@
 	"authors": "Natha",
 	"roll20userid": "75857",
 	"preview": "CypherSystem.png",
-	"instructions": "v1.4 (2015-11-21) To set up a token that's linked to the character sheet, and optionally for API scripts to enhance rolls, check the README.md file at https://github.com/Roll20/roll20-character-sheets/blob/master/CypherSystem/ReadMe.md."
+	"instructions": "v1.5 (2015-12-21) To set up a token that's linked to the character sheet, and optionally for API scripts to enhance rolls, check the README.md file at https://github.com/Roll20/roll20-character-sheets/blob/master/CypherSystem/ReadMe.md."
 }