diff --git a/Exalted2e/exalted2e.css b/Exalted2e/exalted2e.css
index 2f760f4c32..fe705c0fe0 100644
--- a/Exalted2e/exalted2e.css
+++ b/Exalted2e/exalted2e.css
@@ -77,9 +77,10 @@ ul.sheet-craft-types li
     width: 841px;
 }
 
-h4.sheet-span2
+.sheet-span2
 {
     width: 543px;
+    margin-left: 0px;
 }
 
 div[data-groupname="repeating_charms"] .repitem
@@ -95,7 +96,9 @@ div[data-groupname="repeating_charms"] .repitem
 .sheet-languages,
 .sheet-background,
 .sheet-specialty,
-.sheet-intimacy
+.sheet-intimacy,
+.sheet-merit,
+.sheet-flaw
 {
     margin-bottom: 5px;
 }
@@ -140,6 +143,10 @@ span.sheet-span-header
     font-size: 110%;
 }
 
+div.sheet-2colrow.sheet-span2 div.sheet-col { width: 250px; }
+
+div.sheet-2colrow.sheet-span2 div.sheet-col span.sheet-span-header:first-child { width: 200px; }
+
 div.repcontrol { margin-top: 5px; }
 
 div[data-groupname="repeating_attack"] div:not(:first-child) div.sheet-attack
@@ -230,7 +237,9 @@ div.sheet-hearthstones,
 div.sheet-languages,
 div.sheet-specialty,
 div.sheet-intimacy,
-div.sheet-familiar-row
+div.sheet-familiar-row,
+div.sheet-merit,
+div.sheet-flaw
 {
     display: -webkit-flex;
     display: flex;
@@ -246,6 +255,8 @@ div.sheet-hearthstones input[type="text"],
 div.sheet-languages input[type="text"],
 div.sheet-specialty input[type="text"],
 div.sheet-intimacy input[type="text"],
+div.sheet-merit input[type="text"],
+div.sheet-flaw input[type="text"],
 label input[type="text"],
 label input[type="number"],
 label select
@@ -273,7 +284,9 @@ div.sheet-hearthstones input[type="checkbox"],
 div.sheet-hearthstones select,
 div.sheet-charm select,
 div.sheet-charm input[type="text"],
-div.sheet-combo input[type="text"]
+div.sheet-combo input[type="text"],
+div.sheet-merit input[type="text"],
+div.sheet-flaw input[type="text"]
 {
     margin-right: 5px;
 }
@@ -314,10 +327,9 @@ ul.sheet-craft-types
     -moz-border-radius: 5px;
 }
 
-div.sheet-craft-types:hover ul.sheet-craft-types
-{
-    display: block;
-}
+div.sheet-craft-types:hover ul.sheet-craft-types { display: block; }
+
+div.sheet-craft-types:hover ul.sheet-craft-types + div { opacity: 0.4; }
 
 /* Style boxes */
 label input[type="text"],
@@ -337,6 +349,10 @@ div.sheet-hearthstones select,
 div.sheet-languages input[type="text"],
 div.sheet-intimacy input[type="text"],
 div.sheet-familiar-health-row select,
+div.sheet-merit input[type="text"],
+div.sheet-merit input[type="number"],
+div.sheet-flaw input[type="text"],
+div.sheet-flaw input[type="number"],
 table.sheet-familiar-attacks > tbody > tr > td > input[type="text"],
 table.sheet-familiar-attacks > tbody > tr > td > input[type="number"],
 select.sheet-health-label,
@@ -371,6 +387,10 @@ div.sheet-artifacts input[type="text"]:focus,
 div.sheet-hearthstones input[type="text"]:focus,
 div.sheet-languages input[type="text"]:focus,
 div.sheet-intimacy input[type="text"]:focus,
+div.sheet-merit input[type="text"]:focus,
+div.sheet-merit input[type="number"]:focus,
+div.sheet-flaw input[type="text"]:focus,
+div.sheet-flaw input[type="number"]:focus,
 table.sheet-familiar-attacks > tbody > tr > td > input[type="text"]:focus,
 table.sheet-familiar-attacks > tbody > tr > td > input[type="number"]:focus,
 .sheet-fancy:focus
diff --git a/Exalted2e/exalted2e.html b/Exalted2e/exalted2e.html
index f3774f7170..05eb7a06c1 100644
--- a/Exalted2e/exalted2e.html
+++ b/Exalted2e/exalted2e.html
@@ -704,7 +704,16 @@
                             <option value="@{Ride}*(1-@{Ride|max})">Ride</option>
                             <option value="@{Sail}*(1-@{Sail|max})">Sail</option>
                             <option value="@{Socialize}*(1-@{Socialize|max})">Socialize</option>
