diff --git a/HeroSystem6eHeroic/HeroSystem6eHeroic.html b/HeroSystem6eHeroic/HeroSystem6eHeroic.html
index 0f0e3c1c7d..d4697f2513 100644
--- a/HeroSystem6eHeroic/HeroSystem6eHeroic.html
+++ b/HeroSystem6eHeroic/HeroSystem6eHeroic.html
@@ -1147,10 +1147,6 @@
 					
 					<button type="action" class="button buttonSetDefense" tabindex="-1" name="act_setDefense01" value="0"><span name="attr_armorDefense01"></span></button>
 					
-					<!-- <input type="number" name="attr_armorPD01" title="@{armorPD01}" step="1" value="0" min="0" step="1" tabindex="2"/>
-					<input type="number" name="attr_totalPD01" title="@{totalPD01}" step="1" value="0" min="0" step="1" tabindex="3"/>
-					<input type="number" name="attr_armorED01" title="@{armorED01}" step="1" value="0" min="0" step="1" tabindex="4"/>
-					<input type="number" name="attr_totalED01" title="@{totalED01}" step="1" value="0" min="0" step="1" tabindex="5"/> -->
 					<div class="custom-select">
 						<select name="attr_armorEND01" title="@{armorEND01}" tabindex="-1">
 							<option value="5">5</option>
@@ -1204,10 +1200,6 @@
 					
 					<button type="action" class="button buttonSetDefense" tabindex="-1" name="act_setDefense02" value="0"><span name="attr_armorDefense02"></span></button>
 					
-					<!-- <input type="number" name="attr_armorPD02" title="@{armorPD02}" step="1" value="0" min="0" step="1" tabindex="12"/>
-					<input type="number" name="attr_totalPD02" title="@{totalPD02}" step="1" value="0" min="0" step="1" tabindex="13"/>
-					<input type="number" name="attr_armorED02" title="@{armorED02}" step="1" value="0" min="0" step="1" tabindex="14"/>
-					<input type="number" name="attr_totalED02" title="@{totalED02}" step="1" value="0" min="0" step="1" tabindex="15"/> -->
 					<div class="custom-select">
 						<select name="attr_armorEND02" title="@{armorEND02}" tabindex="-1">
 							<option value="5">5</option>
@@ -1261,10 +1253,6 @@
 					
 					<button type="action" class="button buttonSetDefense" tabindex="-1" name="act_setDefense03" value="0"><span name="attr_armorDefense03"></span></button>
 					
-					<!-- <input type="number" name="attr_armorPD03" title="@{armorPD03}" step="1" value="0" min="0" step="1" tabindex="22"/>
-					<input type="number" name="attr_totalPD03" title="@{totalPD03}" step="1" value="0" min="0" step="1" tabindex="23"/>
-					<input type="number" name="attr_armorED03" title="@{armorED03}" step="1" value="0" min="0" step="1" tabindex="24"/>
-					<input type="number" name="attr_totalED03" title="@{totalED03}" step="1" value="0" min="0" step="1" tabindex="25"/> -->
 					<div class="custom-select">
 						<select name="attr_armorEND03" title="@{armorEND03}" tabindex="-1">
 							<option value="5">5</option>
@@ -1318,10 +1306,6 @@
 					
 					<button type="action" class="button buttonSetDefense" tabindex="-1" name="act_setDefense04" value="0"><span name="attr_armorDefense04"></span></button>
 					
-					<!-- <input type="number" name="attr_armorPD04" title="@{armorPD04}" step="1" value="0" min="0" step="1" tabindex="32"/>
-					<input type="number" name="attr_totalPD04" title="@{totalPD04}" step="1" value="0" min="0" step="1" tabindex="33"/>
-					<input type="number" name="attr_armorED04" title="@{armorED04}" step="1" value="0" min="0" step="1" tabindex="34"/>
-					<input type="number" name="attr_totalED04" title="@{totalED04}" step="1" value="0" min="0" step="1" tabindex="35"/> -->
 					<div class="custom-select">
 						<select name="attr_armorEND04" title="@{armorEND04}" tabindex="-1">
 							<option value="5">5</option>
@@ -1359,18 +1343,16 @@
 				<div class="item-tab-gear-flex-container-set-defense-01">
 					<div class="subitem-tab-gear-flex-container-set-defense-column">
 						<div class="item-tab-gear-set-defense-title">
-							<input type="text" name="attr_armorName01" title="@{armorName01}" value="" maxlength="20" tabindex="31"/>
+							<input type="text" name="attr_armorName01" title="@{armorName01}" value="" maxlength="20" tabindex="1"/>
 						</div>
 						
 						<div class="subitem-tab-gear-flex-container-set-defense-row">
 							<h2>Resistant PD:</h2>
 							<input type="number" name="attr_armorPD01" title="@{armorPD01}" step="1" value="0" min="0" step="1" tabindex="2"/>
