diff --git a/D&D_5e/D&D_5e.css b/D&D_5e/D&D_5e.css
index 47b91b2001..bc6affd0b9 100644
--- a/D&D_5e/D&D_5e.css
+++ b/D&D_5e/D&D_5e.css
@@ -53,6 +53,9 @@ button[type=roll]:before {
 .sheet-pad-t-heart {
   padding-top: 17px;
 }
+.sheet-mar-t-lg {
+  margin-top: 10px;
+}
 .sheet-mar-b-md {
   margin-bottom: 5px;
 }
@@ -61,6 +64,16 @@ button[type=roll]:before {
   background: url('http://i.imgur.com/RggDtsN.png');
 }
 
+.sheet-is-npc:checked ~ div .sheet-npc-version,
+.sheet-is-npc:not(:checked) ~ div .sheet-pc-version {
+  display: block !important;
+}
+
+.sheet-pc-version,
+.sheet-npc-version {
+  display: none !important;
+}
+
 .sheet-small-note {
   text-align: center;
   font-family: Arial;
@@ -74,6 +87,23 @@ button[type=roll]:before {
   padding: 2px;
 }
 
+.sheet-checkbox-label {
+  font-weight: normal;
+  font-size: 80%;
+  margin-bottom: 0;
+  padding-right: 0;
+  line-height: 100%;
+  height: 10px;
+  cursor: pointer;
+}
+
+.sheet-checkbox-label input[type=checkbox] {
+  -ms-transform: scale(.8); /* IE */
+  -moz-transform: scale(.8); /* FF */
+  -webkit-transform: scale(.8); /* Safari and Chrome */
+  -o-transform: scale(.8); /* Opera */
+}
+
 .sheet-character-name {
   border-top-width: 1px !important;
   border-left-width: 1px !important;
@@ -144,9 +174,8 @@ button[type=roll]:before {
 }
 .sheet-jack-of-all-trades {
   position: absolute;
-  top: -5px;
+  top: 2px;
   right: 0;
-  font-size: 70%;
 }
 
 .sheet-skills select {
@@ -203,10 +232,7 @@ button[type=roll]:before {
   margin-top: 8px;
 }
 .sheet-speed {
-  height: 60px;
-}
-.sheet-speed input {
-  margin-top: 9px;
+  height: 64px;
 }
 
 .sheet-wrap-box-label {
@@ -368,8 +394,27 @@ input.sheet-inspiration:checked + span.sheet-inspiration-tab::before {
 
 /* END Inspiration button Settings */
 
+.sheet-resistances-immunities textarea {
+  width: 100%;
+  height: auto;
+  font-size: 68%;
+  line-height: 100%;
+  margin-bottom: 0;
+}
+.sheet-resistances-immunities input {
+  font-size: 68%;
+}
 
-
+.sheet-resistances-immunities .sheet-small-label {
+  margin-bottom: 5px;
+}
+.sheet-npc-traits textarea {
+  width: 100%;
+  font-size: 80%;
+  line-height: 100%;
+  margin-bottom: 0;
+  margin-bottom: 0;
+}
 
 
 
@@ -603,12 +648,11 @@ div[class="repcontainer editmode"] ~ div[class^="repcontrol"] button[class="btn
 
 /* player/npc button Settings */
 
-div.sheet-player,  div.sheet-npc {
+ div.sheet-npc {
   display: none;
 }
 
-input.sheet-is-npc:checked ~ div.sheet-npc,
-input.sheet-is-npc:not(:checked )~ div.sheet-player
+input.sheet-is-npc:checked ~ div.sheet-npc
 {
   display: block;
 }
@@ -1109,7 +1153,7 @@ button, input, select, textarea,
   border-bottom: 1px dotted #000;
 }
 
-input[type=number],  input[type=text],  select {
+input[type=number],  input[type=text],  select, .sheet-border-bottom-only {
   width: 100%!important;
   margin-bottom:2px!important;
   border-top-width: 0;
diff --git a/D&D_5e/D&D_5e.html b/D&D_5e/D&D_5e.html
index 23f36cfea5..880c2daea4 100644
--- a/D&D_5e/D&D_5e.html
+++ b/D&D_5e/D&D_5e.html
@@ -10,59 +10,56 @@
         </div>
         <div>
           <input class="sheet-character-name" type="text" name="attr_character_name">
-          <div class="sheet-wrap-box-label">Character Name</div>
+          <div class="sheet-wrap-box-label sheet-pc-version">Character Name</div>
+          <div class="sheet-wrap-box-label sheet-npc-version">Creature Name</div>
         </div>
       </div>
       <div class="sheet-col sheet-col-2-3 sheet-header-info">
         <div class="sheet-wrap-box sheet-pad-md">
           <div class="sheet-row">
-            <div class="sheet-col sheet-col-1-4">
-              <div class="sheet-pad-l-sm sheet-pad-r-sm">
-                <input type="text" name="attr_race">
-                <div class="sheet-wrap-box-label">Race</div>
-              </div>
-            </div>
-            <div class="sheet-col sheet-col-5-12">
-              <div class="sheet-pad-l-sm sheet-pad-r-sm">
+            <div class="sheet-col sheet-col-1-4 sheet-pad-r-sm">
+              <div class="sheet-pc-version">
                 <input type="text" name="attr_class">
                 <div class="sheet-wrap-box-label">Class</div>
               </div>
-            </div>
-            <div class="sheet-col sheet-col-1-12" title="This is automatically calculated from your individual class levels listed in the class section">
-              <input type="number" name="attr_level" value="@{barbarian_level} + @{bard_level} + @{cleric_level} + @{druid_level} + @{fighter_level} + @{monk_level} + @{paladin_level} + @{ranger_level} + @{rogue_level} + @{sorcerer_level} + @{warlock_level} + @{wizard_level}" disabled="disabled">
-              <div class="sheet-wrap-box-label">Level</div>
-            </div>
-            <div class="sheet-col sheet-col-1-4">
-              <div class="sheet-pad-l-sm sheet-pad-r-sm">
-                <input type="text" name="attr_background_title">
-                <div class="sheet-wrap-box-label">Background</div>
+              <div class="sheet-npc-version">
+                <input type="text" name="attr_npc_size">
+                <div class="sheet-wrap-box-label">Size</div>
               </div>
             </div>
+            <div class="sheet-col sheet-col-1-5 sheet-pad-r-sm">
+              <input type="text" name="attr_alignment">
+              <div class="sheet-wrap-box-label">Alignment</div>
+            </div>
+            <div class="sheet-col sheet-col-11-20">
+              <input type="text" name="attr_languages">
+              <div class="sheet-wrap-box-label">Languages</div>
+            </div>
           </div>
           <div class="sheet-row">
-            <div class="sheet-col sheet-col-1-4">
-              <div class="sheet-pad-l-sm sheet-pad-r-sm">
-                <input type="text" name="attr_alignment">
-                <div class="sheet-wrap-box-label">Alignment</div>
+            <div class="sheet-col sheet-col-1-4 sheet-pad-r-sm">
+              <input type="text" name="attr_race">
+              <div class="sheet-wrap-box-label sheet-pc-version">Race</div>
+              <div class="sheet-wrap-box-label sheet-npc-version">Type</div>
+            </div>
+            <div class="sheet-col sheet-col-2-5 sheet-pad-r-sm">
+              <input type="text" name="attr_vision">
+              <div class="sheet-wrap-box-label">Senses</div>
+            </div>
+            <div class="sheet-col sheet-col-3-20 sheet-pad-r-sm" title="This is automatically calculated from your individual class levels listed in the class section">
+              <div class="sheet-pc-version">
+                <input type="number" name="attr_level" value="@{barbarian_level} + @{bard_level} + @{cleric_level} + @{druid_level} + @{fighter_level} + @{monk_level} + @{paladin_level} + @{ranger_level} + @{rogue_level} + @{sorcerer_level} + @{warlock_level} + @{wizard_level}" disabled="disabled">
+                <div class="sheet-wrap-box-label">Level</div>
+              </div>
+              <div class="sheet-npc-version">
+                <input type="text" name="attr_npc_challenge">
+                <div class="sheet-wrap-box-label">Challenge</div>
               </div>
             </div>
-            <div class="sheet-col sheet-col-1-4">
-              <div class="sheet-pad-l-sm sheet-pad-r-sm">
-                <input type="text" name="attr_vision">
-                <div class="sheet-wrap-box-label">Vision</div>
-              </div>
-            </div>
-            <div class="sheet-col sheet-col-1-4">
-              <div class="sheet-pad-l-sm sheet-pad-r-sm">
-                <input type="number" name="attr_xp" min="0" step="1">
-                <div class="sheet-wrap-box-label">Current XP</div>
-              </div>
-            </div>
-            <div class="sheet-col sheet-col-1-4">
-              <div class="sheet-pad-l-sm sheet-pad-r-sm">
-                <input type="number" name="attr_xp_next_level" min="0" step="1">
-                <div class="sheet-wrap-box-label">XP for next level</div>
-              </div>
+            <div class="sheet-col sheet-col-1-5 sheet-pad-r-sm">
+              <input type="number" name="attr_xp" min="0" step="1">
+              <div class="sheet-wrap-box-label sheet-pc-version">Experience Points</div>
+              <div class="sheet-wrap-box-label sheet-npc-version">XP</div>
             </div>
           </div>
         </div>
@@ -997,8 +994,10 @@
                     <div class="sheet-col sheet-col-1">
                       <div class="sheet-wrap-box-title sheet-center">Skills</div>
                     <span class="sheet-jack-of-all-trades sheet-vert-middle">
-                      <input type="checkbox" name="attr_jack_of_all_trades" value="floor(@{PB} / 2)">
-                      <span>Jack of all trades</span>
+                      <label class="sheet-checkbox-label">
+                        <input type="checkbox" name="attr_jack_of_all_trades" value="floor(@{PB} / 2)">
+                        <span>Jack of all trades</span>
+                      </label>
                     </span>
                     </div>
                   </div>
@@ -1012,13 +1011,16 @@
             <div class="sheet-col sheet-col-1-2 sheet-pad-r-md">
               <div class="sheet-row sheet-mar-b-md">
                 <div class="sheet-col sheet-col-3-8 sheet-center">
-                  <div class="sheet-shield">
-                    <div class="sheet-pad-t-xl">
+                  <div class="sheet-shield sheet-pad-t-xl">
+                    <div class="sheet-pc-version">
                       <input class="sheet-center sheet-bottom-line-only" type="number" name="attr_AC" value="@{AC_calc}" disabled="disabled">
-                      <div class="sheet-wrap-box-title">
-                        <div>Armor</div>
-                        <div>Class</div>
-                      </div>
+                    </div>
+                    <div class="sheet-npc-version">
+                      <input class="sheet-center sheet-bottom-line-only" type="number" name="attr_AC">
+                    </div>
+                    <div class="sheet-wrap-box-title">
+                      <div>Armor</div>
+                      <div>Class</div>
                     </div>
                   </div>
                 </div>
@@ -1037,7 +1039,7 @@
                 </div>
                 <div class="sheet-col sheet-col-7-24 sheet-center">
                   <div class="sheet-wrap-box sheet-speed">
-                    <input class="sheet-center sheet-bottom-line-only" type="text" name="attr_speed">
+                    <input class="sheet-center sheet-bottom-line-only sheet-mar-t-lg" type="text" name="attr_speed">
                     <div class="sheet-wrap-box-title">Speed</div>
                   </div>
                 </div>
@@ -1069,6 +1071,145 @@
                   </div>
                 </div>
               </div>
+              <div class="sheet-row sheet-mar-b-md">
+                <div class="sheet-col sheet-col-1 sheet-center sheet-hit-dice">
+                  <div class="sheet-wrap-box">
+                    <div class="sheet-row sheet-npc-version">
+                      <div class="sheet-col sheet-col-1-2">
+                        <input class="sheet-center" type="text" name="attr_npc_HP_hit_dice">
+                        <div class="sheet-small-label">HD Note</div>
+                      </div>
+                    </div>
+                    <div class="sheet-row sheet-sub-header">
+                      <div class="sheet-col sheet-col-1-3 sheet-center sheet-small-label">Classes</div>
+                      <div class="sheet-col sheet-col-1-4 sheet-center sheet-small-label">Hit Die</div>
+                      <div class="sheet-col sheet-col-1-6 sheet-center sheet-small-label">Current</div>
+                      <div class="sheet-col sheet-col-1-6 sheet-center sheet-small-label">Max</div>
+                    </div>
+                    <div class="sheet-row sheet-npc-version">
+                      <div class="sheet-col sheet-col-1-3 sheet-hd-row sheet-vert-middle">
+                        <span>Tiny</span>
+                      </div>
+                      <div class="sheet-col sheet-col-1-4 sheet-center sheet-hd-row sheet-vert-middle">
+                        <button type="roll" class="sheet-roll" name="roll_Use_HD_d4" value="&{template:5eDefault} {{title=Spending Hit Dice - 1d4}} {{subheader=@{character_name}}} {{rollname=HP regained}} {{roll=[[ 1d4 + @{constitution_mod} ]]}} ]]}} @{classactionhitdice}">
+                          <span>d4</span>
+                        </button>
+                      </div>
+                      <div class="sheet-col sheet-col-1-6 sheet-vert-middle">
+                        <input class="sheet-bottom-line-only" type="number" name="attr_hd_d4" min="0" step="1">
+                      </div>
+                      <div class="sheet-col sheet-col-1-6">
+                        <input class="sheet-bottom-line-only" type="number" name="attr_hd_d4_max">
+                      </div>
+                    </div>
+                    <div class="sheet-row">
+                      <div class="sheet-col sheet-col-1-3 sheet-hd-row sheet-vert-middle">
+                        <span class="sheet-pc-version">Sorcerer, Wizard</span>
+                        <span class="sheet-npc-version">Small</span>
+                      </div>
+                      <div class="sheet-col sheet-col-1-4 sheet-center sheet-hd-row sheet-vert-middle">
+                        <button type="roll" class="sheet-roll" name="roll_Use_HD_d6" value="&{template:5eDefault} {{title=Spending Hit Dice - 1d6}} {{subheader=@{character_name}}} {{rollname=HP regained}} {{roll=[[ 1d6 + @{constitution_mod} ]]}} ]]}} @{classactionhitdice}">
+                          <span>d6</span>
+                        </button>
+                      </div>
+                      <div class="sheet-col sheet-col-1-6 sheet-vert-middle">
+                        <input class="sheet-bottom-line-only" type="number" name="attr_hd_d6" min="0" step="1">
+                      </div>
+                      <div class="sheet-col sheet-col-1-6">
+                        <div class="sheet-pc-version">
+                          <input class="sheet-bottom-line-only" type="number" name="attr_hd_d6_max" value="@{sorcerer_level} + @{wizard_level}" disabled="disabled">
+                        </div>
+                        <div class="sheet-npc-version">
+                          <input class="sheet-bottom-line-only" type="number" name="attr_hd_d6_max">
+                        </div>
+                      </div>
+                    </div>
+                    <div class="sheet-row">
+                      <div class="sheet-col sheet-col-1-3 sheet-hd-row sheet-vert-middle">
+                        <span class="sheet-pc-version">Bard, Cleric, Druid, Rogue, Monk, Warlock</span>
+                        <span class="sheet-npc-version">Medium</span>
+                      </div>
+                      <div class="sheet-col sheet-col-1-4 sheet-center sheet-hd-row sheet-vert-middle">
+                        <button type="roll" class="sheet-roll" name="roll_Use_HD_d8" value="&{template:5eDefault} {{title=Spending Hit Dice - 1d8}} {{subheader=@{character_name}}} {{rollname=HP regained}} {{roll=[[ 1d8 + @{constitution_mod} ]]}} ]]}} @{classactionhitdice}">
+                          <span>d8</span>
+                        </button>
+                      </div>
+                      <div class="sheet-col sheet-col-1-6 sheet-vert-middle">
+                        <input class="sheet-bottom-line-only" type="number" name="attr_hd_d8" min="0" step="1">
+                      </div>
+                      <div class="sheet-col sheet-col-1-6">
+                        <div class="sheet-pc-version">
+                          <input class="sheet-bottom-line-only" type="number" name="attr_hd_d8_max" value="@{bard_level} + @{cleric_level} + @{druid_level} + @{rogue_level} + @{monk_level} + @{warlock_level}" disabled="disabled">
+                        </div>
+                        <div class="sheet-npc-version">
+                          <input class="sheet-bottom-line-only" type="number" name="attr_hd_d8_max">
+                        </div>
+                      </div>
+                    </div>
+                    <div class="sheet-row">
+                      <div class="sheet-col sheet-col-1-3 sheet-hd-row sheet-vert-middle">
+                        <span class="sheet-pc-version">Fighter, Paladin, Ranger</span>
+                        <span class="sheet-npc-version">Large</span>
+                      </div>
+                      <div class="sheet-col sheet-col-1-4 sheet-center sheet-hd-row sheet-vert-middle">
+                        <button type="roll" class="sheet-roll" name="roll_Use_HD_d10" value="&{template:5eDefault} {{title=Spending Hit Dice - 1d10}} {{subheader=@{character_name}}} {{rollname=HP regained}} {{roll=[[ 1d10 + @{constitution_mod} ]]}} ]]}} @{classactionhitdice}">
+                          <span>d10</span>
+                        </button>
+                      </div>
+                      <div class="sheet-col sheet-col-1-6 sheet-vert-middle">
+                        <input class="sheet-bottom-line-only" type="number" name="attr_hd_d10" min="0" step="1">
+                      </div>
+                      <div class="sheet-col sheet-col-1-6">
+                        <div class="sheet-pc-version">
+                          <input class="sheet-bottom-line-only" type="number" name="attr_hd_d10_max" value="@{fighter_level} + @{paladin_level} + @{ranger_level}" disabled="disabled">
+                        </div>
+                        <div class="sheet-npc-version">
+                          <input class="sheet-bottom-line-only" type="number" name="attr_hd_d10_max">
+                        </div>
+                      </div>
+                    </div>
+                    <div class="sheet-row">
+                      <div class="sheet-col sheet-col-1-3 sheet-hd-row sheet-vert-middle">
+                        <span class="sheet-pc-version">Barbarian</span>
+                        <span class="sheet-npc-version">Large</span>
+                      </div>
+                      <div class="sheet-col sheet-col-1-4 sheet-center sheet-hd-row sheet-vert-middle">
+                        <button type="roll" class="sheet-roll" name="roll_Use_HD_d12" value="&{template:5eDefault} {{title=Spending Hit Dice - 1d12}} {{subheader=@{character_name}}} {{rollname=HP regained}} {{roll=[[ 1d12 + @{constitution_mod} ]]}} ]]}} @{classactionhitdice}">
+                          <span>d12</span>
+                        </button>
+                      </div>
+                      <div class="sheet-col sheet-col-1-6 sheet-vert-middle">
+                        <input class="sheet-bottom-line-only" type="number" name="attr_hd_d12" min="0" step="1">
+                      </div>
+                      <div class="sheet-col sheet-col-1-6">
+                        <div class="sheet-pc-version">
+                          <input class="sheet-bottom-line-only" type="number" name="attr_hd_d12_max" value="@{barbarian_level}" disabled="disabled">
+                        </div>
+                        <div class="sheet-npc-version">
+                          <input class="sheet-bottom-line-only" type="number" name="attr_hd_d12_max">
+                        </div>
+                      </div>
+                    </div>
+                    <div class="sheet-row sheet-npc-version">
+                      <div class="sheet-col sheet-col-1-3 sheet-hd-row sheet-vert-middle">
+                        <span>Gargantuan</span>
+                      </div>
+                      <div class="sheet-col sheet-col-1-4 sheet-center sheet-hd-row sheet-vert-middle">
+                        <button type="roll" class="sheet-roll" name="roll_Use_HD_d20" value="&{template:5eDefault} {{title=Spending Hit Dice - 1d20}} {{subheader=@{character_name}}} {{rollname=HP regained}} {{roll=[[ 1d20 + @{constitution_mod} ]]}} ]]}} @{classactionhitdice}">
+                          <span>d12</span>
+                        </button>
+                      </div>
+                      <div class="sheet-col sheet-col-1-6 sheet-vert-middle">
+                        <input class="sheet-bottom-line-only" type="number" name="attr_hd_d20" min="0" step="1">
+                      </div>
+                      <div class="sheet-col sheet-col-1-6">
+                        <input class="sheet-bottom-line-only" type="number" name="attr_hd_d20_max">
+                      </div>
+                    </div>
+                    <div class="sheet-wrap-box-title">Hit Dice</div>
+                  </div>
+                </div>
+              </div>
               <div class="sheet-row sheet-mar-b-md">
                 <div class="sheet-col sheet-col-1 sheet-center">
                   <div class="sheet-wrap-box">
@@ -1112,80 +1253,11 @@
                   </div>
                 </div>
               </div>
-              <div class="sheet-row sheet-mar-b-md">
-                <div class="sheet-col sheet-col-1 sheet-center sheet-hit-dice">
-                  <div class="sheet-wrap-box">
-                    <div class="sheet-row sheet-sub-header">
-                      <div class="sheet-col sheet-col-1-3 sheet-center sheet-small-label">Classes</div>
-                      <div class="sheet-col sheet-col-1-4 sheet-center sheet-small-label">Hit Die</div>
-                      <div class="sheet-col sheet-col-1-6 sheet-center sheet-small-label">Current</div>
-                      <div class="sheet-col sheet-col-1-6 sheet-center sheet-small-label">Max</div>
-                    </div>
-                    <div class="sheet-row">
-                      <div class="sheet-col sheet-col-1-3 sheet-hd-row sheet-vert-middle">Sorcerer, Wizard</div>
-                      <div class="sheet-col sheet-col-1-4 sheet-center sheet-hd-row sheet-vert-middle">
-                        <button type="roll" class="sheet-roll" name="roll_Use_HD_d6" value="&{template:5eDefault} {{title=Spending Hit Dice - 1d6}} {{subheader=@{character_name}}} {{rollname=HP regained}} {{roll=[[ 1d6 + @{constitution_mod} ]]}} ]]}} @{classactionhitdice}">
-                          <span>d6</span>
-                        </button>
-                      </div>
-                      <div class="sheet-col sheet-col-1-6 sheet-vert-middle">
-                        <input class="sheet-bottom-line-only" type="number" name="attr_hd_d6" value="0" min="0" step="1">
-                      </div>
-                      <div class="sheet-col sheet-col-1-6">
-                        <input class="sheet-bottom-line-only" type="number" name="attr_hd_d6_max" value="@{sorcerer_level} + @{wizard_level} " disabled="disabled">
-                      </div>
-                    </div>
-                    <div class="sheet-row">
-                      <div class="sheet-col sheet-col-1-3 sheet-hd-row sheet-vert-middle">Bard, Cleric, Druid, Rogue, Monk, Warlock</div>
-                      <div class="sheet-col sheet-col-1-4 sheet-center sheet-hd-row sheet-vert-middle">
-                        <button type="roll" class="sheet-roll" name="roll_Use_HD_d8" value="&{template:5eDefault} {{title=Spending Hit Dice - 1d8}} {{subheader=@{character_name}}} {{rollname=HP regained}} {{roll=[[ 1d8 + @{constitution_mod} ]]}} ]]}} @{classactionhitdice}">
-                          <span>d8</span>
-                        </button>
-                      </div>
-                      <div class="sheet-col sheet-col-1-6 sheet-vert-middle">
-                        <input class="sheet-bottom-line-only" type="number" name="attr_hd_d8" value="0" min="0" step="1">
-                      </div>
-                      <div class="sheet-col sheet-col-1-6">
-                        <input class="sheet-bottom-line-only" type="number" name="attr_hd_d8_max" value="@{bard_level} + @{cleric_level} + @{druid_level} + @{rogue_level} + @{monk_level} + @{warlock_level}" disabled="disabled">
-                      </div>
-                    </div>
-                    <div class="sheet-row">
-                      <div class="sheet-col sheet-col-1-3 sheet-hd-row sheet-vert-middle">Fighter, Paladin, Ranger</div>
-                      <div class="sheet-col sheet-col-1-4 sheet-center sheet-hd-row sheet-vert-middle">
-                        <button type="roll" class="sheet-roll" name="roll_Use_HD_d10" value="&{template:5eDefault} {{title=Spending Hit Dice - 1d10}} {{subheader=@{character_name}}} {{rollname=HP regained}} {{roll=[[ 1d10 + @{constitution_mod} ]]}} ]]}} @{classactionhitdice}">
-                          <span>d10</span>
-                        </button>
-                      </div>
-                      <div class="sheet-col sheet-col-1-6 sheet-vert-middle">
-                        <input class="sheet-bottom-line-only" type="number" name="attr_hd_d10" value="0" min="0" step="1">
-                      </div>
-                      <div class="sheet-col sheet-col-1-6">
-                        <input class="sheet-bottom-line-only" type="number" name="attr_hd_d10_max" value="@{fighter_level} + @{paladin_level} + @{ranger_level}" disabled="disabled">
-                      </div>
-                    </div>
-                    <div class="sheet-row">
-                      <div class="sheet-col sheet-col-1-3 sheet-hd-row sheet-vert-middle">Barbarian</div>
-                      <div class="sheet-col sheet-col-1-4 sheet-center sheet-hd-row sheet-vert-middle">
-                        <button type="roll" class="sheet-roll" name="roll_Use_HD_d12" value="&{template:5eDefault} {{title=Spending Hit Dice - 1d12}} {{subheader=@{character_name}}} {{rollname=HP regained}} {{roll=[[ 1d12 + @{constitution_mod} ]]}} ]]}} @{classactionhitdice}">
-                          <span>d12</span>
-                        </button>
-                      </div>
-                      <div class="sheet-col sheet-col-1-6 sheet-vert-middle">
-                        <input class="sheet-bottom-line-only" type="number" name="attr_hd_d12" value="0" min="0" step="1">
-                      </div>
-                      <div class="sheet-col sheet-col-1-6">
-                        <input class="sheet-bottom-line-only" type="number" name="attr_hd_d12_max" value="@{barbarian_level}" disabled="disabled">
-                      </div>
-                    </div>
-                    <div class="sheet-wrap-box-title">Hit Dice</div>
-                  </div>
-                </div>
-              </div>
             </div>
             <div class="sheet-col sheet-col-1-2">
-              <div class="sheet-row sheet-mar-b-md">
+              <div class="sheet-row sheet-pc-version sheet-mar-b-md">
                 <div class="sheet-col sheet-col-1">
-                  <div class="sheet-wrap-box" title="This is a bonus for you being proficient in a given task.  This bonus automatically increases as you level up and is used automatically in various rolls">
+                  <div class="sheet-wrap-box" title="Inspiration">
                     <div class="sheet-col sheet-col-1-4 sheet-vert-middle">
                       <input class="sheet-inspiration" type="checkbox" name="attr_inspiration" value="1">
                       <span class="sheet-inspiration-tab"></span>
@@ -1194,7 +1266,7 @@
                   </div>
                 </div>
               </div>
-              <div class="sheet-row sheet-mar-b-md">
+              <div class="sheet-row sheet-pc-version sheet-mar-b-md">
                 <div class="sheet-col sheet-col-1">
                   <div class="sheet-wrap-box" title="This is a bonus for you being proficient in a given task.  This bonus automatically increases as you level up and is used automatically in various rolls">
                     <div class="sheet-col sheet-col-1-4 sheet-vert-middle">
@@ -1204,6 +1276,76 @@
                   </div>
                 </div>
               </div>
+              <div class="sheet-row sheet-npc-version sheet-mar-b-md">
+                <div class="sheet-col sheet-col-1">
+                  <div class="sheet-wrap-box sheet-speed">
+                    <div class="sheet-row">
+                      <div class="sheet-col sheet-col-1-4 sheet-center sheet-pad-r-md">
+                        <label class="sheet-checkbox-label">
+                          <input type="checkbox" name="attr_speed_hover">
+                          <span>Hover</span>
+                        </label>
+                        <input class="sheet-center" type="text" name="attr_speed_fly">
+                        <div class="sheet-wrap-box-title">Fly</div>
+                      </div>
+                      <div class="sheet-col sheet-col-1-4 sheet-center sheet-pad-r-md sheet-mar-t-lg">
+                        <input class="sheet-center" type="text" name="attr_speed_climb">
+                        <div class="sheet-wrap-box-title">Climb</div>
+                      </div>
+                      <div class="sheet-col sheet-col-1-4 sheet-center sheet-pad-r-md sheet-mar-t-lg">
+                        <input class="sheet-center" type="text" name="attr_speed_swim">
+                        <div class="sheet-wrap-box-title">Swim</div>
+                      </div>
+                      <div class="sheet-col sheet-col-1-4 sheet-center sheet-mar-t-lg">
+                        <input class="sheet-center" type="text" name="attr_speed_burrow">
+                        <div class="sheet-wrap-box-title">Burrow</div>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+              <div class="sheet-row sheet-npc-version sheet-mar-b-md">
+                <div class="sheet-col sheet-col-1">
+                  <div class="sheet-wrap-box sheet-resistances-immunities sheet-center">
+                    <div class="sheet-row">
+                      <div class="sheet-col sheet-col-1">
+                        <textarea name="attr_damage_resistance" class="sheet-center sheet-border-bottom-only"></textarea>
+                        <div class="sheet-small-label">Damage Resistances</div>
+                      </div>
+                    </div>
+                    <div class="sheet-row">
+                      <div class="sheet-col sheet-col-1">
+                        <input type="text" name="attr_damage_vulnerability" class="sheet-center"></input>
+                        <div class="sheet-small-label">Damage Vulnerabilities</div>
+                      </div>
+                    </div>
+                    <div class="sheet-row">
+                      <div class="sheet-col sheet-col-1">
+                        <textarea name="attr_damage_immunity" class="sheet-center sheet-border-bottom-only"></textarea>
+                        <div class="sheet-small-label">Damage Immunities</div>
+                      </div>
+                    </div>
+                    <div class="sheet-row">
+                      <div class="sheet-col sheet-col-1">
+                        <textarea name="attr_condition_immunity" class="sheet-center sheet-border-bottom-only"></textarea>
+                        <div class="sheet-small-label">Condition Immunities</div>
+                      </div>
+                    </div>
+                    <div class="sheet-wrap-box-title sheet-center">Resistances and Immunities</div>
+                  </div>
+                </div>
+              </div>
+              <div class="sheet-row sheet-npc-version sheet-mar-b-md">
+                <div class="sheet-col sheet-col-1">
+                  <div class="sheet-wrap-box sheet-npc-traits">
+                    <div class="sheet-col sheet-col-1 sheet-vert-middle">
+                      <textarea name="attr_npc_traits" class="sheet-border-bottom-only"></textarea>
+                    </div>
+                    <div class="sheet-wrap-box-title sheet-center">Traits</div>
+                  </div>
+                </div>
+              </div>
+
               <div class="sheet-row">
                 <div class="sheet-col sheet-col-1 sheet-general-bonuses">
                   <div class="sheet-wrap-box sheet-center">
@@ -1305,12 +1447,6 @@
           <div class="sheet-small-label">Size</div>
         </div>
       </div>
-      <div class="sheet-row">
-        <div class="sheet-col sheet-col-1 sheet-center">
-          <input class="sheet-center" type="text" name="attr_prolanguages">
-          <div class="sheet-small-label">Known Languages</div>
-        </div>
-      </div>
 
       <h4 class="sheet-center">Background, Traits, Ideals, Bonds and Flaws <span class="sheet-pictos">g</span></h4>
       <div class="sheet-row sheet-sub-header">