diff --git a/ADnD_2E_Revised/2ESheet.html b/ADnD_2E_Revised/2ESheet.html
index a9fcd825fd..8008f91531 100644
--- a/ADnD_2E_Revised/2ESheet.html
+++ b/ADnD_2E_Revised/2ESheet.html
@@ -14378,8 +14378,8 @@
                                     <td><input type="text" name="attr_ppa22" title="@{repeating_hench4_$X_ppa22}" value="-0" class="sheet-short"/>%</td>
                                     <td><input type="text" name="attr_ppl22" title="@{repeating_hench4_$X_ppl22}" value="0" class="sheet-short"/>%</td>
                                     <td><input type="text" name="attr_ppt22" title="@{repeating_hench4_$X_ppt22}" value="(@{ppb22})+(@{ppr22})+(@{ppd22})+(@{ppk22})+(@{ppm22})+(@{ppa22})+(@{ppl22})" disabled class="sheet-short"/>%</td>
-                                    <td><button type="roll" name="roll_pp22" title="%{repeating_hench4_$X_pp22}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{ppt22})]] [@{henchname44} Pick Pockets]">Armor</button></td>
-                                    <td><button type="roll" name="roll_ppnoarmor22" title="%{repeating_hench4_$X_ppnoarmor22}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{ppb22})+(@{ppr22})+(@{ppd22})+(@{ppk22})+(@{ppm22})+(@{ppl22})+5]] [@{henchname44} Pick Pockets (without armor)]">No Armor</button></td>
+                                    <td><button type="roll" name="roll_pp22" title="%{repeating_hench4_$X_pp22}" value="/w gm &{template:2Echeck} {{checkvs=Pick Pockets}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{ppt22}]]}}">Armor</button></td>
+                                    <td><button type="roll" name="roll_ppnoarmor22" title="%{repeating_hench4_$X_ppnoarmor22}" value="/w gm &{template:2Echeck} {{checkvs=Pick Pockets\n(in No Armor)}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{ppb22})+(@{ppr22})+(@{ppd22})+(@{ppk22})+(@{ppm22})+(@{ppl22})+5]]}}">No Armor</button></td>
                                 </tr>
                                 <tr>
                                     <td>Open Locks</td>
@@ -14391,8 +14391,8 @@
                                     <td><input type="text" name="attr_ola22" title="@{repeating_hench4_$X_ola22}" value="-0" class="sheet-short"/>%</td>
                                     <td><input type="text" name="attr_oll22" title="@{repeating_hench4_$X_oll22}" value="0" class="sheet-short"/>%</td>
                                     <td><input type="text" name="attr_olt22" title="@{repeating_hench4_$X_olt22}" value="(@{olb22})+(@{olr22})+(@{old22})+(@{olk22})+(@{olm22})+(@{ola22})+(@{oll22})" disabled class="sheet-short"/>%</td>
-                                    <td><button type="roll" name="roll_ol22" title="%{repeating_hench4_$X_ol22}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{olt22})]] [@{henchname44} Open Locks]">Armor</button></td>
-                                    <td><button type="roll" name="roll_olnoarmor22" title="%{repeating_hench4_$X_olnoarmor22}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{olb22})+(@{olr22})+(@{old22})+(@{olk22})+(@{olm22})+(@{oll22})]] [@{henchname44} Open Locks (without armor)]">No Armor</button></td>
+                                    <td><button type="roll" name="roll_ol22" title="%{repeating_hench4_$X_ol22}" value="/w gm &{template:2Echeck} {{checkvs=Open Locks}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{olt22}]]}}">Armor</button></td>
+                                    <td><button type="roll" name="roll_olnoarmor22" title="%{repeating_hench4_$X_olnoarmor22}" value="/w gm &{template:2Echeck} {{checkvs=Open Locks\n(in No Armor)}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{olb22})+(@{olr22})+(@{old22})+(@{olk22})+(@{olm22})+(@{oll22})]]}}">No Armor</button></td>
                                 </tr>
                                 <tr>
                                     <td>Find/Remove Traps</td>
@@ -14404,8 +14404,8 @@
                                     <td><input type="text" name="attr_rta22" title="@{repeating_hench4_$X_rta22}" value="-0" class="sheet-short"/>%</td>
                                     <td><input type="text" name="attr_rtl22" title="@{repeating_hench4_$X_rtl22}" value="0" class="sheet-short"/>%</td>
                                     <td><input type="text" name="attr_rtt22" title="@{repeating_hench4_$X_rtt22}" value="(@{rtb22})+(@{rtr22})+(@{rtd22})+(@{rtk22})+(@{rtm22})+(@{rta22})+(@{rtl22})" disabled class="sheet-short"/>%</td>
-                                    <td><button type="roll" name="roll_rt22" title="%{repeating_hench4_$X_rt22}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{rtt22})]] [@{henchname44} Find/Remove Traps]">Armor</button></td>
-                                    <td><button type="roll" name="roll_rtnoarmor22" title="%{repeating_hench4_$X_rtnoarmor22}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{rtb22})+(@{rtr22})+(@{rtd22})+(@{rtk22})+(@{rtm22})+(@{rtl22})]] [@{henchname44} Find/Remove Traps (without armor)]">No Armor</button></td>
+                                    <td><button type="roll" name="roll_rt22" title="%{repeating_hench4_$X_rt22}" value="/w gm &{template:2Echeck} {{checkvs=Find/Remove Traps}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{rtt22}]]}}">Armor</button></td>
+                                    <td><button type="roll" name="roll_rtnoarmor22" title="%{repeating_hench4_$X_rtnoarmor22}" value="/w gm &{template:2Echeck} {{checkvs=Find/Remove Traps\n(in No Armor)}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{rtb22})+(@{rtr22})+(@{rtd22})+(@{rtk22})+(@{rtm22})+(@{rtl22})]]}}">No Armor</button></td>
                                 </tr>
                                 <tr>
                                     <td>Move Silently</td>
@@ -14417,8 +14417,8 @@
                                     <td><input type="text" name="attr_msa22" title="@{repeating_hench4_$X_msa22}" value="-0" class="sheet-short"/>%</td>
                                     <td><input type="text" name="attr_msl22" title="@{repeating_hench4_$X_msl22}" value="0" class="sheet-short"/>%</td>
                                     <td><input type="text" name="attr_mst22" title="@{repeating_hench4_$X_mst22}" value="(@{msb22})+(@{msr22})+(@{msd22})+(@{msk22})+(@{msm22})+(@{msa22})+(@{msl22})" disabled class="sheet-short"/>%</td>
-                                    <td><button type="roll" name="roll_ms22" title="%{repeating_hench4_$X_ms22}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{mst22})]] [@{henchname44} Move Silently]">Armor</button></td>
-                                    <td><button type="roll" name="roll_msnoarmor22" title="%{repeating_hench4_$X_msnoarmor22}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{msb22})+(@{msr22})+(@{msd22})+(@{msk22})+(@{msm22})+(@{msl22})+10]] [@{henchname44} Move Silently (without armor)]">No Armor</button></td>
+                                    <td><button type="roll" name="roll_ms22" title="%{repeating_hench4_$X_ms22}" value="/w gm &{template:2Echeck} {{checkvs=Move Silently}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{mst22}]]}}">Armor</button></td>
+                                    <td><button type="roll" name="roll_msnoarmor22" title="%{repeating_hench4_$X_msnoarmor22}" value="/w gm &{template:2Echeck} {{checkvs=Move Silently\n(in No Armor)}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{msb22})+(@{msr22})+(@{msd22})+(@{msk22})+(@{msm22})+(@{msl22})+10]]}}">No Armor</button></td>
                                 </tr>
                                 <tr>
                                     <td>Hide in Shadows</td>
