diff --git a/Shadowrun5e-Gerdofal/Shadowrun5e-Gerdofal.html b/Shadowrun5e-Gerdofal/Shadowrun5e-Gerdofal.html
index 2a0e3df21e..79c673510b 100644
--- a/Shadowrun5e-Gerdofal/Shadowrun5e-Gerdofal.html
+++ b/Shadowrun5e-Gerdofal/Shadowrun5e-Gerdofal.html
@@ -1,12 +1,19 @@
- <!-- Uploaded to GitHub 6/11 8:44pm AKST -->
- 
+<!-- Uploaded to GitHub 6/26 1:57pm AKST -->
+<!--
+Changes in this version:
+- Fixed limit calculation for certain combinations of numbers
+- Changed essence field for augmentation to text so it will accept decimal numbers
+- Implemented use of roll templates for double attribute rolls.
+
+-->
+
 <div class="sheet-wrapper"> 
   
   <!-- Sheet Header -->
   <div class="sheet-2colrow">
     <div class="sheet-col">
       <p style="text-align: left;"> <img src="https://i.imgur.com/TQ8WzzX.png" style="max-height: 100px;" /> </p>
-      <button type="roll" name="roll_testroll" value="&{template:sr} {{roll_header=roll_header}} {{name=name}} {{v1=v1}} {{v1_num=v1_num}} {{v2=v2}} {{v2_num=v2_num}} {{v3=v3}} {{v3_num=v3_num}} {{v4=v4}} {{v4_num=v4_num}} {{v5=v5}} {{v5_num=v5_num}} {{v6=v6}} {{v6_num=v6_num}} {{v7=v7}} {{v7_num=v7_num}} {{v8=v8}} {{v8_num=v8_num}} {{v9=v9}} {{v9_num=v9_num}} {{woundpenalty=woundpenalty}} {{limit=limit}} {{result1_label=result1_label}} {{result1=result1}} {{result2_label=result2_label}} {{result2=result2}} {{result3_label=result3_label}} {{result3=result3}} {{result4_label=result4_label}} {{result4=result4}} {{result5_label=result5_label}} {{result5=result5}} {{description=description - This test roll shows you the names of all fields in the roll template. The template name is, unsurprisingly, sr. If this sheet is installed in your campaign, then you have access to write macros for this template as well.}}" title="Test Roll">
+      <button type="roll" name="roll_testroll" value="&{template:sr} {{shownotes=@{configshownotes}}} {{roll_header=roll_header}} {{name=name}} {{v1=v1}} {{v1_num=v1_num}} {{v2=v2}} {{v2_num=v2_num}} {{v3=v3}} {{v3_num=v3_num}} {{v4=v4}} {{v4_num=v4_num}} {{v5=v5}} {{v5_num=v5_num}} {{v6=v6}} {{v6_num=v6_num}} {{v7=v7}} {{v7_num=v7_num}} {{v8=v8}} {{v8_num=v8_num}} {{v9=v9}} {{v9_num=v9_num}} {{woundpenalty=woundpenalty - Send a positive number, the minus is added automatically}} {{limit=limit}} {{result1_label=result1_label}} {{result1=result1}} {{result2_label=result2_label}} {{result2=result2}} {{result3_label=result3_label}} {{result3=result3}} {{result4_label=result4_label}} {{result4=result4}} {{result5_label=result5_label}} {{result5=result5}} {{description=description - This test roll shows you the names of all fields in the roll template. The template name is, unsurprisingly, sr. If this sheet is installed in your campaign, then you have access to write macros for this template as well.}} {{notes=notes - for out of character notes, not used in all rolls.}}" title="Test Roll">
       <input type="text" name="attr_testroll" value="test roll" disabled="true" />
       </button>
     </div>
@@ -329,7 +336,7 @@
             <input type="text" name="attr_initiativedice" value="1" />
           </div>
           <div class="sheet-item sheet-small sheet-transparent">
-            <button type="roll" name="roll_initiative" value="&{template:sr} {{roll_header=Initiative Roll}} {{name=@{name}}} {{v1=Reaction}} {{v1_num=@{reaction}}} {{v2=Intuition}} {{v2_num=@{intuition}}} {{v3=Misc}} {{v3_num=@{initiativemisc}}} {{v4=d6 Rolled}} {{v4_num=@{initiativedice}}} {{woundpenalty=[[@{calcwoundmod}]]}} {{result1_label=Initiative}} {{result1=[[@{initiativestat}-@{calcwoundmod}+@{initiativemisc}+@{initiativedice}d6]]}}" title="Initiative Roll">
+            <button type="roll" name="roll_initiative" value="&{template:sr} {{shownotes=@{configshownotes}}} {{roll_header=Initiative Roll}} {{name=@{name}}} {{v1=Reaction}} {{v1_num=@{reaction}}} {{v2=Intuition}} {{v2_num=@{intuition}}} {{v3=Misc}} {{v3_num=@{initiativemisc}}} {{v4=d6 Rolled}} {{v4_num=@{initiativedice}}} {{woundpenalty=[[@{calcwoundmod}]]}} {{result1_label=Initiative}} {{result1=[[@{initiativestat}-@{calcwoundmod}+@{initiativemisc}+@{initiativedice}d6]]}}" title="Initiative Roll">
             <label>d6</label>
             </button>
           </div>
@@ -354,7 +361,7 @@
             <input type="text" name="attr_matrixinitiativedice" value="1" />
           </div>
           <div class="sheet-item sheet-small sheet-transparent">
-            <button type="roll" name="roll_matrixinitiative" value="&{template:sr} {{roll_header=MAtrix Initiative Roll}} {{name=@{name}}} {{v1=Matrix Stat}} {{v1_num=@{matrixinitiativestat}}} {{v2=Misc}} {{v2_num=@{matrixinitiativemisc}}} {{v3=d6 Rolled}} {{v3_num=@{matrixinitiativedice}}} {{woundpenalty=[[@{calcwoundmod}]]}} {{result1_label=Initiative}} {{result1=[[@{matrixinitiativestat}-@{calcwoundmod}+@{matrixinitiativemisc}+@{matrixinitiativedice}d6]]}}" title="Matrix Initiative Roll">
+            <button type="roll" name="roll_matrixinitiative" value="&{template:sr} {{shownotes=@{configshownotes}}} {{roll_header=MAtrix Initiative Roll}} {{name=@{name}}} {{v1=Matrix Stat}} {{v1_num=@{matrixinitiativestat}}} {{v2=Misc}} {{v2_num=@{matrixinitiativemisc}}} {{v3=d6 Rolled}} {{v3_num=@{matrixinitiativedice}}} {{woundpenalty=[[@{calcwoundmod}]]}} {{result1_label=Initiative}} {{result1=[[@{matrixinitiativestat}-@{calcwoundmod}+@{matrixinitiativemisc}+@{matrixinitiativedice}d6]]}}" title="Matrix Initiative Roll">
             <label>d6</label>
             </button>
           </div>
@@ -379,7 +386,7 @@
             <input type="text" name="attr_astralinitiativedice" value="1" />
           </div>
           <div class="sheet-item sheet-small sheet-transparent">
