diff --git a/HeroSystem6eHeroic/HeroSystem6eHeroic.html b/HeroSystem6eHeroic/HeroSystem6eHeroic.html
index c3e44b6e32c5..cbdf4fd75e94 100644
--- a/HeroSystem6eHeroic/HeroSystem6eHeroic.html
+++ b/HeroSystem6eHeroic/HeroSystem6eHeroic.html
@@ -1452,7 +1452,7 @@ <h1>Mass</h1>
 			
 			<!-- Weapon 01 -->
 			<div class="subitem-tab-gear-flex-container-weapon-row">
-				<input type="text" name="attr_weaponName01" title="@{weaponName01}" value="" maxlength="20" tabindex="95"/>
+				<input type="text" name="attr_weaponName01" title="@{weaponName01}" value="" maxlength="20" tabindex="86"/>
 				
 				<div class="weapon-mover-plus-minus-enclosure">
 					<div class="weapon-mover-plus-minus-button">
@@ -1471,24 +1471,24 @@ <h1>Mass</h1>
 				</label>
 				
 				<button type="action" class="button buttonSetDamage" tabindex="-1" name="act_setDamage01" value="0"><span name="attr_weaponAdjustedDamage01"></span></button>
-				<input type="number" name="attr_weaponCSL01" title="@{weaponCSL01}" step="2" min="0" max="20" value="0" tabindex="96"/>
+				<input type="number" name="attr_weaponCSL01" title="@{weaponCSL01}" step="2" min="0" max="20" value="0" tabindex="87"/>
 				<button type="action" class="button buttonRollAttack" tabindex="-1" name="act_attackWeapon01" title="%{attackWeapon01}">Roll</button>
-				<input type="number" name="attr_weaponOCV01" title="@{weaponOCV01}" step="1" value="0" tabindex="97"/>
-				<input type="number" name="attr_weaponStunMod01" title="@{weaponStunMod01}" value="0" min="0" max="2" step="1" tabindex="99"/>
+				<input type="number" name="attr_weaponOCV01" title="@{weaponOCV01}" step="1" value="0" tabindex="88"/>
+				<input type="number" name="attr_weaponStunMod01" title="@{weaponStunMod01}" value="0" min="0" max="2" step="1" tabindex="89"/>
 				<input type="text" name="attr_weaponEndurance01" title="@{weaponEndurance01}" value="0" readonly tabindex="-1"/>
-				<input type="number" name="attr_weaponRange01" title="@{weaponRange01}" step="1" min="0" value="0" tabindex="100"/>
-				<input type="number" name="attr_weaponRangeMod01" title="@{weaponRangeMod01}" step="1" value="0" tabindex="101"/>
-				<input type="number" name="attr_weaponShots01" title="@{weaponShots01}" step="1" min="0" value="0" tabindex="102"/>
+				<input type="number" name="attr_weaponRange01" title="@{weaponRange01}" step="1" min="0" value="0" tabindex="90"/>
+				<input type="number" name="attr_weaponRangeMod01" title="@{weaponRangeMod01}" step="1" value="0" tabindex="91"/>
+				<input type="number" name="attr_weaponShots01" title="@{weaponShots01}" step="1" min="0" value="0" tabindex="92"/>
 				<label class="container-checkbox-small">
 					<input type="checkbox" name="attr_weaponAreaEffect01">
 					<span class="checkmark-small" title="@{weaponAreaEffect01}"></span>
 				</label>
-				<input type="number" name="attr_weaponMass01" title="@{weaponMass01}" step="0.1" min="0" value="0" tabindex="103"/>
+				<input type="number" name="attr_weaponMass01" title="@{weaponMass01}" step="0.1" min="0" value="0" tabindex="93"/>
 			</div>
 			
 			<!-- Weapon 02 -->
 			<div class="subitem-tab-gear-flex-container-weapon-row">
