diff --git a/GURPS/gurps.html b/GURPS/gurps.html
index 6144b62a22..e89615fe87 100644
--- a/GURPS/gurps.html
+++ b/GURPS/gurps.html
@@ -1293,6 +1293,24 @@
 
 								</div>
 
+								<div class="block">
+
+									<label>
+										<div>
+											<input type="checkbox" name="attr_flurry_of_blows" value="1" title="macro name: @{flurry_of_blows}" />
+										</div>
+										<div>
+											<div class="tooltip">
+												<span data-i18n="flurry-of-blows-label">Flurry of Blows (1 FP/attack): -3</span>
+												<span class="tooltiptext">
+													<span data-i18n="flurry-of-blows-tooltip">Flurry of Blows for 1 FP per attack. Similar to Rapid Strike, you make two attacks at -3 each, you <b>may</b> attack multiple opponents. You must have a ready weapon. If you have more than one attack, like all-out attack double, you can replace <b>one</b> of the attacks with rapid strike. <b>Can't</b> be combined with <b>Mighty Blow</b>. See B357</span>
+												</span>
+											</div>
+										</div>
+									</label>
+
+								</div>
+
 								<div class="block">
 
 									<label>
@@ -1329,6 +1347,24 @@
 
 								</div>
 
+								<div class="block">
+
+									<label>
+										<div>
+											<input type="checkbox" name="attr_mighty_blow" value="1" title="macro name: @{might_blow}" />
+										</div>
+										<div>
+											<div class="tooltip">
+												<span data-i18n="mighty-blow-label">Mighty Blow (1 FP)</span>
+												<span class="tooltiptext">
+													<span data-i18n="mighty-blow-tooltip">Mighty Blow does extra damage for 1 FP per attack. <b>Can't</b> be combined with <b>Flurry of Blows</b>. See B357.</span>
+												</span>
+											</div>
+										</div>
+									</label>
+
+								</div>
+
 							</div>
 
 							<div class="item item10">
@@ -4275,7 +4311,8 @@
 					<li>Roll Modifier Tool. Added a reset button and a note icons to view the summary of the roll modifiers.</li>
 					<li>Roll Modifier Tool. Added a checkbox to apply encumbrance penalty skills, techniques, and active defenses.</li>
 					<li>Roll Modifier Tool for Defense. Added drop-down to apply Shield DB and Magic DB to active defenses.</li>
-					<li>Combat tab > Defense. Added option to display Defense Bonus Notes on roll result table. Requested by Charles.</li>
+					<li>Combat tab > Defense. Added option to display Defense Bonus Notes on roll result table. Requested by <i>Charles</i>.</li>
+					<li>Roll Modifier Tool. Melee Attacks. Added <b>Flurry of Blows</b> and <b>Might Blow</b>. Requested by <i>Hypnobeard</i></li>
 				</ul>
 
 				<label class="check"><input type="checkbox" name="attr_announcements_hide" value="1">&nbsp;<b><span data-i18n="hide-until-next-update">Hide until next update</span></b></label>
@@ -13007,7 +13044,8 @@ visualize what it will look like in chat.
 				<li>Roll Modifier Tool. Added a reset button and a note icons to view the summary of the roll modifiers.</li>
 				<li>Roll Modifier Tool. Added a checkbox to apply encumbrance penalty skills, techniques, and active defenses.</li>
 				<li>Roll Modifier Tool for Defense. Added drop-down to apply Shield DB and Magic DB to active defenses.</li>
-				<li>Combat tab > Defense. Added option to display Defense Bonus Notes on roll result table. Requested by Charles.</li>
+				<li>Combat tab > Defense. Added option to display Defense Bonus Notes on roll result table. Requested by <i>Charles</i>.</li>
+				<li>Roll Modifier Tool. Melee Attacks. Added <b>Flurry of Blows</b> and <b>Might Blow</b>. Requested by <i>Hypnobeard</i></li>
 			</ul>
 
 			<h4>Version: 2.5.3</h4>
@@ -15247,7 +15285,7 @@ See notes for weapon.</textarea>
 
 	var version = "2.5.4";
 
-	var latestChangesDate = "12/6/2020";
+	var latestChangesDate = "12/9/2020";
 
 	var modCascade = true;
 	
@@ -15365,8 +15403,10 @@ See notes for weapon.</textarea>
 		["evaluate", {modifier: 0, description: "Evaluate", affectsVisibility: false, isDropDown: true, isMax9: false, isTrait: false, checkPain: false}],
 		["wild_swing", {modifier: -5, description: "Wild Swing", affectsVisibility: false, isDropDown: false, isMax9: true, isTrait: false, checkPain: false}],
 		["rapid_strike", {modifier: -6, description: "Rapid Strike", affectsVisibility: false, isDropDown: false, isMax9: false, isTrait: false, checkPain: false}],
+		["flurry_of_blows", {modifier: -3, description: "Flurry of Blows. 1 FP per attack", affectsVisibility: false, isDropDown: false, isMax9: false, isTrait: false, checkPain: false}],
 		["rapid_strike_master", {modifier: -3, description: "Rapid Strike (master)", affectsVisibility: false, isDropDown: false, isMax9: false, isTrait: false, checkPain: false}],
 		["attack_from_above", {modifier: -2, description: "Attack from above", affectsVisibility: false, isDropDown: false, isMax9: false, isTrait: false, checkPain: false}],