-            <button type="roll" name="roll_astralinitiative" value="&{template:sr} {{roll_header=Astral Initiative Roll}} {{name=@{name}}} {{v1=Intuition*2}} {{v1_num=@{astralinitiativestat}}} {{v2=Misc}} {{v2_num=@{astralinitiativemisc}}} {{v3=d6 Rolled}} {{v3_num=@{astralinitiativedice}}} {{woundpenalty=[[@{calcwoundmod}]]}} {{result1_label=Astral Initiative}} {{result1=[[(@{astralinitiativestat})-@{calcwoundmod}+@{astralinitiativemisc}+@{astralinitiativedice}d6]]}}" title="Initiative Roll">
+            <button type="roll" name="roll_astralinitiative" value="&{template:sr} {{shownotes=@{configshownotes}}} {{roll_header=Astral Initiative Roll}} {{name=@{name}}} {{v1=Intuition*2}} {{v1_num=@{astralinitiativestat}}} {{v2=Misc}} {{v2_num=@{astralinitiativemisc}}} {{v3=d6 Rolled}} {{v3_num=@{astralinitiativedice}}} {{woundpenalty=[[@{calcwoundmod}]]}} {{result1_label=Astral Initiative}} {{result1=[[(@{astralinitiativestat})-@{calcwoundmod}+@{astralinitiativemisc}+@{astralinitiativedice}d6]]}}" title="Initiative Roll">
             <label>d6</label>
             </button>
           </div>
@@ -390,10 +397,11 @@
           <div class="sheet-item sheet-huge">
             <label>Composure:</label>
           </div>
-          <div class="sheet-item sheet-small">
-            <button class="sheet-hidden-roll" type='roll' value='/r [Composure] ([[@{composure}]]-@{calcwoundmod})d6>5s' name='roll_Composure' title="Composure Check">
+          <div class="sheet-item sheet-small">      
+            <button type="roll" name="roll_composure" value="&{template:sr} {{shownotes=@{configshownotes}}} {{name=@{name}}} {{roll_header=Composure Roll}} {{v1=Charisma}} {{v1_num=@{charisma}}} {{v2=Willpower}} {{v2_num=@{willpower}}} {{woundpenalty=[[@{calcwoundmod}]]}} {{v9=Situational Modifiers?}} {{v9_num=?{Situational Modifiers?|0}}} {{result1_label=Successes}} {{result1=[[(@{composure}+?{Situational Modifiers?|0}-@{calcwoundmod})d6>5s]]}}" title="Composure Roll">
             <input type="number" name="attr_composure" value="(@{charisma} + @{willpower})" disabled="true" />
             </button>
+             
           </div>
         </div>
         <div class="sheet-row">
@@ -401,7 +409,7 @@
             <label>Judge Intentions:</label>
           </div>
           <div class="sheet-item sheet-small">
-            <button class="sheet-hidden-roll" type="roll" name="roll_judgeintent" value="/r [Judge Intentions] ([[@{judgeintent}]]-@{calcwoundmod})d6>5s"title="Judge Intentions">
+            <button type="roll" name="roll_judgeintent" value="&{template:sr} {{shownotes=@{configshownotes}}} {{name=@{name}}} {{roll_header=Judge Intentions Roll}} {{v1=Charisma}} {{v1_num=@{charisma}}} {{v2=Intuition}} {{v2_num=@{intuition}}} {{woundpenalty=[[@{calcwoundmod}]]}} {{v9=Situational Modifiers?}} {{v9_num=?{Situational Modifiers?|0}}} {{result1_label=Successes}} {{result1=[[(@{judgeintent}+?{Situational Modifiers?|0}-@{calcwoundmod})d6>5s]]}}" title="Judge Intentions Roll">
             <input type="number" name="attr_judgeintent" value="(@{charisma} + @{intuition})" disabled="true" />
             </button>
           </div>
@@ -411,7 +419,7 @@
             <label>Memory:</label>
           </div>
           <div class="sheet-item sheet-small">
-            <button class="sheet-hidden-roll" type="roll" name="roll_memory" value="/r [Memory] ([[@{memory}]]-@{calcwoundmod})d6>5s" title="Memory">
+            <button type="roll" name="roll_composure" value="&{template:sr} {{shownotes=@{configshownotes}}} {{name=@{name}}} {{roll_header=Memory Roll}} {{v1=Logic}} {{v1_num=@{logic}}} {{v2=Willpower}} {{v2_num=@{willpower}}} {{woundpenalty=[[@{calcwoundmod}]]}} {{v9=Situational Modifiers?}} {{v9_num=?{Situational Modifiers?|0}}} {{result1_label=Successes}} {{result1=[[(@{memory}+?{Situational Modifiers?|0}-@{calcwoundmod})d6>5s]]}}" title="Memory Roll">
             <input type="number" name="attr_memory" value="(@{logic} + @{willpower})" disabled="true" />
             </button>
           </div>
@@ -459,7 +467,7 @@
             <label>Physical Limit:</label>
           </div>
           <div class="sheet-item sheet-small">
-            <input type="hidden" name="attr_pl" value="(((@{strength}*2) + @{body} + @{reaction})/3)" disabled="true" />
+            <input type="hidden" name="attr_pl" value="(((@{strength}*2) + @{body} + @{reaction})/3)-.0001" disabled="true" />
             <input type="number" name="attr_physicallimit" value="(@{pl}+(1-(@{pl})%1))" disabled="true" />
           </div>
         </div>
@@ -468,7 +476,7 @@
             <label>Mental Limit:</label>
           </div>
           <div class="sheet-item sheet-small">
-            <input type="hidden" name="attr_ml" value="(((@{logic}*2)+@{intuition}+@{willpower})/3)" disabled="true" />
+            <input type="hidden" name="attr_ml" value="(((@{logic}*2)+@{intuition}+@{willpower})/3)-.0001" disabled="true" />
             <input type="number" name="attr_mentallimit" value="(@{ml}+(1-(@{ml})%1))" disabled="true" />
           </div>
         </div>
@@ -477,7 +485,7 @@
             <label>Social Limit:</label>
           </div>
           <div class="sheet-item sheet-small">
-            <input type="hidden" name="attr_sl" value="(((@{charisma}*2) + @{willpower} + @{essence})/3)" disabled="true" />
+            <input type="hidden" name="attr_sl" value="(((@{charisma}*2) + @{willpower} + @{essence})/3)-.0001" disabled="true" />
             <input type="number" name="attr_sociallimit" class = "sheet-number" value="(@{sl}+(1-(@{sl})%1))" disabled="true" />
           </div>
         </div>
@@ -536,24 +544,24 @@
         <h3>Quick Roll Collection</h3>
         <div class="sheet-row">
           <div class="sheet-item sheet-big">
