diff --git a/ADnD_2E_Revised/2ESheet.html b/ADnD_2E_Revised/2ESheet.html
index 2ade507c99..a9fcd825fd 100644
--- a/ADnD_2E_Revised/2ESheet.html
+++ b/ADnD_2E_Revised/2ESheet.html
@@ -13936,8 +13936,8 @@
                                 <td><input type="text" name="attr_ppa2" title="@{ppa2}" value="-0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_ppl2" title="@{ppl2}" value="0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_ppt2" title="@{ppt2}" value="(@{ppb2})+(@{ppr2})+(@{ppd2})+(@{ppk2})+(@{ppm2})+(@{ppa2})+(@{ppl2})" disabled class="sheet-short"/>%</td>
-                                <td><button type="roll" name="roll_pp2" title="%{pp2}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{ppt2})]] [@{henchname4} Pick Pockets]">Armor</button></td>
-                                <td><button type="roll" name="roll_ppnoarmor2" title="%{ppnoarmor2}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{ppb2})+(@{ppr2})+(@{ppd2})+(@{ppk2})+(@{ppm2})+(@{ppl2})+5]] [@{henchname4} Pick Pockets (without armor)]">No Armor</button></td>
+                                <td><button type="roll" name="roll_pp2" title="%{pp2}" value="/w gm &{template:2Echeck} {{checkvs=Pick Pockets}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{ppt2}]]}}">Armor</button></td>
+                                <td><button type="roll" name="roll_ppnoarmor2" title="%{ppnoarmor2}" value="/w gm &{template:2Echeck} {{checkvs=Pick Pockets\n(in No Armor)}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{ppb2})+(@{ppr2})+(@{ppd2})+(@{ppk2})+(@{ppm2})+(@{ppl2})+5]]}}">No Armor</button></td>
                             </tr>
                             <tr>
                                 <td>Open Locks</td>
@@ -13949,8 +13949,8 @@
                                 <td><input type="text" name="attr_ola2" title="@{ola2}" value="-0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_oll2" title="@{oll2}" value="0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_olt2" title="@{olt2}" value="(@{olb2})+(@{olr2})+(@{old2})+(@{olk2})+(@{olm2})+(@{ola2})+(@{oll2})" disabled class="sheet-short"/>%</td>
-                                <td><button type="roll" name="roll_ol2" title="%{ol2}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{olt2})]] [@{henchname4} Open Locks]">Armor</button></td>
-                                <td><button type="roll" name="roll_olnoarmor2" title="%{olnoarmor2}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{olb2})+(@{olr2})+(@{old2})+(@{olk2})+(@{olm2})+(@{oll2})]] [@{henchname4} Open Locks (without armor)]">No Armor</button></td>
+                                <td><button type="roll" name="roll_ol2" title="%{ol2}" value="/w gm &{template:2Echeck} {{checkvs=Open Locks}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{olt2}]]}}">Armor</button></td>
+                                <td><button type="roll" name="roll_olnoarmor2" title="%{olnoarmor2}" value="/w gm &{template:2Echeck} {{checkvs=Open Locks\n(in No Armor)}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{olb2})+(@{olr2})+(@{old2})+(@{olk2})+(@{olm2})+(@{oll2})]]}}">No Armor</button></td>
                             </tr>
                             <tr>
                                 <td>Find/Remove Traps</td>
@@ -13962,8 +13962,8 @@
                                 <td><input type="text" name="attr_rta2" title="@{rta2}" value="-0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_rtl2" title="@{rtl2}" value="0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_rtt2" title="@{rtt2}" value="(@{rtb2})+(@{rtr2})+(@{rtd2})+(@{rtk2})+(@{rtm2})+(@{rta2})+(@{rtl2})" disabled class="sheet-short"/>%</td>
-                                <td><button type="roll" name="roll_rt2" title="%{rt2}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{rtt2})]] [@{henchname4} Find/Remove Traps]">Armor</button></td>
-                                <td><button type="roll" name="roll_rtnoarmor2" title="%{rtnoarmor2}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{rtb2})+(@{rtr2})+(@{rtd2})+(@{rtk2})+(@{rtm2})+(@{rtl2})]] [@{henchname4} Find/Remove Traps (without armor)]">No Armor</button></td>
+                                <td><button type="roll" name="roll_rt2" title="%{rt2}" value="/w gm &{template:2Echeck} {{checkvs=Find/Remove Traps}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{rtt2}]]}}">Armor</button></td>
+                                <td><button type="roll" name="roll_rtnoarmor2" title="%{rtnoarmor2}" value="/w gm &{template:2Echeck} {{checkvs=Find/Remove Traps\n(in No Armor)}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{rtb2})+(@{rtr2})+(@{rtd2})+(@{rtk2})+(@{rtm2})+(@{rtl2})]]}}">No Armor</button></td>
                             </tr>
                             <tr>
                                 <td>Move Silently</td>
@@ -13975,8 +13975,8 @@
                                 <td><input type="text" name="attr_msa2" title="@{msa2}" value="-0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_msl2" title="@{msl2}" value="0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_mst2" title="@{mst2}" value="(@{msb2})+(@{msr2})+(@{msd2})+(@{msk2})+(@{msm2})+(@{msa2})+(@{msl2})" disabled class="sheet-short"/>%</td>
-                                <td><button type="roll" name="roll_ms2" title="%{ms2}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{mst2})]] [@{henchname4} Move Silently]">Armor</button></td>
-                                <td><button type="roll" name="roll_msnoarmor2" title="%{msnoarmor2}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{msb2})+(@{msr2})+(@{msd2})+(@{msk2})+(@{msm2})+(@{msl2})+10]] [@{henchname4} Move Silently (without armor)]">No Armor</button></td>
+                                <td><button type="roll" name="roll_ms2" title="%{ms2}" value="/w gm &{template:2Echeck} {{checkvs=Move Silently}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{mst2}]]}}">Armor</button></td>
+                                <td><button type="roll" name="roll_msnoarmor2" title="%{msnoarmor2}" value="/w gm &{template:2Echeck} {{checkvs=Move Silently\n(in No Armor)}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{msb2})+(@{msr2})+(@{msd2})+(@{msk2})+(@{msm2})+(@{msl2})+10]]}}">No Armor</button></td>
                             </tr>
                             <tr>
                                 <td>Hide in Shadows</td>
