From eb91feff7c167b4b118b753022ad06ca4df66316 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Thu, 11 Aug 2022 23:34:37 -0700
Subject: [PATCH] revise tag list and assignments

---
 docs/builtins/alias.rst               | 2 +-
 docs/builtins/cls.rst                 | 2 +-
 docs/builtins/die.rst                 | 2 +-
 docs/builtins/disable.rst             | 2 +-
 docs/builtins/enable.rst              | 2 +-
 docs/builtins/fpause.rst              | 2 +-
 docs/builtins/help.rst                | 2 +-
 docs/builtins/hide.rst                | 2 +-
 docs/builtins/keybinding.rst          | 2 +-
 docs/builtins/kill-lua.rst            | 2 +-
 docs/builtins/load.rst                | 2 +-
 docs/builtins/ls.rst                  | 2 +-
 docs/builtins/plug.rst                | 2 +-
 docs/builtins/reload.rst              | 2 +-
 docs/builtins/sc-script.rst           | 2 +-
 docs/builtins/script.rst              | 2 +-
 docs/builtins/show.rst                | 2 +-
 docs/builtins/tags.rst                | 2 +-
 docs/builtins/type.rst                | 2 +-
 docs/builtins/unload.rst              | 2 +-
 docs/plugins/3dveins.rst              | 2 +-
 docs/plugins/RemoteFortressReader.rst | 2 +-
 docs/plugins/add-spatter.rst          | 2 +-
 docs/plugins/autochop.rst             | 2 +-
 docs/plugins/autoclothing.rst         | 2 +-
 docs/plugins/autodump.rst             | 2 +-
 docs/plugins/autofarm.rst             | 2 +-
 docs/plugins/autogems.rst             | 2 +-
 docs/plugins/automelt.rst             | 2 +-
 docs/plugins/autotrade.rst            | 2 +-
 docs/plugins/blueprint.rst            | 2 +-
 docs/plugins/building-hacks.rst       | 2 +-
 docs/plugins/buildingplan.rst         | 2 +-
 docs/plugins/burrows.rst              | 2 +-
 docs/plugins/cleanconst.rst           | 2 +-
 docs/plugins/cleaners.rst             | 2 +-
 docs/plugins/command-prompt.rst       | 2 +-
 docs/plugins/cursecheck.rst           | 2 +-
 docs/plugins/diggingInvaders.rst      | 2 +-
 docs/plugins/dwarfmonitor.rst         | 2 +-
 docs/plugins/dwarfvet.rst             | 2 +-
 docs/plugins/eventful.rst             | 2 +-
 docs/plugins/fix-unit-occupancy.rst   | 2 +-
 docs/plugins/fixveins.rst             | 2 +-
 docs/plugins/forceequip.rst           | 2 +-
 docs/plugins/getplants.rst            | 2 +-
 docs/plugins/hotkeys.rst              | 2 +-
 docs/plugins/infiniteSky.rst          | 2 +-
 docs/plugins/isoworldremote.rst       | 2 +-
 docs/plugins/luasocket.rst            | 2 +-
 docs/plugins/manipulator.rst          | 2 +-
 docs/plugins/map-render.rst           | 2 +-
 docs/plugins/mode.rst                 | 2 +-
 docs/plugins/orders.rst               | 2 +-
 docs/plugins/pathable.rst             | 2 +-
 docs/plugins/petcapRemover.rst        | 2 +-
 docs/plugins/plants.rst               | 2 +-
 docs/plugins/power-meter.rst          | 2 +-
 docs/plugins/probe.rst                | 2 +-
 docs/plugins/prospector.rst           | 2 +-
 docs/plugins/regrass.rst              | 2 +-
 docs/plugins/rename.rst               | 2 +-
 docs/plugins/rendermax.rst            | 2 +-
 docs/plugins/resume.rst               | 2 +-
 docs/plugins/seedwatch.rst            | 2 +-
 docs/plugins/showmood.rst             | 2 +-
 docs/plugins/siege-engine.rst         | 2 +-
 docs/plugins/spectate.rst             | 2 +-
 docs/plugins/steam-engine.rst         | 2 +-
 docs/plugins/stockflow.rst            | 2 +-
 docs/plugins/stocks.rst               | 2 +-
 docs/plugins/stonesense.rst           | 2 +-
 docs/plugins/tailor.rst               | 2 +-
 docs/plugins/title-folder.rst         | 2 +-
 docs/plugins/title-version.rst        | 2 +-
 docs/plugins/trackstop.rst            | 2 +-
 docs/plugins/tweak.rst                | 2 +-
 docs/plugins/workNow.rst              | 2 +-
 78 files changed, 78 insertions(+), 78 deletions(-)

diff --git a/docs/builtins/alias.rst b/docs/builtins/alias.rst
index 84a761556..a9f44386a 100644
--- a/docs/builtins/alias.rst
+++ b/docs/builtins/alias.rst
@@ -3,7 +3,7 @@ alias
 
 .. dfhack-tool::
     :summary: Configure helper aliases for other DFHack commands.
-    :tags: system
+    :tags: dfhack
 
 Aliases are resolved immediately after built-in commands, which means that an
 alias cannot override a built-in command, but can override a command implemented
diff --git a/docs/builtins/cls.rst b/docs/builtins/cls.rst
index 2aad049b4..515235a93 100644
--- a/docs/builtins/cls.rst
+++ b/docs/builtins/cls.rst
@@ -3,7 +3,7 @@ cls
 
 .. dfhack-tool::
     :summary: Clear the terminal screen.
-    :tags: system
+    :tags: dfhack
 
 Can also be invoked as ``clear``. Note that this command does not delete command
 history. It just clears the text on the screen.
