diff --git a/data/json/obsoletion_and_migration_0.I/talk_tags_obsolete.json b/data/json/obsoletion_and_migration_0.I/talk_tags_obsolete.json
new file mode 100644
index 0000000000000..61582e97b961b
--- /dev/null
+++ b/data/json/obsoletion_and_migration_0.I/talk_tags_obsolete.json
@@ -0,0 +1,76 @@
+[
+  {
+    "type": "snippet",
+    "category": "<okay>",
+    "//": "Obsolete snippet category",
+    "text": "okay"
+  },
+  {
+    "type": "snippet",
+    "category": "<very>",
+    "text": "very"
+  },
+  {
+    "type": "snippet",
+    "category": "<really>",
+    "text": "really"
+  },
+  {
+    "type": "snippet",
+    "category": "<fuck_you>",
+    "text": "fuck you"
+  },
+  {
+    "type": "snippet",
+    "category": "<swear>",
+    "text": [ { "text": { "str": "<freaking>", "//~": "NO_I18N" } } ]
+  },
+  {
+    "type": "snippet",
+    "category": "<shitty>",
+    "text": "shitty"
+  },
+  {
+    "type": "snippet",
+    "category": "<dumb>",
+    "text": "dumb"
+  },
+  {
+    "type": "snippet",
+    "category": "<monster>",
+    "text": "monster"
+  },
+  {
+    "type": "snippet",
+    "category": "<happy>",
+    "text": "happy"
+  },
+  {
+    "type": "snippet",
+    "category": "<sad>",
+    "text": "sad"
+  },
+  {
+    "type": "snippet",
+    "category": "<get_lost>",
+    "text": "Get lost!"
+  },
+  {
+    "type": "snippet",
+    "category": "<move>",
+    "//": "Generic orders to move, mostly used as part of firing warnings.",
+    "text": "Clear the path"
+  },
+  {
+    "type": "snippet",
+    "category": "<ill_kill_you>",
+    "//": "The NPC is announcing a target, and all the phrases are followed by an NPC or monsters' name.",
+    "text": "I'll kill you,"
+  },
+  {
+    "type": "snippet",
+    "category": "<ill_die>",
+    "//": "A snippet use in the context of another complaint, like I'll die without your help",
+    "text": "I won't last much longer"
+  }
+]
diff --git a/doc/NPCs.md b/doc/NPCs.md
index d776d790b5179..b0442fa850b99 100644
--- a/doc/NPCs.md
+++ b/doc/NPCs.md
@@ -272,47 +272,47 @@ For further information on snippets, see [New Contributor Guide: Dialogue](https
 
 Field | Default messages/snippets | Used for...
 ---|---|---
-`<acknowledged>` | `<acknowledged>` | see data/json/npcs/talk_tags_follower.json
-`<camp_food_thanks>` | `<camp_food_thanks>` | see data/json/npcs/talk_tags_follower.json
-`<camp_larder_empty>` | `<camp_larder_empty>` | see data/json/npcs/talk_tags_follower.json
-`<camp_water_thanks>` | `<camp_water_thanks>` | see data/json/npcs/talk_tags_follower.json
-`<cant_flee>` | `<cant_flee>` | see data/json/npcs/talk_tags_line.json
-`<close_distance>` | `<close_distance>` | see data/json/npcs/talk_tags.json
-`<combat_noise_warning>` | `<combat_noise_warning>` | see data/json/npcs/talk_tags_line.json
-`<danger_close_distance>` | `<danger_close_distance>` | see data/json/npcs/talk_tags.json
-`<done_mugging>` | `<done_mugging>` | see data/json/npcs/talk_tags_line.json
-`<far_distance>` | `<far_distance>` | see data/json/npcs/talk_tags.json
-`<fire_bad>` | `<fire_bad>` | see data/json/npcs/talk_tags_line.json
-`<fire_in_the_hole_h>` | `<fire_in_the_hole_h>` | see data/json/npcs/talk_tags_line.json
-`<fire_in_the_hole>` | `<fire_in_the_hole>` | see data/json/npcs/talk_tags_line.json
-`<general_danger_h>` | `<general_danger_h>` | see data/json/npcs/talk_tags_line.json
-`<general_danger>` | `<general_danger>` | see data/json/npcs/talk_tags_line.json
-`<heal_self>` | `<heal_self>` | see data/json/npcs/talk_tags_line.json
-`<hungry>` | `<hungry>` | see data/json/npcs/talk_tags_follower.json
-`<im_leaving_you>` | `<im_leaving_you>` | see data/json/npcs/talk_tags_follower.json
-`<its_safe_h>` | `<its_safe_h>` | see data/json/npcs/talk_tags_line.json
-`<its_safe>` | `<its_safe>` | see data/json/npcs/talk_tags_line.json
-`<keep_up>` | `<keep_up>` | see data/json/npcs/talk_tags_follower.json
-`<kill_npc_h>` | `<kill_npc_h>` | see data/json/npcs/talk_tags_line.json
-`<kill_npc>` | `<kill_npc>` | see data/json/npcs/talk_tags_line.json
-`<kill_player_h>` | `<kill_player_h>` | see data/json/npcs/talk_tags_line.json
-`<let_me_pass>` | `<let_me_pass>` | see data/json/npcs/talk_tags_line.json
-`<lets_talk>` | `<lets_talk>` | see data/json/npcs/talk_tags_line.json
-`<medium_distance>` | `<medium_distance>` | see data/json/npcs/talk_tags.json
-`<monster_warning_h>` | `<monster_warning_h>` | see data/json/npcs/talk_tags_line.json
-`<monster_warning>` | `<monster_warning>` | see data/json/npcs/talk_tags_line.json
-`<movement_noise_warning>` | `<movement_noise_warning>` | see data/json/npcs/talk_tags_line.json
-`<need_batteries>` | `<need_batteries>` | see data/json/npcs/talk_tags_follower.json
-`<need_booze>` | `<need_booze>` | see data/json/npcs/talk_tags_follower.json
-`<need_fuel>` | `<need_fuel>` | see data/json/npcs/talk_tags_follower.json
-`<no_to_thorazine>` | `<no_to_thorazine>` | see data/json/npcs/talk_tags_line.json
-`<run_away>` | `<run_away>` | see data/json/npcs/talk_tags_line.json
-`<speech_warning>` | `<speech_warning>` | see data/json/npcs/talk_tags_line.json
-`<thirsty>` | `<thirsty>` | see data/json/npcs/talk_tags_follower.json
-`<wait>` | `<wait>` | see data/json/npcs/talk_tags_follower.json
-`<warn_sleep>` | `<warn_sleep>` | see data/json/npcs/talk_tags_follower.json
-`<yawn>` | `<yawn>` | see data/json/npcs/talk_tags_follower.json
-`<yes_to_lsd>` | `<yes_to_lsd>` | see data/json/npcs/talk_tags_line.json
+`<acknowledged>` | `<acknowledged>` | see data/json/npcs/snippets/talk_tags_follower.json
+`<camp_food_thanks>` | `<camp_food_thanks>` | see data/json/npcs/snippets/talk_tags_follower.json
+`<camp_larder_empty>` | `<camp_larder_empty>` | see data/json/npcs/snippets/talk_tags_follower.json
+`<camp_water_thanks>` | `<camp_water_thanks>` | see data/json/npcs/snippets/talk_tags_follower.json
+`<cant_flee>` | `<cant_flee>` | see data/json/npcs/snippets/talk_tags_combat.json
+`<close_distance>` | `<close_distance>` | see data/json/npcs/snippets/talk_tags.json
+`<combat_noise_warning>` | `<combat_noise_warning>` | see data/json/npcs/snippets/talk_tags_combat.json
+`<danger_close_distance>` | `<danger_close_distance>` | see data/json/npcs/snippets/talk_combat.json
+`<done_mugging>` | `<done_mugging>` | see data/json/npcs/snippets/talk_tags_combat.json
+`<far_distance>` | `<far_distance>` | see data/json/npcs/snippets/talk_tags.json
+`<fire_bad>` | `<fire_bad>` | see data/json/npcs/snippets/talk_tags_line.json
+`<fire_in_the_hole_h>` | `<fire_in_the_hole_h>` | see data/json/npcs/snippets/talk_tags_combat.json
+`<fire_in_the_hole>` | `<fire_in_the_hole>` | see data/json/npcs/snippets/talk_tags_combat.json
+`<general_danger_h>` | `<general_danger_h>` | see data/json/npcs/snippets/talk_tags_combat.json
+`<general_danger>` | `<general_danger>` | see data/json/npcs/snippets/talk_tags_combat.json
+`<heal_self>` | `<heal_self>` | see data/json/npcs/snippets/talk_tags_combat.json
+`<hungry>` | `<hungry>` | see data/json/npcs/snippets/talk_tags_follower.json
+`<im_leaving_you>` | `<im_leaving_you>` | see data/json/npcs/snippets/talk_tags_follower.json
+`<its_safe_h>` | `<its_safe_h>` | see data/json/npcs/snippets/talk_tags_combat.json
+`<its_safe>` | `<its_safe>` | see data/json/npcs/snippets/talk_tags_combat.json
+`<keep_up>` | `<keep_up>` | see data/json/npcs/snippets/talk_tags_follower.json
+`<kill_npc_h>` | `<kill_npc_h>` | see data/json/npcs/snippets/talk_tags_combat.json
+`<kill_npc>` | `<kill_npc>` | see data/json/npcs/snippets/talk_tags_combat.json
+`<kill_player_h>` | `<kill_player_h>` | see data/json/npcs/snippets/talk_tags_combat.json
+`<let_me_pass>` | `<let_me_pass>` | see data/json/npcs/snippets/talk_tags_line.json
+`<lets_talk>` | `<lets_talk>` | see data/json/npcs/snippets/talk_tags_combat.json
+`<medium_distance>` | `<medium_distance>` | see data/json/npcs/snippets/talk_tags.json
+`<monster_warning_h>` | `<monster_warning_h>` | see data/json/npcs/snippets/talk_tags_combat.json
+`<monster_warning>` | `<monster_warning>` | see data/json/npcs/snippets/talk_tags_combat.json
+`<movement_noise_warning>` | `<movement_noise_warning>` | see data/json/npcs/snippets/talk_tags_combat.json
+`<need_batteries>` | `<need_batteries>` | see data/json/npcs/snippets/talk_tags_follower.json
+`<need_booze>` | `<need_booze>` | see data/json/npcs/snippets/talk_tags_follower.json
+`<need_fuel>` | `<need_fuel>` | see data/json/npcs/snippets/talk_tags_follower.json
+`<no_to_thorazine>` | `<no_to_thorazine>` | see data/json/npcs/snippets/talk_tags_line.json
+`<run_away>` | `<run_away>` | see data/json/npcs/snippets/talk_tags_combat.json
+`<speech_warning>` | `<speech_warning>` | see data/json/npcs/snippets/talk_tags_combat.json
+`<thirsty>` | `<thirsty>` | see data/json/npcs/snippets/talk_tags_follower.json
+`<wait>` | `<wait>` | see data/json/npcs/snippets/talk_tags_follower.json
+`<warn_sleep>` | `<warn_sleep>` | see data/json/npcs/snippets/talk_tags_follower.json
+`<yawn>` | `<yawn>` | see data/json/npcs/snippets/talk_tags_follower.json
+`<yes_to_lsd>` | `<yes_to_lsd>` | see data/json/npcs/snippets/talk_tags_line.json
 `snip_bleeding` | `My %s is bleeding!` | The NPC is bleeding from their %s.
 `snip_bleeding_badly` | `My %s is bleeding badly!` | The NPC is bleeding badly from their %s.
 `snip_wound_bite` | `The bite wound on my %s looks bad.` | The NPC's %s was badly bitten.