-            <button type="roll" name="roll_d6roll" value="&{template:sr} {{roll_header=Standard D6}} {{name=@{name}}} {{v1=Die Pool}} {{v1_num=?{Die Pool?|0}}} {{woundpenalty=[[@{calcwoundmod}]]}} {{limit=?{Limit?|0}}} {{result1_label=Successes}} {{result1=[[(?{Die Pool?|0}-@{calcwoundmod})d6>5sk?{Limit?|0}]]}} {{description=?{Optional Description}}}" title="D6 Roll">
+            <button type="roll" name="roll_d6roll" value="&{template:sr} {{shownotes=@{configshownotes}}} {{roll_header=Standard D6}} {{name=@{name}}} {{v1=Die Pool}} {{v1_num=?{Die Pool?|0}}} {{woundpenalty=[[@{calcwoundmod}]]}} {{limit=?{Limit?|0}}} {{result1_label=Successes}} {{result1=[[(?{Die Pool?|0}-@{calcwoundmod})d6>5sk?{Limit?|0}]]}} {{description=?{Optional Description}}}" title="D6 Roll">
             <label>Standard D6 (incl Wounds)</label>
             </button>
           </div>
           <div class="sheet-item sheet-big">
-            <button type="roll" name="roll_d6edgeroll" value="&{template:sr} {{roll_header=Edge D6}} {{name=@{name}}} {{v1=Die Pool}} {{v1_num=?{Die Pool? (Not Including Edge)|0}}} {{v2=Edge}} {{v2_num=@{edge}}} {{woundpenalty=[[@{calcwoundmod}]]}} {{result1_label=Successes}} {{result1=[[(?{Die Pool? (Not Including Edge)|0}+@{edge}-@{calcwoundmod})d6>5!s]]}} {{description=?{Optional Description}}}" title="D6 Edge Roll">
+            <button type="roll" name="roll_d6edgeroll" value="&{template:sr} {{shownotes=@{configshownotes}}} {{roll_header=Edge D6}} {{name=@{name}}} {{v1=Die Pool}} {{v1_num=?{Die Pool? (Not Including Edge)|0}}} {{v2=Edge}} {{v2_num=@{edge}}} {{woundpenalty=[[@{calcwoundmod}]]}} {{result1_label=Successes}} {{result1=[[(?{Die Pool? (Not Including Edge)|0}+@{edge}-@{calcwoundmod})d6>5!s]]}} {{description=?{Optional Description}}}" title="D6 Edge Roll">
             <label>Edge Roll (incl Wounds)</label>
             </button>
           </div>
         </div>
         <div class="sheet-row">
           <div class="sheet-item sheet-big">
-            <button type="roll" name="roll_d6rollnw" value="&{template:sr} {{roll_header=Standard D6 No Wounds}} {{name=@{name}}} {{v1=Die Pool}} {{v1_num=?{Die Pool?|0}}} {{limit=?{Limit?|0}}} {{result1_label=Successes}} {{result1=[[(?{Die Pool?|0})d6>5sk?{Limit?|0}]]}} {{description=?{Optional Description}}}" title="D6 Roll">
+            <button type="roll" name="roll_d6rollnw" value="&{template:sr} {{shownotes=@{configshownotes}}} {{roll_header=Standard D6 No Wounds}} {{name=@{name}}} {{v1=Die Pool}} {{v1_num=?{Die Pool?|0}}} {{limit=?{Limit?|0}}} {{result1_label=Successes}} {{result1=[[(?{Die Pool?|0})d6>5sk?{Limit?|0}]]}} {{description=?{Optional Description}}}" title="D6 Roll">
             <label>Standard D6 (excl Wounds)</label>
             </button>
           </div>
           <div class="sheet-item sheet-big">
-            <button type="roll" name="roll_d6edgerollnw" value="&{template:sr} {{roll_header=Edge D6 No Wounds}} {{name=@{name}}} {{v1=Die Pool}} {{v1_num=?{Die Pool? (Not Including Edge)|0}}} {{v2=Edge}} {{v2_num=@{edge}}} {{result1_label=Successes}} {{result1=[[(?{Die Pool? (Not Including Edge)|0}+@{edge})d6>5!s]]}} {{description=?{Optional Description}}}" title="D6 Edge Roll">
+            <button type="roll" name="roll_d6edgerollnw" value="&{template:sr} {{shownotes=@{configshownotes}}} {{roll_header=Edge D6 No Wounds}} {{name=@{name}}} {{v1=Die Pool}} {{v1_num=?{Die Pool? (Not Including Edge)|0}}} {{v2=Edge}} {{v2_num=@{edge}}} {{result1_label=Successes}} {{result1=[[(?{Die Pool? (Not Including Edge)|0}+@{edge})d6>5!s]]}} {{description=?{Optional Description}}}" title="D6 Edge Roll">
             <label>Edge Roll (excl Wounds)</label>
             </button>
           </div>
@@ -742,12 +750,12 @@
           </div>
           <div class="sheet-item sheet-puny">
             <input type="hidden" name="attr_activeskilldiesum" value="@{activeskillattr}+@{activeskillbase}+@{activeskillmisc}-@{calcwoundmod}" disabled="true" />
-            <button class="sheet-hidden-roll" type="roll" name="roll_activeskillroll" value="&{template:sr} {{name=@{name}}} {{roll_header=Active Skill}} {{v1=@{activeskillname}}} {{v1_num=@{activeskillbase}}} {{v2=Attribute}} {{v2_num=@{activeskillattr}}} {{v3=Misc}} {{v3_num=@{activeskillmisc}}} {{v4=Limit Mod}} {{v4_num=@{activeskilllimitmod}}} {{v5=Situational Modifier}} {{v5_num=?{Situational Modifiers?|0}}} {{woundpenalty=[[@{calcwoundmod}]]}} {{limit=@{activeskillcalclimit}}} {{result1_label=Successes}} {{result1=[[(@{activeskilldiesum}+?{Situational Modifiers?|0})d6>5sk@{activeskillcalclimit}]]}}" title="Skill Roll" />
+            <button class="sheet-hidden-roll" type="roll" name="roll_activeskillroll" value="&{template:sr} {{shownotes=@{configshownotes}}} {{name=@{name}}} {{roll_header=Active Skill}} {{v1=@{activeskillname}}} {{v1_num=@{activeskillbase}}} {{v2=Attribute}} {{v2_num=@{activeskillattr}}} {{v3=Misc}} {{v3_num=@{activeskillmisc}}} {{v4=Limit Mod}} {{v4_num=@{activeskilllimitmod}}} {{v5=Situational Modifier}} {{v5_num=?{Situational Modifiers?|0}}} {{woundpenalty=[[@{calcwoundmod}]]}} {{limit=@{activeskillcalclimit}}} {{result1_label=Successes}} {{result1=[[(@{activeskilldiesum}+?{Situational Modifiers?|0})d6>5sk@{activeskillcalclimit}]]}}" title="Skill Roll" />
             <input type="number" name="attr_activeskilltotal" value="@{activeskillattr}+@{activeskillbase}+@{activeskillmisc}" disabled="true" />
             </button>
           </div>
           <div class="sheet-item sheet-puny">