diff --git a/docs/builtins/die.rst b/docs/builtins/die.rst
index b4873abc5..25a34504d 100644
--- a/docs/builtins/die.rst
+++ b/docs/builtins/die.rst
@@ -3,7 +3,7 @@ die
 
 .. dfhack-tool::
     :summary: Instantly exit DF without saving.
-    :tags: system
+    :tags: dfhack
 
 Use to exit DF quickly and safely.
 
diff --git a/docs/builtins/disable.rst b/docs/builtins/disable.rst
index e109e69e1..73d267ccf 100644
--- a/docs/builtins/disable.rst
+++ b/docs/builtins/disable.rst
@@ -3,7 +3,7 @@ disable
 
 .. dfhack-tool::
     :summary: Deactivate a DFHack tool that has some persistent effect.
-    :tags: system
+    :tags: dfhack
 
 See the `enable` command for more info.
 
diff --git a/docs/builtins/enable.rst b/docs/builtins/enable.rst
index 63b0bdc5f..19f98a122 100644
--- a/docs/builtins/enable.rst
+++ b/docs/builtins/enable.rst
@@ -3,7 +3,7 @@ enable
 
 .. dfhack-tool::
     :summary: Activate a DFHack tool that has some persistent effect.
-    :tags: system
+    :tags: dfhack
 
 Many plugins and scripts can be in a distinct enabled or disabled state. Some
 of them activate and deactivate automatically depending on the contents of the
diff --git a/docs/builtins/fpause.rst b/docs/builtins/fpause.rst
index 2e8f851f7..5379caec0 100644
--- a/docs/builtins/fpause.rst
+++ b/docs/builtins/fpause.rst
@@ -3,7 +3,7 @@ fpause
 
 .. dfhack-tool::
     :summary: Forces DF to pause.
-    :tags: system
+    :tags: dfhack
 
 This is useful when your FPS drops below 1 and you lose control of the game.
 
diff --git a/docs/builtins/help.rst b/docs/builtins/help.rst
index e1e913747..95dadefd9 100644
--- a/docs/builtins/help.rst
+++ b/docs/builtins/help.rst
@@ -3,7 +3,7 @@ help
 
 .. dfhack-tool::
     :summary: Display help about a command or plugin.
-    :tags: system
+    :tags: dfhack
 
 Can also be invoked as ``?`` or ``man`` (short for "manual").
 
diff --git a/docs/builtins/hide.rst b/docs/builtins/hide.rst
index 0ec8f36df..b23738860 100644
--- a/docs/builtins/hide.rst
+++ b/docs/builtins/hide.rst
@@ -3,7 +3,7 @@ hide
 
 .. dfhack-tool::
     :summary: Hide the DFHack terminal window.
-    :tags: system
+    :tags: dfhack
 
 You can show it again with the `show` command, though you'll need to use it from
 a `keybinding` set beforehand or the in-game `command-prompt`.
diff --git a/docs/builtins/keybinding.rst b/docs/builtins/keybinding.rst
index 5ce8145f4..ae51d7a37 100644
--- a/docs/builtins/keybinding.rst
+++ b/docs/builtins/keybinding.rst
@@ -3,7 +3,7 @@ keybinding
 
 .. dfhack-tool::
     :summary: Create hotkeys that will run DFHack commands.
-    :tags: system
+    :tags: dfhack
 
 Like any other command, it can be used at any time from the console, but
 bindings are not remembered between runs of the game unless re-created in
diff --git a/docs/builtins/kill-lua.rst b/docs/builtins/kill-lua.rst
index 4de0ab7d1..3334b3b2b 100644
--- a/docs/builtins/kill-lua.rst
+++ b/docs/builtins/kill-lua.rst
@@ -3,7 +3,7 @@ kill-lua
 
 .. dfhack-tool::
     :summary: Gracefully stop any currently-running Lua scripts.
-    :tags: system
+    :tags: dfhack
 
 Use this command to stop a misbehaving script that appears to be stuck.
 
diff --git a/docs/builtins/load.rst b/docs/builtins/load.rst
index d253144a8..0c199ae3d 100644
--- a/docs/builtins/load.rst
+++ b/docs/builtins/load.rst
@@ -3,7 +3,7 @@ load
 
 .. dfhack-tool::
     :summary: Load and register a plugin library.
-    :tags: system
+    :tags: dfhack
 
 Also see `unload` and `reload` for related actions.
 
diff --git a/docs/builtins/ls.rst b/docs/builtins/ls.rst
index 702c8bae5..6ef09d236 100644
--- a/docs/builtins/ls.rst
+++ b/docs/builtins/ls.rst
@@ -3,7 +3,7 @@ ls
 
 .. dfhack-tool::
     :summary: List available DFHack commands.
-    :tags: system
+    :tags: dfhack
 
 In order to group related commands, each command is associated with a list of
 tags. You can filter the listed commands by a tag or a substring of the
diff --git a/docs/builtins/plug.rst b/docs/builtins/plug.rst
index e10c154e5..a1b136306 100644
--- a/docs/builtins/plug.rst
+++ b/docs/builtins/plug.rst
@@ -3,7 +3,7 @@ plug
 
 .. dfhack-tool::
     :summary: List available plugins and whether they are enabled.
-    :tags: system
+    :tags: dfhack
 
 Usage::
 
diff --git a/docs/builtins/reload.rst b/docs/builtins/reload.rst
index 1429e1038..17efffb2c 100644
--- a/docs/builtins/reload.rst
+++ b/docs/builtins/reload.rst
@@ -3,7 +3,7 @@ reload
 
 .. dfhack-tool::
     :summary: Reload a loaded plugin.