@@ -13988,8 +13988,8 @@
                                 <td><input type="text" name="attr_hsa2" title="@{hsa2}" value="-0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_hsl2" title="@{hsl2}" value="0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_hst2" title="@{hst2}" value="(@{hsb2})+(@{hsr2})+(@{hsd2})+(@{hsk2})+(@{hsm2})+(@{hsa2})+(@{hsl2})" disabled class="sheet-short"/>%</td>
-                                <td><button type="roll" name="roll_hs2" title="%{hs2}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{hst2})]] [@{henchname4} Hide in Shadows]">Armor</button></td>
-                                <td><button type="roll" name="roll_hsnoarmor2" title="%{hsnoarmor2}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{hsb2})+(@{hsr2})+(@{hsd2})+(@{hsk2})+(@{hsm2})+(@{hsl2})+5]] [@{henchname4} Hide in Shadows (without armor)]">No Armor</button></td>
+                                <td><button type="roll" name="roll_hs2" title="%{hs2}" value="/w gm &{template:2Echeck} {{checkvs=Hide in Shadows}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{hst2}]]}}">Armor</button></td>
+                                <td><button type="roll" name="roll_hsnoarmor2" title="%{hsnoarmor2}" value="/w gm &{template:2Echeck} {{checkvs=Hide in Shadows\n(in No Armor)}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{hsb2})+(@{hsr2})+(@{hsd2})+(@{hsk2})+(@{hsm2})+(@{hsl2})+5]]}}">No Armor</button></td>
                             </tr>
                             <tr>
                                 <td>Detect Noise</td>
@@ -14001,8 +14001,8 @@
                                 <td><input type="text" name="attr_dna2" title="@{dna2}" value="-0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_dnl2" title="@{dnl2}" value="0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_dnt2" title="@{dnt2}" value="(@{dnb2})+(@{dnr2})+(@{dnd2})+(@{dnk2})+(@{dnm2})+(@{dna2})+(@{dnl2})" disabled class="sheet-short"/>%</td>
-                                <td><button type="roll" name="roll_dn2" title="%{dn2}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{dnt2})]] [@{henchname4} Detect Noise]">Armor</button></td>
-                                <td><button type="roll" name="roll_dnnoarmor2" title="%{dnnoarmor2}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{dnb2})+(@{dnr2})+(@{dnd2})+(@{dnk2})+(@{dnm2})+(@{dnl2})]] [@{henchname4} Detect Noise (without armor)]">No Armor</button></td>
+                                <td><button type="roll" name="roll_dn2" title="%{dn2}" value="/w gm &{template:2Echeck} {{checkvs=Detect Noise}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{dnt2}]]}}">Armor</button></td>
+                                <td><button type="roll" name="roll_dnnoarmor2" title="%{dnnoarmor2}" value="/w gm &{template:2Echeck} {{checkvs=Detect Noise\n(in No Armor)}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{dnb2})+(@{dnr2})+(@{dnd2})+(@{dnk2})+(@{dnm2})+(@{dnl2})]]}}">No Armor</button></td>
                             </tr>
                             <tr>
                                 <td>Climb Walls</td>
@@ -14014,8 +14014,8 @@
                                 <td><input type="text" name="attr_cwa2" title="@{cwa2}" value="-0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_cwl2" title="@{cwl2}" value="0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_cwt2" title="@{cwt2}" value="(@{cwb2})+(@{cwr2})+(@{cwd2})+(@{cwk2})+(@{cwm2})+(@{cwa2})+(@{cwl2})" disabled class="sheet-short"/>%</td>
-                                <td><button type="roll" name="roll_cw2" title="%{cw2}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{cwt2})]] [@{henchname4} Climb Walls]">Armor</button></td>
-                                <td><button type="roll" name="roll_cwnoarmor2" title="%{cwnoarmor2}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{cwb2})+(@{cwr2})+(@{cwd2})+(@{cwk2})+(@{cwm2})+(@{cwl2})+10]] [@{henchname4} Climb Walls (without armor)]">No Armor</button></td>
+                                <td><button type="roll" name="roll_cw2" title="%{cw2}" value="/w gm &{template:2Echeck} {{checkvs=Climb Walls}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{cwt2}]]}}">Armor</button></td>
+                                <td><button type="roll" name="roll_cwnoarmor2" title="%{cwnoarmor2}" value="/w gm &{template:2Echeck} {{checkvs=Climb Walls\n(in No Armor)}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{cwb2})+(@{cwr2})+(@{cwd2})+(@{cwk2})+(@{cwm2})+(@{cwl2})+10]]}}">No Armor</button></td>
                             </tr>
                             <tr>
                                 <td>Read Languages</td>
@@ -14027,8 +14027,8 @@
                                 <td><input type="text" name="attr_rla2" title="@{rla2}" value="-0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_rll2" title="@{rll2}" value="0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_rlt2" title="@{rlt2}" value="(@{rlb2})+(@{rlr2})+(@{rld2})+(@{rlk2})+(@{rlm2})+(@{rla2})+(@{rll2})" disabled class="sheet-short"/>%</td>
-                                <td><button type="roll" name="roll_rl2" title="%{rl2}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{rlt2})]] [@{henchname4} Read Languages]">Armor</button></td>
-                                <td><button type="roll" name="roll_rlnoarmor2" title="%{rlnoarmor2}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{rlb2})+(@{rlr2})+(@{rld2})+(@{rlk2})+(@{rlm2})+(@{rll2})]] [@{henchname4} Read Languages (without armor)]">No Armor</button></td>
+                                <td><button type="roll" name="roll_rl2" title="%{rl2}" value="/w gm &{template:2Echeck} {{checkvs=Read Languages}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{rlt2}]]}}">Armor</button></td>
+                                <td><button type="roll" name="roll_rlnoarmor2" title="%{rlnoarmor2}" value="/w gm &{template:2Echeck} {{checkvs=Read Languages\n(in No Armor)}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{rlb2})+(@{rlr2})+(@{rld2})+(@{rlk2})+(@{rlm2})+(@{rll2})]]}}">No Armor</button></td>
                             </tr>
                             <tr>
                                 <td>Legend Lore</td>
@@ -14040,8 +14040,8 @@
                                 <td><input type="text" name="attr_iba2" title="@{iba2}" value="-0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_ibl2" title="@{ibl2}" value="0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_ibt2" title="@{ibt2}" value="(@{ibb2})+(@{ibr2})+(@{ibd2})+(@{ibk2})+(@{ibm2})+(@{iba2})+(@{ibl2})" disabled class="sheet-short"/>%</td>
