diff --git a/Castles&Crusades/C&C.html b/Castles&Crusades/C&C.html
index 71cb050e16..b0a0892612 100644
--- a/Castles&Crusades/C&C.html
+++ b/Castles&Crusades/C&C.html
@@ -3,15 +3,15 @@
       <table>
          <tr>
             <td><b>Name:</b></td>
-            <td><input type="text" name="attr_charname" /></td>
+            <td><input type="text" name="attr_CharacterName" /></td>
          </tr>
          <tr>
             <td><b>Class:</b></td>
-            <td><input type="text" name="attr_class" /></td>
+            <td><input type="text" name="attr_Class" /></td>
          </tr>
          <tr>
             <td><b>Race:</b></td>
-            <td><input type="text" name="attr_race" /></td>
+            <td><input type="text" name="attr_Race" /></td>
          </tr>
          <tr>
             <td><b>Alignment:</b></td>
@@ -37,17 +37,17 @@
             <td colspan="2"><hr /></td>
          </tr>
          <tr>
-            <td><b>Level:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b><input type="number" name="attr_level" class="sheet-short" />
+            <td><b>Level:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b><input type="number" name="attr_Level" class="sheet-short" />
             
          </tr>
          <tr>
             <td colspan="2">&nbsp;</td>
          </tr>
          <tr>
-            <td colspan="2"><b>Experience:</b>&nbsp;&nbsp;<input type="number" name="attr_exp" class="medium"/><b></td>
+            <td colspan="2"><b>Experience:</b>&nbsp;&nbsp;<input type="number" name="attr_Experience" class="medium"/><b></td>
          </tr>
          <tr>
-            <td colspan="2"><b>Next level:</b>&nbsp;&nbsp;&nbsp;&nbsp;<input type="number" name="attr_exp_next" class="medium" /><b></td>
+            <td colspan="2"><b>Next level:</b>&nbsp;&nbsp;&nbsp;&nbsp;<input type="number" name="attr_NextLevel" class="medium" /><b></td>
          </tr>
          <tr>
             <td colspan="2"><hr /></td>
@@ -124,16 +124,16 @@
             <td colspan="5"><hr /></td>
          </tr>
          <tr>
-            <td colspan="5" style='background-color: #26ADE4; color: #000000; font-weight: bold;'>&nbsp;&nbsp;&nbsp;AC&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Armor&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Shield&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Mod&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Magic&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Misc</td>
+            <td colspan="5" style='background-color: #26ADE4; color: #000000; font-weight: bold;'>&nbsp;&nbsp;&nbsp;AC&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Armor&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Shield&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Mod&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Magic&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Misc</td>
          </tr>
          <tr>
             <td colspan="5">
                 <input type="number" name="attr_AC" class="sheet-short" value="10" /> = 10 + 
-                <input type="number" name="attr_AC_armor" class="sheet-short" />
-                &nbsp;&nbsp;&nbsp;&nbsp;<input type="number" name="attr_AC_shield" class="sheet-short" />
-                &nbsp;&nbsp;&nbsp;&nbsp;<input type="number" name="attr_AC_mod" class="sheet-short" />
-                &nbsp;&nbsp;&nbsp;&nbsp;<input type="number" name="attr_AC_magic" class="sheet-short" />
-                &nbsp;&nbsp;&nbsp;<input type="number" name="attr_AC_misc" class="sheet-short" />
+                <input type="number" name="attr_ArmorAC" class="sheet-short" />
+                &nbsp;&nbsp;&nbsp;&nbsp;<input type="number" name="attr_ShieldAC" class="sheet-short" />
+                &nbsp;&nbsp;&nbsp;&nbsp;<input type="number" name="attr_ModAC" class="sheet-short" />
+                &nbsp;&nbsp;&nbsp;&nbsp;<input type="number" name="attr_MagicAC" class="sheet-short" />
+                &nbsp;&nbsp;<input type="number" name="attr_MiscAC" class="sheet-short" />
          </tr>
       </table>
    </div>
@@ -150,17 +150,17 @@
       <tr>
          <td>
             <fieldset class="repeating_weapons">