-            <button class="sheet-hidden-roll" type="roll" name="roll_activeskillroll" value="&{template:sr} {{name=@{name}}} {{roll_header=Active Skill}} {{v1=@{activeskillname}}} {{v1_num=@{activeskillbase}}} {{v2=Attribute}} {{v2_num=@{activeskillattr}}} {{v3=Misc}} {{v3_num=@{activeskillmisc}}} {{v4=Situational Modifier}} {{v4_num=?{Situational Modifiers?|0}}} {{v5=Specialized}} {{v5_num=2}} {{woundpenalty=[[@{calcwoundmod}]]}} {{limit=@{activeskillcalclimit}}} {{result1_label=Successes}} {{result1=[[(@{activeskilldiesum}+2+?{Situational Modifiers?|0})d6>5sk@{activeskillcalclimit}]]}}" title="Skill Roll" />
+            <button class="sheet-hidden-roll" type="roll" name="roll_activeskillroll" value="&{template:sr} {{shownotes=@{configshownotes}}} {{name=@{name}}} {{roll_header=Active Skill}} {{v1=@{activeskillname}}} {{v1_num=@{activeskillbase}}} {{v2=Attribute}} {{v2_num=@{activeskillattr}}} {{v3=Misc}} {{v3_num=@{activeskillmisc}}} {{v4=Situational Modifier}} {{v4_num=?{Situational Modifiers?|0}}} {{v5=Specialized}} {{v5_num=2}} {{woundpenalty=[[@{calcwoundmod}]]}} {{limit=@{activeskillcalclimit}}} {{result1_label=Successes}} {{result1=[[(@{activeskilldiesum}+2+?{Situational Modifiers?|0})d6>5sk@{activeskillcalclimit}]]}}" title="Skill Roll" />
             <input type="number" name="attr_activeskillspectotal" value="@{activeskillattr}+@{activeskillbase}+@{activeskillmisc}+2" disabled="true" />
             </button>
           </div>
@@ -841,12 +849,12 @@
           </div>
           <div class="sheet-item sheet-puny">
             <input type="hidden" name="attr_knowledgeskilldiesum" value="@{knowledgeskillattr}+@{knowledgeskillbase}+@{knowledgeskillmisc}-@{calcwoundmod}" disabled="true" />
-            <button class="sheet-hidden-roll" type="roll" name="roll_knowledgeskillroll" value="&{template:sr} {{name=@{name}}} {{roll_header=knowledge Skill}} {{v1=@{knowledgeskillname}}} {{v1_num=@{knowledgeskillbase}}} {{v2=Attribute}} {{v2_num=@{knowledgeskillattr}}} {{v3=Misc}} {{v3_num=@{knowledgeskillmisc}}} {{v4=Situational Modifier}} {{v4_num=?{Situational Modifiers?|0}}} {{woundpenalty=[[@{calcwoundmod}]]}} {{limit=@{knowledgeskillcalclimit}}} {{result1_label=Successes}} {{result1=[[(@{knowledgeskilldiesum}+?{Situational Modifiers?|0})d6>5sk@{knowledgeskillcalclimit}]]}}" title="Skill Roll" />
+            <button class="sheet-hidden-roll" type="roll" name="roll_knowledgeskillroll" value="&{template:sr} {{shownotes=@{configshownotes}}} {{name=@{name}}} {{roll_header=knowledge Skill}} {{v1=@{knowledgeskillname}}} {{v1_num=@{knowledgeskillbase}}} {{v2=Attribute}} {{v2_num=@{knowledgeskillattr}}} {{v3=Misc}} {{v3_num=@{knowledgeskillmisc}}} {{v4=Situational Modifier}} {{v4_num=?{Situational Modifiers?|0}}} {{woundpenalty=[[@{calcwoundmod}]]}} {{limit=@{knowledgeskillcalclimit}}} {{result1_label=Successes}} {{result1=[[(@{knowledgeskilldiesum}+?{Situational Modifiers?|0})d6>5sk@{knowledgeskillcalclimit}]]}}" title="Skill Roll" />
             <input type="number" name="attr_knowledgeskilltotal" value="@{knowledgeskillattr}+@{knowledgeskillbase}+@{knowledgeskillmisc}" disabled="true" />
             </button>
           </div>
           <div class="sheet-item sheet-puny">
-            <button class="sheet-hidden-roll" type="roll" name="roll_knowledgeskillroll" value="&{template:sr} {{name=@{name}}} {{roll_header=knowledge Skill}} {{v1=@{knowledgeskillname}}} {{v1_num=@{knowledgeskillbase}}} {{v2=Attribute}} {{v2_num=@{knowledgeskillattr}}} {{v3=Misc}} {{v3_num=@{knowledgeskillmisc}}} {{v4=Situational Modifier}} {{v4_num=?{Situational Modifiers?|0}}} {{v5=Specialized}} {{v5_num=2}} {{woundpenalty=[[@{calcwoundmod}]]}} {{limit=@{knowledgeskillcalclimit}}} {{result1_label=Successes}} {{result1=[[(@{knowledgeskilldiesum}+2+?{Situational Modifiers?|0})d6>5sk@{knowledgeskillcalclimit}]]}}" title="Skill Roll" />
+            <button class="sheet-hidden-roll" type="roll" name="roll_knowledgeskillroll" value="&{template:sr} {{shownotes=@{configshownotes}}} {{name=@{name}}} {{roll_header=knowledge Skill}} {{v1=@{knowledgeskillname}}} {{v1_num=@{knowledgeskillbase}}} {{v2=Attribute}} {{v2_num=@{knowledgeskillattr}}} {{v3=Misc}} {{v3_num=@{knowledgeskillmisc}}} {{v4=Situational Modifier}} {{v4_num=?{Situational Modifiers?|0}}} {{v5=Specialized}} {{v5_num=2}} {{woundpenalty=[[@{calcwoundmod}]]}} {{limit=@{knowledgeskillcalclimit}}} {{result1_label=Successes}} {{result1=[[(@{knowledgeskilldiesum}+2+?{Situational Modifiers?|0})d6>5sk@{knowledgeskillcalclimit}]]}}" title="Skill Roll" />
             <input type="number" name="attr_knowledgeskillspectotal" value="@{knowledgeskillattr}+@{knowledgeskillbase}+@{knowledgeskillmisc}+2" disabled="true" />
             </button>
           </div>
@@ -944,12 +952,12 @@
           </div>
           <div class="sheet-item sheet-puny">
             <input type="hidden" name="attr_matrixactionskilldiesum" value="@{matrixactionskillattr}+@{matrixactionskillbase}+@{matrixactionskillmisc}-@{calcwoundmod}" disabled="true" />