-    :tags: system
+    :tags: dfhack
 
 Developers use this command to reload a plugin that they are actively modifying.
 Also see `load` and `unload` for related actions.
diff --git a/docs/builtins/sc-script.rst b/docs/builtins/sc-script.rst
index b3255cb9f..5203f1aff 100644
--- a/docs/builtins/sc-script.rst
+++ b/docs/builtins/sc-script.rst
@@ -3,7 +3,7 @@ sc-script
 
 .. dfhack-tool::
     :summary: Run commands when game state changes occur.
-    :tags: system
+    :tags: dfhack
 
 This is similar to the static `init-files` but is slightly more flexible since
 it can be set dynamically.
diff --git a/docs/builtins/script.rst b/docs/builtins/script.rst
index fbcebff6c..0f40df5df 100644
--- a/docs/builtins/script.rst
+++ b/docs/builtins/script.rst
@@ -3,7 +3,7 @@ script
 
 .. dfhack-tool::
     :summary: Execute a batch file of DFHack commands.
-    :tags: system
+    :tags: dfhack
 
 It reads a text file and runs each line as a DFHack command as if it had been
 typed in by the user -- treating the input like `an init file <init-files>`.
diff --git a/docs/builtins/show.rst b/docs/builtins/show.rst
index 7002d5aff..c59f4e519 100644
--- a/docs/builtins/show.rst
+++ b/docs/builtins/show.rst
@@ -3,7 +3,7 @@ show
 
 .. dfhack-tool::
     :summary: Unhides the DFHack terminal window.
-    :tags: system
+    :tags: dfhack
 
 Useful if you have hidden the terminal with `hide` and you want it back. Since
 the terminal window won't be available to run this command, you'll need to use
diff --git a/docs/builtins/tags.rst b/docs/builtins/tags.rst
index 93a094149..3823a9924 100644
--- a/docs/builtins/tags.rst
+++ b/docs/builtins/tags.rst
@@ -3,7 +3,7 @@ tags
 
 .. dfhack-tool::
     :summary: List the strings that DFHack tools can be tagged with.
-    :tags: system
+    :tags: dfhack
 
 You can find groups of related tools by passing the tag name to the `ls`
 command.
diff --git a/docs/builtins/type.rst b/docs/builtins/type.rst
index 3336cae5f..dfcb493f9 100644
--- a/docs/builtins/type.rst
+++ b/docs/builtins/type.rst
@@ -3,7 +3,7 @@ type
 
 .. dfhack-tool::
     :summary: Describe how a command is implemented.
-    :tags: system
+    :tags: dfhack
 
 DFHack commands can be provided by plugins, scripts, or by the core library
 itself. The ``type`` command can tell you which is the source of a particular
diff --git a/docs/builtins/unload.rst b/docs/builtins/unload.rst
index 132732a7f..fd9e11a46 100644
--- a/docs/builtins/unload.rst
+++ b/docs/builtins/unload.rst
@@ -3,7 +3,7 @@ unload
 
 .. dfhack-tool::
     :summary: Unload a plugin from memory.
-    :tags: system
+    :tags: dfhack
 
 Also see `load` and `reload` for related actions.
 
diff --git a/docs/plugins/3dveins.rst b/docs/plugins/3dveins.rst
index c60582310..b22ac81e5 100644
--- a/docs/plugins/3dveins.rst
+++ b/docs/plugins/3dveins.rst
@@ -3,7 +3,7 @@
 
 .. dfhack-tool::
     :summary: Rewrite layer veins to expand in 3D space.
-    :tags: fort mod map
+    :tags: fort gameplay map
 
 Existing, flat veins are removed and new 3D veins that naturally span z-levels
 are generated in their place. The transformation preserves the mineral counts
diff --git a/docs/plugins/RemoteFortressReader.rst b/docs/plugins/RemoteFortressReader.rst
index f849266c2..9a925d0fd 100644
--- a/docs/plugins/RemoteFortressReader.rst
+++ b/docs/plugins/RemoteFortressReader.rst
@@ -3,7 +3,7 @@ RemoteFortressReader
 
 .. dfhack-tool::
     :summary: Backend for Armok Vision.
-    :tags: dev
+    :tags: dev graphics
     :no-command:
 
 .. dfhack-command:: RemoteFortressReader_version
diff --git a/docs/plugins/add-spatter.rst b/docs/plugins/add-spatter.rst
index 06739291e..873bd761f 100644
--- a/docs/plugins/add-spatter.rst
+++ b/docs/plugins/add-spatter.rst
@@ -3,7 +3,7 @@ add-spatter
 
 .. dfhack-tool::
     :summary: Make tagged reactions produce contaminants.
-    :tags: adventure fort mod items
+    :tags: adventure fort gameplay items
     :no-command:
 
 Give some use to all those poisons that can be bought from caravans! The plugin
diff --git a/docs/plugins/autochop.rst b/docs/plugins/autochop.rst
index b445384fb..f0f7932fd 100644
--- a/docs/plugins/autochop.rst
+++ b/docs/plugins/autochop.rst
@@ -3,7 +3,7 @@ autochop
 
 .. dfhack-tool::
     :summary: Auto-harvest trees when low on stockpiled logs.
-    :tags: fort auto
+    :tags: fort auto plants
     :no-command:
 
 This plugin can designate trees for chopping when your stocks are low on logs.
diff --git a/docs/plugins/autoclothing.rst b/docs/plugins/autoclothing.rst
index a5b57dfb1..ed4f2160d 100644
--- a/docs/plugins/autoclothing.rst
+++ b/docs/plugins/autoclothing.rst
@@ -3,7 +3,7 @@ autoclothing
 
 .. dfhack-tool::
     :summary: Automatically manage clothing work orders.
