diff --git a/Table Top Defined/Table_Top_Defined.css b/Table Top Defined/Table_Top_Defined.css
index 14d37b02cc5..7ec4d88be92 100644
--- a/Table Top Defined/Table_Top_Defined.css	
+++ b/Table Top Defined/Table_Top_Defined.css	
@@ -397,12 +397,12 @@
 
 .ggrid{
     display: grid;
-    grid-template-columns: repeat(auto-fit, auto);
+    grid-auto-columns: auto;
 }
 
 .ggridc{
     display: grid;
-    grid-template-rows: repeat(auto-fit, auto);
+    grid-auto-rows: auto;
 }
 
 /*End General Grid -- End*/
@@ -920,6 +920,7 @@ input.sptoggle[value="1"] ~ .sheet-repeating-fields{
 
 .minimizable-repeat-spells .spells_description{
     width: 388px;
+    overflow: clip;
     background-color: #FFFFFF;
     color: #000000;
     border: 1px solid black;
@@ -929,11 +930,12 @@ input.sptoggle[value="1"] ~ .sheet-repeating-fields{
     display: none;
     grid-template-columns: 50% 50%;
     padding: 0;
-    grid-template-rows: auto auto;
+    grid-template-rows: auto auto auto;
     gap: 1px 1px;
     grid-template-areas:
     "Details-1 Details-2"
-    "Description Description";
+    "Description Description"
+    "Advanced Advanced";
 }
 
 .minimizable-repeat-spells .spells-toggle[value="1"] ~ div.spells_description{
@@ -1021,6 +1023,14 @@ input.sptoggle[value="1"] ~ .sheet-repeating-fields{
     padding: 0;
 }
 
+.minimizable-repeat-spells .spells_description .Advanced {
+    grid-area: Advanced;
+}
+
+.minimizable-repeat-spells .spells_description .spells-advanced-toggle[value="1"] ~ div.grr2.ggridc{
+    display: none;
+}
+
 /*</editor-fold*/
 
 /*</editor-fold>*/
@@ -1307,7 +1317,7 @@ input.sptoggle[value="1"] ~ .sheet-repeating-fields{
 }
 
 .ui-dialog .charsheet .sheet-gear .weapon-name{
-    background-color: #323232;
+    background-color: #000000;
     color: #FFFFFF;
     text-align: center;
     font-weight: bold;
@@ -1335,6 +1345,11 @@ input.sptoggle[value="1"] ~ .sheet-repeating-fields{
     display: none;
 }
 
+.sheet-gear .ggridc .grr1.ggrid .advancedweapon-toggle[value="0"] ~ .advancedweapon-shrink{
+    display: none;
+}
+
+
 .sheet-gear .grr7{
     grid-template-columns: repeat(2,1fr);
 }
diff --git a/Table Top Defined/Table_Top_Defined.html b/Table Top Defined/Table_Top_Defined.html
index 498fafd7c75..c4e38035e97 100644
--- a/Table Top Defined/Table_Top_Defined.html	
+++ b/Table Top Defined/Table_Top_Defined.html	
@@ -1,27 +1,3 @@
-<!-- <editor-fold desc="Roll Template" -->
-<rolltemplate class="sheet-rolltemplate-custom">
- <div class="sheet-container sheet-color-{{color}}">
-  <div class="sheet-header">
-   {{#title}}
-   <div class="sheet-title">{{title}}</div>
-   {{/title}}
-   {{#subtitle}}
-   <div class="sheet-subtitle">{{subtitle}}</div>
-   {{/subtitle}}
-  </div>
-  <div class="sheet-content">
-   {{#allprops() title subtitle desc color}}
-   <div class="sheet-key">{{key}}</div>
-   <div class="sheet-value">{{value}}</div>
-   {{/allprops() title subtitle desc color}}
-   {{#desc}}
-   <div class="sheet-desc">{{desc}}</div>
-   {{/desc}}
-  </div>
- </div>
-</rolltemplate>
-<!-- </editor-fold -->
-
 <!-- <editor-fold desc="ButtonBar"> -->
 <input type="hidden" class="sheet-tabstoggle" name="attr_sheetTab"  value="main"/>
 <div style="text-align: center; width: 800px;" class="SAbutton">
@@ -43,7 +19,7 @@
   <div class="column-header grcsa">Character Information</div>
   <div id="player-name">
    <div>Character Name</div>
-   <div><input class="flex-input" type="text" name="attr_charname"/></div>
+   <div><input class="flex-input" type="text" readonly name="attr_character_name"/></div>
    <div>Player Name</div>
    <div><input class="flex-input" type="text" name="attr_PlayerName"/></div>
   </div>
@@ -167,37 +143,37 @@
    <div>
     <button title="Strength Check"
             type="roll"
-            value="&{template:custom}{{title=Strength Check}}{{subtitle=@{Charname}}}{{Result:= [[1d20+@{strmod}]]}}"
+            value="&{template:custom}{{title=Strength Check}}{{subtitle=@{character_name}}}{{Result:= [[1d20+@{strmod}]]}}"
             name="roll_Strength-Check"></button>
    </div>
    <div>
     <button title="Dexterity Check"
             type="roll"
-            value="&{template:custom}{{title=Dexterity Check}}{{subtitle=@{Charname}}}{{Result:= [[1d20+@{dexmod}]]}}"
+            value="&{template:custom}{{title=Dexterity Check}}{{subtitle=@{character_name}}}{{Result:= [[1d20+@{dexmod}]]}}"
             name="roll_Dexterity-check"></button>
    </div>
    <div>
     <button title="Constitution Check"
             type="roll"
-            value="&{template:custom}{{title=Constitution Check}}{{subtitle=@{Charname}}}{{Result:= [[1d20+@{conmod}]]}}"
+            value="&{template:custom}{{title=Constitution Check}}{{subtitle=@{character_name}}}{{Result:= [[1d20+@{conmod}]]}}"
             name="roll_Constitution-check"></button>
    </div>
    <div>
     <button title="Intelligence Check"
             type="roll"
-            value="&{template:custom}{{title=Intelligence Check}}{{subtitle=@{Charname}}}{{Result:= [[1d20+@{intmod}]]}}"
+            value="&{template:custom}{{title=Intelligence Check}}{{subtitle=@{character_name}}}{{Result:= [[1d20+@{intmod}]]}}"
             name="roll_Intelligence-check"></button>
    </div>
    <div>
     <button title="Wisdom Check"
             type="roll"
-            value="&{template:custom}{{title=Wisdom Check}}{{subtitle=@{Charname}}}{{Result:= [[1d20+@{wismod}]]}}"
+            value="&{template:custom}{{title=Wisdom Check}}{{subtitle=@{character_name}}}{{Result:= [[1d20+@{wismod}]]}}"
             name="roll_Wisdom-check"></button>
    </div>
    <div>
     <button title="Charisma Check"
             type="roll"
-            value="&{template:custom}{{title=Charisma Check}}{{subtitle=@{Charname}}}{{Result:= [[1d20+@{chamod}]]}}"
+            value="&{template:custom}{{title=Charisma Check}}{{subtitle=@{character_name}}}{{Result:= [[1d20+@{chamod}]]}}"
             name="roll_Charisma-check"></button>
    </div>
   </div>
@@ -280,21 +256,21 @@
      <div class="titleblock">
       <button title="Fortitude Save"
               type="roll"
-              value="&{template:custom}{{title=Fortitude Save}}{{subtitle=@{Charname}}}{{Result:= [[1d20+@{FortTotal}]]}}"
+              value="&{template:custom}{{title=Fortitude Save}}{{subtitle=@{character_name}}}{{Result:= [[1d20+@{FortTotal}]]}}"
               name="roll_Fortitude-save"></button>
      </div>
      <div class="titleblock">Save</div>
      <div class="titleblock">
       <button title="Reflex Save"
               type="roll"
-              value="&{template:custom}{{title=Reflex Save}}{{subtitle=@{Charname}}}{{Result:= [[1d20+@{RefTotal}]]}}"
+              value="&{template:custom}{{title=Reflex Save}}{{subtitle=@{character_name}}}{{Result:= [[1d20+@{RefTotal}]]}}"
               name="roll_Reflex-save"></button>
      </div>
      <div class="titleblock">Save</div>
      <div class="titleblock">
       <button title="Will Save"
               type="roll"
-              value="&{template:custom}{{title=Will Save}}{{subtitle=@{Charname}}}{{Result:= [[1d20+@{WilTotal}]]}}"
+              value="&{template:custom}{{title=Will Save}}{{subtitle=@{character_name}}}{{Result:= [[1d20+@{WilTotal}]]}}"
               name="roll_Will-save"></button>
      </div>
     </div>
@@ -352,42 +328,42 @@
       <button class="button"
               title="MagicTouchAttack"
               type="roll"
-              value="&{template:custom}{{title=Magic Touch Attack}}{{subtitle= @{charname}'s touch spell}}{{Result:=[[1d20+@{MagicTouchAttack}]]}}"
+              value="&{template:custom}{{title=Magic Touch Attack}}{{subtitle= @{character_name}'s touch spell}}{{Result:=[[1d20+@{MagicTouchAttack}]]}}"
               name="roll_MagicTouchAttackR"></button>
      </div>
      <div>
       <button class="button"
               title="MartialTouchAttack"
               type="roll"
-              value="&{template:custom}{{title=Martial Touch Attack}}{{subtitle= @{charname}'s touch attack}}{{Result:=[[1d20+@{MartialTouchAttack}]]}}"
+              value="&{template:custom}{{title=Martial Touch Attack}}{{subtitle= @{character_name}'s touch attack}}{{Result:=[[1d20+@{MartialTouchAttack}]]}}"
               name="roll_MartialTouchAttackR"></button>
      </div>
      <div>
       <button class="button"
               title="Opposed Trip"
               type="roll"
-              value="&{template:custom}{{title=oppose strength (Trip)}}{{subtitle= @{charname}'s opposing strength}}{{Result:=[[1d20+@{TripOpposed}]]}}"
+              value="&{template:custom}{{title=oppose strength (Trip)}}{{subtitle= @{character_name}'s opposing strength}}{{Result:=[[1d20+@{TripOpposed}]]}}"
               name="roll_TripOpposedR"></button>
      </div>
      <div>
       <button class="button"
               title="Opposed Shove"
               type="roll"
-              value="&{template:custom}{{title=oppose strength (Shove)}}{{subtitle= @{charname}'s opposing strength}}{{Result:=[[1d20+@{ShoveOpposed}]]}}"
+              value="&{template:custom}{{title=oppose strength (Shove)}}{{subtitle= @{character_name}'s opposing strength}}{{Result:=[[1d20+@{ShoveOpposed}]]}}"
               name="roll_ShoveOpposedR"></button>
      </div>
      <div>
       <button class="button"
               title="Opposed Trample"
               type="roll"
-              value="&{template:custom}{{title=oppose strength (Trample)}}{{subtitle= @{charname}'s opposing strength}}{{Result:=[[1d20+@{TrampleOpposed}]]}}"
+              value="&{template:custom}{{title=oppose strength (Trample)}}{{subtitle= @{character_name}'s opposing strength}}{{Result:=[[1d20+@{TrampleOpposed}]]}}"
               name="roll_opposed-trampleR"></button>
      </div>
      <div>
       <button class="button"
               title="Opposed Grapple"
               type="roll"
-              value="&{template:custom}{{title=Opposed Grapple}}{{subtitle= @{charname} }}{{Result=[[1d20+@{Grapple}]]}}"
+              value="&{template:custom}{{title=Opposed Grapple}}{{subtitle= @{character_name} }}{{Result=[[1d20+@{Grapple}]]}}"
               name="roll_opposed-grappleR"></button>
      </div>
     </div>
@@ -419,7 +395,7 @@
       <button class="button tokenaction"
               title="Initiative"
               type="roll"
-              value="&{template:custom}{{title=Initiative}}{{subtitle=@{charname}}}{{Result:= [[1d20+@{InitTotal}+(@{InitTotal}/100)+([[d10-1]]/1000)&{tracker}]]}}"
+              value="&{template:custom}{{title=Initiative}}{{subtitle=@{character_name}}}{{Result:= [[1d20+@{InitTotal}+(@{InitTotal}/100)+([[d10-1]]/1000)&{tracker}]]}}"
               name="roll_00-Inintiative"></button>
      </div>
      <div class="ggrid">
@@ -752,7 +728,7 @@ <h3 style="color:white">Spell Casting</h3>
    Medium Range: <input type="number" name="attr_MediumRange" readonly/>
    Long: <input type="number" name="attr_LongRange" readonly/>
   </div>
-  <div class="Column1">
+  <div class="Column1"> <!--Left Column-->
    <div class="Spell-Level">
     <input class="sptoggle" type="hidden" name="attr_spell0minimizetoggle" value="1"/>
     <div class="Spell-Level-Name"><button type="action" class="Small-Button" name="act_spell0minimize">-</button>
@@ -766,7 +742,7 @@ <h3 style="color:white">Spell Casting</h3>
        <input type="hidden" class="spells-toggle" name="attr_spell0minimizetoggle" value="1"/>
        <div class="spelltitle">
         <button type="action" class="Small-Button" name="act_spell0minimize">-</button>
-        <button style="float:right" type="roll" name="roll-spell-card" value="@{spellcard}"></button>
+        <button style="float:right" type="roll" name="act_rollspellcard" value="@{spellcard}"></button>
         <input type="text" name="attr_spellname" placeholder="<Spell Name Here>"/>
         <input type="hidden" name="attr_spellcard"/><br>
         <span style="float:left; color: #FFFFFF">
@@ -806,21 +782,43 @@ <h3 style="color:white">Spell Casting</h3>
          <div>Range: <input type="text" name="attr_range"/></div>
          <div>Duration: <input type="text" name="attr_duration"/></div>
          <div>Dice Rolled:<span style="float: right; background-color: #FFFFFF"><input style="float:none" type="text" name="attr_dicenum" placeholder="#"><input style="float:none" type="text" name="attr_dicetype" placeholder="d#"></span></div>
+         <div>
+          Success Effect:
+           <select name="attr_savesucces" class="fixed-select" style="width: 90px;">
+            <option value="">None</option>
+            <option value="; disbelief">Disbelief</option>
+            <option value="; half">Half</option>
+            <option value="; partial">Partial</option>
+            <option value="; negates">Negates</option>
+           </select>
+         </div>
          <div>Spell Resistance?<input type="checkbox" name="attr_sr" value="1"/></div>
         </div>
         <div class="Description">
          <div>Description:<br><textarea name="attr_spelldescription"></textarea></div>
         </div>
+        <div class="Advanced ggrid">
+         <div class="grr1 row-header"><button type="action" class="Small-Button" name="act_spell0minimizeadvanced">-</button>Advanced</div>
+         <input type="hidden" class="spells-advanced-toggle" name="attr_spell0minimizeadvancedtoggle" value="1"/>
+         <div class="grr2 ggridc">
+          <div class="grc1">
+           <div>DC Modifier:</div>
+          </div>
+          <div class="grc2">
+           <div><input style="float: none" type="number" class="standard-input" name="attr_spelldcmod"/></div>
+          </div>
+         </div>
+        </div>
        </div>
       </div>
      </fieldset>
     </div>
-   </div>
+   </div> <!--Simplex Spells-->
    <div class="Spell-Level">
     <input class="sptoggle" type="hidden" name="attr_spell2minimizetoggle" value="1"/>
     <div class="Spell-Level-Name"><button type="action" class="Small-Button" name="act_spell2minimize">-</button>
      <span>Level 2 Spells</span><br>
-     Per Day: <input type="number" name="attr_2perday"/>
+     Per Day: <input readonly type="number" name="attr_2perday"/>
      Remaining: <input type="number" name="attr_2remaining"/>
     </div>
     <div class="sheet-repeating-fields">
@@ -829,7 +827,7 @@ <h3 style="color:white">Spell Casting</h3>
        <input type="hidden" class="spells-toggle" name="attr_spell2minimizetoggle" value="1"/>
        <div class="spelltitle">
         <button type="action" class="Small-Button" name="act_spell2minimize">-</button>
-        <button style="float:right" type="roll" name="roll-spell-card" value="@{spellcard}"></button>
+        <button style="float:right" type="roll" name="act_rollspellcard" value="@{spellcard}"></button>
         <input type="text" name="attr_spellname" placeholder="<Spell Name Here>"/>
         <input type="hidden" name="attr_spellcard"/><br>
         <span style="float:left; color: #FFFFFF">
@@ -874,21 +872,43 @@ <h3 style="color:white">Spell Casting</h3>
          <div>Range: <input type="text" name="attr_range"/></div>
          <div>Duration: <input type="text" name="attr_duration"/></div>
          <div>Dice Rolled:<span style="float: right; background-color: #FFFFFF"><input style="float:none" type="text" name="attr_dicenum" placeholder="#"><input style="float:none" type="text" name="attr_dicetype" placeholder="d#"></span></div>
+         <div>
+          Success Effect:
+          <select name="attr_savesucces" class="fixed-select" style="width: 90px;">
+           <option value="">None</option>
+           <option value="; disbelief">Disbelief</option>
+           <option value="; half">Half</option>
+           <option value="; partial">Partial</option>
+           <option value="; negates">Negates</option>
+          </select>
+         </div>
          <div>Spell Resistance?<input type="checkbox" name="attr_sr" value="1"/></div>
         </div>
         <div class="Description">
          <div>Description:<br><textarea name="attr_spelldescription"></textarea></div>
         </div>
+        <div class="Advanced ggrid">
+         <div class="grr1 row-header"><button type="action" class="Small-Button" name="act_spell2minimizeadvanced">-</button>Advanced</div>
+         <input type="hidden" class="spells-advanced-toggle" name="attr_spell2minimizeadvancedtoggle" value="1"/>
+         <div class="grr2 ggridc">
+          <div class="grc1">
+           <div>DC Modifier:</div>
+          </div>
+          <div class="grc2">
+           <div><input style="float:none" type="number" class="standard-input" name="attr_spelldcmod"/></div>
+          </div>
+         </div>
+        </div>
        </div>
       </div>
      </fieldset>
     </div>
-   </div>
+   </div> <!--Level 2 Spells-->
    <div class="Spell-Level">
     <input class="sptoggle" type="hidden" name="attr_spell4minimizetoggle" value="1"/>
     <div class="Spell-Level-Name"><button type="action" class="Small-Button" name="act_spell4minimize">-</button>
      <span>Level 4 Spells</span><br>
-     Per Day: <input type="number" name="attr_4perday"/>
+     Per Day: <input readonly type="number" name="attr_4perday"/>
      Remaining: <input type="number" name="attr_4remaining"/>
     </div>
     <div class="sheet-repeating-fields">
@@ -897,7 +917,7 @@ <h3 style="color:white">Spell Casting</h3>
        <input type="hidden" class="spells-toggle" name="attr_spell4minimizetoggle" value="1"/>
        <div class="spelltitle">
         <button type="action" class="Small-Button" name="act_spell4minimize">-</button>
-        <button style="float:right" type="roll" name="roll-spell-card" value="@{spellcard}"></button>
+        <button style="float:right" type="roll" name="act_rollspellcard" value="@{spellcard}"></button>
         <input type="text" name="attr_spellname" placeholder="<Spell Name Here>"/>
         <input type="hidden" name="attr_spellcard"/><br>
         <span style="float:left; color: #FFFFFF">
@@ -942,21 +962,43 @@ <h3 style="color:white">Spell Casting</h3>
          <div>Range: <input type="text" name="attr_range"/></div>
          <div>Duration: <input type="text" name="attr_duration"/></div>
          <div>Dice Rolled:<span style="float: right; background-color: #FFFFFF"><input style="float:none" type="text" name="attr_dicenum" placeholder="#"><input style="float:none" type="text" name="attr_dicetype" placeholder="d#"></span></div>
+         <div>
+          Success Effect:
+          <select name="attr_savesucces" class="fixed-select" style="width: 90px;">
+           <option value="">None</option>
+           <option value="; disbelief">Disbelief</option>
+           <option value="; half">Half</option>
+           <option value="; partial">Partial</option>
+           <option value="; negates">Negates</option>
+          </select>
+         </div>
          <div>Spell Resistance?<input type="checkbox" name="attr_sr" value="1"/></div>
         </div>
         <div class="Description">
          <div>Description:<br><textarea name="attr_spelldescription"></textarea></div>
         </div>
+        <div class="Advanced ggrid">
+         <div class="grr1 row-header"><button type="action" class="Small-Button" name="act_spell4minimizeadvanced">-</button>Advanced</div>
+         <input type="hidden" class="spells-advanced-toggle" name="attr_spell4minimizeadvancedtoggle" value="1"/>
+         <div class="grr2 ggridc">
+          <div class="grc1">
+           <div>DC Modifier:</div>
+          </div>
+          <div class="grc2">
+           <div><input style="float:none" type="number" class="standard-input" name="attr_spelldcmod"/></div>
+          </div>
+         </div>
+        </div>
        </div>
       </div>
      </fieldset>
     </div>
-   </div>
+   </div> <!--Level 4 Spells-->
    <div class="Spell-Level">
     <input class="sptoggle" type="hidden" name="attr_spell6minimizetoggle" value="1"/>
     <div class="Spell-Level-Name"><button type="action" class="Small-Button" name="act_spell6minimize">-</button>
      <span>Level 6 Spells</span><br>
-     Per Day: <input type="number" name="attr_6perday"/>
+     Per Day: <input readonly type="number" name="attr_6perday"/>
      Remaining: <input type="number" name="attr_6remaining"/>
     </div>
     <div class="sheet-repeating-fields">
@@ -965,7 +1007,7 @@ <h3 style="color:white">Spell Casting</h3>
        <input type="hidden" class="spells-toggle" name="attr_spell6minimizetoggle" value="1"/>
        <div class="spelltitle">
         <button type="action" class="Small-Button" name="act_spell6minimize">-</button>
-        <button style="float:right" type="roll" name="roll-spell-card" value="@{spellcard}"></button>
+        <button style="float:right" type="roll" name="act_rollspellcard" value="@{spellcard}"></button>
         <input type="text" name="attr_spellname" placeholder="<Spell Name Here>"/>
         <input type="hidden" name="attr_spellcard"/><br>
         <span style="float:left; color: #FFFFFF">
@@ -1010,21 +1052,43 @@ <h3 style="color:white">Spell Casting</h3>
          <div>Range: <input type="text" name="attr_range"/></div>
          <div>Duration: <input type="text" name="attr_duration"/></div>
          <div>Dice Rolled:<span style="float: right; background-color: #FFFFFF"><input style="float:none" type="text" name="attr_dicenum" placeholder="#"><input style="float:none" type="text" name="attr_dicetype" placeholder="d#"></span></div>
+         <div>
+          Success Effect:
+          <select name="attr_savesucces" class="fixed-select" style="width: 90px;">
+           <option value="">None</option>
+           <option value="; disbelief">Disbelief</option>
+           <option value="; half">Half</option>
+           <option value="; partial">Partial</option>
+           <option value="; negates">Negates</option>
+          </select>
+         </div>
          <div>Spell Resistance?<input type="checkbox" name="attr_sr" value="1"/></div>
         </div>
         <div class="Description">
          <div>Description:<br><textarea name="attr_spelldescription"></textarea></div>
         </div>
+        <div class="Advanced ggrid">
+         <div class="grr1 row-header"><button type="action" class="Small-Button" name="act_spell6minimizeadvanced">-</button>Advanced</div>
+         <input type="hidden" class="spells-advanced-toggle" name="attr_spell6minimizeadvancedtoggle" value="1"/>
+         <div class="grr2 ggridc">
+          <div class="grc1">
+           <div>DC Modifier:</div>
+          </div>
+          <div class="grc2">
+           <div><input style="float:none" type="number" class="standard-input" name="attr_spelldcmod"/></div>
+          </div>
+         </div>
+        </div>
        </div>
       </div>
      </fieldset>
     </div>
-   </div>
+   </div> <!--Level 6 Spells-->
    <div class="Spell-Level">
     <input class="sptoggle" type="hidden" name="attr_spell8minimizetoggle" value="1"/>
     <div class="Spell-Level-Name"><button type="action" class="Small-Button" name="act_spell8minimize">-</button>
      <span>Level 8 Spells</span><br>
-     Per Day: <input type="number" name="attr_8perday"/>
+     Per Day: <input readonly type="number" name="attr_8perday"/>
      Remaining: <input type="number" name="attr_8remaining"/>
     </div>
     <div class="sheet-repeating-fields">
@@ -1033,7 +1097,7 @@ <h3 style="color:white">Spell Casting</h3>
        <input type="hidden" class="spells-toggle" name="attr_spell8minimizetoggle" value="1"/>
        <div class="spelltitle">
         <button type="action" class="Small-Button" name="act_spell8minimize">-</button>
-        <button style="float:right" type="roll" name="roll-spell-card" value="@{spellcard}"></button>
+        <button style="float:right" type="roll" name="act_rollspellcard" value="@{spellcard}"></button>
         <input type="text" name="attr_spellname" placeholder="<Spell Name Here>"/>
         <input type="hidden" name="attr_spellcard"/><br>
         <span style="float:left; color: #FFFFFF">
@@ -1078,23 +1142,45 @@ <h3 style="color:white">Spell Casting</h3>
          <div>Range: <input type="text" name="attr_range"/></div>
          <div>Duration: <input type="text" name="attr_duration"/></div>
          <div>Dice Rolled:<span style="float: right; background-color: #FFFFFF"><input style="float:none" type="text" name="attr_dicenum" placeholder="#"><input style="float:none" type="text" name="attr_dicetype" placeholder="d#"></span></div>
+         <div>
+          Success Effect:
+          <select name="attr_savesucces" class="fixed-select" style="width: 90px;">
+           <option value="">None</option>
+           <option value="; disbelief">Disbelief</option>
+           <option value="; half">Half</option>
+           <option value="; partial">Partial</option>
+           <option value="; negates">Negates</option>
+          </select>
+         </div>
          <div>Spell Resistance?<input type="checkbox" name="attr_sr" value="1"/></div>
         </div>
         <div class="Description">
          <div>Description:<br><textarea name="attr_spelldescription"></textarea></div>
         </div>
+        <div class="Advanced ggrid">
+         <div class="grr1 row-header"><button type="action" class="Small-Button" name="act_spell8minimizeadvanced">-</button>Advanced</div>
+         <input type="hidden" class="spells-advanced-toggle" name="attr_spell8minimizeadvancedtoggle" value="1"/>
+         <div class="grr2 ggridc">
+          <div class="grc1">
+           <div>DC Modifier:</div>
+          </div>
+          <div class="grc2">
+           <div><input style="float: none" type="number" class="standard-input" name="attr_spelldcmod"/></div>
+          </div>
+         </div>
+        </div>
        </div>
       </div>
      </fieldset>
     </div>
-   </div>
+   </div> <!--Level 8 Spells-->
   </div>
-  <div class="Column2">
+  <div class="Column2"> <!--Right Column-->
    <div class="Spell-Level">
     <input class="sptoggle" type="hidden" name="attr_spell1minimizetoggle" value="1"/>
     <div class="Spell-Level-Name"><button type="action" class="Small-Button" name="act_spell1minimize">-</button>
      <span>Level 1 Spells</span><br>
-     Per Day: <input type="number" name="attr_1perday"/>
+     Per Day: <input readonly type="number" name="attr_1perday"/>
      Remaining: <input type="number" name="attr_1remaining"/>
     </div>
     <div class="sheet-repeating-fields">
@@ -1103,7 +1189,7 @@ <h3 style="color:white">Spell Casting</h3>
        <input type="hidden" class="spells-toggle" name="attr_spell1minimizetoggle" value="1"/>
        <div class="spelltitle">
         <button type="action" class="Small-Button" name="act_spell1minimize">-</button>
-        <button style="float:right" type="roll" name="roll-spell-card" value="@{spellcard}"></button>
+        <button style="float:right" type="roll" name="act_rollspellcard" value="@{spellcard}"></button>
         <input type="text" name="attr_spellname" placeholder="<Spell Name Here>"/>
         <input type="hidden" name="attr_spellcard"/><br>
         <span style="float:left; color: #FFFFFF">
@@ -1148,21 +1234,43 @@ <h3 style="color:white">Spell Casting</h3>
          <div>Range: <input type="text" name="attr_range"/></div>
          <div>Duration: <input type="text" name="attr_duration"/></div>
          <div>Dice Rolled:<span style="float: right; background-color: #FFFFFF"><input style="float:none" type="text" name="attr_dicenum" placeholder="#"><input style="float:none" type="text" name="attr_dicetype" placeholder="d#"></span></div>
+         <div>
+          Success Effect:
+          <select name="attr_savesucces" class="fixed-select" style="width: 90px;">
+           <option value="">None</option>
+           <option value="; disbelief">Disbelief</option>
+           <option value="; half">Half</option>
+           <option value="; partial">Partial</option>
+           <option value="; negates">Negates</option>
+          </select>
+         </div>
          <div>Spell Resistance?<input type="checkbox" name="attr_sr" value="1"/></div>
         </div>
         <div class="Description">
          <div>Description:<br><textarea name="attr_spelldescription"></textarea></div>
         </div>
+        <div class="Advanced ggrid">
+         <div class="grr1 row-header"><button type="action" class="Small-Button" name="act_spell1minimizeadvanced">-</button>Advanced</div>
+         <input type="hidden" class="spells-advanced-toggle" name="attr_spell1minimizeadvancedtoggle" value="1"/>
+         <div class="grr2 ggridc">
+          <div class="grc1">
+           <div>DC Modifier:</div>
+          </div>
+          <div class="grc2">
+           <div><input style="float: none" type="number" class="standard-input" name="attr_spelldcmod"/></div>
+          </div>
+         </div>
+        </div>
        </div>
       </div>
      </fieldset>
     </div>
-   </div>
+   </div> <!--Level 1 Spells-->
    <div class="Spell-Level">
     <input class="sptoggle" type="hidden" name="attr_spell3minimizetoggle" value="1"/>
     <div class="Spell-Level-Name"><button type="action" class="Small-Button" name="act_spell3minimize">-</button>
      <span>Level 3 Spells</span><br>
-     Per Day: <input type="number" name="attr_3perday"/>
+     Per Day: <input readonly type="number" name="attr_3perday"/>
      Remaining: <input type="number" name="attr_3remaining"/>
     </div>
     <div class="sheet-repeating-fields">
@@ -1171,7 +1279,7 @@ <h3 style="color:white">Spell Casting</h3>
        <input type="hidden" class="spells-toggle" name="attr_spell3minimizetoggle" value="1"/>
        <div class="spelltitle">
         <button type="action" class="Small-Button" name="act_spell3minimize">-</button>
-        <button style="float:right" type="roll" name="roll-spell-card" value="@{spellcard}"></button>
+        <button style="float:right" type="roll" name="act_rollspellcard" value="@{spellcard}"></button>
         <input type="text" name="attr_spellname" placeholder="<Spell Name Here>"/>
         <input type="hidden" name="attr_spellcard"/><br>
         <span style="float:left; color: #FFFFFF">
@@ -1216,21 +1324,43 @@ <h3 style="color:white">Spell Casting</h3>
          <div>Range: <input type="text" name="attr_range"/></div>
          <div>Duration: <input type="text" name="attr_duration"/></div>
          <div>Dice Rolled:<span style="float: right; background-color: #FFFFFF"><input style="float:none" type="text" name="attr_dicenum" placeholder="#"><input style="float:none" type="text" name="attr_dicetype" placeholder="d#"></span></div>
+         <div>
+          Success Effect:
+          <select name="attr_savesucces" class="fixed-select" style="width: 90px;">
+           <option value="">None</option>
+           <option value="; disbelief">Disbelief</option>
+           <option value="; half">Half</option>
+           <option value="; partial">Partial</option>
+           <option value="; negates">Negates</option>
+          </select>
+         </div>
          <div>Spell Resistance?<input type="checkbox" name="attr_sr" value="1"/></div>
         </div>
         <div class="Description">
          <div>Description:<br><textarea name="attr_spelldescription"></textarea></div>
         </div>
+        <div class="Advanced ggrid">
+         <div class="grr1 row-header"><button type="action" class="Small-Button" name="act_spell3minimizeadvanced">-</button>Advanced</div>
+         <input type="hidden" class="spells-advanced-toggle" name="attr_spell3minimizeadvancedtoggle" value="1"/>
+         <div class="grr2 ggridc">
+          <div class="grc1">
+           <div>DC Modifier:</div>
+          </div>
+          <div class="grc2">
+           <div><input style="float: none" type="number" class="standard-input" name="attr_spelldcmod"/></div>
+          </div>
+         </div>
+        </div>
        </div>
       </div>
      </fieldset>
     </div>
-   </div>
+   </div> <!--Level 3 Spells-->
    <div class="Spell-Level">
     <input class="sptoggle" type="hidden" name="attr_spell5minimizetoggle" value="1"/>
     <div class="Spell-Level-Name"><button type="action" class="Small-Button" name="act_spell5minimize">-</button>
      <span>Level 5 Spells</span><br>
-     Per Day: <input type="number" name="attr_5perday"/>
+     Per Day: <input readonly type="number" name="attr_5perday"/>
      Remaining: <input type="number" name="5attr_5remaining"/>
     </div>
     <div class="sheet-repeating-fields">
@@ -1239,7 +1369,7 @@ <h3 style="color:white">Spell Casting</h3>
        <input type="hidden" class="spells-toggle" name="attr_spell5minimizetoggle" value="1"/>
        <div class="spelltitle">
         <button type="action" class="Small-Button" name="act_spell5minimize">-</button>
-        <button style="float:right" type="roll" name="roll-spell-card" value="@{spellcard}"></button>
+        <button style="float:right" type="roll" name="act_rollspellcard" value="@{spellcard}"></button>
         <input type="text" name="attr_spellname" placeholder="<Spell Name Here>"/>
         <input type="hidden" name="attr_spellcard"/><br>
         <span style="float:left; color: #FFFFFF">
@@ -1284,21 +1414,43 @@ <h3 style="color:white">Spell Casting</h3>
          <div>Range: <input type="text" name="attr_range"/></div>
          <div>Duration: <input type="text" name="attr_duration"/></div>
          <div>Dice Rolled:<span style="float: right; background-color: #FFFFFF"><input style="float:none" type="text" name="attr_dicenum" placeholder="#"><input style="float:none" type="text" name="attr_dicetype" placeholder="d#"></span></div>
+         <div>
+          Success Effect:
+          <select name="attr_savesucces" class="fixed-select" style="width: 90px;">
+           <option value="">None</option>
+           <option value="; disbelief">Disbelief</option>
+           <option value="; half">Half</option>
+           <option value="; partial">Partial</option>
+           <option value="; negates">Negates</option>
+          </select>
+         </div>
          <div>Spell Resistance?<input type="checkbox" name="attr_sr" value="1"/></div>
         </div>
         <div class="Description">
          <div>Description:<br><textarea name="attr_spelldescription"></textarea></div>
         </div>
+        <div class="Advanced ggrid">
+         <div class="grr1 row-header"><button type="action" class="Small-Button" name="act_spell5minimizeadvanced">-</button>Advanced</div>
+         <input type="hidden" class="spells-advanced-toggle" name="attr_spell5minimizeadvancedtoggle" value="1"/>
+         <div class="grr2 ggridc">
+          <div class="grc1">
+           <div>DC Modifier:</div>
+          </div>
+          <div class="grc2">
+           <div><input style="float: none" type="number" class="standard-input" name="attr_spelldcmod"/></div>
+          </div>
+         </div>
+        </div>
        </div>
       </div>
      </fieldset>
     </div>
-   </div>
+   </div> <!--Level 5 Spells-->
    <div class="Spell-Level">
     <input class="sptoggle" type="hidden" name="attr_spell7minimizetoggle" value="1"/>
     <div class="Spell-Level-Name"><button type="action" class="Small-Button" name="act_spell7minimize">-</button>
      <span>Level 7 Spells</span><br>
-     Per Day: <input type="number" name="attr_7perday"/>
+     Per Day: <input readonly type="number" name="attr_7perday"/>
      Remaining: <input type="number" name="attr_7remaining"/>
     </div>
     <div class="sheet-repeating-fields">
@@ -1307,7 +1459,7 @@ <h3 style="color:white">Spell Casting</h3>
        <input type="hidden" class="spells-toggle" name="attr_spell7minimizetoggle" value="1"/>
        <div class="spelltitle">
         <button type="action" class="Small-Button" name="act_spell7minimize">-</button>
-        <button style="float:right" type="roll" name="roll-spell-card" value="@{spellcard}"></button>
+        <button style="float:right" type="roll" name="act_rollspellcard" value="@{spellcard}"></button>
         <input type="text" name="attr_spellname" placeholder="<Spell Name Here>"/>
         <input type="hidden" name="attr_spellcard"/><br>
         <span style="float:left; color: #FFFFFF">
@@ -1352,21 +1504,43 @@ <h3 style="color:white">Spell Casting</h3>
          <div>Range: <input type="text" name="attr_range"/></div>
          <div>Duration: <input type="text" name="attr_duration"/></div>
          <div>Dice Rolled:<span style="float: right; background-color: #FFFFFF"><input style="float:none" type="text" name="attr_dicenum" placeholder="#"><input style="float:none" type="text" name="attr_dicetype" placeholder="d#"></span></div>
+         <div>
+          Success Effect:
+          <select name="attr_savesucces" class="fixed-select" style="width: 90px;">
+           <option value="">None</option>
+           <option value="; disbelief">Disbelief</option>
+           <option value="; half">Half</option>
+           <option value="; partial">Partial</option>
+           <option value="; negates">Negates</option>
+          </select>
+         </div>
          <div>Spell Resistance?<input type="checkbox" name="attr_sr" value="1"/></div>
         </div>
         <div class="Description">
          <div>Description:<br><textarea name="attr_spelldescription"></textarea></div>
         </div>
+        <div class="Advanced ggrid">
+         <div class="grr1 row-header"><button type="action" class="Small-Button" name="act_spell7minimizeadvanced">-</button>Advanced</div>
+         <input type="hidden" class="spells-advanced-toggle" name="attr_spell7minimizeadvancedtoggle" value="1"/>
+         <div class="grr2 ggridc">
+          <div class="grc1">
+           <div>DC Modifier:</div>
+          </div>
+          <div class="grc2">
+           <div><input style="float: none" type="number" class="standard-input" name="attr_spelldcmod"/></div>
+          </div>
+         </div>
+        </div>
        </div>
       </div>
      </fieldset>
     </div>
-   </div>
+   </div> <!--Level 7 Spells-->
    <div class="Spell-Level">
     <input class="sptoggle" type="hidden" name="attr_spell9minimizetoggle" value="1"/>
     <div class="Spell-Level-Name"><button type="action" class="Small-Button" name="act_spell9minimize">-</button>
      <span>Level 9 Spells</span><br>
-     Per Day: <input type="number" name="attr_9perday"/>
+     Per Day: <input readonly type="number" name="attr_9perday"/>
      Remaining: <input type="number" name="attr_9remaining"/>
     </div>
     <div class="sheet-repeating-fields">
@@ -1375,7 +1549,7 @@ <h3 style="color:white">Spell Casting</h3>
        <input type="hidden" class="spells-toggle" name="attr_spell9minimizetoggle" value="1"/>
        <div class="spelltitle">
         <button type="action" class="Small-Button" name="act_spell9minimize">-</button>
-        <button style="float:right" type="roll" name="roll-spell-card" value="@{spellcard}"></button>
+        <button style="float:right" type="roll" name="act_rollspellcard" value="@{spellcard}"></button>
         <input type="text" name="attr_spellname" placeholder="<Spell Name Here>"/>
         <input type="hidden" name="attr_spellcard"/><br>
         <span style="float:left; color: #FFFFFF">
@@ -1420,16 +1594,38 @@ <h3 style="color:white">Spell Casting</h3>
          <div>Range: <input type="text" name="attr_range"/></div>
          <div>Duration: <input type="text" name="attr_duration"/></div>
          <div>Dice Rolled:<span style="float: right; background-color: #FFFFFF"><input style="float:none" type="text" name="attr_dicenum" placeholder="#"><input style="float:none" type="text" name="attr_dicetype" placeholder="d#"></span></div>
+         <div>
+          Success Effect:
+          <select name="attr_savesucces" class="fixed-select" style="width: 90px;">
+           <option value="">None</option>
+           <option value="; disbelief">Disbelief</option>
+           <option value="; half">Half</option>
+           <option value="; partial">Partial</option>
+           <option value="; negates">Negates</option>
+          </select>
+         </div>
          <div>Spell Resistance?<input type="checkbox" name="attr_sr" value="1"/></div>
         </div>
         <div class="Description" >
          <div>Description:<br><textarea name="attr_spelldescription"></textarea></div>
         </div>
+        <div class="Advanced ggrid">
+         <div class="grr1 row-header"><button type="action" class="Small-Button" name="act_spell9minimizeadvanced">-</button>Advanced</div>
+         <input type="hidden" class="spells-advanced-toggle" name="attr_spell9minimizeadvancedtoggle" value="1"/>
+         <div class="grr2 ggridc">
+          <div class="grc1">
+           <div>DC Modifier:</div>
+          </div>
+          <div class="grc2">
+           <div><input style="float: none" type="number" class="standard-input" name="attr_spelldcmod"/></div>
+          </div>
+         </div>
+        </div>
        </div>
       </div>
      </fieldset>
     </div>
-   </div>
+   </div> <!--Level 9 Spells-->
   </div>
  </div>
 </div>
@@ -1474,7 +1670,7 @@ <h3 style="color:white">Spell Casting</h3>
     <td><button class="button"
                 title="Acrobatics"
                 type="roll"
-                value="&{template:custom}{{title=Acrobatics}}{{subtitle=@{charname}}}{{Result:= [[1d20+@{AcrobaticsTotal}]]}}"
+                value="&{template:custom}{{title=Acrobatics}}{{subtitle=@{character_name}}}{{Result:= [[1d20+@{AcrobaticsTotal}]]}}"
                 name="roll_Acrobatics-check"></button></td>
     <td><input type="number" readonly name="attr_AcrobaticsTotal"/></td>
     <td><input type="number" readonly name="attr_strmod"/></td>
@@ -1489,7 +1685,7 @@ <h3 style="color:white">Spell Casting</h3>
     <td><button class="button"
                 title="Balance"
                 type="roll"
-                value="&{template:custom}{{title=Balance}}{{subtitle=@{charname}}}{{Result:= [[1d20+@{BalanceTotal}]]}}"
+                value="&{template:custom}{{title=Balance}}{{subtitle=@{character_name}}}{{Result:= [[1d20+@{BalanceTotal}]]}}"
                 name="roll_Balance-check"></button></td>
     <td><input type="number" readonly name="attr_BalanceTotal"/></td>
     <td><input type="number" readonly name="attr_dexmod"/></td>
@@ -1504,7 +1700,7 @@ <h3 style="color:white">Spell Casting</h3>
     <td><button class="button"
                 title="Beguile"
                 type="roll"
-                value="&{template:custom}{{title=Beguile}}{{subtitle=@{charname}}}{{Result:= [[1d20+@{BeguileTotal}]]}}"
+                value="&{template:custom}{{title=Beguile}}{{subtitle=@{character_name}}}{{Result:= [[1d20+@{BeguileTotal}]]}}"
                 name="roll_Beguile-check"></button></td>
     <td><input type="number" readonly name="attr_BeguileTotal"/></td>
     <td><input type="number" readonly name="attr_chamod"/></td>
@@ -1519,7 +1715,7 @@ <h3 style="color:white">Spell Casting</h3>
     <td><button class="button"
                 title="Bushcraft"
                 type="roll"
-                value="&{template:custom}{{title=Bushcraft}}{{subtitle=@{charname}}}{{Result:= [[1d20+@{BushcraftTotal}]]}}"
+                value="&{template:custom}{{title=Bushcraft}}{{subtitle=@{character_name}}}{{Result:= [[1d20+@{BushcraftTotal}]]}}"
                 name="roll_Bushcraft-check"></button></td>
     <td><input type="number" readonly name="attr_BushcraftTotal"/></td>
     <td><input type="number" readonly name="attr_wismod"/></td>
@@ -1534,7 +1730,7 @@ <h3 style="color:white">Spell Casting</h3>
     <td><button class="button"
                 title="Conceal"
                 type="roll"
-                value="&{template:custom}{{title=Conceal}}{{subtitle=@{charname}}}{{Result:= [[1d20+@{ConcealTotal}]]}}"
+                value="&{template:custom}{{title=Conceal}}{{subtitle=@{character_name}}}{{Result:= [[1d20+@{ConcealTotal}]]}}"
                 name="roll_Conceal-check"></button></td>
     <td><input type="number" readonly name="attr_ConcealTotal"/></td>
     <td><input type="number" readonly name="attr_dexmod"/></td>
@@ -1549,7 +1745,7 @@ <h3 style="color:white">Spell Casting</h3>
     <td><button class="button"
                 title="Concentration"
                 type="roll"
-                value="&{template:custom}{{title=Concentration}}{{subtitle=@{charname}}}{{Result:= [[1d20+@{ConcentrationTotal}]]}}"
+                value="&{template:custom}{{title=Concentration}}{{subtitle=@{character_name}}}{{Result:= [[1d20+@{ConcentrationTotal}]]}}"
                 name="roll_Concentration-check"></button></td>
     <td><input type="number" readonly name="attr_ConcentrationTotal"/></td>
     <td><input type="number" readonly name="attr_conmod"/></td>
@@ -1564,7 +1760,7 @@ <h3 style="color:white">Spell Casting</h3>
     <td><button class="button"
                 title="Counterfeit"
                 type="roll"
-                value="&{template:custom}{{title=Counterfeit}}{{subtitle=@{charname}}}{{Result:= [[1d20+@{CounterfeitTotal}]]}}"
+                value="&{template:custom}{{title=Counterfeit}}{{subtitle=@{character_name}}}{{Result:= [[1d20+@{CounterfeitTotal}]]}}"
                 name="roll_Counterfeit-check"></button></td>
     <td><input type="number" readonly name="attr_CounterfeitTotal"/></td>
     <td><input type="number" readonly name="attr_intmod"/></td>
@@ -1579,7 +1775,7 @@ <h3 style="color:white">Spell Casting</h3>
     <td><button class="button"
                 title="Craft1"
                 type="roll"
-                value="&{template:custom}{{title=Craft: @{Craft1Name}}}{{subtitle=@{charname}}}{{Result:= [[1d20+@{Craft1Total}]]}}"
+                value="&{template:custom}{{title=Craft: @{Craft1Name}}}{{subtitle=@{character_name}}}{{Result:= [[1d20+@{Craft1Total}]]}}"
                 name="roll_Craft1-check"></button></td>
     <td><input type="number" readonly name="attr_Craft1Total"/></td>
     <td><input type="number" readonly name="attr_intmod"/></td>
@@ -1594,7 +1790,7 @@ <h3 style="color:white">Spell Casting</h3>
     <td><button class="button"
                 title="Craft2"
                 type="roll"
-                value="&{template:custom}{{title=Craft: @{Craft2Name}}}{{subtitle=@{charname}}}{{Result:= [[1d20+@{Craft2Total}]]}}"
+                value="&{template:custom}{{title=Craft: @{Craft2Name}}}{{subtitle=@{character_name}}}{{Result:= [[1d20+@{Craft2Total}]]}}"
                 name="roll_Craft2-check"></button></td>
     <td><input type="number" readonly name="attr_Craft2Total"/></td>
     <td><input type="number" readonly name="attr_intmod"/></td>
@@ -1609,7 +1805,7 @@ <h3 style="color:white">Spell Casting</h3>
     <td><button class="button"
                 title="Craft3"
                 type="roll"
-                value="&{template:custom}{{title=Craft: @{Craft3Name}}}{{subtitle=@{charname}}}{{Result:= [[1d20+@{Craft3Total}]]}}"
+                value="&{template:custom}{{title=Craft: @{Craft3Name}}}{{subtitle=@{character_name}}}{{Result:= [[1d20+@{Craft3Total}]]}}"
                 name="roll_Craft3-check"></button></td>
     <td><input type="number" readonly name="attr_Craft3Total"/></td>
     <td><input type="number" readonly name="attr_intmod"/></td>
@@ -1624,7 +1820,7 @@ <h3 style="color:white">Spell Casting</h3>
     <td><button class="button"
                 title="DiscernIntent"
                 type="roll"
-                value="&{template:custom}{{title=Discern Intent}}{{subtitle=@{charname}}}{{Result:= [[1d20+@{DiscernIntentTotal}]]}}"
+                value="&{template:custom}{{title=Discern Intent}}{{subtitle=@{character_name}}}{{Result:= [[1d20+@{DiscernIntentTotal}]]}}"
                 name="roll_DiscernIntent-check"></button></td>
     <td><input type="number" readonly name="attr_DiscernIntentTotal"/></td>
     <td><input type="number" readonly name="attr_wismod"/></td>
@@ -1639,7 +1835,7 @@ <h3 style="color:white">Spell Casting</h3>
     <td><button class="button"
                 title="Diplomacy"
                 type="roll"
-                value="&{template:custom}{{title=Diplomacy}}{{subtitle=@{charname}}}{{Result:= [[1d20+@{DiplomacyTotal}]]}}"
+                value="&{template:custom}{{title=Diplomacy}}{{subtitle=@{character_name}}}{{Result:= [[1d20+@{DiplomacyTotal}]]}}"
                 name="roll_Diplomacy-check"></button></td>
     <td><input type="number" readonly name="attr_DiplomacyTotal"/></td>
     <td><input type="number" readonly name="attr_chamod"/></td>
@@ -1654,7 +1850,7 @@ <h3 style="color:white">Spell Casting</h3>
     <td><button class="button"
                 title="Disguise"
                 type="roll"
-                value="&{template:custom}{{title=Disguise}}{{subtitle=@{charname}}}{{Result:= [[1d20+@{DisguiseTotal}]]}}"
+                value="&{template:custom}{{title=Disguise}}{{subtitle=@{character_name}}}{{Result:= [[1d20+@{DisguiseTotal}]]}}"
                 name="roll_Disguise-check"></button></td>
     <td><input type="number" readonly name="attr_DisguiseTotal"/></td>
     <td><input type="number" readonly name="attr_chamod"/></td>
@@ -1669,7 +1865,7 @@ <h3 style="color:white">Spell Casting</h3>
     <td><button class="button"
                 title="Escape Artist"
                 type="roll"
-                value="&{template:custom}{{title=EscapeArtist}}{{subtitle=@{charname}}}{{Result:= [[1d20+@{EscapeArtistTotal}]]}}"
+                value="&{template:custom}{{title=EscapeArtist}}{{subtitle=@{character_name}}}{{Result:= [[1d20+@{EscapeArtistTotal}]]}}"
                 name="roll_EscapeArtist-check"></button></td>
     <td><input type="number" readonly name="attr_EscapeArtistTotal"/></td>
     <td><input type="number" readonly name="attr_dexmod"/></td>
@@ -1684,7 +1880,7 @@ <h3 style="color:white">Spell Casting</h3>
     <td><button class="button"
                 title="Gather Information"
                 type="roll"
-                value="&{template:custom}{{title=GatherInformation}}{{subtitle=@{charname}}}{{Result:= [[1d20+@{GatherInformationTotal}]]}}"
+                value="&{template:custom}{{title=GatherInformation}}{{subtitle=@{character_name}}}{{Result:= [[1d20+@{GatherInformationTotal}]]}}"
                 name="roll_GatherInformation-check"></button></td>
     <td><input type="number" readonly name="attr_GatherInformationTotal"/></td>
     <td><input type="number" readonly name="attr_chamod"/></td>
@@ -1699,7 +1895,7 @@ <h3 style="color:white">Spell Casting</h3>
     <td><button class="button"
                 title="Haggle"
                 type="roll"
-                value="&{template:custom}{{title=Haggle}}{{subtitle=@{charname}}}{{Result:= [[1d20+@{HaggleTotal}]]}}"
+                value="&{template:custom}{{title=Haggle}}{{subtitle=@{character_name}}}{{Result:= [[1d20+@{HaggleTotal}]]}}"
                 name="roll_Haggle-check"></button></td>
     <td><input type="number" readonly name="attr_HaggleTotal"/></td>
     <td><input type="number" readonly name="attr_chamod"/></td>
@@ -1714,7 +1910,7 @@ <h3 style="color:white">Spell Casting</h3>
     <td><button class="button"
                 title="Heal"
                 type="roll"
-                value="&{template:custom}{{title=Heal}}{{subtitle=@{charname}}}{{Result:= [[1d20+@{HealTotal}]]}}"
+                value="&{template:custom}{{title=Heal}}{{subtitle=@{character_name}}}{{Result:= [[1d20+@{HealTotal}]]}}"
                 name="roll_Heal-check"></button></td>
     <td><input type="number" readonly name="attr_HealTotal"/></td>
     <td><input type="number" readonly name="attr_wismod"/></td>
@@ -1729,7 +1925,7 @@ <h3 style="color:white">Spell Casting</h3>
     <td><button class="button"
                 title="Intimidate"
                 type="roll"
-                value="&{template:custom}{{title=Intimidate}}{{subtitle=@{charname}}}{{Result:= [[1d20+@{IntimidateTotal}]]}}"
+                value="&{template:custom}{{title=Intimidate}}{{subtitle=@{character_name}}}{{Result:= [[1d20+@{IntimidateTotal}]]}}"
                 name="roll_Intimidate-check"></button></td>
     <td><input type="number" readonly name="attr_IntimidateTotal"/></td>
     <td><input type="number" readonly name="attr_chamod"/></td>
@@ -1744,7 +1940,7 @@ <h3 style="color:white">Spell Casting</h3>
     <td><button class="button"
                 title="Investigate"
                 type="roll"
-                value="&{template:custom}{{title=Investigate}}{{subtitle=@{charname}}}{{Result:= [[1d20+@{InvestigateTotal}]]}}"
+                value="&{template:custom}{{title=Investigate}}{{subtitle=@{character_name}}}{{Result:= [[1d20+@{InvestigateTotal}]]}}"
                 name="roll_Investigate-check"></button></td>
     <td><input type="number" readonly name="attr_InvestigateTotal"/></td>
     <td><input type="number" readonly name="attr_intmod"/></td>
@@ -1759,7 +1955,7 @@ <h3 style="color:white">Spell Casting</h3>
     <td><button class="button"
                 title="Knowledge1"
                 type="roll"
-                value="&{template:custom}{{title=Knowledge: @{Knowledge1Name}}}{{subtitle=@{charname}}}{{Result:= [[1d20+@{Knowledge1Total}]]}}"
+                value="&{template:custom}{{title=Knowledge: @{Knowledge1Name}}}{{subtitle=@{character_name}}}{{Result:= [[1d20+@{Knowledge1Total}]]}}"
                 name="roll_Knowledge1-check"></button></td>
     <td><input type="number" readonly name="attr_Knowledge1Total"/></td>
     <td><input type="number" readonly name="attr_intmod"/></td>
@@ -1774,7 +1970,7 @@ <h3 style="color:white">Spell Casting</h3>
     <td><button class="button"
                 title="Knowledge2"
                 type="roll"
-                value="&{template:custom}{{title=Knowledge: @{Knowledge2Name}}}{{subtitle=@{charname}}}{{Result:= [[1d20+@{Knowledge2Total}]]}}"
+                value="&{template:custom}{{title=Knowledge: @{Knowledge2Name}}}{{subtitle=@{character_name}}}{{Result:= [[1d20+@{Knowledge2Total}]]}}"
                 name="roll_Knowledge2-check"></button></td>
     <td><input type="number" readonly name="attr_Knowledge2Total"/></td>
     <td><input type="number" readonly name="attr_intmod"/></td>
@@ -1789,7 +1985,7 @@ <h3 style="color:white">Spell Casting</h3>
     <td><button class="button"
                 title="Knowledge3"
                 type="roll"
-                value="&{template:custom}{{title=Knowledge: @{Knowledge3Name}}}{{subtitle=@{charname}}}{{Result:= [[1d20+@{Knowledge3Total}]]}}"
+                value="&{template:custom}{{title=Knowledge: @{Knowledge3Name}}}{{subtitle=@{character_name}}}{{Result:= [[1d20+@{Knowledge3Total}]]}}"
                 name="roll_Knowledge3-check"></button></td>
     <td><input type="number" readonly name="attr_Knowledge3Total"/></td>
     <td><input type="number" readonly name="attr_intmod"/></td>
@@ -1804,7 +2000,7 @@ <h3 style="color:white">Spell Casting</h3>
     <td><button class="button"
                 title="Knowledge4"
                 type="roll"
-                value="&{template:custom}{{title=Knowledge: @{Knowledge4Name}}}{{subtitle=@{charname}}}{{Result:= [[1d20+@{Knowledge4Total}]]}}"
+                value="&{template:custom}{{title=Knowledge: @{Knowledge4Name}}}{{subtitle=@{character_name}}}{{Result:= [[1d20+@{Knowledge4Total}]]}}"
                 name="roll_Knowledge4-check"></button></td>
     <td><input type="number" readonly name="attr_Knowledge4Total"/></td>
     <td><input type="number" readonly name="attr_intmod"/></td>
@@ -1819,7 +2015,7 @@ <h3 style="color:white">Spell Casting</h3>
     <td><button class="button"
                 title="Knowledge5"
                 type="roll"
-                value="&{template:custom}{{title=Knowledge: @{Knowledge5Name}}}{{subtitle=@{charname}}}{{Result:= [[1d20+@{Knowledge5Total}]]}}"
+                value="&{template:custom}{{title=Knowledge: @{Knowledge5Name}}}{{subtitle=@{character_name}}}{{Result:= [[1d20+@{Knowledge5Total}]]}}"
                 name="roll_Knowledge5-check"></button></td>
     <td><input type="number" readonly name="attr_Knowledge5Total"/></td>
     <td><input type="number" readonly name="attr_intmod"/></td>
@@ -1834,7 +2030,7 @@ <h3 style="color:white">Spell Casting</h3>
     <td><button class="button"
                 title="Knowledge6"
                 type="roll"
-                value="&{template:custom}{{title=Knowledge: @{Knowledge6Name}}}{{subtitle=@{charname}}}{{Result:= [[1d20+@{Knowledge6Total}]]}}"
+                value="&{template:custom}{{title=Knowledge: @{Knowledge6Name}}}{{subtitle=@{character_name}}}{{Result:= [[1d20+@{Knowledge6Total}]]}}"
                 name="roll_Knowledge6-check"></button></td>
     <td><input type="number" readonly name="attr_Knowledge6Total"/></td>
     <td><input type="number" readonly name="attr_intmod"/></td>
@@ -1849,7 +2045,7 @@ <h3 style="color:white">Spell Casting</h3>
     <td><button class="button"
                 title="Listen"
                 type="roll"
-                value="&{template:custom}{{title=Listen}}{{subtitle=@{charname}}}{{Result:= [[1d20+@{ListenTotal}]]}}"
+                value="&{template:custom}{{title=Listen}}{{subtitle=@{character_name}}}{{Result:= [[1d20+@{ListenTotal}]]}}"
                 name="roll_Listen-check"></button></td>
     <td><input type="number" readonly name="attr_ListenTotal"/></td>
     <td><input type="number" readonly name="attr_wismod"/></td>
@@ -1864,7 +2060,7 @@ <h3 style="color:white">Spell Casting</h3>
     <td><button class="button"
                 title="Lockpicking"
                 type="roll"
-                value="&{template:custom}{{title=Lockpicking}}{{subtitle=@{charname}}}{{Result:= [[1d20+@{LockpickingTotal}]]}}"
+                value="&{template:custom}{{title=Lockpicking}}{{subtitle=@{character_name}}}{{Result:= [[1d20+@{LockpickingTotal}]]}}"
                 name="roll_Lockpicking-check"></button></td>
     <td><input type="number" readonly name="attr_LockpickingTotal"/></td>
     <td><input type="number" readonly name="attr_dexmod"/></td>
@@ -1879,7 +2075,7 @@ <h3 style="color:white">Spell Casting</h3>
     <td><button class="button"
                 title="MoveSilently"
                 type="roll"
-                value="&{template:custom}{{title=MoveSilently}}{{subtitle=@{charname}}}{{Result:= [[1d20+@{MoveSilentlyTotal}]]}}"
+                value="&{template:custom}{{title=MoveSilently}}{{subtitle=@{character_name}}}{{Result:= [[1d20+@{MoveSilentlyTotal}]]}}"
                 name="roll_MoveSilently-check"></button></td>
     <td><input type="number" readonly name="attr_MoveSilentlyTotal"/></td>
     <td><input type="number" readonly name="attr_dexmod"/></td>
@@ -1894,7 +2090,7 @@ <h3 style="color:white">Spell Casting</h3>
     <td><button class="button"
                 title="Perform1"
                 type="roll"
-                value="&{template:custom}{{title=Perform: @{Perform1Name}}}{{subtitle=@{charname}}}{{Result:= [[1d20+@{Perform1Total}]]}}"
+                value="&{template:custom}{{title=Perform: @{Perform1Name}}}{{subtitle=@{character_name}}}{{Result:= [[1d20+@{Perform1Total}]]}}"
                 name="roll_Perform1-check"></button></td>
     <td><input type="number" readonly name="attr_Perform1Total"/></td>
     <td><input type="number" readonly name="attr_chamod"/></td>
@@ -1909,7 +2105,7 @@ <h3 style="color:white">Spell Casting</h3>
     <td><button class="button"
                 title="Perform2"
                 type="roll"
-                value="&{template:custom}{{title=Perform: @{Perform2Name}}}{{subtitle=@{charname}}}{{Result:= [[1d20+@{Perform2Total}]]}}"
+                value="&{template:custom}{{title=Perform: @{Perform2Name}}}{{subtitle=@{character_name}}}{{Result:= [[1d20+@{Perform2Total}]]}}"
                 name="roll_Perform2-check"></button></td>
     <td><input type="number" readonly name="attr_Perform2Total"/></td>
     <td><input type="number" readonly name="attr_chamod"/></td>
@@ -1923,7 +2119,7 @@ <h3 style="color:white">Spell Casting</h3>
     <td><button class="button"
                 title="Perform3"
                 type="roll"
-                value="&{template:custom}{{title=Perform: @{Perform3Name}}}{{subtitle=@{charname}}}{{Result:= [[1d20+@{Perform3Total}]]}}"
+                value="&{template:custom}{{title=Perform: @{Perform3Name}}}{{subtitle=@{character_name}}}{{Result:= [[1d20+@{Perform3Total}]]}}"
                 name="roll_Perform3-check"></button></td>
     <td><input type="number" readonly name="attr_Perform3Total"/></td>
     <td><input type="number" readonly name="attr_chamod"/></td>
@@ -1938,7 +2134,7 @@ <h3 style="color:white">Spell Casting</h3>
     <td><button class="button"
                 title="Profession1"
                 type="roll"
-                value="&{template:custom}{{title=Profession: @{Profession1Name}}}{{subtitle=@{charname}}}{{Result:= [[1d20+@{Profession1Total}]]}}"
+                value="&{template:custom}{{title=Profession: @{Profession1Name}}}{{subtitle=@{character_name}}}{{Result:= [[1d20+@{Profession1Total}]]}}"
                 name="roll_Profession1-check"></button></td>
     <td><input type="number" readonly name="attr_Profession1Total"/></td>
     <td><input type="number" readonly name="attr_intmod"/></td>
@@ -1953,7 +2149,7 @@ <h3 style="color:white">Spell Casting</h3>
     <td><button class="button"
                 title="Profession2"
                 type="roll"
-                value="&{template:custom}{{title=Profession: @{Profession2Name}}}{{subtitle=@{charname}}}{{Result:= [[1d20+@{Profession2Total}]]}}"
+                value="&{template:custom}{{title=Profession: @{Profession2Name}}}{{subtitle=@{character_name}}}{{Result:= [[1d20+@{Profession2Total}]]}}"
                 name="roll_Profession2-check"></button></td>
     <td><input type="number" readonly name="attr_Profession2Total"/></td>
     <td><input type="number" readonly name="attr_intmod"/></td>
@@ -1968,7 +2164,7 @@ <h3 style="color:white">Spell Casting</h3>
     <td><button class="button"
                 title="Ride"
                 type="roll"
-                value="&{template:custom}{{title=Ride}}{{subtitle=@{charname}}}{{Result:= [[1d20+@{RideTotal}]]}}"
+                value="&{template:custom}{{title=Ride}}{{subtitle=@{character_name}}}{{Result:= [[1d20+@{RideTotal}]]}}"
                 name="roll_Ride-check"></button></td>
     <td><input type="number" readonly name="attr_RideTotal"/></td>
     <td><input type="number" readonly name="attr_dexmod"/></td>
@@ -1983,7 +2179,7 @@ <h3 style="color:white">Spell Casting</h3>
     <td><button class="button"
                 title="SleightOfHand"
                 type="roll"
-                value="&{template:custom}{{title=SleightOfHand}}{{subtitle=@{charname}}}{{Result:= [[1d20+@{SleightOfHandTotal}]]}}"
+                value="&{template:custom}{{title=SleightOfHand}}{{subtitle=@{character_name}}}{{Result:= [[1d20+@{SleightOfHandTotal}]]}}"
                 name="roll_SleightOfHand-check"></button></td>
     <td><input type="number" readonly name="attr_SleightOfHandTotal"/></td>
     <td><input type="number" readonly name="attr_dexmod"/></td>
@@ -1998,7 +2194,7 @@ <h3 style="color:white">Spell Casting</h3>
     <td><button class="button"
                 title="Spot"
                 type="roll"
-                value="&{template:custom}{{title=Spot}}{{subtitle=@{charname}}}{{Result:= [[1d20+@{SpotTotal}]]}}"
+                value="&{template:custom}{{title=Spot}}{{subtitle=@{character_name}}}{{Result:= [[1d20+@{SpotTotal}]]}}"
                 name="roll_Spot-check"></button></td>
     <td><input type="number" readonly name="attr_SpotTotal"/></td>
     <td><input type="number" readonly name="attr_wismod"/></td>
@@ -2013,7 +2209,7 @@ <h3 style="color:white">Spell Casting</h3>
     <td><button class="button"
                 title="SabotageDevice"
                 type="roll"
-                value="&{template:custom}{{title=SabotageDevice}}{{subtitle=@{charname}}}{{Result:= [[1d20+@{SabotageDeviceTotal}]]}}"
+                value="&{template:custom}{{title=SabotageDevice}}{{subtitle=@{character_name}}}{{Result:= [[1d20+@{SabotageDeviceTotal}]]}}"
                 name="roll_SabotageDevice-check"></button></td>
     <td><input type="number" readonly name="attr_SabotageDeviceTotal"/></td>
     <td><input type="number" readonly name="attr_intmod"/></td>
@@ -2028,7 +2224,7 @@ <h3 style="color:white">Spell Casting</h3>
     <td><button class="button"
                 title="Swim"
                 type="roll"
-                value="&{template:custom}{{title=Swim}}{{subtitle=@{charname}}}{{Result:= [[1d20+@{SwimTotal}]]}}"
+                value="&{template:custom}{{title=Swim}}{{subtitle=@{character_name}}}{{Result:= [[1d20+@{SwimTotal}]]}}"
                 name="roll_Swim-check"></button></td>
     <td><input type="number" readonly name="attr_SwimTotal"/></td>
     <td><input type="number" readonly name="attr_strmod"/></td>
@@ -2043,7 +2239,7 @@ <h3 style="color:white">Spell Casting</h3>
     <td><button class="button"
                 title="UseRope"
                 type="roll"
-                value="&{template:custom}{{title=UseRope}}{{subtitle=@{charname}}}{{Result:= [[1d20+@{UseRopeTotal}]]}}"
+                value="&{template:custom}{{title=UseRope}}{{subtitle=@{character_name}}}{{Result:= [[1d20+@{UseRopeTotal}]]}}"
                 name="roll_UseRope-check"></button></td>
     <td><input type="number" readonly name="attr_UseRopeTotal"/></td>
     <td><input type="number" readonly name="attr_intmod"/></td>
@@ -2067,7 +2263,7 @@ <h3 style="color:white">Spell Casting</h3>
   <div class="grc4">Armor Bonus<br><input type="number" name="attr_ArmorBonus"/></div>
   <div class="grc5">AC Dex Limit<br><input type="number" name="attr_DexACLimit"/></div>
   <div class="grc6">Skill Penalty<br><input type="number" name="attr_CheckPen"/></div>
- </div>
+ </div> <!--Armor-->
  <div class ="grr4 ggrid">
   <div class="grc1">Shield<br><input class="flex-bordered-input" type="text" name="attr_ShieldName"/></div>
   <div class="grc2">Shatter Resistance<br><input type="number" name="attr_ShieldSR"/></div>
@@ -2075,27 +2271,27 @@ <h3 style="color:white">Spell Casting</h3>
   <div class="grc4">Shield Bonus<br><input type="number" name="attr_Shield"/></div>
   <div class="grc5">AC Dex Limit<br><input type="number" name="attr_ShieldDexACLimit"/></div>
   <div class="grc6">Skill Penalty<br><input type="number" name="attr_ShieldCheckPen"/></div>
- </div>
+ </div> <!--Shield-->
  <div class="grr5 ggrid">
   <div class="grc1">Focus<br><input class="flex-bordered-input" type="text" name="attr_FocusName"/></div>
   <div class="grc2">Shatter Resistance<br><input type="number" name="attr_FocusSR"/></div>
   <div class="grc3">Hit Points<br><input type="number" name="attr_FocusHP"/></div>
   <div class="grc4">Enhancement<br><input value="0" type="number" name="attr_FocusEnch"/></div>
   <div class="grc5">Notes<br><textarea name="attr_FocusNotes"/></div>
- </div>
- <div class="grr6 ggrid row-header-dark">
+ </div> <!--Focus-->
+ <div class="grr6 ggrid row-header"> <!--Weapon Title-->
   Weapon(s)<br>
   <span style="font-weight: normal; font-size: small">
   Hasted&nbsp;<input type="checkbox" name="attr_haste" value="1"/>&nbsp;or
   Slowed?<input type="checkbox" name="attr_slow" value="1"/>
   </span>
  </div>
- <div class="grr7 ggrid">
-  <div class="grc1">
+ <div class="grr7 ggrid"> <!--Weapon Container-->
+  <div class="grc1"> <!--Left Side Weapons-->
    <fieldset class="repeating_weapons1">
     <div class="weapon-repeat-box">
      <input type="hidden" name="attr_fullattackroll"/>
-     <div style="margin: 0" class="column-header weapon-column-span">
+     <div style="margin: 0" class="column-header-dark weapon-column-span">
       <button type="action" class="Small-Button" name="act_weaponminimize">-</button>
       <input class="weapon-name" type="text" name="attr_weaponname" placeholder="<Weapon Name>"/>
       <span style="font-weight: normal; font-size:small">
@@ -2125,8 +2321,8 @@ <h3 style="color:white">Spell Casting</h3>
         <option value="@{chamod}">Cha</option>
        </select>
       </div>
-      <div><input class="standard-input" type="text" name="attr_bonustoattack" value=""/></div>
-      <div><input class="standard-input" type="text" name="attr_enhancetoattack"/></div>
+      <div><input class="standard-input" type="text" name="attr_bonustoattack" value="0"/></div>
+      <div><input class="standard-input" type="text" name="attr_enhancetoattack" value="0"/></div>
       <div><input class="standard-input" type="text" name="attr_weaponcritmod" value=""/></div>
       <div>
        <input type="text" name="attr_critlow" class="small-input" value="20"/>&nbsp;-
@@ -2172,7 +2368,7 @@ <h3 style="color:white">Spell Casting</h3>
         name="roll_weapondamage"
         value=
          "
-        &{template:custom}{{title=Damage}}{{subtitle= with @{charname}'s @{weaponname} }} {{Deals [[(@{dnum}@{dtype})[Dice]+(@{weapontodamage})+(floor(@{weapontodamage}*@{twohanded}))[Key Ability]+(@{bonustodamage})[Feats]+@{enhancetoattack}[Magic]+(@{enchdamagedice}[Bonus])+(?{Do you have a miscellaneaous bonus to damage?|0})]] damage to their target.}}
+        &{template:custom}{{title=Damage}}{{subtitle= with @{character_name}'s @{weaponname} }} {{Deals [[(@{dnum}@{dtype})[Dice]+(@{weapontodamage})+(floor(@{weapontodamage}*@{twohanded}))[Key Ability]+(@{bonustodamage})[Feats]+@{enhancetoattack}[Magic]+(@{enchdamagedice}[Bonus])+(?{Do you have a miscellaneaous bonus to damage?|0})]] damage to their target.}}
         "
        ></button></div>
        <div style="padding-bottom: 3px;" class="grc2 titleblock">Critical Damage:&nbsp;<button
@@ -2180,7 +2376,7 @@ <h3 style="color:white">Spell Casting</h3>
         name="roll_critweapondamage"
         value=
          "
-        &{template:custom}{{title=Damage}}{{subtitle= with @{charname}'s @{weaponname} }} {{Deals an astonishing [[[[@{weaponcritmod}*@{dnum}]]@{dtype}[Dice]+(0@{weaponcritmod}*(@{weapontodamage}+(floor(0@{weapontodamage}*@{twohanded}))))[Key Ability]+(@{weaponcritmod}*@{bonustodamage})[Feats]+@{enhancetoattack}[Magic]+(0@{enchdamagedice})+(0@{extraenchdicecrit})+(?{Do you have a miscellaneaous bonus to damage?|0})]] damage to their target.}}
+        &{template:custom}{{title=Damage}}{{subtitle= with @{character_name}'s @{weaponname} }} {{Deals an astonishing [[[[@{weaponcritmod}*@{dnum}]]@{dtype}[Dice]+(0@{weaponcritmod}*(@{weapontodamage}+(floor(0@{weapontodamage}*@{twohanded}))))[Key Ability]+(@{weaponcritmod}*@{bonustodamage})[Feats]+@{enhancetoattack}[Magic]+(0@{enchdamagedice})+(0@{extraenchdicecrit})+(?{Do you have a miscellaneaous bonus to damage?|0})]] damage to their target.}}
         "
        ></button></div>
       </div>
@@ -2190,6 +2386,7 @@ <h3 style="color:white">Spell Casting</h3>
      </div>
      <div class="ggridc">
       <div class="grr1 ggrid">
+       <input type="hidden" namte="attr_grandmastervalue"/>
        <input type="hidden" class="critconfirm-toggle" name="attr_critconfirmminimizetoggle" value="0"/>
        <div class="grc1 crit-shrink">
         First Attack:
@@ -2237,14 +2434,37 @@ <h3 style="color:white">Spell Casting</h3>
        </div>
       </div>
      </div>
+     <input type="hidden" class="weapon-toggle" name="attr_weaponminimizetoggle" value="0"/>
+     <div style="margin:0; border-radius: 0" class="column-header-dark weapon-column-span weapon-shrink">
+      <button type="action" class="Small-Button" name="act_advancedweaponminimize">-</button>Advanced
+     </div> <!--Advanced Block-->
+     <div class="ggridc">
+      <input type="hidden" class="weapon-toggle" name="attr_weaponminimizetoggle" value="0"/>
+      <div class="grr1 ggrid weapon-shrink">
+       <input type="hidden" class="advancedweapon-toggle" name="attr_advancedweaponminimizetoggle" value="0"/>
+       <div class="advancedweapon-shrink column-header" style="grid-column: 1/5;border-radius: 0;font-size: small">Weapon Grand Master Bonus</div>
+       <div class="grc1 advancedweapon-shrink">
+        None <input type="radio" name="attr_grandmaster" value="0">
+       </div>
+       <div class="grc2 advancedweapon-shrink">
+        2nd<input type="radio" name="attr_grandmaster" value="2">
+       </div>
+       <div class="grc3 advancedweapon-shrink">
+        3rd<input type="radio" name="attr_grandmaster" value="3">
+       </div>
+       <div class="grc4 advancedweapon-shrink">
+        4th<input type="radio" name="attr_grandmaster" value="4">
+       </div>
+      </div>
+     </div> <!--Advanced Block Grid-->
     </div>
    </fieldset>
-  </div>
-  <div class="grc2">
+  </div> <!--Left Side Weapons-->
+  <div class="grc2"> <!--Right Side Weapons-->
    <fieldset class="repeating_weapons2">
     <div class="weapon-repeat-box">
      <input type="hidden" name="attr_fullattackroll"/>
-     <div style="margin: 0" class="column-header weapon-column-span">
+     <div style="margin: 0" class="column-header-dark weapon-column-span">
       <button type="action" class="Small-Button" name="act_weaponminimize">-</button>
       <input class="weapon-name" type="text" name="attr_weaponname" placeholder="<Weapon Name>"/>
       <span style="font-weight: normal; font-size:small">
@@ -2274,9 +2494,9 @@ <h3 style="color:white">Spell Casting</h3>
          <option value="@{chamod}">Cha</option>
         </select>
        </div>
-       <div><input class="standard-input" type="text" name="attr_bonustoattack" value=""/></div>
-       <div><input class="standard-input" type="text" name="attr_enhancetoattack"/></div>
-       <div><input class="standard-input" type="text" name="attr_weaponcritmod" value=""/></div>
+       <div><input class="standard-input" type="text" name="attr_bonustoattack" value="0"/></div>
+       <div><input class="standard-input" type="text" name="attr_enhancetoattack" value="0"/></div>
+       <div><input class="standard-input" type="text" name="attr_weaponcritmod" value="0"/></div>
        <div>
         <input type="text" name="attr_critlow" class="small-input" value="20"/>&nbsp;-
         <input type="number" class="small-input" value="20" readonly/>
@@ -2321,7 +2541,7 @@ <h3 style="color:white">Spell Casting</h3>
         name="roll_weapondamage"
         value=
          "
-        &{template:custom}{{title=Damage}}{{subtitle= with @{charname}'s @{weaponname} }} {{Deals [[(@{dnum}@{dtype})[Dice]+(@{weapontodamage})+(floor(@{weapontodamage}*@{twohanded}))[Key Ability]+(@{bonustodamage})[Feats]+@{enhancetoattack}[Magic]+(@{enchdamagedice}[Bonus])+(?{Do you have a miscellaneaous bonus to damage?|0})]] damage to their target.}}
+        &{template:custom}{{title=Damage}}{{subtitle= with @{character_name}'s @{weaponname} }} {{Deals [[(@{dnum}@{dtype})[Dice]+(@{weapontodamage})+(floor(@{weapontodamage}*@{twohanded}))[Key Ability]+(@{bonustodamage})[Feats]+@{enhancetoattack}[Magic]+(@{enchdamagedice}[Bonus])+(?{Do you have a miscellaneaous bonus to damage?|0})]] damage to their target.}}
         "
        ></button></div>
        <div style="padding-bottom: 3px;" class="grc2 titleblock">Critical Damage:&nbsp;<button
@@ -2329,7 +2549,7 @@ <h3 style="color:white">Spell Casting</h3>
         name="roll_critweapondamage"
         value=
          "
-        &{template:custom}{{title=Damage}}{{subtitle= with @{charname}'s @{weaponname} }} {{Deals an astonishing [[[[@{weaponcritmod}*@{dnum}]]@{dtype}[Dice]+(0@{weaponcritmod}*(@{weapontodamage}+(floor(0@{weapontodamage}*@{twohanded}))))[Key Ability]+(@{weaponcritmod}*@{bonustodamage})[Feats]+@{enhancetoattack}[Magic]+(0@{enchdamagedice})+(0@{extraenchdicecrit})+(?{Do you have a miscellaneaous bonus to damage?|0})]] damage to their target.}}
+        &{template:custom}{{title=Damage}}{{subtitle= with @{character_name}'s @{weaponname} }} {{Deals an astonishing [[[[@{weaponcritmod}*@{dnum}]]@{dtype}[Dice]+(0@{weaponcritmod}*(@{weapontodamage}+(floor(0@{weapontodamage}*@{twohanded}))))[Key Ability]+(@{weaponcritmod}*@{bonustodamage})[Feats]+@{enhancetoattack}[Magic]+(0@{enchdamagedice})+(0@{extraenchdicecrit})+(?{Do you have a miscellaneaous bonus to damage?|0})]] damage to their target.}}
         "
        ></button></div>
       </div>
@@ -2386,9 +2606,32 @@ <h3 style="color:white">Spell Casting</h3>
        </div>
       </div>
      </div>
+     <input type="hidden" class="weapon-toggle" name="attr_weaponminimizetoggle" value="0"/>
+     <div style="margin:0; border-radius: 0" class="column-header-dark weapon-column-span weapon-shrink">
+      <button type="action" class="Small-Button" name="act_advancedweaponminimize">-</button>Advanced
+     </div> <!--Advanced Block-->
+     <div class="ggridc">
+      <input type="hidden" class="weapon-toggle" name="attr_weaponminimizetoggle" value="0"/>
+      <div class="grr1 ggrid weapon-shrink">
+       <input type="hidden" class="advancedweapon-toggle" name="attr_advancedweaponminimizetoggle" value="0"/>
+       <div class="advancedweapon-shrink column-header" style="grid-column: 1/5;border-radius: 0;font-size: small">Weapon Grand Master Bonus</div>
+       <div class="grc1 advancedweapon-shrink">
+        None <input type="radio" name="attr_grandmaster" value="0">
+       </div>
+       <div class="grc2 advancedweapon-shrink">
+        2nd<input type="radio" name="attr_grandmaster" value="2">
+       </div>
+       <div class="grc3 advancedweapon-shrink">
+        3rd<input type="radio" name="attr_grandmaster" value="3">
+       </div>
+       <div class="grc4 advancedweapon-shrink">
+        4th<input type="radio" name="attr_grandmaster" value="4">
+       </div>
+      </div>
+     </div> <!--Advanced Block Grid-->
     </div>
    </fieldset>
-  </div>
+  </div> <!--Right Side Weapons-->
  </div>
 </div>
 
@@ -2525,6 +2768,30 @@ <h3 style="color:white">Spell Casting</h3>
 
  <!--</editor-fold>-->
 
+<!-- <editor-fold desc="Roll Template" -->
+<rolltemplate class="sheet-rolltemplate-custom">
+ <div class="sheet-container sheet-color-{{color}}">
+  <div class="sheet-header">
+   {{#title}}
+   <div class="sheet-title">{{title}}</div>
+   {{/title}}
+   {{#subtitle}}
+   <div class="sheet-subtitle">{{subtitle}}</div>
+   {{/subtitle}}
+  </div>
+  <div class="sheet-content">
+   {{#allprops() title subtitle desc color}}
+   <div class="sheet-key">{{key}}</div>
+   <div class="sheet-value">{{value}}</div>
+   {{/allprops() title subtitle desc color}}
+   {{#desc}}
+   <div class="sheet-desc">{{desc}}</div>
+   {{/desc}}
+  </div>
+ </div>
+</rolltemplate>
+<!-- </editor-fold -->
+
 <!--<editor-fold desc="Java Script">-->
 
 <!--type="text/worker"-->
@@ -2536,7 +2803,7 @@ <h3 style="color:white">Spell Casting</h3>
     //<editor-fold desc="Inventory Calculations">
 
     on("change:repeating_maininventory remove:repeating_maininventory", function(){
-        getSectionIDs("repeating_maininventory",function(array){
+        getSectionIDs("repeating_maininventory",function(array){ //getting the section IDs
             let AttrsToGet = [];
             for (let arrayID of array){
                 AttrsToGet.push(`repeating_maininventory_${arrayID}_maintotalweight`);
@@ -3590,7 +3857,7 @@ <h3 style="color:white">Spell Casting</h3>
     const WeaponCol = [1,2]
 
     WeaponCol.forEach(col => {
-       const maxMinWeaponList = ["weaponminimize","critconfirmminimize"];
+       const maxMinWeaponList = ["weaponminimize","critconfirmminimize","advancedweaponminimize"];
        maxMinWeaponList.forEach(button => {
            on(`clicked:repeating_weapons${col}:${button}`, function() {
                getAttrs([`repeating_weapons${col}_${button}toggle`], function(v) {
@@ -3616,16 +3883,18 @@ <h3 style="color:white">Spell Casting</h3>
         });
     });
 
+    const advancedMin = ["","advanced"];
     const maxMinSpellList = ["0_spell0minimize","1_spell1minimize","2_spell2minimize","3_spell3minimize","4_spell4minimize","5_spell5minimize",
         "6_spell6minimize","7_spell7minimize","8_spell8minimize","9_spell9minimize"];
-    maxMinSpellList.forEach(button => {
-        on(`clicked:repeating_spells-${button.replace("_",":")}`, function() {
-            getAttrs([`repeating_spells-${button}toggle`], function(v) {
-                let toSetAttrs = {};
-                toSetAttrs[`repeating_spells-${button}toggle`] = 1 - parseInt(v[`repeating_spells-${button}toggle`]);
-                setAttrs(toSetAttrs);
-            });
-        });
+    advancedMin.forEach(subbutton => { maxMinSpellList.forEach(button => {
+         on(`clicked:repeating_spells-${button.replace("_", ":")}${subbutton}`, function () {
+             getAttrs([`repeating_spells-${button}${subbutton}toggle`], function (v) {
+                 let toSetAttrs = {};
+                 toSetAttrs[`repeating_spells-${button}${subbutton}toggle`] = 1 - parseInt(v[`repeating_spells-${button}${subbutton}toggle`]);
+                 setAttrs(toSetAttrs);
+             });
+         });
+     });
     });
 
     //</editor-fold>
@@ -3785,6 +4054,122 @@ <h3 style="color:white">Spell Casting</h3>
 
     // <editor-fold desc="Spellcasting Calculations">
 
+    //Block of Constants used by the sheet for spell casting
+    const BasicMagicSPD = [ /*Vertical Index is 0 - 19 || Horizontal index is 0 - 3 */
+        [null,null,null,null],
+        [0,null,null,null],
+        [1,null,null,null],
+        [1,null,null,null],
+        [2,null,null,null],
+        [2,0,null,null],
+        [2,1,null,null],
+        [2,1,null,null],
+        [2,1,null,null],
+        [3,2,0,null],
+        [3,2,1,null],
+        [3,2,1,null],
+        [3,2,1,null],
+        [3,3,1,0],
+        [4,3,1,1],
+        [4,3,2,1],
+        [4,4,2,1],
+        [4,4,2,2],
+        [4,4,2,2],
+        [5,4,2,2]
+    ];
+    const StandardMagicSPD = [ /*Vertical Index is 0 - 19 || Horizontal index is 0 - 5 */
+        [0,null,null,null,null,null],
+        [1,null,null,null,null,null],
+        [2,0,null,null,null,null],
+        [3,1,null,null,null,null],
+        [3,2,0,null,null,null],
+        [3,2,1,null,null,null],
+        [3,2,2,0,null,null],
+        [4,2,2,1,null,null],
+        [4,3,2,2,null,null],
+        [4,3,2,2,0,null],
+        [4,3,3,2,1,null],
+        [5,3,3,2,2,null],
+        [5,4,3,3,2,0],
+        [5,4,3,3,2,1],
+        [5,4,4,3,2,2],
+        [5,4,4,3,3,2],
+        [5,5,4,4,3,2],
+        [5,5,4,4,3,2],
+        [5,5,5,4,3,3],
+        [5,5,5,4,4,3]
+    ];
+    const AdvancedMagicSPD = [ /*Vertical Index is 0 - 19 || Horizontal index is 0 - 8 */
+        [2,null,null,null,null,null,null,null,null],
+        [3,null,null,null,null,null,null,null,null],
+        [3,1,null,null,null,null,null,null,null],
+        [3,2,null,null,null,null,null,null,null],
+        [4,2,1,null,null,null,null,null,null],
+        [4,3,2,null,null,null,null,null,null],
+        [4,3,2,1,null,null,null,null,null],
+        [4,3,3,2,null,null,null,null,null],
+        [5,4,3,2,1,null,null,null,null],
+        [5,4,3,3,2,null,null,null,null],
+        [5,4,4,3,3,1,null,null,null],
+        [5,4,4,3,3,2,null,null,null],
+        [5,5,4,4,3,2,1,null,null],
+        [5,5,4,4,4,3,2,null,null],
+        [5,5,5,4,4,3,2,1,null],
+        [5,5,5,4,4,3,3,2,null],
+        [5,5,5,5,4,4,3,2,1],
+        [5,5,5,5,5,4,4,3,2],
+        [5,5,5,5,5,4,4,4,3],
+        [5,5,5,5,5,5,5,5,4]
+    ];
+    const SpellsPerDayLevel = [1,2,3,4,5,6,7,8,9];
+    const SpellMacroLevel = [0,1,2,3,4,5,6,7,8,9];
+
+    SpellsPerDayLevel.forEach(level => {  //setting the spells per day
+        on(`change:hd change:magiccurve sheet:opened change:pma change:dexmod change:strmod `+
+            `change:intmod change:wismod change:chamod`, function () {
+            getAttrs(["HD", "PMA", "MagicCurve","strmod","dexmod","wismod","intmod","chamod"], function (values) {
+               let HD = parseInt(values.HD)||1;
+               let PMA;
+                switch(values.PMA){
+                    case "@{strmod}" :
+                        PMA = values.strmod;
+                        break;
+                    case "@{dexmod}":
+                        PMA = values.dexmod;
+                        break;
+                    case "@{wismod}" :
+                        PMA = values.wismod;
+                        break;
+                    case "@{intmod}" :
+                        PMA = values.intmod;
+                        break;
+                    case "@{chamod}" :
+                        PMA = values.chamod;
+                        break;
+                }
+                let HDSpellsPerDay = null;
+                let bonusspell = Math.max(Math.ceil((PMA + 1 - level)/4),0);
+                switch (values.MagicCurve){
+                    case "Basic":
+                        HDSpellsPerDay  = BasicMagicSPD[HD-1][level-1]; /*[ArrayID 1][ArrayID 2]*/
+                        break;
+                    case "Standard":
+                        HDSpellsPerDay  = StandardMagicSPD[HD-1][level-1];
+                        break;
+                    case "Advanced":
+                        HDSpellsPerDay  = AdvancedMagicSPD[HD-1][level-1];
+                        break;
+                }
+                let FinalSPD;
+                if(HDSpellsPerDay === null) FinalSPD = 0;
+                else FinalSPD = HDSpellsPerDay + bonusspell;
+                toSetAttrs = {};
+                toSetAttrs[`${level}perday`] = FinalSPD
+                setAttrs(toSetAttrs);
+            });
+        });
+    });
+
     on(`change:hd change:magiccurve sheet:opened`,function(){
         getAttrs(["HD","MagicCurve"], function(values){
             let HD = parseFloat(values.HD)||0;
@@ -3801,22 +4186,24 @@ <h3 style="color:white">Spell Casting</h3>
         });
     });
 
-    const SpellMacroLevel = [0,1,2,3,4,5,6,7,8,9];
+
     SpellMacroLevel.forEach(level => {
-        on(`change:repeating_spells-${level}:spellsaving change:repeating_spells-${level}:category change:repeating_spells`+
+        on(`change:repeating_spells-${level}:spellsaving change:repeating_spells-${level}:category change:repeating_spells change:repeating_spells-${level}:savesucces `+
             `change:repeating_spells-${level}:harmless change:repeating_spells-${level}:sr change:repeating_spells-${level}:spell${level}minimizetoggle `+
-            `change:repeating_spells-${level}:minimizetoggle change:repeating_spells-${level}:spellname`, function () {
-            getAttrs([`repeating_spells-${level}_spellsaving`,`repeating_spells-${level}_category`,
-                    `repeating_spells-${level}_harmless`, `repeating_spells-${level}_sr`],
+            `change:repeating_spells-${level}:minimizetoggle change:repeating_spells-${level}:spellname change:repeating_spells-${level}:spelldcmod`, function () {
+            getAttrs([`repeating_spells-${level}_spellsaving`,`repeating_spells-${level}_category`,`repeating_spells-${level}_savesucces`,
+                    `repeating_spells-${level}_harmless`, `repeating_spells-${level}_sr`,`repeating_spells-${level}_spelldcmod`],
                 function (values) {
                     let save = values[`repeating_spells-${level}_spellsaving`];
+                    let savesuccess = values[`repeating_spells-${level}_savesucces`];
+                    let dcmod = parseInt(values[`repeating_spells-${level}_spelldcmod`])||0;
                     let type = values[`repeating_spells-${level}_category`];
                     let harmless = values[`repeating_spells-${level}_harmless`];
                     let spell_resistance = values[`repeating_spells-${level}_sr`];
                     let macro = `&{template:custom}{{title=@{spellname}}}{{subtitle=@{school}}}{{Components=@{components}}}`+
                         `{{Range=@{range}}}{{Casting Time=@{castingtime}}}{{Effect=@{effect}}}{{Duration=@{duration}}}`;
                     if (save !== "No") {
-                        macro = macro + `{{${save} save= DC [[10+@{PMA}+${level}+@{SpellProf}]]${harmless.replace(`0`,``)}}}`;
+                        macro = macro + `{{${save} save= DC [[10+${dcmod}+@{PMA}+${level}+@{SpellProf}]]${savesuccess}${harmless.replace(`0`,``)}}}`;
                     }
                     if(type !== "0") {
                         macro = macro + `{{${type}=[[@{dicenum}@{dicetype}+(@{dicenum}*@{SpellProf})]]}}`;
@@ -3867,7 +4254,7 @@ <h3 style="color:white">Spell Casting</h3>
             let type = (values.repeating_abilities_abilitytype);
             let sr = (values.repeating_abilities_abilitysrconfirm);
             let SpellProf = (values.repeating_abilities_asprof);
-            let Macro = `&{template:custom}{{title=@{abilityname}}}{{subtitle=@{charname}}}{{Range=@{abilityrange}}}`+
+            let Macro = `&{template:custom}{{title=@{abilityname}}}{{subtitle=@{character_name}}}{{Range=@{abilityrange}}}`+
                 `{{Target=@{abilitytarget}}}{{Duration=@{abilityduration}}}`;
             if(savethrow !== "N/A"){
                 Macro = Macro + `{{${savethrow} save=@{abilitydc}}}`;
@@ -3925,17 +4312,31 @@ <h3 style="color:white">Spell Casting</h3>
     });
     });
 
+    // WeaponCol.forEach(col =>{
+    //     on(`change:repeating_weapons${col}:grandmaster change:repeating_weapons${col}:weaponminimize` +
+    //     `change:repeating_weapons${col}:weaponhaste`,function(){
+    //         getAttrs([`repeating_weapons${col}_grandmaster`],function(values){
+    //             let grandmaster = parseFloat(values[`repeating_weapons${col}_grandmaster`]) || 0;
+    //             if (grandmaster === 2){
+    //                 grandmaster =
+    //             }
+    //         })
+    //     })
+    // })
+
     WeaponCol.forEach(col => {
     on(`change:repeating_weapons${col}:bonustoattack change:repeating_weapons${col}:weaponhaste change:repeating_weapons${col}:weaponslow` +
         ` change:repeating_weapons${col}:critlow change:repeating_weapons${col}:weaponbab change:repeating_weapons${col}:weaponminimize` +
-        ` change:repeating_weapons${col}:enhancetoattack`, function(){
+        ` change:repeating_weapons${col}:enhancetoattack change:repeating_weapons${col}:grandmaster`, function(){
             getAttrs([`repeating_weapons${col}_bonustoattack`,`repeating_weapons${col}_critlow`,`repeating_weapons${col}_weaponhaste`
-                ,`repeating_weapons${col}_weaponbab`,`repeating_weapons${col}_weaponslow`,`repeating_weapons${col}_enhancetoattack`],function(values){
+                ,`repeating_weapons${col}_weaponbab`,`repeating_weapons${col}_weaponslow`,`repeating_weapons${col}_enhancetoattack`,
+            `repeating_weapons${col}_grandmaster`],function(values){
                 let featbonus = values[`repeating_weapons${col}_bonustoattack`] || 0;
                 let enhance = parseFloat(values[`repeating_weapons${col}_enhancetoattack`]) || 0;
                 let mincrit = parseFloat(values[`repeating_weapons${col}_critlow`]) || 0;
+                let grandmaster = parseFloat(values[`repeating_weapons${col}_grandmaster`]) || 0;
                 let BAB = parseFloat(values[`repeating_weapons${col}_weaponbab`]);
-                let Macro = `&{template:custom}{{title=Attack(s)}}{{subtitle=@{charname}'s @{weaponname}}}`+
+                let Macro = `&{template:custom}{{title=Attack(s)}}{{subtitle=@{character_name}'s @{weaponname}}}`+
                     `{{First Attack=[[1d20cs>${mincrit}+${BAB}[Base Attack]+@{weapontohit}[Key Attribute]+${featbonus}[Feat Bonuses]+${enhance}[Enhancement]+(0?{`+
                     `Do you have any miscellaneous bonuses?|0})]]}}`;
                 if(values[`repeating_weapons${col}_weaponhaste`] === `1`){
@@ -3947,14 +4348,26 @@ <h3 style="color:white">Spell Casting</h3>
                         Macro = Macro + `{{Second Attack=[[1d20cs>${mincrit}+${BAB - 5}[Base Attack]+@{weapontohit}[Key Attribute]` +
                             `+${featbonus}[Feat Bonuses]+${enhance}[Enhancement]+(0?{Do you have any miscellaneous bonuses?|0})]]}}`;
                     }
+                    if (grandmaster === 2){
+                        Macro = Macro + `{{Second Attack=[[1d20cs>${mincrit}+${BAB}[Base Attack]+@{weapontohit}[Key Attribute]` +
+                            `+${featbonus}[Feat Bonuses]+${enhance}[Enhancement]+(0?{Do you have any miscellaneous bonuses?|0})]]}}`;
+                    }
                     if (BAB - 10 > 0) {
                         Macro = Macro + `{{Third Attack=[[1d20cs>${mincrit}+${BAB - 10}[Base Attack]+@{weapontohit}[Key Attribute]` +
                             `+${featbonus}[Feat Bonuses]+${enhance}[Enhancement]+(0?{Do you have any miscellaneous bonuses?|0})]]}}`;
                     }
+                    if (grandmaster === 3){
+                        Macro = Macro + `{{Third Attack=[[1d20cs>${mincrit}+${BAB - 5}[Base Attack]+@{weapontohit}[Key Attribute]` +
+                            `+${featbonus}[Feat Bonuses]+${enhance}[Enhancement]+(0?{Do you have any miscellaneous bonuses?|0})]]}}`;
+                    }
                     if (BAB - 15 > 0) {
                         Macro = Macro + `{{Fourth Attack=[[1d20cs>${mincrit}+${BAB - 15}[Base Attack]+@{weapontohit}[Key Attribute]` +
                             `+${featbonus}[Feat Bonuses]+${enhance}[Enhancement]+(0?{Do you have any miscellaneous bonuses?|0})]]}}`;
                     }
+                    if (grandmaster === 4){
+                        Macro = Macro + `{{Fourth Attack=[[1d20cs>${mincrit}+${BAB - 10}[Base Attack]+@{weapontohit}[Key Attribute]` +
+                            `+${featbonus}[Feat Bonuses]+${enhance}[Enhancement]+(0?{Do you have any miscellaneous bonuses?|0})]]}}`;
+                    }
                 }
                 toSetAttrs = {};
                 toSetAttrs[`repeating_weapons${col}_fullattackroll`] = Macro;