-            <button class="sheet-hidden-roll" type="roll" name="roll_matrixactionskillroll" value="&{template:sr} {{name=@{name}}} {{roll_header=Matrix Action}} {{v1=@{matrixactionskillname}}} {{v1_num=@{matrixactionskillbase}}} {{v2=Attribute}} {{v2_num=@{matrixactionskillattr}}} {{v3=Misc}} {{v3_num=@{matrixactionskillmisc}}} {{v4=Situational Modifier}} {{v4_num=?{Situational Modifiers?|0}}} {{woundpenalty=[[@{calcwoundmod}]]}} {{limit=@{matrixactionskillcalclimit}}} {{result1_label=Successes}} {{result1=[[(@{matrixactionskilldiesum}+?{Situational Modifiers?|0})d6>5sk@{matrixactionskillcalclimit}]]}}" title="Skill Roll" />
+            <button class="sheet-hidden-roll" type="roll" name="roll_matrixactionskillroll" value="&{template:sr} {{shownotes=@{configshownotes}}} {{name=@{name}}} {{roll_header=Matrix Action}} {{v1=@{matrixactionskillname}}} {{v1_num=@{matrixactionskillbase}}} {{v2=Attribute}} {{v2_num=@{matrixactionskillattr}}} {{v3=Misc}} {{v3_num=@{matrixactionskillmisc}}} {{v4=Situational Modifier}} {{v4_num=?{Situational Modifiers?|0}}} {{woundpenalty=[[@{calcwoundmod}]]}} {{limit=@{matrixactionskillcalclimit}}} {{notes=@{matrixactionskillnotes}}} {{result1_label=Successes}} {{result1=[[(@{matrixactionskilldiesum}+?{Situational Modifiers?|0})d6>5sk@{matrixactionskillcalclimit}]]}}" title="Skill Roll" />
             <input type="number" name="attr_matrixactionskilltotal" value="@{matrixactionskillattr}+@{matrixactionskillbase}+@{matrixactionskillmisc}" disabled="true" />
             </button>
           </div>
           <div class="sheet-item sheet-puny">
-            <button class="sheet-hidden-roll" type="roll" name="roll_matrixactionskillroll" value="&{template:sr} {{name=@{name}}} {{roll_header=matrixaction Skill}} {{v1=@{matrixactionskillname}}} {{v1_num=@{matrixactionskillbase}}} {{v2=Attribute}} {{v2_num=@{matrixactionskillattr}}} {{v3=Misc}} {{v3_num=@{matrixactionskillmisc}}} {{v4=Situational Modifier}} {{v4_num=?{Situational Modifiers?|0}}} {{v5=Specialized}} {{v5_num=2}} {{woundpenalty=[[@{calcwoundmod}]]}} {{limit=@{matrixactionskillcalclimit}}} {{result1_label=Successes}} {{result1=[[(@{matrixactionskilldiesum}+2+?{Situational Modifiers?|0})d6>5sk@{matrixactionskillcalclimit}]]}}" title="Skill Roll" />
+            <button class="sheet-hidden-roll" type="roll" name="roll_matrixactionskillroll" value="&{template:sr} {{shownotes=@{configshownotes}}} {{name=@{name}}} {{roll_header=matrixaction Skill}} {{v1=@{matrixactionskillname}}} {{v1_num=@{matrixactionskillbase}}} {{v2=Attribute}} {{v2_num=@{matrixactionskillattr}}} {{v3=Misc}} {{v3_num=@{matrixactionskillmisc}}} {{v4=Situational Modifier}} {{v4_num=?{Situational Modifiers?|0}}} {{v5=Specialized}} {{v5_num=2}} {{woundpenalty=[[@{calcwoundmod}]]}} {{limit=@{matrixactionskillcalclimit}}} {{result1_label=Successes}} {{result1=[[(@{matrixactionskilldiesum}+2+?{Situational Modifiers?|0})d6>5sk@{matrixactionskillcalclimit}]]}}" title="Skill Roll" />
             <input type="number" name="attr_matrixactionskillspectotal" value="@{matrixactionskillattr}+@{matrixactionskillbase}+@{matrixactionskillmisc}+2" disabled="true" />
             </button>
           </div>
@@ -1059,13 +1067,13 @@
           </div>
           <div class="sheet-item sheet-puny">
             <button type="roll" name="roll_attackprimary"
-             value="&{template:sr} {{name=@{name}}} {{roll_header=@{repeatingweaponname} Attack}} {{v1=Agility}} {{v1_num=@{agility}}} {{v2=Skill}} {{v2_num=@{repeatingweaponskill}}} {{v3=Misc}} {{v3_num=@{repeatingweaponmisc}}} {{v9=Situational Modifiers?}} {{v9_num=?{Situational Modifiers?|0}}} {{limit=@{repeatingweaponacc}}}{{woundpenalty=[[@{calcwoundmod}]]}} {{result1_label=Hits}} {{result1=[[(@{repeatingweaponskill}+@{repeatingweaponmisc}+@{agility}+?{Situational Modifiers?|0}-@{calcwoundmod})d6>5sk@{repeatingweaponacc}]]}} {{result2_label=Damage}} {{result2=@{repeatingweapondam} AP @{repeatingweaponap}}} " />
+             value="&{template:sr} {{shownotes=@{configshownotes}}} {{name=@{name}}} {{roll_header=@{repeatingweaponname} Attack}} {{v1=Agility}} {{v1_num=@{agility}}} {{v2=Skill}} {{v2_num=@{repeatingweaponskill}}} {{v3=Misc}} {{v3_num=@{repeatingweaponmisc}}} {{v9=Situational Modifiers?}} {{v9_num=?{Situational Modifiers?|0}}} {{limit=@{repeatingweaponacc}}}{{woundpenalty=[[@{calcwoundmod}]]}} {{result1_label=Hits}} {{result1=[[(@{repeatingweaponskill}+@{repeatingweaponmisc}+@{agility}+?{Situational Modifiers?|0}-@{calcwoundmod})d6>5sk@{repeatingweaponacc}]]}} {{result2_label=Damage}} {{result2=@{repeatingweapondam} AP @{repeatingweaponap}}} " />
             <input type="number" name="attr_repeatingweaponattacktotal" value="[[@{repeatingweaponskill}+@{repeatingweaponmisc}+@{agility}]]" disabled="true" />
             </button>
           </div>
           <div class="sheet-item sheet-puny">
             <button type="roll" name="roll_attackprimaryspec"
-             value="&{template:sr} {{name=@{name}}} {{roll_header=@{repeatingweaponname} Attack}} {{v1=Agility}} {{v1_num=@{agility}}} {{v2=Skill}} {{v2_num=@{repeatingweaponskill}}} {{v3=Misc}} {{v3_num=@{repeatingweaponmisc}}} {{v4=Specialized}} {{v4_num=2}} {{v9=Situational Modifiers?}} {{v9_num=?{Situational Modifiers?|0}}} {{limit=@{repeatingweaponacc}}}{{woundpenalty=[[@{calcwoundmod}]]}} {{result1_label=Hits}} {{result1=[[(@{repeatingweaponskill}+@{repeatingweaponmisc}+@{agility}+2+?{Situational Modifiers?|0}-@{calcwoundmod})d6>5sk@{repeatingweaponacc}]]}} {{result2_label=Damage}} {{result2=@{repeatingweapondam} AP @{repeatingweaponap}}} " />
+             value="&{template:sr} {{shownotes=@{configshownotes}}} {{name=@{name}}} {{roll_header=@{repeatingweaponname} Attack}} {{v1=Agility}} {{v1_num=@{agility}}} {{v2=Skill}} {{v2_num=@{repeatingweaponskill}}} {{v3=Misc}} {{v3_num=@{repeatingweaponmisc}}} {{v4=Specialized}} {{v4_num=2}} {{v9=Situational Modifiers?}} {{v9_num=?{Situational Modifiers?|0}}} {{limit=@{repeatingweaponacc}}}{{woundpenalty=[[@{calcwoundmod}]]}} {{result1_label=Hits}} {{result1=[[(@{repeatingweaponskill}+@{repeatingweaponmisc}+@{agility}+2+?{Situational Modifiers?|0}-@{calcwoundmod})d6>5sk@{repeatingweaponacc}]]}} {{result2_label=Damage}} {{result2=@{repeatingweapondam} AP @{repeatingweaponap}}} " />
             <input type="number" name="attr_repeatingweaponattacktotalspec" value="[[@{repeatingweaponskill}+@{repeatingweaponmisc}+@{agility}+2]]" disabled="true" />
             </button>
           </div>