-    :tags: fort auto jobs
+    :tags: fort auto workorders
 
 This command allows you to set how many of each clothing type every citizen
 should have.
diff --git a/docs/plugins/autodump.rst b/docs/plugins/autodump.rst
index 0fd7ee23c..e2d812219 100644
--- a/docs/plugins/autodump.rst
+++ b/docs/plugins/autodump.rst
@@ -3,7 +3,7 @@ autodump
 
 .. dfhack-tool::
     :summary: Automatically set items in a stockpile to be dumped.
-    :tags: fort auto fps items stockpiles
+    :tags: fort productivity fps armok stockpiles items
     :no-command:
 
 .. dfhack-command:: autodump
diff --git a/docs/plugins/autofarm.rst b/docs/plugins/autofarm.rst
index 44077eb89..026a2ad61 100644
--- a/docs/plugins/autofarm.rst
+++ b/docs/plugins/autofarm.rst
@@ -3,7 +3,7 @@ autofarm
 
 .. dfhack-tool::
     :summary: Automatically manage farm crop selection.
-    :tags: fort auto buildings
+    :tags: fort auto plants
 
 Periodically scan your plant stocks and assign crops to your farm plots based on
 which plant stocks are low (as long as you have the appropriate seeds). The
diff --git a/docs/plugins/autogems.rst b/docs/plugins/autogems.rst
index f95d74fea..9efa33499 100644
--- a/docs/plugins/autogems.rst
+++ b/docs/plugins/autogems.rst
@@ -3,7 +3,7 @@ autogems
 
 .. dfhack-tool::
     :summary: Automatically cut rough gems.
-    :tags: fort auto jobs
+    :tags: fort auto workorders
     :no-command:
 
 .. dfhack-command:: autogems-reload
diff --git a/docs/plugins/automelt.rst b/docs/plugins/automelt.rst
index 508fdaeaf..09b35a378 100644
--- a/docs/plugins/automelt.rst
+++ b/docs/plugins/automelt.rst
@@ -3,7 +3,7 @@ automelt
 
 .. dfhack-tool::
     :summary: Quickly designate items to be melted.
-    :tags: fort auto items stockpiles
+    :tags: fort productivity stockpiles items
     :no-command:
 
 When `enabled <enable>`, this plugin adds an option to the :kbd:`q` menu for
diff --git a/docs/plugins/autotrade.rst b/docs/plugins/autotrade.rst
index f27fab122..946e53508 100644
--- a/docs/plugins/autotrade.rst
+++ b/docs/plugins/autotrade.rst
@@ -3,7 +3,7 @@ autotrade
 
 .. dfhack-tool::
     :summary: Quickly designate items to be traded.
-    :tags: fort auto items stockpiles
+    :tags: fort productivity stockpiles items
     :no-command:
 
 When `enabled <enable>`, this plugin adds an option to the :kbd:`q` menu for
diff --git a/docs/plugins/blueprint.rst b/docs/plugins/blueprint.rst
index 8654aa1ec..ed3d0b29c 100644
--- a/docs/plugins/blueprint.rst
+++ b/docs/plugins/blueprint.rst
@@ -3,7 +3,7 @@ blueprint
 
 .. dfhack-tool::
     :summary: Record a live game map in a quickfort blueprint.
-    :tags: fort design quickfort map
+    :tags: fort design buildings stockpiles map
 
 With ``blueprint``, you can export the structure of a portion of your fortress
 in a blueprint file that you (or anyone else) can later play back with
diff --git a/docs/plugins/building-hacks.rst b/docs/plugins/building-hacks.rst
index cd8835f37..12f49fbbe 100644
--- a/docs/plugins/building-hacks.rst
+++ b/docs/plugins/building-hacks.rst
@@ -3,7 +3,7 @@ building-hacks
 
 .. dfhack-tool::
     :summary: Provides a Lua API for creating powered workshops.
-    :tags: fort mod buildings
+    :tags: fort gameplay buildings
     :no-command:
 
 See `building-hacks-api` for more details.
diff --git a/docs/plugins/buildingplan.rst b/docs/plugins/buildingplan.rst
index ea9d78f64..4e96e3349 100644
--- a/docs/plugins/buildingplan.rst
+++ b/docs/plugins/buildingplan.rst
@@ -3,7 +3,7 @@ buildingplan
 
 .. dfhack-tool::
     :summary: Plan building construction before you have materials.
-    :tags: fort design quickfort buildings map
+    :tags: fort design buildings
 
 This plugin adds a planning mode for building placement. You can then place
 furniture, constructions, and other buildings before the required materials are
diff --git a/docs/plugins/burrows.rst b/docs/plugins/burrows.rst
index 92e62f08b..1bdbd959f 100644
--- a/docs/plugins/burrows.rst
+++ b/docs/plugins/burrows.rst
@@ -3,7 +3,7 @@ burrows
 
 .. dfhack-tool::
     :summary: Auto-expand burrows as you dig.
-    :tags: fort auto productivity units
+    :tags: fort auto productivity design map units
     :no-command:
 
 .. dfhack-command:: burrow
diff --git a/docs/plugins/cleanconst.rst b/docs/plugins/cleanconst.rst
index 9c0309105..9417bd539 100644
--- a/docs/plugins/cleanconst.rst
+++ b/docs/plugins/cleanconst.rst
@@ -3,7 +3,7 @@ cleanconst
 
 .. dfhack-tool::
     :summary: Cleans up construction materials.
-    :tags: fort fps map
+    :tags: fort fps buildings
 
 This tool alters all constructions on the map so that they spawn their building
 component when they are disassembled, allowing their actual build items to be
