diff --git a/GURPS/gurps.html b/GURPS/gurps.html
index f1913dfb96..dee039e9b0 100644
--- a/GURPS/gurps.html
+++ b/GURPS/gurps.html
@@ -2136,9 +2136,11 @@
 							<!-- row 2 -->
 							<div class="item item6">
 
-								<h5>
-									<span data-i18n="maneuver-title">Maneuver</span>
-								</h5>
+								<div class="block">
+									<h5>
+										<span data-i18n="maneuver-title">Maneuver</span>
+									</h5>
+								</div>
 								
 								<div class="block">
 									<label>
@@ -2204,9 +2206,11 @@
 									</label>
 								</div>
 
-								<h5>
-									<span data-i18n="defenders-posture-title">Defender's Posture</span>
-								</h5>
+								<div class="block">
+									<h5>
+										<span data-i18n="defenders-posture-title">Defender's Posture</span>
+									</h5>
+								</div>
 
 								<div class="block">
 									<label>
@@ -2240,13 +2244,53 @@
 									</label>
 								</div>
 
+								<div class="block">
+									<h5>
+										<span data-i18n="attackers-action-title">Attacker's Action</span>
+									</h5>
+								</div>
+
+								<div class="block">
+									<label>
+										<div>
+											<input type="checkbox" name="attr_defense_from_behind" value="1" title="macro name: @{defense_from_behind}" />
+										</div>
+										<div>
+											<div class="tooltip">
+												<span data-i18n="attack-from-behind-label">Attack From Behind <i>Peripheral</i>: -2</span>
+												<span class="tooltiptext">
+													<span data-i18n="attack-from-behind-tooltip">Normally, if attacked from behind, you have no defense. However, if you have Peripheral Vision you can defend at -2. See B391</span>
+												</span>
+											</div>
+										</div>
+									</label>
+								</div>
+
+								<div class="block">
+									<label>
+										<div>
+											<input type="checkbox" name="attr_defense_runaround" value="1" title="macro name: @{defense_runaround}" />
+										</div>
+										<div>
+											<div class="tooltip">
+												<span data-i18n="runaround-attack-label">Runaround Attack: -2</span>
+												<span class="tooltiptext">
+													<span data-i18n="runaround-attack-tooltip">Your foe starts in front of you and runs behind you and attacks from behind. You can defend at -2. See B391</span>
+												</span>
+											</div>
+										</div>
+									</label>
+								</div>
+
 							</div>
 
 							<div class="item item7">
 
-								<h5>
-									<span data-i18n="other-actions-title">Other Actions</span>
-								</h5>
+								<div class="block">
+									<h5>
+										<span data-i18n="other-actions-title">Other Actions</span>
+									</h5>
+								</div>
 								
 								<div class="block">
 									<label>
@@ -2273,7 +2317,7 @@
 											<div class="tooltip">
 												<span data-i18n="retreating-block-parry-label">Retreating Block/Parry: +1</span>
 												<span class="tooltiptext">
-													<span data-i18n="retreating-dodge-tooltip">Move away from attacker, at least one yard or up to your <b>step</b>. See B377</span>
+													<span data-i18n="retreating-block-parry-tooltip">Retreating block or parry. Move away from attacker, at least one yard or up to your <b>step</b>. See B377</span>
 												</span>
 											</div>
 										</div>
@@ -2289,7 +2333,23 @@
 											<div class="tooltip">
 												<span data-i18n="retreating-parry-label">Retreating Parry: +3</span>
 												<span class="tooltiptext">
-													<span data-i18n="retreating-parry-tooltip">If using Boxing, Judo, Karater, or any fencing skill, you can get a +3 retreating bonus.<br />Move away from attacker, at least one yard or up to your <b>step</b>. See B377</span>
+													<span data-i18n="retreating-parry-tooltip">If using Boxing, Judo, Karate, or any fencing skill, you can get a +3 retreating bonus.<br />Move away from attacker, at least one yard or up to your <b>step</b>. See B377</span>
+												</span>
+											</div>
+										</div>
+									</label>
+								</div>
+
+								<div class="block">
+									<label>
+										<div>
+											<input type="checkbox" name="attr_defense_retreating_flight" value="1" title="macro name: @{defense_retreating_flight}" />
+										</div>
+										<div>
+											<div class="tooltip">
+												<span data-i18n="retreating-flight-label">Retreating Flight</span><span>: +1</span>
+												<span class="tooltiptext">
+													<span data-i18n="retreating-flight-tooltip">If flyer can <b>hover</b>, add +1 to defense to retreating defense <i>if</i> you can move 1 hex up or down. See B398</span>
 												</span>
 											</div>
 										</div>
@@ -2303,7 +2363,7 @@
 										</div>
 										<div>
 											<div class="tooltip">
-												<span data-i18n="acrobatic-dodge-label">Acrobatic Dodge: +2</span>
+												<span data-i18n="acrobatic-dodge-label">Acrobatic Dodge</span><span>: +2</span>
 												<span class="tooltiptext">
 													<span data-i18n="acrobatic-dodge-success-tooltip">If you made a successful acrobatic/aerobatic roll, get +2 to dodge. See B375</span>
 												</span>
@@ -2319,7 +2379,7 @@
 										</div>
 										<div>
 											<div class="tooltip">
-												<span data-i18n="acrobatic-dodge-label">Acrobatic Dodge: -2</span>
+												<span data-i18n="acrobatic-dodge-label">Acrobatic Dodge</span><span>: -2</span>
 												<span class="tooltiptext">
 													<span data-i18n="acrobatic-dodge-failed-tooltip">If you failed your acrobatic/aerobatic roll, you're at -2 to dodge. See B375</span>
 												</span>
@@ -2380,19 +2440,19 @@
 									<label>
 										<div>
 											<select name="attr_defense_parries" title="macro: @{defense_parries}">
-												<option value="0">1 : +0</option>
-												<option value="-4">2 : -4</option>
-												<option value="-8">3 : -8</option>
-												<option value="-12">4 : -12</option>
-												<option value="-16">5 : -16</option>
-												<option value="-20">6 : -20</option>
+												<option value="0">1</option>
+												<option value="-4">2</option>
+												<option value="-8">3</option>
+												<option value="-12">4</option>
+												<option value="-16">5</option>
+												<option value="-20">6</option>
 											</select>
 										</div>
 										<div>
 											<div class="tooltip">
 												<span data-i18n="number-of-parries-label"># of Parries</span>
 												<span class="tooltiptext">
-													<span data-i18n="number-of-parries-tooltip">You can more parry more than once per turn, but each additional parry is at a penalty. See B376</span>
+													<span data-i18n="number-of-parries-tooltip">You can more parry more than once per turn, but each additional parry is at a -4 penalty. See B376</span>
 												</span>
 											</div>
 										</div>
@@ -2403,12 +2463,12 @@
 									<label>
 										<div>
 											<select name="attr_defense_parries_master" title="macro: @{defense_parries_master}">
-												<option value="0">1 : +0</option>
-												<option value="-2">2 : -2</option>
-												<option value="-4">3 : -4</option>
-												<option value="-6">4 : -6</option>
-												<option value="-8">5 : -8</option>
-												<option value="-10">6 : -10</option>
+												<option value="0">1</option>
+												<option value="-2">2</option>
+												<option value="-4">3</option>
+												<option value="-6">4</option>
+												<option value="-8">5</option>
+												<option value="-10">6</option>
 											</select>
 										</div>
 										<div>
@@ -2425,29 +2485,17 @@
 								<div class="block">
 									<label>
 										<div>
-											<input type="checkbox" name="attr_defense_from_behind" value="1" title="macro name: @{defense_from_behind}" />
+											<select name="attr_defense_improvised_weapon" title="macro: @{defense_improvised_weapon}">
+												<option>0</option>
+												<option>-1</option>
+												<option>-2</option>
+											</select>
 										</div>
 										<div>
 											<div class="tooltip">
-												<span data-i18n="attack-from-behind-label">Attack From Behind <i>Peripheral</i>: -2</span>
-												<span class="tooltiptext move-left">
-													<span data-i18n="attack-from-behind-tooltip">Normally, if attacked from behind, you have no defense. However, if you have Peripheral Vision you can defend at -2. See B391</span>
-												</span>
-											</div>
-										</div>
-									</label>
-								</div>
-
-								<div class="block">
-									<label>
-										<div>
-											<input type="checkbox" name="attr_defense_runaround" value="1" title="macro name: @{defense_runaround}" />
-										</div>
-										<div>
-											<div class="tooltip">
-												<span data-i18n="runarround-attack-label">Runarround Attack: -2</span>
-												<span class="tooltiptext move-left">
-													<span data-i18n="runarround-attack-tooltip">Your foe starts in front of you and runs behind you and attacks from behind. You can defend at -2. See B391</span>
+												<span data-i18n="defense-improvised-abbreviate-weapon-label">Improvised Wpn</span>
+												<span class="tooltiptext">
+													<span data-i18n="defense-improvised-weapon-tooltip"><b>NOTE:</b> <i>Dungeon Fantasy:</i> if parrying with an improvised weapon, apply a penalty. See DF Exploits-37</span>
 												</span>
 											</div>
 										</div>