-							<!-- <input type="number" name="attr_totalPD01" title="@{totalPD01}" step="1" value="0" min="0" step="1" readonly/> -->
 						</div>
 						<div class="subitem-tab-gear-flex-container-set-defense-row">
 							<h2>Resistant ED:</h2>
 							<input type="number" name="attr_armorED01" title="@{armorED01}" step="1" value="0" min="0" step="1" tabindex="3"/>
-							<!-- <input type="number" name="attr_totalED01" title="@{totalED01}" step="1" value="0" min="0" step="1" readonly/> -->
 						</div>
 						<div class="subitem-tab-gear-flex-container-set-defense-row">
 							<h2>Power Defense:</h2>
@@ -1444,16 +1426,273 @@
 							</div>
 						</div>
 					</div>
+				</div>
+				
+				<!-- Set Armor 02 Defense -->
+				<div class="item-tab-gear-flex-container-set-defense-02">
+					<div class="subitem-tab-gear-flex-container-set-defense-column">
+						<div class="item-tab-gear-set-defense-title">
+							<input type="text" name="attr_armorName02" title="@{armorName02}" value="" maxlength="20" tabindex="1"/>
+						</div>
+						
+						<div class="subitem-tab-gear-flex-container-set-defense-row">
+							<h2>Resistant PD:</h2>
+							<input type="number" name="attr_armorPD02" title="@{armorPD02}" step="1" value="0" min="0" step="1" tabindex="2"/>
+						</div>
+						<div class="subitem-tab-gear-flex-container-set-defense-row">
+							<h2>Resistant ED:</h2>
+							<input type="number" name="attr_armorED02" title="@{armorED02}" step="1" value="0" min="0" step="1" tabindex="3"/>
+						</div>
+						<div class="subitem-tab-gear-flex-container-set-defense-row">
+							<h2>Power Defense:</h2>
+							<input type="number" name="attr_powerDefense02" title="@{powerDefense02}" step="1" value="0" min="0" step="1" tabindex="4"/>
+						</div>
+						<div class="subitem-tab-gear-flex-container-set-defense-row">
+							<h2>Mental Defense:</h2>
+							<input type="number" name="attr_mentalDefense02" title="@{mentalDefense02}" step="1" value="0" min="0" step="1" tabindex="5"/>
+						</div>
+					</div>
 					
-					<!-- <div class="subitem-tab-gear-flex-container-set-defense-column">
+					<div class="subitem-tab-gear-flex-container-set-defense-column">
 						<div class="item-tab-gear-set-defense-title">
 							<h1></h1>
 						</div>
-						<div class="subitem-tab-gear-flex-container-set-damage-button">
-							<button type="action" class="button buttonOK" tabindex="93" name="act_buttonDefenseOK">OK</button>
+						<div class="subitem-tab-gear-flex-container-set-defense-row">
+							<div class="subitem-flash-defense">
+								<h2>Flash Defense:</h2>
+								<input type="number" name="attr_flashDefense02" title="@{flashDefense02}" step="1" value="0" min="0" step="1" tabindex="6"/>
+							</div>
 						</div>