diff --git a/docs/plugins/cleaners.rst b/docs/plugins/cleaners.rst
index 42e585da1..ca022c440 100644
--- a/docs/plugins/cleaners.rst
+++ b/docs/plugins/cleaners.rst
@@ -6,7 +6,7 @@ cleaners
 
 .. dfhack-tool::
     :summary: Provides commands for cleaning spatter from the map.
-    :tags: adventure fort fps items map units
+    :tags: adventure fort fps armok items map units
     :no-command:
 
 .. dfhack-command:: clean
diff --git a/docs/plugins/command-prompt.rst b/docs/plugins/command-prompt.rst
index 278741f36..802a1898e 100644
--- a/docs/plugins/command-prompt.rst
+++ b/docs/plugins/command-prompt.rst
@@ -3,7 +3,7 @@ command-prompt
 
 .. dfhack-tool::
     :summary: An in-game DFHack terminal where you can run other commands.
-    :tags: system
+    :tags: dfhack
 
 Usage::
 
diff --git a/docs/plugins/cursecheck.rst b/docs/plugins/cursecheck.rst
index b2e2943ba..afe6b537f 100644
--- a/docs/plugins/cursecheck.rst
+++ b/docs/plugins/cursecheck.rst
@@ -3,7 +3,7 @@ cursecheck
 
 .. dfhack-tool::
     :summary: Check for cursed creatures.
-    :tags: system interface
+    :tags: dev fps stockpiles
 
 This command checks a single map tile (or the whole map/world) for cursed
 creatures (ghosts, vampires, necromancers, werebeasts, zombies, etc.).
diff --git a/docs/plugins/diggingInvaders.rst b/docs/plugins/diggingInvaders.rst
index df54e7008..bdb65b490 100644
--- a/docs/plugins/diggingInvaders.rst
+++ b/docs/plugins/diggingInvaders.rst
@@ -3,7 +3,7 @@ diggingInvaders
 
 .. dfhack-tool::
     :summary: Invaders dig and destroy to get to your dwarves.
-    :tags: fort mod map
+    :tags: fort gameplay military units
 
 Usage:
 
diff --git a/docs/plugins/dwarfmonitor.rst b/docs/plugins/dwarfmonitor.rst
index 73d8a8c19..1c499639f 100644
--- a/docs/plugins/dwarfmonitor.rst
+++ b/docs/plugins/dwarfmonitor.rst
@@ -3,7 +3,7 @@ dwarfmonitor
 
 .. dfhack-tool::
     :summary: Measure fort happiness and efficiency.
-    :tags: fort inspection units
+    :tags: fort inspection jobs units
 
 It can also show heads-up display widgets with live fort statistics.
 
diff --git a/docs/plugins/dwarfvet.rst b/docs/plugins/dwarfvet.rst
index f607e85cd..fc8f84659 100644
--- a/docs/plugins/dwarfvet.rst
+++ b/docs/plugins/dwarfvet.rst
@@ -3,7 +3,7 @@ dwarfvet
 
 .. dfhack-tool::
     :summary: Allows animals to be treated at animal hospitals.
-    :tags: fort mod animals
+    :tags: fort gameplay animals
 
 Annoyed your dragons become useless after a minor injury? Well, with dwarfvet,
 injured animals will be treated at an animal hospital, which is simply a hospital
diff --git a/docs/plugins/eventful.rst b/docs/plugins/eventful.rst
index d5bd55956..e89480413 100644
--- a/docs/plugins/eventful.rst
+++ b/docs/plugins/eventful.rst
@@ -3,7 +3,7 @@ eventful
 
 .. dfhack-tool::
     :summary: Provides a Lua API for reacting to in-game events.
-    :tags: dev mod
+    :tags: dev gameplay
     :no-command:
 
 See `eventful-api` for details.
diff --git a/docs/plugins/fix-unit-occupancy.rst b/docs/plugins/fix-unit-occupancy.rst
index 117f97467..ba75ed389 100644
--- a/docs/plugins/fix-unit-occupancy.rst
+++ b/docs/plugins/fix-unit-occupancy.rst
@@ -3,7 +3,7 @@ fix-unit-occupancy
 
 .. dfhack-tool::
     :summary: Fix phantom unit occupancy issues.
-    :tags: fort fix map
+    :tags: fort bugfix map
 
 If you see "unit blocking tile" messages that you can't account for
 (:bug:`3499`), this tool can help.
diff --git a/docs/plugins/fixveins.rst b/docs/plugins/fixveins.rst
index 045b3c8da..f8b9c4c36 100644
--- a/docs/plugins/fixveins.rst
+++ b/docs/plugins/fixveins.rst
@@ -3,7 +3,7 @@ fixveins
 
 .. dfhack-tool::
     :summary: Restore missing mineral inclusions.
-    :tags: fort fix map
+    :tags: fort bugfix map
 
 This tool can also remove invalid references to mineral inclusions if you broke
 your embark with tools like `tiletypes`.
diff --git a/docs/plugins/forceequip.rst b/docs/plugins/forceequip.rst
index acfd8f462..b835865e2 100644
--- a/docs/plugins/forceequip.rst
+++ b/docs/plugins/forceequip.rst
@@ -3,7 +3,7 @@ forceequip
 
 .. dfhack-tool::
     :summary: Move items into a unit's inventory.
-    :tags: adventure fort items units
+    :tags: adventure fort animals items military units
 
 This tool is typically used to equip specific clothing/armor items onto a dwarf,
 but can also be used to put armor onto a war animal or to add unusual items
