diff --git a/data/json/martialarts.json b/data/json/martialarts.json
index a9ccfbe25adb9..d067099be4e96 100644
--- a/data/json/martialarts.json
+++ b/data/json/martialarts.json
@@ -1331,6 +1331,49 @@
     ],
     "techniques": [ "tec_taichi_disarm", "tec_taichi_palm", "tec_taichi_counter", "tec_taichi_precise" ]
   },
+  {
+    "type": "martial_art",
+    "id": "style_tiger",
+    "name": "Tiger Kung Fu",
+    "description": "One of the five Shaolin animal styles.  The Tiger focuses on relentless attacks above all else.  Your Strength determines your accuracy, and your attacks do increasing damage as you continue attacking.",
+    "initiate": [ "You clench your hands into ferocious, tiger-like claws.", "%s assumes a tiger-like stance." ],
+    "learn_difficulty": 10,
+    "static_buffs": [
+      {
+        "id": "buff_tiger_static",
+        "name": "Tiger's Strength",
+        "description": "You do not need defense.  You do not need a plan.  You need strength.  Strength will break your opponents' defenses and overwhelm them completely.\n\nStrength increases Accuracy instead of Dexterity.\n\nAccuracy increased by 25%% of Strength but decreased by 25%% of Dexterity.",
+        "min_unarmed": 0,
+        "unarmed_allowed": true,
+        "flat_bonuses": [ [ "hit", "str", 0.25 ], [ "hit", "dex", -0.25 ] ]
+      }
+    ],
+    "onhit_buffs": [
+      {
+        "id": "buff_tiger_onhit",
+        "name": "Tiger Fury",
+        "description": "You attack with an endless barrage of strikes.  The more you hit, the stronger you become.\n\n+10%% damage.\nLasts 3 turns.  Stacks 4 times.",
+        "unarmed_allowed": true,
+        "min_unarmed": 2,
+        "buff_duration": 3,
+        "max_stacks": 4,
+        "mult_bonuses": [ [ "damage", "bash", 1.1 ], [ "damage", "cut", 1.1 ], [ "damage", "stab", 1.1 ] ]
+      }
+    ],
+    "oncrit_buffs": [
+      {
+        "id": "buff_tiger_oncrit",
+        "name": "Tiger Rampage",
+        "description": "Your opponent's lose is your gain.  Your next attack will break through your opponent's guard.\n\nGain Armor Penetration equal to 50%% of Strength.\nLasts 1 turns.  Stacks 2 times.",
+        "unarmed_allowed": true,
+        "min_unarmed": 3,
+        "buff_duration": 1,
+        "max_stacks": 2,
+        "flat_bonuses": [ [ "arpen", "bash", "str", 0.5 ], [ "arpen", "cut", "str", 0.5 ], [ "arpen", "stab", "str", 0.5 ] ]
+      }
+    ],
+    "techniques": [ "tec_tiger_palm", "tec_tiger_takedown" ]
+  },
   {
     "type": "martial_art",
     "id": "style_zui_quan",
@@ -1371,38 +1414,6 @@
     ],
     "techniques": [ "tec_zuiquan_feint", "tec_zuiquan_counter" ]
   },
-  {
-    "type": "martial_art",
-    "id": "style_tiger",
-    "name": "Tiger Kung Fu",
-    "description": "One of the five Shaolin animal styles.  The Tiger focuses on relentless attacks above all else.  Your Strength determines your accuracy, and your attacks do increasing damage as you continue attacking.",
-    "initiate": [ "You clench your hands into ferocious, tiger-like claws.", "%s assumes a tiger-like stance." ],
-    "learn_difficulty": 10,
-    "arm_block": 99,
-    "leg_block": 99,
-    "static_buffs": [
-      {
-        "id": "tiger_static",
-        "name": "Tiger Strength",
-        "description": "Strength provides additional damage bonus.",
-        "unarmed_allowed": true,
-        "flat_bonuses": [ [ "damage", "bash", "str", 0.8 ] ]
-      }
-    ],
-    "onhit_buffs": [
-      {
-        "id": "tiger_hit_buff",
-        "name": "Tiger Fury",
-        "description": "+3 Bash/atk",
-        "unarmed_allowed": true,
-        "min_unarmed": 2,
-        "buff_duration": 3,
-        "max_stacks": 8,
-        "flat_bonuses": [ [ "damage", "bash", 3.0 ] ]
-      }
-    ],
-    "techniques": [ "tec_tiger_grab" ]
-  },
   {
     "type": "martial_art",
     "id": "style_debug",
diff --git a/data/json/techniques.json b/data/json/techniques.json
index 6cfb282259450..60ed80ab25a2b 100644
--- a/data/json/techniques.json
+++ b/data/json/techniques.json
@@ -1438,6 +1438,26 @@
     "stun_dur": 1,
     "mult_bonuses": [ [ "damage", "bash", 2.0 ] ]
   },
+  {
+    "type": "technique",
+    "id": "tec_tiger_palm",
+    "name": "Tiger Palm",
+    "messages": [ "You land a heavy tiger palm on %s", "<npcname> lands a heavy tiger palm on %s" ],
+    "min_unarmed": 4,
+    "unarmed_allowed": true,
+    "crit_tec": true,
+    "stun_dur": 1
+  },
+  {
+    "type": "technique",
+    "id": "tec_tiger_takedown",
+    "name": "Tiger Takedown",
+    "messages": [ "You slam %s to the ground", "<npcname> slams %s to the ground" ],
+    "min_unarmed": 1,
+    "unarmed_allowed": true,
+    "crit_tec": true,
+    "down_dur": 1
+  },
   {
     "type": "technique",
     "id": "tec_zuiquan_feint",
@@ -1459,15 +1479,6 @@
     "mult_bonuses": [ [ "movecost", 0.0 ], [ "damage", "bash", 1.25 ] ],
     "messages": [ "You lurch, and your wild swing hits %s", "<npcname> lurches, and hits %s" ]
   },
-  {
-    "type": "technique",
-    "id": "tec_tiger_grab",
-    "name": "Tiger Takedown",
-    "min_unarmed": 4,
-    "unarmed_allowed": true,
-    "down_dur": 1,
-    "messages": [ "You grab and ground %s", "<npcname> grabs and grounds %s" ]
-  },
   {
     "type": "technique",
     "id": "tec_debug_slow",