+		["mighty_blow", {modifier: 0, description: "Mighty Blow 1 FP per attack. +2 Damage or +1 per die!", affectsVisibility: false, isDropDown: false, isMax9: false, isTrait: false, checkPain: false}],
 		["posture", {modifier: 0, description: "From a function", affectsVisibility: false, isDropDown: false, isMax9: false, isTrait: true, checkPain: false}],
 		["melee_height_difference", {modifier: 0, description: "From a function", affectsVisibility: false, isDropDown: true, isMax9: false, isTrait: false, checkPain: false}],
 		["improvised_weapon", {modifier: 0, description: "Improvised Weapon", affectsVisibility: false, isDropDown: true, isMax9: false, isTrait: false, checkPain: false}],
@@ -15412,7 +15452,7 @@ See notes for weapon.</textarea>
 		["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_feverish", {modifier: 2, 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}],
@@ -15590,8 +15630,10 @@ See notes for weapon.</textarea>
 		"deceptive_strike",
 		"evaluate",
 		"rapid_strike",
+		"flurry_of_blows",
 		"rapid_strike_master",
 		"attack_from_above",
+		"mighty_blow",
 		"melee_height_difference",
 		"improvised_weapon",
 		"tactics",
@@ -23395,8 +23437,10 @@ The attacker may choose to hit the original target or the limb you used to parry
 		"change:deceptive_strike",
 		"change:evaluate",
 		"change:rapid_strike",
+		"change:flurry_of_blows",
 		"change:rapid_strike_master",
 		"change:attack_from_above",
+		"change:mighty_blow",
 		"change:melee_height_difference",
 		"change:improvised_weapon",
 		"change:tactics",
@@ -23905,6 +23949,10 @@ The attacker may choose to hit the original target or the limb you used to parry
 					if (field.isMax9) {
 						max9 = 1;
 					}
+				} else if (key == "mighty_blow" && values.mighty_blow) {
+
+					summary.set(key, description);
+
 				}
 
 				// set max skill of 9 if the melee max 9 was set to true
@@ -25819,7 +25867,15 @@ The attacker may choose to hit the original target or the limb you used to parry
 		updates[`${section}_roll_trait_summary`] = "";
 		updates[`${section}_roll_hit_location`] = "";
 		updates[`${section}_roll_allout_attack`] = "";
-		updates[`${section}_oll_max_nine`] = 0;
+		updates[`${section}_roll_max_nine`] = 0;
+
+		// if defense, also reset Defense Bonuses
+		if (section == "defense") {
+		
+			updates[`${section}_apply_shield_db`] = 0;
+			updates[`${section}_apply_magic_db`] = 0;
+
+		}
 			
 		setAttrs(updates);
 
diff --git a/GURPS/translation.json b/GURPS/translation.json
index 6b8a62fb2c..8b47dc1a90 100644
--- a/GURPS/translation.json
+++ b/GURPS/translation.json
@@ -98,7 +98,7 @@
   "all-out-attack-feint-label": "Feint: +0",
   "all-out-attack-feint-tooltip": "Feint and attack a single foe! Contest of melee weapon skills, defender is at -1 defense per point you win by. Lasts one second!<br />Movement: half-move, forward only<br />Defense: None<br />See B365",
   "all-out-attack-strong-label": "Strong: +0",
-  "all-out-attack-strong-tooltip": "Single attack with +2 to damage or +1 damage per die for ST-based weapons!<br />Movement: half-move, forward only<br />Defense: None<br />See B365",
+  "all-out-attack-strong-tooltip": "Single ST-based attack for +2 to damage or +1 damage per die!<br />Movement: half-move, forward only<br />Defense: None<br />See B365",
   "posture-label": "Posture",
   "posture-tooltip": "Your posture when attack was made. See B547.",
   "evaluate-label": "Evaluate",
@@ -111,8 +111,12 @@
   "rapid-strike-tooltip": "Make two attacks at -6 each, you <b>may</b> attack multiple opponents. You must have a ready weapon. If you have more than one attack, like all-out attack double, you can replace <b>one</b> of the attacks with rapid strike. See B370",
   "rapid-strike-master-label": "Rapid Strike <i>Master</i>: -3",
   "rapid-strike-master-tooltip": "Trained by a Master or Weapon Master. Make two attacks at -3 each, you <b>may</b> attack multiple opponents. You must have a ready weapon. If you have more than one attack, like all-out attack double, you can replace <b>one</b> of the attacks with rapid strike. See B370 and B547",
+  "flurry-of-blows-label": "Flurry of Blows (1 FP): -3",
+  "flurry-of-blows-tooltip": "Flurry of Blows for 1 FP per attack. Similar to Rapid Strike, you make two attacks at -3 each, you <b>may</b> attack multiple opponents. You must have a ready weapon. If you have more than one attack, like all-out attack double, you can replace <b>one</b> of the attacks with rapid strike. <b>Can't</b> be combined with <b>Mighty Blow</b>. See B370",
   "attack-from-above-label": "Attack from above: -2",
   "attack-from-above-tooltip": "Roll contest of Stealth vs Vision (-2 if not looking up).<br />If you win, target is surprised and gets <b>No defense</b> and may <i>freeze</i>.<br />If you lose, target is at -2 defense.<br />If target is <i>aware</i> they could use <i>stop-thrust</i>.<br />You suffer falling damage, but can use skills to offset distance.<br /><b>Optional attack:</b> do falling damage to target.<br />See B400",
+  "mighty-blow-label": "Mighty Blow (1 FP)",
+  "mighty-blow-tooltip": "Mighty Blow does extra damage for 1 FP per attack. ST-based attack for +2 to damage or +1 damage per die! <b>Can't</b> be combined with <b>Flurry of Blows</b>. See B357.",
   "height-difference-label": "Height Difference",
   "height-difference-tooltip": "If you and your foe are at different levels, the vertical distance affects combat. See B402",
   "improvised-weapon-label": "Improvised Weapon",