@@ -2458,10 +2506,437 @@
 
 							<div class="item item10">
 								
-								<h5>
-									<span data-i18n="situation-title">Situation</span>		
-								</h5>
+								<div class="block">
+									<h5>
+										<span data-i18n="situation-title">Situation</span>		
+									</h5>
+								</div>
 								
+								<div class="block">
+
+									<label>
+										<div>
+											<input type="checkbox" name="attr_defense_laser_sight" value="1" title="macro name: @{defense_laser_sight}" />
+										</div>
+										<div>
+											<div class="tooltip">
+												<span data-i18n="laser-sight-label">Laser Sight: +1</span>
+												<span class="tooltiptext move-left">
+													<span data-i18n="defense-laser-sight-tooltip">If you can see the laser sight, you get +1 to <b>Dodge</b>. See B548</span>
+												</span>
+											</div>
+										</div>
+									</label>
+
+								</div>
+								
+								<div class="block">
+
+									<label>
+										<div>
+											<select name="attr_defense_deceptive_attack" title="macro: @{defense_deceptive_attack}">
+												<option selected>0</option>
+												<option>-1</option>
+												<option>-2</option>
+												<option>-3</option>
+												<option>-4</option>
+												<option>-5</option>
+												<option>-6</option>
+												<option>-7</option>
+												<option>-8</option>
+											</select>
+										</div>
+										<div>
+											<div class="tooltip">
+												<span data-i18n="against-deceptive-attack-label">Against Deceptive Attack</span>
+												<span class="tooltiptext move-left">
+													<span data-i18n="against-deceptive-attack-tooltip">You're at -1 to defense for every -2 the attacker took to their to hit modifier. See B369</span>
+												</span>
+											</div>
+										</div>
+									</label>
+
+								</div>
+								
+								<div class="block">
+
+									<label>
+										<div>
+											<select name="attr_defense_feint" title="macro: @{defense_feint}">
+												<option selected>0</option>
+												<option>-1</option>
+												<option>-2</option>
+												<option>-3</option>
+												<option>-4</option>
+												<option>-5</option>
+												<option>-6</option>
+												<option>-7</option>
+												<option>-8</option>
+												<option>-9</option>
+												<option>-10</option>
+												<option>-11</option>
+												<option>-12</option>
+												<option>-13</option>
+												<option>-14</option>
+												<option>-15</option>
+												<option>-16</option>
+												<option>-17</option>
+												<option>-18</option>
+											</select>
+										</div>
+										<div>
+											<div class="tooltip">
+												<span data-i18n="feint-attack-label">Feint Attack</span>
+												<span class="tooltiptext move-left">
+													<span data-i18n="feint-attack-tooltip">You're at a penalty equal to the attacker's margin of victory. See B365</span>
+												</span>
+											</div>
+										</div>
+									</label>
+
+								</div>
+								
+								<div class="block">
+									<div>
+										<div class="tooltip">
+											<span data-i18n="height-difference-label">Height Difference</span>
+											<span class="tooltiptext">
+												<span data-i18n="height-difference-tooltip">If you and your foe are at different levels, the vertical distance affects combat. See B402</span>
+											</span>
+										</div>
+									</div>
+								
+									<div>
+										<select name="attr_defense_height_difference" title="macro name: @{defense_height_difference}">
+											<option value="0" selected="selected">0-2 feet: +0</option>
+											<option value="2-3-higher">Above, 2-3 feet: +1</option>
+											<option value="3-4-higher">Above, 3-4 feet: +2</option>
+											<option value="4-6-higher">Above, 4-6 feet: +3</option>
+											<option value="2-3-below">Below, 2-3 feet: -1</option>
+											<option value="3-4-below">Below, 3-4 feet: -2</option>
+											<option value="4-6-below">Below, 4-6 feet: -3</option>
+										</select>
+									</div>
+									
+								</div>
+
+								<div class="block">
+									<label>
+										<div>
+											<select name="attr_defense_mounted" title="macro name: @{defense_mounted}">
+												<option value="0" selected="selected">0</option>
+												<option>-1</option>
+												<option>-2</option>
+												<option>-3</option>
+												<option>-4</option>
+												<option>-5</option>
+												<option>-6</option>
+											</select>
+										</div>
+										<div>
+											<div class="tooltip">
+												<span data-i18n="mounted-label">Mounted</span>
+												<span class="tooltiptext">
+													<span data-i18n="defense-mounted-tooltip">If mounted, defensive penalty is equal to difference between 12 and Riding skill. See B388</span>
+												</span>
+											</div>
+										</div>
+									</label>
+								</div>
+								
+								<div class="block">
+									<label>
+										<div>
+											<select name="attr_defense_tactics" title="macro name: @{defense_tactics}">
+												<option value="0" selected="selected">0</option>
+												<option>+1</option>
+												<option>+2</option>
+												<option>-1</option>
+												<option>-2</option>
+											</select>
+										</div>
+										<div>
+											<div class="tooltip">
+												<span data-i18n="tactics-label">Tactics</span>
+												<span class="tooltiptext">
+													<span data-i18n="tactics-tooltip"><b>NOTE!</b> from Dungeon Fantasy. A teammate spends turn to observe and advise you. If accepted, roll friends tactics. Success: +1 hit. Critical Success: +2. Fail: -1 hit. Critical Fail: -2 hit. See DF Exploits 57.</span>
+												</span>
+											</div>
+										</div>
+									</label>
+								</div>
+
+								<div class="block">
+
+									<label>
+										<div>
+											<input type="checkbox" name="attr_defense_hidden_weapon" value="1" title="macro name: @{defense_hidden_weapon}" />
+										</div>
+										<div>
+											<div class="tooltip">
+												<span data-i18n="hidden-weapon-label">Hidden Weapon: -2</span>
+												<span class="tooltiptext">
+													<span data-i18n="defense-hidden-weapon-tooltip"><b>NOTE:</b> From <i>Dungeon Fantasy</i>. If attacked by a hidden weapon, you're at -2 to your first defense. See DF Exploits-58</span>
+												</span>
+											</div>
+										</div>
+									</label>
+
+								</div>
+
+							</div>
+
+							<div class="item item8-9">
+
+								<div class="block">
+									<h5>
+										<span data-i18n="defenders-equipment-label">Defender's Equipment</span>
+									</h5>
+								</div>
+								
+								<div class="block">
+
+									<label>
+										<div>
+											<input type="checkbox" name="attr_defense_parry_knife" value="1" title="macro name: @{defense_parry_knife}" />
+										</div>
+										<div>
+											<div class="tooltip">
+												<span data-i18n="parrying-knife-label">Parrying with Knife/Dagger: -1</span>
+												<span class="tooltiptext move-left">
+													<span data-i18n="parrying-knife-tooltip">If parrying with a knife or dagger is -1. See B548<br /><b>Suggestion:</b> Add the modifier to your defense skill instead of using checkbox.</span>
+												</span>
+											</div>
+										</div>
+									</label>
+
+								</div>
+								
+								<div class="block">
+
+									<label>
+										<div>
+											<input type="checkbox" name="attr_defense_parry_kusari" value="1" title="macro name: @{defense_parry_kusari}" />
+										</div>
+										<div>
+											<div class="tooltip">
+												<span data-i18n="parrying-kusari-label">Parrying with Kusari/Whip: -2</span>
+												<span class="tooltiptext move-left">
+													<span data-i18n="parrying-kusari-tooltip">If parrying with a kusari or whip is -2. See B548<br /><b>Suggestion:</b> Add the modifier to your defense skill instead of using checkbox.</span>
+												</span>
+											</div>
+										</div>
+									</label>
+
+								</div>
+								
+								<div class="block">
+
+									<label>
+										<div>
+											<input type="checkbox" name="attr_defense_unarmed_parry" value="1" title="macro name: @{defense_unarmed_parry}" />
+										</div>
+										<div>
+											<div class="tooltip">
+												<span data-i18n="unarmed-parry-label">Unarmed Parry: -3</span>
+												<span class="tooltiptext move-left">
+													<span data-i18n="unarmed-parry-tooltip">Unarmed parry vesus a weapon is -3, unless it's a thrust or you are using Judo or Karate parry. See B548</span>
+												</span>
+											</div>
+										</div>
+									</label>
+
+								</div>
+								
+								<div class="block">
+									<h5>
+										<span data-i18n="attackers-equipment-label">Attacker's Equipment</span>
+									</h5>
+								</div>
+								
+								<div class="block">
+
+									<label>
+										<div>
+											<input type="checkbox" name="attr_defense_dual_weapon" value="1" title="macro name: @{defense_dual_weapon}" />
+										</div>
+										<div>
+											<div class="tooltip">
+												<span data-i18n="against-dual-weapon-label">Against Dual-Weapon: -1</span>
+												<span class="tooltiptext move-left">
+													<span data-i18n="against-dual-weapon-tooltip">If both attacks hit you, you're at -1 to defend. See B548.</span>
+												</span>
+											</div>
+										</div>
+									</label>
+
+								</div>
+
+								<div class="block">
+
+									<label>
+										<div>
+											<input type="checkbox" name="attr_defense_parry_flail" value="1" title="macro name: @{defense_parry_flail}" />
+										</div>
+										<div>
+											<div class="tooltip">
+												<span data-i18n="parry-flail-label">Parry against Flail: -4</span>
+												<span class="tooltiptext move-left">
+													<span data-i18n="parry-flail-tooltip">If parrying against a flail, you're at -4 to defend. See B405.<br /><b>NOTE:</b> You can't parry flails with a <i>fencing</i> weapon.</span>
+												</span>
+											</div>
+										</div>
+									</label>
+
+								</div>
+
+								<div class="block">
+
+									<label>
+										<div>
+											<input type="checkbox" name="attr_defense_parry_nunchaku" value="1" title="macro name: @{defense_parry_nunchaku}" />
+										</div>
+										<div>
+											<div class="tooltip">
+												<span data-i18n="parry-nunchaku-label">Parry against Nunchaku: -2</span>
+												<span class="tooltiptext move-left">
+													<span data-i18n="parry-nunchaku-tooltip">If parrying against a nunchaku, you're at -2 to defend. See B405.<br /><b>NOTE:</b> You can't parry nunchaku with a <i>fencing</i> weapon.</span>
+												</span>
+											</div>
+										</div>
+									</label>
+
+								</div>
+
+								<div class="block">
+
+									<label>
+										<div>
+											<input type="checkbox" name="attr_defense_block_flail" value="1" title="macro name: @{defense_block_flail}" />
+										</div>
+										<div>
+											<div class="tooltip">
+												<span data-i18n="block-flail-label">Block against Flail: -2</span>
+												<span class="tooltiptext move-left">
+													<span data-i18n="block-flail-tooltip">If blocking against a flail, you're at -2 to defend. See B405.</span>
+												</span>
+											</div>
+										</div>
+									</label>
+
+								</div>
+
+								<div class="block">
+
+									<label>
+										<div>
+											<input type="checkbox" name="attr_defense_block_nunchaku" value="1" title="macro name: @{defense_block_nunchaku}" />
+										</div>
+										<div>
+											<div class="tooltip">
+												<span data-i18n="block-nunchaku-label">Block against Nunchaku: -2</span>
+												<span class="tooltiptext move-left">
+													<span data-i18n="block-nunchaku-tooltip">If blocking against a nunchaku, you're at -1 to defend. See B405.</span>
+												</span>
+											</div>
+										</div>
+									</label>
+
+								</div>
+
+								<div class="block">
+
+									<label>
+										<div>
+											<input type="checkbox" name="attr_defense_thrown_weapon" value="1" title="macro name: @{defense_thrown_weapon}" />
+										</div>
+										<div>
+											<div class="tooltip">
+												<span data-i18n="parry-thrown-weapon-label">Parry thrown weapon: -1</span>
+												<span class="tooltiptext move-left">
+													<span data-i18n="parry-thrown-weapon-tooltip">Parry -1 against thrown weapon. See B549</span>
+												</span>
+											</div>
+										</div>
+									</label>
+
+								</div>
+								
+								<div class="block">
+
+									<label>
+										<div>
+											<input type="checkbox" name="attr_defense_thrown_small_weapon" value="1" title="macro name: @{defense_thrown_small_weapon}" />
+										</div>
+										<div>
+											<div class="tooltip">
+												<span data-i18n="parry-thrown-small-weapon-label">Parry thrown small weapon: -2</span>
+												<span class="tooltiptext move-left">
+													<span data-i18n="parry-thrown-small-weapon-tooltip">If the weapon is 1 pound or less, parry is -2. See B549</span>
+												</span>
+											</div>
+										</div>
+									</label>
+
+								</div>
+
+								<div class="block">
+
+									<label>
+										<div>
+											<input type="checkbox" name="attr_defense_trident_dodge" value="1" title="macro name: @{defense_trident_dodge}" />
+										</div>
+										<div>
+											<div class="tooltip">
+												<span data-i18n="trident-dodge-label">Trident: -1 Dodge</span>
+												<span class="tooltiptext move-left">
+													<span data-i18n="trident-dodge-tooltip"><b>NOTE:</b> From <i>Dungeon Fantasy</i>. -1 to dodge a trident. See DF Exploits-97</span>
+												</span>
+											</div>
+										</div>
+									</label>
+
+								</div>
+								
+								<div class="block">
+
+									<label>
+										<div>
+											<input type="checkbox" name="attr_defense_trident_block" value="1" title="macro name: @{defense_trident_block}" />
+										</div>
+										<div>
+											<div class="tooltip">
+												<span data-i18n="trident-block-label">Trident: +1 Block</span>
+												<span class="tooltiptext move-left">
+													<span data-i18n="trident-block-tooltip"><b>NOTE:</b> From <i>Dungeon Fantasy</i>. +1 to <b>block</b> or <b>parry</b> a trident. See DF Exploits-97</span>
+												</span>
+											</div>
+										</div>
+									</label>
+
+								</div>
+
+							</div>
+
+						</div>
+
+					</div>
+
+					<input type="hidden" name="attr_display_defense_maneuvers_section" value="0" />
+					<div class="defense-maneuvers section">
+
+						<div class="container">
+
+							<!-- row 1 -->
+							<div class="item item1-5 full-width">
+								<h4>
+									<span data-i18n="afflictions-conditions-title">Afflictions & Conditions</span>
+								</h4>
+							</div>
+
+							<!-- row 2 -->
+							<div class="item item2">
+
 								<div class="block">
 									<label>
 										<div>