diff --git a/docs/plugins/getplants.rst b/docs/plugins/getplants.rst
index 502f6e9ae..90f4203b9 100644
--- a/docs/plugins/getplants.rst
+++ b/docs/plugins/getplants.rst
@@ -3,7 +3,7 @@ getplants
 
 .. dfhack-tool::
     :summary: Designate trees for chopping and shrubs for gathering.
-    :tags: fort productivity
+    :tags: fort productivity plants
 
 Specify the types of trees to cut down and/or shrubs to gather by their plant
 names.
diff --git a/docs/plugins/hotkeys.rst b/docs/plugins/hotkeys.rst
index 7d30d486e..6115bc90c 100644
--- a/docs/plugins/hotkeys.rst
+++ b/docs/plugins/hotkeys.rst
@@ -3,7 +3,7 @@ hotkeys
 
 .. dfhack-tool::
     :summary: Show all dfhack keybindings for the current context.
-    :tags: system productivity interface
+    :tags: dfhack
 
 The command opens an in-game screen showing which DFHack keybindings are active
 in the current context. See also `hotkey-notes`.
diff --git a/docs/plugins/infiniteSky.rst b/docs/plugins/infiniteSky.rst
index 46f30c24c..144c6c6e7 100644
--- a/docs/plugins/infiniteSky.rst
+++ b/docs/plugins/infiniteSky.rst
@@ -3,7 +3,7 @@ infiniteSky
 
 .. dfhack-tool::
     :summary: Automatically allocates new z-levels of sky
-    :tags: fort map
+    :tags: fort design map
 
 If enabled, this plugin will automatically allocate new z-levels of sky at the
 top of the map as you build up. Or it can allocate one or many additional levels
diff --git a/docs/plugins/isoworldremote.rst b/docs/plugins/isoworldremote.rst
index 1fa439b29..284794f96 100644
--- a/docs/plugins/isoworldremote.rst
+++ b/docs/plugins/isoworldremote.rst
@@ -3,7 +3,7 @@ isoworldremote
 
 .. dfhack-tool::
     :summary: Provides a remote API used by Isoworld.
-    :tags: dev mod
+    :tags: dev graphics
     :no-command:
 
 See `remote` for related remote APIs.
diff --git a/docs/plugins/luasocket.rst b/docs/plugins/luasocket.rst
index 24b30c7a6..4b5b18540 100644
--- a/docs/plugins/luasocket.rst
+++ b/docs/plugins/luasocket.rst
@@ -3,7 +3,7 @@ luasocket
 
 .. dfhack-tool::
     :summary: Provides a Lua API for accessing network sockets.
-    :tags: dev mod
+    :tags: dev
     :no-command:
 
 See `luasocket-api` for details.
diff --git a/docs/plugins/manipulator.rst b/docs/plugins/manipulator.rst
index 26223587d..a0c8ec38e 100644
--- a/docs/plugins/manipulator.rst
+++ b/docs/plugins/manipulator.rst
@@ -3,7 +3,7 @@ manipulator
 
 .. dfhack-tool::
     :summary: An in-game labor management interface.
-    :tags: fort productivity interface labors
+    :tags: fort productivity labors
     :no-command:
 
 It is equivalent to the popular Dwarf Therapist utility.
diff --git a/docs/plugins/map-render.rst b/docs/plugins/map-render.rst
index 7754af8b7..efe3ed0c6 100644
--- a/docs/plugins/map-render.rst
+++ b/docs/plugins/map-render.rst
@@ -3,7 +3,7 @@ map-render
 
 .. dfhack-tool::
     :summary: Provides a Lua API for rerendering portions of the map.
-    :tags: dev
+    :tags: dev graphics
     :no-command:
 
 See `map-render-api` for details.
diff --git a/docs/plugins/mode.rst b/docs/plugins/mode.rst
index db94e6bac..94ee7cb44 100644
--- a/docs/plugins/mode.rst
+++ b/docs/plugins/mode.rst
@@ -3,7 +3,7 @@ mode
 
 .. dfhack-tool::
     :summary: See and change the game mode.
-    :tags: dev
+    :tags: dev gameplay armok
 
 .. warning::
 
diff --git a/docs/plugins/orders.rst b/docs/plugins/orders.rst
index 9403c6c8e..036e0df11 100644
--- a/docs/plugins/orders.rst
+++ b/docs/plugins/orders.rst
@@ -3,7 +3,7 @@ orders
 
 .. dfhack-tool::
     :summary: Manage manager orders.
-    :tags: fort productivity jobs
+    :tags: fort productivity workorders
 
 Usage:
 
diff --git a/docs/plugins/pathable.rst b/docs/plugins/pathable.rst
index 800580017..f4b89683b 100644
--- a/docs/plugins/pathable.rst
+++ b/docs/plugins/pathable.rst
@@ -3,7 +3,7 @@ pathable
 
 .. dfhack-tool::
     :summary: Marks tiles that are reachable from the cursor.
-    :tags: dev inspection interface map
+    :tags: dev inspection map
     :no-command:
 
 This plugin provides a Lua API, but no direct commands. See `pathable-api` for
diff --git a/docs/plugins/petcapRemover.rst b/docs/plugins/petcapRemover.rst
index f3d011308..d4e1f2279 100644
--- a/docs/plugins/petcapRemover.rst
+++ b/docs/plugins/petcapRemover.rst
@@ -3,7 +3,7 @@ petcapRemover
 
 .. dfhack-tool::
     :summary: Modify the pet population cap.
-    :tags: fort armok animals
+    :tags: fort animals
 
 In vanilla DF, pets will not reproduce unless the population is below 50 and the
 number of children of that species is below a certain percentage. This plugin