-                                <td><button type="roll" name="roll_ib2" title="%{ib2}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{ibt2})]] [@{henchname4} Legend Lore]">Armor</button></td>
-                                <td><button type="roll" name="roll_ibnoarmor2" title="%{ibnoarmor2}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{ibb2})+(@{ibr2})+(@{ibd2})+(@{ibk2})+(@{ibm2})+(@{ibl2})]] [@{henchname4} Legend Lore (without armor)]">No Armor</button></td>
+                                <td><button type="roll" name="roll_ib2" title="%{ib2}" value="/w gm &{template:2Echeck} {{checkvs=Legend Lore}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{ibt2}]]}}">Armor</button></td>
+                                <td><button type="roll" name="roll_ibnoarmor2" title="%{ibnoarmor2}" value="/w gm &{template:2Echeck} {{checkvs=Legend Lore\n(in No Armor)}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{ibb2})+(@{ibr2})+(@{ibd2})+(@{ibk2})+(@{ibm2})+(@{ibl2})]]}}">No Armor</button></td>
                             </tr>
                         </table>
                     </div>
@@ -14068,8 +14068,8 @@
                                 <td><input type="text" name="attr_dma2" title="@{dma2}" value="-0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_dml2" title="@{dml2}" value="0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_dmt2" title="@{dmt2}" value="(@{dmb2})+(@{dmr2})+(@{dmd2})+(@{dmk2})+(@{dmm2})+(@{dma2})+(@{dml2})" disabled class="sheet-short"/>%</td>
-                                <td><button type="roll" name="roll_dm" title="%{dm2}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{dmt2})]] [@{henchname4} Detect Magic]">Armor</button></td>
-                                <td><button type="roll" name="roll_dmnoarmor2" title="%{dmnoarmor2}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{dmb2})+(@{dmr2})+(@{dmd2})+(@{dmk2})+(@{dmm2})+(@{dml2})]] [@{henchname4} Detect Magic (without armor)]">No Armor</button></td>
+                                <td><button type="roll" name="roll_dm" title="%{dm2}" value="/w gm &{template:2Echeck} {{checkvs=Detect Magic}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{dmt2}]]}}">Armor</button></td>
+                                <td><button type="roll" name="roll_dmnoarmor2" title="%{dmnoarmor2}" value="/w gm &{template:2Echeck} {{checkvs=Detect Magic\n(in No Armor)}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{dmb2})+(@{dmr2})+(@{dmd2})+(@{dmk2})+(@{dmm2})+(@{dml2})]]}}">No Armor</button></td>
                             </tr>
                             <tr>
                                 <td>Detect Illusion*</td>
@@ -14081,8 +14081,8 @@
                                 <td><input type="text" name="attr_dia2" title="@{dia2}" value="-0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_dil2" title="@{dil2}" value="0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_dit2" title="@{dit2}" value="(@{dib2})+(@{dir2})+(@{did2})+(@{dik2})+(@{dim2})+(@{dia2})+(@{dil2})" disabled class="sheet-short"/>%</td>
-                                <td><button type="roll" name="roll_di2" title="%{di2}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{dit2})]] [@{henchname4} Detect Illusion*]">Armor</button></td>
-                                <td><button type="roll" name="roll_dinoarmor2" title="%{dinoarmor}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{dib2})+(@{dir2})+(@{did2})+(@{dik2})+(@{dim2})+(@{dil2})]] [@{henchname4} Detect Illusion* (without armor)]">No Armor</button></td>
+                                <td><button type="roll" name="roll_di2" title="%{di2}" value="/w gm &{template:2Echeck} {{checkvs=Detect Illusion*}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{dit2}]]}}">Armor</button></td>
+                                <td><button type="roll" name="roll_dinoarmor2" title="%{dinoarmor}" value="/w gm &{template:2Echeck} {{checkvs=Detect Illusion*\n(in No Armor)}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{dib2})+(@{dir2})+(@{did2})+(@{dik2})+(@{dim2})+(@{dil2})]]}}">No Armor</button></td>
                             </tr>
                             <tr>
                                 <td>Bribery*</td>
@@ -14094,8 +14094,8 @@
                                 <td><input type="text" name="attr_bra2" title="@{bra2}" value="-0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_brl2" title="@{brl2}" value="0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_brt2" title="@{brt2}" value="(@{brb2})+(@{brr2})+(@{brd2})+(@{brk2})+(@{brm2})+(@{bra2})+(@{brl2})" disabled class="sheet-short"/>%</td>
-                                <td><button type="roll" name="roll_br2" title="%{br2}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{brt2})]] [@{henchname4} Bribe*]">Armor</button></td>
-                                <td><button type="roll" name="roll_brnoarmor2" title="%{brnoarmor2}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{brb2})+(@{brr2})+(@{brd2})+(@{brk2})+(@{brm2})+(@{brl2})]] [@{henchname4} Bribe* (without armor)]">No Armor</button></td>
+                                <td><button type="roll" name="roll_br2" title="%{br2}" value="/w gm &{template:2Echeck} {{checkvs=Bribe*}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{brt2}]]}}">Armor</button></td>
+                                <td><button type="roll" name="roll_brnoarmor2" title="%{brnoarmor2}" value="/w gm &{template:2Echeck} {{checkvs=Bribe*\n(in No Armor)}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{brb2})+(@{brr2})+(@{brd2})+(@{brk2})+(@{brm2})+(@{brl2})]]}}">No Armor</button></td>
                             </tr>
                             <tr>
                                 <td>Tunneling*</td>
@@ -14107,8 +14107,8 @@
                                 <td><input type="text" name="attr_tua2" title="@{tua2}" value="-0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_tul2" title="@{tul2}" value="0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_tut2" title="@{tut2}" value="(@{tub2})+(@{tur2})+(@{tud2})+(@{tuk2})+(@{tum2})+(@{tua2})+(@{tul2})" disabled class="sheet-short"/>%</td>
