diff --git a/D&D_3-5/charsheet_3-5.css b/D&D_3-5/charsheet_3-5.css
index 43fe42ad08..3a9eeda695 100644
--- a/D&D_3-5/charsheet_3-5.css
+++ b/D&D_3-5/charsheet_3-5.css
@@ -4,6 +4,7 @@
 
 .sheet-pc-spells-show:not(:checked)~.sheet-pc-spells {display:none;}
 .sheet-pc-charrpinfo-show:not(:checked)~.sheet-pc-charrpinfo {display:none;}
+.sheet-pc-charclasses-show:not(:checked)~.sheet-pc-charclasses {display:none;}
 .sheet-pc-combat-show:not(:checked)~.sheet-pc-combat {display:none;}
 .sheet-pc-charnotes-show:not(:checked)~.sheet-pc-charnotes {display:none;}
 .sheet-pc-saveblock-show:not(:checked)~.sheet-pc-saveblock {display:none;}
@@ -69,6 +70,9 @@
 
 .sheet-pc-rolltemplates-show:not(:checked)~.sheet-pc-rolltemplates {display:none;}
 
+.sheet-npc-charrpinfo-show:not(:checked)~.sheet-npc-charrpinfo {display:none;}
+.sheet-npc-charclasses-show:not(:checked)~.sheet-npc-charclasses {display:none;}
+
 .charsheet label {
     display: inline-block;
     width: 75px;
@@ -504,7 +508,7 @@ input.sheet-tab:not(:first-child)::before
     border-left: none;
 }
 
