From fa7c8a5f3f3b5e91ae67c6b6de167192083944f4 Mon Sep 17 00:00:00 2001
From: seregrauko <64831679+seregrauko@users.noreply.github.com>
Date: Mon, 7 Mar 2022 09:57:49 +0000
Subject: [PATCH] Bug fix and Archtype drop  downs

-Split the Archtypes so only the selected class's archtypes will appear in the list
-Fixed bug in NPC Sheet
---
 Level Up - Advanced 5th Edition/CHANGELOG.md |   3 +
 Level Up - Advanced 5th Edition/levelup.css  | 180 +++++++++----------
 Level Up - Advanced 5th Edition/levelup.html |  87 +++++----
 3 files changed, 136 insertions(+), 134 deletions(-)

diff --git a/Level Up - Advanced 5th Edition/CHANGELOG.md b/Level Up - Advanced 5th Edition/CHANGELOG.md
index 8deaff9121..5199101279 100644
--- a/Level Up - Advanced 5th Edition/CHANGELOG.md	
+++ b/Level Up - Advanced 5th Edition/CHANGELOG.md	
@@ -1,5 +1,8 @@
 Change Log
 ==============================================
+**2022-03-07 ** v.11 Paul V
+	Split the Archtypes so only the selected class's archtypes will appear in the list 
+	Fixed bug in NPC Sheet
 **2022-02-31 ** v.10 Paul V
 	---Split the Archtypes so only the selected class's archtypes will appear in the list -- can't get this working at the moment
 	Improved the readability of TextBoxes, increase the text size and darkened the colour a little