diff --git a/docs/plugins/plants.rst b/docs/plugins/plants.rst
index d28119af9..cc23c84dd 100644
--- a/docs/plugins/plants.rst
+++ b/docs/plugins/plants.rst
@@ -5,7 +5,7 @@ plants
 
 .. dfhack-tool::
     :summary: Provides commands that interact with plants.
-    :tags: adventure fort armok map
+    :tags: adventure fort armok map plants
     :no-command:
 
 .. dfhack-command:: plant
diff --git a/docs/plugins/power-meter.rst b/docs/plugins/power-meter.rst
index 01e75491a..5e608ca46 100644
--- a/docs/plugins/power-meter.rst
+++ b/docs/plugins/power-meter.rst
@@ -3,7 +3,7 @@ power-meter
 
 .. dfhack-tool::
     :summary: Allow presure plates to measure power.
-    :tags: fort mod buildings
+    :tags: fort gameplay buildings
     :no-command:
 
 If you run `gui/power-meter` while building a pressure plate, the pressure
diff --git a/docs/plugins/probe.rst b/docs/plugins/probe.rst
index 54436be68..7da332ba5 100644
--- a/docs/plugins/probe.rst
+++ b/docs/plugins/probe.rst
@@ -3,7 +3,7 @@ probe
 
 .. dfhack-tool::
     :summary: Display low-level properties of the selected tile.
-    :tags: adventure fort inspection map
+    :tags: adventure fort inspection buildings map units
 
 .. dfhack-command:: bprobe
     :summary: Display low-level properties of the selected building.
diff --git a/docs/plugins/prospector.rst b/docs/plugins/prospector.rst
index dc6204c06..7ef3d223c 100644
--- a/docs/plugins/prospector.rst
+++ b/docs/plugins/prospector.rst
@@ -5,7 +5,7 @@ prospector
 
 .. dfhack-tool::
     :summary: Provides commands that help you analyze natural resources.
-    :tags: fort embark inspection map
+    :tags: fort embark inspection armok map
     :no-command:
 
 .. dfhack-command:: prospect
diff --git a/docs/plugins/regrass.rst b/docs/plugins/regrass.rst
index 72f077fcd..a4b011a1e 100644
--- a/docs/plugins/regrass.rst
+++ b/docs/plugins/regrass.rst
@@ -3,7 +3,7 @@ regrass
 
 .. dfhack-tool::
     :summary: Regrows all the grass.
-    :tags: adventure fort armok animals
+    :tags: adventure fort armok animals map
 
 Use this command if your grazers have eaten everything down to the dirt.
 
diff --git a/docs/plugins/rename.rst b/docs/plugins/rename.rst
index 02bc04c2c..c3e4d5b59 100644
--- a/docs/plugins/rename.rst
+++ b/docs/plugins/rename.rst
@@ -3,7 +3,7 @@ rename
 
 .. dfhack-tool::
     :summary: Easily rename things.
-    :tags: adventure fort productivity
+    :tags: adventure fort productivity buildings stockpiles units
 
 Use `gui/rename` for an in-game interface.
 
diff --git a/docs/plugins/rendermax.rst b/docs/plugins/rendermax.rst
index 680676fa3..af3dc6c0c 100644
--- a/docs/plugins/rendermax.rst
+++ b/docs/plugins/rendermax.rst
@@ -3,7 +3,7 @@ rendermax
 
 .. dfhack-tool::
     :summary: Modify the map lighting.
-    :tags: adventure fort mod
+    :tags: adventure fort gameplay graphics
 
 This plugin provides a collection of OpenGL lighting filters that affect how the
 map is drawn to the screen.
diff --git a/docs/plugins/resume.rst b/docs/plugins/resume.rst
index 0713026e4..b8c388738 100644
--- a/docs/plugins/resume.rst
+++ b/docs/plugins/resume.rst
@@ -3,7 +3,7 @@ resume
 
 .. dfhack-tool::
     :summary: Color planned buildings based on their suspend status.
-    :tags: fort productivity
+    :tags: fort productivity interface jobs
     :no-command:
 
 .. dfhack-command:: resume
diff --git a/docs/plugins/seedwatch.rst b/docs/plugins/seedwatch.rst
index 1aaa04ee3..7d31c160c 100644
--- a/docs/plugins/seedwatch.rst
+++ b/docs/plugins/seedwatch.rst
@@ -3,7 +3,7 @@ seedwatch
 
 .. dfhack-tool::
     :summary: Manages seed and plant cooking based on seed stock levels.
-    :tags: fort auto
+    :tags: fort auto plants
 
 Each seed type can be assigned a target. If the number of seeds of that type
 falls below that target, then the plants and seeds of that type will be excluded
diff --git a/docs/plugins/showmood.rst b/docs/plugins/showmood.rst
index da67b5803..2a294b166 100644
--- a/docs/plugins/showmood.rst
+++ b/docs/plugins/showmood.rst
@@ -3,7 +3,7 @@ showmood
 
 .. dfhack-tool::
     :summary: Shows all items needed for the active strange mood.
-    :tags: fort inspection jobs
+    :tags: fort inspection armok jobs units
 
 Usage::
 
diff --git a/docs/plugins/siege-engine.rst b/docs/plugins/siege-engine.rst
index 06ff963b7..a6b3e87a8 100644
--- a/docs/plugins/siege-engine.rst
+++ b/docs/plugins/siege-engine.rst
@@ -3,7 +3,7 @@ siege-engine
 
 .. dfhack-tool::
     :summary: Extend the functionality and usability of siege engines.
-    :tags: fort mod buildings
+    :tags: fort gameplay buildings
     :no-command:
 
 Siege engines in DF haven't been updated since the game was 2D, and can only aim