@@ -14430,8 +14430,8 @@
                                     <td><input type="text" name="attr_hsa22" title="@{repeating_hench4_$X_hsa22}" value="-0" class="sheet-short"/>%</td>
                                     <td><input type="text" name="attr_hsl22" title="@{repeating_hench4_$X_hsl22}" value="0" class="sheet-short"/>%</td>
                                     <td><input type="text" name="attr_hst22" title="@{repeating_hench4_$X_hst22}" value="(@{hsb22})+(@{hsr22})+(@{hsd22})+(@{hsk22})+(@{hsm22})+(@{hsa22})+(@{hsl22})" disabled class="sheet-short"/>%</td>
-                                    <td><button type="roll" name="roll_hs22" title="%{repeating_hench4_$X_hs22}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{hst22})]] [@{henchname44} Hide in Shadows]">Armor</button></td>
-                                    <td><button type="roll" name="roll_hsnoarmor22" title="%{repeating_hench4_$X_hsnoarmor22}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{hsb22})+(@{hsr22})+(@{hsd22})+(@{hsk22})+(@{hsm22})+(@{hsl22})+5]] [@{henchname44} Hide in Shadows (without armor)]">No Armor</button></td>
+                                    <td><button type="roll" name="roll_hs22" title="%{repeating_hench4_$X_hs22}" value="/w gm &{template:2Echeck} {{checkvs=Hide in Shadows}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{hst22}]]}}">Armor</button></td>
+                                    <td><button type="roll" name="roll_hsnoarmor22" title="%{repeating_hench4_$X_hsnoarmor22}" value="/w gm &{template:2Echeck} {{checkvs=Hide in Shadows\n(in No Armor)}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{hsb22})+(@{hsr22})+(@{hsd22})+(@{hsk22})+(@{hsm22})+(@{hsl22})+5]]}}">No Armor</button></td>
                                 </tr>
                                 <tr>
                                     <td>Detect Noise</td>
@@ -14443,8 +14443,8 @@
                                     <td><input type="text" name="attr_dna22" title="@{repeating_hench4_$X_dna22}" value="-0" class="sheet-short"/>%</td>
                                     <td><input type="text" name="attr_dnl22" title="@{repeating_hench4_$X_dnl22}" value="0" class="sheet-short"/>%</td>
                                     <td><input type="text" name="attr_dnt22" title="@{repeating_hench4_$X_dnt22}" value="(@{dnb22})+(@{dnr22})+(@{dnd22})+(@{dnk22})+(@{dnm22})+(@{dna22})+(@{dnl22})" disabled class="sheet-short"/>%</td>
-                                    <td><button type="roll" name="roll_dn22" title="%{repeating_hench4_$X_dn22}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{dnt22})]] [@{henchname44} Detect Noise]">Armor</button></td>
-                                    <td><button type="roll" name="roll_dnnoarmor22" title="%{repeating_hench4_$X_dnnoarmor22}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{dnb22})+(@{dnr22})+(@{dnd22})+(@{dnk22})+(@{dnm22})+(@{dnl22})]] [@{henchname44} Detect Noise (without armor)]">No Armor</button></td>
+                                    <td><button type="roll" name="roll_dn22" title="%{repeating_hench4_$X_dn22}" value="/w gm &{template:2Echeck} {{checkvs=Detect Noise}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{dnt22}]]}}">Armor</button></td>
+                                    <td><button type="roll" name="roll_dnnoarmor22" title="%{repeating_hench4_$X_dnnoarmor22}" value="/w gm &{template:2Echeck} {{checkvs=Detect Noise\n(in No Armor)}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{dnb22})+(@{dnr22})+(@{dnd22})+(@{dnk22})+(@{dnm22})+(@{dnl22})]]}}">No Armor</button></td>
                                 </tr>
                                 <tr>
                                     <td>Climb Walls</td>
@@ -14456,8 +14456,8 @@
                                     <td><input type="text" name="attr_cwa22" title="@{repeating_hench4_$X_cwa22}" value="-0" class="sheet-short"/>%</td>
                                     <td><input type="text" name="attr_cwl22" title="@{repeating_hench4_$X_cwl22}" value="0" class="sheet-short"/>%</td>
                                     <td><input type="text" name="attr_cwt22" title="@{repeating_hench4_$X_cwt22}" value="(@{cwb22})+(@{cwr22})+(@{cwd22})+(@{cwk22})+(@{cwm22})+(@{cwa22})+(@{cwl22})" disabled class="sheet-short"/>%</td>
-                                    <td><button type="roll" name="roll_cw22" title="%{repeating_hench4_$X_cw22}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{cwt22})]] [@{henchname44} Climb Walls]">Armor</button></td>
-                                    <td><button type="roll" name="roll_cwnoarmor22" title="%{repeating_hench4_$X_cwnoarmor22}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{cwb22})+(@{cwr22})+(@{cwd22})+(@{cwk22})+(@{cwm22})+(@{cwl22})+10]] [@{henchname44} Climb Walls (without armor)]">No Armor</button></td>
+                                    <td><button type="roll" name="roll_cw22" title="%{repeating_hench4_$X_cw22}" value="/w gm &{template:2Echeck} {{checkvs=Climb Walls}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{cwt22}]]}}">Armor</button></td>
+                                    <td><button type="roll" name="roll_cwnoarmor22" title="%{repeating_hench4_$X_cwnoarmor22}" value="/w gm &{template:2Echeck} {{checkvs=Climb Walls\n(in No Armor)}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{cwb22})+(@{cwr22})+(@{cwd22})+(@{cwk22})+(@{cwm22})+(@{cwl22})+10]]}}">No Armor</button></td>
                                 </tr>
                                 <tr>
                                     <td>Read Languages</td>
@@ -14469,8 +14469,8 @@
                                     <td><input type="text" name="attr_rla22" title="@{repeating_hench4_$X_rla22}" value="-0" class="sheet-short"/>%</td>
                                     <td><input type="text" name="attr_rll22" title="@{repeating_hench4_$X_rll22}" value="0" class="sheet-short"/>%</td>
                                     <td><input type="text" name="attr_rlt22" title="@{repeating_hench4_$X_rlt22}" value="(@{rlb22})+(@{rlr22})+(@{rld22})+(@{rlk22})+(@{rlm22})+(@{rla22})+(@{rll22})" disabled class="sheet-short"/>%</td>
