diff --git a/ADnD 2E Revised/2ESheet.html b/ADnD 2E Revised/2ESheet.html
index 5f80b0a1e0..b27f495d41 100644
--- a/ADnD 2E Revised/2ESheet.html	
+++ b/ADnD 2E Revised/2ESheet.html	
@@ -955,7 +955,7 @@
                 <tr>
                     <td><input type="text" name="attr_domain-name" title="@{domain-name}" class="sheet-maxtext"></td>
                     <td><input type="text" name="attr_province-name" title="@{province-name}" class="sheet-maxtext"></td>
-                    <td><input type="text" name="attr_province-rating" title="@{province-rating}" class="sheet-short">&nbsp;<h4><b>/</b></h4></td>
+                    <td><input type="text" name="attr_province-rating" title="@{province-rating}" class="sheet-short">&nbsp;<label>/</label></td>
                     <td><input type="text" name="attr_magic-rating" title="@{magic-rating}" class="sheet-short"></td>
                     <td><input type="text" name="attr_castle/court" title="@{castle/court}" class="sheet-sym"></td>
                     <td><input type="text" name="attr_taxes" title="@{taxes}" class="sheet-sym"></td>
@@ -1011,7 +1011,7 @@
                     <tr>
                         <td><input type="text" name="attr_domain-name1" title="@{repeating_provinces_$X_domain-name1}" class="sheet-maxtext"></td>
                         <td><input type="text" name="attr_province-name1" title="@{repeating_provinces_$X_province-name1}" class="sheet-maxtext"></td>
-                        <td><input type="text" name="attr_province-rating1" title="@{repeating_provinces_$X_province-rating1}" class="sheet-short">&nbsp;<h4><b>/</b></h4></td>
+                        <td><input type="text" name="attr_province-rating1" title="@{repeating_provinces_$X_province-rating1}" class="sheet-short">&nbsp;<label>/</label></td>
                         <td><input type="text" name="attr_magic-rating1" title="@{repeating_provinces_$X_magic-rating1}" class="sheet-short"></td>
                         <td><input type="text" name="attr_castle/court1" title="@{repeating_provinces_$X_castle/court1}" class="sheet-sym"></td>
                         <td><input type="text" name="attr_taxes1" title="@{repeating_provinces_$X_taxes1}" class="sheet-sym"></td>
