diff --git a/Shadowrun5th/Shadowrun5th.css b/Shadowrun5th/Shadowrun5th.css
index fd50c307f3..52a3e9eba8 100644
--- a/Shadowrun5th/Shadowrun5th.css
+++ b/Shadowrun5th/Shadowrun5th.css
@@ -55,13 +55,13 @@ input[type=radio].tabs{
 
 .tab1:checked + div.tablabel,
 .tab1:checked ~ div.gmroll,
-.content1Main{
+.contentMain{
     color:#aaaaee;
 }
 
 .tab2:checked + div.tablabel,
 .tab2:checked ~ div.gmroll,
-.content2{
+.contentSkills{
     color:#aaaaee;
 }
 
@@ -73,13 +73,13 @@ input[type=radio].tabs{
 
 .tab4:checked + div.tablabel,
 .tab4:checked ~ div.gmroll,
-.content4{
+.contentEnhancements{
     color:#aaaaee;
 }
 
 .tab5:checked + div.tablabel,
 .tab5:checked ~ div.gmroll,
-.content5{
+.contentMatrix{
     color:#aaaaee;
 }
 
@@ -91,7 +91,7 @@ input[type=radio].tabs{
 
 .tab7:checked + div.tablabel,
 .tab7:checked ~ div.gmroll,
-.content7{
+.contentEquipment{
     color:#aaaaee;
 }
 
@@ -107,25 +107,25 @@ input[type=radio].tabs{
     color:#aaaaee;
 }
 
-.content1Main,
-.content2,
+.contentMain,
+.contentSkills,
 .contentMagic,
-.content4,
-.content5,
+.contentEnhancements,
+.contentMatrix,
 .contentVehiclesDrones,
-.content7,
+.contentEquipment,
 .contentSocial,
 .contentCharacter{
     display:none;
 }
 
-input[type=radio].tab1:checked ~ div.content1Main,
-input[type=radio].tab2:checked ~ div.content2,
+input[type=radio].tab1:checked ~ div.contentMain,
+input[type=radio].tab2:checked ~ div.contentSkills,
 input[type=radio].tab3:checked ~ div.contentMagic,
-input[type=radio].tab4:checked ~ div.content4,
-input[type=radio].tab5:checked ~ div.content5,
+input[type=radio].tab4:checked ~ div.contentEnhancements,
+input[type=radio].tab5:checked ~ div.contentMatrix,
 input[type=radio].tab6:checked ~ div.contentVehiclesDrones,
-input[type=radio].tab7:checked ~ div.content7,
+input[type=radio].tab7:checked ~ div.contentEquipment,
 input[type=radio].tab8:checked ~ div.contentSocial,
 input[type=radio].tab9:checked ~ div.contentCharacter
 {
@@ -183,6 +183,10 @@ div .chummerimport label{
     margin-left:-100%;
 }
 
+div .chummerimport{
+    padding-left: 15px;
+}
+
 .chummertextfield textarea{
     min-height:10em;
 }
@@ -265,7 +269,7 @@ div .chummercheckwrapper{
 }
 
 
-.content2 h3{
+.contentSkills h3{
     display:inline-block;
     width:35%;
     color:inherit;
@@ -591,7 +595,7 @@ div.spiritstable .technomancycheckbox:not(:checked) ~ div.technobound
     vertical-align:bottom !important;
 }
 
-.content7 .weapon{
+.contentEquipment .weapon{
     display:inline-block;
     margin:2em 0% 0% 2%;
     vertical-align:top;
@@ -1718,6 +1722,10 @@ input.weaponcheckbox:checked ~ div.weaponnoteswrapper{
     display:block;
 }
 
+div .experimental{
+    padding-left: 15px;
+}
+
 .experimental checkbox {
     margin-right: 10px;
 }
diff --git a/Shadowrun5th/Shadowrun5th.html b/Shadowrun5th/Shadowrun5th.html
index 6b8c0bbebd..4a16ac9184 100644
--- a/Shadowrun5th/Shadowrun5th.html
+++ b/Shadowrun5th/Shadowrun5th.html
@@ -41,7 +41,7 @@
     </div>
 
 
-    <div class="content1Main">
+    <div class="contentMain">
         <div class="statblock">
             <h2>Attributes</h2>
             <div class="statcol statcol1">
@@ -3046,7 +3046,7 @@ Can lift overhead (Strength + Nethits) x 5kg}}"></button>
             </div>
         </div>
     </div>
-    <div class="content2">
+    <div class="contentSkills">
         <div class="skills">
             <h2>Active Skills</h2>
             <h3>Physical Skills</h3>
@@ -8061,7 +8061,6 @@ Can lift overhead (Strength + Nethits) x 5kg}}"></button>
                                 <option value="@{skilldicepool68}">Spell</option>
                                 <option value="@{skilldicepool58}">Preparation</option>
                                 <option value="@{skilldicepool67}">Ritual</option>
-                                <option value="@{mag_total}+@{skillrating42}">Complex Form</option>
                             </select>
                         </div>
                         <input type="text" name="attr_spellschool_name" value="@{skillname68}" class="hiddentextfield">
@@ -8148,8 +8147,7 @@ make sure to enter what the spell is resisted with">
                             <select name="attr_spellschool">
                                 <option value="@{skilldicepool68}">Spell</option>
                                 <option value="@{skilldicepool58}">Preparation</option>
-                                <option value="@{skilldicepool67}">Ritual</option>
-                                <option value="@{skilldicepool42}">Complex Form</option>
+                                <option value="@{skilldicepool67}" selected >Ritual</option>
                             </select>
                         </div>
                         <input type="text" name="attr_spellschool_name" value="@{skillname68}" class="hiddentextfield">
@@ -8234,9 +8232,8 @@ make sure to enter what the spell is resisted with">
                         <div class="spellschoolwrapper">
                             <select name="attr_spellschool">
                                 <option value="@{skilldicepool68}">Spell</option>
-                                <option value="@{skilldicepool58}">Preparation</option>
+                                <option value="@{skilldicepool58}" selected>Preparation</option>
                                 <option value="@{skilldicepool67}">Ritual</option>
-                                <option value="@{skilldicepool42}">Complex Form</option>
                             </select>
                         </div>
                         <input type="text" name="attr_spellschool_name" value="@{skillname68}" class="hiddentextfield">
@@ -8331,7 +8328,6 @@ make sure to enter what the spell is resisted with">
                                 <option value="@{skilldicepool68}">Spell</option>
                                 <option value="@{skilldicepool58}">Preparation</option>
                                 <option value="@{skilldicepool67}">Ritual</option>
-                                <option value="@{skilldicepool42}">Complex Form</option>
                             </select>
                         </div>
                         <input type="text" name="attr_spellschool_name" value="@{skillname68}" class="hiddentextfield">
@@ -8391,7 +8387,7 @@ make sure to enter what the spell is resisted with">
                         <label class="spelllabel">Dur</label>
                     </div>
                     <div class="spelldrainwrapper">
-                        <label class="spelllabel technolabel">Fade</label>
+                        <label class="spelllabel">Fade</label>
                     </div>
                     <div class="spelldescriptionwrapper">
                         <label class="spelllabel">Description</label>
@@ -8692,7 +8688,7 @@ make sure to enter what the spell is resisted with">
             </div>
         </div>
     </div>
-    <div class="content4">
+    <div class="contentEnhancements">
         <div class="qualities">
             <h2>Positive Qualities</h2>
             <div class="qualityrow">
@@ -8888,7 +8884,7 @@ make sure to enter what the spell is resisted with">
             </fieldset>
         </div>
     </div>
-    <div class="content5">
+    <div class="contentMatrix">
         <div class="cyberdeck">
             <h2>Cyberdeck</h2>
             <div class="decklabelwrapper"><label>Deck Array</label></div>
@@ -10235,7 +10231,7 @@ Click again to switch to Manual and Remote">
             </fieldset>
         </div>
     </div>
-    <div class="content7">
+    <div class="contentEquipment">
         <div class="equipment">
             <h2>Equipment</h2>
             <div class="equipmentrow">