-                                    <td><button type="roll" name="roll_rl22" title="%{repeating_hench4_$X_rl22}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{rlt22})]] [@{henchname44} Read Languages]">Armor</button></td>
-                                    <td><button type="roll" name="roll_rlnoarmor22" title="%{repeating_hench4_$X_rlnoarmor22}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{rlb22})+(@{rlr22})+(@{rld22})+(@{rlk22})+(@{rlm22})+(@{rll22})]] [@{henchname44} Read Languages (without armor)]">No Armor</button></td>
+                                    <td><button type="roll" name="roll_rl22" title="%{repeating_hench4_$X_rl22}" value="/w gm &{template:2Echeck} {{checkvs=Read Languages}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{rlt22}]]}}">Armor</button></td>
+                                    <td><button type="roll" name="roll_rlnoarmor22" title="%{repeating_hench4_$X_rlnoarmor22}" value="/w gm &{template:2Echeck} {{checkvs=Read Languages\n(in No Armor)}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{rlb22})+(@{rlr22})+(@{rld22})+(@{rlk22})+(@{rlm22})+(@{rll22})]]}}">No Armor</button></td>
                                 </tr>
                                 <tr>
                                     <td>Legend Lore</td>
@@ -14482,8 +14482,8 @@
                                     <td><input type="text" name="attr_iba22" title="@{repeating_hench4_$X_iba22}" value="-0" class="sheet-short"/>%</td>
                                     <td><input type="text" name="attr_ibl22" title="@{repeating_hench4_$X_ibl22}" value="0" class="sheet-short"/>%</td>
                                     <td><input type="text" name="attr_ibt22" title="@{repeating_hench4_$X_ibt22}" value="(@{ibb22})+(@{ibr22})+(@{ibd22})+(@{ibk22})+(@{ibm22})+(@{iba22})+(@{ibl22})" disabled class="sheet-short"/>%</td>
-                                    <td><button type="roll" name="roll_ib22" title="%{repeating_hench4_$X_ib22}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{ibt22})]] [@{henchname44} Legend Lore]">Armor</button></td>
-                                    <td><button type="roll" name="roll_ibnoarmor22" title="%{repeating_hench4_$X_ibnoarmor22}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{ibb22})+(@{ibr22})+(@{ibd22})+(@{ibk22})+(@{ibm22})+(@{ibl22})]] [@{henchname44} Legend Lore (without armor)]">No Armor</button></td>
+                                    <td><button type="roll" name="roll_ib22" title="%{repeating_hench4_$X_ib22}" value="/w gm &{template:2Echeck} {{checkvs=Legend Lore}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{ibt22}]]}}">Armor</button></td>
+                                    <td><button type="roll" name="roll_ibnoarmor22" title="%{repeating_hench4_$X_ibnoarmor22}" value="/w gm &{template:2Echeck} {{checkvs=Legend Lore\n(in No Armor)}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{ibb22})+(@{ibr22})+(@{ibd22})+(@{ibk22})+(@{ibm22})+(@{ibl22})]]}}">No Armor</button></td>
                                 </tr>
                             </table>
                         </div>
@@ -14510,8 +14510,8 @@
                                     <td><input type="text" name="attr_dma22" title="@{repeating_hench4_$X_dma22}" value="-0" class="sheet-short"/>%</td>
                                     <td><input type="text" name="attr_dml22" title="@{repeating_hench4_$X_dml22}" value="0" class="sheet-short"/>%</td>
                                     <td><input type="text" name="attr_dmt22" title="@{repeating_hench4_$X_dmt22}" value="(@{dmb22})+(@{dmr22})+(@{dmd22})+(@{dmk22})+(@{dmm22})+(@{dma22})+(@{dml22})" disabled class="sheet-short"/>%</td>
-                                    <td><button type="roll" name="roll_dm2" title="=%{repeating_hench4_$X_dm22}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{dmt2})]] [@{henchname44} Detect Magic]">Armor</button></td>
-                                    <td><button type="roll" name="roll_dmnoarmor22" title="%{repeating_hench4_$X_dmnoarmor22}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{dmb22})+(@{dmr22})+(@{dmd22})+(@{dmk22})+(@{dmm22})+(@{dml22})]] [@{henchname44} Detect Magic (without armor)]">No Armor</button></td>
+                                    <td><button type="roll" name="roll_dm2" title="=%{repeating_hench4_$X_dm22}" value="/w gm &{template:2Echeck} {{checkvs=Detect Magic}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{dmt2}]]}}">Armor</button></td>
+                                    <td><button type="roll" name="roll_dmnoarmor22" title="%{repeating_hench4_$X_dmnoarmor22}" value="/w gm &{template:2Echeck} {{checkvs=Detect Magic\n(in No Armor)}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{dmb22})+(@{dmr22})+(@{dmd22})+(@{dmk22})+(@{dmm22})+(@{dml22})]]}}">No Armor</button></td>
                                 </tr>
                                 <tr>
                                     <td>Detect Illusion*</td>
@@ -14523,8 +14523,8 @@
                                     <td><input type="text" name="attr_dia22" title="@{repeating_hench4_$X_dia22}" value="-0" class="sheet-short"/>%</td>
                                     <td><input type="text" name="attr_dil22" title="@{repeating_hench4_$X_dil22}" value="0" class="sheet-short"/>%</td>
                                     <td><input type="text" name="attr_dit22" title="@{repeating_hench4_$X_dit22}" value="(@{dib22})+(@{dir22})+(@{did22})+(@{dik22})+(@{dim22})+(@{dia22})+(@{dil22})" disabled class="sheet-short"/>%</td>
-                                    <td><button type="roll" name="roll_di22" title="%{repeating_hench4_$X_di22}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{dit22})]] [@{henchname44} Detect Illusion*]">Armor</button></td>
-                                    <td><button type="roll" name="roll_dinoarmor22" title="%{repeating_hench4_$X_dinoarmor2}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{dib22})+(@{dir22})+(@{did22})+(@{dik22})+(@{dim22})+(@{dil22})]] [@{henchname44} Detect Illusion* (without armor)]">No Armor</button></td>
+                                    <td><button type="roll" name="roll_di22" title="%{repeating_hench4_$X_di22}" value="/w gm &{template:2Echeck} {{checkvs=Detect Illusion*}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{dit22}]]}}">Armor</button></td>
+                                    <td><button type="roll" name="roll_dinoarmor22" title="%{repeating_hench4_$X_dinoarmor2}" value="/w gm &{template:2Echeck} {{checkvs=Detect Illusion*\n(in No Armor)}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{dib22})+(@{dir22})+(@{did22})+(@{dik22})+(@{dim22})+(@{dil22})]]}}">No Armor</button></td>
                                 </tr>
                                 <tr>
                                     <td>Bribery*</td>
@@ -14536,8 +14536,8 @@
                                     <td><input type="text" name="attr_bra22" title="@{repeating_hench4_$X_bra22}" value="-0" class="sheet-short"/>%</td>
                                     <td><input type="text" name="attr_brl22" title="@{repeating_hench4_$X_brl22}" value="0" class="sheet-short"/>%</td>
                                     <td><input type="text" name="attr_brt22" title="@{repeating_hench4_$X_brt22}" value="(@{brb22})+(@{brr22})+(@{brd22})+(@{brk22})+(@{brm22})+(@{bra22})+(@{brl22})" disabled class="sheet-short"/>%</td>