-                            <option value="@{Craft}*(1-@{Craft|max})">Craft</option>
+                            <option value="@{CraftAir}*(1-@{CraftAir|max})">Craft [Air]</option>
+                            <option value="@{CraftEarth}*(1-@{CraftEarth|max})">Craft [Earth]</option>
+                            <option value="@{CraftFire}*(1-@{CraftFire|max})">Craft [Fire]</option>
+                            <option value="@{CraftWater}*(1-@{CraftWater|max})">Craft [Water]</option>
+                            <option value="@{CraftWood}*(1-@{CraftWood|max})">Craft [Wood]</option>
+                            <option value="@{CraftFate}*(1-@{CraftFate|max})">Craft [Fate]</option>
+                            <option value="@{CraftGenesis}*(1-@{CraftGenesis|max})">Craft [Genesis]</option>
+                            <option value="@{CraftGlamour}*(1-@{CraftGlamour|max})">Craft [Glamour]</option>
+                            <option value="@{CraftMagitech}*(1-@{CraftMagitech|max})">Craft [Magitech]</option>
+                            <option value="@{CraftVitriol}*(1-@{CraftVitriol|max})">Craft [Vitriol]</option>
                             <option value="@{Willpower}">Willpower</option>
                         </select>
                         +
@@ -752,7 +761,16 @@
                             <option value="@{Ride}*(1-@{Ride|max})">Ride</option>
                             <option value="@{Sail}*(1-@{Sail|max})">Sail</option>
                             <option value="@{Socialize}*(1-@{Socialize|max})">Socialize</option>
-                            <option value="@{Craft}*(1-@{Craft|max})">Craft</option>
+                            <option value="@{CraftAir}*(1-@{CraftAir|max})">Craft [Air]</option>
+                            <option value="@{CraftEarth}*(1-@{CraftEarth|max})">Craft [Earth]</option>
+                            <option value="@{CraftFire}*(1-@{CraftFire|max})">Craft [Fire]</option>
+                            <option value="@{CraftWater}*(1-@{CraftWater|max})">Craft [Water]</option>
+                            <option value="@{CraftWood}*(1-@{CraftWood|max})">Craft [Wood]</option>
+                            <option value="@{CraftFate}*(1-@{CraftFate|max})">Craft [Fate]</option>
+                            <option value="@{CraftGenesis}*(1-@{CraftGenesis|max})">Craft [Genesis]</option>
+                            <option value="@{CraftGlamour}*(1-@{CraftGlamour|max})">Craft [Glamour]</option>
+                            <option value="@{CraftMagitech}*(1-@{CraftMagitech|max})">Craft [Magitech]</option>
+                            <option value="@{CraftVitriol}*(1-@{CraftVitriol|max})">Craft [Vitriol]</option>
                             <option value="@{Willpower}">Willpower</option>
                         </select>
                         +
@@ -1151,6 +1169,7 @@
                         </div>
                     </li>
                 </ul>
+                <div class="right" style="padding-right: 20px; font-style: italic">Hover to select crafts</div>
             </div>
             <div class="ability">
                 <input type="checkbox" name="attr_InvestigationFavored" value="1" /><span></span>
@@ -1345,10 +1364,7 @@
             </div>
         </div>
         
-        <div class="sheet-col">
-            <h3 class="ability">Specialties</h3>
-            
-        </div>
+        <div class="sheet-col"><!-- Specialties are on a different page --></div>
     </div>
     
     <h1 class="separator"><span>Advantages</span></h1>
@@ -1376,13 +1392,29 @@
             <textarea name="attr_VirtueFlaw" class="three-lines"></textarea>
         </div>
         <div class="sheet-col">
-            <h4 class="span2">Merits & Flaws</h4>
-            <!--fieldset class="repeating_charms">
-                <div class="charm">
-                    <input type="text" name="attr_CharmName" />
-                    <input type="text" class="very-narrow" name="attr_CharmCost" />
+            <h3 class="center span2">Merits & Flaws</h3>
+            <div class="sheet-2colrow span2">
+                <div class="sheet-col">
+                    <span class="span-header">Merit</span>
+                    <span class="span-header">Cost</span>
+                    <fieldset class="repeating_merits">
+                        <div class="merit">
+                            <input type="text" name="attr_MeritName" />
+                            <input type="number" class="very-narrow" name="attr_MeritCost" min="1" />
+                        </div>
+                    </fieldset>
                 </div>
-            </fieldset-->
+                <div class="sheet-col">
+                    <span class="span-header">Flaw</span>
+                    <span class="span-header">Cost</span>
+                    <fieldset class="repeating_flaws">
+                        <div class="flaw">
+                            <input type="text" name="attr_FlawName" />
+                            <input type="number" class="very-narrow" name="attr_FlawCost" min="1" />
+                        </div>
+                    </fieldset>
+                </div>
+            </div>
             <div class="sheet-2colrow sheet-sub2colrow">
                 <div class="sheet-col">
                     <h1 class="separator"><span>Willpower</span></h1>