@@ -2470,7 +2945,7 @@
 										<div>
 											<div class="tooltip">
 												<span data-i18n="stunned-label">Stunned: -4</span>
-												<span class="tooltiptext move-left">
+												<span class="tooltiptext">
 													<span data-i18n="stunned-tooltip">If you're stunned, defend at -4. See B420</span>
 												</span>
 											</div>
@@ -2481,13 +2956,13 @@
 								<div class="block">
 									<label>
 										<div>
-											<input type="checkbox" name="attr_defense_cant_see_attacker" value="1" title="macro name: @{defense_cant_see_attacker}" />
+											<input type="checkbox" name="attr_defense_nauseated" value="1" title="macro name: @{defense_nauseated}" />
 										</div>
 										<div>
 											<div class="tooltip">
-												<span data-i18n="cant-see-attacker-label">Can't See Attacker: -4</span>
+												<span data-i18n="defense-nauseated-label">Nauseated: -1</span>
 												<span class="tooltiptext">
-													<span data-i18n="cant-see-attacker-tooltip">If you can't see the target you're at -4. A <b>block</b> or <b>parry</b> requires Hearing-2. See B549</span>
+													<span data-i18n="defense-nauseated-tooltip">If nauseated, you're at -1 to defend. See B428</span>
 												</span>
 											</div>
 										</div>
@@ -2516,62 +2991,20 @@
 									</label>
 								</div>
 
-								<div class="block">
-									<div>
-										<div class="tooltip">
-											<span data-i18n="height-difference-label">Height Difference</span>
-											<span class="tooltiptext">
-												<span data-i18n="height-difference-tooltip">If you and your foe are at different levels, the vertical distance affects combat. See B402</span>
-											</span>
-										</div>
-									</div>
-								
-									<div>
-										<select name="attr_ranged_height_difference" title="macro name: @{ranged_height_difference}">
-											<option value="0" selected="selected">0-2 feet: +0</option>
-											<option value="2-3-higher">Above, 2-3 feet: +1</option>
-											<option value="3-4-higher">Above, 3-4 feet: +2</option>
-											<option value="4-5-higher">Above, 4-5 feet: +3</option>
-											<option value="2-3-below">Below, 2-3 feet: -1</option>
-											<option value="3-4-below">Below, 3-4 feet: -2</option>
-											<option value="4-5-below">Below, 4-5 feet: -3</option>
-										</select>
-									</div>
-									
-								</div>
+							</div>
+
+							<div class="item item3">
 
 								<div class="block">
 									<label>
 										<div>
-											<select name="attr_ranged_tactics" title="macro name: @{ranged_tactics}">
-												<option value="0" selected="selected">0</option>
-												<option>+1</option>
-												<option>+2</option>
-												<option>-1</option>
-												<option>-2</option>
-											</select>
+											<input type="checkbox" name="attr_defense_cant_see_attacker" value="1" title="macro name: @{defense_cant_see_attacker}" />
 										</div>
 										<div>
 											<div class="tooltip">