-                                    <td><button type="roll" name="roll_br22" title="%{repeating_hench4_$X_br22}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{brt22})]] [@{henchname44} Bribe*]">Armor</button></td>
-                                    <td><button type="roll" name="roll_brnoarmor22" title="%{repeating_hench4_$X_brnoarmor22}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{brb22})+(@{brr2})+(@{brd22})+(@{brk22})+(@{brm22})+(@{brl22})]] [@{henchname44} Bribe* (without armor)]">No Armor</button></td>
+                                    <td><button type="roll" name="roll_br22" title="%{repeating_hench4_$X_br22}" value="/w gm &{template:2Echeck} {{checkvs=Bribe*}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{brt22}]]}}">Armor</button></td>
+                                    <td><button type="roll" name="roll_brnoarmor22" title="%{repeating_hench4_$X_brnoarmor22}" value="/w gm &{template:2Echeck} {{checkvs=Bribe*\n(in No Armor)}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{brb22})+(@{brr2})+(@{brd22})+(@{brk22})+(@{brm22})+(@{brl22})]]}}">No Armor</button></td>
                                 </tr>
                                 <tr>
                                     <td>Tunneling*</td>
@@ -14549,8 +14549,8 @@
                                     <td><input type="text" name="attr_tua22" title="@{repeating_hench4_$X_tua22}" value="-0" class="sheet-short"/>%</td>
                                     <td><input type="text" name="attr_tul22" title="@{repeating_hench4_$X_tul22}" value="0" class="sheet-short"/>%</td>
                                     <td><input type="text" name="attr_tut22" title="@{repeating_hench4_$X_tut22}" value="(@{tub22})+(@{tur22})+(@{tud22})+(@{tuk22})+(@{tum22})+(@{tua22})+(@{tul22})" disabled class="sheet-short"/>%</td>
-                                    <td><button type="roll" name="roll_tu22" title="%{repeating_hench4_$X_tu22}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{tut22})]] [@{henchname44} Tunneling*]">Armor</button></td>
-                                    <td><button type="roll" name="roll_tunoarmor22" title="%{repeating_hench4_$X_tunoarmor22}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{tub22})+(@{tur22})+(@{tud22})+(@{tuk22})+(@{tum22})+(@{tul22})+10]] [@{henchname44} Tunneling* (without armor)]">No Armor</button></td>
+                                    <td><button type="roll" name="roll_tu22" title="%{repeating_hench4_$X_tu22}" value="/w gm &{template:2Echeck} {{checkvs=Tunneling*}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{tut22}]]}}">Armor</button></td>
+                                    <td><button type="roll" name="roll_tunoarmor22" title="%{repeating_hench4_$X_tunoarmor22}" value="/w gm &{template:2Echeck} {{checkvs=Tunneling*\n(in No Armor)}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{tub22})+(@{tur22})+(@{tud22})+(@{tuk22})+(@{tum22})+(@{tul22})+10]]}}">No Armor</button></td>
                                 </tr>
                                 <tr>
                                     <td>Escape Bonds*</td>
@@ -14562,8 +14562,8 @@
                                     <td><input type="text" name="attr_eba22" title="@{repeating_hench4_$X_eba22}" value="-0" class="sheet-short"/>%</td>
                                     <td><input type="text" name="attr_ebl22" title="@{repeating_hench4_$X_ebl22}" value="0" class="sheet-short"/>%</td>
                                     <td><input type="text" name="attr_ebt22" title="@{repeating_hench4_$X_ebt22}" value="(@{ebb22})+(@{ebr22})+(@{ebd22})+(@{ebk22})+(@{ebm22})+(@{eba22})+(@{ebl22})" disabled class="sheet-short"/>%</td>
-                                    <td><button type="roll" name="roll_eb22" title="%{repeating_hench4_$X_eb22}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{ebt22})]] [@{henchname44} Escape Bonds*]">Armor</button></td>
-                                    <td><button type="roll" name="roll_ebnoarmor22" title="%{repeating_hench4_$X_ebnoarmor22}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{ebb22})+(@{ebr22})+(@{ebd22})+(@{ebk22})+(@{ebm22})+(@{ebl22})+5]] [@{henchname44} Escape Bonds* (without armor)]">No Armor</button></td>
+                                    <td><button type="roll" name="roll_eb22" title="%{repeating_hench4_$X_eb22}" value="/w gm &{template:2Echeck} {{checkvs=Escape Bonds*}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{ebt22}]]}}">Armor</button></td>
+                                    <td><button type="roll" name="roll_ebnoarmor22" title="%{repeating_hench4_$X_ebnoarmor22}" value="/w gm &{template:2Echeck} {{checkvs=Escape Bonds*\n(in No Armor)}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{ebb22})+(@{ebr22})+(@{ebd22})+(@{ebk22})+(@{ebm22})+(@{ebl22})+5]]}}">No Armor</button></td>
                                 </tr>
                                 <tr>
                                     <td>Forge Documents*</td>
@@ -14575,8 +14575,8 @@
                                     <td><input type="text" name="attr_fda22" title="@{repeating_hench4_$X_fda22}" value="-0" class="sheet-short"/>%</td>
                                     <td><input type="text" name="attr_fdl22" title="@{repeating_hench4_$X_fdl22}" value="0" class="sheet-short"/>%</td>
                                     <td><input type="text" name="attr_fdt22" title="@{repeating_hench4_$X_fdt22}" value="(@{fdb22})+(@{fdr22})+(@{fdd22})+(@{fdk22})+(@{fdm22})+(@{fda22})+(@{fdl22})" disabled class="sheet-short"/>%</td>
-                                    <td><button type="roll" name="roll_fd22" title="%{repeating_hench4_$X_fd22}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{fdt22})]] [@{henchname44} Forge Documents*]">Armor</button></td>
-                                    <td><button type="roll" name="roll_fdnoarmor22" title="%{repeating_hench4_$X_fdnoarmor22}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{fdb22})+(@{fdr22})+(@{fdd22})+(@{fdk22})+(@{fdm22})+(@{fdl22})]] [@{henchname44} Forge Documents* (without armor)]">No Armor</button></td>
+                                    <td><button type="roll" name="roll_fd22" title="%{repeating_hench4_$X_fd22}" value="/w gm &{template:2Echeck} {{checkvs=Forge Documents*}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{fdt22}]]}}">Armor</button></td>
+                                    <td><button type="roll" name="roll_fdnoarmor22" title="%{repeating_hench4_$X_fdnoarmor22}" value="/w gm &{template:2Echeck} {{checkvs=Forge Documents*\n(in No Armor)}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{fdb22})+(@{fdr22})+(@{fdd22})+(@{fdk22})+(@{fdm22})+(@{fdl22})]]}}">No Armor</button></td>
                                 </tr>
                                 <tr>
                                     <td>Appraise*</td>
@@ -14588,8 +14588,8 @@
                                     <td><input type="text" name="attr_apa22" title="@{repeating_hench4_$X_apa22}" value="-0" class="sheet-short"/>%</td>
                                     <td><input type="text" name="attr_apl22" title="@{repeating_hench4_$X_apl22}" value="0" class="sheet-short"/>%</td>
                                     <td><input type="text" name="attr_apt22" title="@{repeating_hench4_$X_apt22}" value="(@{apb22})+(@{apr22})+(@{apd22})+(@{apk22})+(@{apm22})+(@{apa22})+(@{apl22})" disabled class="sheet-short"/>%</td>