-                                <td><button type="roll" name="roll_tu2" title="%{tu2}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{tut2})]] [@{henchname4} Tunneling*]">Armor</button></td>
-                                <td><button type="roll" name="roll_tunoarmor2" title="%{tunoarmor2}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{tub2})+(@{tur2})+(@{tud2})+(@{tuk2})+(@{tum2})+(@{tul2})+10]] [@{henchname4} Tunneling* (without armor)]">No Armor</button></td>
+                                <td><button type="roll" name="roll_tu2" title="%{tu2}" value="/w gm &{template:2Echeck} {{checkvs=Tunneling*}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{tut2}]]}}">Armor</button></td>
+                                <td><button type="roll" name="roll_tunoarmor2" title="%{tunoarmor2}" value="/w gm &{template:2Echeck} {{checkvs=Tunneling*\n(in No Armor)}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{tub2})+(@{tur2})+(@{tud2})+(@{tuk2})+(@{tum2})+(@{tul2})+10]]}}">No Armor</button></td>
                             </tr>
                             <tr>
                                 <td>Escape Bonds*</td>
@@ -14120,8 +14120,8 @@
                                 <td><input type="text" name="attr_eba2" title="@{eba2}" value="-0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_ebl2" title="@{ebl2}" value="0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_ebt2" title="@{ebt2}" value="(@{ebb2})+(@{ebr2})+(@{ebd2})+(@{ebk2})+(@{ebm2})+(@{eba2})+(@{ebl2})" disabled class="sheet-short"/>%</td>
-                                <td><button type="roll" name="roll_eb2" title="%{eb2}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{ebt2})]] [@{henchname4} Escape Bonds*]">Armor</button></td>
-                                <td><button type="roll" name="roll_ebnoarmor2" title="%{ebnoarmor2}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{ebb2})+(@{ebr2})+(@{ebd2})+(@{ebk2})+(@{ebm2})+(@{ebl2})+5]] [@{henchname4} Escape Bonds* (without armor)]">No Armor</button></td>
+                                <td><button type="roll" name="roll_eb2" title="%{eb2}" value="/w gm &{template:2Echeck} {{checkvs=Escape Bonds*}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{ebt2}]]}}">Armor</button></td>
+                                <td><button type="roll" name="roll_ebnoarmor2" title="%{ebnoarmor2}" value="/w gm &{template:2Echeck} {{checkvs=Escape Bonds*\n(in No Armor)}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{ebb2})+(@{ebr2})+(@{ebd2})+(@{ebk2})+(@{ebm2})+(@{ebl2})+5]]}}">No Armor</button></td>
                             </tr>
                             <tr>
                                 <td>Forge Documents*</td>
@@ -14133,8 +14133,8 @@
                                 <td><input type="text" name="attr_fda2" title="@{fda2}" value="-0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_fdl2" title="@{fdl2}" value="0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_fdt2" title="@{fdt2}" value="(@{fdb2})+(@{fdr2})+(@{fdd2})+(@{fdk2})+(@{fdm2})+(@{fda2})+(@{fdl2})" disabled class="sheet-short"/>%</td>
-                                <td><button type="roll" name="roll_fd2" title="%{fd2}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{fdt2})]] [@{henchname4} Forge Documents*]">Armor</button></td>
-                                <td><button type="roll" name="roll_fdnoarmor2" title="%{fdnoarmor2}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{fdb2})+(@{fdr2})+(@{fdd2})+(@{fdk2})+(@{fdm2})+(@{fdl2})]] [@{henchname4} Forge Documents* (without armor)]">No Armor</button></td>
+                                <td><button type="roll" name="roll_fd2" title="%{fd2}" value="/w gm &{template:2Echeck} {{checkvs=Forge Documents*}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{fdt2}]]}}">Armor</button></td>
+                                <td><button type="roll" name="roll_fdnoarmor2" title="%{fdnoarmor2}" value="/w gm &{template:2Echeck} {{checkvs=Forge Documents*\n(in No Armor)}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{fdb2})+(@{fdr2})+(@{fdd2})+(@{fdk2})+(@{fdm2})+(@{fdl2})]]}}">No Armor</button></td>
                             </tr>
                             <tr>
                                 <td>Appraise*</td>
@@ -14146,8 +14146,8 @@
                                 <td><input type="text" name="attr_apa2" title="@{apa2}" value="-0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_apl2" title="@{apl2}" value="0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_apt2" title="@{apt2}" value="(@{apb2})+(@{apr2})+(@{apd2})+(@{apk2})+(@{apm2})+(@{apa2})+(@{apl2})" disabled class="sheet-short"/>%</td>
-                                <td><button type="roll" name="roll_ap2" title="%{ap2}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{apt2})]] [@{henchname4} Appraise*]">Armor</button></td>
-                                <td><button type="roll" name="roll_apnoarmor2" title="%{apnoarmor2}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{apb2})+(@{apr2})+(@{apd2})+(@{apk2})+(@{apm2})+(@{apl2})]] [@{henchname4} Appraise* (without armor)]">No Armor</button></td>
+                                <td><button type="roll" name="roll_ap2" title="%{ap2}" value="/w gm &{template:2Echeck} {{checkvs=Appraise*}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{apt2}]]}}">Armor</button></td>
+                                <td><button type="roll" name="roll_apnoarmor2" title="%{apnoarmor2}" value="/w gm &{template:2Echeck} {{checkvs=Appraise*\n(in No Armor)}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{apb2})+(@{apr2})+(@{apd2})+(@{apk2})+(@{apm2})+(@{apl2})]]}}">No Armor</button></td>
                             </tr>
                         </table>
                     </div>
diff --git a/ADnD_2E_Revised/html/tabs/character-tab/followers-tab.html b/ADnD_2E_Revised/html/tabs/character-tab/followers-tab.html
index 9895b641ef..385b7c92d3 100644
--- a/ADnD_2E_Revised/html/tabs/character-tab/followers-tab.html
+++ b/ADnD_2E_Revised/html/tabs/character-tab/followers-tab.html
@@ -443,8 +443,8 @@
                             <td><input type="text" name="attr_ppa2" title="@{ppa2}" value="-0" class="sheet-short"/>%</td>
                             <td><input type="text" name="attr_ppl2" title="@{ppl2}" value="0" class="sheet-short"/>%</td>
                             <td><input type="text" name="attr_ppt2" title="@{ppt2}" value="(@{ppb2})+(@{ppr2})+(@{ppd2})+(@{ppk2})+(@{ppm2})+(@{ppa2})+(@{ppl2})" disabled class="sheet-short"/>%</td>