@@ -3793,7 +3793,7 @@
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime" title="@{repeating_spells_$X_casttime}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell" title="@{repeating_spells_$X_initspell}" value="/gmroll [[{([[1d10]]+@{casttime}), 1}kh1]] [Initiative (@{spellname})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell" title="%{repeating_spells_$X_initspell}" value="/gmroll [[{([[1d10]]+@{casttime}), 1}kh1]] [Initiative (@{spellname})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea type="text" name="attr_cast-macro" title="@{repeating_spells_$X_cast-macro}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -3827,7 +3827,7 @@
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime2" title="@{repeating_spells2_$X_casttime2}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell2" title="@{repeating_spells2_$X_initspell2}" value="/gmroll [[{([[1d10]]+@{casttime2}), 1}kh1]] [Initiative (@{spellname2})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell2" title="%{repeating_spells2_$X_initspell2}" value="/gmroll [[{([[1d10]]+@{casttime2}), 1}kh1]] [Initiative (@{spellname2})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea type="text" name="attr_cast-macro2" title="@{repeating_spells2_$X_cast-macro2}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -3861,7 +3861,7 @@
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime3" title="@{repeating_spells3_$X_casttime3}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell3" title="@{repeating_spells3_$X_initspell3}" value="/gmroll [[{([[1d10]]+@{casttime3}), 1}kh1]] [Initiative (@{spellname3})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell3" title="%{repeating_spells3_$X_initspell3}" value="/gmroll [[{([[1d10]]+@{casttime3}), 1}kh1]] [Initiative (@{spellname3})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea type="text" name="attr_cast-macro3" title="@{repeating_spells3_$X_cast-macro3}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -4023,7 +4023,7 @@
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime4" title="@{repeating_spells4_$X_casttime4}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell4" title="@{repeating_spells4_$X_initspell4}" value="/gmroll [[{([[1d10]]+@{casttime4}), 1}kh1]] [Initiative (@{spellname4})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell4" title="%{repeating_spells4_$X_initspell4}" value="/gmroll [[{([[1d10]]+@{casttime4}), 1}kh1]] [Initiative (@{spellname4})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea type="text" name="attr_cast-macro4" title="@{repeating_spells4_$X_cast-macro4}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -4057,7 +4057,7 @@
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime5" title="@{repeating_spells5_$X_casttime5}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell5" title="@{repeating_spells5_$X_initspell5}" value="/gmroll [[{([[1d10]]+@{casttime5}), 1}kh1]] [Initiative (@{spellname5})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell5" title="%{repeating_spells5_$X_initspell5}" value="/gmroll [[{([[1d10]]+@{casttime5}), 1}kh1]] [Initiative (@{spellname5})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea type="text" name="attr_cast-macro5" title="@{repeating_spells5_$X_cast-macro5}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -4091,7 +4091,7 @@
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime6" title="@{repeating_spells6_$X_casttime6}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell6" title="@{repeating_spells6_$X_initspell6}" value="/gmroll [[{([[1d10]]+@{casttime6}), 1}kh1]] [Initiative (@{spellname6})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell6" title="%{repeating_spells6_$X_initspell6}" value="/gmroll [[{([[1d10]]+@{casttime6}), 1}kh1]] [Initiative (@{spellname6})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea type="text" name="attr_cast-macro6" title="@{repeating_spells6_$X_cast-macro6}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -4253,7 +4253,7 @@
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime7" title="@{repeating_spells7_$X_casttime7}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell7" title="@{repeating_spells7_$X_initspell7}" value="/gmroll [[{([[1d10]]+@{casttime7}), 1}kh1]] [Initiative (@{spellname7})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell7" title="%{repeating_spells7_$X_initspell7}" value="/gmroll [[{([[1d10]]+@{casttime7}), 1}kh1]] [Initiative (@{spellname7})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea type="text" name="attr_cast-macro7" title="@{repeating_spells7_$X_cast-macro7}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -4287,7 +4287,7 @@
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime8" title="@{repeating_spells8_$X_casttime8}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell8" title="@{repeating_spells8_$X_initspell8}" value="/gmroll [[{([[1d10]]+@{casttime8}), 1}kh1]] [Initiative (@{spellname8})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell8" title="%{repeating_spells8_$X_initspell8}" value="/gmroll [[{([[1d10]]+@{casttime8}), 1}kh1]] [Initiative (@{spellname8})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea type="text" name="attr_cast-macro8" title="@{repeating_spells8_$X_cast-macro8}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -4321,7 +4321,7 @@
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime9" title="@{repeating_spells9_$X_casttime9}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell9" title="@{repeating_spells9_$X_initspell9}" value="/gmroll [[{([[1d10]]+@{casttime9}), 1}kh1]] [Initiative (@{spellname9})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell9" title="%{repeating_spells9_$X_initspell9}" value="/gmroll [[{([[1d10]]+@{casttime9}), 1}kh1]] [Initiative (@{spellname9})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea type="text" name="attr_cast-macro9" title="@{repeating_spells9_$X_cast-macro9}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -4483,7 +4483,7 @@
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime10" title="@{repeating_spells10_$X_casttime10}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell10" title="@{repeating_spells10_$X_initspell10}" value="/gmroll [[{([[1d10]]+@{casttime10}), 1}kh1]] [Initiative (@{spellname10})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell10" title="%{repeating_spells10_$X_initspell10}" value="/gmroll [[{([[1d10]]+@{casttime10}), 1}kh1]] [Initiative (@{spellname10})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea type="text" name="attr_cast-macro10" title="@{repeating_spells10_$X_cast-macro10}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -4517,7 +4517,7 @@
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime11" title="@{repeating_spells11_$X_casttime11}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell11" title="@{repeating_spells11_$X_initspell11}" value="/gmroll [[{([[1d10]]+@{casttime11}), 1}kh1]] [Initiative (@{spellname11})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell11" title="%{repeating_spells11_$X_initspell11}" value="/gmroll [[{([[1d10]]+@{casttime11}), 1}kh1]] [Initiative (@{spellname11})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea type="text" name="attr_cast-macro11" title="@{repeating_spells11_$X_cast-macro11}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -4551,7 +4551,7 @@
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime12" title="@{repeating_spells12_$X_casttime12}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell12" title="@{repeating_spells12_$X_initspell12}" value="/gmroll [[{([[1d10]]+@{casttime12}), 1}kh1]] [Initiative (@{spellname12})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell12" title="%{repeating_spells12_$X_initspell12}" value="/gmroll [[{([[1d10]]+@{casttime12}), 1}kh1]] [Initiative (@{spellname12})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea type="text" name="attr_cast-macro12" title="@{repeating_spells12_$X_cast-macro12}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -4713,7 +4713,7 @@
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime70" title="@{repeating_spells70_$X_casttime70}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell70" title="@{repeating_spells70_$X_initspell70}" value="/gmroll [[{([[1d10]]+@{casttime70}), 1}kh1]] [Initiative (@{spellname70})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell70" title="%{repeating_spells70_$X_initspell70}" value="/gmroll [[{([[1d10]]+@{casttime70}), 1}kh1]] [Initiative (@{spellname70})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea type="text" name="attr_cast-macro70" title="@{repeating_spells70_$X_cast-macro70}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -4747,7 +4747,7 @@
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime71" title="@{repeating_spells71_$X_casttime71}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell71" title="@{repeating_spells71_$X_initspell71}" value="/gmroll [[{([[1d10]]+@{casttime71}), 1}kh1]] [Initiative (@{spellname71})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell71" title="%{repeating_spells71_$X_initspell71}" value="/gmroll [[{([[1d10]]+@{casttime71}), 1}kh1]] [Initiative (@{spellname71})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea type="text" name="attr_cast-macro71" title="@{repeating_spells71_$X_cast-macro71}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -4781,7 +4781,7 @@
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime72" title="@{repeating_spells72_$X_casttime72}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell72" title="@{repeating_spells72_$X_initspell72}" value="/gmroll [[{([[1d10]]+@{casttime72}), 1}kh1]] [Initiative (@{spellname72})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell72" title="%{repeating_spells72_$X_initspell72}" value="/gmroll [[{([[1d10]]+@{casttime72}), 1}kh1]] [Initiative (@{spellname72})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea type="text" name="attr_cast-macro72" title="@{repeating_spells72_$X_cast-macro72}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -4944,7 +4944,7 @@
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime13" title="@{repeating_spells13_$X_casttime13}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell13" title="@{repeating_spells13_$X_initspell13}" value="/gmroll [[{([[1d10]]+@{casttime13}), 1}kh1]] [Initiative (@{spellname13})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell13" title="%{repeating_spells13_$X_initspell13}" value="/gmroll [[{([[1d10]]+@{casttime13}), 1}kh1]] [Initiative (@{spellname13})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea type="text" name="attr_cast-macro13" title="@{repeating_spells13_$X_cast-macro13}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -4978,7 +4978,7 @@
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime14" title="@{repeating_spells14_$X_casttime14}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell14" title="@{repeating_spells14_$X_initspell14}" value="/gmroll [[{([[1d10]]+@{casttime14}), 1}kh1]] [Initiative (@{spellname14})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell14" title="%{repeating_spells14_$X_initspell14}" value="/gmroll [[{([[1d10]]+@{casttime14}), 1}kh1]] [Initiative (@{spellname14})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea type="text" name="attr_cast-macro14" title="@{repeating_spells14_$X_cast-macro14}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -5012,7 +5012,7 @@
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime15" title="@{repeating_spells15_$X_casttime15}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell15" title="@{repeating_spells15_$X_initspell15}" value="/gmroll [[{([[1d10]]+@{casttime15}), 1}kh1]] [Initiative (@{spellname15})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell15" title="%{repeating_spells15_$X_initspell15}" value="/gmroll [[{([[1d10]]+@{casttime15}), 1}kh1]] [Initiative (@{spellname15})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea type="text" name="attr_cast-macro15" title="@{repeating_spells15_$X_cast-macro15}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -5175,7 +5175,7 @@
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime16" title="@{repeating_spells16_$X_casttime16}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell16" title="@{repeating_spells16_$X_initspell16}" value="/gmroll [[{([[1d10]]+@{casttime16}), 1}kh1]] [Initiative (@{spellname16})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell16" title="%{repeating_spells16_$X_initspell16}" value="/gmroll [[{([[1d10]]+@{casttime16}), 1}kh1]] [Initiative (@{spellname16})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea type="text" name="attr_cast-macro16" title="@{repeating_spells16_$X_cast-macro16}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -5209,7 +5209,7 @@
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime17" title="@{repeating_spells17_$X_casttime17}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell17" title="@{repeating_spells17_$X_initspell17}" value="/gmroll [[{([[1d10]]+@{casttime17}), 1}kh1]] [Initiative (@{spellname17})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell17" title="%{repeating_spells17_$X_initspell17}" value="/gmroll [[{([[1d10]]+@{casttime17}), 1}kh1]] [Initiative (@{spellname17})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea type="text" name="attr_cast-macro17" title="@{repeating_spells17_$X_cast-macro17}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -5243,7 +5243,7 @@
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime18" title="@{repeating_spells18_$X_casttime18}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell18" title="@{repeating_spells18_$X_initspell18}" value="/gmroll [[{([[1d10]]+@{casttime18}), 1}kh1]] [Initiative (@{spellname18})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell18" title="%{repeating_spells18_$X_initspell18}" value="/gmroll [[{([[1d10]]+@{casttime18}), 1}kh1]] [Initiative (@{spellname18})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea type="text" name="attr_cast-macro18" title="@{repeating_spells18_$X_cast-macro18}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -5406,7 +5406,7 @@
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime19" title="@{repeating_spells19_$X_casttime19}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell19" title="@{repeating_spells19_$X_initspell19}" value="/gmroll [[{([[1d10]]+@{casttime19}), 1}kh1]] [Initiative (@{spellname19})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell19" title="%{repeating_spells19_$X_initspell19}" value="/gmroll [[{([[1d10]]+@{casttime19}), 1}kh1]] [Initiative (@{spellname19})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea type="text" name="attr_cast-macro19" title="@{repeating_spells19_$X_cast-macro19}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -5440,7 +5440,7 @@
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime20" title="@{repeating_spells20_$X_casttime20}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell20" title="@{repeating_spells20_$X_initspell20}" value="/gmroll [[{([[1d10]]+@{casttime20}), 1}kh1]] [Initiative (@{spellname20})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell20" title="%{repeating_spells20_$X_initspell20}" value="/gmroll [[{([[1d10]]+@{casttime20}), 1}kh1]] [Initiative (@{spellname20})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea type="text" name="attr_cast-macro20" title="@{repeating_spells20_$X_cast-macro20}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -5474,7 +5474,7 @@
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime21" title="@{repeating_spells21_$X_casttime21}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell21" title="@{repeating_spells21_$X_initspell21}" value="/gmroll [[{([[1d10]]+@{casttime21}), 1}kh1]] [Initiative (@{spellname21})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell21" title="%{repeating_spells21_$X_initspell21}" value="/gmroll [[{([[1d10]]+@{casttime21}), 1}kh1]] [Initiative (@{spellname21})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea type="text" name="attr_cast-macro21" title="@{repeating_spells21_$X_cast-macro21}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -5637,7 +5637,7 @@
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime22" title="@{repeating_spells22_$X_casttime22}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell22" title="@{repeating_spells22_$X_initspell22}" value="/gmroll [[{([[1d10]]+@{casttime22}), 1}kh1]] [Initiative (@{spellname22})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell22" title="%{repeating_spells22_$X_initspell22}" value="/gmroll [[{([[1d10]]+@{casttime22}), 1}kh1]] [Initiative (@{spellname22})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea type="text" name="attr_cast-macro22" title="@{repeating_spells22_$X_cast-macro22}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -5671,7 +5671,7 @@
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime23" title="@{repeating_spells23_$X_casttime23}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell23" title="@{repeating_spells23_$X_initspell23}" value="/gmroll [[{([[1d10]]+@{casttime23}), 1}kh1]] [Initiative (@{spellname23})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell23" title="%{repeating_spells23_$X_initspell23}" value="/gmroll [[{([[1d10]]+@{casttime23}), 1}kh1]] [Initiative (@{spellname23})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea type="text" name="attr_cast-macro23" title="@{repeating_spells23_$X_cast-macro23}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -5705,7 +5705,7 @@
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime24" title="@{repeating_spells24_$X_casttime24}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell24" title="@{repeating_spells24_$X_initspell24}" value="/gmroll [[{([[1d10]]+@{casttime24}), 1}kh1]] [Initiative (@{spellname24})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell24" title="%{repeating_spells24_$X_initspell24}" value="/gmroll [[{([[1d10]]+@{casttime24}), 1}kh1]] [Initiative (@{spellname24})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea type="text" name="attr_cast-macro24" title="@{repeating_spells24_$X_cast-macro24}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -5868,7 +5868,7 @@
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime25" title="@{repeating_spells25_$X_casttime25}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell25" title="@{repeating_spells25_$X_initspell25}" value="/gmroll [[{([[1d10]]+@{casttime25}), 1}kh1]] [Initiative (@{spellname25})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell25" title="%{repeating_spells25_$X_initspell25}" value="/gmroll [[{([[1d10]]+@{casttime25}), 1}kh1]] [Initiative (@{spellname25})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea type="text" name="attr_cast-macro25" title="@{repeating_spells25_$X_cast-macro25}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -5902,7 +5902,7 @@
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime26" title="@{repeating_spells26_$X_casttime26}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell26" title="@{repeating_spells26_$X_initspell26}" value="/gmroll [[{([[1d10]]+@{casttime26}), 1}kh1]] [Initiative (@{spellname26})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell26" title="%{repeating_spells26_$X_initspell26}" value="/gmroll [[{([[1d10]]+@{casttime26}), 1}kh1]] [Initiative (@{spellname26})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea type="text" name="attr_cast-macro26" title="@{repeating_spells26_$X_cast-macro26}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -5936,7 +5936,7 @@
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime27" title="@{repeating_spells27_$X_casttime27}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell27" title="@{repeating_spells27_$X_initspell27}" value="/gmroll [[{([[1d10]]+@{casttime27}), 1}kh1]] [Initiative (@{spellname27})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell27" title="%{repeating_spells27_$X_initspell27}" value="/gmroll [[{([[1d10]]+@{casttime27}), 1}kh1]] [Initiative (@{spellname27})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea type="text" name="attr_cast-macro27" title="@{repeating_spells27_$X_cast-macro27}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -6099,7 +6099,7 @@
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime52" title="@{repeating_spells52_$X_casttime52}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell52" title="@{repeating_spells52_$X_initspell52}" value="/gmroll [[{([[1d10]]+@{casttime52}), 1}kh1]] [Initiative (@{spellname52})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell52" title="%{repeating_spells52_$X_initspell52}" value="/gmroll [[{([[1d10]]+@{casttime52}), 1}kh1]] [Initiative (@{spellname52})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea type="text" name="attr_cast-macro52" title="@{repeating_spells52_$X_cast-macro52}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -6133,7 +6133,7 @@
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime53" title="@{repeating_spells53_$X_casttime53}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell53" title="@{repeating_spells53_$X_initspell53}" value="/gmroll [[{([[1d10]]+@{casttime53}), 1}kh1]] [Initiative (@{spellname53})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell53" title="%{repeating_spells53_$X_initspell53}" value="/gmroll [[{([[1d10]]+@{casttime53}), 1}kh1]] [Initiative (@{spellname53})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea type="text" name="attr_cast-macro53" title="@{repeating_spells53_$X_cast-macro53}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -6167,7 +6167,7 @@
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime54" title="@{repeating_spells54_$X_casttime54}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell54" title="@{repeating_spells54_$X_initspell54}" value="/gmroll [[{([[1d10]]+@{casttime54}), 1}kh1]] [Initiative (@{spellname54})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell54" title="%{repeating_spells54_$X_initspell54}" value="/gmroll [[{([[1d10]]+@{casttime54}), 1}kh1]] [Initiative (@{spellname54})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea type="text" name="attr_cast-macro54" title="@{repeating_spells54_$X_cast-macro54}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -6330,7 +6330,7 @@
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime55" title="@{repeating_spells55_$X_casttime55}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell55" title="@{repeating_spells55_$X_initspell55}" value="/gmroll [[{([[1d10]]+@{casttime55}), 1}kh1]] [Initiative (@{spellname55})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell55" title="%{repeating_spells55_$X_initspell55}" value="/gmroll [[{([[1d10]]+@{casttime55}), 1}kh1]] [Initiative (@{spellname55})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea type="text" name="attr_cast-macro55" title="@{repeating_spells55_$X_cast-macro55}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -6364,7 +6364,7 @@
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime56" title="@{repeating_spells56_$X_casttime56}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell56" title="@{repeating_spells56_$X_initspell56}" value="/gmroll [[{([[1d10]]+@{casttime56}), 1}kh1]] [Initiative (@{spellname56})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell56" title="%{repeating_spells56_$X_initspell56}" value="/gmroll [[{([[1d10]]+@{casttime56}), 1}kh1]] [Initiative (@{spellname56})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea type="text" name="attr_cast-macro56" title="@{repeating_spells56_$X_cast-macro56}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -6398,7 +6398,7 @@
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime57" title="@{repeating_spells57_$X_casttime57}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell57" title="@{repeating_spells57_$X_initspell57}" value="/gmroll [[{([[1d10]]+@{casttime57}), 1}kh1]] [Initiative (@{spellname57})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell57" title="%{repeating_spells57_$X_initspell57}" value="/gmroll [[{([[1d10]]+@{casttime57}), 1}kh1]] [Initiative (@{spellname57})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea type="text" name="attr_cast-macro57" title="@{repeating_spells57_$X_cast-macro57}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -6561,7 +6561,7 @@
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime58" title="@{repeating_spells58_$X_casttime58}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell58" title="@{repeating_spells58_$X_initspell58}" value="/gmroll [[{([[1d10]]+@{casttime58}), 1}kh1]] [Initiative (@{spellname58})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell58" title="%{repeating_spells58_$X_initspell58}" value="/gmroll [[{([[1d10]]+@{casttime58}), 1}kh1]] [Initiative (@{spellname58})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea type="text" name="attr_cast-macro58" title="@{repeating_spells58_$X_cast-macro58}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -6595,7 +6595,7 @@
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime59" title="@{repeating_spells59_$X_casttime59}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell59" title="@{repeating_spells59_$X_initspell59}" value="/gmroll [[{([[1d10]]+@{casttime59}), 1}kh1]] [Initiative (@{spellname59})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell59" title="%{repeating_spells59_$X_initspell59}" value="/gmroll [[{([[1d10]]+@{casttime59}), 1}kh1]] [Initiative (@{spellname59})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea type="text" name="attr_cast-macro59" title="@{repeating_spells59_$X_cast-macro59}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -6629,7 +6629,7 @@
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime60" title="@{repeating_spells60_$X_casttime60}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell60" title="@{repeating_spells60_$X_initspell60}" value="/gmroll [[{([[1d10]]+@{casttime60}), 1}kh1]] [Initiative (@{spellname60})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell60" title="%{repeating_spells60_$X_initspell60}" value="/gmroll [[{([[1d10]]+@{casttime60}), 1}kh1]] [Initiative (@{spellname60})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea type="text" name="attr_cast-macro60" title="@{repeating_spells60_$X_cast-macro60}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -6792,7 +6792,7 @@
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime61" title="@{repeating_spells61_$X_casttime61}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell61" title="@{repeating_spells61_$X_initspell61}" value="/gmroll [[{([[1d10]]+@{casttime61}), 1}kh1]] [Initiative (@{spellname61})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell61" title="%{repeating_spells61_$X_initspell61}" value="/gmroll [[{([[1d10]]+@{casttime61}), 1}kh1]] [Initiative (@{spellname61})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea type="text" name="attr_cast-macro61" title="@{repeating_spells61_$X_cast-macro61}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -6826,7 +6826,7 @@
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime62" title="@{repeating_spells62_$X_casttime62}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell62" title="@{repeating_spells62_$X_initspell62}" value="/gmroll [[{([[1d10]]+@{casttime62}), 1}kh1]] [Initiative (@{spellname62})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell62" title="%{repeating_spells62_$X_initspell62}" value="/gmroll [[{([[1d10]]+@{casttime62}), 1}kh1]] [Initiative (@{spellname62})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea type="text" name="attr_cast-macro62" title="@{repeating_spells62_$X_cast-macro62}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -6860,7 +6860,7 @@
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime63" title="@{repeating_spells63_$X_casttime63}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell63" title="@{repeating_spells63_$X_initspell63}" value="/gmroll [[{([[1d10]]+@{casttime63}), 1}kh1]] [Initiative (@{spellname63})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell63" title="%{repeating_spells63_$X_initspell63}" value="/gmroll [[{([[1d10]]+@{casttime63}), 1}kh1]] [Initiative (@{spellname63})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea type="text" name="attr_cast-macro63" title="@{repeating_spells63_$X_cast-macro63}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -7023,7 +7023,7 @@
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime64" title="@{repeating_spells64_$X_casttime64}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell64" title="@{repeating_spells64_$X_initspell64}" value="/gmroll [[{([[1d10]]+@{casttime64}), 1}kh1]] [Initiative (@{spellname64})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell64" title="%{repeating_spells64_$X_initspell64}" value="/gmroll [[{([[1d10]]+@{casttime64}), 1}kh1]] [Initiative (@{spellname64})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea type="text" name="attr_cast-macro64" title="@{repeating_spells64_$X_cast-macro64}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -7057,7 +7057,7 @@
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime65" title="@{repeating_spells65_$X_casttime65}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell65" title="@{repeating_spells65_$X_initspell65}" value="/gmroll [[{([[1d10]]+@{casttime65}), 1}kh1]] [Initiative (@{spellname65})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell65" title="%{repeating_spells65_$X_initspell65}" value="/gmroll [[{([[1d10]]+@{casttime65}), 1}kh1]] [Initiative (@{spellname65})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea type="text" name="attr_cast-macro65" title="@{repeating_spells65_$X_cast-macro65}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -7091,7 +7091,7 @@
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime66" title="@{repeating_spells66_$X_casttime66}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell66" title="@{repeating_spells66_$X_initspell66}" value="/gmroll [[{([[1d10]]+@{casttime66}), 1}kh1]] [Initiative (@{spellname66})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell66" title="%{repeating_spells66_$X_initspell66}" value="/gmroll [[{([[1d10]]+@{casttime66}), 1}kh1]] [Initiative (@{spellname66})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea type="text" name="attr_cast-macro66" title="@{repeating_spells66_$X_cast-macro66}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -7344,7 +7344,7 @@
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime28" title="@{repeating_spells28_$X_casttime28}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell28" title="@{repeating_spells28_$X_initspell28}" value="/gmroll [[{([[1d10]]+@{casttime28}), 1}kh1]] [Initiative (@{spellname28})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell28" title="%{repeating_spells28_$X_initspell28}" value="/gmroll [[{([[1d10]]+@{casttime28}), 1}kh1]] [Initiative (@{spellname28})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea type="text" name="attr_cast-macro28" title="@{repeating_spells28_$X_cast-macro28}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -7378,7 +7378,7 @@
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime29" title="@{repeating_spells29_$X_casttime29}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell29" title="@{repeating_spells29_$X_initspell29}" value="/gmroll [[{([[1d10]]+@{casttime29}), 1}kh1]] [Initiative (@{spellname29})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell29" title="%{repeating_spells29_$X_initspell29}" value="/gmroll [[{([[1d10]]+@{casttime29}), 1}kh1]] [Initiative (@{spellname29})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea type="text" name="attr_cast-macro29" title="@{repeating_spells29_$X_cast-macro29}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -7412,7 +7412,7 @@
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime30" title="@{repeating_spells30_$X_casttime30}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell30" title="@{repeating_spells30_$X_initspell30}" value="/gmroll [[{([[1d10]]+@{casttime30}), 1}kh1]] [Initiative (@{spellname30})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell30" title="%{repeating_spells30_$X_initspell30}" value="/gmroll [[{([[1d10]]+@{casttime30}), 1}kh1]] [Initiative (@{spellname30})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea type="text" name="attr_cast-macro30" title="@{repeating_spells30_$X_cast-macro30}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -7580,7 +7580,7 @@
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime31" title="@{repeating_spells31_$X_casttime31}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell31" title="@{repeating_spells31_$X_initspell31}" value="/gmroll [[{([[1d10]]+@{casttime31}), 1}kh1]] [Initiative (@{spellname31})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell31" title="%{repeating_spells31_$X_initspell31}" value="/gmroll [[{([[1d10]]+@{casttime31}), 1}kh1]] [Initiative (@{spellname31})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea type="text" name="attr_cast-macro31" title="@{repeating_spells31_$X_cast-macro31}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -7614,7 +7614,7 @@
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime32" title="@{repeating_spells32_$X_casttime32}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell32" title="@{repeating_spells32_$X_initspell32}" value="/gmroll [[{([[1d10]]+@{casttime32}), 1}kh1]] [Initiative (@{spellname32})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell32" title="%{repeating_spells32_$X_initspell32}" value="/gmroll [[{([[1d10]]+@{casttime32}), 1}kh1]] [Initiative (@{spellname32})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea type="text" name="attr_cast-macro32" title="@{repeating_spells32_$X_cast-macro32}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -7648,7 +7648,7 @@
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime33" title="@{repeating_spells33_$X_casttime33}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell33" title="@{repeating_spells33_$X_initspell33}" value="/gmroll [[{([[1d10]]+@{casttime33}), 1}kh1]] [Initiative (@{spellname33})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell33" title="%{repeating_spells33_$X_initspell33}" value="/gmroll [[{([[1d10]]+@{casttime33}), 1}kh1]] [Initiative (@{spellname33})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea type="text" name="attr_cast-macro33" title="@{repeating_spells33_$X_cast-macro33}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -7816,7 +7816,7 @@
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime34" title="@{repeating_spells34_$X_casttime34}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell34" title="@{repeating_spells34_$X_initspell34}" value="/gmroll [[{([[1d10]]+@{casttime34}), 1}kh1]] [Initiative (@{spellname34})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell34" title="%{repeating_spells34_$X_initspell34}" value="/gmroll [[{([[1d10]]+@{casttime34}), 1}kh1]] [Initiative (@{spellname34})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea type="text" name="attr_cast-macro34" title="@{repeating_spells34_$X_cast-macro34}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -7850,7 +7850,7 @@
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime35" title="@{repeating_spells35_$X_casttime35}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell35" title="@{repeating_spells35_$X_initspell35}" value="/gmroll [[{([[1d10]]+@{casttime35}), 1}kh1]] [Initiative (@{spellname35})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell35" title="%{repeating_spells35_$X_initspell35}" value="/gmroll [[{([[1d10]]+@{casttime35}), 1}kh1]] [Initiative (@{spellname35})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea type="text" name="attr_cast-macro35" title="@{repeating_spells35_$X_cast-macro35}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -7884,7 +7884,7 @@
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime36" title="@{repeating_spells36_$X_casttime36}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell36" title="@{repeating_spells36_$X_initspell36}" value="/gmroll [[{([[1d10]]+@{casttime36}), 1}kh1]] [Initiative (@{spellname36})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell36" title="%{repeating_spells36_$X_initspell36}" value="/gmroll [[{([[1d10]]+@{casttime36}), 1}kh1]] [Initiative (@{spellname36})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea type="text" name="attr_cast-macro36" title="@{repeating_spells36_$X_cast-macro36}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -8052,7 +8052,7 @@
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime37" title="@{repeating_spells37_$X_casttime37}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell37" title="@{repeating_spells37_$X_initspell37}" value="/gmroll [[{([[1d10]]+@{casttime37}), 1}kh1]] [Initiative (@{spellname37})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell37" title="%{repeating_spells37_$X_initspell37}" value="/gmroll [[{([[1d10]]+@{casttime37}), 1}kh1]] [Initiative (@{spellname37})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea type="text" name="attr_cast-macro37" title="@{repeating_spells37_$X_cast-macro37}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -8086,7 +8086,7 @@
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime38" title="@{repeating_spells38_$X_casttime38}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell38" title="@{repeating_spells38_$X_initspell38}" value="/gmroll [[{([[1d10]]+@{casttime38}), 1}kh1]] [Initiative (@{spellname38})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell38" title="%{repeating_spells38_$X_initspell38}" value="/gmroll [[{([[1d10]]+@{casttime38}), 1}kh1]] [Initiative (@{spellname38})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea type="text" name="attr_cast-macro38" title="@{repeating_spells38_$X_cast-macro38}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -8120,7 +8120,7 @@
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime39" title="@{repeating_spells39_$X_casttime39}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell39" title="@{repeating_spells39_$X_initspell39}" value="/gmroll [[{([[1d10]]+@{casttime39}), 1}kh1]] [Initiative (@{spellname39})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell39" title="%{repeating_spells39_$X_initspell39}" value="/gmroll [[{([[1d10]]+@{casttime39}), 1}kh1]] [Initiative (@{spellname39})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea type="text" name="attr_cast-macro39" title="@{repeating_spells39_$X_cast-macro39}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -8288,7 +8288,7 @@
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime40" title="@{repeating_spells40_$X_casttime40}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell40" title="@{repeating_spells40_$X_initspell40}" value="/gmroll [[{([[1d10]]+@{casttime40}), 1}kh1]] [Initiative (@{spellname40})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell40" title="%{repeating_spells40_$X_initspell40}" value="/gmroll [[{([[1d10]]+@{casttime40}), 1}kh1]] [Initiative (@{spellname40})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea type="text" name="attr_cast-macro40" title="@{repeating_spells40_$X_cast-macro40}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -8322,7 +8322,7 @@
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime41" title="@{repeating_spells41_$X_casttime41}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell41" title="@{repeating_spells41_$X_initspell41}" value="/gmroll [[{([[1d10]]+@{casttime41}), 1}kh1]] [Initiative (@{spellname41})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell41" title="%{repeating_spells41_$X_initspell41}" value="/gmroll [[{([[1d10]]+@{casttime41}), 1}kh1]] [Initiative (@{spellname41})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea type="text" name="attr_cast-macro41" title="@{repeating_spells41_$X_cast-macro41}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -8356,7 +8356,7 @@
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime42" title="@{repeating_spells42_$X_casttime42}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell42" title="@{repeating_spells42_$X_initspell42}" value="/gmroll [[{([[1d10]]+@{casttime42}), 1}kh1]] [Initiative (@{spellname42})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell42" title="%{repeating_spells42_$X_initspell42}" value="/gmroll [[{([[1d10]]+@{casttime42}), 1}kh1]] [Initiative (@{spellname42})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea type="text" name="attr_cast-macro42" title="@{repeating_spells42_$X_cast-macro42}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -8524,7 +8524,7 @@
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime43" title="@{repeating_spells43_$X_casttime43}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell43" title="@{repeating_spells43_$X_initspell43}" value="/gmroll [[{([[1d10]]+@{casttime43}), 1}kh1]] [Initiative (@{spellname43})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell43" title="%{repeating_spells43_$X_initspell43}" value="/gmroll [[{([[1d10]]+@{casttime43}), 1}kh1]] [Initiative (@{spellname43})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea type="text" name="attr_cast-macro43" title="@{repeating_spells43_$X_cast-macro43}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -8558,7 +8558,7 @@
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime44" title="@{repeating_spells44_$X_casttime44}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell44" title="@{repeating_spells44_$X_initspell44}" value="/gmroll [[{([[1d10]]+@{casttime44}), 1}kh1]] [Initiative (@{spellname44})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell44" title="%{repeating_spells44_$X_initspell44}" value="/gmroll [[{([[1d10]]+@{casttime44}), 1}kh1]] [Initiative (@{spellname44})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea type="text" name="attr_cast-macro44" title="@{repeating_spells44_$X_cast-macro44}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -8592,7 +8592,7 @@
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime45" title="@{repeating_spells45_$X_casttime45}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell45" title="@{repeating_spells45_$X_initspell45}" value="/gmroll [[{([[1d10]]+@{casttime45}), 1}kh1]] [Initiative (@{spellname45})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell45" title="%{repeating_spells45_$X_initspell45}" value="/gmroll [[{([[1d10]]+@{casttime45}), 1}kh1]] [Initiative (@{spellname45})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea type="text" name="attr_cast-macro45" title="@{repeating_spells45_$X_cast-macro45}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -8760,7 +8760,7 @@
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime46" title="@{repeating_spells46_$X_casttime46}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell46" title="@{repeating_spells46_$X_initspell46}" value="/gmroll [[{([[1d10]]+@{casttime46}), 1}kh1]] [Initiative (@{spellname46})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell46" title="%{repeating_spells46_$X_initspell46}" value="/gmroll [[{([[1d10]]+@{casttime46}), 1}kh1]] [Initiative (@{spellname46})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea type="text" name="attr_cast-macro46" title="@{repeating_spells46_$X_cast-macro46}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -8794,7 +8794,7 @@
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime47" title="@{repeating_spells47_$X_casttime47}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell47" title="@{repeating_spells47_$X_initspell47}" value="/gmroll [[{([[1d10]]+@{casttime47}), 1}kh1]] [Initiative (@{spellname47})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell47" title="%{repeating_spells47_$X_initspell47}" value="/gmroll [[{([[1d10]]+@{casttime47}), 1}kh1]] [Initiative (@{spellname47})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea type="text" name="attr_cast-macro47" title="@{repeating_spells47_$X_cast-macro47}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -8828,7 +8828,7 @@
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime48" title="@{repeating_spells48_$X_casttime48}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell48" title="@{repeating_spells48_$X_initspell48}" value="/gmroll [[{([[1d10]]+@{casttime48}), 1}kh1]] [Initiative (@{spellname48})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell48" title="%{repeating_spells48_$X_initspell48}" value="/gmroll [[{([[1d10]]+@{casttime48}), 1}kh1]] [Initiative (@{spellname48})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea type="text" name="attr_cast-macro48" title="@{repeating_spells48_$X_cast-macro48}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -8989,7 +8989,7 @@
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime49" title="@{repeating_spells49_$X_casttime49}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell49" title="@{repeating_spells49_$X_initspell49}" value="/gmroll [[{([[1d10]]+@{casttime49}), 1}kh1]] [Initiative (@{spellname49})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell49" title="%{repeating_spells49_$X_initspell49}" value="/gmroll [[{([[1d10]]+@{casttime49}), 1}kh1]] [Initiative (@{spellname49})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea type="text" name="attr_cast-macro49" title="@{repeating_spells49_$X_cast-macro49}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -9023,7 +9023,7 @@
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime50" title="@{repeating_spells50_$X_casttime50}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell50" title="@{repeating_spells50_$X_initspell50}" value="/gmroll [[{([[1d10]]+@{casttime50}), 1}kh1]] [Initiative (@{spellname50})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell50" title="%{repeating_spells50_$X_initspell50}" value="/gmroll [[{([[1d10]]+@{casttime50}), 1}kh1]] [Initiative (@{spellname50})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea type="text" name="attr_cast-macro50" title="@{repeating_spells50_$X_cast-macro50}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -9057,7 +9057,7 @@
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime51" title="@{repeating_spells51_$X_casttime51}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell51" title="@{repeating_spells51_$X_initspell51}" value="/gmroll [[{([[1d10]]+@{casttime51}), 1}kh1]] [Initiative (@{spellname51})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell51" title="%{repeating_spells51_$X_initspell51}" value="/gmroll [[{([[1d10]]+@{casttime51}), 1}kh1]] [Initiative (@{spellname51})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea type="text" name="attr_cast-macro51" title="@{repeating_spells51_$X_cast-macro51}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -9118,7 +9118,7 @@
                                     <td><label>Initiative: </label></td>
                                     <td><input type="text" name="attr_casttime67" title="@{repeating_spells67_$X_casttime67}" class="sheet-short"></td>
                                     <td></td>
-                                    <td><button style="margin: 0;" type="roll" name="roll_initspell67" title="@{repeating_spells67_$X_initspell67}" value="/gmroll [[{([[1d10]]+@{casttime67}), 1}kh1]] [Initiative (@{spellname67})]&{tracker}">Initiative</button></td>
+                                    <td><button style="margin: 0;" type="roll" name="roll_initspell67" title="%{repeating_spells67_$X_initspell67}" value="/gmroll [[{([[1d10]]+@{casttime67}), 1}kh1]] [Initiative (@{spellname67})]&{tracker}">Initiative</button></td>
                                 </tr>
                                 <tr>
                                     <td colspan="4"><textarea type="text" name="attr_cast-macro67" title="@{repeating_spells67_$X_cast-macro67}" class="sheet-input-like" placeholder="Insert Ability effects."></textarea></td>
@@ -9146,7 +9146,7 @@
                                     <td><label>Initiative: </label></td>
                                     <td><input type="text" name="attr_casttime68" title="@{repeating_spells68_$X_casttime68}" class="sheet-short"></td>
                                     <td></td>
-                                    <td><button style="margin: 0;" type="roll" name="roll_initspell68" title="@{repeating_spells68_$X_initspell68}" value="/gmroll [[{([[1d10]]+@{casttime68}), 1}kh1]] [Initiative (@{spellname68})]&{tracker}">Initiative</button></td>
+                                    <td><button style="margin: 0;" type="roll" name="roll_initspell68" title="%{repeating_spells68_$X_initspell68}" value="/gmroll [[{([[1d10]]+@{casttime68}), 1}kh1]] [Initiative (@{spellname68})]&{tracker}">Initiative</button></td>
                                 </tr>
                                 <tr>
                                     <td colspan="4"><textarea type="text" name="attr_cast-macro68" title="@{repeating_spells68_$X_cast-macro68}" class="sheet-input-like" placeholder="Insert Ability effects."></textarea></td>
@@ -9174,7 +9174,7 @@
                                     <td><label>Initiative: </label></td>
                                     <td><input type="text" name="attr_casttime69" title="@{repeating_spells69_$X_casttime69}" class="sheet-short"></td>
                                     <td></td>
-                                    <td><button style="margin: 0;" type="roll" name="roll_initspell69" title="@{repeating_spells69_$X_initspell69}" value="/gmroll [[{([[1d10]]+@{casttime69}), 1}kh1]] [Initiative (@{spellname69})]&{tracker}">Initiative</button></td>
+                                    <td><button style="margin: 0;" type="roll" name="roll_initspell69" title="%{repeating_spells69_$X_initspell69}" value="/gmroll [[{([[1d10]]+@{casttime69}), 1}kh1]] [Initiative (@{spellname69})]&{tracker}">Initiative</button></td>
                                 </tr>
                                 <tr>
                                     <td colspan="4"><textarea type="text" name="attr_cast-macro69" title="@{repeating_spells69_$X_cast-macro69}" class="sheet-input-like" placeholder="Insert Ability effects."></textarea></td>
@@ -11138,8 +11138,8 @@
         </div>
     </div>
 
-    <div class="sheet-tab-content sheet-section-followers"><h4><b>Followers, Familiars and Animals</b></h4>
-        <br>
+    <div class="sheet-tab-content sheet-section-followers">
+        <h4>Followers, Familiars and Animals</h4>
         <br>
         <div class="body">
             <input type="radio" name="attr_tab10" class="sheet-tab sheet-tab46" value="1" checked/><span class="sheet-tab sheet-tab46">Warrior</span>&nbsp;
@@ -11149,11 +11149,11 @@
             <input type="radio" name="attr_tab10" class="sheet-tab sheet-tab50" value="5"/><span class="sheet-tab sheet-tab50">Psion</span>&nbsp;
             <input type="radio" name="attr_tab10" class="sheet-tab sheet-tab51" value="6"/><span class="sheet-tab sheet-tab51">Animals</span>
             <br>
+            <br>
 
             <div class="sheet-tab-content sheet-section-follower-warrior">
+                <h4>Warrior Followers</h4>
                 <br>
-                <br>
-                <h4><b>Warrior Followers</b></h4>
                 <table>
                     <tr>
                         <td class="sheet-default-header">Name</td>
@@ -11174,18 +11174,15 @@
                         <td><input type="text" name="attr_henchlvl" title="@{henchlvl}" class="sheet-short"></td>
                         <td><input type="text" name="attr_hench-warrior-class" title="@{hench-warrior-class}" class="sheet-maxtext"></td>
                         <td><input type="text" name="attr_henchhd" title="@{henchhd}" class="sheet-table-dynamic"></td>
-                        <td><input type="text" name="attr_henchhp" title="@{henchhp}" class="sheet-small"/><h4><b>/</b></h4><input type="text" name="attr_henchhp_max" title="@{henchhp_max}" class="sheet-small"/></td>
+                        <td><input type="text" name="attr_henchhp" title="@{henchhp}" class="sheet-small"/><label>/</label><input type="text" name="attr_henchhp_max" title="@{henchhp_max}" class="sheet-small"/></td>
                         <td><input type="text" name="attr_henchunits" title="@{henchunits}" class="sheet-short" placeholder="#"></td>
                         <td><input type="text" name="attr_enemyac" title="@{enemyac}" class="sheet-small" value="10"><input type="text" name="attr_damage-calc" title="@{damage-calc}" class="sheet-small" value="(@{hit-calc})*(1+@{doublestrike})" disabled><input type="text" name="attr_damage-calc001" title="@{damage-calc001}" class="sheet-small" value="(@{hit-calc001})*(1+@{doublestrike001})" disabled><input type="text" name="attr_damage-calc002" title="@{damage-calc002}" class="sheet-small" value="(@{hit-calc002})*(1+@{doublestrike002})" disabled></td>
                         <td><input style="display: none;" type="text" name="attr_hit-calc" value="20-(@{ThAC0hench}-@{enemyac})" disabled><input style="display: none;" type="text" name="attr_hit-calc001" value="20-(@{ThAC0hench001}-@{enemyac})" disabled><input style="display: none;" type="text" name="attr_hit-calc002" value="20-(@{ThAC0hench002}-@{enemyac})" disabled><button type="roll" name="roll_skirmish" title="%{skirmish}" value="&{template:default} {{name=@{henchname} Skirmish}} {{Hit Dice=[[@{henchhd}*@{henchunits}]]}} {{Number of Strikes=[[(?{Which Weapon?|@{weaponnamehench},@{hit-calc}|@{weaponnamehench001},@{hit-calc001}|@{weaponnamehench002},@{hit-calc002}})]]}} {{Damage=[[(?{Confirm Weapon?|@{weaponnamehench},@{damage-calc}|@{weaponnamehench001},@{damage-calc001}|@{weaponnamehench002},@{damage-calc002}})*?{Base Damage more than 12?|No,1|Yes,2}]]}} {{Resolution=[[?{Size of Force?|Full,1d8|Half,1d6|Quarter,1d4}+(floor(?{Levels of magic cast to aid forces?|0}/2))+(?{PC Presence Bonus?|Yes,1|No,0})+(?{Surprised Enemy?|No,0|Yes,2})+(?{Enemy holds Advantageous Terrain?|No,0|Yes,-1})]]}}">Skirmish</button>
                         </td>
                     </tr>
                 </table>
-                <br>
                 <hr>
-                <br>
-                <h4><b>Weapons</b></h4>
-                <br>
+                <h4>Weapons</h4>
                 <table>
                     <tr>
                         <td class="sheet-default-header">Weapon Name</td>
@@ -11240,9 +11237,7 @@
                         <td><input type="text" name="attr_weapspeedhench002" title="@{weapspeedhench002}" class="sheet-small"><button type="roll" name="roll_inithench002" title="%{inithench002}" value="/gmroll [[{([[1d10]]+(@{weapspeedhench002})-(?{Misc. bonus|0})), 1}kh1]] [@{henchname} Initiative (@{weaponnamehench002})]&{tracker}"></button></td>
                     </tr>
                 </table>
-                <br>
                 <hr>
-                <br>
                 <table class="sheet-centering" style="width: 100%;">
                     <tr>
                         <td><button type="roll" name="roll_henchparsave" title="%{henchparsave}" value="/gmroll [[d20+?{Misc Modifier?|0}]] &GreaterEqual; [[@{henchpartar}]] [@{henchname} Save versus Paralyzation]"><br>Para<br>Save</button></td>
@@ -11269,11 +11264,8 @@
                         <td><input type="text" name="attr_henchspetar" title="@{henchspetar}" class="sheet-small"></td>
                     </tr>
                 </table>
-                <br>
                 <hr>
-                <br>
-                <h4><b>Gear</b></h4>
-                <br>
+                <h4>Gear</h4>
                 <table>
                     <tr>
                         <td class="sheet-default-header" style="width:120px; text-align:left;">Description</td>
@@ -11354,7 +11346,8 @@
                     </tr>
                 </table>
                 <br>
-                <h4><b>Notes</b></h4><textarea name="attr_henchnotesarea" title="@{henchnotesarea}"></textarea>
+                <h4>Notes</h4>
+                <textarea name="attr_henchnotesarea" title="@{henchnotesarea}"></textarea>
                 <hr>
                 <hr>
                 <fieldset name="repeating_hench" class="repeating_hench">
@@ -11378,17 +11371,15 @@
                             <td><input type="text" name="attr_henchlvl1" title="@{repeating_hench_$X_henchlvl1}" class="sheet-short"></td>
                             <td><input type="text" name="attr_hench-warrior1-class" title="@{repeating_hench_$X_hench-warrior1-class}" class="sheet-maxtext"></td>
                             <td><input type="text" name="attr_henchhd1" title="@{repeating_hench_$X_henchhd1}" class="sheet-short"></td>
-                            <td><input type="text" name="attr_henchhp1" title="@{repeating_hench_$X_henchhp1}" class="sheet-small"/><h4><b>/</b></h4><input type="text" name="attr_henchhp1_max" title="@{repeating_hench_$X_henchhp1_max}" class="sheet-small"/></td>
+                            <td><input type="text" name="attr_henchhp1" title="@{repeating_hench_$X_henchhp1}" class="sheet-small"/><label>/</label><input type="text" name="attr_henchhp1_max" title="@{repeating_hench_$X_henchhp1_max}" class="sheet-small"/></td>
                             <td><input type="text" name="attr_henchunits1" title="@{repeating_hench_$X_henchunits1}" class="sheet-short" placeholder="#"></td>
                             <td><input type="text" name="attr_enemyac1" title="@{repeating_hench_$X_enemyac1}" class="sheet-small" value="10"><input type="text" name="attr_damage-calc003" title="@{repeating_hench_$X_damage-calc003}" class="sheet-small" value="(@{hit-calc003})*(1+@{doublestrike003})" disabled><input type="text" name="attr_damage-calc004" title="@{repeating_hench_$X_damage-calc004}" class="sheet-small" value="(@{hit-calc004})*(1+@{doublestrike004})" disabled><input type="text" name="attr_damage-calc005" title="@{repeating_hench_$X_damage-calc005}" class="sheet-small" value="(@{hit-calc005})*(1+@{doublestrike005})" disabled></td>
                             <td><input style="display: none;" type="text" name="attr_hit-calc003" value="20-(@{ThAC0hench003}-@{enemyac1})" disabled><input style="display: none;" type="text" name="attr_hit-calc004" value="20-(@{ThAC0hench004}-@{enemyac1})" disabled><input style="display: none;" type="text" name="attr_hit-calc005" value="20-(@{ThAC0hench005}-@{enemyac1})" disabled><button type="roll" name="roll_skirmish1" title="%{repeating_hench_$X_skirmish1}" value="&{template:default} {{name=@{henchname1} Skirmish}} {{Hit Dice=[[@{henchhd1}*@{henchunits1}]]}} {{Number of Strikes=[[(?{Which Weapon?|@{weaponnamehench003},@{hit-calc003}|@{weaponnamehench004},@{hit-calc004}|@{weaponnamehench005},@{hit-calc005}})]]}} {{Damage=[[(?{Confirm Weapon?|@{weaponnamehench003},@{damage-calc003}|@{weaponnamehench004},@{damage-calc004}|@{weaponnamehench005},@{damage-calc005}})*?{Base Damage more than 12?|No,1|Yes,2}]]}} {{Resolution=[[?{Size of Force?|Full,1d8|Half,1d6|Quarter,1d4}+(floor(?{Levels of magic cast to aid forces?|0}/2))+(?{PC Presence Bonus?|Yes,1|No,0})+(?{Surprised Enemy?|No,0|Yes,2})+(?{Enemy holds Advantageous Terrain?|No,0|Yes,-1})]]}}">Skirmish</button></td>
                         </tr>
                     </table>
-                    <br>
                     <hr>
-                    <br><h4><b>Weapons</b></h4><br>
+                    <h4>Weapons</h4>
                     <table>
-
                         <tr>
                             <td class="sheet-default-header">Weapon Name</td>
                             <td class="sheet-default-header"># of<br>Strikes</td>
@@ -11442,7 +11433,6 @@
                             <td><input type="text" name="attr_weapspeedhench005" title="@{repeating_hench_$X_weapspeedhench005}" class="sheet-small"><button type="roll" name="roll_inithench005" title="%{repeating_hench_$X_inithench005}" value="/gmroll [[{([[1d10]]+(@{weapspeedhench005})-(?{Misc. bonus|0})), 1}kh1]] [@{henchname1} Initiative (@{weaponnamehench005})]&{tracker}"></button></td>
                         </tr>
                     </table>
-                    <br>
                     <hr>
                     <table class="sheet-centering" style="width: 100%;">
                         <tr>
@@ -11470,10 +11460,8 @@
                             <td><input type="text" name="attr_hench1spetar" title="@{repeating_hench_$X_hench1spetar}" class="sheet-small"></td>
                         </tr>
                     </table>
-                    <br>
                     <hr>
-                    <br>
-                    <br><h4><b>Gear</b></h4><br>
+                    <h4>Gear</h4>
                     <table>
                         <tr>
                             <td class="sheet-default-header" style="width:120px; text-align:left;">Description</td>
@@ -11554,15 +11542,16 @@
                         </tr>
                     </table>
                     <br>
-                    <h4><b>Notes</b></h4><textarea name="attr_henchnotesarea1" title="@{repeating_hench_$X_henchnotesarea1}"></textarea>
+                    <h4>Notes</h4>
+                    <textarea name="attr_henchnotesarea1" title="@{repeating_hench_$X_henchnotesarea1}"></textarea>
+                    <hr>
                     <hr>
                 </fieldset>
             </div>
 
             <div class="sheet-tab-content sheet-section-follower-wizard">
+                <h4>Wizard Followers</h4>
                 <br>
-                <br>
-                <h4><b>Wizard Followers</b></h4>
                 <table>
                     <tr>
                         <td class="sheet-default-header">Name</td>
@@ -11579,14 +11568,12 @@
                         <td><input type="text" name="attr_henchrace2" title="@{henchrace2}" list="races"></td>
                         <td><input type="text" name="attr_henchlvl2" title="@{henchlvl2}" class="sheet-short"></td>
                         <td><input type="text" name="attr_hench-wizard2-class" title="@{hench-wizard2-class}" class="sheet-maxtext"></td>
-                        <td><input type="text" name="attr_henchhp2" title="@{henchhp2}" class="sheet-small"/><h4><b>/</b></h4><input type="text" name="attr_henchhp2_max" title="@{henchhp2_max}" class="sheet-small"/></td>
+                        <td><input type="text" name="attr_henchhp2" title="@{henchhp2}" class="sheet-small"/><label>/</label><input type="text" name="attr_henchhp2_max" title="@{henchhp2_max}" class="sheet-small"/></td>
                         <td><input type="text" name="attr_henchunits2" title="@{henchunits2}" class="sheet-short" placeholder="#"></td>
                     </tr>
                 </table>
-                <br>
                 <hr>
-                <br>
-                <h4><b>Weapons</b></h4><br>
+                <h4>Weapons</h4>
                 <table>
 
                     <tr>
diff --git a/ADnD 2E Revised/futureIdeas.txt b/ADnD 2E Revised/futureIdeas.txt
index 6268a474f2..5a58b9c1c0 100644
--- a/ADnD 2E Revised/futureIdeas.txt	
+++ b/ADnD 2E Revised/futureIdeas.txt	
@@ -9,10 +9,11 @@
 -- A roll button for the number of pages needed
 -- A roll button for the number of days to write it into the book
 
-- Armor Class repeating section
 - Armor Class detailed breakdown
 - Armor class Slashing/Piercing/Bludgeoning
 
+Follower classes
+
 AD&D 2E Book release order
 The Complete Fighter's Handbook     December 1989
 The Complete Thief's Handbook       December 1989
diff --git a/ADnD 2E Revised/html/2ESheet-base.html b/ADnD 2E Revised/html/2ESheet-base.html
index 8e487a3a46..bcda6b950a 100644
--- a/ADnD 2E Revised/html/2ESheet-base.html	
+++ b/ADnD 2E Revised/html/2ESheet-base.html	
@@ -955,7 +955,7 @@
                 <tr>
                     <td><input type="text" name="attr_domain-name" title="@{domain-name}" class="sheet-maxtext"></td>
                     <td><input type="text" name="attr_province-name" title="@{province-name}" class="sheet-maxtext"></td>
-                    <td><input type="text" name="attr_province-rating" title="@{province-rating}" class="sheet-short">&nbsp;<h4><b>/</b></h4></td>
+                    <td><input type="text" name="attr_province-rating" title="@{province-rating}" class="sheet-short">&nbsp;<label>/</label></td>
                     <td><input type="text" name="attr_magic-rating" title="@{magic-rating}" class="sheet-short"></td>
                     <td><input type="text" name="attr_castle/court" title="@{castle/court}" class="sheet-sym"></td>
                     <td><input type="text" name="attr_taxes" title="@{taxes}" class="sheet-sym"></td>
@@ -1011,7 +1011,7 @@
                     <tr>
                         <td><input type="text" name="attr_domain-name1" title="@{repeating_provinces_$X_domain-name1}" class="sheet-maxtext"></td>
                         <td><input type="text" name="attr_province-name1" title="@{repeating_provinces_$X_province-name1}" class="sheet-maxtext"></td>
-                        <td><input type="text" name="attr_province-rating1" title="@{repeating_provinces_$X_province-rating1}" class="sheet-short">&nbsp;<h4><b>/</b></h4></td>
+                        <td><input type="text" name="attr_province-rating1" title="@{repeating_provinces_$X_province-rating1}" class="sheet-short">&nbsp;<label>/</label></td>
                         <td><input type="text" name="attr_magic-rating1" title="@{repeating_provinces_$X_magic-rating1}" class="sheet-short"></td>
                         <td><input type="text" name="attr_castle/court1" title="@{repeating_provinces_$X_castle/court1}" class="sheet-sym"></td>
                         <td><input type="text" name="attr_taxes1" title="@{repeating_provinces_$X_taxes1}" class="sheet-sym"></td>
@@ -7036,8 +7036,8 @@
         </div>
     </div>
 
-    <div class="sheet-tab-content sheet-section-followers"><h4><b>Followers, Familiars and Animals</b></h4>
-        <br>
+    <div class="sheet-tab-content sheet-section-followers">
+        <h4>Followers, Familiars and Animals</h4>
         <br>
         <div class="body">
             <input type="radio" name="attr_tab10" class="sheet-tab sheet-tab46" value="1" checked/><span class="sheet-tab sheet-tab46">Warrior</span>&nbsp;
@@ -7047,11 +7047,11 @@
             <input type="radio" name="attr_tab10" class="sheet-tab sheet-tab50" value="5"/><span class="sheet-tab sheet-tab50">Psion</span>&nbsp;
             <input type="radio" name="attr_tab10" class="sheet-tab sheet-tab51" value="6"/><span class="sheet-tab sheet-tab51">Animals</span>
             <br>
+            <br>
 
             <div class="sheet-tab-content sheet-section-follower-warrior">
+                <h4>Warrior Followers</h4>
                 <br>
-                <br>
-                <h4><b>Warrior Followers</b></h4>
                 <table>
                     <tr>
                         <td class="sheet-default-header">Name</td>
@@ -7072,18 +7072,15 @@
                         <td><input type="text" name="attr_henchlvl" title="@{henchlvl}" class="sheet-short"></td>
                         <td><input type="text" name="attr_hench-warrior-class" title="@{hench-warrior-class}" class="sheet-maxtext"></td>
                         <td><input type="text" name="attr_henchhd" title="@{henchhd}" class="sheet-table-dynamic"></td>
-                        <td><input type="text" name="attr_henchhp" title="@{henchhp}" class="sheet-small"/><h4><b>/</b></h4><input type="text" name="attr_henchhp_max" title="@{henchhp_max}" class="sheet-small"/></td>
+                        <td><input type="text" name="attr_henchhp" title="@{henchhp}" class="sheet-small"/><label>/</label><input type="text" name="attr_henchhp_max" title="@{henchhp_max}" class="sheet-small"/></td>
                         <td><input type="text" name="attr_henchunits" title="@{henchunits}" class="sheet-short" placeholder="#"></td>
                         <td><input type="text" name="attr_enemyac" title="@{enemyac}" class="sheet-small" value="10"><input type="text" name="attr_damage-calc" title="@{damage-calc}" class="sheet-small" value="(@{hit-calc})*(1+@{doublestrike})" disabled><input type="text" name="attr_damage-calc001" title="@{damage-calc001}" class="sheet-small" value="(@{hit-calc001})*(1+@{doublestrike001})" disabled><input type="text" name="attr_damage-calc002" title="@{damage-calc002}" class="sheet-small" value="(@{hit-calc002})*(1+@{doublestrike002})" disabled></td>
                         <td><input style="display: none;" type="text" name="attr_hit-calc" value="20-(@{ThAC0hench}-@{enemyac})" disabled><input style="display: none;" type="text" name="attr_hit-calc001" value="20-(@{ThAC0hench001}-@{enemyac})" disabled><input style="display: none;" type="text" name="attr_hit-calc002" value="20-(@{ThAC0hench002}-@{enemyac})" disabled><button type="roll" name="roll_skirmish" title="%{skirmish}" value="&{template:default} {{name=@{henchname} Skirmish}} {{Hit Dice=[[@{henchhd}*@{henchunits}]]}} {{Number of Strikes=[[(?{Which Weapon?|@{weaponnamehench},@{hit-calc}|@{weaponnamehench001},@{hit-calc001}|@{weaponnamehench002},@{hit-calc002}})]]}} {{Damage=[[(?{Confirm Weapon?|@{weaponnamehench},@{damage-calc}|@{weaponnamehench001},@{damage-calc001}|@{weaponnamehench002},@{damage-calc002}})*?{Base Damage more than 12?|No,1|Yes,2}]]}} {{Resolution=[[?{Size of Force?|Full,1d8|Half,1d6|Quarter,1d4}+(floor(?{Levels of magic cast to aid forces?|0}/2))+(?{PC Presence Bonus?|Yes,1|No,0})+(?{Surprised Enemy?|No,0|Yes,2})+(?{Enemy holds Advantageous Terrain?|No,0|Yes,-1})]]}}">Skirmish</button>
                         </td>
                     </tr>
                 </table>
-                <br>
                 <hr>
-                <br>
-                <h4><b>Weapons</b></h4>
-                <br>
+                <h4>Weapons</h4>
                 <table>
                     <tr>
                         <td class="sheet-default-header">Weapon Name</td>
@@ -7138,9 +7135,7 @@
                         <td><input type="text" name="attr_weapspeedhench002" title="@{weapspeedhench002}" class="sheet-small"><button type="roll" name="roll_inithench002" title="%{inithench002}" value="/gmroll [[{([[1d10]]+(@{weapspeedhench002})-(?{Misc. bonus|0})), 1}kh1]] [@{henchname} Initiative (@{weaponnamehench002})]&{tracker}"></button></td>
                     </tr>
                 </table>
-                <br>
                 <hr>
-                <br>
                 <table class="sheet-centering" style="width: 100%;">
                     <tr>
                         <td><button type="roll" name="roll_henchparsave" title="%{henchparsave}" value="/gmroll [[d20+?{Misc Modifier?|0}]] &GreaterEqual; [[@{henchpartar}]] [@{henchname} Save versus Paralyzation]"><br>Para<br>Save</button></td>
@@ -7167,11 +7162,8 @@
                         <td><input type="text" name="attr_henchspetar" title="@{henchspetar}" class="sheet-small"></td>
                     </tr>
                 </table>
-                <br>
                 <hr>
-                <br>
-                <h4><b>Gear</b></h4>
-                <br>
+                <h4>Gear</h4>
                 <table>
                     <tr>
                         <td class="sheet-default-header" style="width:120px; text-align:left;">Description</td>
@@ -7252,7 +7244,8 @@
                     </tr>
                 </table>
                 <br>
-                <h4><b>Notes</b></h4><textarea name="attr_henchnotesarea" title="@{henchnotesarea}"></textarea>
+                <h4>Notes</h4>
+                <textarea name="attr_henchnotesarea" title="@{henchnotesarea}"></textarea>
                 <hr>
                 <hr>
                 <fieldset name="repeating_hench" class="repeating_hench">
@@ -7276,17 +7269,15 @@
                             <td><input type="text" name="attr_henchlvl1" title="@{repeating_hench_$X_henchlvl1}" class="sheet-short"></td>
                             <td><input type="text" name="attr_hench-warrior1-class" title="@{repeating_hench_$X_hench-warrior1-class}" class="sheet-maxtext"></td>
                             <td><input type="text" name="attr_henchhd1" title="@{repeating_hench_$X_henchhd1}" class="sheet-short"></td>
-                            <td><input type="text" name="attr_henchhp1" title="@{repeating_hench_$X_henchhp1}" class="sheet-small"/><h4><b>/</b></h4><input type="text" name="attr_henchhp1_max" title="@{repeating_hench_$X_henchhp1_max}" class="sheet-small"/></td>
+                            <td><input type="text" name="attr_henchhp1" title="@{repeating_hench_$X_henchhp1}" class="sheet-small"/><label>/</label><input type="text" name="attr_henchhp1_max" title="@{repeating_hench_$X_henchhp1_max}" class="sheet-small"/></td>
                             <td><input type="text" name="attr_henchunits1" title="@{repeating_hench_$X_henchunits1}" class="sheet-short" placeholder="#"></td>
                             <td><input type="text" name="attr_enemyac1" title="@{repeating_hench_$X_enemyac1}" class="sheet-small" value="10"><input type="text" name="attr_damage-calc003" title="@{repeating_hench_$X_damage-calc003}" class="sheet-small" value="(@{hit-calc003})*(1+@{doublestrike003})" disabled><input type="text" name="attr_damage-calc004" title="@{repeating_hench_$X_damage-calc004}" class="sheet-small" value="(@{hit-calc004})*(1+@{doublestrike004})" disabled><input type="text" name="attr_damage-calc005" title="@{repeating_hench_$X_damage-calc005}" class="sheet-small" value="(@{hit-calc005})*(1+@{doublestrike005})" disabled></td>
                             <td><input style="display: none;" type="text" name="attr_hit-calc003" value="20-(@{ThAC0hench003}-@{enemyac1})" disabled><input style="display: none;" type="text" name="attr_hit-calc004" value="20-(@{ThAC0hench004}-@{enemyac1})" disabled><input style="display: none;" type="text" name="attr_hit-calc005" value="20-(@{ThAC0hench005}-@{enemyac1})" disabled><button type="roll" name="roll_skirmish1" title="%{repeating_hench_$X_skirmish1}" value="&{template:default} {{name=@{henchname1} Skirmish}} {{Hit Dice=[[@{henchhd1}*@{henchunits1}]]}} {{Number of Strikes=[[(?{Which Weapon?|@{weaponnamehench003},@{hit-calc003}|@{weaponnamehench004},@{hit-calc004}|@{weaponnamehench005},@{hit-calc005}})]]}} {{Damage=[[(?{Confirm Weapon?|@{weaponnamehench003},@{damage-calc003}|@{weaponnamehench004},@{damage-calc004}|@{weaponnamehench005},@{damage-calc005}})*?{Base Damage more than 12?|No,1|Yes,2}]]}} {{Resolution=[[?{Size of Force?|Full,1d8|Half,1d6|Quarter,1d4}+(floor(?{Levels of magic cast to aid forces?|0}/2))+(?{PC Presence Bonus?|Yes,1|No,0})+(?{Surprised Enemy?|No,0|Yes,2})+(?{Enemy holds Advantageous Terrain?|No,0|Yes,-1})]]}}">Skirmish</button></td>
                         </tr>
                     </table>
-                    <br>
                     <hr>
-                    <br><h4><b>Weapons</b></h4><br>
+                    <h4>Weapons</h4>
                     <table>
-
                         <tr>
                             <td class="sheet-default-header">Weapon Name</td>
                             <td class="sheet-default-header"># of<br>Strikes</td>
@@ -7340,7 +7331,6 @@
                             <td><input type="text" name="attr_weapspeedhench005" title="@{repeating_hench_$X_weapspeedhench005}" class="sheet-small"><button type="roll" name="roll_inithench005" title="%{repeating_hench_$X_inithench005}" value="/gmroll [[{([[1d10]]+(@{weapspeedhench005})-(?{Misc. bonus|0})), 1}kh1]] [@{henchname1} Initiative (@{weaponnamehench005})]&{tracker}"></button></td>
                         </tr>
                     </table>
-                    <br>
                     <hr>
                     <table class="sheet-centering" style="width: 100%;">
                         <tr>
@@ -7368,10 +7358,8 @@
                             <td><input type="text" name="attr_hench1spetar" title="@{repeating_hench_$X_hench1spetar}" class="sheet-small"></td>
                         </tr>
                     </table>
-                    <br>
                     <hr>
-                    <br>
-                    <br><h4><b>Gear</b></h4><br>
+                    <h4>Gear</h4>
                     <table>
                         <tr>
                             <td class="sheet-default-header" style="width:120px; text-align:left;">Description</td>
@@ -7452,15 +7440,16 @@
                         </tr>
                     </table>
                     <br>
-                    <h4><b>Notes</b></h4><textarea name="attr_henchnotesarea1" title="@{repeating_hench_$X_henchnotesarea1}"></textarea>
+                    <h4>Notes</h4>
+                    <textarea name="attr_henchnotesarea1" title="@{repeating_hench_$X_henchnotesarea1}"></textarea>
+                    <hr>
                     <hr>
                 </fieldset>
             </div>
 
             <div class="sheet-tab-content sheet-section-follower-wizard">
+                <h4>Wizard Followers</h4>
                 <br>
-                <br>
-                <h4><b>Wizard Followers</b></h4>
                 <table>
                     <tr>
                         <td class="sheet-default-header">Name</td>
@@ -7477,14 +7466,12 @@
                         <td><input type="text" name="attr_henchrace2" title="@{henchrace2}" list="races"></td>
                         <td><input type="text" name="attr_henchlvl2" title="@{henchlvl2}" class="sheet-short"></td>
                         <td><input type="text" name="attr_hench-wizard2-class" title="@{hench-wizard2-class}" class="sheet-maxtext"></td>
-                        <td><input type="text" name="attr_henchhp2" title="@{henchhp2}" class="sheet-small"/><h4><b>/</b></h4><input type="text" name="attr_henchhp2_max" title="@{henchhp2_max}" class="sheet-small"/></td>
+                        <td><input type="text" name="attr_henchhp2" title="@{henchhp2}" class="sheet-small"/><label>/</label><input type="text" name="attr_henchhp2_max" title="@{henchhp2_max}" class="sheet-small"/></td>
                         <td><input type="text" name="attr_henchunits2" title="@{henchunits2}" class="sheet-short" placeholder="#"></td>
                     </tr>
                 </table>
-                <br>
                 <hr>
-                <br>
-                <h4><b>Weapons</b></h4><br>
+                <h4>Weapons</h4>
                 <table>
 
                     <tr>
diff --git a/ADnD 2E Revised/html/powers.html b/ADnD 2E Revised/html/powers.html
index b84099874c..9f7d38ab22 100644
--- a/ADnD 2E Revised/html/powers.html	
+++ b/ADnD 2E Revised/html/powers.html	
@@ -14,7 +14,7 @@
                 <td><label>Initiative: </label></td>
                 <td><input type="text" name="attr_casttime#REPLACE0#" title="@{repeating_spells#REPLACE0#_$X_casttime#REPLACE0#}" class="sheet-short"></td>
                 <td></td>
-                <td><button style="margin: 0;" type="roll" name="roll_initspell#REPLACE0#" title="@{repeating_spells#REPLACE0#_$X_initspell#REPLACE0#}" value="/gmroll [[{([[1d10]]+@{casttime#REPLACE0#}), 1}kh1]] [Initiative (@{spellname#REPLACE0#})]&{tracker}">Initiative</button></td>
+                <td><button style="margin: 0;" type="roll" name="roll_initspell#REPLACE0#" title="%{repeating_spells#REPLACE0#_$X_initspell#REPLACE0#}" value="/gmroll [[{([[1d10]]+@{casttime#REPLACE0#}), 1}kh1]] [Initiative (@{spellname#REPLACE0#})]&{tracker}">Initiative</button></td>
             </tr>
             <tr>
                 <td colspan="4"><textarea type="text" name="attr_cast-macro#REPLACE0#" title="@{repeating_spells#REPLACE0#_$X_cast-macro#REPLACE0#}" class="sheet-input-like" placeholder="Insert Ability effects."></textarea></td>
diff --git a/ADnD 2E Revised/html/spells-old.html b/ADnD 2E Revised/html/spells-old.html
index 1446285117..7b317cd59c 100644
--- a/ADnD 2E Revised/html/spells-old.html	
+++ b/ADnD 2E Revised/html/spells-old.html	
@@ -20,7 +20,7 @@
                 <td><label>Casting Time: </label></td>
                 <td><input type="text" name="attr_casttime#REPLACE0#" title="@{repeating_spells#REPLACE0#_$X_casttime#REPLACE0#}" class="sheet-short"></td>
                 <td></td>
-                <td><button type="roll" style="margin: 0;" name="roll_initspell#REPLACE0#" title="@{repeating_spells#REPLACE0#_$X_initspell#REPLACE0#}" value="/gmroll [[{([[1d10]]+@{casttime#REPLACE0#}), 1}kh1]] [Initiative (@{spellname#REPLACE0#})]&{tracker}">Initiative</button></td>
+                <td><button type="roll" style="margin: 0;" name="roll_initspell#REPLACE0#" title="%{repeating_spells#REPLACE0#_$X_initspell#REPLACE0#}" value="/gmroll [[{([[1d10]]+@{casttime#REPLACE0#}), 1}kh1]] [Initiative (@{spellname#REPLACE0#})]&{tracker}">Initiative</button></td>
             </tr>
             <tr>
                 <td colspan="4"><textarea type="text" name="attr_cast-macro#REPLACE0#" title="@{repeating_spells#REPLACE0#_$X_cast-macro#REPLACE0#}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>