-div.sheet-tab-content
+div.sheet-tab-content, .sheet-npc-tab-content
 {
     border: 1px solid #a8a8a8;
     border-top-color: #000;   	                  /* black */
diff --git a/D&D_3-5/charsheet_3-5.html b/D&D_3-5/charsheet_3-5.html
index b85ff59f49..0122ad0750 100644
--- a/D&D_3-5/charsheet_3-5.html
+++ b/D&D_3-5/charsheet_3-5.html
@@ -1,9 +1,10 @@
 <!-- D&D 3.5 Character Sheet -->
 <!-- by Diana P. -->
-<!-- based on Pathfinder sheets from Barry R., Sam, Brian, and Justin N. -->
+<!-- based on Pathfinder sheets from Barry R., Sam, Brian, and Justin N., Hoyer -->
 <!-- with lots of help from Toby-->
 <!-- Version 2.7.8 1/7/19 (Fix roll buttons)-->
 <!-- Version 2.7.9 12/7/20 (change repeating_spells to spells11)-->
+<!-- Version 2.7.20 24/3/21 (Add more speces for classes)-->
 <input type="hidden" name="attr_currentsheetversion" title="currentsheetversion" value="7.9"/>
 <input type="hidden" name="attr_code_version" title="code_version" value="0"/>
 <input type="radio" class="sheet-switch-pc-show sheet-switch" title="npc-show" name="attr_npc-show" value="1" checked /><span style="text-align: left;" data-i18n="pc" >PC </span><span> &nbsp; &nbsp; &nbsp; &nbsp;</span>
@@ -16,14 +17,14 @@
 	<input type="checkbox" class="sheet-pc-charrpinfo-show sheet-arrow" title="charrpinfo-show" name="attr_charrpinfo-show" value="1" checked /><span style="text-align: left;" data-i18n="header">Header</span>
 	<div class="sheet-pc-charrpinfo">
 		<div style="float: left">
-			<table border="0">
+			<table>
 				<tbody>
 					<tr><td rowspan=4> &nbsp; &nbsp; &nbsp; &nbsp; </td></tr>
 					<tr>
 						<td colspan=6>
 							<table>
 								<tr>
-									<td><div style="float: left"><input type="text" name="attr_character_name" title="character_name" style="width: 125px; text-align: right;"><input type="text" name="attr_character-name2" title="character-name2" style="width: 175px;"> &nbsp; <br><span data-i18n="character-name">Character Name</span></div></td>
+									<td><div style="float: left"><input type="text" name="attr_character_name" title="character_name" style="width: 125px;"><input type="text" name="attr_character-name2" title="character-name2" style="width: 175px;"> &nbsp; <br><span data-i18n="character-name">Character Name</span></div></td>
 									<td><div style="float: left"><input type="text" name="attr_playername" title="playername" style="width: 160px;"><br><span data-i18n="player-name">Player Name</span></div></td>
 								</tr>
 								<tr>
@@ -35,9 +36,9 @@
 						<td colspan=2><div style="float: left"><img src="http://i.imgur.com/A746uyc.png?1" style="float: left; width: 200px;"></img> &nbsp; 3.5</div></td>
 					 </tr>
 					<tr>
-						<td><div style="float: left"><input type="text" name="attr_race" title="race" style="width: 130px;"> <br><span data-i18n="race">Race</span></div></td>
-						<td colspan="2"><div style="float: left"><input type="text" name="attr_racetype" title="racetype" style="width: 130px;"> <br><span data-i18n="type">Type</span></div></td>
-						<td><div style="float: left"><select style="width: 90px;" name="attr_size" title="size">
+						<td><div style="float: left"><input type="text" name="attr_race" title="race" style="width: 140px;"> <br><span data-i18n="race">Race</span></div></td>
+						<td><div style="float: left"><input type="text" name="attr_racetype" title="racetype" style="width: 120px;"> <br><span data-i18n="type">Type</span></div></td>
+						<td><div style="float: left"><select style="width: 120px;" name="attr_size" title="size">
 								<option value="-8" data-i18n="colossal" >Colossal</option>
 								<option value="-4" data-i18n="gargantuan" >Gargantuan</option>
 								<option value="-2" data-i18n="huge" >Huge</option>
@@ -49,23 +50,60 @@
 								<option value="8" data-i18n="fine" >Fine</option>
 							</select><br><span data-i18n="size">Size</span></div></td>
 						<td><div style="float: left"><input type="text" name="attr_gender" title="gender" style="width: 70px;"> <br><span data-i18n="gender">Gender</span></div></td>
-						<td><div style="float: left"><input type="text" name="attr_alignment" title="alignment" style="width: 70px;"> <br><span data-i18n="alignment">Alignment</span></div></td>
-						<td colspan="2"><div style="float: left"><input type="text" name="attr_deity" title="deity" style="width: 220px;"> <br><span data-i18n="deity">Deity</span></div></td>
+						<td><div style="float: left"><input type="text" name="attr_alignment" title="alignment" style="width: 130px;"> <br><span data-i18n="alignment">Alignment</span></div></td>
+						<td colspan="3"><div style="float: left"><input type="text" name="attr_deity" title="deity" style="width: 160px;"> <br><span data-i18n="deity">Deity</span></div></td>
 					</tr>
 					<tr>
-						<td><div style="float: left"><input type="text" name="attr_class" title="class" style="width: 130px;"> <br><span data-i18n="class">Class</span></div></td>
-						<td><div style="float: left"><input type="text" name="attr_level" title="level" style="width: 85px;"> <br><span data-i18n="level">Level</span></div></td>
-						<td><div style="float: left"><input type="text" name="attr_hitdie" title="hitdie" style="width: 43px;"> <br><span data-i18n="hit-dice-i">HD</span></div></td>
-						<td><div style="float: left"><input type="text" name="attr_age" title="age" style="width: 90px;"> <br><span data-i18n="age">Age</span></div></td>
-						<td><div style="float: left"><input type="text" name="attr_height" title="height" style="width: 70px;"> <br><span data-i18n="height">Height</span></div> </td>
-						<td><div style="float: left"><input type="text" name="attr_weight" title="weight" style="width: 70px;"> <br><span data-i18n="weight">Weight</span></div></td>
-						<td><div style="float: left"><input type="text" name="attr_eyes" title="eyes" style="width: 95px;"> <br><span data-i18n="eyes">Eyes</span></div></td>
-						<td><div style="float: left"><input type="text" name="attr_hair" title="hair" style="width: 120px;"> <br><span data-i18n="hair">Hair</span></div></td>
+						<td><div style="float: left"><input type="text" name="attr_age" title="age" style="width: 140px;"> <br><span data-i18n="age">Age</span></div></td>
+						<td><div style="float: left"><input type="text" name="attr_height" title="height" style="width: 120px;"> <br><span data-i18n="height">Height</span></div> </td>
+						<td><div style="float: left"><input type="text" name="attr_weight" title="weight" style="width: 120px;"> <br><span data-i18n="weight">Weight</span></div></td>
+						<td colspan="2"><div style="float: left"><input type="text" name="attr_eyes" title="eyes" style="width: 200px;"> <br><span data-i18n="eyes">Eyes</span></div></td>
+						<td colspan="3"><div style="float: left"><input type="text" name="attr_hair" title="hair" style="width: 160px;"> <br><span data-i18n="hair">Hair</span></div></td>
 					</tr>
 				</tbody>
 			</table>
 		</div>
 		<hr/>
+	<input type="checkbox" class="sheet-pc-charclasses-show sheet-arrow" title="charclasses-show" name="attr_charclasses-show" value="1" /><span style="text-align: left;" data-i18n="classes">Classes</span>
+	<div class="sheet-pc-charclasses">
+		<div style="float: left">
+			<table>
+				<tbody>
+					<tr>
+						<td><div style="float: left"><input type="text" name="attr_class" title="class" style="width: 260px;"> <br><span data-i18n="class">Class</span> 1</div></td>
+						<td><div style="float: left"><input type="text" name="attr_level" title="level" style="width: 85px;"> <br><span data-i18n="level">Level</span> 1</div></td>
+						<td><div style="float: left"><input type="text" name="attr_hitdie" title="hitdie" style="width: 43px;"> <br><span data-i18n="hit-dice-i">HD</span> 1</div></td>
+						<td><div style="float: left"><input type="text" name="attr_hitpoint" title="hitpoint" style="width: 43px;"> <br><span data-i18n="hit-points-i">HP</span> 1</div></td>
+					</tr>
+					<tr>
+						<td><div style="float: left"><input type="text" name="attr_class2" title="class2" style="width: 260px;"> <br><span data-i18n="class">Class</span> 2</div></td>
+						<td><div style="float: left"><input type="text" name="attr_level2" title="level2" style="width: 85px;"> <br><span data-i18n="level">Level</span> 2</div></td>
+						<td><div style="float: left"><input type="text" name="attr_hitdie2" title="hitdie2" style="width: 43px;"> <br><span data-i18n="hit-dice-i">HD</span> 2</div></td>
+						<td><div style="float: left"><input type="text" name="attr_hitpoint2" title="hitpoint2" style="width: 43px;"> <br><span data-i18n="hit-points-i">HP</span> 2</div></td>
+					</tr>
+					<tr>
+						<td><div style="float: left"><input type="text" name="attr_class3" title="class4" style="width: 260px;"> <br><span data-i18n="class">Class</span> 3</div></td>
+						<td><div style="float: left"><input type="text" name="attr_level3" title="level4" style="width: 85px;"> <br><span data-i18n="level">Level</span> 3</div></td>
+						<td><div style="float: left"><input type="text" name="attr_hitdie3" title="hitdie4" style="width: 43px;"> <br><span data-i18n="hit-dice-i">HD</span> 3</div></td>
+						<td><div style="float: left"><input type="text" name="attr_hitpoint3" title="hitpoint3" style="width: 43px;"> <br><span data-i18n="hit-points-i">HP</span> 3</div></td>
+					</tr>
+					<tr>
+						<td><div style="float: left"><input type="text" name="attr_class4" title="class4" style="width: 260px;"> <br><span data-i18n="class">Class</span> 4</div></td>
+						<td><div style="float: left"><input type="text" name="attr_level4" title="level4" style="width: 85px;"> <br><span data-i18n="level">Level</span> 4</div></td>
+						<td><div style="float: left"><input type="text" name="attr_hitdie4" title="hitdie4" style="width: 43px;"> <br><span data-i18n="hit-dice-i">HD</span> 4</div></td>
+						<td><div style="float: left"><input type="text" name="attr_hitpoint4" title="hitpoint4" style="width: 43px;"> <br><span data-i18n="hit-points-i">HP</span> 4</div></td>
+					</tr>
+					<tr>
+						<td><div style="float: left"><input type="text" name="attr_class5" title="class5" style="width: 260px;"> <br><span data-i18n="class">Class</span> 5</div></td>
+						<td><div style="float: left"><input type="text" name="attr_level5" title="level5" style="width: 85px;"> <br><span data-i18n="level">Level</span> 5</div></td>
+						<td><div style="float: left"><input type="text" name="attr_hitdie5" title="hitdie5" style="width: 43px;"> <br><span data-i18n="hit-dice-i">HD</span> 5</div></td>
+						<td><div style="float: left"><input type="text" name="attr_hitpoint5" title="hitpoint5" style="width: 43px;"> <br><span data-i18n="hit-points-i">HP</span> 5</div></td>
+					</tr>
+				</tbody>
+			</table>
+		</div>
+		<hr/>
+	</div>
 	</div>
 	<br>
 	<input type="radio" name="attr_tab" class="sheet-tab sheet-tab1" value="1" title="Stats" checked="checked" />
@@ -3483,130 +3521,207 @@
 <div class="sheet-switch-npc">
 	<!-- NPC's -->
 <!-- start NPC section -->
+	<input type="checkbox" class="sheet-npc-charrpinfo-show sheet-arrow" title="npc-charrpinfo-show" name="attr_npc-charrpinfo-show" value="1" checked /><span style="text-align: left;" data-i18n="header">Header</span>
+	<div class="sheet-npc-charrpinfo">
+		<div style="float: left">
+			<table>
+				<tbody>
+					<tr><td rowspan=4> &nbsp; &nbsp; &nbsp; &nbsp; </td></tr>
+					<tr>
+						<td colspan=4>
+							<table>
+								<tr>
+									<td><div style="float: left"><input type="text" name="attr_npcname" title="npcname" style="width: 320px;"><br><span data-i18n="name">Name</span></div></td>
+								</tr>
+								<tr>
+									<td><div style="float: left"><input type="text" name="attr_npcrace" title="npcrace" style="width: 320px;"><br><span data-i18n="race">Race</span></div> </td>
+								</tr>
+							</table>
+						</td>
+						<td colspan=2><div style="float: left"><img src="http://i.imgur.com/A746uyc.png?1" style="float: left; width: 200px;"></img> &nbsp; 3.5</div></td>
+					 </tr>
+					<tr>
+						<td colspan=2><div style="float: left"><input type="text" name="attr_npctype" title="npctype" style="width: 320px;"> <br><span data-i18n="type">Type</span></div></td>
+						<td><div style="float: left"><select style="width: 90px;" name="attr_npcsize" title="npcsize">
+								<option value="-8" data-i18n="colossal" >Colossal</option>
+								<option value="-4" data-i18n="gargantuan" >Gargantuan</option>
+								<option value="-2" data-i18n="huge" >Huge</option>
+								<option value="-1" data-i18n="large" >Large</option>
+								<option value="0" data-i18n="medium" selected>Medium</option>
+								<option value="1" data-i18n="small" >Small</option>
+								<option value="2" data-i18n="tiny" >Tiny</option>
+								<option value="4" data-i18n="diminutive" >Diminutive</option>
+								<option value="8" data-i18n="fine" >Fine</option>
+							</select><br><span data-i18n="size">Size</span></div></td>
+						<td><div style="float: left"><input type="text" name="attr_npcgender" title="npcgender" style="width: 100px;"> <br><span data-i18n="gender">Gender</span></div></td>
+						<td colspan=2><div style="float: left"><input type="text" name="attr_npcalignment" title="npcalignment" style="width: 200px;"> <br><span data-i18n="alignment">Alignment</span></div></td>
+					</tr>
+				</tbody>
+			</table>
+		</div>
+		
+		<hr/>
+		
+		<input type="checkbox" class="sheet-npc-charclasses-show sheet-arrow" title="npc-charclasses-show" name="attr_npc-charclasses-show" value="1" /><span style="text-align: left;" data-i18n="classes">Classes</span>
+		<div class="sheet-npc-charclasses">
+			<div style="float: left">
+				<table>
+					<tbody>
+						<tr>
+							<td><div style="float: left"><input type="text" name="attr_npcclass" title="npcclass" style="width: 260px;"> <br><span data-i18n="class">Class</span> 1</div></td>
+							<td><div style="float: left"><input type="text" name="attr_npclevel" title="npclevel" style="width: 85px;"> <br><span data-i18n="level">Level</span> 1</div></td>
+							<td><div style="float: left"><input type="text" name="attr_npchitdie" title="npchitdie" style="width: 43px;"> <br><span data-i18n="hit-dice-i">HD</span> 1</div></td>
+							<td><div style="float: left"><input type="text" name="attr_npchitpoint" title="npchitpoint" style="width: 43px;"> <br><span data-i18n="hit-points-i">HP</span> 1</div></td>
+						</tr>
+						<tr>
+							<td><div style="float: left"><input type="text" name="attr_npcclass2" title="npcclass2" style="width: 260px;"> <br><span data-i18n="class">Class</span> 2</div></td>
+							<td><div style="float: left"><input type="text" name="attr_npclevel2" title="npclevel2" style="width: 85px;"> <br><span data-i18n="level">Level</span> 2</div></td>
+							<td><div style="float: left"><input type="text" name="attr_npchitdie2" title="npchitdie2" style="width: 43px;"> <br><span data-i18n="hit-dice-i">HD</span> 2</div></td>
+							<td><div style="float: left"><input type="text" name="attr_npchitpoint2" title="npchitpoint2" style="width: 43px;"> <br><span data-i18n="hit-points-i">HP</span> 2</div></td>
+						</tr>
+						<tr>
+							<td><div style="float: left"><input type="text" name="attr_npcclass3" title="npcclass3" style="width: 260px;"> <br><span data-i18n="class">Class</span> 3</div></td>
+							<td><div style="float: left"><input type="text" name="attr_npclevel3" title="npclevel3" style="width: 85px;"> <br><span data-i18n="level">Level</span> 3</div></td>
+							<td><div style="float: left"><input type="text" name="attr_npchitdie3" title="npchitdie3" style="width: 43px;"> <br><span data-i18n="hit-dice-i">HD</span> 3</div></td>
+							<td><div style="float: left"><input type="text" name="attr_npchitpoint3" title="npchitpoint3" style="width: 43px;"> <br><span data-i18n="hit-points-i">HP</span> 3</div></td>
+						</tr>
+						<tr>
+							<td><div style="float: left"><input type="text" name="attr_npcclass4" title="npcclass4" style="width: 260px;"> <br><span data-i18n="class">Class</span> 4</div></td>
+							<td><div style="float: left"><input type="text" name="attr_npclevel4" title="npclevel4" style="width: 85px;"> <br><span data-i18n="level">Level</span> 4</div></td>
+							<td><div style="float: left"><input type="text" name="attr_npchitdie4" title="npchitdie4" style="width: 43px;"> <br><span data-i18n="hit-dice-i">HD</span> 4</div></td>
+							<td><div style="float: left"><input type="text" name="attr_npchitpoint4" title="npchitpoint4" style="width: 43px;"> <br><span data-i18n="hit-points-i">HP</span> 4</div></td>
+						</tr>
+						<tr>
+							<td><div style="float: left"><input type="text" name="attr_npcclass5" title="npcclass5" style="width: 260px;"> <br><span data-i18n="class">Class</span> 5</div></td>
+							<td><div style="float: left"><input type="text" name="attr_npclevel5" title="npclevel5" style="width: 85px;"> <br><span data-i18n="level">Level</span> 5</div></td>
+							<td><div style="float: left"><input type="text" name="attr_npchitdie5" title="npchitdie5" style="width: 43px;"> <br><span data-i18n="hit-dice-i">HD</span> 5</div></td>
+							<td><div style="float: left"><input type="text" name="attr_npchitpoint5" title="npchitpoint5" style="width: 43px;"> <br><span data-i18n="hit-points-i">HP</span> 5</div></td>
+						</tr>
+					</tbody>
+				</table>
+			</div>
+			<hr/>
+		</div>
+	</div>
+
 <br>
-<br>
-	<table style="width: 790px;">
-		<tr>
-			<td class="sheet-table-header-right"><span data-i18n="name">Name</span>:</td>
-			<td class="sheet-table-left"><input type="text" style="width: 650px;" name="attr_npcname" title="npcname" placeholder="Name" data-i18n-placeholder="name"></td>
-		</tr>
-		<tr>
-			<td class="sheet-table-header-right"><span data-i18n="size">Size</span>/<span data-i18n="type">Type</span>:</td>
-			<td class="sheet-table-left"><input style="width: 140px;" type="text" name="attr_npcsize" title="npcsize" placeholder="Size" data-i18n-placeholder="size">/<input style="width: 180px;" type="text" name="attr_npctype" title="npctype" placeholder="Type" data-i18n-placeholder="type"></td>
-		</tr>
-		<tr>
-			<td class="sheet-table-header-right"><span data-i18n="hit-dice">Hit Dice</span>:</td>
-			<td class="sheet-table-left"><input style="width: 100px;" type="text" name="attr_npchitdie" title="npchitdie" placeholder="HD">(<input style="width: 50px;" type="text" name="attr_npchitpoints" title="npchitpoints" placeholder="Hit Points">/<input style="width: 50px;" type="text" name="attr_npchitpoints_max" title="npchitpoints|max" placeholder="Max HP" data-i18n-placeholder="max-hit-points-a">)</td>
-		</tr>
-		<tr>
-			<td class="sheet-table-header-right"><span data-i18n="initiative">Initiative</span>:</td>
-			<td class="sheet-table-left"><input style="width: 40px;" type="text" name="attr_npcinit" title="npcinit" value="0"> <textarea rows="1" cols="40" style="width: 565px; height: 20px;" title="npcinitmacro (modify to modify npc's initiative roll macro)" name="attr_npcinitmacro">/w gm &{template:DnD35Initiative} {{name=@{selected|token_name} }} {{check=Initiative:}} {{checkroll= [[ 1d20 + [[ @{selected|npcinit} ]] + ( [[ (@{selected|npcinit}) ]] /100) &{tracker} ]] }}</textarea><button type="roll" name="roll_npcinitiative" title="npcinitiative" value="@{npcinitmacro}"></button></td>
-		</tr>
-		<tr>
-			<td class="sheet-table-header-right"><span data-i18n="speed">Speed</span>:</td>
-			<td class="sheet-table-left"><input style="width: 650px;" type="text" name="attr_npcspeed" title="npcspeed" placeholder="Speed" data-i18n-placeholder="speed"></td>
-		</tr>
-		<tr>
-			<td class="sheet-table-header-right"><span data-i18n="armor-class">Armor Class</span>:</td>
-			<td class="sheet-table-left"><input style="width: 40px;" type="text" name="attr_npcarmorclass" title="npcarmorclass" placeholder="AC" data-i18n-placeholder="armor-class-i">(<input style="width: 290px;" type="text" name="attr_npcarmorclassinfo" title="npcarmorclassinfo" placeholder="Armor Class Mod Info" data-i18n-placeholder="armor-class-modification-info-a">), <span data-i18n="touch">Touch</span>:<input style="width: 40px;" type="text" name="attr_npctoucharmorclass" title="npctoucharmorclass" placeholder="T AC" data-i18n-placeholder="touch-armor-class-i">, <span data-i18n="flat-footed-i">FF</span>:<input style="width: 40px;" type="text" name="attr_npcflatfootarmorclass" title="npcflatfootarmorclass" placeholder="FF AC" data-i18n-placeholder="flat-footed-armor-class-i"></td>
-		</tr>
-		<tr>
-			<td class="sheet-table-header-right"><span data-i18n="base-attack">Base Attack</span>/<span data-i18n="grapple">Grapple</span>:</td>
-			<td class="sheet-table-left"><input style="width: 50px;" type="text" name="attr_npcbaseatt" title="npcbaseatt" placeholder="Base Attack" data-i18n-placeholder="base-attack">/<input style="width: 50px;" type="text" name="attr_npcgrapple" title="npcgrapple" placeholder="Grapple" data-i18n-placeholder="grapple"></td>
-		</tr>
-		<tr>
-			<td class="sheet-table-header-right"><span data-i18n="attack">Attack</span>:</td>
-			<td class="sheet-table-left"><input type="text" style="width: 650px;" name="attr_npcattack" title="npcattack" placeholder="Attack" data-i18n-placeholder="attack" /></td>
-		</tr>
-		<tr>
-			<td class="sheet-table-header-right"> &nbsp; </td>
-			<td class="sheet-table-left"><textarea input class="sheet-inputbox" rows="1" cols="55" style="width: 615px;" name="attr_npcattackmacro" title="npcattackmacro" placeholder="Attack Macro" data-i18n-placeholder="attack-macro"></textarea><button type="roll" name="roll_npcattackbutton" title="npcattackbutton" value="@{npcattackmacro}" style="height: 24px; width: 20px;" ></button></td>
-		</tr>
-		<tr>
-			<td class="sheet-table-header-right"><span data-i18n="full-attack">Full Attack</span>:</td>
-			<td class="sheet-table-left"><input type="text" style="width: 650px;" name="attr_npcfullattack" title="npcfullattack" placeholder="Full Attack" data-i18n-placeholder="full-attack" /></td>
-		</tr>
-		<tr>
-			<td class="sheet-table-header-right"> &nbsp; </td>
-			<td class="sheet-table-left"><textarea input class="sheet-inputbox" rows="1" cols="55" style="width: 615px;" name="attr_npcfullattackmacro" title="npcfullattackmacro" placeholder="Full Attack Macro" data-i18n-placeholder="full-attack-macro"></textarea><button type="roll" name="roll_npcfullattackbutton" title="npcfullattackbutton" value="@{npcfullattackmacro}" style="height: 24px; width: 20px;" ></button></td>
-		</tr>
-		<tr>
-			<td class="sheet-table-header-right"><span data-i18n="space">Space</span>/<span data-i18n="reach">Reach</span>:</td>
-			<td class="sheet-table-left"><input style="width: 140px;" type="text" name="attr_npcspace" title="npcspace" placeholder="Space" data-i18n-placeholder="space">/<input style="width: 140px;" type="text" name="attr_npcreach" title="npcreach" placeholder="Reach" data-i18n-placeholder="reach"> &nbsp; &nbsp;</td>
-		</tr>
-		<tr>
-			<td class="sheet-table-header-right"><span data-i18n="special-attacks">Special Attacks</span>:</td>
-			<td class="sheet-table-left"><input style="width: 650px;" type="text" name="attr_npcspecialattacks" title="npcspecialattacks" placeholder="Special Attacks" data-i18n-placeholder="special-attacks"></td>
-		</tr>
-		<tr>
-			<td class="sheet-table-header-right"><span data-i18n="special-qualities">Special Qualities</span>:</td>
-			<td class="sheet-table-left"><input style="width: 650px;" type="text" name="attr_npcspecialqualities" title="npcspecialqualities" placeholder="Special Qualities" data-i18n-placeholder="special-qualities"></td>
-		</tr>
-		<tr>
-			<td class="sheet-table-header-right"><span data-i18n="saves">Saves</span>:</td>
-			<td class="sheet-table-left"> <span data-i18n="fortitude-a">Fort</span>:<input style="width: 40px;" type="text" name="attr_npcfortsave" title="npcfortsave" placeholder="Fort" data-i18n-placeholder="fortitude-a">, &nbsp; &nbsp; <span data-i18n="reflex-a">Ref</span>:<input style="width: 40px;" type="text" name="attr_npcrefsave" title="npcrefsave" placeholder="Ref" data-i18n-placeholder="reflex-a">, &nbsp; &nbsp; <span data-i18n="will">Will</span>:<input style="width: 40px;" type="text" name="attr_npcwillsave" title="npcwillsave" placeholder="Will" data-i18n-placeholder="will"> </td>
-		</tr>
-		<tr>
-			<td class="sheet-table-header-right"><span data-i18n="abilities">Abilities</span>:</td>
-			<td class="sheet-table-left"> <span data-i18n="strength-a">Str</span>:<input style="width: 3em;" type="text" name="attr_npcstr" title="npcstr" placeholder="Str" data-i18n-placeholder="strength-a">(+<input style="width: 2em;" type="text" name="attr_npcstr-mod" title="npcstr-mod" value="0">), &nbsp; &nbsp; <span data-i18n="dexterity-a">Dex</span>:<input style="width: 3em;" type="text" name="attr_npcdex" title="npcdex" placeholder="Dex" data-i18n-placeholder="dexterity-a">(+<input style="width: 2em;" type="text" name="attr_npcdex-mod" title="npcdex-mod" value="0">), &nbsp; &nbsp; <span data-i18n="constitution-a">Con</span>:<input style="width: 3em;" type="text" name="attr_npccon" title="npccon" placeholder="Con" data-i18n-placeholder="constitution-a">(+<input style="width: 2em;" type="text" name="attr_npccon-mod" title="npccon-mod" value="0">), &nbsp; &nbsp; <span data-i18n="intelligence-a">Int</span>:<input style="width: 3em;" type="text" name="attr_npcint" title="npcint" placeholder="Int" data-i18n-placeholder="intelligence-a">(+<input style="width: 2em;" type="text" name="attr_npcint-mod" title="npcint-mod" value="0">), &nbsp; &nbsp; <span data-i18n="wisdom-a">Wis</span>:<input style="width: 3em;" type="text" name="attr_npcwis" title="npcwis" placeholder="Wis" data-i18n-placeholder="wisdom-a">(+<input style="width: 2em;" type="text" name="attr_npcwis-mod" title="npcwis-mod" value="0">), &nbsp; &nbsp; <span data-i18n="charisma-a">Cha</span>:<input style="width: 3em;" type="text" name="attr_npccha" title="npccha" placeholder="Cha" data-i18n-placeholder="charisma-a">(+<input style="width: 2em;" type="text" name="attr_npccha-mod" title="npccha-mod" value="0">) </td>
-		</tr>
-		<tr>
-			<td class="sheet-table-header-right"><span data-i18n="skills">Skills</span>:</td>
-			<td class="sheet-table-left"><input style="width: 650px;" type="text" name="attr_npcskills" title="npcskills" placeholder="Skills" data-i18n-placeholder="skills"></td>
-		</tr>
-		<tr>
-			<td class="sheet-table-header-right"><span data-i18n="feats">Feats</span>:</td>
-			<td class="sheet-table-left"><input style="width: 650px;" type="text" name="attr_npcfeats" title="npcfeats" placeholder="Feats" data-i18n-placeholder="feats"></td>
-		</tr>
-		<tr>
-			<td colspan="2">
-				<hr/>
-			</td>
-		</tr>
-		<tr>
-			<td class="sheet-table-header-right"><span data-i18n="environment">Environment</span>:</td>
-			<td class="sheet-table-left"><input style="width: 650px;" type="text" name="attr_npcenv" title="npcenv" placeholder="Environment" data-i18n-placeholder="environment"></td>
-		</tr>
-		<tr>
-			<td class="sheet-table-header-right"><span data-i18n="organization">Organization</span>:</td>
-			<td class="sheet-table-left"><input style="width: 650px;" type="text" name="attr_npcorg" title="npcorg" placeholder="Organization" data-i18n-placeholder="organization"></td>
-		</tr>
-		<tr>
-			<td class="sheet-table-header-right"><span data-i18n="challenge-rating">Challenge Rating</span>:</td>
-			<td class="sheet-table-left"><input style="width: 650px;" type="text" name="attr_npccr" title="npccr" placeholder="CR" data-i18n-placeholder="challenge-rating-i"></td>
-		</tr>
-		<tr>
-			<td class="sheet-table-header-right"><span data-i18n="treasure">Treasure</span>:</td>
-			<td class="sheet-table-left"><input style="width: 650px;" type="text" name="attr_npctreasure" title="npctreasure" placeholder="Treasure" data-i18n-placeholder="treasure"> &nbsp; &nbsp; </td>
-		</tr>
-		<tr>
-			<td class="sheet-table-header-right"><span data-i18n="alignment">Alignment</span>:</td>
-			<td class="sheet-table-left"><input style="width: 650px;" type="text" name="attr_npcalignment" title="npcalignment" placeholder="Alignment" data-i18n-placeholder="alignment"></td>
-		</tr>
-		<tr>
-			<td class="sheet-table-header-right"><span data-i18n="advancement">Advancement</span>:</td>
-			<td class="sheet-table-left"><input style="width: 650px;" type="text" name="attr_npcadv" title="npcadv" placeholder="Advancement" data-i18n-placeholder="advancement"></td>
-		</tr>
-		<tr>
-			<td class="sheet-table-header-right"><span data-i18n="level-adjustment">Level Adjustment</span>:</td>
-			<td class="sheet-table-left"><input style="width: 650px;" type="text" name="attr_npclvladj" title="npclvladj" placeholder="-"></td>
-		</tr>
-		<tr>
-			<td> </td>
-		</tr>
-		<tr>
-			<td class="sheet-table-left" colspan="2"><textarea input class="sheet-inputbox" rows="4" cols="55" style="height: 60px; width: 790px;" name="attr_npcdescr" title="npcdescr" placeholder="Description etc" data-i18n-placeholder="description-etc"></textarea></td>
-		</tr>
-		<tr>
-			<td> </td>
-		</tr>
-		<tr>
-			<td class="sheet-table-header-left" colspan="2"><span data-i18n="combat-u">COMBAT</span></td>
-		</tr>
-		<tr>
-			<td class="sheet-table-left" colspan="2"><textarea input class="sheet-inputbox" rows="8" cols="55" style="height: 60px; width: 790px;" name="attr_npccombatdescr" title="npccombatdescr" placeholder="Combat information" data-i18n-placeholder="combat-information"></textarea></td>
-		</tr>
-	</table>
+
+	<div class="sheet-npc-tab-content">
+		<table style="width: 790px;">
+			<tr>
+				<td class="sheet-table-header-right"><span data-i18n="hit-dice">Hit Dice</span>:</td>
+				<td class="sheet-table-left"><input style="width: 100px;" type="text" name="attr_npchitdie" title="npchitdie" placeholder="HD">(<input style="width: 50px;" type="text" name="attr_npchitpoints" title="npchitpoints" placeholder="Hit Points">/<input style="width: 50px;" type="text" name="attr_npchitpoints_max" title="npchitpoints|max" placeholder="Max HP" data-i18n-placeholder="max-hit-points-a">)</td>
+			</tr>
+			<tr>
+				<td class="sheet-table-header-right"><span data-i18n="initiative">Initiative</span>:</td>
+				<td class="sheet-table-left"><input style="width: 40px;" type="text" name="attr_npcinit" title="npcinit" value="0"> <textarea rows="1" cols="40" style="width: 565px; height: 20px;" title="npcinitmacro (modify to modify npc's initiative roll macro)" name="attr_npcinitmacro">/w gm &{template:DnD35Initiative} {{name=@{selected|token_name} }} {{check=Initiative:}} {{checkroll= [[ 1d20 + [[ @{selected|npcinit} ]] + ( [[ (@{selected|npcinit}) ]] /100) &{tracker} ]] }}</textarea><button type="roll" name="roll_npcinitiative" title="npcinitiative" value="@{npcinitmacro}"></button></td>
+			</tr>
+			<tr>
+				<td class="sheet-table-header-right"><span data-i18n="speed">Speed</span>:</td>
+				<td class="sheet-table-left"><input style="width: 650px;" type="text" name="attr_npcspeed" title="npcspeed" placeholder="Speed" data-i18n-placeholder="speed"></td>
+			</tr>
+			<tr>
+				<td class="sheet-table-header-right"><span data-i18n="armor-class">Armor Class</span>:</td>
+				<td class="sheet-table-left"><input style="width: 40px;" type="text" name="attr_npcarmorclass" title="npcarmorclass" placeholder="AC" data-i18n-placeholder="armor-class-i">(<input style="width: 290px;" type="text" name="attr_npcarmorclassinfo" title="npcarmorclassinfo" placeholder="Armor Class Mod Info" data-i18n-placeholder="armor-class-modification-info-a">), <span data-i18n="touch">Touch</span>:<input style="width: 40px;" type="text" name="attr_npctoucharmorclass" title="npctoucharmorclass" placeholder="T AC" data-i18n-placeholder="touch-armor-class-i">, <span data-i18n="flat-footed-i">FF</span>:<input style="width: 40px;" type="text" name="attr_npcflatfootarmorclass" title="npcflatfootarmorclass" placeholder="FF AC" data-i18n-placeholder="flat-footed-armor-class-i"></td>
+			</tr>
+			<tr>
+				<td class="sheet-table-header-right"><span data-i18n="base-attack">Base Attack</span>/<span data-i18n="grapple">Grapple</span>:</td>
+				<td class="sheet-table-left"><input style="width: 50px;" type="text" name="attr_npcbaseatt" title="npcbaseatt" placeholder="Base Attack" data-i18n-placeholder="base-attack">/<input style="width: 50px;" type="text" name="attr_npcgrapple" title="npcgrapple" placeholder="Grapple" data-i18n-placeholder="grapple"></td>
+			</tr>
+			<tr>
+				<td class="sheet-table-header-right"><span data-i18n="attack">Attack</span>:</td>
+				<td class="sheet-table-left"><input type="text" style="width: 650px;" name="attr_npcattack" title="npcattack" placeholder="Attack" data-i18n-placeholder="attack" /></td>
+			</tr>
+			<tr>
+				<td class="sheet-table-header-right"> &nbsp; </td>
+				<td class="sheet-table-left"><textarea class="sheet-inputbox" rows="1" cols="55" style="width: 615px;" name="attr_npcattackmacro" title="npcattackmacro" placeholder="Attack Macro" data-i18n-placeholder="attack-macro"></textarea><button type="roll" name="roll_npcattackbutton" title="npcattackbutton" value="@{npcattackmacro}" style="height: 24px; width: 20px;" ></button></td>
+			</tr>
+			<tr>
+				<td class="sheet-table-header-right"><span data-i18n="full-attack">Full Attack</span>:</td>
+				<td class="sheet-table-left"><input type="text" style="width: 650px;" name="attr_npcfullattack" title="npcfullattack" placeholder="Full Attack" data-i18n-placeholder="full-attack" /></td>
+			</tr>
+			<tr>
+				<td class="sheet-table-header-right"> &nbsp; </td>
+				<td class="sheet-table-left"><textarea class="sheet-inputbox" rows="1" cols="55" style="width: 615px;" name="attr_npcfullattackmacro" title="npcfullattackmacro" placeholder="Full Attack Macro" data-i18n-placeholder="full-attack-macro"></textarea><button type="roll" name="roll_npcfullattackbutton" title="npcfullattackbutton" value="@{npcfullattackmacro}" style="height: 24px; width: 20px;" ></button></td>
+			</tr>
+			<tr>
+				<td class="sheet-table-header-right"><span data-i18n="space">Space</span>/<span data-i18n="reach">Reach</span>:</td>
+				<td class="sheet-table-left"><input style="width: 140px;" type="text" name="attr_npcspace" title="npcspace" placeholder="Space" data-i18n-placeholder="space">/<input style="width: 140px;" type="text" name="attr_npcreach" title="npcreach" placeholder="Reach" data-i18n-placeholder="reach"> &nbsp; &nbsp;</td>
+			</tr>
+			<tr>
+				<td class="sheet-table-header-right"><span data-i18n="special-attacks">Special Attacks</span>:</td>
+				<td class="sheet-table-left"><input style="width: 650px;" type="text" name="attr_npcspecialattacks" title="npcspecialattacks" placeholder="Special Attacks" data-i18n-placeholder="special-attacks"></td>
+			</tr>
+			<tr>
+				<td class="sheet-table-header-right"><span data-i18n="special-qualities">Special Qualities</span>:</td>
+				<td class="sheet-table-left"><input style="width: 650px;" type="text" name="attr_npcspecialqualities" title="npcspecialqualities" placeholder="Special Qualities" data-i18n-placeholder="special-qualities"></td>
+			</tr>
+			<tr>
+				<td class="sheet-table-header-right"><span data-i18n="saves">Saves</span>:</td>
+				<td class="sheet-table-left"> <span data-i18n="fortitude-a">Fort</span>:<input style="width: 40px;" type="text" name="attr_npcfortsave" title="npcfortsave" placeholder="Fort" data-i18n-placeholder="fortitude-a">, &nbsp; &nbsp; <span data-i18n="reflex-a">Ref</span>:<input style="width: 40px;" type="text" name="attr_npcrefsave" title="npcrefsave" placeholder="Ref" data-i18n-placeholder="reflex-a">, &nbsp; &nbsp; <span data-i18n="will">Will</span>:<input style="width: 40px;" type="text" name="attr_npcwillsave" title="npcwillsave" placeholder="Will" data-i18n-placeholder="will"> </td>
+			</tr>
+			<tr>
+				<td class="sheet-table-header-right"><span data-i18n="abilities">Abilities</span>:</td>
+				<td class="sheet-table-left"> <span data-i18n="strength-a">Str</span>:<input style="width: 3em;" type="text" name="attr_npcstr" title="npcstr" placeholder="Str" data-i18n-placeholder="strength-a">(+<input style="width: 2em;" type="text" name="attr_npcstr-mod" title="npcstr-mod" value="0">), &nbsp; &nbsp; <span data-i18n="dexterity-a">Dex</span>:<input style="width: 3em;" type="text" name="attr_npcdex" title="npcdex" placeholder="Dex" data-i18n-placeholder="dexterity-a">(+<input style="width: 2em;" type="text" name="attr_npcdex-mod" title="npcdex-mod" value="0">), &nbsp; &nbsp; <span data-i18n="constitution-a">Con</span>:<input style="width: 3em;" type="text" name="attr_npccon" title="npccon" placeholder="Con" data-i18n-placeholder="constitution-a">(+<input style="width: 2em;" type="text" name="attr_npccon-mod" title="npccon-mod" value="0">), &nbsp; &nbsp; <span data-i18n="intelligence-a">Int</span>:<input style="width: 3em;" type="text" name="attr_npcint" title="npcint" placeholder="Int" data-i18n-placeholder="intelligence-a">(+<input style="width: 2em;" type="text" name="attr_npcint-mod" title="npcint-mod" value="0">), &nbsp; &nbsp; <span data-i18n="wisdom-a">Wis</span>:<input style="width: 3em;" type="text" name="attr_npcwis" title="npcwis" placeholder="Wis" data-i18n-placeholder="wisdom-a">(+<input style="width: 2em;" type="text" name="attr_npcwis-mod" title="npcwis-mod" value="0">), &nbsp; &nbsp; <span data-i18n="charisma-a">Cha</span>:<input style="width: 3em;" type="text" name="attr_npccha" title="npccha" placeholder="Cha" data-i18n-placeholder="charisma-a">(+<input style="width: 2em;" type="text" name="attr_npccha-mod" title="npccha-mod" value="0">) </td>
+			</tr>
+			<tr>
+				<td class="sheet-table-header-right"><span data-i18n="skills">Skills</span>:</td>
+				<td class="sheet-table-left"><input style="width: 650px;" type="text" name="attr_npcskills" title="npcskills" placeholder="Skills" data-i18n-placeholder="skills"></td>
+			</tr>
+			<tr>
+				<td class="sheet-table-header-right"><span data-i18n="feats">Feats</span>:</td>
+				<td class="sheet-table-left"><input style="width: 650px;" type="text" name="attr_npcfeats" title="npcfeats" placeholder="Feats" data-i18n-placeholder="feats"></td>
+			</tr>
+			<tr>
+				<td colspan="2">
+					<hr/>
+				</td>
+			</tr>
+			<tr>
+				<td class="sheet-table-header-right"><span data-i18n="environment">Environment</span>:</td>
+				<td class="sheet-table-left"><input style="width: 650px;" type="text" name="attr_npcenv" title="npcenv" placeholder="Environment" data-i18n-placeholder="environment"></td>
+			</tr>
+			<tr>
+				<td class="sheet-table-header-right"><span data-i18n="organization">Organization</span>:</td>
+				<td class="sheet-table-left"><input style="width: 650px;" type="text" name="attr_npcorg" title="npcorg" placeholder="Organization" data-i18n-placeholder="organization"></td>
+			</tr>
+			<tr>
+				<td class="sheet-table-header-right"><span data-i18n="challenge-rating">Challenge Rating</span>:</td>
+				<td class="sheet-table-left"><input style="width: 650px;" type="text" name="attr_npccr" title="npccr" placeholder="CR" data-i18n-placeholder="challenge-rating-i"></td>
+			</tr>
+			<tr>
+				<td class="sheet-table-header-right"><span data-i18n="treasure">Treasure</span>:</td>
+				<td class="sheet-table-left"><input style="width: 650px;" type="text" name="attr_npctreasure" title="npctreasure" placeholder="Treasure" data-i18n-placeholder="treasure"> &nbsp; &nbsp; </td>
+			</tr>
+			<tr>
+				<td class="sheet-table-header-right"><span data-i18n="alignment">Alignment</span>:</td>
+				<td class="sheet-table-left"><input style="width: 650px;" type="text" name="attr_npcalignment" title="npcalignment" placeholder="Alignment" data-i18n-placeholder="alignment"></td>
+			</tr>
+			<tr>
+				<td class="sheet-table-header-right"><span data-i18n="advancement">Advancement</span>:</td>
+				<td class="sheet-table-left"><input style="width: 650px;" type="text" name="attr_npcadv" title="npcadv" placeholder="Advancement" data-i18n-placeholder="advancement"></td>
+			</tr>
+			<tr>
+				<td class="sheet-table-header-right"><span data-i18n="level-adjustment">Level Adjustment</span>:</td>
+				<td class="sheet-table-left"><input style="width: 650px;" type="text" name="attr_npclvladj" title="npclvladj" placeholder="-"></td>
+			</tr>
+			<tr>
+				<td> </td>
+			</tr>
+			<tr>
+				<td class="sheet-table-left" colspan="2"><textarea class="sheet-inputbox" rows="4" cols="55" style="height: 60px; width: 790px;" name="attr_npcdescr" title="npcdescr" placeholder="Description etc" data-i18n-placeholder="description-etc"></textarea></td>
+			</tr>
+			<tr>
+				<td> </td>
+			</tr>
+			<tr>
+				<td class="sheet-table-header-left" colspan="2"><span data-i18n="combat-u">COMBAT</span></td>
+			</tr>
+			<tr>
+				<td class="sheet-table-left" colspan="2"><textarea class="sheet-inputbox" rows="8" cols="55" style="height: 60px; width: 790px;" name="attr_npccombatdescr" title="npccombatdescr" placeholder="Combat information" data-i18n-placeholder="combat-information"></textarea></td>
+			</tr>
+		</table>
+	</div>
 
 <!-- end NPC section-->
 </div>
diff --git a/D&D_3-5/translation.json b/D&D_3-5/translation.json
index 46a224a1f7..7bafc2e006 100644
--- a/D&D_3-5/translation.json
+++ b/D&D_3-5/translation.json
@@ -22,6 +22,7 @@
 	"alignment": "Alignment",
 	"deity": "Deity",
 	"class": "Class",
+	"classes": "Classes",
 	"level": "Level",
 	"hit-dice-i": "HD",
 	"age": "Age",