-                            <td><button type="roll" name="roll_pp2" title="%{pp2}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{ppt2})]] [@{henchname4} Pick Pockets]">Armor</button></td>
-                            <td><button type="roll" name="roll_ppnoarmor2" title="%{ppnoarmor2}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{ppb2})+(@{ppr2})+(@{ppd2})+(@{ppk2})+(@{ppm2})+(@{ppl2})+5]] [@{henchname4} Pick Pockets (without armor)]">No Armor</button></td>
+                            <td><button type="roll" name="roll_pp2" title="%{pp2}" value="/w gm &{template:2Echeck} {{checkvs=Pick Pockets}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{ppt2}]]}}">Armor</button></td>
+                            <td><button type="roll" name="roll_ppnoarmor2" title="%{ppnoarmor2}" value="/w gm &{template:2Echeck} {{checkvs=Pick Pockets\n(in No Armor)}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{ppb2})+(@{ppr2})+(@{ppd2})+(@{ppk2})+(@{ppm2})+(@{ppl2})+5]]}}">No Armor</button></td>
                         </tr>
                         <tr>
                             <td>Open Locks</td>
@@ -456,8 +456,8 @@
                             <td><input type="text" name="attr_ola2" title="@{ola2}" value="-0" class="sheet-short"/>%</td>
                             <td><input type="text" name="attr_oll2" title="@{oll2}" value="0" class="sheet-short"/>%</td>
                             <td><input type="text" name="attr_olt2" title="@{olt2}" value="(@{olb2})+(@{olr2})+(@{old2})+(@{olk2})+(@{olm2})+(@{ola2})+(@{oll2})" disabled class="sheet-short"/>%</td>
-                            <td><button type="roll" name="roll_ol2" title="%{ol2}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{olt2})]] [@{henchname4} Open Locks]">Armor</button></td>
-                            <td><button type="roll" name="roll_olnoarmor2" title="%{olnoarmor2}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{olb2})+(@{olr2})+(@{old2})+(@{olk2})+(@{olm2})+(@{oll2})]] [@{henchname4} Open Locks (without armor)]">No Armor</button></td>
+                            <td><button type="roll" name="roll_ol2" title="%{ol2}" value="/w gm &{template:2Echeck} {{checkvs=Open Locks}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{olt2}]]}}">Armor</button></td>
+                            <td><button type="roll" name="roll_olnoarmor2" title="%{olnoarmor2}" value="/w gm &{template:2Echeck} {{checkvs=Open Locks\n(in No Armor)}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{olb2})+(@{olr2})+(@{old2})+(@{olk2})+(@{olm2})+(@{oll2})]]}}">No Armor</button></td>
                         </tr>
                         <tr>
                             <td>Find/Remove Traps</td>
@@ -469,8 +469,8 @@
                             <td><input type="text" name="attr_rta2" title="@{rta2}" value="-0" class="sheet-short"/>%</td>
                             <td><input type="text" name="attr_rtl2" title="@{rtl2}" value="0" class="sheet-short"/>%</td>
                             <td><input type="text" name="attr_rtt2" title="@{rtt2}" value="(@{rtb2})+(@{rtr2})+(@{rtd2})+(@{rtk2})+(@{rtm2})+(@{rta2})+(@{rtl2})" disabled class="sheet-short"/>%</td>
-                            <td><button type="roll" name="roll_rt2" title="%{rt2}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{rtt2})]] [@{henchname4} Find/Remove Traps]">Armor</button></td>
-                            <td><button type="roll" name="roll_rtnoarmor2" title="%{rtnoarmor2}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{rtb2})+(@{rtr2})+(@{rtd2})+(@{rtk2})+(@{rtm2})+(@{rtl2})]] [@{henchname4} Find/Remove Traps (without armor)]">No Armor</button></td>
+                            <td><button type="roll" name="roll_rt2" title="%{rt2}" value="/w gm &{template:2Echeck} {{checkvs=Find/Remove Traps}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{rtt2}]]}}">Armor</button></td>
+                            <td><button type="roll" name="roll_rtnoarmor2" title="%{rtnoarmor2}" value="/w gm &{template:2Echeck} {{checkvs=Find/Remove Traps\n(in No Armor)}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{rtb2})+(@{rtr2})+(@{rtd2})+(@{rtk2})+(@{rtm2})+(@{rtl2})]]}}">No Armor</button></td>
                         </tr>
                         <tr>
                             <td>Move Silently</td>
@@ -482,8 +482,8 @@
                             <td><input type="text" name="attr_msa2" title="@{msa2}" value="-0" class="sheet-short"/>%</td>
                             <td><input type="text" name="attr_msl2" title="@{msl2}" value="0" class="sheet-short"/>%</td>
                             <td><input type="text" name="attr_mst2" title="@{mst2}" value="(@{msb2})+(@{msr2})+(@{msd2})+(@{msk2})+(@{msm2})+(@{msa2})+(@{msl2})" disabled class="sheet-short"/>%</td>
-                            <td><button type="roll" name="roll_ms2" title="%{ms2}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{mst2})]] [@{henchname4} Move Silently]">Armor</button></td>
-                            <td><button type="roll" name="roll_msnoarmor2" title="%{msnoarmor2}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{msb2})+(@{msr2})+(@{msd2})+(@{msk2})+(@{msm2})+(@{msl2})+10]] [@{henchname4} Move Silently (without armor)]">No Armor</button></td>
+                            <td><button type="roll" name="roll_ms2" title="%{ms2}" value="/w gm &{template:2Echeck} {{checkvs=Move Silently}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{mst2}]]}}">Armor</button></td>
+                            <td><button type="roll" name="roll_msnoarmor2" title="%{msnoarmor2}" value="/w gm &{template:2Echeck} {{checkvs=Move Silently\n(in No Armor)}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{msb2})+(@{msr2})+(@{msd2})+(@{msk2})+(@{msm2})+(@{msl2})+10]]}}">No Armor</button></td>
                         </tr>
                         <tr>
                             <td>Hide in Shadows</td>
@@ -495,8 +495,8 @@
                             <td><input type="text" name="attr_hsa2" title="@{hsa2}" value="-0" class="sheet-short"/>%</td>
                             <td><input type="text" name="attr_hsl2" title="@{hsl2}" value="0" class="sheet-short"/>%</td>
                             <td><input type="text" name="attr_hst2" title="@{hst2}" value="(@{hsb2})+(@{hsr2})+(@{hsd2})+(@{hsk2})+(@{hsm2})+(@{hsa2})+(@{hsl2})" disabled class="sheet-short"/>%</td>