diff --git a/docs/plugins/spectate.rst b/docs/plugins/spectate.rst
index 7f448ebfb..96147695a 100644
--- a/docs/plugins/spectate.rst
+++ b/docs/plugins/spectate.rst
@@ -3,7 +3,7 @@ spectate
 
 .. dfhack-tool::
     :summary: Automatically follow exciting dwarves.
-    :tags: fort units
+    :tags: fort interface
     :no-command:
 
 Usage::
diff --git a/docs/plugins/steam-engine.rst b/docs/plugins/steam-engine.rst
index e0f938915..6560ae714 100644
--- a/docs/plugins/steam-engine.rst
+++ b/docs/plugins/steam-engine.rst
@@ -3,7 +3,7 @@ steam-engine
 
 .. dfhack-tool::
     :summary: Allow modded steam engine buildings to function.
-    :tags: fort mod buildings
+    :tags: fort gameplay buildings
     :no-command:
 
 The steam-engine plugin detects custom workshops with the string
diff --git a/docs/plugins/stockflow.rst b/docs/plugins/stockflow.rst
index 81eab07ff..358305a96 100644
--- a/docs/plugins/stockflow.rst
+++ b/docs/plugins/stockflow.rst
@@ -3,7 +3,7 @@ stockflow
 
 .. dfhack-tool::
     :summary: Queue manager jobs based on free space in stockpiles.
-    :tags: fort auto jobs stockpiles
+    :tags: fort auto stockpiles workorders
 
 With this plugin, the fortress bookkeeper can tally up free space in specific
 stockpiles and queue jobs through the manager to produce items to fill the free
diff --git a/docs/plugins/stocks.rst b/docs/plugins/stocks.rst
index e518fc1f1..144ba2287 100644
--- a/docs/plugins/stocks.rst
+++ b/docs/plugins/stocks.rst
@@ -3,7 +3,7 @@ stocks
 
 .. dfhack-tool::
     :summary: Enhanced fortress stock management interface.
-    :tags: fort productivity interface
+    :tags: fort productivity items
 
 When the plugin is enabled, two new hotkeys become available:
 
diff --git a/docs/plugins/stonesense.rst b/docs/plugins/stonesense.rst
index 0315c92ed..b43f95697 100644
--- a/docs/plugins/stonesense.rst
+++ b/docs/plugins/stonesense.rst
@@ -3,7 +3,7 @@ stonesense
 
 .. dfhack-tool::
     :summary: A 3D isometric visualizer.
-    :tags: adventure fort interface map
+    :tags: adventure fort map graphics
 
 .. dfhack-command:: ssense
    :summary: An alias for stonesense.
diff --git a/docs/plugins/tailor.rst b/docs/plugins/tailor.rst
index 5da293fbf..646e73f91 100644
--- a/docs/plugins/tailor.rst
+++ b/docs/plugins/tailor.rst
@@ -3,7 +3,7 @@ tailor
 
 .. dfhack-tool::
     :summary: Automatically keep your dwarves in fresh clothing.
-    :tags: fort auto jobs
+    :tags: fort auto workorders
 
 Whenever the bookkeeper updates stockpile records, this plugin will scan the
 fort. If there are fresh cloths available, dwarves who are wearing tattered
diff --git a/docs/plugins/title-folder.rst b/docs/plugins/title-folder.rst
index 56de7d769..ca349a0ed 100644
--- a/docs/plugins/title-folder.rst
+++ b/docs/plugins/title-folder.rst
@@ -3,7 +3,7 @@ title-folder
 
 .. dfhack-tool::
     :summary: Displays the DF folder name in the window title bar.
-    :tags: system interface
+    :tags: interface
     :no-command:
 
 Usage::
diff --git a/docs/plugins/title-version.rst b/docs/plugins/title-version.rst
index f7fc238c7..239b08bc2 100644
--- a/docs/plugins/title-version.rst
+++ b/docs/plugins/title-version.rst
@@ -3,7 +3,7 @@ title-version
 
 .. dfhack-tool::
     :summary: Displays the DFHack version on DF's title screen.
-    :tags: system interface
+    :tags: interface
     :no-command:
 
 Usage::
diff --git a/docs/plugins/trackstop.rst b/docs/plugins/trackstop.rst
index 65aae2b7f..1c638dfd7 100644
--- a/docs/plugins/trackstop.rst
+++ b/docs/plugins/trackstop.rst
@@ -3,7 +3,7 @@ trackstop
 
 .. dfhack-tool::
     :summary: Add dynamic configuration options for track stops.
-    :tags: fort interface mod buildings
+    :tags: fort gameplay buildings
     :no-command:
 
 When enabled, this plugin adds a :kbd:`q` menu for track stops, which is
diff --git a/docs/plugins/tweak.rst b/docs/plugins/tweak.rst
index 71b564434..c04392c62 100644
--- a/docs/plugins/tweak.rst
+++ b/docs/plugins/tweak.rst
@@ -3,7 +3,7 @@ tweak
 
 .. dfhack-tool::
     :summary: A collection of tweaks and bugfixes.
-    :tags: adventure fort interface fps fix armok
+    :tags: adventure fort fps bugfix armok interface
 
 Usage::
 
diff --git a/docs/plugins/workNow.rst b/docs/plugins/workNow.rst
index 678649487..27709c166 100644
--- a/docs/plugins/workNow.rst
+++ b/docs/plugins/workNow.rst
@@ -3,7 +3,7 @@ workNow
 
 .. dfhack-tool::
     :summary: Reduce the time that dwarves idle after completing a job.
-    :tags: fort auto jobs
+    :tags: fort auto labors
 
 After finishing a job, dwarves will wander away for a while before picking up a
 new job. This plugin will automatically poke the game to assign dwarves to new