@@ -1143,13 +1151,13 @@
           </div>
           <div class="sheet-item sheet-puny">
             <button type="roll" name="roll_attackprimary"
-             value="&{template:sr} {{name=@{name}}} {{roll_header=@{repeatingweaponname} Attack}} {{v1=Agility}} {{v1_num=@{agility}}} {{v2=Skill}} {{v2_num=@{repeatingweaponskill}}} {{v3=Misc}} {{v3_num=@{repeatingweaponmisc}}} {{v9=Situational Modifiers?}} {{v9_num=?{Situational Modifiers?|0}}} {{limit=@{repeatingweaponacc}}}{{woundpenalty=[[@{calcwoundmod}]]}} {{result1_label=Hits}} {{result1=[[(@{repeatingweaponskill}+@{repeatingweaponmisc}+@{agility}+?{Situational Modifiers?|0}-@{calcwoundmod})d6>5sk@{repeatingweaponacc}]]}} {{result2_label=Damage}} {{result2=@{repeatingweapondam} AP @{repeatingweaponap}}} " />
+             value="&{template:sr} {{shownotes=@{configshownotes}}} {{name=@{name}}} {{roll_header=@{repeatingweaponname} Attack}} {{v1=Agility}} {{v1_num=@{agility}}} {{v2=Skill}} {{v2_num=@{repeatingweaponskill}}} {{v3=Misc}} {{v3_num=@{repeatingweaponmisc}}} {{v9=Situational Modifiers?}} {{v9_num=?{Situational Modifiers?|0}}} {{limit=@{repeatingweaponacc}}}{{woundpenalty=[[@{calcwoundmod}]]}} {{result1_label=Hits}} {{result1=[[(@{repeatingweaponskill}+@{repeatingweaponmisc}+@{agility}+?{Situational Modifiers?|0}-@{calcwoundmod})d6>5sk@{repeatingweaponacc}]]}} {{result2_label=Damage}} {{result2=@{repeatingweapondam} AP @{repeatingweaponap}}} " />
             <input type="number" name="attr_repeatingweaponattacktotal" value="[[@{repeatingweaponskill}+@{repeatingweaponmisc}+@{agility}]]" disabled="true" />
             </button>
           </div>
           <div class="sheet-item sheet-puny">
             <button type="roll" name="roll_attackprimaryspec"
-             value="&{template:sr} {{name=@{name}}} {{roll_header=@{repeatingweaponname} Attack}} {{v1=Agility}} {{v1_num=@{agility}}} {{v2=Skill}} {{v2_num=@{repeatingweaponskill}}} {{v3=Misc}} {{v3_num=@{repeatingweaponmisc}}} {{v4=Specialized}} {{v4_num=2}} {{v9=Situational Modifiers?}} {{v9_num=?{Situational Modifiers?|0}}} {{limit=@{repeatingweaponacc}}}{{woundpenalty=[[@{calcwoundmod}]]}} {{result1_label=Hits}} {{result1=[[(@{repeatingweaponskill}+@{repeatingweaponmisc}+@{agility}+2+?{Situational Modifiers?|0}-@{calcwoundmod})d6>5sk@{repeatingweaponacc}]]}} {{result2_label=Damage}} {{result2=@{repeatingweapondam} AP @{repeatingweaponap}}} " />
+             value="&{template:sr} {{shownotes=@{configshownotes}}} {{name=@{name}}} {{roll_header=@{repeatingweaponname} Attack}} {{v1=Agility}} {{v1_num=@{agility}}} {{v2=Skill}} {{v2_num=@{repeatingweaponskill}}} {{v3=Misc}} {{v3_num=@{repeatingweaponmisc}}} {{v4=Specialized}} {{v4_num=2}} {{v9=Situational Modifiers?}} {{v9_num=?{Situational Modifiers?|0}}} {{limit=@{repeatingweaponacc}}}{{woundpenalty=[[@{calcwoundmod}]]}} {{result1_label=Hits}} {{result1=[[(@{repeatingweaponskill}+@{repeatingweaponmisc}+@{agility}+2+?{Situational Modifiers?|0}-@{calcwoundmod})d6>5sk@{repeatingweaponacc}]]}} {{result2_label=Damage}} {{result2=@{repeatingweapondam} AP @{repeatingweaponap}}} " />
             <input type="number" name="attr_repeatingweaponattacktotalspec" value="[[@{repeatingweaponskill}+@{repeatingweaponmisc}+@{agility}+2]]" disabled="true" />
             </button>
           </div>
@@ -1241,12 +1249,12 @@
             <input type="text" name="attr_spelldesc" />
           </div>
           <div class="sheet-item sheet-puny">
-            <button type="roll" name="roll_spellroll" value="&{template:sr} {{name=@{name}}} {{roll_header=@{spellname}}} {{v1=Force}} {{v1_num=?{Force?|0}}} {{v2=Willpower}} {{v2_num=@{willpower}}} {{v3=Drain Attribute}} {{v3_num=@{drainfadeattribute}}} {{v4=Magic/Resonance}} {{v4_num=@{magicresonance}}} {{v5=Skill}} {{v5_num=@{spellsoftskillvalue}}} {{v6=Spell Drain}} {{v6_num=F@{spelldrain}}} {{v7=Misc}} {{v7_num=@{spellmisc}}} {{v9=Situational Modifier}} {{v9_num=?{Situational Modifiers?|0}}} {{woundpenalty=[[@{calcwoundmod}]]}} {{result1_label=Casting Success}} {{result1=[[(@{spellsoftskillvalue}+@{spellmisc}+@{magicresonance}-@{calcwoundmod}+?{Situational Modifiers?|0})d6>5sk?{Force?|0}]]}} {{result2_label=Incoming Drain (min 2)}} {{result2=[[(?{Force?|0}+@{spelldrain})]]}} {{result3_label=Drain Resisted}} {{limit=?{Force?|0}}} {{result3=[[(@{willpower}+@{drainfadeattribute})d6>5s]]}} {{description=@{spelldesc}}}" title="Spell Roll" />
+            <button type="roll" name="roll_spellroll" value="&{template:sr} {{shownotes=@{configshownotes}}} {{name=@{name}}} {{roll_header=@{spellname}}} {{v1=Force}} {{v1_num=?{Force?|0}}} {{v2=Willpower}} {{v2_num=@{willpower}}} {{v3=Drain Attribute}} {{v3_num=@{drainfadeattribute}}} {{v4=Magic/Resonance}} {{v4_num=@{magicresonance}}} {{v5=Skill}} {{v5_num=@{spellsoftskillvalue}}} {{v6=Spell Drain}} {{v6_num=F@{spelldrain}}} {{v7=Misc}} {{v7_num=@{spellmisc}}} {{v9=Situational Modifier}} {{v9_num=?{Situational Modifiers?|0}}} {{woundpenalty=[[@{calcwoundmod}]]}} {{result1_label=Casting Success}} {{result1=[[(@{spellsoftskillvalue}+@{spellmisc}+@{magicresonance}-@{calcwoundmod}+?{Situational Modifiers?|0})d6>5sk?{Force?|0}]]}} {{result2_label=Incoming Drain (min 2)}} {{result2=[[(?{Force?|0}+@{spelldrain})]]}} {{result3_label=Drain Resisted}} {{limit=?{Force?|0}}} {{result3=[[(@{willpower}+@{drainfadeattribute})d6>5s]]}} {{description=@{spelldesc}}}" title="Spell Roll" />
             <input type="number" name="attr_spellrollshow" value="(@{spellsoftskillvalue}+@{magicresonance})" disabled="true" />
             </button>
           </div>
           <div class="sheet-item sheet-puny">