-                                    <td><button type="roll" name="roll_ap22" title="%{repeating_hench4_$X_ap22}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{apt22})]] [@{henchname44} Appraise*]">Armor</button></td>
-                                    <td><button type="roll" name="roll_apnoarmor22" title="%{repeating_hench4_$X_apnoarmor22}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{apb22})+(@{apr22})+(@{apd22})+(@{apk22})+(@{apm22})+(@{apl22})]] [@{henchname44} Appraise* (without armor)]">No Armor</button></td>
+                                    <td><button type="roll" name="roll_ap22" title="%{repeating_hench4_$X_ap22}" value="/w gm &{template:2Echeck} {{checkvs=Appraise*}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{apt22}]]}}">Armor</button></td>
+                                    <td><button type="roll" name="roll_apnoarmor22" title="%{repeating_hench4_$X_apnoarmor22}" value="/w gm &{template:2Echeck} {{checkvs=Appraise*\n(in No Armor)}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{apb22})+(@{apr22})+(@{apd22})+(@{apk22})+(@{apm22})+(@{apl22})]]}}">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 385b7c92d3..02b78e13bd 100644
--- a/ADnD_2E_Revised/html/tabs/character-tab/followers-tab.html
+++ b/ADnD_2E_Revised/html/tabs/character-tab/followers-tab.html
@@ -724,8 +724,8 @@
                                 <td><input type="text" name="attr_ppa22" title="@{repeating_hench4_$X_ppa22}" value="-0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_ppl22" title="@{repeating_hench4_$X_ppl22}" value="0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_ppt22" title="@{repeating_hench4_$X_ppt22}" value="(@{ppb22})+(@{ppr22})+(@{ppd22})+(@{ppk22})+(@{ppm22})+(@{ppa22})+(@{ppl22})" disabled class="sheet-short"/>%</td>
-                                <td><button type="roll" name="roll_pp22" title="%{repeating_hench4_$X_pp22}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{ppt22})]] [@{henchname44} Pick Pockets]">Armor</button></td>
-                                <td><button type="roll" name="roll_ppnoarmor22" title="%{repeating_hench4_$X_ppnoarmor22}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{ppb22})+(@{ppr22})+(@{ppd22})+(@{ppk22})+(@{ppm22})+(@{ppl22})+5]] [@{henchname44} Pick Pockets (without armor)]">No Armor</button></td>
+                                <td><button type="roll" name="roll_pp22" title="%{repeating_hench4_$X_pp22}" value="/w gm &{template:2Echeck} {{checkvs=Pick Pockets}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{ppt22}]]}}">Armor</button></td>
+                                <td><button type="roll" name="roll_ppnoarmor22" title="%{repeating_hench4_$X_ppnoarmor22}" value="/w gm &{template:2Echeck} {{checkvs=Pick Pockets\n(in No Armor)}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{ppb22})+(@{ppr22})+(@{ppd22})+(@{ppk22})+(@{ppm22})+(@{ppl22})+5]]}}">No Armor</button></td>
                             </tr>
                             <tr>
                                 <td>Open Locks</td>
@@ -737,8 +737,8 @@
                                 <td><input type="text" name="attr_ola22" title="@{repeating_hench4_$X_ola22}" value="-0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_oll22" title="@{repeating_hench4_$X_oll22}" value="0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_olt22" title="@{repeating_hench4_$X_olt22}" value="(@{olb22})+(@{olr22})+(@{old22})+(@{olk22})+(@{olm22})+(@{ola22})+(@{oll22})" disabled class="sheet-short"/>%</td>
-                                <td><button type="roll" name="roll_ol22" title="%{repeating_hench4_$X_ol22}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{olt22})]] [@{henchname44} Open Locks]">Armor</button></td>
-                                <td><button type="roll" name="roll_olnoarmor22" title="%{repeating_hench4_$X_olnoarmor22}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{olb22})+(@{olr22})+(@{old22})+(@{olk22})+(@{olm22})+(@{oll22})]] [@{henchname44} Open Locks (without armor)]">No Armor</button></td>
+                                <td><button type="roll" name="roll_ol22" title="%{repeating_hench4_$X_ol22}" value="/w gm &{template:2Echeck} {{checkvs=Open Locks}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{olt22}]]}}">Armor</button></td>
+                                <td><button type="roll" name="roll_olnoarmor22" title="%{repeating_hench4_$X_olnoarmor22}" value="/w gm &{template:2Echeck} {{checkvs=Open Locks\n(in No Armor)}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{olb22})+(@{olr22})+(@{old22})+(@{olk22})+(@{olm22})+(@{oll22})]]}}">No Armor</button></td>
                             </tr>
                             <tr>
                                 <td>Find/Remove Traps</td>
@@ -750,8 +750,8 @@
                                 <td><input type="text" name="attr_rta22" title="@{repeating_hench4_$X_rta22}" value="-0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_rtl22" title="@{repeating_hench4_$X_rtl22}" value="0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_rtt22" title="@{repeating_hench4_$X_rtt22}" value="(@{rtb22})+(@{rtr22})+(@{rtd22})+(@{rtk22})+(@{rtm22})+(@{rta22})+(@{rtl22})" disabled class="sheet-short"/>%</td>
-                                <td><button type="roll" name="roll_rt22" title="%{repeating_hench4_$X_rt22}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{rtt22})]] [@{henchname44} Find/Remove Traps]">Armor</button></td>
-                                <td><button type="roll" name="roll_rtnoarmor22" title="%{repeating_hench4_$X_rtnoarmor22}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{rtb22})+(@{rtr22})+(@{rtd22})+(@{rtk22})+(@{rtm22})+(@{rtl22})]] [@{henchname44} Find/Remove Traps (without armor)]">No Armor</button></td>
+                                <td><button type="roll" name="roll_rt22" title="%{repeating_hench4_$X_rt22}" value="/w gm &{template:2Echeck} {{checkvs=Find/Remove Traps}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{rtt22}]]}}">Armor</button></td>
+                                <td><button type="roll" name="roll_rtnoarmor22" title="%{repeating_hench4_$X_rtnoarmor22}" value="/w gm &{template:2Echeck} {{checkvs=Find/Remove Traps\n(in No Armor)}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{rtb22})+(@{rtr22})+(@{rtd22})+(@{rtk22})+(@{rtm22})+(@{rtl22})]]}}">No Armor</button></td>
                             </tr>
                             <tr>
                                 <td>Move Silently</td>
@@ -763,8 +763,8 @@
                                 <td><input type="text" name="attr_msa22" title="@{repeating_hench4_$X_msa22}" value="-0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_msl22" title="@{repeating_hench4_$X_msl22}" value="0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_mst22" title="@{repeating_hench4_$X_mst22}" value="(@{msb22})+(@{msr22})+(@{msd22})+(@{msk22})+(@{msm22})+(@{msa22})+(@{msl22})" disabled class="sheet-short"/>%</td>