-				<input type="text" name="attr_weaponName02" title="@{weaponName02}" value="" maxlength="20" tabindex="95"/>
+				<input type="text" name="attr_weaponName02" title="@{weaponName02}" value="" maxlength="20" tabindex="94"/>
 				
 				<div class="weapon-mover-plus-minus-enclosure">
 					<div class="weapon-mover-plus-minus-button">
@@ -1507,19 +1507,19 @@ <h1>Mass</h1>
 				</label>
 				
 				<button type="action" class="button buttonSetDamage" tabindex="-1" name="act_setDamage02" value="0"><span name="attr_weaponAdjustedDamage02"></span></button>
-				<input type="number" name="attr_weaponCSL02" title="@{weaponCSL02}" step="2" min="0" max="20" value="0" tabindex="96"/>
+				<input type="number" name="attr_weaponCSL02" title="@{weaponCSL02}" step="2" min="0" max="20" value="0" tabindex="95"/>
 				<button type="action" class="button buttonRollAttack" tabindex="-1" name="act_attackWeapon02" title="%{attackWeapon02}">Roll</button>
-				<input type="number" name="attr_weaponOCV02" title="@{weaponOCV02}" step="1" value="0" tabindex="97"/>
-				<input type="number" name="attr_weaponStunMod02" title="@{weaponStunMod02}" value="0" min="0" max="2" step="1" tabindex="99"/>
+				<input type="number" name="attr_weaponOCV02" title="@{weaponOCV02}" step="1" value="0" tabindex="96"/>
+				<input type="number" name="attr_weaponStunMod02" title="@{weaponStunMod02}" value="0" min="0" max="2" step="1" tabindex="97"/>
 				<input type="text" name="attr_weaponEndurance02" title="@{weaponEndurance02}" value="0" readonly tabindex="-1"/>
-				<input type="number" name="attr_weaponRange02" title="@{weaponRange02}" step="1" min="0" value="0" tabindex="100"/>
-				<input type="number" name="attr_weaponRangeMod02" title="@{weaponRangeMod02}" step="1" value="0" tabindex="101"/>
-				<input type="number" name="attr_weaponShots02" title="@{weaponShots02}" step="1" min="0" value="0" tabindex="102"/>
+				<input type="number" name="attr_weaponRange02" title="@{weaponRange02}" step="1" min="0" value="0" tabindex="98"/>
+				<input type="number" name="attr_weaponRangeMod02" title="@{weaponRangeMod02}" step="1" value="0" tabindex="99"/>
+				<input type="number" name="attr_weaponShots02" title="@{weaponShots02}" step="1" min="0" value="0" tabindex="100"/>
 				<label class="container-checkbox-small">
 					<input type="checkbox" name="attr_weaponAreaEffect02">
 					<span class="checkmark-small" title="@{weaponAreaEffect02}"></span>
 				</label>
-				<input type="number" name="attr_weaponMass02" title="@{weaponMass02}" step="0.1" min="0" value="0" tabindex="103"/>
+				<input type="number" name="attr_weaponMass02" title="@{weaponMass02}" step="0.1" min="0" value="0" tabindex="101"/>
 			</div>
 			
 			<!-- Weapon 03 -->
@@ -12498,7 +12498,7 @@ <h2>Version:</h2>
 			
 			<div class="item-version-information">
 				<!-- Update version before release. -->
-				<input type="text" value="3.21" name="attr_version" title="@{version}" readonly tabindex="-1"/>
+				<input type="text" value="3.22" name="attr_version" title="@{version}" readonly tabindex="-1"/>
 			</div>
 		</div>
 		
@@ -13260,9 +13260,9 @@ <h2>Version:</h2>
 			version = 3.05;
 		}
 		
-		if (version < 3.21) {
+		if (version < 3.22) {
 			// No updates needed.
-			version = 3.21;
+			version = 3.22;
 		}
 		
 		if (version != origVersion) {