-                            <td><button type="roll" name="roll_hs2" title="%{hs2}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{hst2})]] [@{henchname4} Hide in Shadows]">Armor</button></td>
-                            <td><button type="roll" name="roll_hsnoarmor2" title="%{hsnoarmor2}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{hsb2})+(@{hsr2})+(@{hsd2})+(@{hsk2})+(@{hsm2})+(@{hsl2})+5]] [@{henchname4} Hide in Shadows (without armor)]">No Armor</button></td>
+                            <td><button type="roll" name="roll_hs2" title="%{hs2}" value="/w gm &{template:2Echeck} {{checkvs=Hide in Shadows}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{hst2}]]}}">Armor</button></td>
+                            <td><button type="roll" name="roll_hsnoarmor2" title="%{hsnoarmor2}" value="/w gm &{template:2Echeck} {{checkvs=Hide in Shadows\n(in No Armor)}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{hsb2})+(@{hsr2})+(@{hsd2})+(@{hsk2})+(@{hsm2})+(@{hsl2})+5]]}}">No Armor</button></td>
                         </tr>
                         <tr>
                             <td>Detect Noise</td>
@@ -508,8 +508,8 @@
                             <td><input type="text" name="attr_dna2" title="@{dna2}" value="-0" class="sheet-short"/>%</td>
                             <td><input type="text" name="attr_dnl2" title="@{dnl2}" value="0" class="sheet-short"/>%</td>
                             <td><input type="text" name="attr_dnt2" title="@{dnt2}" value="(@{dnb2})+(@{dnr2})+(@{dnd2})+(@{dnk2})+(@{dnm2})+(@{dna2})+(@{dnl2})" disabled class="sheet-short"/>%</td>
-                            <td><button type="roll" name="roll_dn2" title="%{dn2}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{dnt2})]] [@{henchname4} Detect Noise]">Armor</button></td>
-                            <td><button type="roll" name="roll_dnnoarmor2" title="%{dnnoarmor2}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{dnb2})+(@{dnr2})+(@{dnd2})+(@{dnk2})+(@{dnm2})+(@{dnl2})]] [@{henchname4} Detect Noise (without armor)]">No Armor</button></td>
+                            <td><button type="roll" name="roll_dn2" title="%{dn2}" value="/w gm &{template:2Echeck} {{checkvs=Detect Noise}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{dnt2}]]}}">Armor</button></td>
+                            <td><button type="roll" name="roll_dnnoarmor2" title="%{dnnoarmor2}" value="/w gm &{template:2Echeck} {{checkvs=Detect Noise\n(in No Armor)}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{dnb2})+(@{dnr2})+(@{dnd2})+(@{dnk2})+(@{dnm2})+(@{dnl2})]]}}">No Armor</button></td>
                         </tr>
                         <tr>
                             <td>Climb Walls</td>
@@ -521,8 +521,8 @@
                             <td><input type="text" name="attr_cwa2" title="@{cwa2}" value="-0" class="sheet-short"/>%</td>
                             <td><input type="text" name="attr_cwl2" title="@{cwl2}" value="0" class="sheet-short"/>%</td>
                             <td><input type="text" name="attr_cwt2" title="@{cwt2}" value="(@{cwb2})+(@{cwr2})+(@{cwd2})+(@{cwk2})+(@{cwm2})+(@{cwa2})+(@{cwl2})" disabled class="sheet-short"/>%</td>
-                            <td><button type="roll" name="roll_cw2" title="%{cw2}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{cwt2})]] [@{henchname4} Climb Walls]">Armor</button></td>
-                            <td><button type="roll" name="roll_cwnoarmor2" title="%{cwnoarmor2}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{cwb2})+(@{cwr2})+(@{cwd2})+(@{cwk2})+(@{cwm2})+(@{cwl2})+10]] [@{henchname4} Climb Walls (without armor)]">No Armor</button></td>
+                            <td><button type="roll" name="roll_cw2" title="%{cw2}" value="/w gm &{template:2Echeck} {{checkvs=Climb Walls}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{cwt2}]]}}">Armor</button></td>
+                            <td><button type="roll" name="roll_cwnoarmor2" title="%{cwnoarmor2}" value="/w gm &{template:2Echeck} {{checkvs=Climb Walls\n(in No Armor)}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{cwb2})+(@{cwr2})+(@{cwd2})+(@{cwk2})+(@{cwm2})+(@{cwl2})+10]]}}">No Armor</button></td>
                         </tr>
                         <tr>
                             <td>Read Languages</td>
@@ -534,8 +534,8 @@
                             <td><input type="text" name="attr_rla2" title="@{rla2}" value="-0" class="sheet-short"/>%</td>
                             <td><input type="text" name="attr_rll2" title="@{rll2}" value="0" class="sheet-short"/>%</td>
                             <td><input type="text" name="attr_rlt2" title="@{rlt2}" value="(@{rlb2})+(@{rlr2})+(@{rld2})+(@{rlk2})+(@{rlm2})+(@{rla2})+(@{rll2})" disabled class="sheet-short"/>%</td>
-                            <td><button type="roll" name="roll_rl2" title="%{rl2}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{rlt2})]] [@{henchname4} Read Languages]">Armor</button></td>
-                            <td><button type="roll" name="roll_rlnoarmor2" title="%{rlnoarmor2}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{rlb2})+(@{rlr2})+(@{rld2})+(@{rlk2})+(@{rlm2})+(@{rll2})]] [@{henchname4} Read Languages (without armor)]">No Armor</button></td>
+                            <td><button type="roll" name="roll_rl2" title="%{rl2}" value="/w gm &{template:2Echeck} {{checkvs=Read Languages}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{rlt2}]]}}">Armor</button></td>
+                            <td><button type="roll" name="roll_rlnoarmor2" title="%{rlnoarmor2}" value="/w gm &{template:2Echeck} {{checkvs=Read Languages\n(in No Armor)}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{rlb2})+(@{rlr2})+(@{rld2})+(@{rlk2})+(@{rlm2})+(@{rll2})]]}}">No Armor</button></td>
                         </tr>
                         <tr>
                             <td>Legend Lore</td>