-            <button type="roll" name="roll_spellspecroll" value="&{template:sr} {{name=@{name}}} {{roll_header=@{spellname}}} {{v1=Force}} {{v1_num=?{Force?|0}}} {{v2=Willpower}} {{v2_num=@{willpower}}} {{v3=Drain Attribute}} {{v3_num=@{drainfadeattribute}}} {{v4=Magic/Resonance}} {{v4_num=@{magicresonance}}} {{v5=Skill}} {{v5_num=@{spellsoftskillvalue}}} {{v6=Spell Drain}} {{v6_num=F@{spelldrain}}} {{v7=Misc}} {{v7_num=@{spellmisc}}} {{v9=Situational Modifier}} {{v9_num=?{Situational Modifiers?|0}}} {{woundpenalty=[[@{calcwoundmod}]]}} {{result1_label=Casting Success}} {{result1=[[(@{spellsoftskillvalue}+@{spellmisc}+@{magicresonance}-@{calcwoundmod}+?{Situational Modifiers?|0})d6>5sk?{Force?|0}]]}} {{result2_label=Incoming Drain (min 2)}} {{result2=[[(?{Force?|0}+@{spelldrain})]]}} {{limit=?{Force?|0}}} {{result3_label=Drain Resisted}} {{result3=[[(@{willpower}+2+@{drainfadeattribute})d6>5s]]}} {{description=@{spelldesc}}}" title="Spell Roll" />
+            <button type="roll" name="roll_spellspecroll" value="&{template:sr} {{shownotes=@{configshownotes}}} {{name=@{name}}} {{roll_header=@{spellname}}} {{v1=Force}} {{v1_num=?{Force?|0}}} {{v2=Willpower}} {{v2_num=@{willpower}}} {{v3=Drain Attribute}} {{v3_num=@{drainfadeattribute}}} {{v4=Magic/Resonance}} {{v4_num=@{magicresonance}}} {{v5=Skill}} {{v5_num=@{spellsoftskillvalue}}} {{v6=Spell Drain}} {{v6_num=F@{spelldrain}}} {{v7=Misc}} {{v7_num=@{spellmisc}}} {{v9=Situational Modifier}} {{v9_num=?{Situational Modifiers?|0}}} {{woundpenalty=[[@{calcwoundmod}]]}} {{result1_label=Casting Success}} {{result1=[[(@{spellsoftskillvalue}+@{spellmisc}+@{magicresonance}-@{calcwoundmod}+?{Situational Modifiers?|0})d6>5sk?{Force?|0}]]}} {{result2_label=Incoming Drain (min 2)}} {{result2=[[(?{Force?|0}+@{spelldrain})]]}} {{limit=?{Force?|0}}} {{result3_label=Drain Resisted}} {{result3=[[(@{willpower}+2+@{drainfadeattribute})d6>5s]]}} {{description=@{spelldesc}}}" title="Spell Roll" />
             <input type="number" name="attr_spellspecrollshow" value="(@{spellsoftskillvalue}+2+@{magicresonance})" disabled="true" />
             </button>
           </div>
@@ -1266,7 +1274,7 @@
         <div class="sheet-row">
           <div class="sheet-item sheet-big">
             <input type="hidden" name="attr_avoidrollsum" value="@{reaction}+@{intuition}+@{avoidmisc}-@{calcwoundmod}" diabled="true" />
-            <button type="roll" name="roll_avoidance" value="&{template:sr} {{name=@{name}}} {{roll_header=Avoidance Roll}} {{v1=Avoidance}} {{v1_num=@{avoid}}} {{v2=Avoid Misc}} {{v2_num=@{avoidmisc}}} {{woundpenalty=[[@{calcwoundmod}]]}} {{v9=Situational Modifiers?}} {{v9_num=?{Situational Modifiers?|0}}} {{result1_label=Hits Avoided}} {{result1=[[(@{avoidrollsum}+?{Situational Modifiers?|0})d6>5s]]}}" title="Defense Roll">
+            <button type="roll" name="roll_avoidance" value="&{template:sr} {{shownotes=@{configshownotes}}} {{name=@{name}}} {{roll_header=Avoidance Roll}} {{v1=Avoidance}} {{v1_num=@{avoid}}} {{v2=Avoid Misc}} {{v2_num=@{avoidmisc}}} {{woundpenalty=[[@{calcwoundmod}]]}} {{v9=Situational Modifiers?}} {{v9_num=?{Situational Modifiers?|0}}} {{result1_label=Hits Avoided}} {{result1=[[(@{avoidrollsum}+?{Situational Modifiers?|0})d6>5s]]}}" title="Defense Roll">
             <input type="text" name="attr_avoidancebutton" value="@{avoidrollsum}" disabled="true" />
             </button>
           </div>
@@ -1323,7 +1331,7 @@
               <input type="text" name="attr_repeatingarmornotes" />
             </div>
             <div class="sheet-item sheet-puny">
-              <button type="roll" name="roll_ccidefense" value="&{template:sr} {{name=@{name}}} {{roll_header=Soak Roll for @{repeatingarmorname}}} {{v1=Body}} {{v1_num=@{body}}} {{v2=Armor}} {{v2_num=@{repeatingarmor}}} {{v3=Misc}} {{v3_num=@{repeatingarmormisc}}} {{v4=Armor Pen}} {{v4_num=?{Armor Penetration?|0}}} {{result1_label=Damage Reduction}} {{result1=[[(@{body}+@{repeatingarmor}+@{repeatingarmormisc}+?{Armor Penetration?|0})d6>5s]]}}" title="Soak Roll">
+              <button type="roll" name="roll_ccidefense" value="&{template:sr} {{shownotes=@{configshownotes}}} {{name=@{name}}} {{roll_header=Soak Roll for @{repeatingarmorname}}} {{v1=Body}} {{v1_num=@{body}}} {{v2=Armor}} {{v2_num=@{repeatingarmor}}} {{v3=Misc}} {{v3_num=@{repeatingarmormisc}}} {{v4=Armor Pen}} {{v4_num=?{Armor Penetration?|0}}} {{result1_label=Damage Reduction}} {{result1=[[(@{body}+@{repeatingarmor}+@{repeatingarmormisc}+?{Armor Penetration?|0})d6>5s]]}}" title="Soak Roll">
               <input type="text" name="attr_soaksum" value="@{body}+@{repeatingarmor}+@{repeatingarmormisc}" disabled="true" />
               </button>
             </div>