-												<span data-i18n="tactics-label">Tactics</span>
-												<span class="tooltiptext move-left">
-													<span data-i18n="tactics-tooltip"><b>NOTE!</b> from Dungeon Fantasy. A teammate spends turn to observe and advise you. If accepted, roll friends tactics. Success: +1 hit. Critical Success: +2. Fail: -1 hit. Critical Fail: -2 hit. See DF Exploits 57.</span>
-												</span>
-											</div>
-										</div>
-									</label>
-								</div>
-
-								<div class="block">
-									<label>
-										<div>
-											<input type="checkbox" name="attr_ranged_backstab" value="1" title="macro name: @{ranged_backstab}" />
-										</div>
-										<div>
-											<div class="tooltip">
-												<span data-i18n="backstab-label">Backstab: +4</span>
-												<span class="tooltiptext move-left">
-													<span data-i18n="backstab-tooltip"><b>NOTE!</b> from Dungeon Fantasy. At start of combat, make Stealth roll. If successful, get backstab bonus. See DF Exploits 57-58</span>
+												<span data-i18n="cant-see-attacker-label">Can't See Attacker: -4</span>
+												<span class="tooltiptext">
+													<span data-i18n="cant-see-attacker-tooltip">If you can't see the target you're at -4. A <b>block</b> or <b>parry</b> requires Hearing-2. See B549</span>
 												</span>
 											</div>
 										</div>
@@ -2580,179 +3013,92 @@
 
 							</div>
 
-							<div class="item item8-9">
+							<div class="item item4">
 
 								<div class="block">
-									<div>
-										<div class="tooltip">
-											<b><span data-i18n="moving-mount-vehicle-label">Moving Mount/Vehicle</span></b>
-											<span class="tooltiptext move-left">
-												<span data-i18n="moving-mount-vehicle-tooltip">Attacking from moving mount or vehicle.<br /><b>NOTE:</b>If <i>not</i> stabilized, the total of Accuracy, Aim, Bracing, and Targeting systems can't exceed vehicle's stability rating (SR). See B469 and B548</span>
-											</span>
-										</div>
-									</div>
-								</div>
-
-								<div class="block">
-
 									<label>
 										<div>
-											<input type="number" name="attr_vehicle_stability_rating" value="0" min="0" step="1" title="macro name: @{vehicle_stability_rating}" />
+											<select name="attr_defense_bad_footing" title="macro name: @{defense_bad_footing}">
+												<option value="0" selected="selected">0</option>
+												<option>-1</option>
+												<option>-3</option>
+												<option>-4</option>
+												<option>-5</option>
+												<option>-6</option>
+											</select>
 										</div>
 										<div>
 											<div class="tooltip">
-												<span data-i18n="abbreviation-stability-rating-label">SR</span>
-												<span class="tooltiptext move-left">
-													<span data-i18n="stability-rating-tooltip">Vehicle's stability rating. Affects Targeting systems.</span>
+												<span data-i18n="bad-footing-label">Bad Footing</span>
+												<span class="tooltiptext">
+													<span data-i18n="defense-bad-footing-tooltip">Defensive penalty for bad footing. See B547-B549.</span>
 												</span>
 											</div>
 										</div>
 									</label>
-
 								</div>
-								
-								<div class="block">
 
-									<label>
-										<div>
-											<input type="checkbox" name="attr_vehicle_weapon_unstabilized" value="1" title="macro name: @{vehicle_weapon_unstabilized}" />
-										</div>
-										<div>
-											<div class="tooltip">
-												<span data-i18n="unstabilized-label">Unstabilized</span>
-												<span class="tooltiptext move-left">
-													<span data-i18n="unstabilized-tooltip">The vehicle's weapon is not stabilized. The max bonus from Targeting Systems can't exceed Stability Rating of the vehicle. See B469</span>
-												</span>
-											</div>
-										</div>
-									</label>
-
-								</div>
-								
-								<div class="block">
-									<div>
-										<div class="tooltip">
-											<span data-i18n="conditions-label">Conditions</span>
-											<span class="tooltiptext move-left">
-												<span data-i18n="vehicle-conditions-tooltip">What conditions is the vehicle experiencing. See B548.</span>
-											</span>
-										</div>
-									</div>
-									<div>
-										<select name="attr_ranged_vehicle_conditions" title="macro name: @{ranged_vehicle_conditions}">
-											<option value="0" selected="selected">Select</option>
-											<option value="air-handheld">-1 : Air vehicle. Using handheld weapon.</option>
-											<option value="ground-good-road-handheld">-1 : Ground vehicle, good road. Using handheld weapon.</option>
-											<option value="ground-bad-road-fixed">-1 : Ground vehicle, bad road. Weapon in fixed mount/hardpoint/carriage.</option>
-											<option value="ground-bad-road-external">-2 : Ground vehicle, bad road. Weapon in external open mount.</option>
-											<option value="ground-bad-road-handheld">-3 : Ground vehicle, bad road. Using handheld weapon.</option>
-											<option value="ground-off-road-stabilized-turret">-1 : Ground vehicle, off-road. Weapon in stabalized turret/open mount.</option>
-											<option value="ground-off-road-fixed">-2 : Ground vehicle, off-road. Weapon in fixed mount/hardpoint/carriage.</option>
-											<option value="ground-off-road-external">-3 : Ground vehicle, off-road. Weapon in external open mount.</option>
-											<option value="ground-off-road-handheld">-4 : Ground vehicle, off-road. Using handheld weapon.</option>
-											<option value="water-calm-fixed">-1 : Water vehicle, calm. Weapon in fixed mount/hardpoint/carriage.</option>
-											<option value="water-calm-external">-2 : Water vehicle, calm. Weapon in external mount.</option>
-											<option value="water-calm-handheld">-3 : Water vehicle, calm. Using handheld weapon.</option>
-											<option value="water-rough-stabilized-turret">-1 : Water vehicle, rough. Weapon in stabilized turret/open mount.</option>
-											<option value="water-rough-fixed">-2 : Water vehicle, rough. Weapon in fixed mount/hardpoint/carriage.</option>
-											<option value="water-rough-external">-3 : Water vehicle, rough. Weapon in external mount.</option>
-											<option value="water-rough-handheld">-4 : Water vehicle, rough. Using handheld weapon.</option>
-										</select>
-									</div>
-								</div>
-								
 								<div class="block">
 									<label>
 										<div>
-											<select name="attr_ranged_controll_roll" title="macro: @{ranged_ranged_controll_roll}">
-												<option selected>0</option>
+											<select name="attr_defense_distraction" title="macro name: @{defense_distraction}">
+												<option value="0" selected="selected">0</option>
 												<option>-1</option>
 												<option>-2</option>
 												<option>-3</option>
 												<option>-4</option>
 												<option>-5</option>
-												<option>-6</option>
-												<option>-7</option>
-												<option>-8</option>
-												<option>-9</option>
-												<option>-10</option>
-												<option>-11</option>
-												<option>-12</option>
-												<option>-13</option>
-												<option>-14</option>
-												<option>-15</option>
-												<option>-16</option>
 											</select>
 										</div>
 										<div>
 											<div class="tooltip">
-												<span data-i18n="failed-control-roll-label">Failed Control Roll</span>
-												<span class="tooltiptext move-left">
-													<span data-i18n="failed-control-roll-tooltip">Vehicle/mount failed control last turn. Penalty equal to margin of failure. See B548</span>
+												<span data-i18n="distraction-label">Distraction</span>
+												<span class="tooltiptext">
+													<span data-i18n="distraction-tooltip">-1 for Bees in your face, -2 for part clothes on fire, -3 all clothes on fire, etc. See B548.</span>
 												</span>
 											</div>
 										</div>
 									</label>
 								</div>
-								
-								<div class="block">
-
-									<label>
-										<div>
-											<input type="checkbox" name="attr_ranged_over_under_mount" value="1" title="macro name: @{ranged_over_under_mount}" />
-										</div>
-										<div>
-											<div class="tooltip">
-												<span data-i18n="over-under-mount-label">Over/Under Mount: -6</span>
-												<span class="tooltiptext move-left">
-													<span data-i18n="over-under-mount-tooltip">If you're an exposed rider hanging from side of mount/vehicle, penalty to hit is -6 to shoot over or under the mount.</span>
-												</span>
-											</div>
-										</div>
-									</label>
-
-								</div>
-
-								<div class="block">
-
-									<label>
-										<div>
-											<input type="checkbox" name="attr_ranged_vehicle_dodge" value="1" title="macro name: @{ranged_vehicle_dodge}" />
-										</div>
-										<div>
-											<div class="tooltip">
-												<span data-i18n="vehicle-dodged-label">Vehicle Dodged Last Turn: -2</span>
-												<span class="tooltiptext move-left">
-													<span data-i18n="vehicle-dodged-tooltip">Vehicle/mount dodged last turn and you're <b>not</b> the operator.</span>
-												</span>
-											</div>
-										</div>
-									</label>
-
-								</div>
-								
-								<div class="block">
-
-									<label>
-										<div>
-											<input type="checkbox" name="attr_ranged_air_vehicle_dodge" value="1" title="macro name: @{ranged_air_vehicle_dodge}" />
-										</div>
-										<div>
-											<div class="tooltip">
-												<span data-i18n="air-vehicle-dodged-label">Air Vehicle Dodged Last Turn: -4</span>
-												<span class="tooltiptext move-left">
-													<span data-i18n="vehicle-dodged-tooltip">Vehicle/mount dodged last turn and you're <b>not</b> the operator.</span>
-												</span>
-											</div>
-										</div>
-									</label>
-
-								</div>
 
 							</div>
 