-						<h1></h1>
-					</div> -->
+						<div class="subitem-tab-gear-flex-container-set-defense-row">
+							<div class="subitem-flash-defense-sense">
+								<h2>Vision:</h2>
+								<label class="container-checkbox-small">
+									<input type="checkbox" name="attr_flashDefenseSight02">
+									<span class="checkmark-small" title="@{flashDefenseSight02}"></span>
+								</label>
+							</div>
+							<div class="subitem-flash-defense-sense">
+								<h2>Hearing:</h2>
+								<label class="container-checkbox-small">
+									<input type="checkbox" name="attr_flashDefenseHearing02">
+									<span class="checkmark-small" title="@{flashDefenseHearing02}"></span>
+								</label>
+							</div>
+							<div class="subitem-flash-defense-sense">
+								<h2>Smell:</h2>
+								<label class="container-checkbox-small">
+									<input type="checkbox" name="attr_flashDefenseSmell02">
+									<span class="checkmark-small" title="@{flashDefenseSmell02}"></span>
+								</label>
+							</div>
+						</div>
+						<div class="subitem-tab-gear-flex-container-set-defense-row">
+							<div class="subitem-flash-defense-sense">
+								<h2>Mental:</h2>
+								<label class="container-checkbox-small">
+									<input type="checkbox" name="attr_flashDefenseMental02">
+									<span class="checkmark-small" title="@{flashDefenseMental02}"></span>
+								</label>
+							</div>
+							<div class="subitem-flash-defense-sense">
+								<h2>Touch:</h2>
+								<label class="container-checkbox-small">
+									<input type="checkbox" name="attr_flashDefenseTouch02">
+									<span class="checkmark-small" title="@{flashDefenseTouch02}"></span>
+								</label>
+							</div>
+							<div class="subitem-flash-defense-sense">
+								<h2>Radio:</h2>
+								<label class="container-checkbox-small">
+									<input type="checkbox" name="attr_flashDefenseRadio02">
+									<span class="checkmark-small" title="@{flashDefenseRadio02}"></span>
+								</label>
+							</div>
+						</div>
+						<div class="subitem-tab-gear-flex-container-set-defense-row">
+							<div class="subitem-tab-gear-flex-container-set-damage-button">
+								<button type="action" class="button buttonOK" tabindex="7" name="act_buttonDefenseOK">OK</button>
+							</div>
+						</div>
+					</div>
+				</div>
+				
+				<!-- Set Armor 03 Defense -->
+				<div class="item-tab-gear-flex-container-set-defense-03">
+					<div class="subitem-tab-gear-flex-container-set-defense-column">
+						<div class="item-tab-gear-set-defense-title">
+							<input type="text" name="attr_armorName03" title="@{armorName03}" value="" maxlength="20" tabindex="1"/>
+						</div>
+						
+						<div class="subitem-tab-gear-flex-container-set-defense-row">
+							<h2>Resistant PD:</h2>
+							<input type="number" name="attr_armorPD03" title="@{armorPD03}" step="1" value="0" min="0" step="1" tabindex="2"/>
+						</div>
+						<div class="subitem-tab-gear-flex-container-set-defense-row">
+							<h2>Resistant ED:</h2>
+							<input type="number" name="attr_armorED03" title="@{armorED03}" step="1" value="0" min="0" step="1" tabindex="3"/>
+						</div>
+						<div class="subitem-tab-gear-flex-container-set-defense-row">
+							<h2>Power Defense:</h2>
+							<input type="number" name="attr_powerDefense03" title="@{powerDefense03}" step="1" value="0" min="0" step="1" tabindex="4"/>
+						</div>
+						<div class="subitem-tab-gear-flex-container-set-defense-row">
+							<h2>Mental Defense:</h2>
+							<input type="number" name="attr_mentalDefense03" title="@{mentalDefense03}" step="1" value="0" min="0" step="1" tabindex="5"/>
+						</div>
+					</div>
+					
+					<div class="subitem-tab-gear-flex-container-set-defense-column">
+						<div class="item-tab-gear-set-defense-title">
+							<h1></h1>
+						</div>
+						<div class="subitem-tab-gear-flex-container-set-defense-row">
+							<div class="subitem-flash-defense">
+								<h2>Flash Defense:</h2>
+								<input type="number" name="attr_flashDefense03" title="@{flashDefense03}" step="1" value="0" min="0" step="1" tabindex="6"/>
+							</div>
+						</div>
+						<div class="subitem-tab-gear-flex-container-set-defense-row">
+							<div class="subitem-flash-defense-sense">
+								<h2>Vision:</h2>
+								<label class="container-checkbox-small">
+									<input type="checkbox" name="attr_flashDefenseSight03">
+									<span class="checkmark-small" title="@{flashDefenseSight03}"></span>
+								</label>
+							</div>
+							<div class="subitem-flash-defense-sense">
+								<h2>Hearing:</h2>
+								<label class="container-checkbox-small">
+									<input type="checkbox" name="attr_flashDefenseHearing03">
+									<span class="checkmark-small" title="@{flashDefenseHearing03}"></span>
+								</label>
+							</div>
+							<div class="subitem-flash-defense-sense">
+								<h2>Smell:</h2>
+								<label class="container-checkbox-small">
+									<input type="checkbox" name="attr_flashDefenseSmell03">
+									<span class="checkmark-small" title="@{flashDefenseSmell03}"></span>
+								</label>
+							</div>
+						</div>
+						<div class="subitem-tab-gear-flex-container-set-defense-row">
+							<div class="subitem-flash-defense-sense">
+								<h2>Mental:</h2>
+								<label class="container-checkbox-small">
+									<input type="checkbox" name="attr_flashDefenseMental03">
+									<span class="checkmark-small" title="@{flashDefenseMental03}"></span>
+								</label>
+							</div>
+							<div class="subitem-flash-defense-sense">
+								<h2>Touch:</h2>
+								<label class="container-checkbox-small">
+									<input type="checkbox" name="attr_flashDefenseTouch03">
+									<span class="checkmark-small" title="@{flashDefenseTouch03}"></span>
+								</label>
+							</div>
+							<div class="subitem-flash-defense-sense">
+								<h2>Radio:</h2>
+								<label class="container-checkbox-small">
+									<input type="checkbox" name="attr_flashDefenseRadio03">
+									<span class="checkmark-small" title="@{flashDefenseRadio03}"></span>
+								</label>
+							</div>
+						</div>
+						<div class="subitem-tab-gear-flex-container-set-defense-row">
+							<div class="subitem-tab-gear-flex-container-set-damage-button">
+								<button type="action" class="button buttonOK" tabindex="7" name="act_buttonDefenseOK">OK</button>
+							</div>
+						</div>
+					</div>
+				</div>
+				
+				<!-- Set Armor 04 Defense -->
+				<div class="item-tab-gear-flex-container-set-defense-04">
+					<div class="subitem-tab-gear-flex-container-set-defense-column">
+						<div class="item-tab-gear-set-defense-title">
+							<input type="text" name="attr_armorName04" title="@{armorName04}" value="" maxlength="20" tabindex="1"/>
+						</div>
+						
+						<div class="subitem-tab-gear-flex-container-set-defense-row">
+							<h2>Resistant PD:</h2>
+							<input type="number" name="attr_armorPD04" title="@{armorPD04}" step="1" value="0" min="0" step="1" tabindex="2"/>
+						</div>
+						<div class="subitem-tab-gear-flex-container-set-defense-row">
+							<h2>Resistant ED:</h2>
+							<input type="number" name="attr_armorED04" title="@{armorED04}" step="1" value="0" min="0" step="1" tabindex="3"/>
+						</div>
+						<div class="subitem-tab-gear-flex-container-set-defense-row">
+							<h2>Power Defense:</h2>
+							<input type="number" name="attr_powerDefense04" title="@{powerDefense04}" step="1" value="0" min="0" step="1" tabindex="4"/>
+						</div>
+						<div class="subitem-tab-gear-flex-container-set-defense-row">
+							<h2>Mental Defense:</h2>
+							<input type="number" name="attr_mentalDefense04" title="@{mentalDefense04}" step="1" value="0" min="0" step="1" tabindex="5"/>
+						</div>
+					</div>
+					
+					<div class="subitem-tab-gear-flex-container-set-defense-column">
+						<div class="item-tab-gear-set-defense-title">
+							<h1></h1>
+						</div>
+						<div class="subitem-tab-gear-flex-container-set-defense-row">
+							<div class="subitem-flash-defense">
+								<h2>Flash Defense:</h2>
+								<input type="number" name="attr_flashDefense04" title="@{flashDefense04}" step="1" value="0" min="0" step="1" tabindex="6"/>
+							</div>
+						</div>
+						<div class="subitem-tab-gear-flex-container-set-defense-row">
+							<div class="subitem-flash-defense-sense">
+								<h2>Vision:</h2>
+								<label class="container-checkbox-small">
+									<input type="checkbox" name="attr_flashDefenseSight04">
+									<span class="checkmark-small" title="@{flashDefenseSight04}"></span>
+								</label>
+							</div>
+							<div class="subitem-flash-defense-sense">
+								<h2>Hearing:</h2>
+								<label class="container-checkbox-small">
+									<input type="checkbox" name="attr_flashDefenseHearing04">
+									<span class="checkmark-small" title="@{flashDefenseHearing04}"></span>
+								</label>
+							</div>
+							<div class="subitem-flash-defense-sense">
+								<h2>Smell:</h2>
+								<label class="container-checkbox-small">
+									<input type="checkbox" name="attr_flashDefenseSmell04">
+									<span class="checkmark-small" title="@{flashDefenseSmell04}"></span>
+								</label>
+							</div>
+						</div>
+						<div class="subitem-tab-gear-flex-container-set-defense-row">
+							<div class="subitem-flash-defense-sense">
+								<h2>Mental:</h2>
+								<label class="container-checkbox-small">
+									<input type="checkbox" name="attr_flashDefenseMental04">
+									<span class="checkmark-small" title="@{flashDefenseMental04}"></span>
+								</label>
+							</div>
+							<div class="subitem-flash-defense-sense">
+								<h2>Touch:</h2>
+								<label class="container-checkbox-small">
+									<input type="checkbox" name="attr_flashDefenseTouch04">
+									<span class="checkmark-small" title="@{flashDefenseTouch04}"></span>
+								</label>
+							</div>
+							<div class="subitem-flash-defense-sense">
+								<h2>Radio:</h2>
+								<label class="container-checkbox-small">
+									<input type="checkbox" name="attr_flashDefenseRadio04">
+									<span class="checkmark-small" title="@{flashDefenseRadio04}"></span>
+								</label>
+							</div>
+						</div>
+						<div class="subitem-tab-gear-flex-container-set-defense-row">
+							<div class="subitem-tab-gear-flex-container-set-damage-button">
+								<button type="action" class="button buttonOK" tabindex="7" name="act_buttonDefenseOK">OK</button>
+							</div>
+						</div>
+					</div>
 				</div>
 			</div>