diff --git a/The One Ring 2e/sheet.css b/The One Ring 2e/sheet.css
index 76969f8512..456678d51a 100644
--- a/The One Ring 2e/sheet.css	
+++ b/The One Ring 2e/sheet.css	
@@ -163,48 +163,52 @@
 .charsheet input[type="checkbox"]:checked + span {
     text-decoration: underline;
 }
-/*
-    Dots
- */
+/* Dots*/
 .charsheet .sheet-dots {
     display: block;
     float: right;
     top: 2px;
     right: 0;
-    margin-right: 20px;
+    margin: 3px 15px 0px 0px;
 }
 .charsheet .sheet-dots input[type="radio"] {
     opacity: 0;
     width: 16px;
     height: 16px;
     position: relative;
-    top: 5px;
+    top: -4px;
     left: 6px;
     margin: -8px -8px -8px -8px;
     cursor: pointer;
     z-index: 1;
 }
-.charsheet input[type="radio"] + span::before{
+.charsheet .sheet-dots input[type="radio"] + span:before{
     margin-right: 4px;
-    text-align: center;
     display: inline-block;
-    vertical-align: middle;
+    vertical-align: top;
     line-height: 10px;
     width: 10px;
     height: 10px;
     content: "•";
     opacity:0;
 }
-.charsheet .sheet-dots input[type="radio"]:not([value="0"]) + span {
-    background: url("https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/The%20One%20Ring/assets/images/square-filled.png") no-repeat;
-    background-size:100%;
-}
 .charsheet .sheet-dots input[type="radio"]:checked ~ input[type="radio"] + span {
     background: url("https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/The%20One%20Ring/assets/images/square-empty.png") no-repeat;
     background-size:100%;
 }
+.charsheet .sheet-dots input[type="radio"][value="0"] + span:before {
+	content: 'X';
+	opacity: 0.2;
+	border: 0.5px solid rgb(155, 151, 151);
+	border-radius: 50%;
+    margin-top: 2px;
+}
+.charsheet .sheet-dots input[type="radio"]:not([value="0"]) + span {
+    background: url("https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/The%20One%20Ring/assets/images/square-filled.png") no-repeat;
+    background-size:100%;
+}
 /* Remove dot from all radios _after_ selected one */
-.charsheet input[type="radio"]:checked ~ input[type="radio"] + span::before{    
+.charsheet .sheet-dots input[type="radio"]:checked ~ input[type="radio"] + span:before{    
     content: "";
 }
 .charsheet .sheet-hover-info {
diff --git a/The One Ring 2e/sheet.html b/The One Ring 2e/sheet.html
index 3e0ef9655c..26af217200 100644
--- a/The One Ring 2e/sheet.html	
+++ b/The One Ring 2e/sheet.html	
@@ -1,4 +1,4 @@
-<input type="hidden" name="attr_version" value="02-00-00"/>
+<input type="hidden" name="attr_version" value="02-00-00" />
 <input type="hidden" class="sheet-tabstoggle" name="attr_sheetTab" />
 <input type="checkbox" name="attr_parsedrolls" value="1" class="hidden config-parsed-rolls" hidden readonly />
 <div class="sheet-pc">
@@ -110,6 +110,38 @@
 				<span /><span />
 			</div>
 		</div>
+		<div id="conditions">
+			<h2>Conditions / Modifiers</h2>
+			<div id="conditions-nested">
+				<label><input name="attr_favorill" type="radio" value="{1t[feat]}" checked="checked">Normal</label>
+				<label><input name="attr_favorill" type="radio" value="{2t[feat]}kh1">Favoured</label>
+				<label><input name="attr_favorill" type="radio" value="{2t[feat]}kl1">Ill Fav.</label>
+				<label><input name="attr_weary" type="checkbox">Weary</label>
+				<label><input name="attr_miserable" type="checkbox">Miserable</label>
+				<label><input name="attr_wounded" type="checkbox">Wounded</label>
+			</div>
+			<label>Injury<input name="attr_injury" type="text"></label>
+			<br />
+			<br />
+			<div class="center">
+				<label>Parsed rolls</label>
+				<div class="sheet-hover-info" data-i18n="parsedroll-description">When enabled the dice rolls will be
+					parsed and calculated, with output displayed in a rolltemplate. This removes the need for roll
+					tables. </div>
+				<span class="toggle">
+					<input type="radio" name="attr_parsedrolls" value="1" selected id="config_parsedrolls" />
+					&nbsp;
+					<input type="radio" name="attr_parsedrolls" value="0" id="config_tablerolls" />
+				</span>
+				<label>Table rolls</label>
+				<br />
+				<div class="sheet-hover-info" data-i18n="tableroll-description">When enabled the dice rolls will be
+					using preconfigured rollable tables according to instructions for The One Ring 1st Edition, with
+					output displayed in a rolltemplate.</div>
+			</div>
+			<br />
+			<button type="action" name="act_notestoggle" data-i18n="notes">Notes</button>
+		</div>
 		<div id="endurance">
 			<div id="endurance-nested">
 				<span class="diamond-small"><input name="attr_load" value="0" type="number" readonly="readonly"></span>
@@ -142,58 +174,92 @@
 				<label><input type="checkbox" name="attr_stanceparry_active" value=1 checked="checked">Stance</label>
 			</div>
 		</div>
-		<div id="conditions">
-			<h2>Conditions / Modifiers</h2>
-			<div id="conditions-nested">
-				<label><input name="attr_favorill" type="radio" value="{1t[feat]}" checked="checked">Normal</label>
-				<label><input name="attr_favorill" type="radio" value="{2t[feat]}kh1">Favoured</label>
-				<label><input name="attr_favorill" type="radio" value="{2t[feat]}kl1">Ill Fav.</label>
-				<label><input name="attr_weary" type="checkbox">Weary</label>
-				<label><input name="attr_miserable" type="checkbox">Miserable</label>
-				<label><input name="attr_wounded" type="checkbox">Wounded</label>
+		<div id="proficiencies">
+			<h1 class="center bordertop" data-i18n="combat">Combat</h1>
+			<div class="sheet-row">
+				<input type="hidden" name="attr_axes_roll1" />
+				<button type="roll" name="roll_axescheck1" value="@{axes_roll1}"></button>
+				<input type="hidden" name="attr_axes_roll2" />
+				<button type="roll" name="roll_axescheck2" value="@{axes_roll2}"></button>
+				<label data-i18n="axes">Axes</label>
+				<div class="sheet-hover-info" data-i18n="axes-description"></div>
+				<div class="sheet-dots">
+					<input type="radio" name="attr_axes" value="0" checked="checked" /><span></span>
+					<input type="radio" name="attr_axes" value="1" /><span></span>
+					<input type="radio" name="attr_axes" value="2" /><span></span>
+					<input type="radio" name="attr_axes" value="3" /><span></span>
+					<input type="radio" name="attr_axes" value="4" /><span></span>
+					<input type="radio" name="attr_axes" value="5" /><span></span>
+					<input type="radio" name="attr_axes" value="6" /><span></span>
+				</div>
 			</div>
-			<label>Injury<input name="attr_injury" type="text"></label>
-			<br/>
-			<br/>
-			<div class="center">
-				<label>Parsed rolls</label>
-				<div class="sheet-hover-info" data-i18n="parsedroll-description">When enabled the dice rolls will be parsed and calculated, with output displayed in a rolltemplate. This removes the need for roll tables. </div>
-				<span class="toggle">
-					<input type="radio" name="attr_parsedrolls" value="1" selected id="config_parsedrolls" />
-					&nbsp;
-					<input type="radio" name="attr_parsedrolls" value="0" id="config_tablerolls" />
-				</span>
-				<label>Table rolls</label>
-				<br/>
-				<div class="sheet-hover-info" data-i18n="tableroll-description">When enabled the dice rolls will be using preconfigured rollable tables according to instructions for The One Ring 1st Edition, with output displayed in a rolltemplate.</div>
+
+			<div class="sheet-row">
+				<input type="hidden" name="attr_bows_roll1" />
+				<button type="roll" name="roll_bowscheck1" value="@{bows_roll1}"></button>
+				<input type="hidden" name="attr_bows_roll2" />
+				<button type="roll" name="roll_bowscheck2" value="@{bows_roll2}"></button>
+				<label data-i18n="bows">Bows</label>
+				<div class="sheet-hover-info" data-i18n="bows-description"></div>
+				<div class="sheet-dots">
+					<input type="radio" name="attr_bows" value="0" checked="checked" /><span></span>
+					<input type="radio" name="attr_bows" value="1" /><span></span>
+					<input type="radio" name="attr_bows" value="2" /><span></span>
+					<input type="radio" name="attr_bows" value="3" /><span></span>
+					<input type="radio" name="attr_bows" value="4" /><span></span>
+					<input type="radio" name="attr_bows" value="5" /><span></span>
+					<input type="radio" name="attr_bows" value="6" /><span></span>
+				</div>
 			</div>
-			<br/>
-			<button type="action" name="act_notestoggle" data-i18n="notes">Notes</button>
-		</div>	
-		<div id="protection">
-			<h1 class="bordertop">Protection</h1>
-			<div id="protection-nested">
-				<label class="left"><input type="checkbox" name="attr_armourprot_active" value=1
-						checked="checked">Armour</label>
-				<span />
-				<label class="right">Helm<input type="checkbox" name="attr_helmprot_active" value=1
-						checked="checked"></label>
-				<span class="diamond-small"><input name="attr_armourprot" value="0" type="number"></span>
-				<span class="diamond-red"><input name="attr_protection" value="0" type="number"
-						readonly="readonly"></span>
-				<span class="diamond-small"><input name="attr_helmprot" value="0" type="number"></span>
-				<span class="diamond-small"><input name="attr_otherprot" value="0" type="number"></span>
-				<label>
-					<button type="roll" class="table-rolls" name="roll_protectioncheck"
-						value="/me rolls for Protection against Injury TN.\n/roll @{favorill} + (@{protection}+?{Bonus Dice|0})t[@{wearytype}]"></button>
-					<button type="action" class="parsed-rolls" name="act_protection" id="roll_protection"></button>Total</label>
-				
-				<span class="diamond-small"><input name="attr_stanceprot" value="0" type="number"></span>
-				<label class="left"><input type="checkbox" name="attr_otherprot_active" value=1
-						checked="checked">Other</label>
-				<span />
-				<label class="right">Stance<input type="checkbox" name="attr_stanceprot_active" value=1
-						checked="checked"></label>
+
+			<div class="sheet-row">
+				<input type="hidden" name="attr_spears_roll1" />
+				<button type="roll" name="roll_spearscheck1" value="@{spears_roll1}"></button>
+				<input type="hidden" name="attr_spears_roll2" />
+				<button type="roll" name="roll_spearscheck2" value="@{spears_roll2}"></button>
+				<label data-i18n="spears">Spears</label>
+				<div class="sheet-hover-info" data-i18n="spears-description"></div>
+				<div class="sheet-dots">
+					<input type="radio" name="attr_spears" value="0" checked="checked" /><span></span>
+					<input type="radio" name="attr_spears" value="1" /><span></span>
+					<input type="radio" name="attr_spears" value="2" /><span></span>
+					<input type="radio" name="attr_spears" value="3" /><span></span>
+					<input type="radio" name="attr_spears" value="4" /><span></span>
+					<input type="radio" name="attr_spears" value="5" /><span></span>
+					<input type="radio" name="attr_spears" value="6" /><span></span>
+				</div>
+			</div>
+
+			<div class="sheet-row">
+				<input type="hidden" name="attr_swords_roll1" />
+				<button type="roll" name="roll_swordscheck1" value="@{swords_roll1}"></button>
+				<input type="hidden" name="attr_swords_roll2" />
+				<button type="roll" name="roll_swordscheck2" value="@{swords_roll2}"></button>
+				<label data-i18n="swords">Swords</label>
+				<div class="sheet-hover-info" data-i18n="swords-description"></div>
+				<div class="sheet-dots">
+					<input type="radio" name="attr_swords" value="0" checked="checked" /><span></span>
+					<input type="radio" name="attr_swords" value="1" /><span></span>
+					<input type="radio" name="attr_swords" value="2" /><span></span>
+					<input type="radio" name="attr_swords" value="3" /><span></span>
+					<input type="radio" name="attr_swords" value="4" /><span></span>
+					<input type="radio" name="attr_swords" value="5" /><span></span>
+					<input type="radio" name="attr_swords" value="6" /><span></span>
+				</div>
+			</div>
+			<div class="center sheet-row">
+				<h3 class="center">Stance</h3>
+				<label><input name="attr_stance" type="radio" value="Forward"> Forw.</label>
+				<label><input name="attr_stance" type="radio" value="Open" checked="checked"> Open</label>
+				<label><input name="attr_stance" type="radio" value="Defensive"> Def.</label>
+				<label><input name="attr_stance" type="radio" value="Rearward"> Rear</label>
+			</div>
+			<div class="sheet-row">
+				<div class="center">
+					<label><input name="attr_stanceattack_active" type="checkbox" value="1">Stance</label>
+					<label>Attack:</label><input name="attr_stanceattackbonus" value="0" type="number">
+					<label>Damage:</label><input name="attr_stancedamagebonus" value="1" type="number">
+				</div>
 			</div>
 		</div>
 		<div id="skill-strength">
@@ -493,146 +559,37 @@
 				</div>
 			</div>
 		</div>
-		<div id="proficiencies">
-			<h1 class="center bordertop" data-i18n="combat">Combat</h1>
-			<div class="sheet-row">
-				<input type="hidden" name="attr_axes_roll1"/>
-				<button type="roll" name="roll_axescheck1" value="@{axes_roll1}"></button>
-				<input type="hidden" name="attr_axes_roll2"/>
-				<button type="roll" name="roll_axescheck2" value="@{axes_roll2}"></button>
-				<label data-i18n="axes">Axes</label>
-				<div class="sheet-hover-info" data-i18n="axes-description"></div>
-				<div class="sheet-dots">
-					<input type="radio" name="attr_axes" value="0" checked="checked" /><span></span>
-					<input type="radio" name="attr_axes" value="1" /><span></span>
-					<input type="radio" name="attr_axes" value="2" /><span></span>
-					<input type="radio" name="attr_axes" value="3" /><span></span>
-					<input type="radio" name="attr_axes" value="4" /><span></span>
-					<input type="radio" name="attr_axes" value="5" /><span></span>
-					<input type="radio" name="attr_axes" value="6" /><span></span>
-				</div>
-			</div>
+		<div id="protection">
+			<h1 class="bordertop">Protection</h1>
+			<div id="protection-nested">
+				<label class="left"><input type="checkbox" name="attr_armourprot_active" value=1
+						checked="checked">Armour</label>
+				<span />
+				<label class="right">Helm<input type="checkbox" name="attr_helmprot_active" value=1
+						checked="checked"></label>
+				<span class="diamond-small"><input name="attr_armourprot" value="0" type="number"></span>
+				<span class="diamond-red"><input name="attr_protection" value="0" type="number"
+						readonly="readonly"></span>
+				<span class="diamond-small"><input name="attr_helmprot" value="0" type="number"></span>
+				<span class="diamond-small"><input name="attr_otherprot" value="0" type="number"></span>
+				<label>
+					<button type="roll" class="table-rolls" name="roll_protectioncheck"
+						value="/me rolls for Protection against Injury TN.\n/roll @{favorill} + (@{protection}+?{Bonus Dice|0})t[@{wearytype}]"></button>
+					<button type="action" class="parsed-rolls" name="act_protection"
+						id="roll_protection"></button>Total</label>
 
-			<div class="sheet-row">
-				<input type="hidden" name="attr_bows_roll1"/>
-				<button type="roll" name="roll_bowscheck1" value="@{bows_roll1}"></button>
-				<input type="hidden" name="attr_bows_roll2"/>
-				<button type="roll" name="roll_bowscheck2" value="@{bows_roll2}"></button>
-				<label data-i18n="bows">Bows</label>
-				<div class="sheet-hover-info" data-i18n="bows-description"></div>
-				<div class="sheet-dots">
-					<input type="radio" name="attr_bows" value="0" checked="checked" /><span></span>
-					<input type="radio" name="attr_bows" value="1" /><span></span>
-					<input type="radio" name="attr_bows" value="2" /><span></span>
-					<input type="radio" name="attr_bows" value="3" /><span></span>
-					<input type="radio" name="attr_bows" value="4" /><span></span>
-					<input type="radio" name="attr_bows" value="5" /><span></span>
-					<input type="radio" name="attr_bows" value="6" /><span></span>
-				</div>
-			</div>
-
-			<div class="sheet-row">
-				<input type="hidden" name="attr_spears_roll1"/>
-				<button type="roll" name="roll_spearscheck1" value="@{spears_roll1}"></button>
-				<input type="hidden" name="attr_spears_roll2"/>
-				<button type="roll" name="roll_spearscheck2" value="@{spears_roll2}"></button>
-				<label data-i18n="spears">Spears</label>
-				<div class="sheet-hover-info" data-i18n="spears-description"></div>
-				<div class="sheet-dots">
-					<input type="radio" name="attr_spears" value="0" checked="checked" /><span></span>
-					<input type="radio" name="attr_spears" value="1" /><span></span>
-					<input type="radio" name="attr_spears" value="2" /><span></span>
-					<input type="radio" name="attr_spears" value="3" /><span></span>
-					<input type="radio" name="attr_spears" value="4" /><span></span>
-					<input type="radio" name="attr_spears" value="5" /><span></span>
-					<input type="radio" name="attr_spears" value="6" /><span></span>
-				</div>
-			</div>
-
-			<div class="sheet-row">
-				<input type="hidden" name="attr_swords_roll1"/>
-				<button type="roll" name="roll_swordscheck1" value="@{swords_roll1}"></button>
-				<input type="hidden" name="attr_swords_roll2"/>
-				<button type="roll" name="roll_swordscheck2" value="@{swords_roll2}"></button>
-				<label data-i18n="swords">Swords</label>
-				<div class="sheet-hover-info" data-i18n="swords-description"></div>
-				<div class="sheet-dots">
-					<input type="radio" name="attr_swords" value="0" checked="checked" /><span></span>
-					<input type="radio" name="attr_swords" value="1" /><span></span>
-					<input type="radio" name="attr_swords" value="2" /><span></span>
-					<input type="radio" name="attr_swords" value="3" /><span></span>
-					<input type="radio" name="attr_swords" value="4" /><span></span>
-					<input type="radio" name="attr_swords" value="5" /><span></span>
-					<input type="radio" name="attr_swords" value="6" /><span></span>
-				</div>
-			</div>
-			<div class="center">
-				<h3>Stance</h3>
-				<label><input name="attr_stance" type="radio" value="Forward"> Forw.</label>
-				<label><input name="attr_stance" type="radio" value="Open" checked="checked"> Open</label>
-				<label><input name="attr_stance" type="radio" value="Defensive"> Def.</label>
-				<label><input name="attr_stance" type="radio" value="Rearward"> Rear</label>
-			</div>
-			<div class="sheet-row">
-				<div class="center">
-					<label><input name="attr_stanceattack_active" type="checkbox" value="1">Stance</label>
-					<label>Attack:</label><input name="attr_stanceattackbonus" value="0" type="number">
-					<label>Damage:</label><input name="attr_stancedamagebonus" value="1" type="number">
-				</div>
-			</div>
-		</div>
-		<div id="armour">
-			<!-- <h2>Armour</h2> -->
-			<div id="armour-nested">
-				<span /><span /><span /><span /><span /><span /><span /><span /><span /><span /><span />
-				<label>Armour</label>
-				<input class="text" type="text" name="attr_armour">
-				<label>Protection</label>
-				<input class="center number" type="number" name="attr_armourprot" value="0">
-				<label>Load</label>
-				<input class="center number" type="number" name="attr_armourload" value="0">
-				<label title="Close Fitting: When you make a parsed PROTECTION roll while wearing a close-­fitting armour or helm you add +2 to the result">CF</label>
-				<input type="checkbox" class="center gridcol4" value="1" name="attr_armourcf"></checkbox> 	 
-				<label title="Cunning make: reduce the Load rating of the item by 2 (to a minimum of 0 Load)">CM</label>
-				<input type="checkbox" class="center gridcol5" value="1" name="attr_armourcm"></checkbox> 	 				
-				<span />
-				<label>Helm</label>
-				<input class="text" type="text" name="attr_helm">
-				<label>Protection</label>
-				<input class="center number" type="number" name="attr_helmprot" value="0">
-				<label>Load</label>
-				<input class="center number" type="number" name="attr_helmload" value="0">
-				<label title="Close Fitting: When you make a parsed PROTECTION roll while wearing a close-­fitting armour or helm you add +2 to the result">CF</label>
-				<input type="checkbox" class="center gridcol4" value="1" name="attr_helmetcf"></checkbox> 	 
-				<label title="Cunning Make: reduce the Load rating of the item by 2 (to a minimum of 0 Load)">CM</label>
-				<input type="checkbox" class="center gridcol5" value="1" name="attr_helmetcm"></checkbox> 	 								
-				<span />
-				<label>Shield</label>
-				<input class="text" type="text" name="attr_shield">
-				<label>Parry</label>
-				<input class="center number" type="number" name="attr_shieldparry" value="0">
-				<label>Load</label>
-				<input class="center number" type="number" name="attr_shieldload" value="0">
-				<label title="Reinforced: add 1 to your shield’s Parry bonus.">RI</label>
-				<input type="checkbox" class="center gridcol4" value="1" name="attr_shieldreinf"></checkbox> 	
-				<label title="Cunning Make: reduce the Load rating of the item by 2 (to a minimum of 0 Load)">CM</label>
-				<input type="checkbox" class="center gridcol5" value="1" name="attr_shieldcm"></checkbox> 								
-				<span />
-				<label>Mount</label>
-				<input class="text" type="text" name="attr_mount">
-				<label>Quality</label>
-				<input class="center number" type="number" name="attr_mountquality" value="0">
-				<label>Vigour</label>
-				<input class="center number" type="number" name="attr_mountvigour" value="0">
-				<span />
-				<span />
+				<span class="diamond-small"><input name="attr_stanceprot" value="0" type="number"></span>
+				<label class="left"><input type="checkbox" name="attr_otherprot_active" value=1
+						checked="checked">Other</label>
 				<span />
+				<label class="right">Stance<input type="checkbox" name="attr_stanceprot_active" value=1
+						checked="checked"></label>
 			</div>
 		</div>
 		<div id="war-gear">
 			<!-- <h2>War Gear</h2> -->
 			<div id="war-gear-nested">
-				<span/>
+				<span />
 				<label>Weapon</label>
 				<label>Type</label>
 				<label class="center">Damage</label>
@@ -640,9 +597,10 @@
 				<label class="center">Load</label>
 				<label class="center" title="Fell: Add 2 to the Injury rating of the selected weapon">F</label>
 				<label class="center" title="Grievious: Add 1 to the damage rating of the weapon">G</label>
-				<label class="center" title="Keen: Attack rolls made with a Keen weapon score a Piercing Blow also on a result of 9 on the Feat die">K</label>
+				<label class="center"
+					title="Keen: Attack rolls made with a Keen weapon score a Piercing Blow also on a result of 9 on the Feat die">K</label>
 				<label>Notes</label>
-				<span class="table-rolls"/>
+				<span class="table-rolls" />
 				<button type="action" name="act_weapon_1" id="roll_weapon1" class="parsed-rolls"></button>
 				<input name="attr_weapon_skill_name_1" type="text"></input>
 				<select name="attr_weapon_combat_prof_1">
@@ -655,11 +613,11 @@
 				<input name="attr_weapon_damage_1" value="0" class="center number" type="number">
 				<input name="attr_weapon_injury_1" value="0" class="center number" type="number">
 				<input name="attr_weapon_load_1" value="0" class="center number" type="number">
-				<input type="checkbox" class="center" value="1" name="attr_weapon_fell_1"> 
-				<input type="checkbox" class="center" value="1" name="attr_weapon_grievous_1"> 
-				<input type="checkbox" class="center" value="1" name="attr_weapon_keen_1"> 
+				<input type="checkbox" class="center" value="1" name="attr_weapon_fell_1">
+				<input type="checkbox" class="center" value="1" name="attr_weapon_grievous_1">
+				<input type="checkbox" class="center" value="1" name="attr_weapon_keen_1">
 				<input name="attr_weapon_note_1" type="text">
-				<span class="table-rolls"/>
+				<span class="table-rolls" />
 				<button type="action" name="act_weapon_2" id="roll_weapon2" class="parsed-rolls"></button>
 				<input name="attr_weapon_skill_name_2" type="text">
 				<select name="attr_weapon_combat_prof_2">
@@ -672,11 +630,11 @@
 				<input name="attr_weapon_damage_2" value="0" class="center number" type="number">
 				<input name="attr_weapon_injury_2" value="0" class="center number" type="number">
 				<input name="attr_weapon_load_2" value="0" class="center number" type="number">
-				<input type="checkbox" class="center" name="attr_weapon_fell_2"> 
-				<input type="checkbox" class="center" name="attr_weapon_grievous_2"> 
-				<input type="checkbox" class="center" name="attr_weapon_keen_2"> 
+				<input type="checkbox" class="center" name="attr_weapon_fell_2">
+				<input type="checkbox" class="center" name="attr_weapon_grievous_2">
+				<input type="checkbox" class="center" name="attr_weapon_keen_2">
 				<input name="attr_weapon_note_2" type="text">
-				<span class="table-rolls"/>
+				<span class="table-rolls" />
 				<button type="action" name="act_weapon_2" id="roll_weapon2" class="parsed-rolls"></button>
 				<input name="attr_weapon_skill_name_3" type="text">
 				<select name="attr_weapon_combat_prof_3">
@@ -689,11 +647,11 @@
 				<input name="attr_weapon_damage_3" value="0" class="center number" type="number">
 				<input name="attr_weapon_injury_3" value="0" class="center number" type="number">
 				<input name="attr_weapon_load_3" value="0" class="center number" type="number">
-				<input type="checkbox" class="center" name="attr_weapon_fell_3"> 
-				<input type="checkbox" class="center" name="attr_weapon_grievous_3"> 
-				<input type="checkbox" class="center" name="attr_weapon_keen_3"> 
+				<input type="checkbox" class="center" name="attr_weapon_fell_3">
+				<input type="checkbox" class="center" name="attr_weapon_grievous_3">
+				<input type="checkbox" class="center" name="attr_weapon_keen_3">
 				<input name="attr_weapon_note_3" type="text">
-				<span class="table-rolls"/>
+				<span class="table-rolls" />
 				<button type="action" name="act_weapon_2" id="roll_weapon2" class="parsed-rolls"></button>
 				<input name="attr_weapon_skill_name_4" type="text">
 				<select name="attr_weapon_combat_prof_4">
@@ -706,12 +664,62 @@
 				<input name="attr_weapon_damage_4" value="0" class="center number" type="number">
 				<input name="attr_weapon_injury_4" value="0" class="center number" type="number">
 				<input name="attr_weapon_load_4" value="0" class="center number" type="number">
-				<input type="checkbox" class="center" name="attr_weapon_fell_4"> 
-				<input type="checkbox" class="center" name="attr_weapon_grievous_4"> 
-				<input type="checkbox" class="center" name="attr_weapon_keen_4"> 
+				<input type="checkbox" class="center" name="attr_weapon_fell_4">
+				<input type="checkbox" class="center" name="attr_weapon_grievous_4">
+				<input type="checkbox" class="center" name="attr_weapon_keen_4">
 				<input name="attr_weapon_note_4" type="text">
 			</div>
 		</div>
+		<div id="armour">
+			<!-- <h2>Armour</h2> -->
+			<div id="armour-nested">
+				<span /><span /><span /><span /><span /><span /><span /><span /><span /><span /><span />
+				<label>Armour</label>
+				<input class="text" type="text" name="attr_armour">
+				<label>Protection</label>
+				<input class="center number" type="number" name="attr_armourprot" value="0">
+				<label>Load</label>
+				<input class="center number" type="number" name="attr_armourload" value="0">
+				<label
+					title="Close Fitting: When you make a parsed PROTECTION roll while wearing a close-­fitting armour or helm you add +2 to the result">CF</label>
+				<input type="checkbox" class="center gridcol4" value="1" name="attr_armourcf"></checkbox>
+				<label title="Cunning make: reduce the Load rating of the item by 2 (to a minimum of 0 Load)">CM</label>
+				<input type="checkbox" class="center gridcol5" value="1" name="attr_armourcm"></checkbox>
+				<span />
+				<label>Helm</label>
+				<input class="text" type="text" name="attr_helm">
+				<label>Protection</label>
+				<input class="center number" type="number" name="attr_helmprot" value="0">
+				<label>Load</label>
+				<input class="center number" type="number" name="attr_helmload" value="0">
+				<label
+					title="Close Fitting: When you make a parsed PROTECTION roll while wearing a close-­fitting armour or helm you add +2 to the result">CF</label>
+				<input type="checkbox" class="center gridcol4" value="1" name="attr_helmetcf"></checkbox>
+				<label title="Cunning Make: reduce the Load rating of the item by 2 (to a minimum of 0 Load)">CM</label>
+				<input type="checkbox" class="center gridcol5" value="1" name="attr_helmetcm"></checkbox>
+				<span />
+				<label>Shield</label>
+				<input class="text" type="text" name="attr_shield">
+				<label>Parry</label>
+				<input class="center number" type="number" name="attr_shieldparry" value="0">
+				<label>Load</label>
+				<input class="center number" type="number" name="attr_shieldload" value="0">
+				<label title="Reinforced: add 1 to your shield’s Parry bonus.">RI</label>
+				<input type="checkbox" class="center gridcol4" value="1" name="attr_shieldreinf"></checkbox>
+				<label title="Cunning Make: reduce the Load rating of the item by 2 (to a minimum of 0 Load)">CM</label>
+				<input type="checkbox" class="center gridcol5" value="1" name="attr_shieldcm"></checkbox>
+				<span />
+				<label>Mount</label>
+				<input class="text" type="text" name="attr_mount">
+				<label>Quality</label>
+				<input class="center number" type="number" name="attr_mountquality" value="0">
+				<label>Vigour</label>
+				<input class="center number" type="number" name="attr_mountvigour" value="0">
+				<span />
+				<span />
+				<span />
+			</div>
+		</div>
 		<input type="hidden" class="sheet-notestoggle" name="attr_notesactive" />
 		<div id="notes">
 			<h1>NOTES</h1>
@@ -1508,18 +1516,18 @@
 	});	
 </script>
 <rolltemplate class="sheet-rolltemplate-standard">
-    <div class="sheet=pc">
-        <div class="sheet-main">{{skill}}</div>
+	<div class="sheet=pc">
+		<div class="sheet-main">{{skill}}</div>
 		{{#rollTotal() favorill 1}}
-			<div class="sheet-main">stand {{standard}}</div>
+		<div class="sheet-main">stand {{standard}}</div>
 		{{/rollTotal() favorill 1}}
 		{{#rollTotal() favorill 2}}
-			<div class="sheet-main">fav {{fav}}</div>
+		<div class="sheet-main">fav {{fav}}</div>
 		{{/rollTotal() favorill 2}}
 		{{#rollTotal() favorill 3}}
-			<div class="sheet-main">ill {{ill}}</div>
+		<div class="sheet-main">ill {{ill}}</div>
 		{{/rollTotal() favorill 3}}
-    </div>
+	</div>
 </rolltemplate>
 <rolltemplate class="sheet-rolltemplate-tor">
 	<div class="sheet-container sheet-color-{{color}}">
@@ -1529,13 +1537,28 @@
 		</div>
 		<div class="sheet-content">
 			<div class="full-col center die-title target-number">Target Number</div>
-			<div class="full-col center die-result target-number"><span class="rotated-box"><span class="die-result">{{target}}</span></span></div>
+			<div class="full-col center die-result target-number">
+				<span class="rotated-box"><span class="die-result">{{target}}</span></span>
+			</div>
 			<div class="half-col die-title feat-label">Feat Die</div>
-			<div class="half-col die-title success-label">Success<br/> Dice</div>
-			{{#rollWasCrit() feat}}<div class="half-col die-result feat-die"><span class="rotated-box fullcrit">{{feat}}</span><span class="gandalf"></span></div>{{/rollWasCrit() feat}}
-			{{#rollWasFumble() feat}}<div class="half-col die-result feat-die"><span class="rotated-box fullfail">{{feat}}</span><span class="eye"></span></div>{{/rollWasFumble() feat}}
-			{{#rollBetween() feat 1 10}}<div class="half-col die-result feat-die"><span class="rotated-box">{{feat}}</span></div>{{/rollBetween() feat 1 10}}
-			{{^feat}}<div class="half-col die-result feat-die"><span class="rotated-box"><span>-</span></span></div>{{/feat}}
+			<div class="half-col die-title success-label">Success<br /> Dice</div>
+			{{#rollWasCrit() feat}}
+			<div class="half-col die-result feat-die">
+				<span class="rotated-box fullcrit">{{feat}}</span><span class="gandalf"></span>
+			</div>
+			{{/rollWasCrit() feat}}
+			{{#rollWasFumble() feat}}
+			<div class="half-col die-result feat-die">
+				<span class="rotated-box fullfail">{{feat}}</span><span class="eye"></span>
+			</div>
+			{{/rollWasFumble() feat}}
+			{{#rollBetween() feat 1 10}}
+			<div class="half-col die-result feat-die">
+				<span class="rotated-box">{{feat}}</span>
+			</div>
+			{{/rollBetween() feat 1 10}}{{^feat}}
+			<div class="half-col die-result feat-die"><span class="rotated-box"><span>-</span></span></div>
+			{{/feat}}
 			<div class="half-col die-result success-die"><span class="rotated-box">{{r1}}</span></div>
 			<div class="half-col die-comment favoured">
 				{{#favoured}}{{favoured}}{{/favoured}}
@@ -1549,23 +1572,26 @@
 			<div class="half-col die-comment weary red">
 				{{#weary}}{{weary}}{{/weary}}
 			</div>
-			<div class="full-col center die-result roll-total"><span class="rotated-box">{{computed::total}}</span></div>
+			<div class="full-col center die-result roll-total"><span class="rotated-box">{{computed::total}}</span>
+			</div>
 			<div class="full-col center die-title roll-total">Total</div>
 			<div class="full-col center die-result roll-diff"><span class="rotated-box">{{computed::diff}}</span></div>
 			<div class="full-col center die-title roll-diff">Diff</div>
 			<div class="full-col center roll-outcome">
 				<div class="center die-title">
 					{{#rollLess() computed::outcome 1}}
-						{{#rollTotal() computed::outcome -2}}Miserable&nbsp;&nbsp;{{/rollTotal() computed::outcome -2}}
-						{{#rollTotal() computed::outcome -1}}Weary&nbsp;&nbsp;{{/rollTotal() computed::outcome -1}}
-						Failure!
+					{{#rollTotal() computed::outcome -2}}Miserable&nbsp;&nbsp;{{/rollTotal() computed::outcome -2}}
+					{{#rollTotal() computed::outcome -1}}Weary&nbsp;&nbsp;{{/rollTotal() computed::outcome -1}}
+					Failure!
 					{{/rollLess() computed::outcome 1}}
 					{{#rollBetween() computed::outcome 1 3}}
-						{{#rollTotal() computed::greatness 1}}Great&nbsp;&nbsp;({{computed::greatness}})&nbsp;{{/rollTotal() computed::greatness 1}}
-						{{#rollGreater() computed::greatness 1}}Extraordinary&nbsp;&nbsp;({{computed::greatness}})&nbsp;{{/rollGreater() computed::greatness 1}}
-						{{#rollTotal() computed::outcome 2}}Feat&nbsp;&nbsp;{{/rollTotal() computed::outcome 2}}
-						{{#rollBetween() computed::outcome 1 2}}Success!{{/rollBetween() computed::outcome 1 2}}
-						{{#rollTotal() computed::outcome 3}}Piercing&nbsp;&nbsp;Blow!{{/rollTotal() computed::outcome 3}}
+					{{#rollTotal() computed::greatness 1}}Great&nbsp;&nbsp;({{computed::greatness}})&nbsp;
+					{{/rollTotal() computed::greatness 1}}
+					{{#rollGreater() computed::greatness 1}}Extraordinary&nbsp;&nbsp;({{computed::greatness}})&nbsp;
+					{{/rollGreater() computed::greatness 1}}
+					{{#rollTotal() computed::outcome 2}}Feat&nbsp;&nbsp;{{/rollTotal() computed::outcome 2}}
+					{{#rollBetween() computed::outcome 1 2}}Success!{{/rollBetween() computed::outcome 1 2}}
+					{{#rollTotal() computed::outcome 3}}Piercing&nbsp;&nbsp;Blow!{{/rollTotal() computed::outcome 3}}
 					{{/rollBetween() computed::outcome 1 3}}
 				</div>
 			</div>
@@ -1576,15 +1602,15 @@
 				<div class="center">
 					{{weaponinfo}}
 				</div>
-			</div>	
-			{{/weaponinfo}}	
+			</div>
+			{{/weaponinfo}}
 			{{#additional}}
 			<div class="full-col center additional">
 				<div class="center">
 					{{additional}}
 				</div>
-			</div>	
-			{{/additional}}	
+			</div>
+			{{/additional}}
 		</div>
 		<!-- 
 		<div class="sheet-extra">