-               <input type="text" name="attr_weapon_name" class="medium" />
-               &nbsp;&nbsp;&nbsp;&nbsp;<input type="text" name="attr_weapon_bth" class="short" />
-               &nbsp;&nbsp;&nbsp;&nbsp;<input type="text" name="attr_weapon_hit_mod" class="short" />
-               &nbsp;&nbsp;&nbsp;&nbsp;<input type="text" name="attr_weapon_hit_misc" class="short" />
-               &nbsp;&nbsp;&nbsp;&nbsp;<input type="text" name="attr_weapon_hit_magic" class="short" />
-               &nbsp;&nbsp;&nbsp;&nbsp;<input type="text" name="attr_weapon_hit_total" class="short" />
-               &nbsp;&nbsp;&nbsp;&nbsp;<input type="text" name="attr_weapon_dmg" class="short" />
-               &nbsp;&nbsp;&nbsp;&nbsp;<input type="text" name="attr_weapon_dmg_mod" class="short" />
-               &nbsp;&nbsp;&nbsp;&nbsp;<input type="text" name="attr_weapon_dmg_misc" class="short" />
-               &nbsp;&nbsp;&nbsp;&nbsp;<input type="text" name="attr_weapon_dmg_magic" class="short" />
-               &nbsp;&nbsp;&nbsp;&nbsp;<input type="text" name="attr_weapon_dmg_total" class="short" />
+               <input type="text" name="attr_WeaponName" class="medium" />
+               &nbsp;&nbsp;&nbsp;&nbsp;<input type="text" name="attr_WeaponBth" class="short" />
+               &nbsp;&nbsp;&nbsp;&nbsp;<input type="text" name="attr_WeaponHitMod" class="short" />
+               &nbsp;&nbsp;&nbsp;&nbsp;<input type="text" name="attr_WeaponHitMisc" class="short" />
+               &nbsp;&nbsp;&nbsp;&nbsp;<input type="text" name="attr_WeaponHitMagic" class="short" />
+               &nbsp;&nbsp;&nbsp;&nbsp;<input type="text" name="attr_WeaponHitTotal" class="short" />
+               &nbsp;&nbsp;&nbsp;&nbsp;<input type="text" name="attr_WeaponDmg" class="short" />
+               &nbsp;&nbsp;&nbsp;&nbsp;<input type="text" name="attr_WeaponDmgMod" class="short" />
+               &nbsp;&nbsp;&nbsp;&nbsp;<input type="text" name="attr_WeaponDmgMisc" class="short" />
+               &nbsp;&nbsp;&nbsp;&nbsp;<input type="text" name="attr_WeaponDmgMagic" class="short" />
+               &nbsp;&nbsp;&nbsp;&nbsp;<input type="text" name="attr_WeaponDmgTotal" class="short" />
             </fieldset>
          </td>
       </tr>
@@ -176,7 +176,7 @@
          <tr>
             <td>
                <fieldset class="repeating_classabilities">
-                  <input type="text" name="attr_class_ability" class="long" />
+                  <input type="text" name="attr_ClassAbility" class="long" />
                </fieldset>
             </td>
          </tr>
@@ -189,7 +189,7 @@
          <tr>
             <td>
                <fieldset class="repeating_raceabilities">
-                  <input type="text" name="attr_race_ability" class="long" />
+                  <input type="text" name="attr_RaceAbility" class="long" />
                </fieldset>
             </td>
          </tr>
@@ -202,18 +202,90 @@
          </tr>
          <tr>
             <td style='background-color: #26ADE4; color: #000000; font-weight: bold;'>Level</td>
-            <td style='background-color: #26ADE4; color: #000000; font-weight: bold;'>&nbsp;&nbsp;&nbsp;#Spells</td>
-            <td style='background-color: #26ADE4; color: #000000; font-weight: bold;'>&nbsp;&nbsp;&nbsp;Bonus<br />&nbsp;&nbsp;&nbsp;Spells</td>
-            <td style='background-color: #26ADE4; color: #000000; font-weight: bold;'>&nbsp;&nbsp;&nbsp;Total</td>
+            <td style='background-color: #26ADE4; color: #000000; font-weight: bold;'>&nbsp;&nbsp;#Spells</td>
+            <td style='background-color: #26ADE4; color: #000000; font-weight: bold;'>&nbsp;&nbsp;Bonus<br />&nbsp;&nbsp;Spells</td>
+            <td style='background-color: #26ADE4; color: #000000; font-weight: bold;'>&nbsp;&nbsp;Total</td>
          </tr>
          <tr>
             <td colspan="4">
                0th&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-               <input type="text" name="attr_numspells_first" class="short" />&nbsp;&nbsp;&nbsp;+&nbsp;&nbsp;&nbsp;