@@ -1364,7 +1372,7 @@
               <input type="text" name="attr_augnotes" />
             </div>
             <div class="sheet-item sheet-little">
-              <input type="number" name="attr_augessence" />
+              <input type="text" name="attr_augessence" />
             </div>
           </div>
         </fieldset>
@@ -1688,53 +1696,77 @@
     </div>
     <div class="sheet-col">
       <h3>Special Rolls</h3>
-      <button type="roll" name="roll_summonspirit" value="&{template:sr} {{roll_header=Summon Spirit}} {{name=@{name}}} {{v1=Magic}} {{v1_num=@{magicresonance}}} {{v2=Summoning}} {{v2_num=?{Summoning Skill?|0}}} {{v3=Spirit Force}} {{v3_num=?{Spirit Force?|0}}} {{woundpenalty=[[@{calcwoundmod}]]}} {{limit=?{Limit?|0}}} {{result1_label=Summoning Hits}} {{result1=[[(@{magicresonance}+?{Summoning Skill?|0}-@{calcwoundmod})d6>5sk?{Limit?|0}]]}} {{result2_label=Spirit Hits}} {{result2=[[(?{Spirit Force?|0})d6>5s]]}} {{spiritdrain=Yes}} {{result4_label=Drain Resist}} {{result4=[[(@{willpower}+@{drainfadeattribute})d6>5s]]}}" title="Test Roll">
+      <button type="roll" name="roll_summonspirit" value="&{template:sr} {{shownotes=@{configshownotes}}} {{roll_header=Summon Spirit}} {{name=@{name}}} {{v1=Magic}} {{v1_num=@{magicresonance}}} {{v2=Summoning}} {{v2_num=?{Summoning Skill?|0}}} {{v3=Spirit Force}} {{v3_num=?{Spirit Force?|0}}} {{woundpenalty=[[@{calcwoundmod}]]}} {{limit=?{Limit?|0}}} {{result1_label=Summoning Hits}} {{result1=[[(@{magicresonance}+?{Summoning Skill?|0}-@{calcwoundmod})d6>5sk?{Limit?|0}]]}} {{result2_label=Spirit Hits}} {{result2=[[(?{Spirit Force?|0})d6>5s]]}} {{spiritdrain=Yes}} {{result4_label=Drain Resist}} {{result4=[[(@{willpower}+@{drainfadeattribute})d6>5s]]}}" title="Test Roll">
       <input type="text" name="attr_summonspiritlabel" value="Summon Spirit" disabled="true" />
       </button>
     </div>
   </div>
-
-<!-- Eleventh Tier -->
-
-     <div class="sheet-col">
-      <h3>Karma</h3>
-      <div class="sheet-box">
-        <div class="sheet-header sheet-bottomline">
+  
+  <!-- Eleventh Tier -->
+  
+  <div class="sheet-col">
+    <h3>Karma</h3>
+    <div class="sheet-box">
+      <div class="sheet-header sheet-bottomline">
+        <div class="sheet-item sheet-large">
+          <label>Date</label>
+        </div>
+        <div class="sheet-item sheet-tiny">
+          <label>Game #</label>
+        </div>
+        <div class="sheet-item sheet-tiny">
+          <label>Amount</label>
+        </div>
+        <div class="sheet-item sheet-large">
+          <label>Spent on or earned for....</label>
+        </div>
+      </div>
+      <fieldset class="repeating_karma">
+        <div class="sheet-row">
           <div class="sheet-item sheet-large">
-            <label>Date</label>
+            <input type="text" name="attr_karmaname" />
           </div>
           <div class="sheet-item sheet-tiny">
-            <label>Game #</label>
+            <input type="number" name="attr_karmagame" />
           </div>
           <div class="sheet-item sheet-tiny">
-            <label>Amount</label>
+            <input type="number" name="attr_karmaamount" />
           </div>
           <div class="sheet-item sheet-large">
-            <label>Spent on or earned for....</label>
+            <input type="text" name="attr_karmanotes" />
           </div>
         </div>
-        <fieldset class="repeating_karma">
-          <div class="sheet-row">
-            <div class="sheet-item sheet-large">
-              <input type="text" name="attr_karmaname" />
-            </div>
-            <div class="sheet-item sheet-tiny">
-              <input type="number" name="attr_karmagame" />
-            </div>
-            <div class="sheet-item sheet-tiny">
-              <input type="number" name="attr_karmaamount" />
-            </div>
-            <div class="sheet-item sheet-large">
-              <input type="text" name="attr_karmanotes" />
-            </div>
-          </div>
-        </fieldset>
+      </fieldset>
+    </div>
+  </div>
+  <!-- Config Tier -->
+  
+  <div class="sheet-col">
+    <h3>Config (In testing. All choices are 1=ON 0=OFF. Not all choices work yet.)</h3>
+    <div class="sheet-box">
+      <div class="sheet-header sheet-bottomline">
+        <div class="sheet-item sheet-tiny">
+          <label>Config</label>
+        </div>
+        <div class="sheet-item sheet-tiny">
+          <label>Value</label>
+        </div>
+        <div class="sheet-item sheet-huge">
+          <label>Amount</label>
+        </div>
+      </div>
+      <div class="sheet-row">
+        <div class="sheet-item sheet-tiny"> shownotes </div>
+        <div class="sheet-item sheet-tiny">
+          <input type="number" name="attr_configshownotes" value="0" />
+        </div>
+        <div class="sheet-item sheet-huge"> Should the notes field be shown when rolls are made?</div>
       </div>
     </div>
+  </div>
 </div>
 
 
-
 <rolltemplate class="sheet-rolltemplate-sr">
   <table>
     <tr>
@@ -1855,7 +1887,6 @@
     </tr>
     {{/spiritdrain}}
     
-    
     {{#result4}}
     <tr>
       <td class="result" align="right" >{{result4}}</td>
@@ -1871,11 +1902,19 @@
       <td class="result" align="center">{{result5_label}}</td>
     </tr>
     {{/result5}}
+    
     {{#description}}
     <tr>
       <td class="description" align="left" colspan="3">{{description}}</td>
     </tr>
     {{/description}}
+
+    {{#notes}}
+    <tr>
+      <td class="notes" align="left" colspan="3">{{notes}}</td>
+    </tr>
+    {{/notes}}
+
     <tr>
       <td colspan="3">&nbsp;</td>
     </tr>