-						</div>
+							<div class="item item5">
+								<div class="block">
+									<label>
+										<div>
+											<input type="checkbox" name="attr_defense_grappled_dodge" value="1" title="macro name: @{defense_grappled_dodge}" />
+										</div>
+										<div>
+											<div class="tooltip">
+												<span data-i18n="grappled-dodge-label">Grappled: -1 Dodge</span>
+												<span class="tooltiptext move-left">
+													<span data-i18n="grappled-dodge-tooltip"><b>NOTE!</b> from Dungeon Fantasy. If grappled, you're at -1 to dodge. See DF Exploits 41</span>
+												</span>
+											</div>
+										</div>
+									</label>
+								</div>
+								
+								<div class="block">
+									<label>
+										<div>
+											<input type="checkbox" name="attr_defense_grappled_block" value="1" title="macro name: @{defense_grappled_block}" />
+										</div>
+										<div>
+											<div class="tooltip">
+												<span data-i18n="grappled-block-label">Grappled: -2 Block/Parry</span>
+												<span class="tooltiptext move-left">
+													<span data-i18n="grappled-block-tooltip"><b>NOTE!</b> from Dungeon Fantasy. If grappled, you're at -2 to block/parry. A grappled limb can't use block/parry. See DF Exploits 41</span>
+												</span>
+											</div>
+										</div>
+									</label>
+								</div>
+							</div>
 
+						</div>
+						
 					</div>
 
 					<input type="hidden" name="attr_display_visibility_section" value="0" />
@@ -8016,24 +8362,15 @@ parry if you've already attacked with it this turn<br />
 						<input type="hidden" value="" name="attr_defense_roll_hit_location" />
 						<input type="hidden" value="" name="attr_defense_roll_maneuver" />
 						<input type="hidden" value="" name="attr_defense_roll_allout_attack" />
+
+						<!-- not used for defense -->
+						<input type="hidden" name="attr_defense_roll_max_nine" value="1" />
+						<input type="hidden" name="attr_defense_roll_max_nine_value" value="100" />
+
 					</div>
 					<div class="cell">
 						<button type="action" name="act_show_roll_modifiers_for_defense" class="btn" title="Select Skill Modifiers"><span data-i18n="select-skill-modifiers-button">Select Skill Modifiers</span></button>
 					</div>
-					<div class="cell cell-popup">
-						<div>
-							<input type="checkbox" name="attr_defense_roll_max_nine" value="1" title="Macro: @{defense_roll_max_nine}" />
-							<input type="hidden" name="attr_defense_roll_max_nine_value" value="100" />
-						</div>
-						<div>
-							<div class="popup">
-								<span data-i18n="max-skill-9-label">Max skill of 9</span>
-							</div>
-							<div class="tooltip">
-								<span data-i18n="max-skill-9-tooltip">The effective skill cannot exceed 9.</span>
-							</div>
-						</div>
-					</div>
 				</div>
 				
 				<div class="row-static-defense">
@@ -13400,7 +13737,7 @@ See notes for weapon.</textarea>
     
 </div>
 
-<script type="application/javascript">
+<script type="text/worker">
 	// this type is required by roll20, be sure to set before uploading
 	// type="text/worker"
 	
@@ -13560,6 +13897,50 @@ See notes for weapon.</textarea>
 		["ranged_over_under_mount", {modifier: -6, description: "Over/under mount", affectsVisibility: false, isDropDown: false, isMax9: false, isTrait: false, checkPain: false}],
 		["ranged_vehicle_dodge", {modifier: -2, description: "Vehicle dodge", affectsVisibility: false, isDropDown: false, isMax9: false, isTrait: false, checkPain: false}],
 		["ranged_air_vehicle_dodge", {modifier: -4, description: "Vehicle dodge", affectsVisibility: false, isDropDown: false, isMax9: false, isTrait: false, checkPain: false}],