diff --git a/Level Up - Advanced 5th Edition/levelup.css b/Level Up - Advanced 5th Edition/levelup.css
index aa817c2b6b..b97fa5ae9d 100644
--- a/Level Up - Advanced 5th Edition/levelup.css	
+++ b/Level Up - Advanced 5th Edition/levelup.css	
@@ -270,76 +270,76 @@ div.sheet-character-info {
 		div.sheet-character-info label[data-i18n-title="repeatingclass"] > input[data-i18n-placeholder="class"]{
 			grid-column: 2 / span 16;
 		}
-		div.sheet-character-info label[data-i18n-title="repeatingclass"] > div.sheet-archtypeslist {
-			grid-column: 19 / span 15;
+		div.sheet-character-info label[data-i18n-title="repeatingclass"] > div.sheet-archetypeslist {
+			grid-column: 20 / span 15;
 		}
 		
 		/*archtype dropdown logic*/
 
-		div.sheet-character-info label[data-i18n-title="repeatingclass"] div.sheet-archtypeslist div.sheet-archtypelist { display: block; }
-		div.sheet-character-info label[data-i18n-title="repeatingclass"] div.sheet-archtypeslist div.sheet-adeptlist,  
-		div.sheet-character-info label[data-i18n-title="repeatingclass"] div.sheet-archtypeslist div.sheet-bardlist,  
-		div.sheet-character-info label[data-i18n-title="repeatingclass"] div.sheet-archtypeslist div.sheet-berserkerlist,  
-		div.sheet-character-info label[data-i18n-title="repeatingclass"] div.sheet-archtypeslist div.sheet-clericlist,  
-		div.sheet-character-info label[data-i18n-title="repeatingclass"] div.sheet-archtypeslist div.sheet-druidlist,  
-		div.sheet-character-info label[data-i18n-title="repeatingclass"] div.sheet-archtypeslist div.sheet-heraldlist,  
-		div.sheet-character-info label[data-i18n-title="repeatingclass"] div.sheet-archtypeslist div.sheet-fighterlist,  
-		div.sheet-character-info label[data-i18n-title="repeatingclass"] div.sheet-archtypeslist div.sheet-marshallist,  
-		div.sheet-character-info label[data-i18n-title="repeatingclass"] div.sheet-archtypeslist div.sheet-rangerlist,  
-		div.sheet-character-info label[data-i18n-title="repeatingclass"] div.sheet-archtypeslist div.sheet-roguelist,  
-		div.sheet-character-info label[data-i18n-title="repeatingclass"] div.sheet-archtypeslist div.sheet-sorcererlist,  
-		div.sheet-character-info label[data-i18n-title="repeatingclass"] div.sheet-archtypeslist div.sheet-warlocklist,  
-		div.sheet-character-info label[data-i18n-title="repeatingclass"] div.sheet-archtypeslist div.sheet-wizardlist  
-		{
-				display: none;
+/* By deafult, hides all archetypes*/
+
+		.charsheet .sheet-archtypefull,
+		.charsheet .sheet-adept,  
+		.charsheet .sheet-bard,  
+		.charsheet .sheet-berserker,  
+		.charsheet .sheet-cleric,  
+		.charsheet .sheet-druid,  
+		.charsheet .sheet-herald,  
+		.charsheet .sheet-fighter,  
+		.charsheet .sheet-marshal,  
+		.charsheet .sheet-ranger,  
+		.charsheet .sheet-rogue,  
+		.charsheet .sheet-sorcerer,  
+		.charsheet .sheet-warlock,  
+		.charsheet .sheet-wizard {
+			display: none;
 		}
-		div.sheet-character-info label[data-i18n-title="repeatingclass"] div.sheet-archtypeslist div.sheet-archtypelist input,  
-		div.sheet-character-info label[data-i18n-title="repeatingclass"] div.sheet-archtypeslist div.sheet-adeptlist input,  
-		div.sheet-character-info label[data-i18n-title="repeatingclass"] div.sheet-archtypeslist div.sheet-bardlist input,  
-		div.sheet-character-info label[data-i18n-title="repeatingclass"] div.sheet-archtypeslist div.sheet-berserkerlist input,  
-		div.sheet-character-info label[data-i18n-title="repeatingclass"] div.sheet-archtypeslist div.sheet-clericlist input,  
-		div.sheet-character-info label[data-i18n-title="repeatingclass"] div.sheet-archtypeslist div.sheet-druidlist input,  
-		div.sheet-character-info label[data-i18n-title="repeatingclass"] div.sheet-archtypeslist div.sheet-heraldlist input,  
-		div.sheet-character-info label[data-i18n-title="repeatingclass"] div.sheet-archtypeslist div.sheet-fighterlist input,  
-		div.sheet-character-info label[data-i18n-title="repeatingclass"] div.sheet-archtypeslist div.sheet-marshallist input,  
-		div.sheet-character-info label[data-i18n-title="repeatingclass"] div.sheet-archtypeslist div.sheet-rangerlist input,  
-		div.sheet-character-info label[data-i18n-title="repeatingclass"] div.sheet-archtypeslist div.sheet-roguelist input,  
-		div.sheet-character-info label[data-i18n-title="repeatingclass"] div.sheet-archtypeslist div.sheet-sorcererlist input,  
-		div.sheet-character-info label[data-i18n-title="repeatingclass"] div.sheet-archtypeslist div.sheet-warlocklist input,  
-		div.sheet-character-info label[data-i18n-title="repeatingclass"] div.sheet-archtypeslist div.sheet-wizardlist input 
-		{
+
+		.charsheet .sheet-archetypetoggle[value="archetype"] ~ div.sheet-archtypefull,
+		.charsheet .sheet-archetypetoggle[value="Adept"] ~ div.sheet-adept,
+		.charsheet .sheet-archetypetoggle[value="Bard"] ~ div.sheet-bard,
+		.charsheet .sheet-archetypetoggle[value="Berserker"] ~ div.sheet-berserker,
+		.charsheet .sheet-archetypetoggle[value="Cleric"] ~ div.sheet-cleric,
+		.charsheet .sheet-archetypetoggle[value="Druid"] ~ div.sheet-druid,
+		.charsheet .sheet-archetypetoggle[value="Herald"] ~ div.sheet-herald,
+		.charsheet .sheet-archetypetoggle[value="Fighter"] ~ div.sheet-fighter,
+		.charsheet .sheet-archetypetoggle[value="Marshal"] ~ div.sheet-marshal,
+		.charsheet .sheet-archetypetoggle[value="Ranger"] ~ div.sheet-ranger,
+		.charsheet .sheet-archetypetoggle[value="Rogue"] ~ div.sheet-rogue,
+		.charsheet .sheet-archetypetoggle[value="Sorcerer"] ~ div.sheet-sorcerer,
+		.charsheet .sheet-archetypetoggle[value="Warlock"] ~ div.sheet-warlock,
+		.charsheet .sheet-archetypetoggle[value="Wizard"] ~ div.sheet-wizard {
+			display: block !important;
+		}
+
+		.charsheet .sheet-archtypefull input ,
+		.charsheet .sheet-adept input ,  
+		.charsheet .sheet-bard input ,  
+		.charsheet .sheet-berserker input ,  
+		.charsheet .sheet-cleric input ,  
+		.charsheet .sheet-druid input ,  
+		.charsheet .sheet-herald input ,  
+		.charsheet .sheet-fighter input ,  
+		.charsheet .sheet-marshal input ,  
+		.charsheet .sheet-ranger input ,  
+		.charsheet .sheet-rogue input ,  
+		.charsheet .sheet-sorcerer input ,  
+		.charsheet .sheet-warlock input ,  
+		.charsheet .sheet-wizard input {
 			font-family:Times,serif;
 			font-size: 0.8em;
 			border: none;
 			border-bottom: solid 1pt;
 			border-radius:0;
+			width: 140px;
 			min-width: 0;
-			width: 100%;
 			vertical-align: middle;
 		}
 		
-/*
-		.sheet-archtypetoggle[value="archtype"] ~ div.sheet-archtypelist,
-		.sheet-archtypetoggle[value="adept"] ~ div.sheet-adeptlist,
-		.sheet-archtypetoggle[value="bard"] ~ div.sheet-bardlist,
-		.sheet-archtypetoggle[value="berserker"] ~ div.sheet-berserkerlist,
-		.sheet-archtypetoggle[value="cleric"] ~ div.sheet-clericlist,
-		.sheet-archtypetoggle[value="druid"] ~ div.sheet-druidlist,
-		.sheet-archtypetoggle[value="herald"] ~ div.sheet-heraldlist,
-		.sheet-archtypetoggle[value="fighter"] ~ div.sheet-fighterlist,
-		.sheet-archtypetoggle[value="marshal"] ~ div.sheet-marshallist,
-		.sheet-archtypetoggle[value="ranger"] ~ div.sheet-rangerlist,
-		.sheet-archtypetoggle[value="rogue"] ~ div.sheet-roguelist,
-		.sheet-archtypetoggle[value="sorcerer"] ~ div.sheet-sorcererlist,
-		.sheet-archtypetoggle[value="warlock"] ~ div.sheet-warlocklist,
-		.sheet-archtypetoggle[value="wizard"] ~ div.sheet-wizardlist {
-			display:block;
-		}
-		*/
 		div.sheet-character-info label[data-i18n-title="repeatingclass"] > input[data-i18n-placeholder="level"]{
-			grid-column: 35 / span 8;
-			
+			grid-column: 35 / span 8;			
 		}	
+		
 	div.sheet-character-info label[data-i18n-title="experience_points_xp"] {
 		border-radius: 0px 10px 0px 0px;
 		grid-area: 1 / 9 / 1 / 13; 
@@ -5261,13 +5261,13 @@ div.sheet-statsinfo {
 	  }
 
 
-div.sheet-npc-info,
-div.sheet-npc-stats {
+div.sheet-npcstats,
+div.sheet-npcinfo {
 	display: none; 
-	}
+}
 
-.sheet-statsinfotoggle[value="info"] ~ div.sheet-NPC > div.sheet-npc-info,
-.sheet-statsinfotoggle[value="stats"] ~ div.sheet-NPC > div.sheet-npc-stats {
+.sheet-statsinfotoggle[value="info"] ~ div.sheet-NPC div.sheet-npcinfo,
+.sheet-statsinfotoggle[value="stats"] ~ div.sheet-NPC div.sheet-npcstats {
     display: block;
 }
 
@@ -5330,7 +5330,7 @@ div.sheet-npc-header {
 		border: 0;
 		}
 
-div.sheet-npc-stats {
+div.sheet-npcstat {
 	display: grid;
 	grid-template-columns: repeat(20, 1fr);
 	grid-template-rows: repeat(3, 1fr);
@@ -5347,40 +5347,40 @@ div.sheet-npc-stats {
 	color:rgb(43,42,41);
 	}
 
-	div.sheet-npc-stats label[data-i18n-title="armourclass"]{
+	div.sheet-npcstat label[data-i18n-title="armourclass"]{
 		grid-column: 1 / span 10 ;
 		grid-row: 1 ;
 		}
-	div.sheet-npc-stats label[data-i18n-title="armourclass"] input{
+	div.sheet-npcstat label[data-i18n-title="armourclass"] input{
 		border: 0;
 		width: 80%;
 		text-align: left;
 		}
-	div.sheet-npc-stats label[data-i18n-title="hit_points"]{
+	div.sheet-npcstat label[data-i18n-title="hit_points"]{
 		grid-column: 1 / span 5 ;
 		grid-row: 2 ;
 		}
-	div.sheet-npc-stats label[data-i18n-title="hit_points"] input[type=number] {
+	div.sheet-npcstat label[data-i18n-title="hit_points"] input[type=number] {
 		border: 0;
 		text-align: left;
 		}
-	div.sheet-npc-stats label[data-i18n-title="hit_points"] input[type=text] {
+	div.sheet-npcstat label[data-i18n-title="hit_points"] input[type=text] {
 		width: 60%;
 		border: 0;
 		text-align: left;
 		}
-	div.sheet-npc-stats label[data-i18n-title="speed"]{
+	div.sheet-npcstat label[data-i18n-title="speed"]{
 		grid-column: 1 / span 10 ;
 		grid-row: 3 ;
 		}
-	div.sheet-npc-stats label[data-i18n-title="speed"] input {
+	div.sheet-npcstat label[data-i18n-title="speed"] input {
 		border: 0;
 		text-align: left;
 		width: 70%;
 		}
 	
 
-	div.sheet-npc-stats > div.sheet-statblock {
+	div.sheet-statblock {
 		grid-column: 1 / span 20 ;
 		grid-row: 6 / span 2;
 		width: 98.5%;
@@ -5575,7 +5575,7 @@ div.sheet-npc-stats {
 		border: 0;
 		}
 	
-	div.sheet-npc-stats > div.sheet-profman  {
+	div.sheet-profman  {
 		grid-column: 1 / span 20 ;
 		grid-row: 8 ;
 		}
@@ -5606,7 +5606,7 @@ div.sheet-profman {
 		border: 0;
 		}
 		
-	div.sheet-npc-stats > div.sheet-skills  {
+	div.sheet-skills  {
 		grid-column: 1 / span 20 ;
 		grid-row: 9 ;
 		}
@@ -5703,14 +5703,14 @@ div.sheet-skills {
 			grid-column: 16 / span 3;
 		}
 		
-	div.sheet-npc-stats > div.sheet-vulresinn {
+	div.sheet-vulresinn {
 		grid-column: 1 / span 20 ;
 		grid-row: 10 / span 4;
 		width: 98.5%;
 		border: double 4pt;
 		border-radius: 10px;
 	}
-	div.sheet-npc-stats > div.sheet-senlang {
+	div.sheet-senlang {
 		grid-column: 1 / span 20 ;
 		grid-row: 14 / span 2;
 		width: 98.5%;
@@ -5739,50 +5739,50 @@ div.sheet-skills {
 		text-align: left;
 		}
 	
-	div.sheet-npc-stats label[data-i18n-title="senses"]  {
+	div.sheet-senlang label[data-i18n-title="senses"]  {
 		grid-column: 2 / span 20 ;
 		grid-row: 14 ;
 		}
-	div.sheet-npc-stats label[data-i18n-title="senses"] input  {
+	div.sheet-senlang label[data-i18n-title="senses"] input  {
 		border: 0;
 		width: 80%;
 		text-align: left;
 		}
-	div.sheet-npc-stats label[data-i18n-title="languages"]  {
+	div.sheet-senlang label[data-i18n-title="languages"]  {
 		grid-column: 2 / span 20 ;
 		grid-row: 15 ;
 		}
-	div.sheet-npc-stats label[data-i18n-title="languages"] input  {
+	div.sheet-senlang label[data-i18n-title="languages"] input  {
 		border: 0;
 		width: 80%;
 		text-align: left;
 		}
 		
-	div.sheet-npc-stats > div.sheet-abilities_and_powers {
+	div.sheet-abilities_and_powers {
 		grid-column: 1 / span 20 ;
 		grid-row: 16;
 		width: 98.5%;
 		border: double 4pt;
 		border-radius: 10px;
 	}
-	div.sheet-npc-stats label[data-i18n-title="abilities_and_powers"]  textarea {
+	div.sheet-abilities_and_power label[data-i18n-title="abilities_and_powers"]  textarea {
 		border: 0;
 		width: 98.5%;
 		}
 		
-	div.sheet-npc-stats > div.sheet-attacks  {
+	div.sheet-attacks  {
 		grid-column: 1 / span 20 ;
 		grid-row: 17 ;
 		}
-	div.sheet-npc-stats > div.sheet-bonusactions  {
+	div.sheet-bonusactions  {
 		grid-column: 1 / span 20 ;
 		grid-row: 18 ;
 		}
-	div.sheet-npc-stats > div.sheet-reactions  {
+	div.sheet-reactions  {
 		grid-column: 1 / span 20 ;
 		grid-row: 19 ;
 		}
-	div.sheet-npc-stats > div.sheet-legendaryactions  {
+	ddiv.sheet-legendaryactions  {
 		grid-column: 1 / span 20 ;
 		grid-row: 20 ;
 		}
@@ -6088,7 +6088,7 @@ div.sheet-legendaryactions {
 		}
 
 
-	div.sheet-npc-info > div.sheet-NPCNotes {
+	div.sheet-npcinfo > div.sheet-NPCNotes {
 		grid-column: 1 / span 20 ;
 		grid-row: 16;
 		width: 98.5%;
@@ -6099,7 +6099,7 @@ div.sheet-legendaryactions {
 		border: 0;
 		width: 98.5%;
 		}
-	div.sheet-npc-info > div.sheet-NPClegend_and_lore {
+	div.sheet-npcinfo > div.sheet-NPClegend_and_lore {
 		grid-column: 1 / span 20 ;
 		grid-row: 16;
 		width: 98.5%;
@@ -6110,7 +6110,7 @@ div.sheet-legendaryactions {
 		border: 0;
 		width: 98.5%;
 		}
-	div.sheet-npc-info > div.sheet-NPCEncounters {
+	div.sheet-npcinfo > div.sheet-NPCEncounters {
 		grid-column: 1 / span 20 ;
 		grid-row: 16;
 		width: 98.5%;
@@ -6121,7 +6121,7 @@ div.sheet-legendaryactions {
 		border: 0;
 		width: 98.5%;
 		}
-	div.sheet-npc-info > div.sheet-NPCRules {
+	div.sheet-npcinfo > div.sheet-NPCRules {
 		grid-column: 1 / span 20 ;
 		grid-row: 16;
 		width: 98.5%;
@@ -6132,7 +6132,7 @@ div.sheet-legendaryactions {
 		border: 0;
 		width: 98.5%;
 		}
-	div.sheet-npc-info > div.sheet-NPCSigns {
+	div.sheet-npcinfo > div.sheet-NPCSigns {
 		grid-column: 1 / span 20 ;
 		grid-row: 16;
 		width: 98.5%;
@@ -6143,7 +6143,7 @@ div.sheet-legendaryactions {
 		border: 0;
 		width: 98.5%;
 		}
-	div.sheet-npc-info > div.sheet-NPCBehaviour {
+	div.sheet-npcinfo > div.sheet-NPCBehaviour {
 		grid-column: 1 / span 20 ;
 		grid-row: 16;
 		width: 98.5%;
@@ -6154,7 +6154,7 @@ div.sheet-legendaryactions {
 		border: 0;
 		width: 98.5%;
 		}
-	div.sheet-npc-info > div.sheet-NPCCombat {
+	div.sheet-npcinfo > div.sheet-NPCCombat {
 		grid-column: 1 / span 20 ;
 		grid-row: 16;
 		width: 98.5%;
@@ -6165,7 +6165,7 @@ div.sheet-legendaryactions {
 		border: 0;
 		width: 98.5%;
 		}
-	div.sheet-npc-info > div.sheet-NPCNames {
+	div.sheet-npcinfo > div.sheet-NPCNames {
 		grid-column: 1 / span 20 ;
 		grid-row: 16;
 		width: 98.5%;
diff --git a/Level Up - Advanced 5th Edition/levelup.html b/Level Up - Advanced 5th Edition/levelup.html
index 8459e8f7a3..27ae61e14a 100644
--- a/Level Up - Advanced 5th Edition/levelup.html	
+++ b/Level Up - Advanced 5th Edition/levelup.html	
@@ -284,15 +284,15 @@
 	<label data-i18n-title="npc" title="npc">
 		<input name="attr_pcnpc_type" type="radio" value="npc"><span data-i18n="npc"></span></input>
 	</label>
-	<label data-i18n-title="npc" title="npc">
+	<label data-i18n-title="npc1" title="npc1">
 	</label>
-	<label data-i18n-title="npc" title="npc">
+	<label data-i18n-title="npc2" title="npc2">
 	</label>
-	<label data-i18n-title="npc" title="npc">
+	<label data-i18n-title="npc3" title="npc3">
 	</label>
-	<label data-i18n-title="npc" title="npc">
+	<label data-i18n-title="npc4" title="npc4">
 	</label>
-	<label data-i18n-title="npc" title="npc">
+	<label data-i18n-title="npc5" title="npc5">
 	</label>
 </div>
 
@@ -313,46 +313,45 @@
 					<fieldset class="repeating_class">
 						<label data-i18n-title="repeatingclass" title="repeatingclass">
 							<input data-i18n-placeholder="class" name="attr_class" placeholder="class" spellcheck="false" title="@{class}" type="text" list="classlist"/>
-							<input data-i18n-placeholder="level" type="hidden" class="sheet-archtypetoggle" name="attr_archtypeclass" value="archtype"/>
-
-							<div class="sheet-archtypeslist">
-								<div class="sheet-archtypelist">
+							<div class="archetypeslist">
+								<input type="hidden" class="sheet-archetypetoggle" name="attr_class"  value="fighter"  /> 
+								<div class="sheet-archtypefull">
 									<input data-i18n-placeholder="archtype" name="attr_archtype" placeholder="archtype" spellcheck="false" title="@{archtype}" type="text" list="archtypelist"/>
 								</div>
-								<div class="sheet-adeptlist">
+								<div class="sheet-adept">
 									<input data-i18n-placeholder="archtype" name="attr_archtype" placeholder="archtype" spellcheck="false" title="@{archtype}" type="text" list="adeptlist"/>
 								</div>
-								<div class="sheet-bardlist">
+								<div class="sheet-bard">
 									<input data-i18n-placeholder="archtype" name="attr_archtype" placeholder="archtype" spellcheck="false" title="@{archtype}" type="text" list="bardlist"/>
 								</div>
-								<div class="sheet-berserkerlist">
+								<div class="sheet-berserker">
 									<input data-i18n-placeholder="archtype" name="attr_archtype" placeholder="archtype" spellcheck="false" title="@{archtype}" type="text" list="berserkerlist"/>
 								</div>
-								<div class="sheet-clericlist">
+								<div class="sheet-cleric">
 									<input data-i18n-placeholder="archtype" name="attr_archtype" placeholder="archtype" spellcheck="false" title="@{archtype}" type="text" list="clericlist"/>
 								</div>
-								<div class="sheet-druidlist">
+								<div class="sheet-druid">
 									<input data-i18n-placeholder="archtype" name="attr_archtype" placeholder="archtype" spellcheck="false" title="@{archtype}" type="text" list="druidlist"/>
 								</div>
-								<div class="sheet-fighterlist">
+								<div class="sheet-fighter">
 									<input data-i18n-placeholder="archtype" name="attr_archtype" placeholder="archtype" spellcheck="false" title="@{archtype}" type="text" list="fighterlist"/>
 								</div>
-								<div class="sheet-heraldlist">
+								<div class="sheet-herald">
 									<input data-i18n-placeholder="archtype" name="attr_archtype" placeholder="archtype" spellcheck="false" title="@{archtype}" type="text" list="heraldlist"/>
 								</div>
-								<div class="sheet-rangerlist">
+								<div class="sheet-ranger">
 									<input data-i18n-placeholder="archtype" name="attr_archtype" placeholder="archtype" spellcheck="false" title="@{archtype}" type="text" list="rangerlist"/>
 								</div>
-								<div class="sheet-roguelist">
+								<div class="sheet-rogue">
 									<input data-i18n-placeholder="archtype" name="attr_archtype" placeholder="archtype" spellcheck="false" title="@{archtype}" type="text" list="roguelist"/>
 								</div>
-								<div class="sheet-sorcererlist">
+								<div class="sheet-sorcerer">
 									<input data-i18n-placeholder="archtype" name="attr_archtype" placeholder="archtype" spellcheck="false" title="@{archtype}" type="text" list="sorcererlist"/>
 								</div>
-								<div class="sheet-warlocklist">
+								<div class="sheet-warlock">
 									<input data-i18n-placeholder="archtype" name="attr_archtype" placeholder="archtype" spellcheck="false" title="@{archtype}" type="text" list="warlocklist"/>
 								</div>
-								<div class="sheet-wizardlist">
+								<div class="sheet-wizard">
 									<input data-i18n-placeholder="archtype" name="attr_archtype" placeholder="archtype" spellcheck="false" title="@{archtype}" type="text" list="wizardlist"/>
 								</div>
 							</div>
@@ -1866,34 +1865,36 @@
 		<label data-i18n-title="info" title="info">
 			<input name="attr_statsinfo_type" type="radio" value="info"><span data-i18n="info"></span></input>
 		</label>
-		<label data-i18n-title="info" title="info">
+		<label data-i18n-title="info1" title="info1">
 		</label>
-		<label data-i18n-title="info" title="info">
+		<label data-i18n-title="info2" title="info2">
 		</label>
-		<label data-i18n-title="info" title="info">
+		<label data-i18n-title="info3" title="info3">
 		</label>
-		<label data-i18n-title="info" title="info">
+		<label data-i18n-title="info4" title="info4">
 		</label>
-		<label data-i18n-title="info" title="info">
+		<label data-i18n-title="info5" title="info5">
 		</label>
-		<label data-i18n-title="info" title="info">
+		<label data-i18n-title="info6" title="info6">
 		</label>
 	</div>
 
-	<div class="sheet-npc-stats">
-		<label data-i18n-title="armourclass" title="armourclass">
-			<span data-i18n="armour_class">armour_class</span>
-			<input data-i18n-placeholder="armour_class" name="attr_AC" placeholder="armour_class" spellcheck="false" title="@{armour_class}" type="text" value="" />
-		</label>
-		<label data-i18n-title="hit_points" title="hit_points">
-			<span data-i18n="hit_points">hit_points</span>
-			<input data-i18n-placeholder="hit_points" name="attr_HP" placeholder="hit_points" spellcheck="false" title="@{HP}" type="number" value="" />
-			<input data-i18n-placeholder="hit_dice" name="attr_hit_dice" placeholder="hit_dice" spellcheck="false" title="@{hit_dice}" type="text" value="" />
-		</label>
-		<label data-i18n-title="speed" title="speed">
-			<span data-i18n="speed">speed</span>
-			<input data-i18n-placeholder="speed" name="attr_speed" placeholder="speed" spellcheck="false" title="@{speed}" type="text" value="" />
-		</label> 
+	<div class="sheet-npcstats">
+		<div class="sheet-npcstat">
+			<label data-i18n-title="armourclass" title="armourclass">
+				<span data-i18n="armour_class">armour_class</span>
+				<input data-i18n-placeholder="armour_class" name="attr_AC" placeholder="armour_class" spellcheck="false" title="@{armour_class}" type="text" value="" />
+			</label>
+			<label data-i18n-title="hit_points" title="hit_points">
+				<span data-i18n="hit_points">hit_points</span>
+				<input data-i18n-placeholder="hit_points" name="attr_HP" placeholder="hit_points" spellcheck="false" title="@{HP}" type="number" value="" />
+				<input data-i18n-placeholder="hit_dice" name="attr_hit_dice" placeholder="hit_dice" spellcheck="false" title="@{hit_dice}" type="text" value="" />
+			</label>
+			<label data-i18n-title="speed" title="speed">
+				<span data-i18n="speed">speed</span>
+				<input data-i18n-placeholder="speed" name="attr_speed" placeholder="speed" spellcheck="false" title="@{speed}" type="text" value="" />
+			</label> 
+		</div>
 		<div class="sheet-statblock">
 			<label data-i18n-title="str" title="str">
 				<span data-i18n="str">str</span>
@@ -2092,7 +2093,6 @@
 					</label>
 				</fieldset>
 			</div>
-	
 		</div>
 		<div class="sheet-actions">
 			<label data-i18n-title="actions" title="actions">
@@ -2170,9 +2170,8 @@
 				</fieldset>
 			</div>
 		</div>
-
 	</div>
-	<div class="sheet-npc-info">
+	<div class="sheet-npcinfo">
 		<div class="sheet-NPCNotes">
 			<label data-i18n-title="NPCNotes" title="NPCNotes">
 				<textarea data-i18n-placeholder="npcnotes" name="attr_npcnotes" placeholder="npcnotes" spellcheck="false" title="@{npcnotes}" />