+               <input type="text" name="attr_numspells_zero" class="short" />&nbsp;&nbsp;+&nbsp;&nbsp;&nbsp;
+               <input type="text" name="attr_bonusspells_zero" class="short" />&nbsp;&nbsp;=&nbsp;
+               <input type="text" name="attr_total_spells_zero" class="short" />
+            </td>
+         </tr>
+         <tr>
+            <td colspan="4">
+               1st&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+               <input type="text" name="attr_numspells_first" class="short" />&nbsp;&nbsp;+&nbsp;&nbsp;&nbsp;
                <input type="text" name="attr_bonusspells_first" class="short" />&nbsp;&nbsp;=&nbsp;
                <input type="text" name="attr_total_spells_first" class="short" />
             </td>
          </tr>
+         <tr>
+            <td colspan="4">
+               2nd&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+               <input type="text" name="attr_numspells_second" class="short" />&nbsp;&nbsp;+&nbsp;&nbsp;&nbsp;
+               <input type="text" name="attr_bonusspells_second" class="short" />&nbsp;&nbsp;=&nbsp;
+               <input type="text" name="attr_total_spells_second" class="short" />
+            </td>
+         </tr>
+         <tr>
+            <td colspan="4">
+               3rd&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+               <input type="text" name="attr_numspells_third" class="short" />&nbsp;&nbsp;+&nbsp;&nbsp;&nbsp;
+               <input type="text" name="attr_bonusspells_third" class="short" />&nbsp;&nbsp;=&nbsp;
+               <input type="text" name="attr_total_spells_third" class="short" />
+            </td>
+         </tr>
+         <tr>
+            <td colspan="4">
+               4th&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+               <input type="text" name="attr_numspells_fourth" class="short" />&nbsp;&nbsp;+&nbsp;&nbsp;&nbsp;
+               <input type="text" name="attr_bonusspells_fourth" class="short" />&nbsp;&nbsp;=&nbsp;
+               <input type="text" name="attr_total_spells_fourth" class="short" />
+            </td>
+         </tr>
+         <tr>
+            <td colspan="4">
+               5th&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+               <input type="text" name="attr_numspells_fifth" class="short" />&nbsp;&nbsp;+&nbsp;&nbsp;&nbsp;
+               <input type="text" name="attr_bonusspells_fifth" class="short" />&nbsp;&nbsp;=&nbsp;
+               <input type="text" name="attr_total_spells_fifth" class="short" />
+            </td>
+         </tr>
+         <tr>
+            <td colspan="4">
+               6th&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+               <input type="text" name="attr_numspells_sixth" class="short" />&nbsp;&nbsp;+&nbsp;&nbsp;&nbsp;
+               <input type="text" name="attr_bonusspells_sixth" class="short" />&nbsp;&nbsp;=&nbsp;
+               <input type="text" name="attr_total_spells_sixth" class="short" />
+            </td>
+         </tr>
+         <tr>
+            <td colspan="4">
+               7th&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+               <input type="text" name="attr_numspells_seventh" class="short" />&nbsp;&nbsp;+&nbsp;&nbsp;&nbsp;
+               <input type="text" name="attr_bonusspells_seventh" class="short" />&nbsp;&nbsp;=&nbsp;
+               <input type="text" name="attr_total_spells_seventh" class="short" />
+            </td>
+         </tr>
+         <tr>
+            <td colspan="4">
+               8th&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+               <input type="text" name="attr_numspells_eigth" class="short" />&nbsp;&nbsp;+&nbsp;&nbsp;&nbsp;
+               <input type="text" name="attr_bonusspells_eigth" class="short" />&nbsp;&nbsp;=&nbsp;
+               <input type="text" name="attr_total_spells_eigth" class="short" />
+            </td>
+         </tr>
+         <tr>
+            <td colspan="4">
+               9th&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+               <input type="text" name="attr_numspells_ninth" class="short" />&nbsp;&nbsp;+&nbsp;&nbsp;&nbsp;
+               <input type="text" name="attr_bonusspells_ninth" class="short" />&nbsp;&nbsp;=&nbsp;
+               <input type="text" name="attr_total_spells_ninth" class="short" />
+            </td>
+         </tr>
       </table>
    </div>
 </div>