-                                <td><button type="roll" name="roll_ms22" title="%{repeating_hench4_$X_ms22}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{mst22})]] [@{henchname44} Move Silently]">Armor</button></td>
-                                <td><button type="roll" name="roll_msnoarmor22" title="%{repeating_hench4_$X_msnoarmor22}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{msb22})+(@{msr22})+(@{msd22})+(@{msk22})+(@{msm22})+(@{msl22})+10]] [@{henchname44} Move Silently (without armor)]">No Armor</button></td>
+                                <td><button type="roll" name="roll_ms22" title="%{repeating_hench4_$X_ms22}" value="/w gm &{template:2Echeck} {{checkvs=Move Silently}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{mst22}]]}}">Armor</button></td>
+                                <td><button type="roll" name="roll_msnoarmor22" title="%{repeating_hench4_$X_msnoarmor22}" value="/w gm &{template:2Echeck} {{checkvs=Move Silently\n(in No Armor)}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{msb22})+(@{msr22})+(@{msd22})+(@{msk22})+(@{msm22})+(@{msl22})+10]]}}">No Armor</button></td>
                             </tr>
                             <tr>
                                 <td>Hide in Shadows</td>
@@ -776,8 +776,8 @@
                                 <td><input type="text" name="attr_hsa22" title="@{repeating_hench4_$X_hsa22}" value="-0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_hsl22" title="@{repeating_hench4_$X_hsl22}" value="0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_hst22" title="@{repeating_hench4_$X_hst22}" value="(@{hsb22})+(@{hsr22})+(@{hsd22})+(@{hsk22})+(@{hsm22})+(@{hsa22})+(@{hsl22})" disabled class="sheet-short"/>%</td>
-                                <td><button type="roll" name="roll_hs22" title="%{repeating_hench4_$X_hs22}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{hst22})]] [@{henchname44} Hide in Shadows]">Armor</button></td>
-                                <td><button type="roll" name="roll_hsnoarmor22" title="%{repeating_hench4_$X_hsnoarmor22}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{hsb22})+(@{hsr22})+(@{hsd22})+(@{hsk22})+(@{hsm22})+(@{hsl22})+5]] [@{henchname44} Hide in Shadows (without armor)]">No Armor</button></td>
+                                <td><button type="roll" name="roll_hs22" title="%{repeating_hench4_$X_hs22}" value="/w gm &{template:2Echeck} {{checkvs=Hide in Shadows}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{hst22}]]}}">Armor</button></td>
+                                <td><button type="roll" name="roll_hsnoarmor22" title="%{repeating_hench4_$X_hsnoarmor22}" value="/w gm &{template:2Echeck} {{checkvs=Hide in Shadows\n(in No Armor)}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{hsb22})+(@{hsr22})+(@{hsd22})+(@{hsk22})+(@{hsm22})+(@{hsl22})+5]]}}">No Armor</button></td>
                             </tr>
                             <tr>
                                 <td>Detect Noise</td>
@@ -789,8 +789,8 @@
                                 <td><input type="text" name="attr_dna22" title="@{repeating_hench4_$X_dna22}" value="-0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_dnl22" title="@{repeating_hench4_$X_dnl22}" value="0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_dnt22" title="@{repeating_hench4_$X_dnt22}" value="(@{dnb22})+(@{dnr22})+(@{dnd22})+(@{dnk22})+(@{dnm22})+(@{dna22})+(@{dnl22})" disabled class="sheet-short"/>%</td>
-                                <td><button type="roll" name="roll_dn22" title="%{repeating_hench4_$X_dn22}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{dnt22})]] [@{henchname44} Detect Noise]">Armor</button></td>
-                                <td><button type="roll" name="roll_dnnoarmor22" title="%{repeating_hench4_$X_dnnoarmor22}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{dnb22})+(@{dnr22})+(@{dnd22})+(@{dnk22})+(@{dnm22})+(@{dnl22})]] [@{henchname44} Detect Noise (without armor)]">No Armor</button></td>
+                                <td><button type="roll" name="roll_dn22" title="%{repeating_hench4_$X_dn22}" value="/w gm &{template:2Echeck} {{checkvs=Detect Noise}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{dnt22}]]}}">Armor</button></td>
+                                <td><button type="roll" name="roll_dnnoarmor22" title="%{repeating_hench4_$X_dnnoarmor22}" value="/w gm &{template:2Echeck} {{checkvs=Detect Noise\n(in No Armor)}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{dnb22})+(@{dnr22})+(@{dnd22})+(@{dnk22})+(@{dnm22})+(@{dnl22})]]}}">No Armor</button></td>
                             </tr>
                             <tr>
                                 <td>Climb Walls</td>
@@ -802,8 +802,8 @@
                                 <td><input type="text" name="attr_cwa22" title="@{repeating_hench4_$X_cwa22}" value="-0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_cwl22" title="@{repeating_hench4_$X_cwl22}" value="0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_cwt22" title="@{repeating_hench4_$X_cwt22}" value="(@{cwb22})+(@{cwr22})+(@{cwd22})+(@{cwk22})+(@{cwm22})+(@{cwa22})+(@{cwl22})" disabled class="sheet-short"/>%</td>
-                                <td><button type="roll" name="roll_cw22" title="%{repeating_hench4_$X_cw22}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{cwt22})]] [@{henchname44} Climb Walls]">Armor</button></td>
-                                <td><button type="roll" name="roll_cwnoarmor22" title="%{repeating_hench4_$X_cwnoarmor22}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{cwb22})+(@{cwr22})+(@{cwd22})+(@{cwk22})+(@{cwm22})+(@{cwl22})+10]] [@{henchname44} Climb Walls (without armor)]">No Armor</button></td>
+                                <td><button type="roll" name="roll_cw22" title="%{repeating_hench4_$X_cw22}" value="/w gm &{template:2Echeck} {{checkvs=Climb Walls}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{cwt22}]]}}">Armor</button></td>
+                                <td><button type="roll" name="roll_cwnoarmor22" title="%{repeating_hench4_$X_cwnoarmor22}" value="/w gm &{template:2Echeck} {{checkvs=Climb Walls\n(in No Armor)}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{cwb22})+(@{cwr22})+(@{cwd22})+(@{cwk22})+(@{cwm22})+(@{cwl22})+10]]}}">No Armor</button></td>
                             </tr>
                             <tr>
                                 <td>Read Languages</td>
@@ -815,8 +815,8 @@
                                 <td><input type="text" name="attr_rla22" title="@{repeating_hench4_$X_rla22}" value="-0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_rll22" title="@{repeating_hench4_$X_rll22}" value="0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_rlt22" title="@{repeating_hench4_$X_rlt22}" value="(@{rlb22})+(@{rlr22})+(@{rld22})+(@{rlk22})+(@{rlm22})+(@{rla22})+(@{rll22})" disabled class="sheet-short"/>%</td>
