diff --git a/Deadlands Classic/deadlandsclassic.css b/Deadlands Classic/deadlandsclassic.css
index f740a7c9cd..4aab5eff46 100644
--- a/Deadlands Classic/deadlandsclassic.css	
+++ b/Deadlands Classic/deadlandsclassic.css	
@@ -151,6 +151,10 @@
     margin: auto;
 }
 
+.sheet-chiprow .sheet-item {
+  width: 8%;
+}
+
 .sheet-itemright {
     margin: auto;
   margin-right: 5px;
@@ -381,14 +385,16 @@ textarea {
 .sheet-big input[type=radio],
 .sheet-location input[type=radio] {
   display: inline-block;
-  text-align: center;
-  position: relative;
-  left: 20px;
-  width: 25px;
   opacity: 0;
+  position: relative;
+  width: 30px;
   z-index: 2;
 }
 
+.sheet-chiprow .sheet-buttons input[type=radio] {
+  top: 20px;
+}
+
 .sheet-big input[type=radio] + span {
   position: relative;
   left: -15px;
@@ -403,13 +409,13 @@ textarea {
 .sheet-location input[type=radio]:hover + span,
 .sheet-location input[type=radio]:checked + span {
   color: white;
-  font-size: 1rem;
+  font-size: 1.5em;
   text-shadow: 1px 0 0 #000, 0 -1px 0 #000, 0 1px 0 #000, -1px 0 0 #000;
 }
 
 .sheet-buttons input[type=radio] + span {
   font-weight: bolder;
-  font-size: 1rem;
+  font-size: 1.2em;
 }
 
 .sheet-buttonsred input[type=radio]:hover + span,
@@ -456,6 +462,31 @@ textarea {
   left: 5px;
 }
 
+.sheet-weapon-headers .sheet-wea-label {
+  width: 13%;
+}
+
+.sheet-weapon-headers .sheet-wea-label:nth-of-type(3) {
+  width: 4%;
+}
+
+.sheet-weapon-headers .sheet-wea-label:nth-of-type(4)  {
+  width: 5%;
+}
+
+.sheet-weapon .sheet-large {
+  text-align: left;
+  width: 5%;
+}
+
+.sheet-weapon .sheet-large input[type=text] {
+  text-align: center;
+}
+
+.sheet-weapon .sheet-xxxlarge input[type=text] {
+  width: 39%;
+}
+
 .sheet-xxxlarge .sheet-xxhuge {
   padding-bottom: 5px;
 }
@@ -465,12 +496,23 @@ textarea {
   float: right;
 }
 
+.sheet-location input[type=radio] {
+  height: 25px;
+  margin-right: -27px;
+}
+
+.sheet-location input[type=radio]:last-child,
+.sheet-location input[type=radio]:last-child + span {
+  margin-left: 10px;
+}
+
 .sheet-location label {
   display: inline;
   margin-right: -10px;
 }
 
 .sheet-location span {
+  padding: 5px;
   font-weight: bolder;
 }
 
@@ -481,4 +523,30 @@ textarea {
 
 .sheet-rolltemplate-default table {
   border-color: #6d4b3e;
+}
+
+.sheet-xxxlarge .repcontrol .repcontrol_edit {
+  position: relative;
+  left: 30px;
+  width: 40%;
+  top: 25px;
+  z-index: 3;
+}
+
+.sheet-xxxlarge .repcontrol .repcontrol_edit:after {
+  position: relative;
+  left: -35px;
+}
+
+.sheet-xxxlarge .repcontrol .repcontrol_add {
+  position: relative;
+  width: 40%;
+}
+
+.sheet-xxxlarge .repcontrol .repcontrol_add:after {
+
+}
+
+.sheet-arcane-row .sheet-item {
+  vertical-align: top;
 }
\ No newline at end of file
diff --git a/Deadlands Classic/deadlandsclassic.html b/Deadlands Classic/deadlandsclassic.html
index 893173696d..aafac7ade5 100644
--- a/Deadlands Classic/deadlandsclassic.html	
+++ b/Deadlands Classic/deadlandsclassic.html	
@@ -117,25 +117,25 @@
         <div class="sheet-col">
           <div class="sheet-item">
             Pace:
-            <input type="number" name="attr_pace">
+            <input type="number" name="attr_pace" placeholder="0">
           </div>
         </div>
         <div class="sheet-col">
           <div class="sheet-item">
             Size:
-            <input type="number" name="attr_size">
+            <input type="number" name="attr_size"  placeholder="0">
           </div>
         </div>
         <div class="sheet-col">
           <div class="sheet-item">
             Max Wind:
-            <input type="number" name="attr_maxwind">
+            <input type="number" name="attr_maxwind"  placeholder="0">
           </div>
         </div>
         <div class="sheet-col">
           <div class="sheet-item">
             Grit:
-            <input type="number" name="attr_grit">
+            <input type="number" name="attr_grit" placeholder="0">
           </div>
         </div>
       </div>
@@ -143,48 +143,74 @@
       <div class="sheet-row sheet-h1">
         <div class="sheet-center">Fate Chips</div>
       </div>
-      <div class="sheet-row chiprow">
-        <div class="sheet-row sheet-h3">
-          <div class="sheet-center">White Chips</div>
+      <div class="sheet-2colrow">
+        <div class="sheet-col">
+          <div class="sheet-row sheet-h3">
+              <div class="sheet-center">White Chips</div>
+          </div>
+          <div class="sheet-row chiprow">
+            <div class="sheet-item buttons">
+              <input type="radio" name="attr_fatew" value="0" checked="checked"><span>0</span>
+            </div>
+            <div class="sheet-item buttons">
+              <input type="radio" name="attr_fatew" value="1"><span>1</span>
+            </div>
+            <div class="sheet-item buttons">
+              <input type="radio" name="attr_fatew" value="2"><span>2</span>
+            </div>
+            <div class="sheet-item buttons">
+              <input type="radio" name="attr_fatew" value="3"><span>3</span>
+            </div>
+            <div class="sheet-item buttons">
+              <input type="radio" name="attr_fatew" value="4"><span>4</span>
+            </div>
+            <div class="sheet-item buttons">
+              <input type="radio" name="attr_fatew" value="5"><span>5</span>
+            </div>
+            <div class="sheet-item buttons">
+              <input type="radio" name="attr_fatew" value="6"><span>6</span>
+            </div>
+            <div class="sheet-item buttons">
+              <input type="radio" name="attr_fatew" value="7"><span>7</span>
+            </div>
+            <div class="sheet-item buttons">
+              <input type="radio" name="attr_fatew" value="8"><span>8</span>
+            </div>
+            <div class="sheet-item buttons">
+              <input type="radio" name="attr_fatew" value="9"><span>9</span>
+            </div>
+            <div class="sheet-item buttons">
+              <input type="radio" name="attr_fatew" value="10"><span>10</span>
+            </div>
+          </div>
         </div>
-        <div class="sheet-row chiprow">
-          <div class="sheet-item buttons">
-            <input type="radio" name="attr_fatew" value="0" checked="checked"><span>0</span>
+        <div class="sheet-col">
+          <div class="sheet-row sheet-h3 chiprow">
+            <div class="sheet-center">Legend Chips</div>
           </div>
-          <div class="sheet-item buttons">
-            <input type="radio" name="attr_fatew" value="1"><span>1</span>
-          </div>
-          <div class="sheet-item buttons">
-            <input type="radio" name="attr_fatew" value="2"><span>2</span>
-          </div>
-          <div class="sheet-item buttons">
-            <input type="radio" name="attr_fatew" value="3"><span>3</span>
-          </div>
-          <div class="sheet-item buttons">
-            <input type="radio" name="attr_fatew" value="4"><span>4</span>
-          </div>
-          <div class="sheet-item buttons">
-            <input type="radio" name="attr_fatew" value="5"><span>5</span>
-          </div>
-          <div class="sheet-item buttons">
-            <input type="radio" name="attr_fatew" value="6"><span>6</span>
-          </div>
-          <div class="sheet-item buttons">
-            <input type="radio" name="attr_fatew" value="7"><span>7</span>
-          </div>
-          <div class="sheet-item buttons">
-            <input type="radio" name="attr_fatew" value="8"><span>8</span>
-          </div>
-          <div class="sheet-item buttons">
-            <input type="radio" name="attr_fatew" value="9"><span>9</span>
-          </div>
-          <div class="sheet-item buttons">
-            <input type="radio" name="attr_fatew" value="10"><span>10</span>
+          <div class="sheet-row buttons chiprow">
+            <div class="sheet-item buttons buttonsleg">
+              <input type="radio" name="attr_fatel" value="0"><span>0</span>
+            </div>
+            <div class="sheet-item buttons buttonsleg">
+              <input type="radio" name="attr_fatel" value="1"><span>1</span>
+            </div>
+            <div class="sheet-item buttons buttonsleg">
+              <input type="radio" name="attr_fatel" value="2"><span>2</span>
+            </div>
+            <div class="sheet-item buttons buttonsleg">
+              <input type="radio" name="attr_fatel" value="3"><span>3</span>
+            </div>
+            <div class="sheet-item buttons buttonsleg">
+              <input type="radio" name="attr_fatel" value="4"><span>4</span>
+            </div>
+            <div class="sheet-item buttons buttonsleg">
+              <input type="radio" name="attr_fatel" value="5"><span>5</span>
+            </div>
           </div>
         </div>
       </div>
-      <br>
-      <div class="sheet-3colrow">
+    <div class="sheet-2colrow">
         <div class="sheet-col">
           <div class="sheet-row sheet-h3">
             <div class="sheet-center">Red Chips</div>
@@ -208,6 +234,21 @@
             <div class="sheet-item buttons buttonsred">
               <input type="radio" name="attr_fater" value="5"><span>5</span>
             </div>
+            <div class="sheet-item buttons buttonsred">
+              <input type="radio" name="attr_fater" value="6"><span>6</span>
+            </div>
+            <div class="sheet-item buttons buttonsred">
+              <input type="radio" name="attr_fater" value="7"><span>7</span>
+            </div>
+            <div class="sheet-item buttons buttonsred">
+              <input type="radio" name="attr_fater" value="8"><span>8</span>
+            </div>
+            <div class="sheet-item buttons buttonsred">
+              <input type="radio" name="attr_fater" value="9"><span>9</span>
+            </div>
+            <div class="sheet-item buttons buttonsred">
+              <input type="radio" name="attr_fater" value="10"><span>10</span>
+            </div>
           </div>
         </div>
         <div class="sheet-col">
@@ -230,28 +271,28 @@
             <div class="sheet-item buttons buttonsblue">
               <input type="radio" name="attr_fateb" value="4"><span>4</span>
             </div>
-          </div>
-        </div>
-        <div class="sheet-col">
-          <div class="sheet-row sheet-h3 chiprow">
-            <div class="sheet-center">Legend Chips</div>
-          </div>
-          <div class="sheet-row buttons chiprow">
-            <div class="sheet-item buttons buttonsleg">
-              <input type="radio" name="attr_fatel" value="0"><span>0</span>
+            <div class="sheet-item buttons buttonsblue">
+              <input type="radio" name="attr_fateb" value="5"><span>5</span>
             </div>
-            <div class="sheet-item buttons buttonsleg">
-              <input type="radio" name="attr_fatel" value="1"><span>1</span>
+            <div class="sheet-item buttons buttonsblue">
+              <input type="radio" name="attr_fateb" value="6"><span>6</span>
             </div>
-            <div class="sheet-item buttons buttonsleg">
-              <input type="radio" name="attr_fatel" value="2"><span>2</span>
+             <div class="sheet-item buttons buttonsblue">
+              <input type="radio" name="attr_fateb" value="7"><span>7</span>
+            </div>
+            <div class="sheet-item buttons buttonsblue">
+              <input type="radio" name="attr_fateb" value="8"><span>8</span>
+            </div>
+            <div class="sheet-item buttons buttonsblue">
+              <input type="radio" name="attr_fateb" value="9"><span>9</span>
+            </div>
+            <div class="sheet-item buttons buttonsblue">
+              <input type="radio" name="attr_fateb" value="10"><span>10</span>
             </div>
           </div>
         </div>
       </div>
-      <br>
     </div>
-    <br>
     <div class="sheet-borderdiv">
       <div class="sheet-row sheet-h1">
         <div class="sheet-center">Common Rolls</div>
@@ -260,7 +301,7 @@
         <div class="sheet-col">
           <div class="sheet-item sheet-xxxlarge"><label><b>Guts + Grit</b></label></div>
           <div class="sheet-item sheet-small">
-            <button type="roll" name="roll_GutsGrit" value="@{gmtoggle}&{template:simple}  {{rollname=Guts+Grit}} {{dice=[[@{gutslvl}@{spidtype}!!k1+@{gutsmod}+@{grit}]]}}"></button>
+            <button type="roll" name="roll_GutsGrit" value="@{gmtoggle}&{template:simple}  {{rollname=Guts+Grit}} {{dice=[[@{gutslvl}@{spidtype}!!k1@{gutsmod}+@{grit}]]}}"></button>
           </div>
         </div>
       </div>
@@ -1344,6 +1385,189 @@
     </div>
     <br>
     <div class="sheet-borderdiv">
+      <div class="sheet-row sheet-h1">
+        <div class="sheet-center">Shootin Irons &amp; Such</div>
+      </div>
+      <div class="sheet-row weapon-headers">
+        <div class="sheet-item sheet-xlarge"><label><b>Weapon</b></label></div>
+        <div class="sheet-item sheet-large wea-label"><label><b>Shots / Max</b></label></div>
+        <div class="sheet-item sheet-large wea-label"><label><b>RoF</b></label></div>
+        <div class="sheet-item sheet-large wea-label"><label><b>Range</b></label></div>
+        <div class="sheet-item sheet-large wea-label"><label><b>Damage</b></label></div>
+        <div class="sheet-item sheet-xlarge location"><label><b>Location Toggle</b></label>
+          <input type="radio" name="attr_locationtoggle" value="{{location=[[1d20]]}}" /><span>On</span>
+          <input type="radio" name="attr_locationtoggle" value="" checked="checked" /><span>Off</span>
+        </div>
+      </div>
+      <div class="sheet-row weapon" style="vertical-align: top;">
+        <fieldset class="repeating_range">
+          <div class="sheet-item sheet-xlarge"><input type="text" name="attr_name" placeholder="Colt Army"></div>
+          <div class="sheet-item sheet-large"><input type="text" name="attr_shots" placeholder="6"></div> /
+          <div class="sheet-item sheet-large"><input type="text" name="attr_shots_max" placeholder="6"></div>
+          <div class="sheet-item sheet-large"><input type="text" name="attr_rof" placeholder="1"></div>
+          <div class="sheet-item sheet-large"><input type="text" name="attr_range" placeholder="10"></div>
+          <div class="sheet-item sheet-xxxlarge">
+             <input type="text" name="attr_damage" placeholder="example 3d6">
+             <button type="roll" name="roll_mien" value="@{gmtoggle}&{template:simple} {{rollname=@{name}}} {{damage=[[@{damage}!!]]}} @{locationtoggle}"></button>
+            <input type="text" name="attr_damage2" placeholder="example 3d6">
+            <button type="roll" name="roll_mien" value="@{gmtoggle}&{template:simple} {{rollname=@{name}}} {{damage=[[@{damage2}!!]]}} @{locationtoggle}"></button>
+          </div>
+          <hr>
+        </fieldset>
+      </div>
+    </div>
+    <br>
+    <div class="sheet-borderdiv">
+      <div class="sheet-row sheet-h1">
+        <div class="sheet-center">Hand-To-Hand Weapons</div>
+      </div>
+      <div class="sheet-row">
+        <div class="sheet-item sheet-xlarge"><label><b>Weapon</b></label></div>
+        <div class="sheet-item sheet-large"><label><b>Defense</b></label></div>
+        <div class="sheet-item sheet-large"><label><b>Speed</b></label></div>
+        <div class="sheet-item sheet-large"><label><b>Damage</b></label></div>
+        <div class="sheet-item sheet-xlarge location"><label><b>Location Toggle</b></label>
+          <input type="radio" name="attr_meleelocationtoggle" value="{{location=[[1d20]]}}" /><span>On</span>
+          <input type="radio" name="attr_meleelocationtoggle" value="" checked="checked" /><span>Off</span>
+        </div>
+      </div>
+      <div class="sheet-row" style="vertical-align: top;">
+        <fieldset class="repeating_melee">
+          <div class="sheet-item sheet-xlarge"><input type="text" name="attr_name" value="" placeholder="Fist"></div>
+          <div class="sheet-item sheet-large"><input type="text" name="attr_defense" value="" placeholder="-"></div>
+          <div class="sheet-item sheet-large"><input type="text" name="attr_speed" value="" placeholder=""></div>
+          <div class="sheet-item sheet-xxxlarge weapon-damage">
+            <input type="text" name="attr_damage" style="width: 89%" value="" placeholder="(Add 0 to roll only STR)">
+            <button type="roll" name="roll_mien" value="@{gmtoggle}&{template:simple} {{rollname=@{name}}} {{strength=[[@{strlvl}@{strdtype}!!k1]]}} {{meleedamage=[[@{damage}!!]]}} @{meleelocationtoggle}"></button>
+          </div>
+          <hr>
+          </fieldset>
+        </div>
+      </div>
+    </div><!-- Combat Stuff Tab -->
+
+  <!-- Arcane Ablities Tab -->
+  <div class="sheet-section-arcane">
+    <div class="sheet-row sheet-h1">
+      <div class="sheet-center">Arcane Abilities</div>
+    </div>
+    <div class="sheet-row">
+      <div class="sheet-item sheet-large"><label><b>Hexslingin'</b></label></div>
+      <div class="sheet-item sheet-small"><input type="number" name="attr_hexslinginlvl"></div>
+      <div class="sheet-item sheet-large"><b>Ritual</b></div>
+      <div class="sheet-item sheet-small">
+        <input type="number" name="attr_rituallvl">
+      </div>
+      <div class="sheet-item sheet-large"><b>Rituals</b></div>
+      <div class="sheet-item sheet-huge">
+        <input type="text" name="attr_rituals">
+      </div>
+    </div>
+    <br>
+    <div class="sheet-row">
+      <div class="sheet-item sheet-large"><label><b>Power</b></label></div>
+      <div class="sheet-item sheet-small"><label><b>Speed</b></label></div>
+      <div class="sheet-item sheet-large"><label><b>Duration</b></label></div>
+      <div class="sheet-item sheet-small"><label><b>Range</b></label></div>
+      <div class="sheet-item sheet-small"><label><b>Trait</b></label></div>
+      <div class="sheet-item sheet-small"><label><b>TN</b></label></div>
+      <div class="sheet-item sheet-small"><label><b>Trait</b></label></div>
+      <div class="sheet-item sheet-large"><label><b>Notes</b></label></div>
+      <fieldset class="repeating_spells" style="display: none;">
+      <div class="arcane-row">
+        <div class="sheet-item sheet-large"><input type="text" name="attr_spellname" placeholder="Shadow Man"></div>
+        <div class="sheet-item sheet-small"><input type="number" name="attr_spellspeed" placeholder="2"></div>
+        <div class="sheet-item sheet-large"><input type="text" name="attr_spelldur" placeholder="Concentration"></div>
+        <div class="sheet-item sheet-small"><input type="text" name="attr_spellran" placeholder="Self"></div>
+        <div class="sheet-item sheet-small"><input type="text" name="attr_spelltrait" placeholder="Smarts">
+          <select name="attr_spelltrait">
+            <option></option>
+          </select>
+        </div>
+        <div class="sheet-item sheet-small"><input type="text" name="attr_spelltn" placeholder="Target #"></div>>
+        <div class="sheet-item sheet-huge" style="width: 30%;">
+          <textarea name="attr_spellnotes" class="sheet-shorttextarea" placeholder="Notes"></textarea>
+        </div>
+      </div>
+      </fieldset>
+      <div class="repcontainer" data-groupname="repeating_spells"></div>
+    </div>
+  </div> <!-- Arcane Ablities Tab -->
+
+  <!-- Misc Tab -->
+  <div class="sheet-section-misc">
+    <div class="sheet-row">
+      <div class="sheet-2colrow">
+        <div class="sheet-col">
+          <div class="sheet-row">
+            <h2>Edges</h2>
+          </div>
+          <fieldset class="repeating_edges">
+            <div class="sheet-row sheet-textarea">
+              <input type="text" name="attr_edgename" placeholder="Edge name"><br>
+              <textarea name="attr_edgesdesc" class="sheet-shorttextarea"></textarea>
+            </div>
+          </fieldset>
+        </div>
+        <div class="sheet-col">
+          <div class="sheet-row">
+            <h2>Hindrances</h2>
+          </div>
+          <fieldset class="repeating_hinds">
+            <div class="sheet-row sheet-textarea">
+              <input type="text" name="attr_hindname" placeholder="Hindrance name"><br>
+              <textarea name="attr_hinddesc" class="sheet-shorttextarea"></textarea>
+            </div>
+          </fieldset>
+        </div>
+      </div>
+      <div class="sheet-2colrow">
+        <div class="sheet-col">
+          <div class="sheet-row">
+            <h2>Equipment</h2>
+          </div>
+          <div class="sheet-row sheet-textarea">
+            <textarea name="attr_equipment" class="sheet-textarea" placeholder="Equipment"></textarea>
+          </div>
+        </div>
+        <div class="sheet-col">
+          <div class="sheet-row">
+          <h2>Money</h2>
+          </div>
+          <div class="sheet-row sheet-textarea">
+            <textarea name="attr_money" class="sheet-textarea" placeholder="Money"></textarea>
+          </div>
+        </div>
+      </div>
+      <div class="sheet-2colrow">
+        <div class="sheet-col">
+          <div class="sheet-row">
+            <h2>Your Worst Nightmare</h2>
+          </div>
+          <div class="sheet-row sheet-textarea">
+            <textarea name="attr_nightmare" class="sheet-textarea" placeholder="Elm Street"></textarea>
+          </div>
+        </div>
+        <div class="sheet-col">
+          <div class="sheet-row">
+            <h2>Character Notes</h2>
+          </div>
+          <div class="sheet-row sheet-textarea">
+            <textarea name="attr_notes" class="sheet-textarea" placeholder="Notes"></textarea>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div><!-- Misc Tab -->
+     <!-- Obsolete Data Tab -->
+  <div class="sheet-section-obsolete">
+    <div style="border: 1px solid black">
+        <div class="sheet-alert sheet-alert-warning">
+            <div class="sheet-row" style="margin-bottom: 15px;">
+            This sheet has been recently updated. This section was broke and has been made obsolete. Data on this tab will be removed over time.
+            </div>
+        </div>
+  <div class="sheet-borderdiv">
       <div class="sheet-row sheet-h1">
         <div class="sheet-center">Shootin Irons &amp; Such</div>
       </div>
@@ -1364,9 +1588,9 @@
         <div class="sheet-item sheet-large"><input type="text" name="attr_rngweaponrof1" placeholder="1"></div>
         <div class="sheet-item sheet-large"><input type="text" name="attr_rngweaponrange1" placeholder="10"></div>
         <div class="sheet-item sheet-xxxlarge">
-          <fieldset class="repeating_rngweapons_dmg1">
+          <fieldset class="repeating_rngweaponsdmg1">
             <div class="sheet-item sheet-xxhuge"><input type="text" name="attr_rngweapondamage1" placeholder="3d6"></div>
-            <div class="sheet-item sheet-xlarge"><button type="roll" name="roll_mien" value="@{gmtoggle}&{template:simple} {{rollname=@{rngweaponname1}}} {{damage=[[@{rngweapondamage1}!!]]}} @{locationtoggle}"></button></div>
+            <div class="sheet-item sheet-xlarge"><button type="roll" name="roll_rngweapondamage1" value="@{gmtoggle}&{template:simple} {{rollname=@{rngweaponname1}}} {{damage=[[@{rngweapondamage1}!!]]}} @{locationtoggle}"></button></div>
           </fieldset>
         </div><br>
         <hr>
@@ -1377,9 +1601,9 @@
         <div class="sheet-item sheet-large"><input type="text" name="attr_rngweaponrof2"></div>
         <div class="sheet-item sheet-large"><input type="text" name="attr_rngweaponrange2"></div>
         <div class="sheet-item sheet-xxxlarge">
-          <fieldset class="repeating_rngweapons_dmg2">
+          <fieldset class="repeating_rngweaponsdmg2">
             <div class="sheet-item sheet-xxhuge"><input type="text" name="attr_rngweapondamage2"></div>
-            <div class="sheet-item sheet-xlarge"><button type="roll" name="roll_mien" value="@{gmtoggle}&{template:simple} {{rollname=@{rngweaponname2}}} {{damage=[[@{rngweaponrange2}!!]]}} @{locationtoggle}"></button></div>
+            <div class="sheet-item sheet-xlarge"><button type="roll" name="roll_rngweapondamage2" value="@{gmtoggle}&{template:simple} {{rollname=@{rngweaponname2}}} {{damage=[[@{rngweaponrange2}!!]]}} @{locationtoggle}"></button></div>
           </fieldset>
         </div><br>
         <hr>
@@ -1390,9 +1614,9 @@
         <div class="sheet-item sheet-large"><input type="text" name="attr_rngweaponrof3"></div>
         <div class="sheet-item sheet-large"><input type="text" name="attr_rngweaponrange3"></div>
         <div class="sheet-item sheet-xxxlarge">
-          <fieldset class="repeating_rngweapons_dmg3">
+          <fieldset class="repeating_rngweaponsdmg3">
             <div class="sheet-item sheet-xxhuge"><input type="text" name="attr_rngweapondamage3"></div>
-            <div class="sheet-item sheet-xlarge"><button type="roll" name="roll_mien" value="@{gmtoggle}&{template:simple} {{rollname=@{rngweaponname3}}} {{damage=[[@{rngweaponrange3}!!]]}} @{locationtoggle}"></button></div>
+            <div class="sheet-item sheet-xlarge"><button type="roll" name="roll_rngweapondamage3" value="@{gmtoggle}&{template:simple} {{rollname=@{rngweaponname3}}} {{damage=[[@{rngweaponrange3}!!]]}} @{locationtoggle}"></button></div>
           </fieldset>
         </div><br>
         <hr>
@@ -1403,9 +1627,9 @@
         <div class="sheet-item sheet-large"><input type="text" name="attr_rngweaponrof4"></div>
         <div class="sheet-item sheet-large"><input type="text" name="attr_rngweaponrange4"></div>
         <div class="sheet-item sheet-xxxlarge">
-          <fieldset class="repeating_rngweapons_dmg4">
+          <fieldset class="repeating_rngweaponsdmg4">
             <div class="sheet-item sheet-xxhuge"><input type="text" name="attr_rngweapondamage4"></div>
-            <div class="sheet-item sheet-xlarge"><button type="roll" name="roll_mien" value="@{gmtoggle}&{template:simple} {{rollname=@{rngweaponname4}}} {{damage=[[@{rngweaponrange4}!!]]}} @{locationtoggle}"></button></div>
+            <div class="sheet-item sheet-xlarge"><button type="roll" name="roll_rngweapondamage4" value="@{gmtoggle}&{template:simple} {{rollname=@{rngweaponname4}}} {{damage=[[@{rngweaponrange4}!!]]}} @{locationtoggle}"></button></div>
           </fieldset>
         </div><br>
         <hr>
@@ -1416,9 +1640,9 @@
         <div class="sheet-item sheet-large"><input type="text" name="attr_rngweaponrof5"></div>
         <div class="sheet-item sheet-large"><input type="text" name="attr_rngweaponrange5"></div>
         <div class="sheet-item sheet-xxxlarge">
-          <fieldset class="repeating_rngweapons_dmg5">
+          <fieldset class="repeating_rngweaponsdmg5">
             <div class="sheet-item sheet-xxhuge"><input type="text" name="attr_rngweapondamage5"></div>
-            <div class="sheet-item sheet-xlarge"><button type="roll" name="roll_mien" value="@{gmtoggle}&{template:simple} {{rollname=@{rngweaponname5}}} {{damage=[[@{rngweaponrange5}!!]]}} @{locationtoggle}"></button></div>
+            <div class="sheet-item sheet-xlarge"><button type="roll" name="roll_rngweapondamage5" value="@{gmtoggle}&{template:simple} {{rollname=@{rngweaponname5}}} {{damage=[[@{rngweaponrange5}!!]]}} @{locationtoggle}"></button></div>
           </fieldset>
         </div><br>
         <hr>
@@ -1429,9 +1653,9 @@
         <div class="sheet-item sheet-large"><input type="text" name="attr_rngweaponrof6"></div>
         <div class="sheet-item sheet-large"><input type="text" name="attr_rngweaponrange6"></div>
         <div class="sheet-item sheet-xxxlarge">
-          <fieldset class="repeating_rngweapons_dmg6">
+          <fieldset class="repeating_rngweaponsdmg6">
             <div class="sheet-item sheet-xxhuge"><input type="text" name="attr_rngweapondamage6"></div>
-            <div class="sheet-item sheet-xlarge"><button type="roll" name="roll_mien" value="@{gmtoggle}&{template:simple} {{rollname=@{rngweaponname6}}} {{damage=[[@{rngweapondamage6}!!]]}} @{locationtoggle}"></button></div>
+            <div class="sheet-item sheet-xlarge"><button type="roll" name="roll_rngweapondamage6" value="@{gmtoggle}&{template:simple} {{rollname=@{rngweaponname6}}} {{damage=[[@{rngweapondamage6}!!]]}} @{locationtoggle}"></button></div>
           </fieldset>
         </div><br>
         <hr>
@@ -1527,362 +1751,5 @@
     </div>
   </div>
   <!-- Combat Stuff Tab -->
-
-  <!-- Arcane Ablities Tab -->
-  <div class="sheet-section-arcane">
-    <div class="sheet-row sheet-h1">
-      <div class="sheet-center">Arcane Abilities</div>
-    </div>
-    <div class="sheet-row">
-      <div class="sheet-item sheet-large"><label><b>Hexslingin'</b></label></div>
-      <div class="sheet-item sheet-small"><input type="number" name="attr_hexslinginlvl"></div>
-      <div class="sheet-item sheet-large"><b>Ritual</b></div>
-      <div class="sheet-item sheet-small">
-        <input type="number" name="attr_rituallvl">
-      </div>
-      <div class="sheet-item sheet-large"><b>Rituals</b></div>
-      <div class="sheet-item sheet-huge">
-        <input type="text" name="attr_rituals">
-      </div>
-    </div>
-    <br>
-    <div class="sheet-row">
-      <div class="sheet-item sheet-large"><label><b>Power</b></label></div>
-      <div class="sheet-item sheet-small"><label><b>Speed</b></label></div>
-      <div class="sheet-item sheet-large"><label><b>Duration</b></label></div>
-      <div class="sheet-item sheet-small"><label><b>Range</b></label></div>
-      <div class="sheet-item sheet-small"><label><b>Trait</b></label></div>
-      <div class="sheet-item sheet-small"><label><b>TN</b></label></div>
-      <div class="sheet-item sheet-large"><label><b>Notes</b></label></div>
-      <fieldset class="repeating_spells" style="display: none;">
-        <div class="sheet-item sheet-large"><input type="text" name="attr_spellname" placeholder="Shadow Man"></div>
-        <div class="sheet-item sheet-small"><input type="number" name="attr_spellspeed" placeholder="2"></div>
-        <div class="sheet-item sheet-large"><input type="text" name="attr_spelldur" placeholder="Concentration"></div>
-        <div class="sheet-item sheet-small"><input type="text" name="attr_spellran" placeholder="Self"></div>
-        <div class="sheet-item sheet-small"><input type="text" name="attr_spelltrait" placeholder="Smarts"></div>
-        <div class="sheet-item sheet-small"><input type="text" name="attr_spelltn" placeholder="Target Number"></div>
-        <div class="sheet-item sheet-huge"><textarea name="attr_spellnotes" class="sheet-shorttextarea" placeholder="Notes"></textarea></div>
-      </fieldset>
-      <div class="repcontainer" data-groupname="repeating_spells"></div>
-    </div>
   </div>
-  <!-- Arcane Ablities Tab -->
-
-  <!-- Misc Tab -->
-  <div class="sheet-section-misc">
-    <div class="sheet-row">
-      <div class="sheet-2colrow">
-        <div class="sheet-col">
-          <div class="sheet-row">
-            <h2>Edges</h2>
-          </div>
-          <fieldset class="repeating_edges">
-            <div class="sheet-row sheet-textarea">
-              <input type="text" name="attr_edgename" placeholder="Edge name"><br>
-              <textarea name="attr_edgesdesc" class="sheet-shorttextarea"></textarea>
-            </div>
-          </fieldset>
-        </div>
-        <div class="sheet-col">
-          <div class="sheet-row">
-            <h2>Hindrances</h2>
-          </div>
-          <fieldset class="repeating_hinds">
-            <div class="sheet-row sheet-textarea">
-              <input type="text" name="attr_hindname" placeholder="Hindrance name"><br>
-              <textarea name="attr_hinddesc" class="sheet-shorttextarea"></textarea>
-            </div>
-          </fieldset>
-        </div>
-      </div>
-      <div class="sheet-2colrow">
-        <div class="sheet-col">
-          <div class="sheet-row">
-            <h2>Equipment</h2>
-          </div>
-          <div class="sheet-row sheet-textarea">
-            <textarea name="attr_equipment" class="sheet-textarea" placeholder="Equipment"></textarea>
-          </div>
-        </div>
-        <div class="sheet-col">
-          <div class="sheet-row">
-          <h2>Money</h2>
-          </div>
-          <div class="sheet-row sheet-textarea">
-            <textarea name="attr_money" class="sheet-textarea" placeholder="Money"></textarea>
-          </div>
-        </div>
-      </div>
-      <div class="sheet-2colrow">
-        <div class="sheet-col">
-          <div class="sheet-row">
-            <h2>Your Worst Nightmare</h2>
-          </div>
-          <div class="sheet-row sheet-textarea">
-            <textarea name="attr_nightmare" class="sheet-textarea" placeholder="Elm Street"></textarea>
-          </div>
-        </div>
-        <div class="sheet-col">
-          <div class="sheet-row">
-            <h2>Character Notes</h2>
-          </div>
-          <div class="sheet-row sheet-textarea">
-            <textarea name="attr_notes" class="sheet-textarea" placeholder="Notes"></textarea>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-  <!-- Misc Tab -->
-
-  <!-- Obsolete Data Tab -->
-  <div class="sheet-section-obsolete">
-    <div class="sheet-row">
-      <div class="sheet-alert sheet-alert-warning">
-          <div class="sheet-row" style="margin-bottom: 15px;">
-          This sheet has been recently updated. Some fields have been obsoleted. Please review and ensure your information is correct.<br />
-          Data on this tab will be removed over time. It is obsolete fields from the orginal Kevin Justus sheet design.
-          </div>
-      </div>
-    </div>
-    <div class="sheet-2colrow">
-      <div class="sheet-col">
-        <div class="sheet-h2">Shootin Irons &amp; Such</div>
-    <div>
-    <table>
-      <tbody>
-        <tr>
-      <th><p><b>Weapon</b></p></th>
-      <th><p><b>Shots</b></p></th>
-      <th><p><b>RoF</b></p></th>
-      <th><p><b>Range</b></p></th>
-      <th><p><b>Damage</b></p></th>
-        </tr>
-      <tr>
-        <td><input type="text" name="attr_weapon1name" style="width: 100px"></td>
-    <td><input type="number" name="attr_weapon1shots" style="width: 50px"></td>
-    <td><input type="number" name="attr_weapon1rof" style="width: 40px"></td>
-    <td><input type="number" name="attr_weapon1range" style="width: 50px"></td>
-    <td><input type="text" name="attr_weapon1damage" style="width: 80px"></td>
-      </tr><tr>
-        <td><input type="text" name="attr_weapon2name" style="width: 100px"></td>
-    <td><input type="number" name="attr_weapon2shots" style="width: 50px"></td>
-    <td><input type="number" name="attr_weapon2rof" style="width: 40px"></td>
-    <td><input type="number" name="attr_weapon2range" style="width: 50px"></td>
-    <td><input type="text" name="attr_weapon2damage" style="width: 80px"></td>
-      </tr>
-    <tr>
-        <td><input type="text" name="attr_weapon3name" style="width: 100px"></td>
-    <td><input type="number" name="attr_weapon3shots" style="width: 50px"></td>
-    <td><input type="number" name="attr_weapon3rof" style="width: 40px"></td>
-    <td><input type="number" name="attr_weapon3range" style="width: 50px"></td>
-    <td><input type="text" name="attr_weapon3damage" style="width: 80px"></td>
-      </tr>
-    </tbody>
-    </table>
-    </div>
-    <div class="sheet-h2">Hand-To-Hand Weapons</div>
-    <div>
-    <table>
-      <tbody>
-        <tr>
-          <th><p><b>Weapon</b></p></th>
-          <th><p><b>Defense</b></p></th>
-          <th><p><b>Speed</b></p></th>
-          <th><p><b>Damage</b></p></th>
-    </tr>
-    <tr>
-      <td>
-      <input type="text" name="attr_weapon4name" value="Fist" style="width: 100px" disabled="" data-formula="Fist">
-      </td>
-      <td>
-      <input type="number" name="attr_weapon4def" value="0" style="width: 50px" disabled="" data-formula="0">
-      </td>
-      <td>
-        <input type="number" name="attr_weapon4speed" value="1" style="width: 40px" disabled="" data-formula="1">
-      </td>
-      <td>
-        <input type="text" name="attr_weapon4damage" style="width: 100px">
-      </td>
-    </tr>
-    <tr>
-      <td>
-      <input type="text" name="attr_weapon5name" style="width: 100px">
-      </td>
-      <td>
-      <input type="number" name="attr_weapon5def" style="width: 50px">
-      </td>
-      <td>
-        <input type="number" name="attr_weapon5speed" style="width: 40px">
-      </td>
-      <td>
-        <input type="text" name="attr_weapon5damage" style="width: 100px">
-      </td>
-    </tr>
-    <tr>
-      <td>
-      <input type="text" name="attr_weapon6name" style="width: 100px">
-      </td>
-      <td>
-      <input type="number" name="attr_weapon6def" style="width: 50px">
-      </td>
-      <td>
-        <input type="number" name="attr_weapon6speed" style="width: 40px">
-      </td>
-      <td>
-        <input type="text" name="attr_weapon6damage" style="width: 100px">
-      </td>
-    </tr>
-      </tbody>
-    </table>
-    </div>
-    </div>
-    <div class="sheet-col">
-      <div class="sheet-2colrow">
-      <div class="sheet-col">
-        <div class="sheet-row sheet-h3">Ammo One</div>
-            <div class="sheet-row"><div class="sheet-row">
-    <div class="sheet-item sheet-ammo1"><b>0</b></div>
-      <div class="sheet-item sheet-ammo1"><b>1</b></div>
-      <div class="sheet-item sheet-ammo1"><b>2</b></div>
-      <div class="sheet-item sheet-ammo1"><b>3</b></div>
-      <div class="sheet-item sheet-ammo1"><b>4</b></div>
-      <div class="sheet-item sheet-ammo1"><b>5</b></div>
-      <div class="sheet-item sheet-ammo1"><b>6</b></div>
-    </div>
-    <div class="sheet-row">
-        <div class="sheet-item sheet-ammo1">
-      <input type="radio" name="attr_ammo1" value="0">
-    </div>
-    <div class="sheet-item sheet-ammo1">
-      <input type="radio" name="attr_ammo1" value="1">
-    </div>
-    <div class="sheet-item sheet-ammo1">
-      <input type="radio" name="attr_ammo1" value="2">
-    </div>
-    <div class="sheet-item sheet-ammo1">
-      <input type="radio" name="attr_ammo1" value="3">
-    </div>
-    <div class="sheet-item sheet-ammo1">
-      <input type="radio" name="attr_ammo1" value="4">
-    </div>
-    <div class="sheet-item sheet-ammo1">
-      <input type="radio" name="attr_ammo1" value="5">
-    </div>
-    <div class="sheet-item sheet-ammo1">
-      <input type="radio" name="attr_ammo1" value="6"></div></div>
-      </div></div>
-      <div class="sheet-col">
-      <div class="sheet-row sheet-h3">Ammo Two</div>
-            <div class="sheet-row">
-    <div class="sheet-row">
-    <div class="sheet-item sheet-ammo1"><b>0</b></div>
-      <div class="sheet-item sheet-ammo1"><b>1</b></div>
-      <div class="sheet-item sheet-ammo1"><b>2</b></div>
-      <div class="sheet-item sheet-ammo1"><b>3</b></div>
-      <div class="sheet-item sheet-ammo1"><b>4</b></div>
-      <div class="sheet-item sheet-ammo1"><b>5</b></div>
-      <div class="sheet-item sheet-ammo1"><b>6</b></div>
-    </div>
-    <div class="sheet-row">
-        <div class="sheet-item sheet-ammo1">
-      <input type="radio" name="attr_ammo2" value="0">
-    </div>
-    <div class="sheet-item sheet-ammo1">
-      <input type="radio" name="attr_ammo2" value="1">
-    </div>
-    <div class="sheet-item sheet-ammo1">
-      <input type="radio" name="attr_ammo2" value="2">
-    </div>
-    <div class="sheet-item sheet-ammo1">
-      <input type="radio" name="attr_ammo2" value="3">
-    </div>
-    <div class="sheet-item sheet-ammo1">
-      <input type="radio" name="attr_ammo2" value="4">
-    </div>
-    <div class="sheet-item sheet-ammo1">
-      <input type="radio" name="attr_ammo2" value="5">
-    </div>
-    <div class="sheet-item sheet-ammo1">
-      <input type="radio" name="attr_ammo2" value="6"></div></div>
-
-
-
-    </div></div></div>
-    <div class="sheet-row"><div class="sheet-row"><div class="sheet-h3">Ammo Three</div>
-    </div>
-    <div class="sheet-row"><div class="sheet-row"><div class="sheet-row">
-        <div class="sheet-item sheet-ammo3"><b>0</b></div>
-    <div class="sheet-item sheet-ammo3"><b>1</b></div>
-    <div class="sheet-item sheet-ammo3"><b>2</b></div>
-    <div class="sheet-item sheet-ammo3"><b>3</b></div>
-    <div class="sheet-item sheet-ammo3"><b>4</b></div>
-    <div class="sheet-item sheet-ammo3"><b>5</b></div>
-    <div class="sheet-item sheet-ammo3"><b>6</b></div>
-    <div class="sheet-item sheet-ammo3"><b>7</b></div>
-    <div class="sheet-item sheet-ammo3"><b>8</b></div>
-    <div class="sheet-item sheet-ammo3"><b>9</b></div>
-    <div class="sheet-item sheet-ammo3"><b>10</b></div>
-    <div class="sheet-item sheet-ammo3"><b>11</b></div>
-    <div class="sheet-item sheet-ammo3"><b>12</b></div>
-    <div class="sheet-item sheet-ammo3"><b>13</b></div>
-    <div class="sheet-item sheet-ammo3"><b>14</b></div>
-    <div class="sheet-item sheet-ammo3"><b>15</b></div>
-      </div>
-
-      <div class="sheet-row">
-        <div class="sheet-item sheet-ammo3">
-      <input type="radio" name="attr_ammo3" value="0">
-    </div>
-    <div class="sheet-item sheet-ammo3">
-      <input type="radio" name="attr_ammo3" value="1">
-    </div>
-    <div class="sheet-item sheet-ammo3">
-      <input type="radio" name="attr_ammo3" value="2">
-    </div>
-    <div class="sheet-item sheet-ammo3">
-      <input type="radio" name="attr_ammo3" value="3">
-    </div>
-    <div class="sheet-item sheet-ammo3">
-      <input type="radio" name="attr_ammo3" value="4">
-    </div>
-    <div class="sheet-item sheet-ammo3">
-      <input type="radio" name="attr_ammo3" value="5">
-    </div>
-    <div class="sheet-item sheet-ammo3">
-      <input type="radio" name="attr_ammo3" value="6">
-    </div>
-    <div class="sheet-item sheet-ammo3">
-      <input type="radio" name="attr_ammo3" value="7">
-    </div>
-    <div class="sheet-item sheet-ammo3">
-      <input type="radio" name="attr_ammo3" value="8">
-    </div>
-    <div class="sheet-item sheet-ammo3">
-      <input type="radio" name="attr_ammo3" value="9">
-    </div>
-    <div class="sheet-item sheet-ammo3">
-      <input type="radio" name="attr_ammo3" value="10">
-    </div>
-    <div class="sheet-item sheet-ammo3">
-      <input type="radio" name="attr_ammo3" value="11">
-    </div>
-    <div class="sheet-item sheet-ammo3">
-      <input type="radio" name="attr_ammo3" value="12">
-    </div>
-    <div class="sheet-item sheet-ammo3">
-      <input type="radio" name="attr_ammo3" value="13">
-    </div>
-    <div class="sheet-item sheet-ammo3">
-      <input type="radio" name="attr_ammo3" value="14">
-    </div>
-    <div class="sheet-item sheet-ammo3">
-      <input type="radio" name="attr_ammo3" value="15">
-    </div>
-      </div>
-      </div></div>
-      </div>
-      </div></div>
-  </div>
-  <!-- Obsolete Data Tab -->
-</div>
\ No newline at end of file
+</div><!-- Sheet wrapper-->
\ No newline at end of file