@@ -547,8 +547,8 @@
                             <td><input type="text" name="attr_iba2" title="@{iba2}" value="-0" class="sheet-short"/>%</td>
                             <td><input type="text" name="attr_ibl2" title="@{ibl2}" value="0" class="sheet-short"/>%</td>
                             <td><input type="text" name="attr_ibt2" title="@{ibt2}" value="(@{ibb2})+(@{ibr2})+(@{ibd2})+(@{ibk2})+(@{ibm2})+(@{iba2})+(@{ibl2})" disabled class="sheet-short"/>%</td>
-                            <td><button type="roll" name="roll_ib2" title="%{ib2}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{ibt2})]] [@{henchname4} Legend Lore]">Armor</button></td>
-                            <td><button type="roll" name="roll_ibnoarmor2" title="%{ibnoarmor2}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{ibb2})+(@{ibr2})+(@{ibd2})+(@{ibk2})+(@{ibm2})+(@{ibl2})]] [@{henchname4} Legend Lore (without armor)]">No Armor</button></td>
+                            <td><button type="roll" name="roll_ib2" title="%{ib2}" value="/w gm &{template:2Echeck} {{checkvs=Legend Lore}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{ibt2}]]}}">Armor</button></td>
+                            <td><button type="roll" name="roll_ibnoarmor2" title="%{ibnoarmor2}" value="/w gm &{template:2Echeck} {{checkvs=Legend Lore\n(in No Armor)}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{ibb2})+(@{ibr2})+(@{ibd2})+(@{ibk2})+(@{ibm2})+(@{ibl2})]]}}">No Armor</button></td>
                         </tr>
                     </table>
                 </div>
@@ -575,8 +575,8 @@
                             <td><input type="text" name="attr_dma2" title="@{dma2}" value="-0" class="sheet-short"/>%</td>
                             <td><input type="text" name="attr_dml2" title="@{dml2}" value="0" class="sheet-short"/>%</td>
                             <td><input type="text" name="attr_dmt2" title="@{dmt2}" value="(@{dmb2})+(@{dmr2})+(@{dmd2})+(@{dmk2})+(@{dmm2})+(@{dma2})+(@{dml2})" disabled class="sheet-short"/>%</td>
-                            <td><button type="roll" name="roll_dm" title="%{dm2}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{dmt2})]] [@{henchname4} Detect Magic]">Armor</button></td>
-                            <td><button type="roll" name="roll_dmnoarmor2" title="%{dmnoarmor2}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{dmb2})+(@{dmr2})+(@{dmd2})+(@{dmk2})+(@{dmm2})+(@{dml2})]] [@{henchname4} Detect Magic (without armor)]">No Armor</button></td>
+                            <td><button type="roll" name="roll_dm" title="%{dm2}" value="/w gm &{template:2Echeck} {{checkvs=Detect Magic}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{dmt2}]]}}">Armor</button></td>
+                            <td><button type="roll" name="roll_dmnoarmor2" title="%{dmnoarmor2}" value="/w gm &{template:2Echeck} {{checkvs=Detect Magic\n(in No Armor)}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{dmb2})+(@{dmr2})+(@{dmd2})+(@{dmk2})+(@{dmm2})+(@{dml2})]]}}">No Armor</button></td>
                         </tr>
                         <tr>
                             <td>Detect Illusion*</td>
@@ -588,8 +588,8 @@
                             <td><input type="text" name="attr_dia2" title="@{dia2}" value="-0" class="sheet-short"/>%</td>
                             <td><input type="text" name="attr_dil2" title="@{dil2}" value="0" class="sheet-short"/>%</td>
                             <td><input type="text" name="attr_dit2" title="@{dit2}" value="(@{dib2})+(@{dir2})+(@{did2})+(@{dik2})+(@{dim2})+(@{dia2})+(@{dil2})" disabled class="sheet-short"/>%</td>
-                            <td><button type="roll" name="roll_di2" title="%{di2}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{dit2})]] [@{henchname4} Detect Illusion*]">Armor</button></td>
-                            <td><button type="roll" name="roll_dinoarmor2" title="%{dinoarmor}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{dib2})+(@{dir2})+(@{did2})+(@{dik2})+(@{dim2})+(@{dil2})]] [@{henchname4} Detect Illusion* (without armor)]">No Armor</button></td>
+                            <td><button type="roll" name="roll_di2" title="%{di2}" value="/w gm &{template:2Echeck} {{checkvs=Detect Illusion*}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{dit2}]]}}">Armor</button></td>
+                            <td><button type="roll" name="roll_dinoarmor2" title="%{dinoarmor}" value="/w gm &{template:2Echeck} {{checkvs=Detect Illusion*\n(in No Armor)}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{dib2})+(@{dir2})+(@{did2})+(@{dik2})+(@{dim2})+(@{dil2})]]}}">No Armor</button></td>
                         </tr>
                         <tr>
                             <td>Bribery*</td>
@@ -601,8 +601,8 @@
                             <td><input type="text" name="attr_bra2" title="@{bra2}" value="-0" class="sheet-short"/>%</td>
                             <td><input type="text" name="attr_brl2" title="@{brl2}" value="0" class="sheet-short"/>%</td>
                             <td><input type="text" name="attr_brt2" title="@{brt2}" value="(@{brb2})+(@{brr2})+(@{brd2})+(@{brk2})+(@{brm2})+(@{bra2})+(@{brl2})" disabled class="sheet-short"/>%</td>
-                            <td><button type="roll" name="roll_br2" title="%{br2}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{brt2})]] [@{henchname4} Bribe*]">Armor</button></td>
-                            <td><button type="roll" name="roll_brnoarmor2" title="%{brnoarmor2}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{brb2})+(@{brr2})+(@{brd2})+(@{brk2})+(@{brm2})+(@{brl2})]] [@{henchname4} Bribe* (without armor)]">No Armor</button></td>
+                            <td><button type="roll" name="roll_br2" title="%{br2}" value="/w gm &{template:2Echeck} {{checkvs=Bribe*}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{brt2}]]}}">Armor</button></td>
+                            <td><button type="roll" name="roll_brnoarmor2" title="%{brnoarmor2}" value="/w gm &{template:2Echeck} {{checkvs=Bribe*\n(in No Armor)}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{brb2})+(@{brr2})+(@{brd2})+(@{brk2})+(@{brm2})+(@{brl2})]]}}">No Armor</button></td>
                         </tr>
                         <tr>
                             <td>Tunneling*</td>