-                                <td><button type="roll" name="roll_rl22" title="%{repeating_hench4_$X_rl22}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{rlt22})]] [@{henchname44} Read Languages]">Armor</button></td>
-                                <td><button type="roll" name="roll_rlnoarmor22" title="%{repeating_hench4_$X_rlnoarmor22}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{rlb22})+(@{rlr22})+(@{rld22})+(@{rlk22})+(@{rlm22})+(@{rll22})]] [@{henchname44} Read Languages (without armor)]">No Armor</button></td>
+                                <td><button type="roll" name="roll_rl22" title="%{repeating_hench4_$X_rl22}" value="/w gm &{template:2Echeck} {{checkvs=Read Languages}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{rlt22}]]}}">Armor</button></td>
+                                <td><button type="roll" name="roll_rlnoarmor22" title="%{repeating_hench4_$X_rlnoarmor22}" value="/w gm &{template:2Echeck} {{checkvs=Read Languages\n(in No Armor)}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{rlb22})+(@{rlr22})+(@{rld22})+(@{rlk22})+(@{rlm22})+(@{rll22})]]}}">No Armor</button></td>
                             </tr>
                             <tr>
                                 <td>Legend Lore</td>
@@ -828,8 +828,8 @@
                                 <td><input type="text" name="attr_iba22" title="@{repeating_hench4_$X_iba22}" value="-0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_ibl22" title="@{repeating_hench4_$X_ibl22}" value="0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_ibt22" title="@{repeating_hench4_$X_ibt22}" value="(@{ibb22})+(@{ibr22})+(@{ibd22})+(@{ibk22})+(@{ibm22})+(@{iba22})+(@{ibl22})" disabled class="sheet-short"/>%</td>
-                                <td><button type="roll" name="roll_ib22" title="%{repeating_hench4_$X_ib22}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{ibt22})]] [@{henchname44} Legend Lore]">Armor</button></td>
-                                <td><button type="roll" name="roll_ibnoarmor22" title="%{repeating_hench4_$X_ibnoarmor22}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{ibb22})+(@{ibr22})+(@{ibd22})+(@{ibk22})+(@{ibm22})+(@{ibl22})]] [@{henchname44} Legend Lore (without armor)]">No Armor</button></td>
+                                <td><button type="roll" name="roll_ib22" title="%{repeating_hench4_$X_ib22}" value="/w gm &{template:2Echeck} {{checkvs=Legend Lore}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{ibt22}]]}}">Armor</button></td>
+                                <td><button type="roll" name="roll_ibnoarmor22" title="%{repeating_hench4_$X_ibnoarmor22}" value="/w gm &{template:2Echeck} {{checkvs=Legend Lore\n(in No Armor)}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{ibb22})+(@{ibr22})+(@{ibd22})+(@{ibk22})+(@{ibm22})+(@{ibl22})]]}}">No Armor</button></td>
                             </tr>
                         </table>
                     </div>
@@ -856,8 +856,8 @@
                                 <td><input type="text" name="attr_dma22" title="@{repeating_hench4_$X_dma22}" value="-0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_dml22" title="@{repeating_hench4_$X_dml22}" value="0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_dmt22" title="@{repeating_hench4_$X_dmt22}" value="(@{dmb22})+(@{dmr22})+(@{dmd22})+(@{dmk22})+(@{dmm22})+(@{dma22})+(@{dml22})" disabled class="sheet-short"/>%</td>
-                                <td><button type="roll" name="roll_dm2" title="=%{repeating_hench4_$X_dm22}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{dmt2})]] [@{henchname44} Detect Magic]">Armor</button></td>
-                                <td><button type="roll" name="roll_dmnoarmor22" title="%{repeating_hench4_$X_dmnoarmor22}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{dmb22})+(@{dmr22})+(@{dmd22})+(@{dmk22})+(@{dmm22})+(@{dml22})]] [@{henchname44} Detect Magic (without armor)]">No Armor</button></td>
+                                <td><button type="roll" name="roll_dm2" title="=%{repeating_hench4_$X_dm22}" value="/w gm &{template:2Echeck} {{checkvs=Detect Magic}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{dmt2}]]}}">Armor</button></td>
+                                <td><button type="roll" name="roll_dmnoarmor22" title="%{repeating_hench4_$X_dmnoarmor22}" value="/w gm &{template:2Echeck} {{checkvs=Detect Magic\n(in No Armor)}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{dmb22})+(@{dmr22})+(@{dmd22})+(@{dmk22})+(@{dmm22})+(@{dml22})]]}}">No Armor</button></td>
                             </tr>
                             <tr>
                                 <td>Detect Illusion*</td>
@@ -869,8 +869,8 @@
                                 <td><input type="text" name="attr_dia22" title="@{repeating_hench4_$X_dia22}" value="-0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_dil22" title="@{repeating_hench4_$X_dil22}" value="0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_dit22" title="@{repeating_hench4_$X_dit22}" value="(@{dib22})+(@{dir22})+(@{did22})+(@{dik22})+(@{dim22})+(@{dia22})+(@{dil22})" disabled class="sheet-short"/>%</td>
-                                <td><button type="roll" name="roll_di22" title="%{repeating_hench4_$X_di22}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{dit22})]] [@{henchname44} Detect Illusion*]">Armor</button></td>
-                                <td><button type="roll" name="roll_dinoarmor22" title="%{repeating_hench4_$X_dinoarmor2}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{dib22})+(@{dir22})+(@{did22})+(@{dik22})+(@{dim22})+(@{dil22})]] [@{henchname44} Detect Illusion* (without armor)]">No Armor</button></td>
+                                <td><button type="roll" name="roll_di22" title="%{repeating_hench4_$X_di22}" value="/w gm &{template:2Echeck} {{checkvs=Detect Illusion*}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{dit22}]]}}">Armor</button></td>
+                                <td><button type="roll" name="roll_dinoarmor22" title="%{repeating_hench4_$X_dinoarmor2}" value="/w gm &{template:2Echeck} {{checkvs=Detect Illusion*\n(in No Armor)}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{dib22})+(@{dir22})+(@{did22})+(@{dik22})+(@{dim22})+(@{dil22})]]}}">No Armor</button></td>
                             </tr>
                             <tr>
                                 <td>Bribery*</td>
@@ -882,8 +882,8 @@
                                 <td><input type="text" name="attr_bra22" title="@{repeating_hench4_$X_bra22}" value="-0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_brl22" title="@{repeating_hench4_$X_brl22}" value="0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_brt22" title="@{repeating_hench4_$X_brt22}" value="(@{brb22})+(@{brr22})+(@{brd22})+(@{brk22})+(@{brm22})+(@{bra22})+(@{brl22})" disabled class="sheet-short"/>%</td>
-                                <td><button type="roll" name="roll_br22" title="%{repeating_hench4_$X_br22}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{brt22})]] [@{henchname44} Bribe*]">Armor</button></td>
-                                <td><button type="roll" name="roll_brnoarmor22" title="%{repeating_hench4_$X_brnoarmor22}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{brb22})+(@{brr2})+(@{brd22})+(@{brk22})+(@{brm22})+(@{brl22})]] [@{henchname44} Bribe* (without armor)]">No Armor</button></td>
+                                <td><button type="roll" name="roll_br22" title="%{repeating_hench4_$X_br22}" value="/w gm &{template:2Echeck} {{checkvs=Bribe*}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{brt22}]]}}">Armor</button></td>
+                                <td><button type="roll" name="roll_brnoarmor22" title="%{repeating_hench4_$X_brnoarmor22}" value="/w gm &{template:2Echeck} {{checkvs=Bribe*\n(in No Armor)}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{brb22})+(@{brr2})+(@{brd22})+(@{brk22})+(@{brm22})+(@{brl22})]]}}">No Armor</button></td>
                             </tr>
                             <tr>
                                 <td>Tunneling*</td>
