diff --git a/Chaos 6010/Chaos 6010.css b/Chaos 6010/Chaos 6010.css
index 56f2415324..d48d065881 100644
--- a/Chaos 6010/Chaos 6010.css	
+++ b/Chaos 6010/Chaos 6010.css	
@@ -110,8 +110,7 @@ input.sheet-tab4:checked~div.sheet-section-gear,
 input.sheet-tab5:checked~div.sheet-section-mystic,
 input.sheet-tab6:checked~div.sheet-section-abilities,
 input.sheet-tab7:checked~div.sheet-section-reputation,
-input.sheet-tab8:checked~div.sheet-section-notes,
-input.sheet-tab9:checked~div.sheet-section-old-sheet {
+input.sheet-tab8:checked~div.sheet-section-notes {
 	display: block;
 }
 
diff --git a/Chaos 6010/Chaos 6010.html b/Chaos 6010/Chaos 6010.html
index ec17255843..a619f8db74 100644
--- a/Chaos 6010/Chaos 6010.html	
+++ b/Chaos 6010/Chaos 6010.html	
@@ -2113,8 +2113,6 @@
             <span class="sheet-tab sheet-tab7">Reputation</span>
             <input type="radio" class="sheet-tab sheet-tab8" name="attr_core-tab" value="8" title="Notes" />
             <span class="sheet-tab sheet-tab8">Notes</span>
-            <input type="radio" class="sheet-tab sheet-tab9" name="attr_core-tab" value="9" title="Old Sheet" />
-            <span class="sheet-tab sheet-tab9">Old Sheet</span>
 
 
             <!-- ----------------------------------------------------------------------------------------------------------------------------------------------------
@@ -2501,7 +2499,7 @@
                                 </td>
                                 <td class="sheet-button-cell">
                                     <button type="roll"
-                                        value="&{template:roll} {{character=@{Name}}} {{name=Strength Check}} {{roll=[[@{StrDice}@{PhysMod}+?{Modifier|0}]]}}"></button>
+                                        value="&{template:roll} {{character=@{character_name}}} {{name=Strength Check}} {{roll=[[@{StrDice}@{PhysMod}+?{Modifier|0}]]}}"></button>
                                 </td>
                             </tr>
                             <tr>
@@ -2556,7 +2554,7 @@
                                 </td>
                                 <td class="sheet-button-cell">
                                     <button type="roll"
-                                        value="&{template:roll} {{character=@{Name}}} {{name=Dexterity Check}} {{roll=[[@{DexDice}@{PhysMod}+?{Modifier|0}]]}}"></button>
+                                        value="&{template:roll} {{character=@{character_name}}} {{name=Dexterity Check}} {{roll=[[@{DexDice}@{PhysMod}+?{Modifier|0}]]}}"></button>
                                 </td>
                             </tr>
                             <tr>
@@ -2630,7 +2628,7 @@
                                 </td>
                                 <td class="sheet-button-cell">
                                     <button type="roll"
-                                        value="&{template:roll} {{character=@{Name}}} {{name=Body Check}} {{roll=[[@{BdyDice}@{PhysMod}+?{Modifier|0}]]}}"></button>
+                                        value="&{template:roll} {{character=@{character_name}}} {{name=Body Check}} {{roll=[[@{BdyDice}@{PhysMod}+?{Modifier|0}]]}}"></button>
                                 </td>
                             </tr>
                             <tr>
@@ -2691,7 +2689,7 @@
                                 </td>
                                 <td class="sheet-button-cell">
                                     <button type="roll"
-                                        value="&{template:roll} {{character=@{Name}}} {{name=Perception Check}} {{roll=[[@{PrcDice}@{PhysMod}+?{Modifier|0}]]}}"></button>
+                                        value="&{template:roll} {{character=@{character_name}}} {{name=Perception Check}} {{roll=[[@{PrcDice}@{PhysMod}+?{Modifier|0}]]}}"></button>
                                 </td>
                             </tr>
                             <tr>
@@ -2751,7 +2749,7 @@
                                 </td>
                                 <td class="sheet-button-cell">
                                     <button type="roll"
-                                        value="&{template:roll} {{character=@{Name}}} {{name=Intelligence Check}} {{roll=[[@{IntDice}@{MenMod}+?{Modifier|0}]]}}"></button>
+                                        value="&{template:roll} {{character=@{character_name}}} {{name=Intelligence Check}} {{roll=[[@{IntDice}@{MenMod}+?{Modifier|0}]]}}"></button>
                                 </td>
                             </tr>
                             <tr>
@@ -2817,7 +2815,7 @@
                                 </td>
                                 <td class="sheet-button-cell">
                                     <button type="roll"
-                                        value="&{template:roll} {{character=@{Name}}} {{name=Willpower Check}} {{roll=[[@{WilDice}@{MenMod}+?{Modifier|0}]]}}"></button>
+                                        value="&{template:roll} {{character=@{character_name}}} {{name=Willpower Check}} {{roll=[[@{WilDice}@{MenMod}+?{Modifier|0}]]}}"></button>
                                 </td>
                             </tr>
                             <tr>
@@ -2878,7 +2876,7 @@
                                 </td>
                                 <td class="sheet-button-cell">
                                     <button type="roll"
-                                        value="&{template:roll} {{character=@{Name}}} {{name=Charisma Check}} {{roll=[[@{ChrDice}@{MenMod}+?{Modifier|0}]]}}"></button>
+                                        value="&{template:roll} {{character=@{character_name}}} {{name=Charisma Check}} {{roll=[[@{ChrDice}@{MenMod}+?{Modifier|0}]]}}"></button>
                                 </td>
                             </tr>
                             <tr>
@@ -3811,7 +3809,7 @@
                                             </td>
                                             <td class="sheet-button-cell">
                                                 <button type="roll"
-                                                    value="&{template:roll} {{character=@{Name}}} {{name=@{Lang1Name} Check}} {{roll=[[@{Lang1Dice}@{MenMod}+?{Modifier|0}]]}}">
+                                                    value="&{template:roll} {{character=@{character_name}}} {{name=@{Lang1Name} Check}} {{roll=[[@{Lang1Dice}@{MenMod}+?{Modifier|0}]]}}">
                                                 </button>
                                             </td>
                                         </tr>
@@ -3835,7 +3833,7 @@
                                             </td>
                                             <td class="sheet-button-cell">
                                                 <button type="roll"
-                                                    value="&{template:roll} {{character=@{Name}}} {{name=@{Lang2Name} Check}} {{roll=[[@{Lang2Dice}@{MenMod}+?{Modifier|0}]]}}">
+                                                    value="&{template:roll} {{character=@{character_name}}} {{name=@{Lang2Name} Check}} {{roll=[[@{Lang2Dice}@{MenMod}+?{Modifier|0}]]}}">
                                                 </button>
                                             </td>
                                         </tr>
@@ -3859,7 +3857,7 @@
                                             </td>
                                             <td class="sheet-button-cell">
                                                 <button type="roll"
-                                                    value="&{template:roll} {{character=@{Name}}} {{name=@{Lang3Name} Check}} {{roll=[[@{Lang3Dice}@{MenMod}+?{Modifier|0}]]}}">
+                                                    value="&{template:roll} {{character=@{character_name}}} {{name=@{Lang3Name} Check}} {{roll=[[@{Lang3Dice}@{MenMod}+?{Modifier|0}]]}}">
                                                 </button>
                                             </td>
                                         </tr>
@@ -3971,12 +3969,12 @@
                                 </td>
                                 <td class="sheet-button-cell">
                                     <button type="roll"
-                                        value="&{template:attack} {{character=@{Name}}} {{attackType=@{Weapon1Name}}} {{roll=[[d20+@{Weapon1Hit}@{PhysMod}+@{Weapon1HitBonus}+?{Modifier|0}]]}} {{actions=?{Actions|1}}}">
+                                        value="&{template:attack} {{character=@{character_name}}} {{attackType=@{Weapon1Name}}} {{roll=[[d20+@{Weapon1Hit}@{PhysMod}+@{Weapon1HitBonus}+?{Modifier|0}]]}} {{actions=?{Actions|1}}}">
                                     </button>
                                 </td>
                                 <td class="sheet-button-cell">
                                     <button type="roll"
-                                        value="&{template:damage} {{character=@{Name}}} {{damageType=@{Weapon1Name}}} {{damage=[[(@{Weapon1Dmg}+@{Weapon1DmgBonus}+@{W1DmgMod}+?{Modifier|0})*?{Multiplier|1}]]}}">
+                                        value="&{template:damage} {{character=@{character_name}}} {{damageType=@{Weapon1Name}}} {{damage=[[(@{Weapon1Dmg}+@{Weapon1DmgBonus}+@{W1DmgMod}+?{Modifier|0})*?{Multiplier|1}]]}}">
                                     </button>
                                 </td>
                             </tr>
@@ -3986,12 +3984,12 @@
                                 </td>
                                 <td class="sheet-button-cell">
                                     <button type="roll"
-                                        value="&{template:attack} {{character=@{Name}}} {{attackType=@{Weapon2Name}}} {{roll=[[d20+@{Weapon2Hit}@{PhysMod}+@{Weapon2HitBonus}+?{Modifier|0}]]}} {{actions=?{Actions|1}}}">
+                                        value="&{template:attack} {{character=@{character_name}}} {{attackType=@{Weapon2Name}}} {{roll=[[d20+@{Weapon2Hit}@{PhysMod}+@{Weapon2HitBonus}+?{Modifier|0}]]}} {{actions=?{Actions|1}}}">
                                     </button>
                                 </td>
                                 <td class="sheet-button-cell">
                                     <button type="roll"
-                                        value="&{template:damage} {{character=@{Name}}} {{damageType=@{Weapon2Name}}} {{damage=[[(@{Weapon2Dmg}+@{Weapon2DmgBonus}+@{W2DmgMod}+?{Modifier|0})*?{Multiplier|1}]]}}">
+                                        value="&{template:damage} {{character=@{character_name}}} {{damageType=@{Weapon2Name}}} {{damage=[[(@{Weapon2Dmg}+@{Weapon2DmgBonus}+@{W2DmgMod}+?{Modifier|0})*?{Multiplier|1}]]}}">
                                     </button>
                                 </td>
                             </tr>
@@ -4001,12 +3999,12 @@
                                 </td>
                                 <td class="sheet-button-cell">
                                     <button type="roll"
-                                        value="&{template:attack} {{character=@{Name}}} {{attackType=@{Weapon3Name}}} {{roll=[[d20+@{Weapon3Hit}@{PhysMod}+@{Weapon3HitBonus}+?{Modifier|0}]]}} {{actions=?{Actions|1}}}">
+                                        value="&{template:attack} {{character=@{character_name}}} {{attackType=@{Weapon3Name}}} {{roll=[[d20+@{Weapon3Hit}@{PhysMod}+@{Weapon3HitBonus}+?{Modifier|0}]]}} {{actions=?{Actions|1}}}">
                                     </button>
                                 </td>
                                 <td class="sheet-button-cell">
                                     <button type="roll"
-                                        value="&{template:damage} {{character=@{Name}}} {{damageType=@{Weapon3Name}}} {{damage=[[(@{Weapon3Dmg}+@{Weapon3DmgBonus}+@{W3DmgMod}+?{Modifier|0})*?{Multiplier|1}]]}}">
+                                        value="&{template:damage} {{character=@{character_name}}} {{damageType=@{Weapon3Name}}} {{damage=[[(@{Weapon3Dmg}+@{Weapon3DmgBonus}+@{W3DmgMod}+?{Modifier|0})*?{Multiplier|1}]]}}">
                                     </button>
                                 </td>
                             </tr>
@@ -4016,12 +4014,12 @@
                                 </td>
                                 <td class="sheet-button-cell">
                                     <button type="roll"
-                                        value="&{template:attack} {{character=@{Name}}} {{attackType=@{Weapon4Name}}} {{roll=[[d20+@{Weapon4Hit}@{PhysMod}+@{Weapon4HitBonus}+?{Modifier|0}]]}} {{actions=?{Actions|1}}}">
+                                        value="&{template:attack} {{character=@{character_name}}} {{attackType=@{Weapon4Name}}} {{roll=[[d20+@{Weapon4Hit}@{PhysMod}+@{Weapon4HitBonus}+?{Modifier|0}]]}} {{actions=?{Actions|1}}}">
                                     </button>
                                 </td>
                                 <td class="sheet-button-cell">
                                     <button type="roll"
-                                        value="&{template:damage} {{character=@{Name}}} {{damageType=@{Weapon4Name}}} {{damage=[[(@{Weapon4Dmg}+@{Weapon4DmgBonus}+@{W4DmgMod}+?{Modifier|0})*?{Multiplier|1}]]}}">
+                                        value="&{template:damage} {{character=@{character_name}}} {{damageType=@{Weapon4Name}}} {{damage=[[(@{Weapon4Dmg}+@{Weapon4DmgBonus}+@{W4DmgMod}+?{Modifier|0})*?{Multiplier|1}]]}}">
                                     </button>
                                 </td>
                             </tr>
@@ -4031,12 +4029,12 @@
                                 </td>
                                 <td class="sheet-button-cell">
                                     <button type="roll"
-                                        value="&{template:attack} {{character=@{Name}}} {{attackType=@{Weapon5Name}}} {{roll=[[d20+@{Weapon5Hit}@{PhysMod}+@{Weapon5HitBonus}+?{Modifier|0}]]}} {{actions=?{Actions|1}}}">
+                                        value="&{template:attack} {{character=@{character_name}}} {{attackType=@{Weapon5Name}}} {{roll=[[d20+@{Weapon5Hit}@{PhysMod}+@{Weapon5HitBonus}+?{Modifier|0}]]}} {{actions=?{Actions|1}}}">
                                     </button>
                                 </td>
                                 <td class="sheet-button-cell">
                                     <button type="roll"
-                                        value="&{template:damage} {{character=@{Name}}} {{damageType=@{Weapon5Name}}} {{damage=[[(@{Weapon5Dmg}+@{Weapon5DmgBonus}+@{W5DmgMod}+?{Modifier|0})*?{Multiplier|1}]]}}">
+                                        value="&{template:damage} {{character=@{character_name}}} {{damageType=@{Weapon5Name}}} {{damage=[[(@{Weapon5Dmg}+@{Weapon5DmgBonus}+@{W5DmgMod}+?{Modifier|0})*?{Multiplier|1}]]}}">
                                     </button>
                                 </td>
                             </tr>
@@ -4046,12 +4044,12 @@
                                 </td>
                                 <td class="sheet-button-cell">
                                     <button type="roll"
-                                        value="&{template:attack} {{character=@{Name}}} {{attackType=@{Weapon6Name}}} {{roll=[[d20+@{Weapon6Hit}@{PhysMod}+@{Weapon6HitBonus}+?{Modifier|0}]]}} {{actions=?{Actions|1}}}">
+                                        value="&{template:attack} {{character=@{character_name}}} {{attackType=@{Weapon6Name}}} {{roll=[[d20+@{Weapon6Hit}@{PhysMod}+@{Weapon6HitBonus}+?{Modifier|0}]]}} {{actions=?{Actions|1}}}">
                                     </button>
                                 </td>
                                 <td class="sheet-button-cell">
                                     <button type="roll"
-                                        value="&{template:damage} {{character=@{Name}}} {{damageType=@{Weapon6Name}}} {{damage=[[(@{Weapon6Dmg}+@{Weapon6DmgBonus}+@{W6DmgMod}+?{Modifier|0})*?{Multiplier|1}]]}}">
+                                        value="&{template:damage} {{character=@{character_name}}} {{damageType=@{Weapon6Name}}} {{damage=[[(@{Weapon6Dmg}+@{Weapon6DmgBonus}+@{W6DmgMod}+?{Modifier|0})*?{Multiplier|1}]]}}">
                                     </button>
                                 </td>
                             </tr>
@@ -4061,12 +4059,12 @@
                                 </td>
                                 <td class="sheet-button-cell">
                                     <button type="roll"
-                                        value="&{template:attack} {{character=@{Name}}} {{attackType=Unarmed}} {{roll=[[d20+@{UnarmedHit}@{PhysMod}+@{UnarmedHitBonus}+?{Modifier|0}]]}} {{actions=?{Actions|1}}}">
+                                        value="&{template:attack} {{character=@{character_name}}} {{attackType=Unarmed}} {{roll=[[d20+@{UnarmedHit}@{PhysMod}+@{UnarmedHitBonus}+?{Modifier|0}]]}} {{actions=?{Actions|1}}}">
                                     </button>
                                 </td>
                                 <td class="sheet-button-cell">
                                     <button type="roll"
-                                        value="&{template:damage} {{character=@{Name}}} {{damageType=Unarmed}} {{damage=[[(@{UnarmedDmg}+@{UnarmedDmgBonus}+@{DmgModTotal}+?{Modifier|0})*?{Multiplier|1}]]}}">
+                                        value="&{template:damage} {{character=@{character_name}}} {{damageType=Unarmed}} {{damage=[[(@{UnarmedDmg}+@{UnarmedDmgBonus}+@{DmgModTotal}+?{Modifier|0})*?{Multiplier|1}]]}}">
                                     </button>
                                 </td>
                             </tr>
@@ -4076,12 +4074,12 @@
                                 </td>
                                 <td class="sheet-button-cell">
                                     <button type="roll"
-                                        value="&{template:attack} {{character=@{Name}}} {{attackType=@{AltUnarmedName}}} {{roll=[[d20+@{AltUnarmedHit}@{PhysMod}+@{AltUnarmedHitBonus}+?{Modifier|0}]]}} {{actions=?{Actions|1}}}">
+                                        value="&{template:attack} {{character=@{character_name}}} {{attackType=@{AltUnarmedName}}} {{roll=[[d20+@{AltUnarmedHit}@{PhysMod}+@{AltUnarmedHitBonus}+?{Modifier|0}]]}} {{actions=?{Actions|1}}}">
                                     </button>
                                 </td>
                                 <td class="sheet-button-cell">
                                     <button type="roll"
-                                        value="&{template:damage} {{character=@{Name}}} {{damageType=@{AltUnarmedName}}} {{damage=[[(@{AltUnarmedDmg}+@{AltUnarmedDmgBonus}+@{DmgModTotal}+?{Modifier|0})*?{Multiplier|1}]]}}">
+                                        value="&{template:damage} {{character=@{character_name}}} {{damageType=@{AltUnarmedName}}} {{damage=[[(@{AltUnarmedDmg}+@{AltUnarmedDmgBonus}+@{DmgModTotal}+?{Modifier|0})*?{Multiplier|1}]]}}">
                                     </button>
                                 </td>
                             </tr>
@@ -4106,12 +4104,12 @@
                                 </td>
                                 <td class="sheet-button-cell">
                                     <button type="roll"
-                                        value="&{template:spell-cast} {{name=@{Spell1Name}}} {{character=@{Name}}} {{area=@{Spell1Area}}} {{duration=@{Spell1Dur}}} {{actions=@{Spell1Act}}} {{drain=@{Spell1Drain}}} {{roll=[[d20+@{Spell1HitMod}@{MenMod}+?{Modifier|0}]]}}">
+                                        value="&{template:spell-cast} {{name=@{Spell1Name}}} {{character=@{character_name}}} {{area=@{Spell1Area}}} {{duration=@{Spell1Dur}}} {{actions=@{Spell1Act}}} {{drain=@{Spell1Drain}}} {{roll=[[d20+@{Spell1HitMod}@{MenMod}+?{Modifier|0}]]}}">
                                     </button>
                                 </td>
                                 <td class="sheet-button-cell">
                                     <button type="roll"
-                                        value="&{template:spell-effect} {{name=@{Spell1Name}}} {{character=@{Name}}} {{protection=@{Spell1Prot}}} {{roll=[[(@{Spell1Dmg}+@{SpEffTotal}+?{Modifier|0})*?{Multiplier}]]}}">
+                                        value="&{template:spell-effect} {{name=@{Spell1Name}}} {{character=@{character_name}}} {{protection=@{Spell1Prot}}} {{roll=[[(@{Spell1Dmg}+@{SpEffTotal}+?{Modifier|0})*?{Multiplier}]]}}">
                                     </button>
                                 </td>
                             </tr>
@@ -4121,12 +4119,12 @@
                                 </td>
                                 <td class="sheet-button-cell">
                                     <button type="roll"
-                                        value="&{template:spell-cast} {{name=@{Spell2Name}}} {{character=@{Name}}} {{area=@{Spell2Area}}} {{duration=@{Spell2Dur}}} {{actions=@{Spell2Act}}} {{drain=@{Spell2Drain}}} {{roll=[[d20+@{Spell2HitMod}@{MenMod}+?{Modifier|0}]]}}">
+                                        value="&{template:spell-cast} {{name=@{Spell2Name}}} {{character=@{character_name}}} {{area=@{Spell2Area}}} {{duration=@{Spell2Dur}}} {{actions=@{Spell2Act}}} {{drain=@{Spell2Drain}}} {{roll=[[d20+@{Spell2HitMod}@{MenMod}+?{Modifier|0}]]}}">
                                     </button>
                                 </td>
                                 <td class="sheet-button-cell">
                                     <button type="roll"
-                                        value="&{template:spell-effect} {{name=@{Spell2Name}}} {{character=@{Name}}} {{protection=@{Spell2Prot}}} {{roll=[[(@{Spell2Dmg}+@{SpEffTotal}+?{Modifier|0})*?{Multiplier}]]}}">
+                                        value="&{template:spell-effect} {{name=@{Spell2Name}}} {{character=@{character_name}}} {{protection=@{Spell2Prot}}} {{roll=[[(@{Spell2Dmg}+@{SpEffTotal}+?{Modifier|0})*?{Multiplier}]]}}">
                                     </button>
                                 </td>
                             </tr>
@@ -4136,12 +4134,12 @@
                                 </td>
                                 <td class="sheet-button-cell">
                                     <button type="roll"
-                                        value="&{template:spell-cast} {{name=@{Spell3Name}}} {{character=@{Name}}} {{area=@{Spell3Area}}} {{duration=@{Spell3Dur}}} {{actions=@{Spell3Act}}} {{drain=@{Spell3Drain}}} {{roll=[[d20+@{Spell3HitMod}@{MenMod}+?{Modifier|0}]]}}">
+                                        value="&{template:spell-cast} {{name=@{Spell3Name}}} {{character=@{character_name}}} {{area=@{Spell3Area}}} {{duration=@{Spell3Dur}}} {{actions=@{Spell3Act}}} {{drain=@{Spell3Drain}}} {{roll=[[d20+@{Spell3HitMod}@{MenMod}+?{Modifier|0}]]}}">
                                     </button>
                                 </td>
                                 <td class="sheet-button-cell">
                                     <button type="roll"
-                                        value="&{template:spell-effect} {{name=@{Spell3Name}}} {{character=@{Name}}} {{protection=@{Spell3Prot}}} {{roll=[[(@{Spell3Dmg}+@{SpEffTotal}+?{Modifier|0})*?{Multiplier}]]}}">
+                                        value="&{template:spell-effect} {{name=@{Spell3Name}}} {{character=@{character_name}}} {{protection=@{Spell3Prot}}} {{roll=[[(@{Spell3Dmg}+@{SpEffTotal}+?{Modifier|0})*?{Multiplier}]]}}">
                                     </button>
                                 </td>
                             </tr>
@@ -4151,12 +4149,12 @@
                                 </td>
                                 <td class="sheet-button-cell">
                                     <button type="roll"
-                                        value="&{template:spell-cast} {{name=@{Spell4Name}}} {{character=@{Name}}} {{area=@{Spell4Area}}} {{duration=@{Spell4Dur}}} {{actions=@{Spell4Act}}} {{drain=@{Spell4Drain}}} {{roll=[[d20+@{Spell4HitMod}@{MenMod}+?{Modifier|0}]]}}">
+                                        value="&{template:spell-cast} {{name=@{Spell4Name}}} {{character=@{character_name}}} {{area=@{Spell4Area}}} {{duration=@{Spell4Dur}}} {{actions=@{Spell4Act}}} {{drain=@{Spell4Drain}}} {{roll=[[d20+@{Spell4HitMod}@{MenMod}+?{Modifier|0}]]}}">
                                     </button>
                                 </td>
                                 <td class="sheet-button-cell">
                                     <button type="roll"
-                                        value="&{template:spell-effect} {{name=@{Spell4Name}}} {{character=@{Name}}} {{protection=@{Spell4Prot}}} {{roll=[[(@{Spell4Dmg}+@{SpEffTotal}+?{Modifier|0})*?{Multiplier}]]}}">
+                                        value="&{template:spell-effect} {{name=@{Spell4Name}}} {{character=@{character_name}}} {{protection=@{Spell4Prot}}} {{roll=[[(@{Spell4Dmg}+@{SpEffTotal}+?{Modifier|0})*?{Multiplier}]]}}">
                                     </button>
                                 </td>
                             </tr>
@@ -4166,12 +4164,12 @@
                                 </td>
                                 <td class="sheet-button-cell">
                                     <button type="roll"
-                                        value="&{template:spell-cast} {{name=@{Spell5Name}}} {{character=@{Name}}} {{area=@{Spell5Area}}} {{duration=@{Spell5Dur}}} {{actions=@{Spell5Act}}} {{drain=@{Spell5Drain}}} {{roll=[[d20+@{Spell5HitMod}@{MenMod}+?{Modifier|0}]]}}">
+                                        value="&{template:spell-cast} {{name=@{Spell5Name}}} {{character=@{character_name}}} {{area=@{Spell5Area}}} {{duration=@{Spell5Dur}}} {{actions=@{Spell5Act}}} {{drain=@{Spell5Drain}}} {{roll=[[d20+@{Spell5HitMod}@{MenMod}+?{Modifier|0}]]}}">
                                     </button>
                                 </td>
                                 <td class="sheet-button-cell">
                                     <button type="roll"
-                                        value="&{template:spell-effect} {{name=@{Spell5Name}}} {{character=@{Name}}} {{protection=@{Spell5Prot}}} {{roll=[[(@{Spell5Dmg}+@{SpEffTotal}+?{Modifier|0})*?{Multiplier}]]}}">
+                                        value="&{template:spell-effect} {{name=@{Spell5Name}}} {{character=@{character_name}}} {{protection=@{Spell5Prot}}} {{roll=[[(@{Spell5Dmg}+@{SpEffTotal}+?{Modifier|0})*?{Multiplier}]]}}">
                                     </button>
                                 </td>
                             </tr>
@@ -4181,12 +4179,12 @@
                                 </td>
                                 <td class="sheet-button-cell">
                                     <button type="roll"
-                                        value="&{template:spell-cast} {{name=@{Spell6Name}}} {{character=@{Name}}} {{area=@{Spell6Area}}} {{duration=@{Spell6Dur}}} {{actions=@{Spell6Act}}} {{drain=@{Spell6Drain}}} {{roll=[[d20+@{Spell6HitMod}@{MenMod}+?{Modifier|0}]]}}">
+                                        value="&{template:spell-cast} {{name=@{Spell6Name}}} {{character=@{character_name}}} {{area=@{Spell6Area}}} {{duration=@{Spell6Dur}}} {{actions=@{Spell6Act}}} {{drain=@{Spell6Drain}}} {{roll=[[d20+@{Spell6HitMod}@{MenMod}+?{Modifier|0}]]}}">
                                     </button>
                                 </td>
                                 <td class="sheet-button-cell">
                                     <button type="roll"
-                                        value="&{template:spell-effect} {{name=@{Spell6Name}}} {{character=@{Name}}} {{protection=@{Spell6Prot}}} {{roll=[[(@{Spell6Dmg}+@{SpEffTotal}+?{Modifier|0})*?{Multiplier}]]}}">
+                                        value="&{template:spell-effect} {{name=@{Spell6Name}}} {{character=@{character_name}}} {{protection=@{Spell6Prot}}} {{roll=[[(@{Spell6Dmg}+@{SpEffTotal}+?{Modifier|0})*?{Multiplier}]]}}">
                                     </button>
                                 </td>
                             </tr>
@@ -4196,12 +4194,12 @@
                                 </td>
                                 <td class="sheet-button-cell">
                                     <button type="roll"
-                                        value="&{template:spell-cast} {{name=@{Spell7Name}}} {{character=@{Name}}} {{area=@{Spell7Area}}} {{duration=@{Spell7Dur}}} {{actions=@{Spell7Act}}} {{drain=@{Spell7Drain}}} {{roll=[[d20+@{Spell7HitMod}@{MenMod}+?{Modifier|0}]]}}">
+                                        value="&{template:spell-cast} {{name=@{Spell7Name}}} {{character=@{character_name}}} {{area=@{Spell7Area}}} {{duration=@{Spell7Dur}}} {{actions=@{Spell7Act}}} {{drain=@{Spell7Drain}}} {{roll=[[d20+@{Spell7HitMod}@{MenMod}+?{Modifier|0}]]}}">
                                     </button>
                                 </td>
                                 <td class="sheet-button-cell">
                                     <button type="roll"
-                                        value="&{template:spell-effect} {{name=@{Spell7Name}}} {{character=@{Name}}} {{protection=@{Spell7Prot}}} {{roll=[[(@{Spell7Dmg}+@{SpEffTotal}+?{Modifier|0})*?{Multiplier}]]}}">
+                                        value="&{template:spell-effect} {{name=@{Spell7Name}}} {{character=@{character_name}}} {{protection=@{Spell7Prot}}} {{roll=[[(@{Spell7Dmg}+@{SpEffTotal}+?{Modifier|0})*?{Multiplier}]]}}">
                                     </button>
                                 </td>
                             </tr>
@@ -4211,12 +4209,12 @@
                                 </td>
                                 <td class="sheet-button-cell">
                                     <button type="roll"
-                                        value="&{template:spell-cast} {{name=@{Spell8Name}}} {{character=@{Name}}} {{area=@{Spell8Area}}} {{duration=@{Spell8Dur}}} {{actions=@{Spell8Act}}} {{drain=@{Spell8Drain}}} {{roll=[[d20+@{Spell8HitMod}@{MenMod}+?{Modifier|0}]]}}">
+                                        value="&{template:spell-cast} {{name=@{Spell8Name}}} {{character=@{character_name}}} {{area=@{Spell8Area}}} {{duration=@{Spell8Dur}}} {{actions=@{Spell8Act}}} {{drain=@{Spell8Drain}}} {{roll=[[d20+@{Spell8HitMod}@{MenMod}+?{Modifier|0}]]}}">
                                     </button>
                                 </td>
                                 <td class="sheet-button-cell">
                                     <button type="roll"
-                                        value="&{template:spell-effect} {{name=@{Spell8Name}}} {{character=@{Name}}} {{protection=@{Spell8Prot}}} {{roll=[[(@{Spell8Dmg}+@{SpEffTotal}+?{Modifier|0})*?{Multiplier}]]}}">
+                                        value="&{template:spell-effect} {{name=@{Spell8Name}}} {{character=@{character_name}}} {{protection=@{Spell8Prot}}} {{roll=[[(@{Spell8Dmg}+@{SpEffTotal}+?{Modifier|0})*?{Multiplier}]]}}">
                                     </button>
                                 </td>
                             </tr>
@@ -4226,12 +4224,12 @@
                                 </td>
                                 <td class="sheet-button-cell">
                                     <button type="roll"
-                                        value="&{template:spell-cast} {{name=@{Spell9Name}}} {{character=@{Name}}} {{area=@{Spell9Area}}} {{duration=@{Spell9Dur}}} {{actions=@{Spell9Act}}} {{drain=@{Spell9Drain}}} {{roll=[[d20+@{Spell9HitMod}@{MenMod}+?{Modifier|0}]]}}">
+                                        value="&{template:spell-cast} {{name=@{Spell9Name}}} {{character=@{character_name}}} {{area=@{Spell9Area}}} {{duration=@{Spell9Dur}}} {{actions=@{Spell9Act}}} {{drain=@{Spell9Drain}}} {{roll=[[d20+@{Spell9HitMod}@{MenMod}+?{Modifier|0}]]}}">
                                     </button>
                                 </td>
                                 <td class="sheet-button-cell">
                                     <button type="roll"
-                                        value="&{template:spell-effect} {{name=@{Spell9Name}}} {{character=@{Name}}} {{protection=@{Spell9Prot}}} {{roll=[[(@{Spell9Dmg}+@{SpEffTotal}+?{Modifier|0})*?{Multiplier}]]}}">
+                                        value="&{template:spell-effect} {{name=@{Spell9Name}}} {{character=@{character_name}}} {{protection=@{Spell9Prot}}} {{roll=[[(@{Spell9Dmg}+@{SpEffTotal}+?{Modifier|0})*?{Multiplier}]]}}">
                                     </button>
                                 </td>
                             </tr>
@@ -4241,12 +4239,12 @@
                                 </td>
                                 <td class="sheet-button-cell">
                                     <button type="roll"
-                                        value="&{template:spell-cast} {{name=@{Spell10Name}}} {{character=@{Name}}} {{area=@{Spell10Area}}} {{duration=@{Spell10Dur}}} {{actions=@{Spell10Act}}} {{drain=@{Spell10Drain}}} {{roll=[[d20+@{Spell10HitMod}@{MenMod}+?{Modifier|0}]]}}">
+                                        value="&{template:spell-cast} {{name=@{Spell10Name}}} {{character=@{character_name}}} {{area=@{Spell10Area}}} {{duration=@{Spell10Dur}}} {{actions=@{Spell10Act}}} {{drain=@{Spell10Drain}}} {{roll=[[d20+@{Spell10HitMod}@{MenMod}+?{Modifier|0}]]}}">
                                     </button>
                                 </td>
                                 <td class="sheet-button-cell">
                                     <button type="roll"
-                                        value="&{template:spell-effect} {{name=@{Spell10Name}}} {{character=@{Name}}} {{protection=@{Spell10Prot}}} {{roll=[[(@{Spell10Dmg}+@{SpEffTotal}+?{Modifier|0})*?{Multiplier}]]}}">
+                                        value="&{template:spell-effect} {{name=@{Spell10Name}}} {{character=@{character_name}}} {{protection=@{Spell10Prot}}} {{roll=[[(@{Spell10Dmg}+@{SpEffTotal}+?{Modifier|0})*?{Multiplier}]]}}">
                                     </button>
                                 </td>
                             </tr>
@@ -4309,7 +4307,7 @@
                                     <input type="number" class="sheet-desctotalfield" name="attr_DefModTotal" value="0" readonly />
                                 </td>
                                 <td class="sheet-button-cell">
-                                    <button type="roll" value="&{template:roll} {{character=@{Name}}} {{name=Dodge Roll}} {{roll=[[d20+@{DefModTotal}+?{Modifier|0}]]}}">
+                                    <button type="roll" value="&{template:roll} {{character=@{character_name}}} {{name=Dodge Roll}} {{roll=[[d20+@{DefModTotal}+?{Modifier|0}]]}}">
                                     </button>
                                 </td>
                             </tr>
@@ -4320,7 +4318,7 @@
                                 </td>
                                 <td class="sheet-button-cell">
                                     <button type="roll"
-                                        value="&{template:roll} {{character=@{Name}}} {{name=Parry Roll}} {{roll=[[d20+@{DefModTotal}+@{ParryBonus}-1+?{Modifier|0}]]}}">
+                                        value="&{template:roll} {{character=@{character_name}}} {{name=Parry Roll}} {{roll=[[d20+@{DefModTotal}+@{ParryBonus}-1+?{Modifier|0}]]}}">
                                     </button>
                                 </td>
                             </tr>
@@ -4331,7 +4329,7 @@
                                 </td>
                                 <td class="sheet-button-cell">
                                     <button type="roll"
-                                        value="&{template:roll} {{character=@{Name}}} {{name=Block Roll}} {{roll=[[d20+@{DefModTotal}+@{BlockBonus}+1+?{Modifier|0}]]}}">
+                                        value="&{template:roll} {{character=@{character_name}}} {{name=Block Roll}} {{roll=[[d20+@{DefModTotal}+@{BlockBonus}+1+?{Modifier|0}]]}}">
                                     </button>
                                 </td>
                             </tr>
@@ -4342,7 +4340,7 @@
                                 </td>
                                 <td class="sheet-button-cell">
                                     <button type="roll"
-                                        value="&{template:roll} {{character=@{Name}}} {{name=Shield Block Roll}} {{roll=[[d20+@{DefModTotal}+@{ShieldBlockBonus}+@{ShieldCover}+?{Modifier|0}]]}}">
+                                        value="&{template:roll} {{character=@{character_name}}} {{name=Shield Block Roll}} {{roll=[[d20+@{DefModTotal}+@{ShieldBlockBonus}+@{ShieldCover}+?{Modifier|0}]]}}">
                                     </button>
                                 </td>
                             </tr>
@@ -4353,7 +4351,7 @@
                                 </td>
                                 <td class="sheet-button-cell">
                                     <button type="roll"
-                                        value="&{template:roll} {{character=@{Name}}} {{name=Mental Defense Roll}} {{roll=[[d20+@{MenDefTotal}+?{Modifier|0}]]}}">
+                                        value="&{template:roll} {{character=@{character_name}}} {{name=Mental Defense Roll}} {{roll=[[d20+@{MenDefTotal}+?{Modifier|0}]]}}">
                                     </button>
                                 </td>
                             </tr>
@@ -4371,7 +4369,7 @@
                                 <td class="sheet-skillname">Initiative</td>
                                 <td class="sheet-button-cell">
                                     <button type="roll"
-                                        value="&{template:roll} {{character=@{Name}}} {{name=Initiative Roll}} {{roll=[[1d10!+@{InitModTotal}+?{Modifier|0}&{tracker}]]}}">
+                                        value="&{template:roll} {{character=@{character_name}}} {{name=Initiative Roll}} {{roll=[[1d10!+@{InitModTotal}+?{Modifier|0}&{tracker}]]}}">
                                     </button>
                                 </td>
                             </tr>
@@ -4483,7 +4481,7 @@
                                 </td>
                                 <td class="sheet-button-cell">
                                     <button type="roll"
-                                        value="&{template:attack} {{character=@{Name}}} {{attackType=Unarmed}} {{roll=[[d20+@{UnarmedHit}@{PhysMod}+@{UnarmedHitBonus}+?{Modifier|0}]]}} {{actions=?{Actions|1}}}">
+                                        value="&{template:attack} {{character=@{character_name}}} {{attackType=Unarmed}} {{roll=[[d20+@{UnarmedHit}@{PhysMod}+@{UnarmedHitBonus}+?{Modifier|0}]]}} {{actions=?{Actions|1}}}">
                                     </button>
                                 </td>
                             </tr>
@@ -4507,7 +4505,7 @@
                                 </td>
                                 <td class="sheet-button-cell">
                                     <button type="roll"
-                                        value="&{template:damage} {{character=@{Name}}} {{damageType=@{Unarmed}}} {{damage=[[(@{UnarmedDmg}+@{UnarmedDmgBonus}+@{DmgModTotal}+?{Modifier|0})*?{Multiplier|1}]]}}">
+                                        value="&{template:damage} {{character=@{character_name}}} {{damageType=@{Unarmed}}} {{damage=[[(@{UnarmedDmg}+@{UnarmedDmgBonus}+@{DmgModTotal}+?{Modifier|0})*?{Multiplier|1}]]}}">
                                     </button>
                                 </td>
                             </tr>
@@ -4529,7 +4527,7 @@
                                 </td>
                                 <td class="sheet-button-cell">
                                     <button type="roll"
-                                        value="&{template:attack} {{character=@{Name}}} {{attackType=@{AltUnarmedName}}} {{roll=[[d20+@{AltUnarmedHit}@{PhysMod}+@{AltUnarmedHitBonus}+?{Modifier|0}]]}} {{actions=?{Actions|1}}}">
+                                        value="&{template:attack} {{character=@{character_name}}} {{attackType=@{AltUnarmedName}}} {{roll=[[d20+@{AltUnarmedHit}@{PhysMod}+@{AltUnarmedHitBonus}+?{Modifier|0}]]}} {{actions=?{Actions|1}}}">
                                     </button>
                                 </td>
                             </tr>
@@ -4551,7 +4549,7 @@
                                 </td>
                                 <td class="sheet-button-cell">
                                     <button type="roll"
-                                        value="&{template:damage} {{character=@{Name}}} {{damageType=@{AltUnarmedName}}} {{damage=[[(@{AltUnarmedDmg}+@{AltUnarmedDmgBonus}+@{DmgModTotal}+?{Modifier|0})*?{Multiplier|1}]]}}">
+                                        value="&{template:damage} {{character=@{character_name}}} {{damageType=@{AltUnarmedName}}} {{damage=[[(@{AltUnarmedDmg}+@{AltUnarmedDmgBonus}+@{DmgModTotal}+?{Modifier|0})*?{Multiplier|1}]]}}">
                                     </button>
                                 </td>
                             </tr>
@@ -4582,7 +4580,7 @@
                                 </td>
                                 <td class="sheet-button-cell">
                                     <button type="roll"
-                                        value="&{template:attack} {{character=@{Name}}} {{attackType=@{Weapon1Name}}} {{roll=[[d20+@{Weapon1Hit}@{PhysMod}+@{Weapon1HitBonus}+?{Modifier|0}]]}} {{actions=?{Actions|1}}}">
+                                        value="&{template:attack} {{character=@{character_name}}} {{attackType=@{Weapon1Name}}} {{roll=[[d20+@{Weapon1Hit}@{PhysMod}+@{Weapon1HitBonus}+?{Modifier|0}]]}} {{actions=?{Actions|1}}}">
                                     </button>
                                 </td>
                             </tr>
@@ -4602,7 +4600,7 @@
                                 </td>
                                 <td class="sheet-button-cell">
                                     <button type="roll"
-                                        value="&{template:damage} {{character=@{Name}}} {{damageType=@{Weapon1Name}}} {{damage=[[(@{Weapon1Dmg}+@{Weapon1DmgBonus}+@{W1DmgMod}+?{Modifier|0})*?{Multiplier|1}]]}}">
+                                        value="&{template:damage} {{character=@{character_name}}} {{damageType=@{Weapon1Name}}} {{damage=[[(@{Weapon1Dmg}+@{Weapon1DmgBonus}+@{W1DmgMod}+?{Modifier|0})*?{Multiplier|1}]]}}">
                                     </button>
                                 </td>
                             </tr>
@@ -4674,7 +4672,7 @@
                                 </td>
                                 <td class="sheet-button-cell">
                                     <button type="roll"
-                                        value="&{template:attack} {{character=@{Name}}} {{attackType=@{Weapon2Name}}} {{roll=[[d20+@{Weapon2Hit}@{PhysMod}+@{Weapon2HitBonus}+?{Modifier|0}]]}} {{actions=?{Actions|1}}}">
+                                        value="&{template:attack} {{character=@{character_name}}} {{attackType=@{Weapon2Name}}} {{roll=[[d20+@{Weapon2Hit}@{PhysMod}+@{Weapon2HitBonus}+?{Modifier|0}]]}} {{actions=?{Actions|1}}}">
                                     </button>
                                 </td>
                             </tr>
@@ -4694,7 +4692,7 @@
                                 </td>
                                 <td class="sheet-button-cell">
                                     <button type="roll"
-                                        value="&{template:damage} {{character=@{Name}}} {{damageType=@{Weapon2Name}}} {{damage=[[(@{Weapon2Dmg}+@{Weapon2DmgBonus}+@{W2DmgMod}+?{Modifier|0})*?{Multiplier|1}]]}}">
+                                        value="&{template:damage} {{character=@{character_name}}} {{damageType=@{Weapon2Name}}} {{damage=[[(@{Weapon2Dmg}+@{Weapon2DmgBonus}+@{W2DmgMod}+?{Modifier|0})*?{Multiplier|1}]]}}">
                                     </button>
                                 </td>
                             </tr>
@@ -4766,7 +4764,7 @@
                                 </td>
                                 <td class="sheet-button-cell">
                                     <button type="roll"
-                                        value="&{template:attack} {{character=@{Name}}} {{attackType=@{Weapon3Name}}} {{roll=[[d20+@{Weapon3Hit}@{PhysMod}+@{Weapon3HitBonus}+?{Modifier|0}]]}} {{actions=?{Actions|1}}}">
+                                        value="&{template:attack} {{character=@{character_name}}} {{attackType=@{Weapon3Name}}} {{roll=[[d20+@{Weapon3Hit}@{PhysMod}+@{Weapon3HitBonus}+?{Modifier|0}]]}} {{actions=?{Actions|1}}}">
                                     </button>
                                 </td>
                             </tr>
@@ -4786,7 +4784,7 @@
                                 </td>
                                 <td class="sheet-button-cell">
                                     <button type="roll"
-                                        value="&{template:damage} {{character=@{Name}}} {{damageType=@{Weapon3Name}}} {{damage=[[(@{Weapon3Dmg}+@{Weapon3DmgBonus}+@{W3DmgMod}+?{Modifier|0})*?{Multiplier|1}]]}}">
+                                        value="&{template:damage} {{character=@{character_name}}} {{damageType=@{Weapon3Name}}} {{damage=[[(@{Weapon3Dmg}+@{Weapon3DmgBonus}+@{W3DmgMod}+?{Modifier|0})*?{Multiplier|1}]]}}">
                                     </button>
                                 </td>
                             </tr>
@@ -4858,7 +4856,7 @@
                                 </td>
                                 <td class="sheet-button-cell">
                                     <button type="roll"
-                                        value="&{template:attack} {{character=@{Name}}} {{attackType=@{Weapon4Name}}} {{roll=[[d20+@{Weapon4Hit}@{PhysMod}+@{Weapon4HitBonus}+?{Modifier|0}]]}} {{actions=?{Actions|1}}}">
+                                        value="&{template:attack} {{character=@{character_name}}} {{attackType=@{Weapon4Name}}} {{roll=[[d20+@{Weapon4Hit}@{PhysMod}+@{Weapon4HitBonus}+?{Modifier|0}]]}} {{actions=?{Actions|1}}}">
                                     </button>
                                 </td>
                             </tr>
@@ -4878,7 +4876,7 @@
                                 </td>
                                 <td class="sheet-button-cell">
                                     <button type="roll"
-                                        value="&{template:damage} {{character=@{Name}}} {{damageType=@{Weapon4Name}}} {{damage=[[(@{Weapon4Dmg}+@{Weapon4DmgBonus}+@{W4DmgMod}+?{Modifier|0})*?{Multiplier|1}]]}}">
+                                        value="&{template:damage} {{character=@{character_name}}} {{damageType=@{Weapon4Name}}} {{damage=[[(@{Weapon4Dmg}+@{Weapon4DmgBonus}+@{W4DmgMod}+?{Modifier|0})*?{Multiplier|1}]]}}">
                                     </button>
                                 </td>
                             </tr>
@@ -4950,7 +4948,7 @@
                                 </td>
                                 <td class="sheet-button-cell">
                                     <button type="roll"
-                                        value="&{template:attack} {{character=@{Name}}} {{attackType=@{Weapon5Name}}} {{roll=[[d20+@{Weapon5Hit}@{PhysMod}+@{Weapon5HitBonus}+?{Modifier|0}]]}} {{actions=?{Actions|1}}}">
+                                        value="&{template:attack} {{character=@{character_name}}} {{attackType=@{Weapon5Name}}} {{roll=[[d20+@{Weapon5Hit}@{PhysMod}+@{Weapon5HitBonus}+?{Modifier|0}]]}} {{actions=?{Actions|1}}}">
                                     </button>
                                 </td>
                             </tr>
@@ -4970,7 +4968,7 @@
                                 </td>
                                 <td class="sheet-button-cell">
                                     <button type="roll"
-                                        value="&{template:damage} {{character=@{Name}}} {{damageType=@{Weapon5Name}}} {{damage=[[(@{Weapon5Dmg}+@{Weapon5DmgBonus}+@{W5DmgMod}+?{Modifier|0})*?{Multiplier|1}]]}}">
+                                        value="&{template:damage} {{character=@{character_name}}} {{damageType=@{Weapon5Name}}} {{damage=[[(@{Weapon5Dmg}+@{Weapon5DmgBonus}+@{W5DmgMod}+?{Modifier|0})*?{Multiplier|1}]]}}">
                                     </button>
                                 </td>
                             </tr>
@@ -5042,7 +5040,7 @@
                                 </td>
                                 <td class="sheet-button-cell">
                                     <button type="roll"
-                                        value="&{template:attack} {{character=@{Name}}} {{attackType=@{Weapon6Name}}} {{roll=[[d20+@{Weapon6Hit}@{PhysMod}+@{Weapon6HitBonus}+?{Modifier|0}]]}} {{actions=?{Actions|1}}}">
+                                        value="&{template:attack} {{character=@{character_name}}} {{attackType=@{Weapon6Name}}} {{roll=[[d20+@{Weapon6Hit}@{PhysMod}+@{Weapon6HitBonus}+?{Modifier|0}]]}} {{actions=?{Actions|1}}}">
                                     </button>
                                 </td>
                             </tr>
@@ -5062,7 +5060,7 @@
                                 </td>
                                 <td class="sheet-button-cell">
                                     <button type="roll"
-                                        value="&{template:damage} {{character=@{Name}}} {{damageType=@{Weapon6Name}}} {{damage=[[(@{Weapon6Dmg}+@{Weapon6DmgBonus}+@{W6DmgMod}+?{Modifier|0})*?{Multiplier|1}]]}}">
+                                        value="&{template:damage} {{character=@{character_name}}} {{damageType=@{Weapon6Name}}} {{damage=[[(@{Weapon6Dmg}+@{Weapon6DmgBonus}+@{W6DmgMod}+?{Modifier|0})*?{Multiplier|1}]]}}">
                                     </button>
                                 </td>
                             </tr>
@@ -5722,7 +5720,7 @@
                                     </td>
                                     <td rowspan="2" class="sheet-button-cell">
                                         <button type="roll"
-                                            value="&{template:spell-cast} {{name=@{Spell1Name}}} {{character=@{Name}}} {{area=@{Spell1Area}}} {{duration=@{Spell1Dur}}} {{actions=@{Spell1Act}}} {{drain=@{Spell1Drain}}} {{roll=[[d20+@{Spell1HitMod}@{MenMod}+?{Modifier|0}]]}}">
+                                            value="&{template:spell-cast} {{name=@{Spell1Name}}} {{character=@{character_name}}} {{area=@{Spell1Area}}} {{duration=@{Spell1Dur}}} {{actions=@{Spell1Act}}} {{drain=@{Spell1Drain}}} {{roll=[[d20+@{Spell1HitMod}@{MenMod}+?{Modifier|0}]]}}">
                                         </button>
                                     </td>
                                     <td>
@@ -5730,7 +5728,7 @@
                                     </td>
                                     <td rowspan="2" class="sheet-button-cell">
                                         <button type="roll"
-                                            value="&{template:spell-effect} {{name=@{Spell1Name}}} {{character=@{Name}}} {{protection=@{Spell1Prot}}} {{roll=[[(@{Spell1Dmg}+@{SpEffTotal}+?{Modifier|0})*?{Multiplier}]]}}">
+                                            value="&{template:spell-effect} {{name=@{Spell1Name}}} {{character=@{character_name}}} {{protection=@{Spell1Prot}}} {{roll=[[(@{Spell1Dmg}+@{SpEffTotal}+?{Modifier|0})*?{Multiplier}]]}}">
                                         </button>
                                     </td>
                                 </tr>
@@ -5788,7 +5786,7 @@
                                     </td>
                                     <td rowspan="2" class="sheet-button-cell">
                                         <button type="roll"
-                                            value="&{template:spell-cast} {{name=@{Spell2Name}}} {{character=@{Name}}} {{area=@{Spell2Area}}} {{duration=@{Spell2Dur}}} {{actions=@{Spell2Act}}} {{drain=@{Spell2Drain}}} {{roll=[[d20+@{Spell2HitMod}@{MenMod}+?{Modifier|0}]]}}">
+                                            value="&{template:spell-cast} {{name=@{Spell2Name}}} {{character=@{character_name}}} {{area=@{Spell2Area}}} {{duration=@{Spell2Dur}}} {{actions=@{Spell2Act}}} {{drain=@{Spell2Drain}}} {{roll=[[d20+@{Spell2HitMod}@{MenMod}+?{Modifier|0}]]}}">
                                         </button>
                                     </td>
                                     <td>
@@ -5796,7 +5794,7 @@
                                     </td>
                                     <td rowspan="2" class="sheet-button-cell">
                                         <button type="roll"
-                                            value="&{template:spell-effect} {{name=@{Spell2Name}}} {{character=@{Name}}} {{protection=@{Spell2Prot}}} {{roll=[[(@{Spell2Dmg}+@{SpEffTotal}+?{Modifier|0})*?{Multiplier}]]}}">
+                                            value="&{template:spell-effect} {{name=@{Spell2Name}}} {{character=@{character_name}}} {{protection=@{Spell2Prot}}} {{roll=[[(@{Spell2Dmg}+@{SpEffTotal}+?{Modifier|0})*?{Multiplier}]]}}">
                                         </button>
                                     </td>
                                 </tr>
@@ -5854,7 +5852,7 @@
                                     </td>
                                     <td rowspan="2" class="sheet-button-cell">
                                         <button type="roll"
-                                            value="&{template:spell-cast} {{name=@{Spell3Name}}} {{character=@{Name}}} {{area=@{Spell3Area}}} {{duration=@{Spell3Dur}}} {{actions=@{Spell3Act}}} {{drain=@{Spell3Drain}}} {{roll=[[d20+@{Spell3HitMod}@{MenMod}+?{Modifier|0}]]}}">
+                                            value="&{template:spell-cast} {{name=@{Spell3Name}}} {{character=@{character_name}}} {{area=@{Spell3Area}}} {{duration=@{Spell3Dur}}} {{actions=@{Spell3Act}}} {{drain=@{Spell3Drain}}} {{roll=[[d20+@{Spell3HitMod}@{MenMod}+?{Modifier|0}]]}}">
                                         </button>
                                     </td>
                                     <td>
@@ -5862,7 +5860,7 @@
                                     </td>
                                     <td rowspan="2" class="sheet-button-cell">
                                         <button type="roll"
-                                            value="&{template:spell-effect} {{name=@{Spell3Name}}} {{character=@{Name}}} {{protection=@{Spell3Prot}}} {{roll=[[(@{Spell3Dmg}+@{SpEffTotal}+?{Modifier|0})*?{Multiplier}]]}}">
+                                            value="&{template:spell-effect} {{name=@{Spell3Name}}} {{character=@{character_name}}} {{protection=@{Spell3Prot}}} {{roll=[[(@{Spell3Dmg}+@{SpEffTotal}+?{Modifier|0})*?{Multiplier}]]}}">
                                         </button>
                                     </td>
                                 </tr>
@@ -5920,7 +5918,7 @@
                                     </td>
                                     <td rowspan="2" class="sheet-button-cell">
                                         <button type="roll"
-                                            value="&{template:spell-cast} {{name=@{Spell4Name}}} {{character=@{Name}}} {{area=@{Spell4Area}}} {{duration=@{Spell4Dur}}} {{actions=@{Spell4Act}}} {{drain=@{Spell4Drain}}} {{roll=[[d20+@{Spell4HitMod}@{MenMod}+?{Modifier|0}]]}}">
+                                            value="&{template:spell-cast} {{name=@{Spell4Name}}} {{character=@{character_name}}} {{area=@{Spell4Area}}} {{duration=@{Spell4Dur}}} {{actions=@{Spell4Act}}} {{drain=@{Spell4Drain}}} {{roll=[[d20+@{Spell4HitMod}@{MenMod}+?{Modifier|0}]]}}">
                                         </button>
                                     </td>
                                     <td>
@@ -5928,7 +5926,7 @@
                                     </td>
                                     <td rowspan="2" class="sheet-button-cell">
                                         <button type="roll"
-                                            value="&{template:spell-effect} {{name=@{Spell4Name}}} {{character=@{Name}}} {{protection=@{Spell4Prot}}} {{roll=[[(@{Spell4Dmg}+@{SpEffTotal}+?{Modifier|0})*?{Multiplier}]]}}">
+                                            value="&{template:spell-effect} {{name=@{Spell4Name}}} {{character=@{character_name}}} {{protection=@{Spell4Prot}}} {{roll=[[(@{Spell4Dmg}+@{SpEffTotal}+?{Modifier|0})*?{Multiplier}]]}}">
                                         </button>
                                     </td>
                                 </tr>
@@ -5986,7 +5984,7 @@
                                     </td>
                                     <td rowspan="2" class="sheet-button-cell">
                                         <button type="roll"
-                                            value="&{template:spell-cast} {{name=@{Spell5Name}}} {{character=@{Name}}} {{area=@{Spell5Area}}} {{duration=@{Spell5Dur}}} {{actions=@{Spell5Act}}} {{drain=@{Spell5Drain}}} {{roll=[[d20+@{Spell5HitMod}@{MenMod}+?{Modifier|0}]]}}">
+                                            value="&{template:spell-cast} {{name=@{Spell5Name}}} {{character=@{character_name}}} {{area=@{Spell5Area}}} {{duration=@{Spell5Dur}}} {{actions=@{Spell5Act}}} {{drain=@{Spell5Drain}}} {{roll=[[d20+@{Spell5HitMod}@{MenMod}+?{Modifier|0}]]}}">
                                         </button>
                                     </td>
                                     <td>
@@ -5994,7 +5992,7 @@
                                     </td>
                                     <td rowspan="2" class="sheet-button-cell">
                                         <button type="roll"
-                                            value="&{template:spell-effect} {{name=@{Spell5Name}}} {{character=@{Name}}} {{protection=@{Spell5Prot}}} {{roll=[[(@{Spell5Dmg}+@{SpEffTotal}+?{Modifier|0})*?{Multiplier}]]}}">
+                                            value="&{template:spell-effect} {{name=@{Spell5Name}}} {{character=@{character_name}}} {{protection=@{Spell5Prot}}} {{roll=[[(@{Spell5Dmg}+@{SpEffTotal}+?{Modifier|0})*?{Multiplier}]]}}">
                                         </button>
                                     </td>
                                 </tr>
@@ -6052,7 +6050,7 @@
                                     </td>
                                     <td rowspan="2" class="sheet-button-cell">
                                         <button type="roll"
-                                            value="&{template:spell-cast} {{name=@{Spell6Name}}} {{character=@{Name}}} {{area=@{Spell6Area}}} {{duration=@{Spell6Dur}}} {{actions=@{Spell6Act}}} {{drain=@{Spell6Drain}}} {{roll=[[d20+@{Spell6HitMod}@{MenMod}+?{Modifier|0}]]}}">
+                                            value="&{template:spell-cast} {{name=@{Spell6Name}}} {{character=@{character_name}}} {{area=@{Spell6Area}}} {{duration=@{Spell6Dur}}} {{actions=@{Spell6Act}}} {{drain=@{Spell6Drain}}} {{roll=[[d20+@{Spell6HitMod}@{MenMod}+?{Modifier|0}]]}}">
                                         </button>
                                     </td>
                                     <td>
@@ -6060,7 +6058,7 @@
                                     </td>
                                     <td rowspan="2" class="sheet-button-cell">
                                         <button type="roll"
-                                            value="&{template:spell-effect} {{name=@{Spell6Name}}} {{character=@{Name}}} {{protection=@{Spell6Prot}}} {{roll=[[(@{Spell6Dmg}+@{SpEffTotal}+?{Modifier|0})*?{Multiplier}]]}}">
+                                            value="&{template:spell-effect} {{name=@{Spell6Name}}} {{character=@{character_name}}} {{protection=@{Spell6Prot}}} {{roll=[[(@{Spell6Dmg}+@{SpEffTotal}+?{Modifier|0})*?{Multiplier}]]}}">
                                         </button>
                                     </td>
                                 </tr>
@@ -6118,7 +6116,7 @@
                                     </td>
                                     <td rowspan="2" class="sheet-button-cell">
                                         <button type="roll"
-                                            value="&{template:spell-cast} {{name=@{Spell7Name}}} {{character=@{Name}}} {{area=@{Spell7Area}}} {{duration=@{Spell7Dur}}} {{actions=@{Spell7Act}}} {{drain=@{Spell7Drain}}} {{roll=[[d20+@{Spell7HitMod}@{MenMod}+?{Modifier|0}]]}}">
+                                            value="&{template:spell-cast} {{name=@{Spell7Name}}} {{character=@{character_name}}} {{area=@{Spell7Area}}} {{duration=@{Spell7Dur}}} {{actions=@{Spell7Act}}} {{drain=@{Spell7Drain}}} {{roll=[[d20+@{Spell7HitMod}@{MenMod}+?{Modifier|0}]]}}">
                                         </button>
                                     </td>
                                     <td>
@@ -6126,7 +6124,7 @@
                                     </td>
                                     <td rowspan="2" class="sheet-button-cell">
                                         <button type="roll"
-                                            value="&{template:spell-effect} {{name=@{Spell7Name}}} {{character=@{Name}}} {{protection=@{Spell7Prot}}} {{roll=[[(@{Spell7Dmg}+@{SpEffTotal}+?{Modifier|0})*?{Multiplier}]]}}">
+                                            value="&{template:spell-effect} {{name=@{Spell7Name}}} {{character=@{character_name}}} {{protection=@{Spell7Prot}}} {{roll=[[(@{Spell7Dmg}+@{SpEffTotal}+?{Modifier|0})*?{Multiplier}]]}}">
                                         </button>
                                     </td>
                                 </tr>
@@ -6184,7 +6182,7 @@
                                     </td>
                                     <td rowspan="2" class="sheet-button-cell">
                                         <button type="roll"
-                                            value="&{template:spell-cast} {{name=@{Spell8Name}}} {{character=@{Name}}} {{area=@{Spell8Area}}} {{duration=@{Spell8Dur}}} {{actions=@{Spell8Act}}} {{drain=@{Spell8Drain}}} {{roll=[[d20+@{Spell8HitMod}@{MenMod}+?{Modifier|0}]]}}">
+                                            value="&{template:spell-cast} {{name=@{Spell8Name}}} {{character=@{character_name}}} {{area=@{Spell8Area}}} {{duration=@{Spell8Dur}}} {{actions=@{Spell8Act}}} {{drain=@{Spell8Drain}}} {{roll=[[d20+@{Spell8HitMod}@{MenMod}+?{Modifier|0}]]}}">
                                         </button>
                                     </td>
                                     <td>
@@ -6192,7 +6190,7 @@
                                     </td>
                                     <td rowspan="2" class="sheet-button-cell">
                                         <button type="roll"
-                                            value="&{template:spell-effect} {{name=@{Spell8Name}}} {{character=@{Name}}} {{protection=@{Spell8Prot}}} {{roll=[[(@{Spell8Dmg}+@{SpEffTotal}+?{Modifier|0})*?{Multiplier}]]}}">
+                                            value="&{template:spell-effect} {{name=@{Spell8Name}}} {{character=@{character_name}}} {{protection=@{Spell8Prot}}} {{roll=[[(@{Spell8Dmg}+@{SpEffTotal}+?{Modifier|0})*?{Multiplier}]]}}">
                                         </button>
                                     </td>
                                 </tr>
@@ -6250,7 +6248,7 @@
                                     </td>
                                     <td rowspan="2" class="sheet-button-cell">
                                         <button type="roll"
-                                            value="&{template:spell-cast} {{name=@{Spell9Name}}} {{character=@{Name}}} {{area=@{Spell9Area}}} {{duration=@{Spell9Dur}}} {{actions=@{Spell9Act}}} {{drain=@{Spell9Drain}}} {{roll=[[d20+@{Spell9HitMod}@{MenMod}+?{Modifier|0}]]}}">
+                                            value="&{template:spell-cast} {{name=@{Spell9Name}}} {{character=@{character_name}}} {{area=@{Spell9Area}}} {{duration=@{Spell9Dur}}} {{actions=@{Spell9Act}}} {{drain=@{Spell9Drain}}} {{roll=[[d20+@{Spell9HitMod}@{MenMod}+?{Modifier|0}]]}}">
                                         </button>
                                     </td>
                                     <td>
@@ -6258,7 +6256,7 @@
                                     </td>
                                     <td rowspan="2" class="sheet-button-cell">
                                         <button type="roll"
-                                            value="&{template:spell-effect} {{name=@{Spell9Name}}} {{character=@{Name}}} {{protection=@{Spell9Prot}}} {{roll=[[(@{Spell9Dmg}+@{SpEffTotal}+?{Modifier|0})*?{Multiplier}]]}}">
+                                            value="&{template:spell-effect} {{name=@{Spell9Name}}} {{character=@{character_name}}} {{protection=@{Spell9Prot}}} {{roll=[[(@{Spell9Dmg}+@{SpEffTotal}+?{Modifier|0})*?{Multiplier}]]}}">
                                         </button>
                                     </td>
                                 </tr>
@@ -6316,7 +6314,7 @@
                                     </td>
                                     <td rowspan="2" class="sheet-button-cell">
                                         <button type="roll"
-                                            value="&{template:spell-cast} {{name=@{Spell10Name}}} {{character=@{Name}}} {{area=@{Spell10Area}}} {{duration=@{Spell10Dur}}} {{actions=@{Spell10Act}}} {{drain=@{Spell10Drain}}} {{roll=[[d20+@{Spell10HitMod}@{MenMod}+?{Modifier|0}]]}}">
+                                            value="&{template:spell-cast} {{name=@{Spell10Name}}} {{character=@{character_name}}} {{area=@{Spell10Area}}} {{duration=@{Spell10Dur}}} {{actions=@{Spell10Act}}} {{drain=@{Spell10Drain}}} {{roll=[[d20+@{Spell10HitMod}@{MenMod}+?{Modifier|0}]]}}">
                                         </button>
                                     </td>
                                     <td>
@@ -6324,7 +6322,7 @@
                                     </td>
                                     <td rowspan="2" class="sheet-button-cell">
                                         <button type="roll"
-                                            value="&{template:spell-effect} {{name=@{Spell10Name}}} {{character=@{Name}}} {{protection=@{Spell10Prot}}} {{roll=[[(@{Spell10Dmg}+@{SpEffTotal}+?{Modifier|0})*?{Multiplier}]]}}">
+                                            value="&{template:spell-effect} {{name=@{Spell10Name}}} {{character=@{character_name}}} {{protection=@{Spell10Prot}}} {{roll=[[(@{Spell10Dmg}+@{SpEffTotal}+?{Modifier|0})*?{Multiplier}]]}}">
                                         </button>
                                     </td>
                                 </tr>
@@ -6392,7 +6390,7 @@
                                     </td>
                                     <td rowspan="2" class="sheet-button-cell">
                                         <button type="roll"
-                                            value="&{template:spell-cast} {{name=@{NCSpell1Name}}} {{character=@{Name}}} {{area=@{NCSpell1Area}}} {{duration=@{NCSpell1Dur}}} {{actions=@{NCSpell1Act}}} {{drain=@{NCSpell1Drain}}} {{roll=[[d20+@{NCSpell1HitMod}@{MenMod}+?{Modifier|0}]]}}">
+                                            value="&{template:spell-cast} {{name=@{NCSpell1Name}}} {{character=@{character_name}}} {{area=@{NCSpell1Area}}} {{duration=@{NCSpell1Dur}}} {{actions=@{NCSpell1Act}}} {{drain=@{NCSpell1Drain}}} {{roll=[[d20+@{NCSpell1HitMod}@{MenMod}+?{Modifier|0}]]}}">
                                         </button>
                                     </td>
                                     <td>
@@ -6400,7 +6398,7 @@
                                     </td>
                                     <td rowspan="2" class="sheet-button-cell">
                                         <button type="roll"
-                                            value="&{template:spell-effect} {{name=@{NCSpell1Name}}} {{character=@{Name}}} {{protection=@{NCSpell1Prot}}} {{roll=[[(@{NCSpell1Dmg}+@{SpEffTotal}+?{Modifier|0})*?{Multiplier}]]}}">
+                                            value="&{template:spell-effect} {{name=@{NCSpell1Name}}} {{character=@{character_name}}} {{protection=@{NCSpell1Prot}}} {{roll=[[(@{NCSpell1Dmg}+@{SpEffTotal}+?{Modifier|0})*?{Multiplier}]]}}">
                                         </button>
                                     </td>
                                 </tr>
@@ -6458,7 +6456,7 @@
                                     </td>
                                     <td rowspan="2" class="sheet-button-cell">
                                         <button type="roll"
-                                            value="&{template:spell-cast} {{name=@{NCSpell2Name}}} {{character=@{Name}}} {{area=@{NCSpell2Area}}} {{duration=@{NCSpell2Dur}}} {{actions=@{NCSpell2Act}}} {{drain=@{NCSpell2Drain}}} {{roll=[[d20+@{NCSpell2HitMod}@{MenMod}+?{Modifier|0}]]}}">
+                                            value="&{template:spell-cast} {{name=@{NCSpell2Name}}} {{character=@{character_name}}} {{area=@{NCSpell2Area}}} {{duration=@{NCSpell2Dur}}} {{actions=@{NCSpell2Act}}} {{drain=@{NCSpell2Drain}}} {{roll=[[d20+@{NCSpell2HitMod}@{MenMod}+?{Modifier|0}]]}}">
                                         </button>
                                     </td>
                                     <td>
@@ -6466,7 +6464,7 @@
                                     </td>
                                     <td rowspan="2" class="sheet-button-cell">
                                         <button type="roll"
-                                            value="&{template:spell-effect} {{name=@{NCSpell2Name}}} {{character=@{Name}}} {{protection=@{NCSpell2Prot}}} {{roll=[[(@{NCSpell2Dmg}+@{SpEffTotal}+?{Modifier|0})*?{Multiplier}]]}}">
+                                            value="&{template:spell-effect} {{name=@{NCSpell2Name}}} {{character=@{character_name}}} {{protection=@{NCSpell2Prot}}} {{roll=[[(@{NCSpell2Dmg}+@{SpEffTotal}+?{Modifier|0})*?{Multiplier}]]}}">
                                         </button>
                                     </td>
                                 </tr>
@@ -6524,7 +6522,7 @@
                                     </td>
                                     <td rowspan="2" class="sheet-button-cell">
                                         <button type="roll"
-                                            value="&{template:spell-cast} {{name=@{NCSpell3Name}}} {{character=@{Name}}} {{area=@{NCSpell3Area}}} {{duration=@{NCSpell3Dur}}} {{actions=@{NCSpell3Act}}} {{drain=@{NCSpell3Drain}}} {{roll=[[d20+@{NCSpell3HitMod}@{MenMod}+?{Modifier|0}]]}}">
+                                            value="&{template:spell-cast} {{name=@{NCSpell3Name}}} {{character=@{character_name}}} {{area=@{NCSpell3Area}}} {{duration=@{NCSpell3Dur}}} {{actions=@{NCSpell3Act}}} {{drain=@{NCSpell3Drain}}} {{roll=[[d20+@{NCSpell3HitMod}@{MenMod}+?{Modifier|0}]]}}">
                                         </button>
                                     </td>
                                     <td>
@@ -6532,7 +6530,7 @@
                                     </td>
                                     <td rowspan="2" class="sheet-button-cell">
                                         <button type="roll"
-                                            value="&{template:spell-effect} {{name=@{NCSpell3Name}}} {{character=@{Name}}} {{protection=@{NCSpell3Prot}}} {{roll=[[(@{NCSpell3Dmg}+@{SpEffTotal}+?{Modifier|0})*?{Multiplier}]]}}">
+                                            value="&{template:spell-effect} {{name=@{NCSpell3Name}}} {{character=@{character_name}}} {{protection=@{NCSpell3Prot}}} {{roll=[[(@{NCSpell3Dmg}+@{SpEffTotal}+?{Modifier|0})*?{Multiplier}]]}}">
                                         </button>
                                     </td>
                                 </tr>
@@ -6590,7 +6588,7 @@
                                     </td>
                                     <td rowspan="2" class="sheet-button-cell">
                                         <button type="roll"
-                                            value="&{template:spell-cast} {{name=@{NCSpell4Name}}} {{character=@{Name}}} {{area=@{NCSpell4Area}}} {{duration=@{NCSpell4Dur}}} {{actions=@{NCSpell4Act}}} {{drain=@{NCSpell4Drain}}} {{roll=[[d20+@{NCSpell4HitMod}@{MenMod}+?{Modifier|0}]]}}">
+                                            value="&{template:spell-cast} {{name=@{NCSpell4Name}}} {{character=@{character_name}}} {{area=@{NCSpell4Area}}} {{duration=@{NCSpell4Dur}}} {{actions=@{NCSpell4Act}}} {{drain=@{NCSpell4Drain}}} {{roll=[[d20+@{NCSpell4HitMod}@{MenMod}+?{Modifier|0}]]}}">
                                         </button>
                                     </td>
                                     <td>
@@ -6598,7 +6596,7 @@
                                     </td>
                                     <td rowspan="2" class="sheet-button-cell">
                                         <button type="roll"
-                                            value="&{template:spell-effect} {{name=@{NCSpell4Name}}} {{character=@{Name}}} {{protection=@{NCSpell4Prot}}} {{roll=[[(@{NCSpell4Dmg}+@{SpEffTotal}+?{Modifier|0})*?{Multiplier}]]}}">
+                                            value="&{template:spell-effect} {{name=@{NCSpell4Name}}} {{character=@{character_name}}} {{protection=@{NCSpell4Prot}}} {{roll=[[(@{NCSpell4Dmg}+@{SpEffTotal}+?{Modifier|0})*?{Multiplier}]]}}">
                                         </button>
                                     </td>
                                 </tr>
@@ -6656,7 +6654,7 @@
                                     </td>
                                     <td rowspan="2" class="sheet-button-cell">
                                         <button type="roll"
-                                            value="&{template:spell-cast} {{name=@{NCSpell5Name}}} {{character=@{Name}}} {{area=@{NCSpell5Area}}} {{duration=@{NCSpell5Dur}}} {{actions=@{NCSpell5Act}}} {{drain=@{NCSpell5Drain}}} {{roll=[[d20+@{NCSpell5HitMod}@{MenMod}+?{Modifier|0}]]}}">
+                                            value="&{template:spell-cast} {{name=@{NCSpell5Name}}} {{character=@{character_name}}} {{area=@{NCSpell5Area}}} {{duration=@{NCSpell5Dur}}} {{actions=@{NCSpell5Act}}} {{drain=@{NCSpell5Drain}}} {{roll=[[d20+@{NCSpell5HitMod}@{MenMod}+?{Modifier|0}]]}}">
                                         </button>
                                     </td>
                                     <td>
@@ -6664,7 +6662,7 @@
                                     </td>
                                     <td rowspan="2" class="sheet-button-cell">
                                         <button type="roll"
-                                            value="&{template:spell-effect} {{name=@{NCSpell5Name}}} {{character=@{Name}}} {{protection=@{NCSpell5Prot}}} {{roll=[[(@{NCSpell5Dmg}+@{SpEffTotal}+?{Modifier|0})*?{Multiplier}]]}}">
+                                            value="&{template:spell-effect} {{name=@{NCSpell5Name}}} {{character=@{character_name}}} {{protection=@{NCSpell5Prot}}} {{roll=[[(@{NCSpell5Dmg}+@{SpEffTotal}+?{Modifier|0})*?{Multiplier}]]}}">
                                         </button>
                                     </td>
                                 </tr>
@@ -6722,7 +6720,7 @@
                                     </td>
                                     <td rowspan="2" class="sheet-button-cell">
                                         <button type="roll"
-                                            value="&{template:spell-cast} {{name=@{NCSpell6Name}}} {{character=@{Name}}} {{area=@{NCSpell6Area}}} {{duration=@{NCSpell6Dur}}} {{actions=@{NCSpell6Act}}} {{drain=@{NCSpell6Drain}}} {{roll=[[d20+@{NCSpell6HitMod}@{MenMod}+?{Modifier|0}]]}}">
+                                            value="&{template:spell-cast} {{name=@{NCSpell6Name}}} {{character=@{character_name}}} {{area=@{NCSpell6Area}}} {{duration=@{NCSpell6Dur}}} {{actions=@{NCSpell6Act}}} {{drain=@{NCSpell6Drain}}} {{roll=[[d20+@{NCSpell6HitMod}@{MenMod}+?{Modifier|0}]]}}">
                                         </button>
                                     </td>
                                     <td>
@@ -6730,7 +6728,7 @@
                                     </td>
                                     <td rowspan="2" class="sheet-button-cell">
                                         <button type="roll"
-                                            value="&{template:spell-effect} {{name=@{NCSpell6Name}}} {{character=@{Name}}} {{protection=@{NCSpell6Prot}}} {{roll=[[(@{NCSpell6Dmg}+@{SpEffTotal}+?{Modifier|0})*?{Multiplier}]]}}">
+                                            value="&{template:spell-effect} {{name=@{NCSpell6Name}}} {{character=@{character_name}}} {{protection=@{NCSpell6Prot}}} {{roll=[[(@{NCSpell6Dmg}+@{SpEffTotal}+?{Modifier|0})*?{Multiplier}]]}}">
                                         </button>
                                     </td>
                                 </tr>
@@ -6788,7 +6786,7 @@
                                     </td>
                                     <td rowspan="2" class="sheet-button-cell">
                                         <button type="roll"
-                                            value="&{template:spell-cast} {{name=@{NCSpell7Name}}} {{character=@{Name}}} {{area=@{NCSpell7Area}}} {{duration=@{NCSpell7Dur}}} {{actions=@{NCSpell7Act}}} {{drain=@{NCSpell7Drain}}} {{roll=[[d20+@{NCSpell7HitMod}@{MenMod}+?{Modifier|0}]]}}">
+                                            value="&{template:spell-cast} {{name=@{NCSpell7Name}}} {{character=@{character_name}}} {{area=@{NCSpell7Area}}} {{duration=@{NCSpell7Dur}}} {{actions=@{NCSpell7Act}}} {{drain=@{NCSpell7Drain}}} {{roll=[[d20+@{NCSpell7HitMod}@{MenMod}+?{Modifier|0}]]}}">
                                         </button>
                                     </td>
                                     <td>
@@ -6796,7 +6794,7 @@
                                     </td>
                                     <td rowspan="2" class="sheet-button-cell">
                                         <button type="roll"
-                                            value="&{template:spell-effect} {{name=@{NCSpell7Name}}} {{character=@{Name}}} {{protection=@{NCSpell7Prot}}} {{roll=[[(@{NCSpell7Dmg}+@{SpEffTotal}+?{Modifier|0})*?{Multiplier}]]}}">
+                                            value="&{template:spell-effect} {{name=@{NCSpell7Name}}} {{character=@{character_name}}} {{protection=@{NCSpell7Prot}}} {{roll=[[(@{NCSpell7Dmg}+@{SpEffTotal}+?{Modifier|0})*?{Multiplier}]]}}">
                                         </button>
                                     </td>
                                 </tr>
@@ -6854,7 +6852,7 @@
                                     </td>
                                     <td rowspan="2" class="sheet-button-cell">
                                         <button type="roll"
-                                            value="&{template:spell-cast} {{name=@{NCSpell8Name}}} {{character=@{Name}}} {{area=@{NCSpell8Area}}} {{duration=@{NCSpell8Dur}}} {{actions=@{NCSpell8Act}}} {{drain=@{NCSpell8Drain}}} {{roll=[[d20+@{NCSpell8HitMod}@{MenMod}+?{Modifier|0}]]}}">
+                                            value="&{template:spell-cast} {{name=@{NCSpell8Name}}} {{character=@{character_name}}} {{area=@{NCSpell8Area}}} {{duration=@{NCSpell8Dur}}} {{actions=@{NCSpell8Act}}} {{drain=@{NCSpell8Drain}}} {{roll=[[d20+@{NCSpell8HitMod}@{MenMod}+?{Modifier|0}]]}}">
                                         </button>
                                     </td>
                                     <td>
@@ -6862,7 +6860,7 @@
                                     </td>
                                     <td rowspan="2" class="sheet-button-cell">
                                         <button type="roll"
-                                            value="&{template:spell-effect} {{name=@{NCSpell8Name}}} {{character=@{Name}}} {{protection=@{NCSpell8Prot}}} {{roll=[[(@{NCSpell8Dmg}+@{SpEffTotal}+?{Modifier|0})*?{Multiplier}]]}}">
+                                            value="&{template:spell-effect} {{name=@{NCSpell8Name}}} {{character=@{character_name}}} {{protection=@{NCSpell8Prot}}} {{roll=[[(@{NCSpell8Dmg}+@{SpEffTotal}+?{Modifier|0})*?{Multiplier}]]}}">
                                         </button>
                                     </td>
                                 </tr>
@@ -6920,7 +6918,7 @@
                                     </td>
                                     <td rowspan="2" class="sheet-button-cell">
                                         <button type="roll"
-                                            value="&{template:spell-cast} {{name=@{NCSpell9Name}}} {{character=@{Name}}} {{area=@{NCSpell9Area}}} {{duration=@{NCSpell9Dur}}} {{actions=@{NCSpell9Act}}} {{drain=@{NCSpell9Drain}}} {{roll=[[d20+@{NCSpell9HitMod}@{MenMod}+?{Modifier|0}]]}}">
+                                            value="&{template:spell-cast} {{name=@{NCSpell9Name}}} {{character=@{character_name}}} {{area=@{NCSpell9Area}}} {{duration=@{NCSpell9Dur}}} {{actions=@{NCSpell9Act}}} {{drain=@{NCSpell9Drain}}} {{roll=[[d20+@{NCSpell9HitMod}@{MenMod}+?{Modifier|0}]]}}">
                                         </button>
                                     </td>
                                     <td>
@@ -6928,7 +6926,7 @@
                                     </td>
                                     <td rowspan="2" class="sheet-button-cell">
                                         <button type="roll"
-                                            value="&{template:spell-effect} {{name=@{NCSpell9Name}}} {{character=@{Name}}} {{protection=@{NCSpell9Prot}}} {{roll=[[(@{NCSpell9Dmg}+@{SpEffTotal}+?{Modifier|0})*?{Multiplier}]]}}">
+                                            value="&{template:spell-effect} {{name=@{NCSpell9Name}}} {{character=@{character_name}}} {{protection=@{NCSpell9Prot}}} {{roll=[[(@{NCSpell9Dmg}+@{SpEffTotal}+?{Modifier|0})*?{Multiplier}]]}}">
                                         </button>
                                     </td>
                                 </tr>
@@ -6986,7 +6984,7 @@
                                     </td>
                                     <td rowspan="2" class="sheet-button-cell">
                                         <button type="roll"
-                                            value="&{template:spell-cast} {{name=@{NCSpell10Name}}} {{character=@{Name}}} {{area=@{NCSpell10Area}}} {{duration=@{NCSpell10Dur}}} {{actions=@{NCSpell10Act}}} {{drain=@{NCSpell10Drain}}} {{roll=[[d20+@{NCSpell10HitMod}@{MenMod}+?{Modifier|0}]]}}">
+                                            value="&{template:spell-cast} {{name=@{NCSpell10Name}}} {{character=@{character_name}}} {{area=@{NCSpell10Area}}} {{duration=@{NCSpell10Dur}}} {{actions=@{NCSpell10Act}}} {{drain=@{NCSpell10Drain}}} {{roll=[[d20+@{NCSpell10HitMod}@{MenMod}+?{Modifier|0}]]}}">
                                         </button>
                                     </td>
                                     <td>
@@ -6994,7 +6992,7 @@
                                     </td>
                                     <td rowspan="2" class="sheet-button-cell">
                                         <button type="roll"
-                                            value="&{template:spell-effect} {{name=@{NCSpell10Name}}} {{character=@{Name}}} {{protection=@{NCSpell10Prot}}} {{roll=[[(@{NCSpell10Dmg}+@{SpEffTotal}+?{Modifier|0})*?{Multiplier}]]}}">
+                                            value="&{template:spell-effect} {{name=@{NCSpell10Name}}} {{character=@{character_name}}} {{protection=@{NCSpell10Prot}}} {{roll=[[(@{NCSpell10Dmg}+@{SpEffTotal}+?{Modifier|0})*?{Multiplier}]]}}">
                                         </button>
                                     </td>
                                 </tr>
@@ -7063,7 +7061,7 @@
                                         </td>
                                         <td rowspan="2" class="sheet-button-cell">
                                             <button type="roll"
-                                                value="&{template:spell-cast} {{name=@{SpellName}}} {{character=@{Name}}} {{area=@{SpellArea}}} {{duration=@{SpellDur}}} {{actions=@{SpellAct}}} {{drain=@{SpellDrain}}} {{roll=[[d20+@{SpellHitMod}@{MenMod}+?{Modifier|0}]]}}">
+                                                value="&{template:spell-cast} {{name=@{SpellName}}} {{character=@{character_name}}} {{area=@{SpellArea}}} {{duration=@{SpellDur}}} {{actions=@{SpellAct}}} {{drain=@{SpellDrain}}} {{roll=[[d20+@{SpellHitMod}@{MenMod}+?{Modifier|0}]]}}">
                                             </button>
                                         </td>
                                         <td>
@@ -7071,7 +7069,7 @@
                                         </td>
                                         <td rowspan="2" class="sheet-button-cell">
                                             <button type="roll"
-                                                value="&{template:spell-effect} {{name=@{SpellName}}} {{character=@{Name}}} {{protection=@{SpellProt}}} {{roll=[[(@{SpellDmg}+@{SpEffTotal}+?{Modifier|0})*?{Multiplier}]]}}">
+                                                value="&{template:spell-effect} {{name=@{SpellName}}} {{character=@{character_name}}} {{protection=@{SpellProt}}} {{roll=[[(@{SpellDmg}+@{SpEffTotal}+?{Modifier|0})*?{Multiplier}]]}}">
                                             </button>
                                         </td>
                                     </tr>
@@ -7519,1114 +7517,6 @@
                     </div>
                 </div>
             </div>
-
-            <!-- ----------------------------------------------------------------------------------------------------------------------------------------------------
-            --------------------------------------------------------------------  Old Sheet Tab  --------------------------------------------------------------------
-            ------------------------------------------------------------------------------------------------------------------------------------------------------ -->
-            <div class="sheet-section-old-sheet">
-                <h1 class="sheet-vertical-margin">
-                    <span class="sheet-h1-box">Old Sheet - Please Do Not Use</span>
-                </h1>
-            
-                <h2>Users of the old sheet - please copy your character details out of this tab and into the main sheet. This tab will be removed soon.</h2>
-            
-                <hr>
-            
-                <h3 style="text-align: center;"> Player Information </h3>
-                <hr />
-                <table style="width:100%">
-                    <tr>
-                        <td>Character Name:</td>
-                        <td><input type="text" name="attr_character_name" /></td>
-                    </tr>
-                    <tr>
-                        <td>Title:</td>
-                        <td><input type="text" name="attr_character_title" /></td>
-                    </tr>
-                    <tr>
-                        <td>Player's Name:</td>
-                        <td><input type="text" name="attr_player_name" /></td>
-                    </tr>
-                    <tr>
-                        <td>Race:</td>
-                        <td><input type="text" name="attr_race" /></td>
-                    </tr>
-                    <tr>
-                        <td>Class:</td>
-                        <td><input type="text" name="attr_class" /></td>
-                    </tr>
-                    <tr>
-                        <td>Level:</td>
-                        <td><input type="text" name="attr_level" /></td>
-                    </tr>
-                    <tr>
-                        <td>Cool Points:</td>
-                        <td><input type="text" name="attr_cool_points" /></td>
-                    </tr>
-                    <tr>
-                        <td>Saved Cool Points:</td>
-                        <td><input type="text" name="attr_saved_cool_points" /></td>
-                    </tr>
-                    <tr>
-                        <td>Frenzy Pool:</td>
-                        <td><input type="text" name="attr_frenzy_pool" /></td>
-                    </tr>
-                </table>
-            
-                <table style="width:100%">
-                    <tr>
-                        <td>Current Hit Points:</td>
-                        <td><input type="text" name="attr_hit_points" /></td>
-                    </tr>
-                    <tr>
-                        <td>Max Hit Points:</td>
-                        <td><input type="text" name="attr_hit_points_max" /></td>
-                    </tr>
-                    <tr>
-                        <td>Total Armor Value:</td>
-                        <td><input type="text" name="attr_total_armor_value" /></td>
-                    </tr>
-                </table>
-            
-                <h3 style="text-align: center;"> Actions and Attacks </h3>
-                <hr />
-                <table style="width:100%">
-                    <tr>
-                        <td>Unarmed:</td>
-                        <td><input type="text" name="attr_unarmed_attack" /></td>
-                    </tr>
-                    <tr>
-                        <td>Melee:</td>
-                        <td><input type="text" name="attr_melee_attack" /></td>
-                    </tr>
-                    <tr>
-                        <td>Projectile:</td>
-                        <td><input type="text" name="attr_projectile_attack" /></td>
-                    </tr>
-                    <tr>
-                        <td>Magic:</td>
-                        <td><input type="text" name="attr_magic_attack" /></td>
-                    </tr>
-                </table>
-                <hr />
-                <h3 style="text-align: center;"> Defense</h3>
-                <hr />
-                <table style="width:100%">
-                    <tr>
-                        <td>+Physical:</td>
-                        <td><input type="text" name="attr_physical_defense" /></td>
-                        <td><button type='roll' name='roll_physical_defense'
-                                value=' &{template:default} {{name=Defense Roll}} {{Defense = Physical}}   {{Roll = [[1d20+@{physical_defense}]]}} '></td>
-                    </tr>
-                    <tr>
-                        <td>+Magical:</td>
-                        <td><input type="text" name="attr_magic_defense" /></td>
-                        <td><button type='roll' name='roll_magic_defense'
-                                value=' &{template:default} {{name=Defense Roll}} {{Defense = Magic}} {{Roll = [[1d20+@{magic_defense}]]}} '>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>+Mental:</td>
-                        <td><input type="text" name="attr_mental_defense" /></td>
-                        <td><button type='roll' name='roll_mental_defense'
-                                value=' &{template:default} {{name=Defense Roll}} {{Defense = Mental}} {{Roll = [[1d20+@{mental_defense}]]}} '>
-                        </td>
-                    </tr>
-                </table>
-            
-                <hr />
-            
-                <h3 style="margin-bottom: 10px;">Attributes</h3>
-                <hr />
-            
-                <table style="width:100%">
-                    <tr>
-                        <th>Strength</th>
-                        <th></th>
-                        <th>Rank</th>
-                        <th>Dice</th>
-                    </tr>
-                    <td><input type="text" class="sheet-short" name="attr_strength" /></td>
-                    <td><input type="text" class="sheet-short" name="attr_strength_mod" value="( )" /></td>
-                    <td><input type="text" class="sheet-short" name="attr_strength_rank" /></td>
-                    <td><input type="text" class="sheet-short" name="attr_strength_dice" /><button type='roll' name='roll_strength'
-                            value=' &{template:default} {{name=Strength Roll}} {{Strength=@{strength}}} {{Roll = [[@{strength_dice}]]}}'></td>
-                </table>
-                <table style="width:100%">
-                    <tr>
-                        <td>DMG Modifier:</td>
-                        <td><input type="text" name="attr_strength_dam_modifier" /></td>
-                    </tr>
-                    <tr>
-                        <td>Weight Allow:</td>
-                        <td><input type="text" name="attr_strength_weight_allow" /></td>
-                    </tr>
-                </table>
-            
-                <hr />
-            
-                <table style="width:100%">
-                    <tr>
-                        <th>Dexterity</th>
-                        <th></th>
-                        <th>Rank</th>
-                        <th>Dice</th>
-                    </tr>
-                    <tr>
-                        <td><input type="text" class="sheet-short" name="attr_dexterity" /></td>
-                        <td><input type="text" class="sheet-short" name="attr_dexterity_mod" value="( )" /></td>
-                        <td><input type="text" class="sheet-short" name="attr_dexterity_rank" /></td>
-                        <td><input type="text" class="sheet-short" name="attr_dexterity_dice" /><button type='roll' name='roll_dexterity'
-                                value=' &{template:default} {{name=Dexterity Roll}} {{Dexterity=@{dexterity}}} {{Roll = [[@{dexterity_dice}]]}}'></td>
-                    </tr>
-                </table>
-                <table style="width:100%">
-                    <tr>
-                        <td>Defense Modifier:</td>
-                        <td><input type="text" name="attr_dexterity_defense_mod" /></td>
-                    </tr>
-                    <tr>
-                        <td>Initiative Modifier:</td>
-                        <td><input type="text" name="attr_dexterity_initiative_mod" /></td>
-                    </tr>
-                    <tr>
-                        <td>Movement:</td>
-                        <td></label><input type="text" name="attr_dexterity_movement_mod" /></td>
-                    </tr>
-                </table>
-            
-                <hr />
-            
-                <table style="width:100%">
-                    <tr>
-                        <th>Body</th>
-                        <th></th>
-                        <th>Rank</th>
-                        <th>Dice</th>
-                    </tr>
-                    <tr>
-                        <td><input type="text" class="sheet-short" name="attr_body" /></td>
-                        <td><input type="text" class="sheet-short" name="attr_body_mod" value="( )" /></td>
-                        <td><input type="text" class="sheet-short" name="attr_body_rank" /></td>
-                        <td><input type="text" class="sheet-short" name="attr_body_dice" /><button type='roll' name='roll_body'
-                                value=' &{template:default} {{name=Body Roll}} {{Body=@{body}}} {{Roll = [[@{body_dice}]]}}'></td>
-                    </tr>
-                </table>
-                <table style="width:100%">
-                    <tr>
-                        <td>Body Save:</td>
-                        <td><input type="text" name="attr_body_body_save" /></td>
-                    </tr>
-                    <tr>
-                        <td>Toughness:</td>
-                        <td><input type="text" name="attr_body_toughness" /></td>
-                    </tr>
-                    <tr>
-                        <td>Chi:</td>
-                        <td><input type="text" name="attr_body_chi" /></td>
-                    </tr>
-                </table>
-            
-                <hr />
-            
-                <table style="width:100%">
-                    <tr>
-                        <th>Perception</th>
-                        <th></th>
-                        <th>Rank</th>
-                        <th>Dice</th>
-                    </tr>
-                    <tr>
-                        <td><input type="text" class="sheet-short" name="attr_perception" /></td>
-                        <td><input type="text" class="sheet-short" name="attr_perception_mod" value="( )" /></td>
-                        <td><input type="text" class="sheet-short" name="attr_perception_rank" /></td>
-                        <td><input type="text" class="sheet-short" name="attr_perception_dice" /><button type='roll' name='roll_perception'
-                                value=' &{template:default} {{name=Perception Roll}} {{Perception=@{perception}}} {{Roll = [[@{perception_dice}]]}}'></td>
-                    </tr>
-                </table>
-                <table style="width:100%">
-                    <tr>
-                        <td>Shot Dmg Mod:</td>
-                        <td><input type="text" name="attr_perception_shot_damage_mod" /></td>
-                    </tr>
-                </table>
-            
-                <hr />
-            
-                <table style="width:100%">
-                    <tr>
-                        <th>Intelligence</th>
-                        <th></th>
-                        <th>Rank</th>
-                        <th>Dice</th>
-                    </tr>
-                    <tr>
-                        <td><input type="text" class="sheet-short" name="attr_intelligence" /></td>
-                        <td><input type="text" class="sheet-short" name="attr_intelligence_mod" value="( )" /></td>
-                        <td><input type="text" class="sheet-short" name="attr_intelligence_rank" /></td>
-                        <td><input type="text" class="sheet-short" name="attr_intelligence_dice" /><button type='roll' name='roll_intelligence'
-                                value=' &{template:default} {{name=Intelligence Roll}} {{Intelligence=@{intelligence}}} {{Roll = [[@{intelligence_dice}]]}}'></td>
-                    </tr>
-                </table>
-                <table style="width:100%">
-                    <tr>
-                        <td>Spell Time:</td>
-                        <td><input type="text" name="attr_intelligence_spell_time" /></td>
-                    </tr>
-                </table>
-            
-                <hr />
-            
-                <table style="width:100%">
-                    <tr>
-                        <th>Willpower</th>
-                        <th></th>
-                        <th>Rank</th>
-                        <th>Dice</th>
-                    </tr>
-                    <tr>
-                        <td><input type="text" class="sheet-short" name="attr_willpower" /></td>
-                        <td><input type="text" class="sheet-short" name="attr_willpower_mod" value="( )" /></td>
-                        <td><input type="text" class="sheet-short" name="attr_willpower_rank" /></td>
-                        <td><input type="text" class="sheet-short" name="attr_willpower_dice" /><button type='roll' name='roll_willpower'
-                                value=' &{template:default} {{name=Willpower Roll}} {{Willpower=@{willpower}}} {{Roll = [[@{willpower_dice}]]}}'></td>
-                    </tr>
-                </table>
-                <table style="width:100%">
-                    <tr>
-                        <td>Mana:</td>
-                        <td><input type="text" name="attr_intelligence_mana" /></td>
-                    </tr>
-                    <tr>
-                        <td>Mental Defense:</td>
-                        <td><input type="text" name="attr_intelligence_mental_defense" /></td>
-                    </tr>
-                    <tr>
-                        <td>Fortitude:</td>
-                        <td><input type="text" name="attr_intelligence_fortitude" /></td>
-                    </tr>
-                </table>
-            
-                <hr />
-            
-                <table style="width:100%">
-                    <tr>
-                        <th>Charisma</th>
-                        <th></th>
-                        <th>Rank</th>
-                        <th>Dice</th>
-                    </tr>
-                    <tr>
-                        <td><input type="text" class="sheet-short" name="attr_charisma" /></td>
-                        <td><input type="text" class="sheet-short" name="attr_charisma_mod" value="( )" /></td>
-                        <td><input type="text" class="sheet-short" name="attr_charisma_rank" /></td>
-                        <td><input type="text" class="sheet-short" name="attr_charisma_dice" /><button type='roll' name='roll_charisma'
-                                value=' &{template:default} {{name=Charisma Roll}} {{Charisma=@{charisma}}} {{Roll = [[@{charisma_dice}]]}}'></td>
-                    </tr>
-                </table>
-                <table style="width:100%">
-                    <tr>
-                        <td>Reputation:</td>
-                        <td><input type="text" name="attr_charisma_reputation" /></td>
-                    </tr>
-                    <tr>
-                        <td>Social Pool:</td>
-                        <td><input type="text" name="attr_charisma_social_pool" /></td>
-                    </tr>
-                </table>
-            
-                <hr />
-            
-                <h3 style="margin-bottom: 10px;">Character Description</h3>
-                <table>
-                    <td>Physical Beauty</td>
-                    <td><input type="text" class="sheet-short" name="attr_description_physical_beauty" /></td>
-                    <td>Gender</td>
-                    <td><input type="text" class="sheet-short" name="attr_description_gender" /></td>
-                    <td>Height</td>
-                    <td><input type="text" class="sheet-short" name="attr_description_height" /></td>
-                    <tr>
-                        <td>Weight</td>
-                        <td><input type="text" class="sheet-short" name="attr_description_weight" /></td>
-                        <td>Skin Color</td>
-                        <td><input type="text" class="sheet-short" name="attr_description_skin_color" /></td>
-                        <td>Hair</td>
-                        <td><input type="text" class="sheet-short" name="attr_description_hair" /></td>
-                    </tr>
-                    <tr>
-                        <td>D.O.B.</td>
-                        <td><input type="text" class="sheet-short" name="attr_description_dob" /></td>
-                        <td>Age</td>
-                        <td><input type="text" class="sheet-short" name="attr_description_age" /></td>
-                        <td>Origin</td>
-                        <td><input type="text" class="sheet-short" name="attr_description_origin" /></td>
-                    </tr>
-                </table>
-            
-            
-                <h3 style="margin-bottom: 10px;">Skills</h3>
-            
-                <hr />
-            
-                <h3 style="margin-bottom: 10px;">Combat Skills</h3>
-                <table style="width:100%">
-                    <tr>
-                        <th>Unarmed Combat</th>
-                        <th></th>
-                        <th>+ to hit</th>
-                        <th>DMG</th>
-                    </tr>
-                    <td><input type="text" name="attr_unarmed_combat" /></td>
-                    <td></td>
-                    <td><input type="text" class="sheet-short" name="attr_unarmed_combat_to_hit" /></td>
-                    <td><input type="text" class="sheet-short" name="attr_unarmed_combat_dmg" />
-                </table>
-                <table style="width:100%">
-                    <tr>
-                        <td>Attack:</td>
-                        <td><button type='roll' name='roll_unarmed_combat' value=' &{template:default} {{name=Unarmed Combat Roll}}  {{Roll = [[d20+@{unarmed_combat_to_hit}]]}} '>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>Damage:</td>
-                        <td><button type='roll' name='roll_unarmed_combat_damage' value=' &{template:default} {{name=Unarmed Combat Damage}}  {{Damage = [[@{unarmed_combat_dmg}]]}}'>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>Damage with Multipliers:</td>
-                        <td><button type='roll' name='roll_unarmed_combat_damage'
-                                value=' &{template:default} {{name=Multiplied Unarmed Combat Damage}} {{Weapon = Unarmed}} {{Multiplier = ?{Multiplier?}}}{{Damage Roll = [[(@{unarmed_combat_dmg})*?{Multiplier?}]]}}'>
-                        </td>
-                    </tr>
-                </table>
-            
-                <hr />
-            
-                <h3 style="margin-bottom: 10px;">Weapon Proficiencies</h3>
-                <fieldset class="repeating_weapon-proficiency">
-                    <table style="width:100%">
-                        <tr>
-                            <th>Name</th>
-                        </tr>
-                        <tr>
-                            <td><input type="text" name="attr_skill_weapon_proficiency" /></td>
-                        </tr>
-                    </table>
-                </fieldset>
-            
-                <hr />
-            
-                <h3 style="margin-bottom: 10px;">Specializations </h3>
-                <fieldset class="repeating_weapon-specialization">
-                    <table style="width:100%">
-                        <tr>
-                            <th>Spec</th>
-                            <th>+ to hit</th>
-                        </tr>
-                        <tr>
-                            <td><input type="text" name="attr_skill_weapon_specialization" /></td>
-                            <td><input type="text" class="sheet-short" name="attr_skill_weapon_specialization_to_hit" /></td>
-                        </tr>
-                </fieldset>
-            
-                <hr />
-            
-                <h3 style="margin-bottom: 10px;">Character Skills</h3>
-            
-                <fieldset class="repeating_character-skills">
-            
-                    <table style="width:100%">
-                        <tr>
-                            <th>Skill</th>
-                            <th>Rating</th>
-                            <th>Level</th>
-                            <th>Dice</th>
-                        </tr>
-                        <td><input type="text" name="attr_character_skill" /></td>
-                        <td><input type="text" class="sheet-short" name="attr_character_skill_rating" /></td>
-                        <td><input type="text" class="sheet-short" name="attr_character_skill_level" /></td>
-                        <td><input type="text" class="sheet-short" name="attr_character_skill_dice" /></td>
-                    </table>
-                    <table style="width:100%">
-                        <tr>
-                            <td>Skill Roll:</td>
-                            <td><button type='roll' name='roll_character_skill_dice'
-                                    value=' &{template:default} {{name=Character Skill Roll}} {{Skill = @{character_skill}}} {{Roll = [[@{character_skill_dice}]]}} '></td>
-                        </tr>
-                    </table>
-                </fieldset>
-            
-                <hr />
-            
-                <h3 style="margin-bottom: 10px;">Fluent Languages</h3>
-                <fieldset class="repeating_fluent-languages">
-                    <input type="text" name="attr_fluent_languages" />
-                </fieldset>
-            
-                <h3 style="margin-bottom: 10px;">Weapons</h3>
-                <hr />
-                <fieldset class="repeating_weapons">
-                    <table style="width:100%">
-                        <tr>
-                            <th>Name</th>
-                            <th>+ to hit</th>
-                        </tr>
-                        <tr>
-                            <td><input type="text" name="attr_weapon_name" /></td>
-                            <td><input type="text" class="sheet-short" name="attr_weapon_plus_to_hit" /></td>
-                        </tr>
-                    </table>
-                    <table style="width:100%">
-                        <tr>
-                            <td><label>DMG:</label></td>
-                            <td><input type="text" name="attr_weapon_damage" /></td>
-                        </tr>
-                        <tr>
-                            <td><label>Durability:</label></td>
-                            <td><input type="text" name="attr_weapon_durability" /></td>
-                        </tr>
-                        <tr>
-                            <td><label>Range:</label></td>
-                            <td><input type="text" name="attr_weapon_range" /></td>
-                        </tr>
-                        <tr>
-                            <td><label>Weight:</label></td>
-                            <td><input type="text" name="attr_weapon_weight" /></td>
-                        </tr>
-                        <tr>
-                            <td><label>Ammo:</label></td>
-                            <td><input type="text" name="attr_weapon_ammo" /></td>
-                        </tr>
-                        <tr>
-                            <td><label>Accessories:</label></td>
-                            <td><input type="text" name="attr_weapon_accessories" /></td>
-                        </tr>
-                    </table>
-            
-                    <table style="width:100%">
-                        <tr>
-                            <td>Attack:</td>
-                            <td><button type='roll' name='roll_weapon_hit'
-                                    value=' &{template:default} {{name=Weapon Attack}} {{Weapon = @{weapon_name}}}  {{Attack Roll = [[d20+@{weapon_plus_to_hit}]]}} '></td>
-                        </tr>
-                        <tr>
-                            <td>Damage:</td>
-                            <td><button type='roll' name='roll_weapon_damage'
-                                    value=' &{template:default} {{name=Weapon Damage}} {{Weapon = @{weapon_name}}} {{Damage Roll = [[@{weapon_damage}]]}}'></td>
-                        </tr>
-                        <tr>
-                            <td>Damage with Multipliers:</td>
-                            <td><button type='roll' name='roll_weapon_damage'
-                                    value=' &{template:default} {{name=Multiplied Weapon Damage}} {{Weapon = @{weapon_name}}} {{Multiplier = ?{Multiplier?}}}{{Damage Roll = [[(@{weapon_damage})*?{Multiplier?}]]}}'>
-                            </td>
-                        </tr>
-            
-                    </table>
-                    <hr />
-                </fieldset>
-            
-                <hr />
-            
-                <h3 style="margin-bottom: 10px;">Armor and Clothing</h3>
-            
-                <table style="width:100%">
-                    <tr>
-                        <th></th>
-                        <th>Name</th>
-                        <th>Dur</th>
-                        <th>AR</th>
-                    </tr>
-                    <tr>
-                        <td>Clothing</td>
-                        <td><input type="text" name="attr_armor_clothing_name" /></td>
-                        <td><input type="text" class="sheet-short" name="attr_armor_clothing_durability" /></td>
-                        <td><input type="text" class="sheet-short" name="attr_armor_clothing_ar" /></td>
-                    </tr>
-            
-                    <tr>
-                        <td>Torso</td>
-                        <td><input type="text" name="attr_armor_torso_name" /></td>
-                        <td><input type="text" class="sheet-short" name="attr_armor_torso_durability" /></td>
-                        <td><input type="text" class="sheet-short" name="attr_armor_torso_ar" /></td>
-                    </tr>
-            
-                    <tr>
-                        <td>Cloak</td>
-                        <td><input type="text" name="attr_armor_cloak_name" /></td>
-                        <td><input type="text" class="sheet-short" name="attr_armor_cloak_durability" /></td>
-                        <td><input type="text" class="sheet-short" name="attr_armor_cloak_ar" /></td>
-                    </tr>
-            
-                    <tr>
-                        <td>Helmet</td>
-                        <td><input type="text" name="attr_armor_helmet_name" /></td>
-                        <td><input type="text" class="sheet-short" name="attr_armor_helmet_durability" /></td>
-                        <td><input type="text" class="sheet-short" name="attr_armor_hemlet_ar" /></td>
-                    </tr>
-            
-                    <tr>
-                        <td>Amulet</td>
-                        <td><input type="text" name="attr_armor_amulet_name" /></td>
-                        <td><input type="text" class="sheet-short" name="attr_armor_amulet_durability" /></td>
-                        <td><input type="text" class="sheet-short" name="attr_armor_amulet_ar" /></td>
-                    </tr>
-            
-                    <tr>
-                        <td>Pauldrons</td>
-                        <td><input type="text" name="attr_armor_pauldrons_name" /></td>
-                        <td><input type="text" class="sheet-short" name="attr_armor_pauldrons_durability" /></td>
-                        <td><input type="text" class="sheet-short" name="attr_armor_pauldrons_ar" /></td>
-                    </tr>
-            
-                    <tr>
-                        <td>Bracers</td>
-                        <td><input type="text" name="attr_armor_bracers_name" /></td>
-                        <td><input type="text" class="sheet-short" name="attr_armor_bracers_durability" /></td>
-                        <td><input type="text" class="sheet-short" name="attr_armor_bracers_ar" /></td>
-                    </tr>
-            
-                    <tr>
-                        <td>Greaves</td>
-                        <td><input type="text" name="attr_armor_greaves_name" /></td>
-                        <td><input type="text" class="sheet-short" name="attr_armor_greaves_durability" /></td>
-                        <td><input type="text" class="sheet-short" name="attr_armor_greaves_ar" /></td>
-                    </tr>
-            
-                    <tr>
-                        <td>Belt</td>
-                        <td><input type="text" name="attr_armor_belt_name" /></td>
-                        <td><input type="text" class="sheet-short" name="attr_armor_belt_durability" /></td>
-                        <td><input type="text" class="sheet-short" name="attr_armor_belt_ar" /></td>
-                    </tr>
-            
-                    <tr>
-                        <td>Shield</td>
-                        <td><input type="text" name="attr_armor_shield_name" /></td>
-                        <td><input type="text" class="sheet-short" name="attr_armor_shield_durability" /></td>
-                        <td><input type="text" class="sheet-short" name="attr_armor_shield_ar" /></td>
-                    </tr>
-            
-                    <tr>
-                        <td>Boots</td>
-                        <td><input type="text" name="attr_armor_boots_name" /></td>
-                        <td><input type="text" class="sheet-short" name="attr_armor_boots_durability" /></td>
-                        <td><input type="text" class="sheet-short" name="attr_armor_boots_ar" /></td>
-                    </tr>
-            
-                    <tr>
-                        <td>Gloves</td>
-                        <td><input type="text" name="attr_armor_gloves_name" /></td>
-                        <td><input type="text" class="sheet-short" name="attr_armor_gloves_durability" /></td>
-                        <td><input type="text" class="sheet-short" name="attr_armor_gloves_ar" /></td>
-                    </tr>
-            
-                    <tr>
-                        <td>Ring</td>
-                        <td><input type="text" name="attr_armor_ring_name" /></td>
-                        <td><input type="text" class="sheet-short" name="attr_armor_ring_durability" /></td>
-                        <td><input type="text" class="sheet-short" name="attr_armor_ring_ar" /></td>
-                    </tr>
-                </table>
-            
-                <hr />
-            
-                <h3 style="margin-bottom: 10px;">Resistances</h3>
-                <table>
-                    <tr>
-                        <td>Fire</td>
-                        <td><input type="text" class="sheet-short" name="attr_resistance_fire" /></td>
-                        <td>Cold</td>
-                        <td><input type="text" class="sheet-short" name="attr_resistance_cold" /></td>
-                        <td>Toxic</td>
-                        <td><input type="text" class="sheet-short" name="attr_resistance_toxic" /></td>
-                    </tr>
-                    <tr>
-                        <td>Electrical</td>
-                        <td><input type="text" class="sheet-short" name="attr_resistance_electrical" /></td>
-                        <td>Sonic</td>
-                        <td><input type="text" class="sheet-short" name="attr_resistance_sonic" /></td>
-                        <td>Radiation</td>
-                        <td><input type="text" class="sheet-short" name="attr_resistance_radiation" /></td>
-                    </tr>
-                </table>
-            
-                <hr />
-            
-                <h3 style="margin-bottom: 10px;">Equipent(belt)</h3>
-                <fieldset class="repeating_equipment-belt">
-                    <input type="text" name="attr_equipment_belt" />
-                </fieldset>
-            
-                <hr />
-            
-                <h3 style="margin-bottom: 10px;">Racial Abilities</h3>
-                <fieldset class="repeating_racial-ability">
-                    <input type="text" name="attr_racial_ability" />
-                </fieldset>
-            
-                <hr />
-            
-                <h3 style="margin-bottom: 10px;">Class Abilities</h3>
-                <fieldset class="repeating_class-ability">
-                    <table style="width:100%">
-                        <tr>
-                            <th>Name</th>
-                            <th>Rank</th>
-                        </tr>
-                        <tr>
-                            <td><input type="text" name="attr_class_ability" /></td>
-                            <td><input type="text" class="sheet-short" name="attr_class_ability_rank" /></td>
-                        </tr>
-                    </table>
-                </fieldset>
-            
-                <h3 style="margin-bottom: 10px;">Character Traits</h3>
-                <fieldset class="repeating_character-traits">
-                    <input type="text" name="attr_character_traits" />
-                </fieldset>
-            
-                <hr />
-            
-                <h3 style="margin-bottom: 10px;">Talents</h3>
-                <fieldset class="repeating_talents">
-                    <input type="text" name="attr_talents" />
-                </fieldset>
-            
-                <h3 style="margin-bottom: 10px;">Backpack or Stash</h3>
-                <fieldset class="repeating_backpack-or-stash">
-                    <input type="text" name="attr_backpack_or_stash" />
-                </fieldset>
-            
-                <hr />
-            
-                <h3 style="margin-bottom: 10px;">Loot</h3>
-            
-                <table style="width:100%">
-                    <tr>
-                        <td>Credits</td>
-                        <td><input type="text" class="sheet-short" name="attr_credits" /></td>
-                    </tr>
-                    <tr>
-                        <td>Bank Accounts</td>
-                        <td><input type="text" class="sheet-short" name="attr_bank_accounts" /></td>
-                    </tr>
-                </table>
-            
-                <h3 style="margin-bottom: 10px;">Additional Loot</h3>
-                <fieldset class="repeating_additional-loot">
-                    <input type="text" name="attr_additional_loot" />
-                </fieldset>
-            
-                <hr />
-            
-                <h3 style="margin-bottom: 10px;">Hideouts</h3>
-                <fieldset class="repeating_hideouts">
-                    <input type="text" name="attr_hideouts" />
-                </fieldset>
-            
-                <hr />
-            
-                <h3 style="margin-bottom: 10px;">Total Hideouts</h3>
-                <table style="width:100%">
-                    <tr>
-                        <th>Income</th>
-                        <th>Upkeep</th>
-                    </tr>
-                    <td><input type="text" name="attr_hideout_income" /></td>
-                    <td><input type="text" name="attr_hideout_upkeep" /></td>
-                    </tr>
-                </table>
-            
-                <hr />
-            
-                <h3 style="margin-bottom: 10px;">Religious Beliefs</h3>
-                <table style="width:100%">
-                    <tr>
-                        <td>Path</td>
-                        <td><input type="text" name="attr_religious_path" /></td>
-                    </tr>
-                    <tr>
-                        <td>Spiritual Influence</td>
-                        <td><input type="text" name="attr_spiritual_influence" /></td>
-                    </tr>
-                    <tr>
-                        <td>Animal Spirit</td>
-                        <td><input type="text" name="attr_animal_spirit" /></td>
-                    </tr>
-                    <tr>
-                        <td>Soul Points</td>
-                        <td><input type="text" name="attr_soul_points" /></td>
-                    </tr>
-                    <tr>
-                        <td>gods</td>
-                    </tr>
-                </table>
-            
-                <fieldset class="repeating_gods">
-                    <table style="width:100%">
-                        <tr>
-                            <td><input type="text" name="attr_god" /></td>
-                            <td><input type="text" class="sheet-short" name="attr_god_number" /></td>
-                        </tr>
-                    </table>
-                </fieldset>
-            
-                <hr />
-            
-                <h3 style="margin-bottom: 10px;">Reputation</h3>
-                <table style="width:100%">
-                    <tr>
-                        <td>Title</td>
-                        <td><input type="text" name="attr_reputation_title" /></td>
-                    </tr>
-                    <tr>
-                        <td>Glory</td>
-                        <td><input type="text" name="attr_reputation_glory" /></td>
-                    </tr>
-                    <tr>
-                        <td>Total Reputation Points</td>
-                        <td><input type="text" name="attr_total_rep_points" /></td>
-                    </tr>
-                </table>
-            
-                <h3 style="margin-bottom: 10px;">Reputation Log</h3>
-                <fieldset class="repeating_reputation-log">
-                    <input type="text" name="attr_reputation_log" />
-                </fieldset>
-            
-                <h3 style="margin-bottom: 10px;">Reputation Locations</h3>
-                <fieldset class="repeating_reputation-locations">
-                    <table style="width:100%">
-                        <tr>
-                            <th>Name</th>
-                            <th>Points</th>
-                        </tr>
-                        <tr>
-                            <td><input type="text" name="attr_reputation_location_name" /></td>
-                            <td><input type="text" class="sheet-short" name="attr_reputation_location_points" /></td>
-                        </tr>
-                    </table>
-                </fieldset>
-            
-                <hr />
-            
-                <h3 style="margin-bottom: 10px;">Character Background</h3>
-                <fieldset class="repeating_character-background">
-                    <input type="text" name="attr_character_background" />
-                </fieldset>
-            
-                <h3 style="margin-bottom: 10px;">Vehicles</h3>
-                <hr />
-                <fieldset class="repeating_vehicles">
-                    <table style="width:100%">
-                        <tr></tr>
-                        <td><label>Vehicle name:</label></td>
-                        <td><input type="text" name="attr_vehicle_name" /></td>
-                        </tr>
-                        <tr></tr>
-                        <td><label>SHP:</label></td>
-                        <td><input type="text" name="attr_vehicle_shp" /></td>
-                        </tr>
-                        <tr></tr>
-                        <td><label>Armor:</label></td>
-                        <td><input type="text" name="attr_weapon_range" /></td>
-                        </tr>
-                        <tr></tr>
-                        <td><label>Speed:</label></td>
-                        <td><input type="text" name="attr_vehicle_speed" /></td>
-                        </tr>
-                        <tr></tr>
-                        <td><label>Mounts:</label></td>
-                        <td><input type="text" name="attr_vehicle_mounts" /></td>
-                        </tr>
-                    </table>
-            
-            
-                    <table style="width:100%">
-                        <tr>
-                            <th>Weapon</th>
-                            <th>+to hit</th>
-                            <th>DMG</th>
-                        <tr>
-                        <tr>
-                            <td><input type="text" name="attr_vehicle_weapon1_name" /></td>
-                            <td><input type="text" class="sheet-short" name="attr_vehicle_weapon1_plus_to_hit" /></td>
-                            <td><input type="text" class="sheet-short" name="attr_vehicle_weapon1_damage" /></td>
-                        </tr>
-            
-                        <tr>
-                            <td><button type='roll' name='roll_vehicle_weapon1_hit'
-                                    value=' &{template:default} {{name=Vehicle Weapon Attack}} {{Weapon = @{vehicle_weapon1_name}}}  {{Attack Roll = [[d20+@{vehicle_weapon1_plus_to_hit}]]}} '>Hit
-                            </td>
-                            <td><button type='roll' name='roll_vehicle_weapon1_damage'
-                                    value=' &{template:default} {{name=Vehicle Weapon Damage}} {{Weapon = @{vehicle_weapon1_name}}} {{Damage Roll = [[@{vehicle_weapon1_damage}]]}}'>DMG
-                            </td>
-                            <td><button type='roll' name='roll_vehicle_weapon1_damage_multiplier'
-                                    value=' &{template:default} {{name=Multiplied Vehicle Weapon Damage}} {{Weapon = @{vehicle_weapon1_name}}} {{Multiplier = ?{Multiplier?}}}{{Damage Roll = [[(@{vehicle_weapon1_damage})*?{Multiplier?}]]}}'>Mult
-                            </td>
-                        </tr>
-            
-                        <tr>
-                            <td><input type="text" name="attr_vehicle_weapon2_name" /></td>
-                            <td><input type="text" class="sheet-short" name="attr_vehicle_weapon2_plus_to_hit" /></td>
-                            <td><input type="text" class="sheet-short" name="attr_vehicle_weapon2_damage" /></td>
-                        </tr>
-            
-                        <tr>
-                            <td><button type='roll' name='roll_vehicle_weapon2_hit'
-                                    value=' &{template:default} {{name=Vehicle Weapon Attack}} {{Weapon = @{vehicle_weapon2_name}}}  {{Attack Roll = [[d20+@{vehicle_weapon2_plus_to_hit}]]}} '>Hit
-                            </td>
-                            <td><button type='roll' name='roll_vehicle_weapon2_damage'
-                                    value=' &{template:default} {{name=Vehicle Weapon Damage}} {{Weapon = @{vehicle_weapon2_name}}} {{Damage Roll = [[@{vehicle_weapon2_damage}]]}}'>DMG
-                            </td>
-                            <td><button type='roll' name='roll_vehicle_weapon2_damage_multiplier'
-                                    value=' &{template:default} {{name=Multiplied Vehicle Weapon Damage}} {{Weapon = @{vehicle_weapon2_name}}} {{Multiplier = ?{Multiplier?}}}{{Damage Roll = [[(@{vehicle_weapon2_damage})*?{Multiplier?}]]}}'>Mult
-                            </td>
-                        </tr>
-            
-                        <tr>
-                            <td><input type="text" name="attr_vehicle_weapon3_name" /></td>
-                            <td><input type="text" class="sheet-short" name="attr_vehicle_weapon3_plus_to_hit" /></td>
-                            <td><input type="text" class="sheet-short" name="attr_vehicle_weapon3_damage" /></td>
-                        </tr>
-            
-                        <tr>
-                            <td><button type='roll' name='roll_vehicle_weapon3_hit'
-                                    value=' &{template:default} {{name=Vehicle Weapon Attack}} {{Weapon = @{vehicle_weapon3_name}}}  {{Attack Roll = [[d20+@{vehicle_weapon3_plus_to_hit}]]}} '>Hit
-                            </td>
-                            <td><button type='roll' name='roll_vehicle_weapon3_damage'
-                                    value=' &{template:default} {{name=Vehicle Weapon Damage}} {{Weapon = @{vehicle_weapon3_name}}} {{Damage Roll = [[@{vehicle_weapon3_damage}]]}}'>DMG
-                            </td>
-                            <td><button type='roll' name='roll_vehicle_weapon3_damage_multiplier'
-                                    value=' &{template:default} {{name=Multiplied Vehicle Weapon Damage}} {{Weapon = @{vehicle_weapon3_name}}} {{Multiplier = ?{Multiplier?}}}{{Damage Roll = [[(@{vehicle_weapon3_damage})*?{Multiplier?}]]}}'>Mult
-                            </td>
-                        </tr>
-            
-                    </table>
-                    <hr />
-                </fieldset>
-            
-                <hr />
-            
-                <h3 style="margin-bottom: 10px;">Characters Known</h3>
-            
-                <fieldset class="repeating_characters-known">
-                    <table style="width:100%">
-                        <tr>
-                            <th>Name</th>
-                            <th>Rank</th>
-                        </tr>
-                        <td><input type="text" name="attr_characters_known_name" /></td>
-                        <td><input type="text" class="sheet-short" name="attr_characters_known_level" /></td>
-                        </tr>
-                    </table>
-                </fieldset>
-            
-                <hr />
-                <h3 style="text-align: center;">Physical Condition Gauge</h3>
-                <table style="width:100%">
-            
-                    <tr>
-                        <td><input type='radio' value='restored' name='attr_physical_condition' checked='true' /></td>
-                        <td>Restored</td>
-                        <td>-0%</td>
-                        <td>-0</td>
-                    </tr>
-                    <tr>
-                        <td><input type='radio' value='tired' name='attr_physical_condition' /></td>
-                        <td>Tired</td>
-                        <td>-10%</td>
-                        <td>-0</td>
-                    </tr>
-                    <tr>
-                        <td><input type='radio' value='weary' name='attr_physical_condition' /></td>
-                        <td>Weary</td>
-                        <td>-25%</td>
-                        <td>-1</td>
-                    </tr>
-                    <tr>
-                        <td><input type='radio' value='fatigued' name='attr_physical_condition' /></td>
-                        <td>Fatigued</td>
-                        <td>-50%</td>
-                        <td>-2</td>
-                    </tr>
-                    <tr>
-                        <td><input type='radio' value='exhausted' name='attr_physical_condition' /></td>
-                        <td>Exhausted</td>
-                        <td>-75%</td>
-                        <td>-3</td>
-                    </tr>
-                    <tr>
-                        <td><input type='radio' value='overexhausted' name='attr_physical_condition' /></td>
-                        <td>Over Exhausted</td>
-                        <td>-90%</td>
-                        <td>-4</td>
-                    </tr>
-                    <tr>
-                        <td><input type='radio' value='critical' name='attr_physical_condition' /></td>
-                        <td>Critical</td>
-                        <td>-100%</td>
-                        <td>-5</td>
-                    </tr>
-                </table>
-            
-                <hr />
-            
-            
-                <h3 style="text-align: center;">Mental Condition Gauge</h3>
-                <table style="width:100%">
-            
-                    <tr>
-                        <td><input type='radio' value='collected' name='attr_mental_condition' checked='true' /></td>
-                        <td>Collected</td>
-                        <td>-0%</td>
-                        <td>-0</td>
-                    </tr>
-                    <tr>
-                        <td><input type='radio' value='agitated' name='attr_mental_condition' /></td>
-                        <td>Agitated</td>
-                        <td>-10%</td>
-                        <td>-0</td>
-                    </tr>
-                    <tr>
-                        <td><input type='radio' value='distraught' name='attr_mental_condition' /></td>
-                        <td>Distraught</td>
-                        <td>-25%</td>
-                        <td>-1</td>
-                    </tr>
-                    <tr>
-                        <td><input type='radio' value='irrational' name='attr_mental_condition' /></td>
-                        <td>Irrational</td>
-                        <td>-50%</td>
-                        <td>-2</td>
-                    </tr>
-                    <tr>
-                        <td><input type='radio' value='unstable' name='attr_mental_condition' /></td>
-                        <td>Unstable</td>
-                        <td>-75%</td>
-                        <td>-3</td>
-                    </tr>
-                    <tr>
-                        <td><input type='radio' value='maniacal' name='attr_mental_condition' /></td>
-                        <td>Maniacal</td>
-                        <td>-90%</td>
-                        <td>-4</td>
-                    </tr>
-                    <tr>
-                        <td><input type='radio' value='senseless' name='attr_mental_condition' /></td>
-                        <td>Senseless</td>
-                        <td>-100%</td>
-                        <td>-5</td>
-                    </tr>
-                </table>
-            
-                <hr />
-            
-                <h3 style="margin-bottom: 10px;">Spell Book</h3>
-                <fieldset class="repeating_spells">
-                    <table style="width:100%">
-                        <tr>
-                            <th>Spell</th>
-                            <th>Area</th>
-                            <th>Actions</th>
-                            <th>DMG</th>
-                            <th>Duration</th>
-                            <th>Protect</th>
-                            <th>Drain</th>
-                            <th>+ to hit</th>
-                        </tr>
-                        <tr>
-                            <td><input type="text" name="attr_spell" /></td>
-                            <td><input type="text" class="sheet-short" name="attr_spell_area" /></td>
-                            <td><input type="text" class="sheet-short" name="attr_spell_actions" /></td>
-                            <td><input type="text" class="sheet-short" name="attr_spell_damage" /><button type='roll' name='roll_spell_damage'
-                                    value=' &{template:default} {{name=Spell Damage}} {{Spell=@{spell}}} {{Damage Roll = [[@{spell_damage}]]}} '>Base <button type='roll'
-                                        name='roll_spell_damage'
-                                        value=' &{template:default} {{name=Multiplied Spell Damage}} {{Spell = @{spell}}} {{Multiplier = ?{Multiplier?}}}{{Damage Roll = [[(@{spell_damage})*?{Multiplier?}]]}}'>Mult
-                            </td>
-                            <td><input type="text" class="sheet-short" name="attr_spell_duration" /></td>
-                            <td><input type="text" class="sheet-short" name="attr_spell_protect" /></td>
-                            <td><input type="text" class="sheet-short" name="attr_spell_Drain" /></td>
-                            <td><input type="text" class="sheet-short" name="attr_spell_plus_to_hit" /><button type='roll' name='roll_spell_hit'
-                                    value=' &{template:default} {{name=Spell Attack}} {{Spell=@{spell}}} {{Spell Attack Roll = [[d20+@{spell_plus_to_hit}]]}} '></td>
-                        </tr>
-                    </table>
-                </fieldset>
-            
-                <hr />
-            
-                <h3 style="margin-bottom: 10px;">Alchemical Formulas</h3>
-                <fieldset class="repeating_alchemical-formula">
-                    <input type="text" name="attr_alchemical_formula" />
-                </fieldset>
-                <hr />
-                <h3 style="margin-bottom: 10px;">Cybernetics & Bionics</h3>
-                <fieldset class="repeating_cybernetics">
-                    <table style="width:100%">
-                        <tr>
-                            <th>Implant</th>
-                            <th>Rating</th>
-                            <th>Drain</th>
-                        </tr>
-                        <td><input type="text" name="attr_cybernetics_name" /></td>
-                        <td><input type="text" name="attr_cybernetics_rating" /></td>
-                        </tr>
-                        <td><input type="text" name="attr_cybernetics_drain" /></td>
-                        </tr>
-                    </table>
-                </fieldset>
-            
-                <h3 style="margin-bottom: 10px;">Chi Abilities</h3>
-                <fieldset class="repeating_chi-ability">
-                    <table style="width:100%">
-                        <tr>
-                            <th>Name</th>
-                            <th>Drain</th>
-                        </tr>
-                        <td><input type="text" name="attr_chi_ability" /></td>
-                        <td><input type="text" class="sheet-short" name="attr_chi_ability_drain" /></td>
-                        </tr>
-                    </table>
-                </fieldset>
-            
-                <hr />
-            
-                <h3 style="margin-bottom: 10px;">Cyberboard</h3>
-                <fieldset class="repeating_cyberboard">
-                    <table style="width:100%">
-                        <tr>
-                            <th>Name</th>
-                            <th>Speed</th>
-                            <th>Attacks</th>
-                            <th>Armor</th>
-                            <th>Memory</th>
-                            <th>Storage</th>
-                            <th>+to hit</th>
-                            <th>+ to def</th>
-                            <th>DMG</th>
-                        </tr>
-                        <tr>
-                            <td><input type="text" name="attr_cyberboard_name" /></td>
-                            <td><input type="text" class="sheet-short" name="attr_cyberboard_speed" /></td>
-                            <td><input type="text" class="sheet-short" name="attr_cyberboard_attacks" /></td>
-                            <td><input type="text" class="sheet-short" name="attr_cyberboard_armor" /></td>
-                            <td><input type="text" class="sheet-short" name="attr_cyberboard_memory" /></td>
-                            <td><input type="text" class="sheet-short" name="attr_cyberboard_Storage" /></td>
-                            <td><input type="text" class="sheet-short" name="attr_cyberboard_plus_to_hit" /><button type='roll' name='roll_cyberboard_hit'
-                                    value=' &{template:default} {{name=Cyberboard Attack}} {{cyberboard_=@{cyberboard_name}}} {{Hit Roll = [[d20+@{cyberboard_plus_to_hit}]]}} '>Hit
-                            </td>
-                            <td><input type="text" class="sheet-short" name="attr_cyberboard_plus_to_def" /><button type='roll' name='roll_cyberboard_hit'
-                                    value=' &{template:default} {{name=Cyberboard Defense}} {{cyberboard_=@{cyberboard_name}}} {{Defense Roll = [[d20+@{cyberboard_plus_to_def}]]}} '>Def
-                            </td>
-                            <td><input type="text" class="sheet-short" name="attr_cyberboard_dmg" /><button type='roll' name='roll_cyberboard_dmg'
-                                    value=' &{template:default} {{name=Cyberboard Damage}} {{Cyberboard=@{cyberboard_name}}} {{Damage Roll = [[@{cyberboard_dmg}]]}} '>Base <button
-                                        type='roll' name='roll_cyberboard_damage_multiplier'
-                                        value=' &{template:default} {{name=Multiplied Cyberboard Damage}} {{Cyberboard = @{cyberboard_name}}} {{Multiplier = ?{Multiplier?}}}{{Damage Roll = [[(@{cyberboard_dmg})*?{Multiplier?}]]}}'>Mult
-                            </td>
-            
-                    </table>
-                </fieldset>
-            </div>
         </div>
 
         <div class="sheet-background-column-fixed-right"></div>
diff --git a/Chaos 6010/images/Chaos_6010_Title_thumb.jpg b/Chaos 6010/images/Chaos_6010_Title_thumb.jpg
new file mode 100644
index 0000000000..cd26f09954
Binary files /dev/null and b/Chaos 6010/images/Chaos_6010_Title_thumb.jpg differ
diff --git a/Chaos 6010/images/Chaos_6010_Title_transparent.png b/Chaos 6010/images/Chaos_6010_Title_transparent.png
new file mode 100644
index 0000000000..09a1e1a856
Binary files /dev/null and b/Chaos 6010/images/Chaos_6010_Title_transparent.png differ
diff --git a/Chaos 6010/images/Circle.png b/Chaos 6010/images/Circle.png
new file mode 100644
index 0000000000..b44992594d
Binary files /dev/null and b/Chaos 6010/images/Circle.png differ
diff --git a/Chaos 6010/images/collapsed.png b/Chaos 6010/images/collapsed.png
new file mode 100644
index 0000000000..0ac362fe94
Binary files /dev/null and b/Chaos 6010/images/collapsed.png differ
diff --git a/Chaos 6010/images/expanded.png b/Chaos 6010/images/expanded.png
new file mode 100644
index 0000000000..0af17be03e
Binary files /dev/null and b/Chaos 6010/images/expanded.png differ
diff --git a/Chaos 6010/images/roll-divider.png b/Chaos 6010/images/roll-divider.png
new file mode 100644
index 0000000000..c5fb2f60b0
Binary files /dev/null and b/Chaos 6010/images/roll-divider.png differ
diff --git a/Chaos 6010/images/warning-stripes-banner-transparent.png b/Chaos 6010/images/warning-stripes-banner-transparent.png
new file mode 100644
index 0000000000..7364178597
Binary files /dev/null and b/Chaos 6010/images/warning-stripes-banner-transparent.png differ