@@ -614,8 +614,8 @@
                             <td><input type="text" name="attr_tua2" title="@{tua2}" value="-0" class="sheet-short"/>%</td>
                             <td><input type="text" name="attr_tul2" title="@{tul2}" value="0" class="sheet-short"/>%</td>
                             <td><input type="text" name="attr_tut2" title="@{tut2}" value="(@{tub2})+(@{tur2})+(@{tud2})+(@{tuk2})+(@{tum2})+(@{tua2})+(@{tul2})" disabled class="sheet-short"/>%</td>
-                            <td><button type="roll" name="roll_tu2" title="%{tu2}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{tut2})]] [@{henchname4} Tunneling*]">Armor</button></td>
-                            <td><button type="roll" name="roll_tunoarmor2" title="%{tunoarmor2}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{tub2})+(@{tur2})+(@{tud2})+(@{tuk2})+(@{tum2})+(@{tul2})+10]] [@{henchname4} Tunneling* (without armor)]">No Armor</button></td>
+                            <td><button type="roll" name="roll_tu2" title="%{tu2}" value="/w gm &{template:2Echeck} {{checkvs=Tunneling*}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{tut2}]]}}">Armor</button></td>
+                            <td><button type="roll" name="roll_tunoarmor2" title="%{tunoarmor2}" value="/w gm &{template:2Echeck} {{checkvs=Tunneling*\n(in No Armor)}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{tub2})+(@{tur2})+(@{tud2})+(@{tuk2})+(@{tum2})+(@{tul2})+10]]}}">No Armor</button></td>
                         </tr>
                         <tr>
                             <td>Escape Bonds*</td>
@@ -627,8 +627,8 @@
                             <td><input type="text" name="attr_eba2" title="@{eba2}" value="-0" class="sheet-short"/>%</td>
                             <td><input type="text" name="attr_ebl2" title="@{ebl2}" value="0" class="sheet-short"/>%</td>
                             <td><input type="text" name="attr_ebt2" title="@{ebt2}" value="(@{ebb2})+(@{ebr2})+(@{ebd2})+(@{ebk2})+(@{ebm2})+(@{eba2})+(@{ebl2})" disabled class="sheet-short"/>%</td>
-                            <td><button type="roll" name="roll_eb2" title="%{eb2}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{ebt2})]] [@{henchname4} Escape Bonds*]">Armor</button></td>
-                            <td><button type="roll" name="roll_ebnoarmor2" title="%{ebnoarmor2}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{ebb2})+(@{ebr2})+(@{ebd2})+(@{ebk2})+(@{ebm2})+(@{ebl2})+5]] [@{henchname4} Escape Bonds* (without armor)]">No Armor</button></td>
+                            <td><button type="roll" name="roll_eb2" title="%{eb2}" value="/w gm &{template:2Echeck} {{checkvs=Escape Bonds*}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{ebt2}]]}}">Armor</button></td>
+                            <td><button type="roll" name="roll_ebnoarmor2" title="%{ebnoarmor2}" value="/w gm &{template:2Echeck} {{checkvs=Escape Bonds*\n(in No Armor)}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{ebb2})+(@{ebr2})+(@{ebd2})+(@{ebk2})+(@{ebm2})+(@{ebl2})+5]]}}">No Armor</button></td>
                         </tr>
                         <tr>
                             <td>Forge Documents*</td>
@@ -640,8 +640,8 @@
                             <td><input type="text" name="attr_fda2" title="@{fda2}" value="-0" class="sheet-short"/>%</td>
                             <td><input type="text" name="attr_fdl2" title="@{fdl2}" value="0" class="sheet-short"/>%</td>
                             <td><input type="text" name="attr_fdt2" title="@{fdt2}" value="(@{fdb2})+(@{fdr2})+(@{fdd2})+(@{fdk2})+(@{fdm2})+(@{fda2})+(@{fdl2})" disabled class="sheet-short"/>%</td>
-                            <td><button type="roll" name="roll_fd2" title="%{fd2}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{fdt2})]] [@{henchname4} Forge Documents*]">Armor</button></td>
-                            <td><button type="roll" name="roll_fdnoarmor2" title="%{fdnoarmor2}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{fdb2})+(@{fdr2})+(@{fdd2})+(@{fdk2})+(@{fdm2})+(@{fdl2})]] [@{henchname4} Forge Documents* (without armor)]">No Armor</button></td>
+                            <td><button type="roll" name="roll_fd2" title="%{fd2}" value="/w gm &{template:2Echeck} {{checkvs=Forge Documents*}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{fdt2}]]}}">Armor</button></td>
+                            <td><button type="roll" name="roll_fdnoarmor2" title="%{fdnoarmor2}" value="/w gm &{template:2Echeck} {{checkvs=Forge Documents*\n(in No Armor)}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{fdb2})+(@{fdr2})+(@{fdd2})+(@{fdk2})+(@{fdm2})+(@{fdl2})]]}}">No Armor</button></td>
                         </tr>
                         <tr>
                             <td>Appraise*</td>
@@ -653,8 +653,8 @@
                             <td><input type="text" name="attr_apa2" title="@{apa2}" value="-0" class="sheet-short"/>%</td>
                             <td><input type="text" name="attr_apl2" title="@{apl2}" value="0" class="sheet-short"/>%</td>
                             <td><input type="text" name="attr_apt2" title="@{apt2}" value="(@{apb2})+(@{apr2})+(@{apd2})+(@{apk2})+(@{apm2})+(@{apa2})+(@{apl2})" disabled class="sheet-short"/>%</td>
-                            <td><button type="roll" name="roll_ap2" title="%{ap2}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{apt2})]] [@{henchname4} Appraise*]">Armor</button></td>
-                            <td><button type="roll" name="roll_apnoarmor2" title="%{apnoarmor2}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{apb2})+(@{apr2})+(@{apd2})+(@{apk2})+(@{apm2})+(@{apl2})]] [@{henchname4} Appraise* (without armor)]">No Armor</button></td>
+                            <td><button type="roll" name="roll_ap2" title="%{ap2}" value="/w gm &{template:2Echeck} {{checkvs=Appraise*}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{apt2}]]}}">Armor</button></td>
+                            <td><button type="roll" name="roll_apnoarmor2" title="%{apnoarmor2}" value="/w gm &{template:2Echeck} {{checkvs=Appraise*\n(in No Armor)}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{apb2})+(@{apr2})+(@{apd2})+(@{apk2})+(@{apm2})+(@{apl2})]]}}">No Armor</button></td>
                         </tr>
                     </table>
                 </div>