@@ -895,8 +895,8 @@
                                 <td><input type="text" name="attr_tua22" title="@{repeating_hench4_$X_tua22}" value="-0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_tul22" title="@{repeating_hench4_$X_tul22}" value="0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_tut22" title="@{repeating_hench4_$X_tut22}" value="(@{tub22})+(@{tur22})+(@{tud22})+(@{tuk22})+(@{tum22})+(@{tua22})+(@{tul22})" disabled class="sheet-short"/>%</td>
-                                <td><button type="roll" name="roll_tu22" title="%{repeating_hench4_$X_tu22}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{tut22})]] [@{henchname44} Tunneling*]">Armor</button></td>
-                                <td><button type="roll" name="roll_tunoarmor22" title="%{repeating_hench4_$X_tunoarmor22}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{tub22})+(@{tur22})+(@{tud22})+(@{tuk22})+(@{tum22})+(@{tul22})+10]] [@{henchname44} Tunneling* (without armor)]">No Armor</button></td>
+                                <td><button type="roll" name="roll_tu22" title="%{repeating_hench4_$X_tu22}" value="/w gm &{template:2Echeck} {{checkvs=Tunneling*}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{tut22}]]}}">Armor</button></td>
+                                <td><button type="roll" name="roll_tunoarmor22" title="%{repeating_hench4_$X_tunoarmor22}" value="/w gm &{template:2Echeck} {{checkvs=Tunneling*\n(in No Armor)}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{tub22})+(@{tur22})+(@{tud22})+(@{tuk22})+(@{tum22})+(@{tul22})+10]]}}">No Armor</button></td>
                             </tr>
                             <tr>
                                 <td>Escape Bonds*</td>
@@ -908,8 +908,8 @@
                                 <td><input type="text" name="attr_eba22" title="@{repeating_hench4_$X_eba22}" value="-0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_ebl22" title="@{repeating_hench4_$X_ebl22}" value="0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_ebt22" title="@{repeating_hench4_$X_ebt22}" value="(@{ebb22})+(@{ebr22})+(@{ebd22})+(@{ebk22})+(@{ebm22})+(@{eba22})+(@{ebl22})" disabled class="sheet-short"/>%</td>
-                                <td><button type="roll" name="roll_eb22" title="%{repeating_hench4_$X_eb22}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{ebt22})]] [@{henchname44} Escape Bonds*]">Armor</button></td>
-                                <td><button type="roll" name="roll_ebnoarmor22" title="%{repeating_hench4_$X_ebnoarmor22}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{ebb22})+(@{ebr22})+(@{ebd22})+(@{ebk22})+(@{ebm22})+(@{ebl22})+5]] [@{henchname44} Escape Bonds* (without armor)]">No Armor</button></td>
+                                <td><button type="roll" name="roll_eb22" title="%{repeating_hench4_$X_eb22}" value="/w gm &{template:2Echeck} {{checkvs=Escape Bonds*}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{ebt22}]]}}">Armor</button></td>
+                                <td><button type="roll" name="roll_ebnoarmor22" title="%{repeating_hench4_$X_ebnoarmor22}" value="/w gm &{template:2Echeck} {{checkvs=Escape Bonds*\n(in No Armor)}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{ebb22})+(@{ebr22})+(@{ebd22})+(@{ebk22})+(@{ebm22})+(@{ebl22})+5]]}}">No Armor</button></td>
                             </tr>
                             <tr>
                                 <td>Forge Documents*</td>
@@ -921,8 +921,8 @@
                                 <td><input type="text" name="attr_fda22" title="@{repeating_hench4_$X_fda22}" value="-0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_fdl22" title="@{repeating_hench4_$X_fdl22}" value="0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_fdt22" title="@{repeating_hench4_$X_fdt22}" value="(@{fdb22})+(@{fdr22})+(@{fdd22})+(@{fdk22})+(@{fdm22})+(@{fda22})+(@{fdl22})" disabled class="sheet-short"/>%</td>
-                                <td><button type="roll" name="roll_fd22" title="%{repeating_hench4_$X_fd22}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{fdt22})]] [@{henchname44} Forge Documents*]">Armor</button></td>
-                                <td><button type="roll" name="roll_fdnoarmor22" title="%{repeating_hench4_$X_fdnoarmor22}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{fdb22})+(@{fdr22})+(@{fdd22})+(@{fdk22})+(@{fdm22})+(@{fdl22})]] [@{henchname44} Forge Documents* (without armor)]">No Armor</button></td>
+                                <td><button type="roll" name="roll_fd22" title="%{repeating_hench4_$X_fd22}" value="/w gm &{template:2Echeck} {{checkvs=Forge Documents*}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{fdt22}]]}}">Armor</button></td>
+                                <td><button type="roll" name="roll_fdnoarmor22" title="%{repeating_hench4_$X_fdnoarmor22}" value="/w gm &{template:2Echeck} {{checkvs=Forge Documents*\n(in No Armor)}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{fdb22})+(@{fdr22})+(@{fdd22})+(@{fdk22})+(@{fdm22})+(@{fdl22})]]}}">No Armor</button></td>
                             </tr>
                             <tr>
                                 <td>Appraise*</td>
@@ -934,8 +934,8 @@
                                 <td><input type="text" name="attr_apa22" title="@{repeating_hench4_$X_apa22}" value="-0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_apl22" title="@{repeating_hench4_$X_apl22}" value="0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_apt22" title="@{repeating_hench4_$X_apt22}" value="(@{apb22})+(@{apr22})+(@{apd22})+(@{apk22})+(@{apm22})+(@{apa22})+(@{apl22})" disabled class="sheet-short"/>%</td>
-                                <td><button type="roll" name="roll_ap22" title="%{repeating_hench4_$X_ap22}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{apt22})]] [@{henchname44} Appraise*]">Armor</button></td>
-                                <td><button type="roll" name="roll_apnoarmor22" title="%{repeating_hench4_$X_apnoarmor22}" value="/gmroll [[1d100cs<1cf>96+(@{misc-mod})]]&le;[[(@{apb22})+(@{apr22})+(@{apd22})+(@{apk22})+(@{apm22})+(@{apl22})]] [@{henchname44} Appraise* (without armor)]">No Armor</button></td>
+                                <td><button type="roll" name="roll_ap22" title="%{repeating_hench4_$X_ap22}" value="/w gm &{template:2Echeck} {{checkvs=Appraise*}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{apt22}]]}}">Armor</button></td>
+                                <td><button type="roll" name="roll_apnoarmor22" title="%{repeating_hench4_$X_apnoarmor22}" value="/w gm &{template:2Echeck} {{checkvs=Appraise*\n(in No Armor)}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{apb22})+(@{apr22})+(@{apd22})+(@{apk22})+(@{apm22})+(@{apl22})]]}}">No Armor</button></td>
                             </tr>
                         </table>
                     </div>