+		["defense_maneuver", {modifier: 0, description: "A function returns description", affectsVisibility: false, isDropDown: true, isMax9: false, isTrait: false, checkPain: false}],
+		["defense_crawling", {modifier: -3, description: "Crawling/Lying down", affectsVisibility: false, isDropDown: false, isMax9: false, isTrait: false, checkPain: false}],
+		["defense_kneeling", {modifier: -2, description: "Kneeling/Sitting", affectsVisibility: false, isDropDown: false, isMax9: false, isTrait: false, checkPain: false}],
+		["defense_from_behind", {modifier: -2, description: "Attacked from behind, you have peripheral vision", affectsVisibility: false, isDropDown: false, isMax9: false, isTrait: false, checkPain: false}],
+		["defense_runaround", {modifier: -2, description: "Ranaround attack", affectsVisibility: false, isDropDown: false, isMax9: false, isTrait: false, checkPain: false}],
+		["defense_retreat_dodge", {modifier: 3, description: "Retreating Dodge", affectsVisibility: false, isDropDown: false, isMax9: false, isTrait: false, checkPain: false}],
+		["defense_retreat_parry", {modifier: 1, description: "Retreating Block/Parry", affectsVisibility: false, isDropDown: false, isMax9: false, isTrait: false, checkPain: false}],
+		["defense_retreat_parry_fence", {modifier: 3, description: "Retreating Parry using fencing, boxing, judo, karate", affectsVisibility: false, isDropDown: false, isMax9: false, isTrait: false, checkPain: false}],
+		["defense_retreating_flight", {modifier: 1, description: "Retreating while flying, must be able to hover", affectsVisibility: false, isDropDown: false, isMax9: false, isTrait: false, checkPain: false}],
+		["defense_acrobatic_dodge_success", {modifier: 2, description: "Acrobatic Dodge", affectsVisibility: false, isDropDown: false, isMax9: false, isTrait: false, checkPain: false}],
+		["defense_acrobatic_dodge_failed", {modifier: -2, description: "Failed Acrobatic Dodge", affectsVisibility: false, isDropDown: false, isMax9: false, isTrait: false, checkPain: false}],
+		["defense_dodge_drop", {modifier: 3, description: "Dodge & Drop", affectsVisibility: false, isDropDown: false, isMax9: false, isTrait: false, checkPain: false}],
+		["defense_feverish", {modifier: 1, description: "Feverish defense (costs 1 FP)", affectsVisibility: false, isDropDown: false, isMax9: false, isTrait: false, checkPain: false}],
+		["defense_offhand_parry", {modifier: -2, description: "Off-Hand Parry", affectsVisibility: false, isDropDown: false, isMax9: false, isTrait: false, checkPain: false}],
+		["defense_parries", {modifier: 0, description: "Multiple parries", affectsVisibility: false, isDropDown: true, isMax9: false, isTrait: false, checkPain: false}],
+		["defense_parries_master", {modifier: 0, description: "Multiple parries by a master", affectsVisibility: false, isDropDown: true, isMax9: false, isTrait: false, checkPain: false}],
+		["defense_improvised_weapon", {modifier: 0, description: "Parry with improvised weapon", affectsVisibility: false, isDropDown: true, isMax9: false, isTrait: false, checkPain: false}],
+		["defense_laser_sight", {modifier: 1, description: "Laster Sight", affectsVisibility: false, isDropDown: false, isMax9: false, isTrait: false, checkPain: false}],
+		["defense_deceptive_attack", {modifier: 0, description: "Defending against deceptive attack", affectsVisibility: false, isDropDown: true, isMax9: false, isTrait: false, checkPain: false}],
+		["defense_feint", {modifier: 0, description: "Defending against a feint", affectsVisibility: false, isDropDown: true, isMax9: false, isTrait: false, checkPain: false}],
+		["defense_height_difference", {modifier: 0, description: "From a function", affectsVisibility: false, isDropDown: true, isMax9: false, isTrait: false, checkPain: false}],
+		["defense_mounted", {modifier: 0, description: "Defending while mounted", affectsVisibility: false, isDropDown: true, isMax9: false, isTrait: false, checkPain: false}],
+		["defense_tactics", {modifier: 0, description: "Tactics", affectsVisibility: false, isDropDown: true, isMax9: false, isTrait: false, checkPain: false}],
+		["defense_hidden_weapon", {modifier: -2, description: "Defending against hidden weapon", affectsVisibility: false, isDropDown: false, isMax9: false, isTrait: false, checkPain: false}],
+		["defense_parry_knife", {modifier: -1, description: "Parrying with knife/dagger", affectsVisibility: false, isDropDown: false, isMax9: false, isTrait: false, checkPain: false}],
+		["defense_parry_kusari", {modifier: -2, description: "Parrying with kusari/whip", affectsVisibility: false, isDropDown: false, isMax9: false, isTrait: false, checkPain: false}],
+		["defense_unarmed_parry", {modifier: -3, description: "Unarmed parry against a swung weapon", affectsVisibility: false, isDropDown: false, isMax9: false, isTrait: false, checkPain: false}],
+		["defense_dual_weapon", {modifier: -1, description: "Defending against a dual-weapon attack", affectsVisibility: false, isDropDown: false, isMax9: false, isTrait: false, checkPain: false}],
+		["defense_parry_flail", {modifier: -4, description: "Parrying against a flail", affectsVisibility: false, isDropDown: false, isMax9: false, isTrait: false, checkPain: false}],
+		["defense_parry_nunchaku", {modifier: -2, description: "Parrying against a nunchaku", affectsVisibility: false, isDropDown: false, isMax9: false, isTrait: false, checkPain: false}],
+		["defense_block_flail", {modifier: -2, description: "Blocking against a flail", affectsVisibility: false, isDropDown: false, isMax9: false, isTrait: false, checkPain: false}],
+		["defense_block_nunchaku", {modifier: -1, description: "Blocking against a nunchaku", affectsVisibility: false, isDropDown: false, isMax9: false, isTrait: false, checkPain: false}],
+		["defense_thrown_weapon", {modifier: -1, description: "Parry a thrown weapon", affectsVisibility: false, isDropDown: false, isMax9: false, isTrait: false, checkPain: false}],
+		["defense_thrown_small_weapon", {modifier: -2, description: "Parry a small thrown weapon", affectsVisibility: false, isDropDown: false, isMax9: false, isTrait: false, checkPain: false}],
+		["defense_trident_dodge", {modifier: -1, description: "Dodging a trident", affectsVisibility: false, isDropDown: false, isMax9: false, isTrait: false, checkPain: false}],
+		["defense_trident_block", {modifier: -1, description: "Block/parry against a trident", affectsVisibility: false, isDropDown: false, isMax9: false, isTrait: false, checkPain: false}],
+		["defense_stunned", {modifier: -4, description: "Stunned", affectsVisibility: false, isDropDown: false, isMax9: false, isTrait: false, checkPain: false}],
+		["defense_nauseated", {modifier: -1, description: "Nauseated", affectsVisibility: false, isDropDown: false, isMax9: false, isTrait: false, checkPain: false}],
+		["defense_encumbered", {modifier: 0, description: "Encumbered", affectsVisibility: false, isDropDown: true, isMax9: false, isTrait: false, checkPain: false}],
+		["defense_cant_see_attacker", {modifier: -4, description: "Can't see attacker", affectsVisibility: false, isDropDown: false, isMax9: false, isTrait: false, checkPain: false}],
+		["defense_bad_footing", {modifier: 0, description: "Bad footing", affectsVisibility: false, isDropDown: true, isMax9: false, isTrait: false, checkPain: false}],
+		["defense_distraction", {modifier: 0, description: "Distraction", affectsVisibility: false, isDropDown: true, isMax9: false, isTrait: false, checkPain: false}],
+		["defense_grappled_dodge", {modifier: -1, description: "Grappled dodge penalty", affectsVisibility: false, isDropDown: false, isMax9: false, isTrait: false, checkPain: false}],
+		["defense_grappled_block", {modifier: -2, description: "Grappled block/parry penalty", affectsVisibility: false, isDropDown: false, isMax9: false, isTrait: false, checkPain: false}],
 	]);
 
 	const traitFields = [
@@ -13779,18 +14160,50 @@ See notes for weapon.</textarea>
 		"has_high_pain_threshold",
 		"has_low_pain_threshold",
 		"is_used_to_blindness",
-		"coughing_sneezing_iq",
-		"coughing_sneezing_dx",
-		"drowzy",
-		"tipsy",
-		"drunk",
-		"euphoria",
-		"distraction",
-		"pain_level",
-		"bad_footing",
-		"shield_close_combat_penalty",
-		"grappled",
-		"holding_large_shield",
+		"defense_maneuver",
+		"defense_crawling",
+		"defense_kneeling",
+		"defense_from_behind",
+		"defense_runaround",
+		"defense_retreat_dodge",
+		"defense_retreat_parry",
+		"defense_retreat_parry_fence",
+		"defense_retreating_flight",
+		"defense_acrobatic_dodge_success",
+		"defense_acrobatic_dodge_failed",
+		"defense_dodge_drop",
+		"defense_feverish",
+		"defense_offhand_parry",
+		"defense_parries",
+		"defense_parries_master",
+		"defense_improvised_weapon",
+		"defense_laser_sight",
+		"defense_deceptive_attack",
+		"defense_feint",
+		"defense_height_difference",
+		"defense_mounted",
+		"defense_tactics",
+		"defense_hidden_weapon",
+		"defense_parry_knife",
+		"defense_parry_kusari",
+		"defense_unarmed_parry",
+		"defense_dual_weapon",
+		"defense_parry_flail",
+		"defense_parry_nunchaku",
+		"defense_block_flail",
+		"defense_block_nunchaku",
+		"defense_thrown_weapon",
+		"defense_thrown_small_weapon",
+		"defense_trident_dodge",
+		"defense_trident_block",
+		"defense_stunned",
+		"defense_nauseated",
+		"defense_encumbered",
+		"defense_cant_see_attacker",
+		"defense_bad_footing",
+		"defense_distraction",
+		"defense_grappled_dodge",
+		"defense_grappled_block",
 	];
 	
 	/* Due to the change from auto-calc fields to helper scripts,
@@ -20757,6 +21170,10 @@ The attacker may choose to hit the original target or the limb you used to parry
 
 						value = "step-attack";
 
+					} else if (key == "defense_maneuver" ) {
+
+						value = "step-attack";
+
 					} else {
 						
 						value = 0;
@@ -20863,6 +21280,50 @@ The attacker may choose to hit the original target or the limb you used to parry
 		"change:ranged_over_under_mount",
 		"change:ranged_vehicle_dodge",
 		"change:ranged_air_vehicle_dodge",
+		"change:defense_maneuver",
+		"change:defense_crawling",
+		"change:defense_kneeling",
+		"change:defense_from_behind",
+		"change:defense_runaround",
+		"change:defense_retreat_dodge",
+		"change:defense_retreat_parry",
+		"change:defense_retreat_parry_fence",
+		"change:defense_retreating_flight",
+		"change:defense_acrobatic_dodge_success",
+		"change:defense_acrobatic_dodge_failed",
+		"change:defense_dodge_drop",
+		"change:defense_feverish",
+		"change:defense_offhand_parry",
+		"change:defense_parries",
+		"change:defense_parries_master",
+		"change:defense_improvised_weapon",
+		"change:defense_laser_sight",
+		"change:defense_deceptive_attack",
+		"change:defense_feint",
+		"change:defense_height_difference",
+		"change:defense_mounted",
+		"change:defense_tactics",
+		"change:defense_hidden_weapon",
+		"change:defense_parry_knife",
+		"change:defense_parry_kusari",
+		"change:defense_unarmed_parry",
+		"change:defense_dual_weapon",
+		"change:defense_parry_flail",
+		"change:defense_parry_nunchaku",
+		"change:defense_block_flail",
+		"change:defense_block_nunchaku",
+		"change:defense_thrown_weapon",
+		"change:defense_thrown_small_weapon",
+		"change:defense_trident_dodge",
+		"change:defense_trident_block",
+		"change:defense_stunned",
+		"change:defense_nauseated",
+		"change:defense_encumbered",
+		"change:defense_cant_see_attacker",
+		"change:defense_bad_footing",
+		"change:defense_distraction",
+		"change:defense_grappled_dodge",
+		"change:defense_grappled_block",
 	];
 
 	const changeSkillRollMods = arrChangeSkillRollMods.join(" ");
@@ -20916,7 +21377,7 @@ The attacker may choose to hit the original target or the limb you used to parry
 				break;
 		
 			case "defense":
-				modFields = defenseModifierFields;
+				fields = defenseModifierFields;
 				break;
 
 			default:
@@ -21009,25 +21470,26 @@ The attacker may choose to hit the original target or the limb you used to parry
 
 		let visibilityMod = 0;
 
-		let usedToBlind = Number(values.is_used_to_blindness);
+		// prevent NaN error: https://stackoverflow.com/questions/37998501/return-zero-if-input-value-is-nan
+		let usedToBlind = parseInt(values.is_used_to_blindness) || 0;
 
-		let visibilityCondition = Number(values.visiblity_condition);
+		let visibilityCondition = parseInt(values.visiblity_condition) || 0;
 
-		let darknessPenalty = Number(values.darkness_penalty);
+		let darknessPenalty = parseInt(values.darkness_penalty) || 0;
 
-		let nightVision = Number(values.night_vision);
+		let nightVision = parseInt(values.night_vision) || 0;
 
 		let adjustedDarknessPenalty = 0;
 
-		let hasDarkVision = Number(values.has_dark_vision);
+		let hasDarkVision = parseInt(values.has_dark_vision) || 0;
 
-		let smokePenalty = Number(values.smoke_penalty);
+		let smokePenalty = parseInt(values.smoke_penalty) || 0;
 
-		let fogPenalty = Number(values.fog_penalty);
+		let fogPenalty = parseInt(values.fog_penalty) || 0;
 
-		let blurPenalty = Number(values.blur_penalty);
+		let blurPenalty = parseInt(values.blur_penalty) || 0;
 
-		let otherPenalty = Number(values.other_vision_penalty);
+		let otherPenalty = parseInt(values.other_vision_penalty) || 0;
 
 		let max9 = 0;
 
@@ -21164,6 +21626,12 @@ The attacker may choose to hit the original target or the limb you used to parry
 
 					maneuverDescription = description;
 
+				} else if (key == "defense_maneuver") {
+
+					[modifier, description] = getModifierForDefenseManeuver(values.defense_maneuver);
+
+					maneuverDescription = description;
+
 				} else if (key == "melee_all_out_attack") {
 
 					[modifier, description] = getModifierForAllOutAttack(values.melee_all_out_attack);
@@ -21178,6 +21646,10 @@ The attacker may choose to hit the original target or the limb you used to parry
 
 					[modifier, description] = getModifierForHeightDifference(values.melee_height_difference);
 
+				} else if (key == "defense_height_difference") {
+
+					[modifier, description] = getModifierForDefenseHeightDifference(values.defense_height_difference);
+
 				} else if (key == "weapon_hand") {
 
 					[modifier, description] = getModifierHandedness(values.weapon_hand, values.off_hand_training, values.dual_weapon_training);
@@ -21233,10 +21705,12 @@ The attacker may choose to hit the original target or the limb you used to parry
 							key == "melee_all_out_attack" || 
 							key == "posture" ||
 							key == "melee_height_difference" ||
+							key == "defense_height_difference" ||
 							key == "weapon_hand" || 
 							key == "ranged_weapon_hand" ||
 							key == "ranged_vehicle_conditions" ||
-							key == "ranged_maneuver" ) {
+							key == "ranged_maneuver" || 
+							key == "defense_maneuver" ) {
 
 					// we already have the description
 
@@ -21344,6 +21818,50 @@ The attacker may choose to hit the original target or the limb you used to parry
 
 	}
 
+	/**
+	 * Get modifier, description for a defense maneuver
+	 *
+	 * @param string maneuver User's selected maneuver
+	 *
+	 * @return array [modifier, description]
+	 */
+	 function getModifierForDefenseManeuver(maneuver) {
+
+		let modifier = 0;
+
+		let description = "";
+
+		switch (maneuver) {
+			case "step-attack":
+				modifier = 0;
+				description = "Normal Defense";
+				break;
+		
+			case "all-out-defense-increased":
+				modifier = 2;
+				description = "All-Out Defense: Increased";
+				break;
+		
+			case "all-out-defense-double":
+				modifier = 0;
+				description = "All-out Defense: Double";
+				max9 = 1;
+				break;
+		
+			case "moved-attack":
+				modifier = 0;
+				description = "Moved and Attacked, only dodge/block no retreat.";
+				max9 = 1;
+				break;
+		
+			default:
+				break;
+		}
+		
+		return [modifier, description];
+
+	}
+
 	/**
 	 * Get modifier, description for a ranged maneuver
 	 *
@@ -21605,6 +22123,58 @@ The attacker may choose to hit the original target or the limb you used to parry
 
 	}
 
+	/**
+	 * Get defense modifier, description for difference in height
+	 *
+	 * @param string height Difference in height
+	 *
+	 * @return array [modifier, description]
+	 */
+	 function getModifierForDefenseHeightDifference(height) {
+
+		let modifier = 0;
+
+		let description = "";
+
+		switch (height) {
+			case "2-3-higher":
+				modifier = 1;
+				description = "2-3 feet above attacker.";
+				break;
+		
+			case "3-4-higher":
+				modifier = 2;
+				description = "3-4 feet above attacker.";
+				break;
+		
+			case "4-6-higher":
+				modifier = 3;
+				description = "4-6 feet above attacker.";
+				break;
+		
+			case "2-3-below":
+				modifier = -1;
+				description = "2-3 feet below attacker.";
+				break;
+		
+			case "3-4-below":
+				modifier = -2;
+				description = "3-4 feet below attacker.";
+				break;
+		
+			case "4-6-below":
+				modifier = -3;
+				description = "4-6 feet below attacker.";
+				break;
+		
+			default:
+				break;
+		}
+		
+		return [modifier, description];
+
+	}
+
 	/**
 	 * Get modifier, description for vehicle conditions
 	 *
@@ -21845,7 +22415,7 @@ The attacker may choose to hit the original target or the limb you used to parry
 
 	const displaySectionsForDefense = {
 		"display_visibility_section": 0,
-		"display_afflictions_section": 1,
+		"display_afflictions_section": 0,
 		"display_tasks_section": 0,
 		"display_equipment_section": 0,
 		"display_attack_section": 0,
diff --git a/GURPS/translation.json b/GURPS/translation.json
index 7ea23b7a96..94252d41f1 100644
--- a/GURPS/translation.json
+++ b/GURPS/translation.json
@@ -115,6 +115,10 @@
   "height-difference-tooltip": "If you and your foe are at different levels, the vertical distance affects combat. See B402",
   "improvised-weapon-label": "Improvised Weapon",
   "improvised-weapon-tooltip": "Improvised weapon, See B404.",
+  "defense-improvised-abbreviate-weapon-label": "Improvised Wpn",
+  "defense-improvised-weapon-tooltip": "<b>NOTE:</b> <i>Dungeon Fantasy:</i> if parrying with an improvised weapon, apply a penalty. See DF Exploits-37",
+  "hidden-weapon-label": "Hidden Weapon: -2",
+  "defense-hidden-weapon-tooltip": "<b>NOTE:</b> From <i>Dungeon Fantasy</i>. If attacked by a hidden weapon, you're at -2 to your first defense. See DF Exploits-58",
   "backstab-label": "Backstab: +4",
   "backstab-tooltip": "<b>NOTE!</b> from Dungeon Fantasy. At start of combat, make Stealth roll. If successful, get backstab bonus. See DF Exploits 57-58",
   "tactics-label": "Tactics",
@@ -201,40 +205,78 @@
   "defense-crawling-tooltip": "If you're crawling or lying down, -3 to defense. See B549",
   "defense-kneeling-label": "Kneeling/Sitting: -2",
   "defense-kneeling-tooltip": "If you're kneeling or sitting, -2 to defense. See B549",
-  "retreating-dodge-label": "Retreating Dodge: +3",
-  "retreating-dodge-tooltip": "Move away from attacker, at least one yard or up to your <b>step</b>. See B377",
-  "retreating-block-parry-label": "Retreating Block/Parry: +1",
+  "retreating-dodge-label": "Retreat Dodge: +3",
+  "retreating-dodge-tooltip": "Retreating defense, move away from attacker, at least one yard or up to your <b>step</b>. See B377",
+  "retreating-block-parry-label": "Retreat Blk/Prry: +1",
+  "retreating-block-parry-tooltip": "Retreating block or parry. Move away from attacker, at least one yard or up to your <b>step</b>. See B377",
   "retreating-parry-label": "Retreating Parry: +3",
-  "retreating-parry-tooltip": "If using Boxing, Judo, Karater, or any fencing skill, you can get a +3 retreating bonus.<br />Move away from attacker, at least one yard or up to your <b>step</b>. See B377",
-  "acrobatic-dodge-label": "Acrobatic Dodge: +2",
+  "retreating-parry-tooltip": "If using Boxing, Judo, Karate, or any fencing skill, you can get a +3 retreating bonus.<br />Move away from attacker, at least one yard or up to your <b>step</b>. See B377",
+  "acrobatic-dodge-label": "Acrobatic Dodge",
+  "defense-nauseated-label": "Nauseated: -1",
+  "defense-nauseated-tooltip": "If nauseated, you're at -1 to defend. See B428",
   "acrobatic-dodge-success-tooltip": "If you made a successful acrobatic/aerobatic roll, get +2 to dodge. See B375",
   "acrobatic-dodge-failed-tooltip": "If you failed your acrobatic/aerobatic roll, you're at -2 to dodge. See B375",
   "dodge-drop-label": "Dodge & Drop: +3",
   "dodge-drop-tooltip": "Only against <b>ranged attacks</b>, drop to the ground and become prone.<br />Any cover you get does <i>not</i> count against the initial attack.<br /><b>NOTE:</b> Flying or Swimming is possible but only if a step would take you below concealing terrain. See B377",
-  "feverish-defense-label": "Feverish Defense (1 FP): +2",
-  "feverish-defense-tooltip": "Spend <b>1 FP</b> to increase active defense by 2. See B357",
+  "feverish-defense-label": "Feverish (1 FP): +2",
+  "feverish-defense-tooltip": "Feverish defense, spend <b>1 FP</b> to increase active defense by 2. See B357",
   "offhand-parry-label": "Off-Hand Parry: -2",
   "offhand-parry-tooltip": "Off-Hand weapon parry is at -2. See B549",
   "number-of-parries-label": "# of Parries",
-  "number-of-parries-tooltip": "You can more parry more than once per turn, but each additional parry is at a penalty. See B376",
-  "number-of-parries-master-label": "# of Parries <i>Master</i>",
+  "number-of-parries-tooltip": "You can more parry more than once per turn, but each additional parry is at a -4 penalty. See B376",
+  "number-of-parries-master-label": "Master Parries",
   "number-of-parries-master-tooltip": "If you're <b>Trained by a Master</b> or a <b>Weapon Master</b>, penalties are halved. See B376",
-  "attack-from-behind-label": "Attack From Behind <i>Peripheral</i>: -2",
+  "attack-from-behind-label": "Back <i>Peripheral</i>: -2",
   "attack-from-behind-tooltip": "Normally, if attacked from behind, you have no defense. However, if you have Peripheral Vision you can defend at -2. See B391",
-  "runarround-attack-label": "Runarround Attack: -2",
-  "runarround-attack-tooltip": "Your foe starts in front of you and runs behind you and attacks from behind. You can defend at -2. See B391",
+  "runaround-attack-label": "Runaround: -2",
+  "runaround-attack-tooltip": "Runaround Attack! Your foe starts in front of you and runs behind you and attacks from behind. You can defend at -2. See B391",
+  "grappled-dodge-label": "Grappled: -1 Dodge",
+  "grappled-dodge-tooltip": "<b>NOTE!</b> from Dungeon Fantasy. If grappled, you're at -1 to dodge. See DF Exploits 41",
+  "grappled-block-label": "Grappled: -2 Block/Parry",
+  "grappled-block-tooltip": "<b>NOTE!</b> from Dungeon Fantasy. If grappled, you're at -2 to block/parry. A grappled limb can't use block/parry. See DF Exploits 41",
   "stunned-label": "Stunned: -4",
   "stunned-tooltip": "If you're stunned, defend at -4. See B420",
   "encumbered-label": "Encumbered",
   "encumbered-tooltip": "Penalty equal to your encumbrance is applied to Dodge, Judo, Karate, ar any fencing Parry. See B549",
   "cant-see-attacker-label": "Can't See Attacker: -4",
-  "cant-see-attacker-tooltip": "If you can't see the target you're at -4. A <b>block</b> or <b>parry</b> requires Hearing-2. See B549",
-  "": "",
-  "": "",
-  "": "",
-  "": "",
-  "": "",
-  "": "",
+  "cant-see-attacker-tooltip": "If you can't see the attacker you're at -4 to defend. A <b>block</b> or <b>parry</b> requires Hearing-2. See B549",
+  "defenders-equipment-label": "Defender's Equipment",
+  "attackers-equipment-label": "Attacker's Equipment",
+  "trident-dodge-label": "Trident: -1 Dodge",
+  "trident-dodge-tooltip": "<b>NOTE:</b> From <i>Dungeon Fantasy</i>. -1 to dodge a trident. See DF Exploits-97",
+  "trident-block-label": "Trident: +1 Block/Parry",
+  "trident-block-tooltip": "<b>NOTE:</b> From <i>Dungeon Fantasy</i>. +1 to <b>block</b> or <b>parry</b> a trident. See DF Exploits-97",
+  "parrying-knife-label": "Parry with Knife: -1",
+  "parrying-knife-tooltip": "If parrying with a knife or dagger is -1. See B548<br /><b>Suggestion:</b> Add the modifier to your defense skill instead of using this checkbox.",
+  "parrying-kusari-label": "Parry with Kusari: -2",
+  "parrying-kusari-tooltip": "If parrying with a kusari or whip is -2. See B548<br /><b>Suggestion:</b> Add the modifier to your defense skill instead of using this checkbox.",
+  "parrying-staff-label": "Parry with Staff: +2",
+  "parrying-staff-tooltip": "If parrying with a staff you get +2. See B548<br /><b>Suggestion:</b> Add the modifier to your defense skill instead of using this checkbox.",
+  "defense-bonus-label": "Defense Bonus",
+  "defense-bonus-tooltip": "Apply the defense bonus of a shield, cloak, spell (B252), or Meta-trait (Supers34). See B374<br /><b>Shield/Cloak:</b> Used against attacks from front or from your shield side. Can't be used against firearms <b>unless</b> you're using the <i>Damage to Shields</i> option.<br /><b>Shield Spell:</b> Protects from <i>frontal</i> attacks and is cumulative with a normal shield.",
+  "unarmed-parry-label": "Unarmed Parry: -3",
+  "unarmed-parry-tooltip": "Unarmed parry vesus a weapon is -3, unless it's a thrust or you are using Judo or Karate parry. See B548",
+  "defense-laser-sight-tooltip": "If you can see the laser sight, you get +1 to <b>Dodge</b>. See B548",
+  "against-deceptive-attack-label": "Deceptive",
+  "against-deceptive-attack-tooltip": "You're at -1 to defense for every -2 the attacker took to their to hit modifier. See B369",
+  "against-dual-weapon-label": "Dual-Weapon: -1",
+  "against-dual-weapon-tooltip": "If both attacks hit you, you're at -1 to defend. See B548.",
+  "parry-flail-label": "Parry Flail: -4",
+  "parry-flail-tooltip": "If parrying against a flail, you're at -4 to defend. See B405.<br /><b>NOTE:</b> You can't parry flails with a <i>fencing</i> weapon.",
+  "parry-nunchaku-label": "Parry Nunchaku: -2",
+  "parry-nunchaku-tooltip": "If parrying against a nunchaku, you're at -2 to defend. See B405.<br /><b>NOTE:</b> You can't parry flails with a <i>fencing</i> weapon.",
+  "block-flail-label": "Block Flail: -2",
+  "block-flail-tooltip": "If blocking against a flail, you're at -2 to defend. See B405.  ",
+  "block-nunchaku-label": "Block Nunchaku: -1",
+  "block-nunchaku-tooltip": "If blocking against a nunchaku, you're at -1 to defend. See B405.",
+  "parry-thrown-weapon-label": "Parry thrown: -1",
+  "parry-thrown-weapon-tooltip": "Parry -1 against thrown weapon. See B549",
+  "parry-thrown-small-weapon-label": "Parry thrown, sm: -2",
+  "parry-thrown-small-weapon-tooltip": "If the thrown weapon is 1 pound or less, parry is -2. See B549",
+  "feint-attack-label": "Feint Attack",
+  "feint-attack-tooltip": "You're at a penalty equal to the attacker's margin of victory. See B365",
+  "defenders-posture-title": "Defender's Posture",
+  "attackers-action-title": "Attacker's Action",
   "afflictions-conditions-title": "Afflictions & Conditions",
   "coughing-sneezing-iq-label": "Coughing/Sneezing: -1 IQ",
   "coughing-sneezing-iq-tooltip": "-1 to IQ and IQ-based skills. Can't use Stealth. See B428.",
@@ -253,7 +295,12 @@
   "distraction-label": "Distraction",
   "distraction-tooltip": "-1 for Bees in your face, -2 for part clothes on fire, -3 all clothes on fire, etc. See B548.",
   "bad-footing-label": "Bad Footing",
-  "bad-footing-tooltip": "If defense, -1 or more. If attacking/skill, -2 or more. See B547-B549.",
+  "bad-footing-tooltip": "Skill penalty for bad footing. See B547-B549.",
+  "defense-bad-footing-tooltip": "Defensive penalty for bad footing. See B547-B549.",
+  "mounted-label": "Mounted",
+  "defense-mounted-tooltip": "If mounted, defensive penalty is equal to difference between 12 and Riding skill. See B388",
+  "retreating-flight-label": "Retreating Flight",
+  "retreating-flight-tooltip": "If flyer can <b>hover</b>, add +1 to defense to retreating defense <i>if</i> you can move 1 hex up or down. See B398",
   "grappled-label": "You're grappled: -4",
   "grappled-tooltip": "See Actions after being grappled for more information. See B371.",
   "holding-large-shield-label": "Holding Large Shield: -2",